From 9753ae7d43ea1069a9d71c1182dacf8b7028a201 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Mon, 24 Jun 2024 18:33:38 +0200 Subject: mixer is now food processor --- data/recipes.ts | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'data') diff --git a/data/recipes.ts b/data/recipes.ts index ea2706ed..7eb8ef4b 100644 --- a/data/recipes.ts +++ b/data/recipes.ts @@ -34,7 +34,7 @@ function auto_trash() { let [i, ic] = get_container(ifull) if (i == "plate") continue if (i == "pot") continue - if (i == "mixer") continue + if (i == "food-processor") continue if (i == "dirty") continue if (ic == "plate") ic = "dirty-plate" out({ @@ -64,10 +64,10 @@ function cook(from: string, to?: string) { out({ action: "passive", duration: 20, revert_duration: 40, tile: "stove", inputs: [i], outputs: [o] }) out({ action: "passive", duration: 5, revert_duration: 10, tile: "stove", inputs: [o], outputs: ["burned-pot"], warn: true }) } -function mix(from: string, to?: string) { - const i = from + "-mixer" - const o = (to ?? (from + "-juice")) + "-mixer" - out({ action: "instant", inputs: ["mixer", from], outputs: [i] }) +function process(from: string, to?: string) { + const i = from + "-food-processor" + const o = (to ?? (from + "-juice")) + "-food-processor" + out({ action: "instant", inputs: ["food-processor", from], outputs: [i] }) out({ action: "active", duration: 3, inputs: [i], outputs: [o] }) } function bake(from: string, to?: string) { @@ -82,7 +82,7 @@ function crate(item: string) { function get_container(ifull: string): [string, string | null] { const iparts = ifull.split("-") const ic = iparts.pop() - if (ic && iparts.length && ["pot", "plate", "mixer"].includes(ic)) return [iparts.join("-"), ic] + if (ic && iparts.length && ["pot", "plate", "food-processor"].includes(ic)) return [iparts.join("-"), ic] return [ifull, null] } @@ -128,12 +128,12 @@ cut("tomato") cook("raw-steak", "steak") combine("plate", "steak-pot", "sliced-tomato", "bread") -mix("flour", "dough") -out({ action: "instant", inputs: ["dough-mixer"], outputs: ["mixer", "dough"] }) +process("flour", "dough") +out({ action: "instant", inputs: ["dough-food-processor"], outputs: ["food-processor", "dough"] }) bake("dough", "bread") -mix("tomato") -combine("pot", "herbs", "tomato-juice-mixer") +process("tomato") +combine("pot", "herbs", "tomato-juice-food-processor") cook("herbs-tomato-juice-pot", "tomato-soop") out({ action: "instant", inputs: ["tomato-soop-pot", "plate"], outputs: ["pot", "tomato-soop-plate"] }) -- cgit v1.2.3-70-g09d2 From 06b6eac1c0aa1bcd09124e4475003199af2255e9 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Mon, 24 Jun 2024 18:56:30 +0200 Subject: also rename food processor in map --- data/map.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data') diff --git a/data/map.yaml b/data/map.yaml index b9bf3cce..0a1d8047 100644 --- a/data/map.yaml +++ b/data/map.yaml @@ -22,7 +22,7 @@ map: - "|c...c...w........~.R|" - "|c.......w..######..T|" - "|tc......w..........F|" - - "|c.....ct|#moo##SSS#X|" + - "|c.....ct|#foo##SSS#X|" - "+---dd---+-----------+" - "......................" - ".........!............" @@ -30,7 +30,7 @@ map: tiles: "#": counter - "m": counter + "f": counter "t": table "w": window "s": sink @@ -56,7 +56,7 @@ tiles: items: "S": pot "w": plate - "m": mixer + "f": food-processor chef_spawn: "~" customer_spawn: "!" -- cgit v1.2.3-70-g09d2 From 2d2dbe19a315abfc140b1b815442cdd56eb2ebd1 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Mon, 24 Jun 2024 19:00:46 +0200 Subject: regression with food processor rename --- data/recipes.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'data') diff --git a/data/recipes.ts b/data/recipes.ts index 7eb8ef4b..90307e88 100644 --- a/data/recipes.ts +++ b/data/recipes.ts @@ -34,7 +34,7 @@ function auto_trash() { let [i, ic] = get_container(ifull) if (i == "plate") continue if (i == "pot") continue - if (i == "food-processor") continue + if (i == "foodprocessor") continue if (i == "dirty") continue if (ic == "plate") ic = "dirty-plate" out({ @@ -65,9 +65,9 @@ function cook(from: string, to?: string) { out({ action: "passive", duration: 5, revert_duration: 10, tile: "stove", inputs: [o], outputs: ["burned-pot"], warn: true }) } function process(from: string, to?: string) { - const i = from + "-food-processor" - const o = (to ?? (from + "-juice")) + "-food-processor" - out({ action: "instant", inputs: ["food-processor", from], outputs: [i] }) + const i = from + "-foodprocessor" + const o = (to ?? (from + "-juice")) + "-foodprocessor" + out({ action: "instant", inputs: ["foodprocessor", from], outputs: [i] }) out({ action: "active", duration: 3, inputs: [i], outputs: [o] }) } function bake(from: string, to?: string) { @@ -82,7 +82,7 @@ function crate(item: string) { function get_container(ifull: string): [string, string | null] { const iparts = ifull.split("-") const ic = iparts.pop() - if (ic && iparts.length && ["pot", "plate", "food-processor"].includes(ic)) return [iparts.join("-"), ic] + if (ic && iparts.length && ["pot", "plate", "foodprocessor"].includes(ic)) return [iparts.join("-"), ic] return [ifull, null] } @@ -129,11 +129,11 @@ cook("raw-steak", "steak") combine("plate", "steak-pot", "sliced-tomato", "bread") process("flour", "dough") -out({ action: "instant", inputs: ["dough-food-processor"], outputs: ["food-processor", "dough"] }) +out({ action: "instant", inputs: ["dough-foodprocessor"], outputs: ["foodprocessor", "dough"] }) bake("dough", "bread") process("tomato") -combine("pot", "herbs", "tomato-juice-food-processor") +combine("pot", "herbs", "tomato-juice-foodprocessor") cook("herbs-tomato-juice-pot", "tomato-soop") out({ action: "instant", inputs: ["tomato-soop-pot", "plate"], outputs: ["pot", "tomato-soop-plate"] }) -- cgit v1.2.3-70-g09d2 From aedfd730dc305e122b9fe8dfd910238be9f7c1d9 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Mon, 24 Jun 2024 19:03:56 +0200 Subject: forgot to update map as usual --- data/map.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/map.yaml b/data/map.yaml index 0a1d8047..8ee53f5c 100644 --- a/data/map.yaml +++ b/data/map.yaml @@ -56,7 +56,7 @@ tiles: items: "S": pot "w": plate - "f": food-processor + "f": foodprocessor chef_spawn: "~" customer_spawn: "!" -- cgit v1.2.3-70-g09d2