create new 5star and improve several other maps

5 files changed, 83 insertions, 65 deletions

diff --git a/data/maps/5star.yaml b/data/maps/5star.yaml
index 7bd19997..c281cca1 100644
--- a/data/maps/5star.yaml
+++ b/data/maps/5star.yaml
@@ -1,7 +1,5 @@
 # Hurry Curry! - a game about cooking
-# Copyright 2024 Sofviic
 # Copyright 2024 metamuffin
-# Copyright 2024 nokoe
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -17,75 +15,85 @@
 #
 score_baseline: 200
 map:
-    - "''''''''''''''''''''''''████████████████████''''''''''''"
-    - "'''██▒███▒███▒███▒███▒███#LRTF#LRTF#pppppp#█======''''''"
-    - "'''█ctc.ctc.ctc.ctc..c..█..................d__'*'=''''''"
-    - "'''█.c...c...c...c..ctc.█..#pppp#fff#CCC..o█X_'''=''''''"
-    - "'''█c...................d...........#.....o█X_'''=''''''"
-    - "'''▒tc..............ctc.█#.......~........o█X_''*=''''''"
-    - "'''█c...c....c.......c..█#pppsss....SSSSSS#█'*'''=''''''"
-    - "'''█...ctc..ctc...███████████████dd███████████████''''''"
-    - "'''█c..ctc..ctc...█...ccccccc..█....█..ccccccc...█''''''"
-    - "'''▒tc.ctc..ctc...█...ttttttt..█....█..ttttttt...▒''''''"
-    - "'''█c...c....c....█.ct.........d....d.........tc.▒''''''"
-    - "'''█..............█...ttttttt..█....█..ttttttt...▒''''''"
-    - "'''█c...c....c....█...ccccccc..█....█..ccccccc...█''''''"
-    - "'''▒tc.ctc..ctc...██████████████....██████████████''''''"
-    - "'''█c..ctc..ctc...█...ccccccc..█....█..ccccccc...█''''''"
-    - "'''█...ctc..ctc...█...ttttttt..█....█..ttttttt...▒''''''"
-    - "'''█c...c....c....█.ct.........d....d.........tc.▒''''''"
-    - "'''▒tc............█...ttttttt..█....█..ttttttt...▒''''''"
-    - "'''█c...c....c....█...ccccccc..█....█..ccccccc...█''''''"
-    - "'''█...ctc..ctc...██████████████....██████████████''''''"
-    - "'''█c..ctc..ctc...█...ccccccc..█....█..ccccccc...█''''''"
-    - "'''▒tc.ctc..ctc...█...ttttttt..█....█..ttttttt...▒''''''"
-    - "'''█c...c....c....█.ct.........d....d.........tc.▒''''''"
-    - "'''█.c........c...█...ttttttt..█....█..ttttttt...▒''''''"
-    - "'''█ctc......ctc..█...ccccccc..█....█..ccccccc...█''''''"
-    - "'''██▒████dd██▒██████▒▒▒▒▒▒▒▒████dd████▒▒▒▒▒▒▒▒███''''''"
-    - "''''''''''__'''''''''''''''''''''__'''''''''''''''''''''"
-    - "___________________________________'''''''''''''''''''''"
-    - "_!_________________________________'''''''''''''''''''''"
-    - "''''''''''''''''''''''''''''''''''''''''''''''''''''''''"
+    - "             '''''''''''''    "
+    - "  *''*''''''''*''''*'''*''*'  "
+    - " ''''''''*''''''''*'''''''''  "
+    - "'''██████████████████████''*' "
+    - "'''█c..........d.......#█'''' "
+    - "'''▒tc..c...c..d..vv#..#▒'''' "
+    - " ''█c..ctc.ctc.█..v##..S▒''*' "
+    - " ''▒...ctc.ctc.w.......S█''*' "
+    - " ''█c...c...c..w..##C..S█X''  "
+    - "'''▒tc.........w..##C..#█'''  "
+    - "'''▒tc.........w.....,..d--'' "
+    - "'''█c...c...c..█s..██dd██'-*' "
+    - "'''█c..ctc.ctc.█s..█T..F█'-*' "
+    - " ''▒tc.ctc.ctc.██d██U..G█'-'' "
+    - " ''█c...c...c..W...█V..R█'-'' "
+    - " ''▒...........W.##█L..D█'-'' "
+    - " ''▒.c......c..W.#P██dd██'-'' "
+    - " ''█ctc....ctc.W.......C█'-'' "
+    - "'''█ctc....ctc.█.......#█'-'' "
+    - "'''█.c......c..█ffoo##P#█'-'' "
+    - "'''██▒███dd██▒██████▒██▒█'-'' "
+    - "'''''''''--'''''''''''''''-'''"
+    - "''''Ŧ''''--''''Ŧ'''''''Ŧ''-'''"
+    - "_____________________________'"
+    - "_!___________________________'"
+    - " ______________________,_____'"
+    - "  ''''''''''''''''''''''''''' "
+    - "     '''''''''''''''''''''    "
 
 tiles:
     "#": counter
     "f": counter
-    "p": counter
-    "t": table
+    "P": counter
+    "v": counter
     "w": counter-window
+    "W": counter-window
     "s": sink
     "o": oven
     "S": stove
+    "f": freezer
     "C": cuttingboard
+    "X": trash
+
     "R": raw-steak-crate
+    "D": coconut-crate
+    "V": strawberry-crate
+    "F": fish-crate
+    "U": rice-crate
     "T": tomato-crate
-    "F": flour-crate
+    "G": flour-crate
     "L": leek-crate
-    "X": trash
 
-    "c": chair
     ".": floor
+    ",": floor
     "'": grass
+    "t": table
+    "c": chair
     "*": tree
-    "~": floor
-    "!": path
-    "_": path
+    "!": street
+    "_": street
+    "-": path
     "d": door
     "█": wall
     "▒": wall-window
     "=": fence
+    "^": conveyor
+    "Ŧ": lamp
 
 items:
     "S": pot
     "w": plate
-    "p": plate
-    "f": foodprocessor
+    "v": plate
+    "W": glass
+    "P": foodprocessor
 
 entities:
     - !customers
 
-chef_spawn: "~"
+chef_spawn: ","
 customer_spawn: "!"
 
 walkable:
@@ -94,6 +102,7 @@ walkable:
     - chair
     - grass
     - path
+    - street
 
 collider:
     - wall
diff --git a/data/maps/debug.yaml b/data/maps/debug.yaml
index 93139286..f3472e22 100644
--- a/data/maps/debug.yaml
+++ b/data/maps/debug.yaml
@@ -123,6 +123,7 @@ walkable:
     - grass
     - path
     - black-hole
+    - chandelier
 
 collider:
     - wall
diff --git a/data/maps/duplex.yaml b/data/maps/duplex.yaml
index 59552f09..1265c327 100644
--- a/data/maps/duplex.yaml
+++ b/data/maps/duplex.yaml
@@ -28,7 +28,7 @@ map:
     - "''c_c'█S..>›>>>>›#..o█'c_c''"
     - "''t_t'█S...█''''█...o█'t_t''"
     - "''c_c'█S...█====█...o█'c_c''"
-    - "'''_''█#P#F█''''█RTL#█''_'''"
+    - "'''_''█#PDF█''''█RTL#█''_'''"
     - "*''_''██████''''██████''_'''"
     - "'''_''''''''''''''''''''_''*"
     - "'''______________________'''"
@@ -49,7 +49,8 @@ tiles:
     "o": oven
     "S": stove
     "C": cuttingboard
-    "R": raw-steak-crate
+    "R": rice-crate
+    "D": coconut-crate
     "T": tomato-crate
     "F": flour-crate
     "L": leek-crate
diff --git a/data/maps/sushibar.yaml b/data/maps/sushibar.yaml
index 71bfd968..e086fd37 100644
--- a/data/maps/sushibar.yaml
+++ b/data/maps/sushibar.yaml
@@ -15,22 +15,22 @@
 #
 score_baseline: 200
 map:
-    - "*''''*''''*''''''''*''"
-    - "'''*'''''''**''''''''*"
-    - "''█████████████'X'''*'"
-    - "''█f.....#c...█'''''**"
-    - "''█f..⌷⌷.#c...d____'''"
-    - "'*█o..S⌷.#c...d____'*'"
-    - "*'█o..S⌷.#c...█''__'''"
-    - "''█R.....#c...█''__''*"
-    - "*'█T..⌷⌷.#c.~.█''__'*'"
-    - "'*█F..C⌷.#c...█''__''*"
-    - "''█L..C⌷.███d██''__'''"
-    - "*'█Z..........█''__'*'"
-    - "'*█Z⌷s⌷ggggg⌷⌷█''__''*"
-    - "*'█████████████''__'''"
-    - "'''*'''''''''''''_!'''"
-    - "'*''''''''''''''''''''"
+    - "*''''*''''*''''''*''*''"
+    - "'''*'''''''*'*''''''''*"
+    - "''██████████████'X'''*'"
+    - "''█f......#c...█'''''**"
+    - "''█f..⌷⌷..#c...d____'''"
+    - "'*█o..S⌷..#c...d____'*'"
+    - "*'█o..S⌷..#c...█''__'''"
+    - "''█R......#c...█''__''*"
+    - "*'█T..⌷⌷..#c.~.█''__'*'"
+    - "'*█F..C⌷..#c...█''__''*"
+    - "''█L..C⌷..███d██''__'''"
+    - "*'█Z...........█''__'*'"
+    - "'*█Z⌷s⌷gggg⌷⌷⌷⌷█''__''*"
+    - "''██████████████''__'''"
+    - "*'''''''''''''''''_!'''"
+    - "'*''''''''''''''''''''*"
 
 tiles:
     "⌷": counter
diff --git a/data/recipes/default.ts b/data/recipes/default.ts
index 041b7d99..2fb74c7b 100644
--- a/data/recipes/default.ts
+++ b/data/recipes/default.ts
@@ -59,7 +59,12 @@ function auto_trash() {
         if (i instanceof Container) continue
         if (!i.container) out({ action: "instant", inputs: [i], outputs: [], tile: "trash" })
         else {
-            out({ action: "instant", inputs: [i], outputs: [i.container.dispose ?? i.container], tile: "trash" })
+            out({
+                action: "instant",
+                inputs: [i],
+                outputs: [i.container.dispose ?? i.container],
+                tile: i.container.dispose_tile ?? "trash"
+            })
         }
     }
 }
@@ -81,11 +86,11 @@ class Item {
     }
 }
 
-class Container extends Item { constructor(name: string, public dispose?: Item) { super(name) } }
+class Container extends Item { constructor(name: string, public dispose?: Item, public dispose_tile?: string) { super(name) } }
 const FP = new Container("foodprocessor")
 const POT = new Container("pot")
 const PL = new Container("plate", new Container("dirty-plate"))
-const GL = new Container("glass")
+const GL = new Container("glass", undefined, "sink")
 
 function crate(s: string): Item {
     const item = new Item(s);
@@ -228,10 +233,12 @@ edible(strawberry_mochi)
 // Drinks
 edible(
     strawberry_shake.tr(GL),
+    tomato_juice.tr(GL),
     sink_fill(GL)
 )
 
-const curry_with_rice = combine(PL, cook(rice.tr(POT)), cook(combine(POT, milk, tomato, leek)))
+// Curry
+const curry_with_rice = combine(PL, cook(rice.tr(POT)), cook(combine(POT, milk, tomato, leek)).as("curry"))
 edible(curry_with_rice)
 
 auto_trash()