diff options
| -rw-r--r-- | data/recipes/default.js | 21 | ||||
| -rw-r--r-- | makefile | 17 |
2 files changed, 19 insertions, 19 deletions
diff --git a/data/recipes/default.js b/data/recipes/default.js index dcb36123..e7980627 100644 --- a/data/recipes/default.js +++ b/data/recipes/default.js @@ -294,22 +294,23 @@ edible("burger", group_hidden(combine(PL, cut(bun), cut(fish))) ) -// Noodles -const noodle = cook(cut(roll(dough)).as("noodles").tr(POT)) -edible("noodles", - combine(PL, noodle, tomato_juice), - combine(PL, noodle, tomato_juice, cut(cheese)), - // combine(PL, noodle, tomato_juice, cut(cheese), sear(patty)), -) - // Soup +const tomato_soup = cook(combine(POT, tomato_juice)).as("tomato-soup") edible("soups", - cook(combine(POT, tomato_juice)).as("tomato-soup").tr(PL), - cook(combine(POT, cut(mushroom))).as("mushroom-soup").tr(PL), + tomato_soup.tr(PL), + cook(combine(POT, process(mushroom.tr(FP)))).as("mushroom-soup").tr(PL), cook(combine(POT, cheese, cut(leek))).as("cheese-leek-soup").tr(PL), // cook(combine(PL, patty, cut(potato), cut(leek))).as("stew").tr(PL) ) +// Noodles +const noodle = cook(cut(roll(dough)).as("noodles").tr(POT)) +edible("noodles", + combine(PL, noodle, tomato_soup), + combine(PL, noodle, tomato_soup, cut(cheese)), + // combine(PL, noodle, tomato_juice, cut(cheese), sear(patty)), +) + // Rice and nigiri edible("nigiri", container_add(cut(fish), cook(rice.tr(POT))).as("nigiri").tr(PL), @@ -30,8 +30,9 @@ EDITOR = target/release/hurrycurry-editor ALL_TESTCLIENT = test-client/main.js $(patsubst locale/%.ini,test-client/locale/%.json,$(wildcard locale/*.ini)) ALL_BOOK = target/book/book.html ALL_SERVER = $(SERVER) $(TOOLS) $(REPLAYTOOL) $(EDITOR) $(DISCOVER) $(LOCALE_EXPORT) -ALL_CLIENT = client/.godot/import-finished client/icons/adaptive-background.png client/icons/adaptive-foreground.png -ALL = $(ALL_BOOK) $(ALL_SERVER) $(ALL_CLIENT) +ALL_CLIENT = client/.godot/import-finished client/icons/adaptive-background.png client/icons/adaptive-foreground.png +ALL_DATA = data/recipes/none.yaml data/recipes/anticurry.yaml data/recipes/default.yaml +ALL = $(ALL_BOOK) $(ALL_SERVER) $(ALL_CLIENT) $(ALL_DATA) .PHONY: all clean all_client all_server all_book all_testclient all: $(ALL) all_client: $(ALL_CLIENT) @@ -44,17 +45,15 @@ clean: target/release/%: $(shell find server -type f -name '*.rs') cargo build --release --bin $(patsubst target/release/%,%,$@); touch $@ -target/book/tiles/list: $(TOOLS) +target/book/tiles/list: $(TOOLS) $(ALL_DATA) @mkdir -p $(dir $@); $(TOOLS) map-tiles 5star > $@~ && cp $@~ $@ -target/book/items/list: $(TOOLS) +target/book/items/list: $(TOOLS) $(ALL_DATA) @mkdir -p $(dir $@); $(TOOLS) map-items 5star > $@~ && cp $@~ $@ target/book/tiles/done: target/book/tiles/list client/.godot/import-finished - $(CLIENT) --render-tiles ../$< --render-output ../$(dir $@) --render-resolution 256 - touch $@ + $(CLIENT) --render-tiles ../$< --render-output ../$(dir $@) --render-resolution 256; touch $@ target/book/items/done: target/book/items/list client/.godot/import-finished - $(CLIENT) --render-items ../$< --render-output ../$(dir $@) --render-resolution 256 - touch $@ -target/book/book.html: target/book/tiles/done target/book/items/done $(BOOK_EXPORT) + $(CLIENT) --render-items ../$< --render-output ../$(dir $@) --render-resolution 256; touch $@ +target/book/book.html: target/book/tiles/done target/book/items/done $(BOOK_EXPORT) $(ALL_DATA) $(BOOK_EXPORT) -f html -m 5star > $@~ && cp $@~ $@ data/recipes/none.yaml: |