clean up, decorate and improve all maps.

16 files changed, 106 insertions, 231 deletions

diff --git a/data/maps/5star.yaml b/data/maps/5star.yaml
index 1b8e3d3e..b56dd4b6 100644
--- a/data/maps/5star.yaml
+++ b/data/maps/5star.yaml
@@ -1,6 +1,7 @@
 # Hurry Curry! - a game about cooking
 # Copyright 2024 Sofviic
 # Copyright 2024 nokoe
+# Copyright 2024 metamuffin
 #
 # 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
@@ -20,8 +21,8 @@ map:
     - "'''█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#█'*'''=''''''"
+    - "'''▒tc..............ctc.█#.......~........o█X_''*=''''''"
+    - "'''█c...c....c.......c..█#pppsss....SSSSSS#█'*'''=''''''"
     - "'''█...ctc..ctc...███████████████dd███████████████''''''"
     - "'''█c..ctc..ctc...█...ccccccc..█....█..ccccccc...█''''''"
     - "'''▒tc.ctc..ctc...█...ttttttt..█....█..ttttttt...▒''''''"
@@ -42,11 +43,10 @@ map:
     - "'''█ctc......ctc..█...ccccccc..█....█..ccccccc...█''''''"
     - "'''██▒████dd██▒██████▒▒▒▒▒▒▒▒████dd████▒▒▒▒▒▒▒▒███''''''"
     - "''''''''''__'''''''''''''''''''''__'''''''''''''''''''''"
-    - "_~_________________________________'''''''''''''''''''''"
+    - "___________________________________'''''''''''''''''''''"
     - "_!_________________________________'''''''''''''''''''''"
     - "''''''''''''''''''''''''''''''''''''''''''''''''''''''''"
 
-
 tiles:
     "#": counter
     "f": counter
@@ -67,7 +67,7 @@ tiles:
     ".": floor
     "'": grass
     "*": tree
-    "~": path
+    "~": floor
     "!": path
     "_": path
     "d": door
@@ -75,7 +75,6 @@ tiles:
     "▒": wall-window
     "=": fence
 
-
 items:
     "S": pot
     "w": plate
@@ -95,3 +94,4 @@ walkable:
 collider:
     - wall
     - tree
+    - fence
diff --git a/data/maps/bbq.yaml b/data/maps/bbq.yaml
index 92c415d8..01af4185 100644
--- a/data/maps/bbq.yaml
+++ b/data/maps/bbq.yaml
@@ -14,24 +14,21 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #
 map:
-    - "''''''''''''''''"
-    - "''LL'TT''RR'FF''"
-    - "'██████████████'"
-    - "'ppSSfCCfoopssp'"
-    - "''''''''''''''''"
-    - "''cccc'__'cccc''"
-    - "'Xtttt'__'ttttX'"
-    - "''cccc'__'cccc''"
-    - "'''''''__'''''''"
-    - "'''''''!~X''''''"
-    - "'''''''__'''''''"
+    - "'*''''''''''''''*'"
+    - "*''''''''''''''''*"
+    - "'''LL'TT''RR'FF'''"
+    - "''██████████████''"
+    - "''ppSSfCCfoopssp''"
+    - "''''''''''''''''''"
+    - "'''cccc'__'cccc'''"
+    - "''Xtttt'__'ttttX''"
+    - "'''cccc'__'cccc'''"
+    - "''''''''__''''''''"
+    - "''''''''~_''''''''"
+    - "''''''''__''''''''"
 
 tiles:
     "#": counter
-    "<": counter
-    ">": counter
-    "v": counter
-    "^": counter
     "f": counter
     "p": counter
     "t": table
@@ -55,7 +52,6 @@ tiles:
     "_": path
     "d": door
     "█": wall
-    "▒": wall-window
 
 items:
     "S": pot
@@ -64,7 +60,7 @@ items:
     "f": foodprocessor
 
 chef_spawn: "~"
-customer_spawn: "!"
+customer_spawn: "~"
 
 walkable:
     - door
diff --git a/data/maps/bus.yaml b/data/maps/bus.yaml
index cff24538..39d5b242 100644
--- a/data/maps/bus.yaml
+++ b/data/maps/bus.yaml
@@ -14,8 +14,8 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #
 map:
-    - "''''''''''''''''''''''"
-    - "''''''''''''''''''''''"
+    - "'*''''''*'''*'''*''*'*"
+    - "*'''''''''''''''''''''"
     - "''███████c__c███████''"
     - "''█#SSSS█t__t█RTFL#█''"
     - "''█#....█c__c█.....█''"
@@ -24,19 +24,19 @@ map:
     - "''█oo.^██▒dd▒██v.##█''"
     - "''████“█.c..c.█„████''"
     - "'''''▒^.ct..tc.v▒'''''"
-    - "'''''█^........v█'''''"
-    - "'''''█^........v█'''''"
+    - "''*''█^........v█'*'''"
+    - "*''''█^........v█'''*'"
     - "'''''▒^.ct..tc.v▒'''''"
     - "''████“█.c..c.█„████''"
     - "''█#..^██▒dd▒██v.pp█''"
-    - "''█#..^<‹<««<‹<<..p█''"
+    - "''█#..^<‹<««<‹<<..p█'*"
     - "''d.....█'__'█.....d''"
     - "''█.....█'__'█....p█''"
     - "''█ff#CC█'__'█Xsspp█''"
     - "''███████'__'███████''"
-    - "''''''''''__''''''''''"
-    - "''''''''''__''''''''''"
-    - "''''''''''!~''''''''''"
+    - "''''''''''__''''*'''''"
+    - "*'''''''''__''*'''''*'"
+    - "'*'*''''''!~'''''*''''"
 
 tiles:
     "#": counter
diff --git a/data/maps/depot.yaml b/data/maps/depot.yaml
index 323843ff..45b36398 100644
--- a/data/maps/depot.yaml
+++ b/data/maps/depot.yaml
@@ -15,14 +15,14 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #
 map:
-    - "'''''''''''''''''''''''''''''''''''''''''''''''"
-    - "''██▒▒▒█▒▒▒▒█▒▒▒█████████████████''''''''''''''"
-    - "''█.....cccc....#█##############█''''''''''''''"
-    - "''▒.ctc.tttt....#█#............#█''''''''''''''"
-    - "''▒.ctc.cccc.....d....#...>v<..#█''''''''''''''"
-    - "''▒.ctc.........#█X...^....v...#█''''''''''''''"
-    - "''▒.ctc.........#█#...^...>v<..#█========''''''"
-    - "''█..............█#...^....v...#█X_'''''=''''''"
+    - "'''''''''''''''''''''''''''''''''''''''*'''*'''"
+    - "''██▒▒▒█▒▒▒▒█▒▒▒█████████████████'''*''''''''*'"
+    - "''█.....cccc....#█##############█''''''''*'''''"
+    - "''▒.ctc.tttt....#█#............#█''''*''''''''*"
+    - "''▒.ctc.cccc.....d....#...>v<..#█''''''*''*''''"
+    - "''▒.ctc.........#█X...^....v...#█'''''''''''*''"
+    - "''▒.ctc.........#█#...^...>v<..#█========'''''*"
+    - "''█..............█#...^....v...#█X_'''*'=''''''"
     - "''▒.ctc......ctc.█#...^...>v<..#█X_'''''=''''''"
     - "''▒.ctc......ctc.█#...^....v...#█X_________''''"
     - "''▒.ctc......ctc.█████^████v██████d██████'_''''"
@@ -37,8 +37,8 @@ map:
     - "'''''ctc'__'ctc''█#SSS#ooo#fff##█'''''''''_''''"
     - "'''''''''__''''''████████████████'''''''''_''''"
     - "'''''''''__'''''''''''''''''''''''''''''''_''''"
-    - "_~___________________________________________~_"
-    - "_!___________________________________________!_"
+    - "_____________________________________________~_"
+    - "_!_____________________________________________"
     - "'''''''''''''''''''''''''''''''''''''''''''''''"
 
 tiles:
@@ -98,3 +98,4 @@ walkable:
 collider:
     - wall
     - tree
+    - fence
diff --git a/data/maps/duplex.yaml b/data/maps/duplex.yaml
index f0f2f853..5fd23034 100644
--- a/data/maps/duplex.yaml
+++ b/data/maps/duplex.yaml
@@ -32,7 +32,7 @@ map:
     - "'''_''''''''''''''''''''_''*"
     - "'''______________________'''"
     - "'*'''''''''''__'''''''''''*'"
-    - "''''*'*''''''!~'''''*''''*''"
+    - "''''*'*''''''_~'''''*''''*''"
 
 tiles:
     "#": counter
@@ -87,7 +87,7 @@ items:
     "f": foodprocessor
 
 chef_spawn: "~"
-customer_spawn: "!"
+customer_spawn: "~"
 
 walkable:
     - door
diff --git a/data/maps/junior.yaml b/data/maps/junior.yaml
index 91f61435..d3ed31c7 100644
--- a/data/maps/junior.yaml
+++ b/data/maps/junior.yaml
@@ -1,5 +1,4 @@
 # Hurry Curry! - a game about cooking
-# Copyright 2024 Sofviic
 # Copyright 2024 metamuffin
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/data/maps/line.yaml b/data/maps/line.yaml
index 225dc534..f7aa913e 100644
--- a/data/maps/line.yaml
+++ b/data/maps/line.yaml
@@ -22,7 +22,6 @@ map:
     - "''███████████████████████''"
     - "'''''''''''''''''''''''''''"
 
-
 tiles:
     "#": counter
     "f": counter
@@ -42,13 +41,11 @@ tiles:
     "c": chair
     ".": floor
     "'": grass
-    "*": tree
     "~": path
     "!": path
     "_": path
     "d": door
     "█": wall
-    "▒": wall-window
 
 items:
     "S": pot
@@ -68,4 +65,3 @@ walkable:
 
 collider:
     - wall
-    - tree
diff --git a/data/maps/lobby.yaml b/data/maps/lobby.yaml
index 2785e3e0..36153bfa 100644
--- a/data/maps/lobby.yaml
+++ b/data/maps/lobby.yaml
@@ -14,20 +14,22 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #
 map:
-    - "'''''*'''*''''"
-    - "'''*''''*'*'*'"
-    - "''██████████*'"
-    - "''█b..ctc.c█**"
-    - "''█c...c.cT█''"
-    - "'*█tc.....c█*'"
-    - "*'█c..~..ct█''"
-    - "''█......cT█'*"
-    - "*'█.c.....c█*'"
-    - "'*█cTc..c..█'*"
-    - "''█.c..ctc.█*'"
-    - "*'██████████*'"
-    - "'*'''*'''*''*'"
-    - "*''*''**'''**'"
+    - "'*''''''''''''*'"
+    - "*'''''*'''*'''''"
+    - "'*''*''''*'*'*'*"
+    - "*''██████████*''"
+    - "*''█b..ctc.c█**'"
+    - "'''█c...c.cT█'''"
+    - "''*█tc.....c█*'*"
+    - "'*'█c..~..ct█'''"
+    - "'''█......cT█'*'"
+    - "'*'█.c.....c█*''"
+    - "''*█cTc..c..█'*'"
+    - "'''█.c..ctc.█*''"
+    - "'*'██████████*''"
+    - "''*'''*'''*''*''"
+    - "'*''*''**'''**''"
+    - "*'''''''''*''''*"
 
 tiles:
     "t": table
diff --git a/data/maps/rivalry.yaml b/data/maps/rivalry.yaml
index 45ea06ba..42e9b50c 100644
--- a/data/maps/rivalry.yaml
+++ b/data/maps/rivalry.yaml
@@ -14,29 +14,23 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #
 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______''''''''''''''"
-    - "'''''''''''__~!__''''''''''''''"
-
-
+    - "''*''''''''_____'''''''''*''*'"
+    - "'''''''''''_____''''''''''''''"
+    - "''███████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
@@ -60,7 +54,6 @@ tiles:
     "_": path
     "d": door
     "█": wall
-    "▒": wall-window
 
 items:
     "S": pot
diff --git a/data/maps/smallest.yaml b/data/maps/smallest.yaml
index 9842212f..5c1153f3 100644
--- a/data/maps/smallest.yaml
+++ b/data/maps/smallest.yaml
@@ -17,16 +17,12 @@ map:
     - "████████'"
     - "█oSCstc█X"
     - "█......d_"
-    - "█LTFRpf█~"
-    - "████████!"
+    - "█LTFRpf█_"
+    - "████████~"
 
 
 tiles:
     "#": counter
-    "<": counter
-    ">": counter
-    "v": counter
-    "^": counter
     "f": counter
     "p": counter
     "t": table
@@ -44,13 +40,10 @@ tiles:
     "c": chair
     ".": floor
     "'": grass
-    "*": tree
     "~": path
-    "!": path
     "_": path
     "d": door
     "█": wall
-    "▒": wall-window
 
 items:
     "S": pot
@@ -58,15 +51,13 @@ items:
     "f": foodprocessor
 
 chef_spawn: "~"
-customer_spawn: "!"
+customer_spawn: "~"
 
 walkable:
     - door
     - floor
     - chair
-    - grass
     - path
 
 collider:
     - wall
-    - tree
diff --git a/data/maps/sophomore.yaml b/data/maps/sophomore.yaml
index 62b5fca6..4d0b9288 100644
--- a/data/maps/sophomore.yaml
+++ b/data/maps/sophomore.yaml
@@ -1,5 +1,4 @@
 # Hurry Curry! - a game about cooking
-# Copyright 2024 Sofviic
 # Copyright 2024 metamuffin
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/data/maps/station.yaml b/data/maps/station.yaml
index db1510d4..2d73ab37 100644
--- a/data/maps/station.yaml
+++ b/data/maps/station.yaml
@@ -1,6 +1,7 @@
 # Hurry Curry! - a game about cooking
 # Copyright 2024 nokoe
 # Copyright 2024 Sofviic
+# Copyright 2024 metamuffin
 #
 # 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
@@ -32,17 +33,10 @@ map:
     - "________________________"
     - "________________________"
     - "________________________"
-    - "________________________"
-    - "________________________"
     - "''''''''''''''''''''''''"
 
-
 tiles:
     "#": counter
-    "<": counter
-    ">": counter
-    "v": counter
-    "^": counter
     "f": counter
     "p": counter
     "t": table
@@ -87,3 +81,4 @@ walkable:
 collider:
     - wall
     - tree
+    - fence
diff --git a/data/maps/teeny.yaml b/data/maps/teeny.yaml
index 29ae7df7..95236917 100644
--- a/data/maps/teeny.yaml
+++ b/data/maps/teeny.yaml
@@ -29,7 +29,7 @@ map:
     - "''''_'█▒▒▒▒dd▒▒▒▒█'_''''"
     - "''''________________''''"
     - "'''''''''''__'''''''''''"
-    - "'''''''''''~!'''''''''''"
+    - "'''''''''''~_'''''''''''"
 
 tiles:
     "#": counter
@@ -52,7 +52,6 @@ tiles:
     "'": grass
     "*": tree
     "~": path
-    "!": path
     "_": path
     "d": door
     "█": wall
@@ -65,7 +64,7 @@ items:
     "f": foodprocessor
 
 chef_spawn: "~"
-customer_spawn: "!"
+customer_spawn: "~"
 
 walkable:
     - door
diff --git a/data/maps/test.yaml b/data/maps/test.yaml
deleted file mode 100644
index 17c958d1..00000000
--- a/data/maps/test.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
-# Hurry Curry! - a game about cooking
-# 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
-# the Free Software Foundation, version 3 of the License only.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-#
-map:
-    - "*''''*'''*'''''*'''*'''*'''*''*'"
-    - "'''*''''*'*'**'''*''**''**''*'''"
-    - "''██▒██▒██▒███████▒████▒██▒███*'"
-    - "''█ctc.ctc.ctcdctc.ctc█s....#█**"
-    - "''█.....c.....d.......█s.~..⌷█''"
-    - "'*▒c...c...████www██d██⌷⌷.⌷.⌷█*'"
-    - "*'█tc.ctc..█#.....CC.>>>>.⌷.L█''"
-    - "''▒c...c...w..⌷⌷.....<<<<...R█'*"
-    - "*'█c.......w..⌷⌷⌷⌷⌷⌷⌷⌷█ff.⌷.T█*'"
-    - "'*▒tc......w..........d...⌷.F█''"
-    - "''█c.....ct█⌷SSS⌷f⌷oo⌷█⌷⌷...X█*'"
-    - "*'████dd██████████▒███████▒███'*"
-    - "'''*''__''''''''''''''''''''''*'"
-    - "*'''*'__________________________"
-    - "'*'*''_______________________!__"
-    - "*''*''''''''''''''''''''''''''''"
-
-tiles:
-    "⌷": counter
-    "f": counter
-    "<": conveyor
-    "#": conveyor
-    ">": conveyor
-    "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
-    ".": floor
-    "'": grass
-    "*": tree
-    "!": path
-    "_": path
-    "d": door
-    "█": wall
-    "▒": wall-window
-
-items:
-    "S": pot
-    "w": plate
-    "f": foodprocessor
-
-entities:
-    - !conveyor { from: [22, 7], to: [21, 7] }
-    - !conveyor { from: [23, 7], to: [22, 7] }
-    - !conveyor { from: [24, 7], to: [23, 7] }
-    - !conveyor { from: [21, 6], to: [22, 6] }
-    - !conveyor { from: [22, 6], to: [23, 6] }
-    - !conveyor { from: [23, 6], to: [24, 6] }
-    - !conveyor { from: [23, 6], to: [24, 6] }
-
-    - !conveyor { from: [28, 3], to: [12, 6] }
-
-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
index 8b9e5960..5d8a47c1 100644
--- a/data/maps/village.yaml
+++ b/data/maps/village.yaml
@@ -39,10 +39,6 @@ map:
 
 tiles:
     "#": counter
-    "<": counter
-    ">": counter
-    "v": counter
-    "^": counter
     "f": counter
     "p": counter
     "t": table
@@ -66,7 +62,6 @@ tiles:
     "_": path
     "d": door
     "█": wall
-    "▒": wall-window
     "=": fence
 
 items:
@@ -88,3 +83,4 @@ walkable:
 collider:
     - wall
     - tree
+    - fence
diff --git a/data/maps/zigzag.yaml b/data/maps/zigzag.yaml
index 66291e5c..d30e3dab 100644
--- a/data/maps/zigzag.yaml
+++ b/data/maps/zigzag.yaml
@@ -1,5 +1,6 @@
 # Hurry Curry! - a game about cooking
 # Copyright 2024 Sofviic
+# Copyright 2024 metamuffin
 #
 # 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
@@ -14,32 +15,34 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #
 map:
-    - "''''''''''''''''''"
-    - "'████████████████'"
-    - "'█vLLRRFFTT####X█'"
-    - "'█v............^█'"
-    - "'█v..ppppppff##^█'"
-    - "'█v............^█'"
-    - "'█voooo######..^█'"
-    - "'█v............^█'"
-    - "'█v..#######ss#^█'"
-    - "'█v............^█'"
-    - "'█vSSS#######..^█'"
-    - "'█v............^█'"
-    - "'█X..######CCC#^█'"
-    - "'█..............█'"
-    - "'█.tttttttttttt.█'"
-    - "'█.cccccccccccc.█'"
-    - "'█..............█'"
-    - "''______!~______''"
-
+    - "''*''''''''*'''*''''''"
+    - "*''''''*''''''''''''*'"
+    - "'''████████████████''*"
+    - "'''█vLLRRFFTT####X█'''"
+    - "'*'█v............^█'*'"
+    - "'''█v..ppppppff##^█'''"
+    - "'''█v............^█'''"
+    - "'*'█voooo######..^█'*'"
+    - "'''█v............^█''*"
+    - "*''█v..#######ss#^█'''"
+    - "'''█v............^█'''"
+    - "'''█vSSS#######..^█''*"
+    - "'*'█v............^█'*'"
+    - "*''█X..######CCC#^█'''"
+    - "'''█..............█'''"
+    - "'''█.tttttttttttt.█''*"
+    - "'''█.cccccccccccc.█'''"
+    - "*''█..............█'''"
+    - "'''█.....!~.......█'*'"
+    - "'''█..............█'''"
+    - "*''████████████████'''"
+    - "'''*''''''''''*'''''*'"
+    - "''''''*'''''*'''*''''*"
 
 tiles:
     "#": counter
-    "<": counter
-    ">": counter
-    "v": counter
-    "^": counter
+    "v": conveyor
+    "^": conveyor
     "f": counter
     "p": counter
     "t": table
@@ -58,12 +61,9 @@ tiles:
     ".": floor
     "'": grass
     "*": tree
-    "~": path
-    "!": path
-    "_": path
-    "d": door
+    "~": floor
+    "!": floor
     "█": wall
-    "▒": wall-window
 
 tile_entities:
     ">": !conveyor { dir: [1, 0] }