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

12 files changed, 223 insertions, 16 deletions

diff --git a/data/index.yaml b/data/index.yaml
index 6f07e834..cacc6e60 100644
--- a/data/index.yaml
+++ b/data/index.yaml
@@ -4,9 +4,9 @@ demands:
 
 maps:
     - lobby
-    - tiny
-    - small
-    - big
+    - sophomore
+    - junior
+    - senior
     - test
     - 5star
     - depot
@@ -16,6 +16,9 @@ maps:
     - rivalry
     - village
     - zigzag
+    - bbq
+    - station
+    - smallest
 
 recipes:
     - none
diff --git a/data/maps/bbq.yaml b/data/maps/bbq.yaml
new file mode 100644
index 00000000..5f648e32
--- /dev/null
+++ b/data/maps/bbq.yaml
@@ -0,0 +1,63 @@
+map:
+    - "''''''''''''''''"
+    - "''LL'TT''RR'FF''"
+    - "'██████████████'"
+    - "'ppSSfCCfoopssp'"
+    - "''''''''''''''''"
+    - "''cccc'__'cccc''"
+    - "'Xtttt'__'ttttX'"
+    - "''cccc'__'cccc''"
+    - "'''''''__'''''''"
+    - "'''''''!~X''''''"
+    - "'''''''__'''''''"
+
+tiles:
+    "#": counter
+    "<": counter
+    ">": counter
+    "v": counter
+    "^": counter
+    "f": counter
+    "p": counter
+    "t": table
+    "w": counter-window
+    "s": sink
+    "o": oven
+    "S": stove
+    "C": cuttingboard
+    "R": raw-steak-crate
+    "T": tomato-crate
+    "F": flour-crate
+    "L": leek-crate
+    "X": trash
+
+    "c": chair
+    ".": floor
+    "'": grass
+    "*": tree
+    "~": path
+    "!": path
+    "_": path
+    "d": door
+    "█": wall
+    "▒": wall-window
+
+items:
+    "S": pot
+    "w": plate
+    "p": plate
+    "f": foodprocessor
+
+chef_spawn: "~"
+customer_spawn: "!"
+
+walkable:
+    - door
+    - floor
+    - chair
+    - grass
+    - path
+
+collider:
+    - wall
+    - tree
diff --git a/data/maps/depot.yaml b/data/maps/depot.yaml
index 5291180d..499966f6 100644
--- a/data/maps/depot.yaml
+++ b/data/maps/depot.yaml
@@ -56,6 +56,12 @@ tiles:
     "█": wall
     "▒": wall-window
 
+tile_entities:
+    ">": !conveyor { dir: [1, 0] }
+    "<": !conveyor { dir: [-1, 0] }
+    "v": !conveyor { dir: [0, 1] }
+    "^": !conveyor { dir: [0, -1] }
+
 items:
     "S": pot
     "w": plate
diff --git a/data/maps/small.yaml b/data/maps/junior.yaml
index 768793a3..768793a3 100644
--- a/data/maps/small.yaml
+++ b/data/maps/junior.yaml
diff --git a/data/maps/rivalry.yaml b/data/maps/rivalry.yaml
index 016aa154..e331b4b9 100644
--- a/data/maps/rivalry.yaml
+++ b/data/maps/rivalry.yaml
@@ -3,10 +3,10 @@ map:
     - "'''''''''''______''''''''''''''"
     - "''███████c'______'c'c'c'█████''"
     - "''█SSSos█t'______'t't't'█ppf█''"
-    - "''█'''''█c'______'c'c'c'█...█''"
-    - "''█CC#''d''______'''''''█C.F█''"
-    - "''█'''''█t'______'███dd██C.R█''"
-    - "''█LRFT'█c'______'█.........█''"
+    - "''█.....█c'______'c'c'c'█...█''"
+    - "''█CC#..d''______'''''''█C.F█''"
+    - "''█.....█t'______'███dd██C.R█''"
+    - "''█LRFT.█c'______'█.........█''"
     - "''███████t'______'█T#ss#SooL█''"
     - "'''pppff'''______'███████████''"
     - "'''''''''''______''''''''''''''"
diff --git a/data/maps/big.yaml b/data/maps/senior.yaml
index 88a1726c..88a1726c 100644
--- a/data/maps/big.yaml
+++ b/data/maps/senior.yaml
diff --git a/data/maps/smallest.yaml b/data/maps/smallest.yaml
new file mode 100644
index 00000000..296cf3c6
--- /dev/null
+++ b/data/maps/smallest.yaml
@@ -0,0 +1,57 @@
+map:
+    - "████████'"
+    - "█oSC.tc█X"
+    - "█......d_"
+    - "█LTFRpf█~"
+    - "████████!"
+
+
+tiles:
+    "#": counter
+    "<": counter
+    ">": counter
+    "v": counter
+    "^": counter
+    "f": counter
+    "p": counter
+    "t": table
+    "w": counter-window
+    "s": sink
+    "o": oven
+    "S": stove
+    "C": cuttingboard
+    "R": raw-steak-crate
+    "T": tomato-crate
+    "F": flour-crate
+    "L": leek-crate
+    "X": trash
+
+    "c": chair
+    ".": floor
+    "'": grass
+    "*": tree
+    "~": path
+    "!": path
+    "_": path
+    "d": door
+    "█": wall
+    "▒": wall-window
+
+items:
+    "S": pot
+    "p": plate
+    "f": foodprocessor
+
+chef_spawn: "~"
+customer_spawn: "!"
+
+walkable:
+    - door
+    - floor
+    - chair
+    - grass
+    - path
+
+collider:
+    - wall
+    - tree
diff --git a/data/maps/tiny.yaml b/data/maps/sophomore.yaml
index 7917fb05..7917fb05 100644
--- a/data/maps/tiny.yaml
+++ b/data/maps/sophomore.yaml
diff --git a/data/maps/station.yaml b/data/maps/station.yaml
new file mode 100644
index 00000000..70d76157
--- /dev/null
+++ b/data/maps/station.yaml
@@ -0,0 +1,72 @@
+map:
+    - "''''''''''''''''''''''''"
+    - "''''███████████████'''''"
+    - "_~__d.ct.w.ss█#ff#█'''''"
+    - "_!__d.ct.w...d...o█X_'''"
+    - "''X'█.ct.█████.p.o█X_'''"
+    - "''''█.ct.....w.p.o█X_'''"
+    - "''''█.ct.....w.p..d__'''"
+    - "''''█.ct.....w.p.S██d██'"
+    - "''''█.ct.....█.p.S█L.T█'"
+    - "''''█.ct.....d...S█R.F█'"
+    - "''''█........█#CC#█ppp█'"
+    - "''''███████████████████'"
+    - "''''''''''''''''''''''''"
+    - "________________________"
+    - "________________________"
+    - "________________________"
+    - "________________________"
+    - "________________________"
+    - "________________________"
+    - "''''''''''''''''''''''''"
+
+
+tiles:
+    "#": counter
+    "<": counter
+    ">": counter
+    "v": counter
+    "^": counter
+    "f": counter
+    "p": counter
+    "t": table
+    "w": counter-window
+    "s": sink
+    "o": oven
+    "S": stove
+    "C": cuttingboard
+    "R": raw-steak-crate
+    "T": tomato-crate
+    "F": flour-crate
+    "L": leek-crate
+    "X": trash
+
+    "c": chair
+    ".": floor
+    "'": grass
+    "*": tree
+    "~": path
+    "!": path
+    "_": path
+    "d": door
+    "█": wall
+    "▒": wall-window
+
+items:
+    "S": pot
+    "p": plate
+    "f": foodprocessor
+
+chef_spawn: "~"
+customer_spawn: "!"
+
+walkable:
+    - door
+    - floor
+    - chair
+    - grass
+    - path
+
+collider:
+    - wall
+    - tree
diff --git a/data/maps/test.yaml b/data/maps/test.yaml
index bb6137e5..ac43bb1d 100644
--- a/data/maps/test.yaml
+++ b/data/maps/test.yaml
@@ -16,9 +16,9 @@
 map:
     - "*''''*'''*'''''*'''*'''*'''*''*'"
     - "'''*''''*'*'**'''*''**''**''*'''"
-    - "''██▒██▒██▒███▒███▒████▒██▒███*'"
-    - "''█ctc.ctc.ctc.ctc.ctc█s....#█**"
-    - "''█.....c.............█s.~..⌷█''"
+    - "''██▒██▒██▒███████▒████▒██▒███*'"
+    - "''█ctc.ctc.ctcdctc.ctc█s....#█**"
+    - "''█.....c.....d.......█s.~..⌷█''"
     - "'*▒c...c...████www██d██⌷⌷.⌷.⌷█*'"
     - "*'█tc.ctc..█#.....CC.>>>>.⌷.L█''"
     - "''▒c...c...w..⌷⌷.....<<<<...R█'*"
diff --git a/data/maps/village.yaml b/data/maps/village.yaml
index 762d4faf..2319f3ee 100644
--- a/data/maps/village.yaml
+++ b/data/maps/village.yaml
@@ -10,14 +10,14 @@ map:
     - "'''█..d_d..█__█..d_d.p█'''"
     - "'''█LR█'█FT█__█ss█'█pp█'''"
     - "'''████'████__████'████'''"
-    - "''''ctc'ctc.__.ctc'ctc''''"
-    - "''''ctc'ctc.__.ctc'ctc''''"
+    - "''''ctc'ctc'__'ctc'ctc''''"
+    - "''''ctc'ctc'__'ctc'ctc''''"
     - "'''''________________'''''"
-    - "''''ctc.ctc.__.ctc.ctc''''"
-    - "''''ctc.ctc.__.ctc.ctc''''"
+    - "''''ctc'ctc'__'ctc'ctc''''"
+    - "''''ctc'ctc'__'ctc'ctc''''"
     - "'''''________________'''''"
-    - "''''ctc.ctc'__'ctc.ctc''''"
-    - "''''ctc.ctc'__'ctc.ctc''''"
+    - "''''ctc'ctc'__'ctc'ctc''''"
+    - "''''ctc'ctc'__'ctc'ctc''''"
     - "''''''''''''__''''''''''''"
     - "''''''''''''_!''''''''''''"
 
diff --git a/data/maps/zigzag.yaml b/data/maps/zigzag.yaml
index 2a1d749e..56d974b3 100644
--- a/data/maps/zigzag.yaml
+++ b/data/maps/zigzag.yaml
@@ -50,6 +50,12 @@ tiles:
     "█": wall
     "▒": wall-window
 
+tile_entities:
+    ">": !conveyor { dir: [1, 0] }
+    "<": !conveyor { dir: [-1, 0] }
+    "v": !conveyor { dir: [0, 1] }
+    "^": !conveyor { dir: [0, -1] }
+
 items:
     "S": pot
     "w": plate