1 files changed, 36 insertions, 6 deletions

diff --git a/data/recipes/default.ts b/data/recipes/default.ts
index a7ccfd1d..24122b5d 100644
--- a/data/recipes/default.ts
+++ b/data/recipes/default.ts
@@ -34,13 +34,15 @@ export function auto_trash() {
     for (const ifull of all_items) {
         let [i, ic] = get_container(ifull)
         if (i == "plate") continue
+        if (i == "glass") continue
         if (i == "pot") continue
         if (i == "foodprocessor") continue
         if (i == "dirty") continue
+        if (ic == "glass") ic = "glass"
         if (ic == "plate") ic = "dirty-plate"
         out({
             action: "instant",
-            tile: "trash",
+            tile: ic == "glass" ? "sink" : "trash",
             inputs: [ifull],
             outputs: [ic]
         })
@@ -66,13 +68,13 @@ export function cook(from: string, to?: string) {
     out({ action: "passive", duration: 5, revert_duration: 10, tile: "stove", inputs: [o], outputs: ["burned-pot"], warn: true })
 }
 export function process(from: string, to?: string) {
-    const i = from + "-foodprocessor"
+    const i = from.endsWith("-foodprocessor") ? from : from + "-foodprocessor"
     const o = (to ?? (from + "-juice")) + "-foodprocessor"
-    out({ action: "instant", inputs: ["foodprocessor", from], outputs: [i] })
+    if (!from.endsWith("-foodprocessor")) out({ action: "instant", inputs: ["foodprocessor", from], outputs: [i] })
     out({ action: "passive", duration: 5, inputs: [i], outputs: [o] })
 }
 export function bake(from: string, to?: string) {
-    const o = (to ?? ("cooked-" + from))
+    const o = (to ?? ("baked-" + from))
     out({ action: "passive", duration: 25, tile: "oven", inputs: [from], outputs: [o] })
     out({ action: "passive", duration: 15, revert_duration: 20, tile: "oven", inputs: [o], outputs: ["burned"], warn: true })
 }
@@ -83,7 +85,7 @@ export function crate(item: string) {
 export function get_container(ifull: string): [string, string | null] {
     const iparts = ifull.split("-")
     const ic = iparts.pop()
-    if (ic && iparts.length && ["pot", "plate", "foodprocessor"].includes(ic)) return [iparts.join("-"), ic]
+    if (ic && iparts.length && ["pot", "plate", "foodprocessor", "glass"].includes(ic)) return [iparts.join("-"), ic]
     return [ifull, null]
 }
 
@@ -127,14 +129,15 @@ if (import.meta.main) {
     crate("leek")
 
     cut("tomato")
-
     cook("raw-steak", "steak")
 
+    // bread
     process("flour", "dough")
     out({ action: "instant", inputs: ["dough-foodprocessor"], outputs: ["foodprocessor", "dough"] })
     bake("dough", "bread")
     cut("bread", "bread-slice", "bread-slice")
 
+    // tomato soup
     process("tomato")
     combine("pot", "leek", "tomato-juice-foodprocessor")
     cook("leek-tomato-juice-pot", "tomato-soup")
@@ -142,5 +145,32 @@ if (import.meta.main) {
 
     combine("plate", "steak-pot", "sliced-tomato", "bread-slice")
 
+    crate("rice")
+    crate("fish")
+    crate("coconut")
+    crate("strawberry")
+
+    // Rice and nigiri
+    cut("fish")
+    cook("rice")
+    out({ action: "instant", inputs: ["sliced-fish", "cooked-rice-pot"], outputs: ["nigiri", "pot"] })
+
+    // coconut milk and strawberry puree
+    process("strawberry", "strawberry-puree")
+    process("coconut", "milk")
+    out({ action: "instant", inputs: ["milk-foodprocessor", "strawberry"], outputs: ["strawberry-milk-foodprocessor"] })
+    out({ action: "instant", inputs: ["strawberry-puree-foodprocessor", "coconut"], outputs: ["strawberry-milk-foodprocessor"] })
+    process("strawberry-milk-foodprocessor", "strawberrymilk")
+    process("coconut-strawberry-puree-foodprocessor", "strawberrymilk")
+
+    // icecream
+    out({ action: "passive", inputs: ["strawberrymilk-foodprocessor"], outputs: ["strawberry-icecream-foodprocessor"], tile: "freezer", duration: 20 })
+    out({ action: "instant", inputs: ["strawberry-icecream-foodprocessor", "plate"], outputs: ["foodprocessor", "strawberry-icecream-plate"] })
+
+    // drinks
+    out({ action: "instant", inputs: ["glass"], outputs: ["water-glass"], tile: "sink" })
+    out({ action: "instant", inputs: ["glass", "milk-foodprocessor"], outputs: ["milk-glass", "foodprocessor"] })
+    out({ action: "instant", inputs: ["glass", "strawberrymilk-foodprocessor"], outputs: ["strawberrymilk-glass", "foodprocessor"] })
+
     auto_trash()
 }