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

5 files changed, 217 insertions, 2 deletions

diff --git a/data/index.yaml b/data/index.yaml
index f7abdb3b..37229844 100644
--- a/data/index.yaml
+++ b/data/index.yaml
@@ -15,6 +15,9 @@ maps:
     - line
     - teeny
     - bus
+    - rivalry
+    - village
+    - zigzag
 
 recipes:
     - none
diff --git a/data/maps/line.yaml b/data/maps/line.yaml
index abb1c25d..1fe5bd99 100644
--- a/data/maps/line.yaml
+++ b/data/maps/line.yaml
@@ -1,9 +1,9 @@
 map:
     - "'''''''''''''''''''''''''''"
     - "''███████████████████████''"
-    - "''█ctc.ctc.ctc█##█sSC#LR█''"
+    - "''█ctc.ctc.ctc█pp█sSC#LR█''"
     - "!_d...........d..d......d~'"
-    - "''█ctc.ctc.ctc█##█#of#TF█X'"
+    - "''█ctc.ctc.ctc█pp█#of#TF█X'"
     - "''███████████████████████''"
     - "'''''''''''''''''''''''''''"
 
diff --git a/data/maps/rivalry.yaml b/data/maps/rivalry.yaml
new file mode 100644
index 00000000..016aa154
--- /dev/null
+++ b/data/maps/rivalry.yaml
@@ -0,0 +1,68 @@
+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'______'█.........█''"
+    - "''███████t'______'█T#ss#SooL█''"
+    - "'''pppff'''______'███████████''"
+    - "'''''''''''______''''''''''''''"
+    - "''''''''''X______''''''''''''''"
+    - "''''''''''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/village.yaml b/data/maps/village.yaml
new file mode 100644
index 00000000..762d4faf
--- /dev/null
+++ b/data/maps/village.yaml
@@ -0,0 +1,73 @@
+map:
+    - "''''''''''''~_''''''''''''"
+    - "''''''''''''__''''''''''''"
+    - "'''████'████__████'████'''"
+    - "'''█CC█'█ff█__█oo█'█SS█'''"
+    - "'''█..d_d.f█__█..d_d..█'''"
+    - "'''████_████__████_████'''"
+    - "''''''X____________X''''''"
+    - "'''████_████__████_████'''"
+    - "'''█..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''''"
+    - "''''''''''''__''''''''''''"
+    - "''''''''''''_!''''''''''''"
+
+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/zigzag.yaml b/data/maps/zigzag.yaml
new file mode 100644
index 00000000..2a1d749e
--- /dev/null
+++ b/data/maps/zigzag.yaml
@@ -0,0 +1,71 @@
+map:
+    - "''''''''''''''''''"
+    - "'████████████████'"
+    - "'█vLLRRFFTT####X█'"
+    - "'█v............^█'"
+    - "'█v..ppppppff##^█'"
+    - "'█v............^█'"
+    - "'█voooo######..^█'"
+    - "'█v............^█'"
+    - "'█v..#######ss#^█'"
+    - "'█v............^█'"
+    - "'█vSSS#######..^█'"
+    - "'█v............^█'"
+    - "'█X..######CCC#^█'"
+    - "'█..............█'"
+    - "'█.tttttttttttt.█'"
+    - "'█.cccccccccccc.█'"
+    - "'█..............█'"
+    - "''______!~______''"
+
+
+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