Merge branch 'master' of ssh://codeberg.org/metamuffin/undercooked

2 files changed, 13 insertions, 13 deletions

diff --git a/data/map.yaml b/data/map.yaml
index b9bf3cce..8ee53f5c 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": foodprocessor
 
 chef_spawn: "~"
 customer_spawn: "!"
diff --git a/data/recipes.ts b/data/recipes.ts
index ea2706ed..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 == "mixer") continue
+        if (i == "foodprocessor") 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 + "-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", "mixer"].includes(ic)) return [iparts.join("-"), ic]
+    if (ic && iparts.length && ["pot", "plate", "foodprocessor"].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-foodprocessor"], outputs: ["foodprocessor", "dough"] })
 bake("dough", "bread")
 
-mix("tomato")
-combine("pot", "herbs", "tomato-juice-mixer")
+process("tomato")
+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"] })