port some existing maps to new format; add tile palettes and tile properties file

6 files changed, 138 insertions, 166 deletions

diff --git a/data/maps/5star.yaml b/data/maps/5star.yaml
index 3427f8b1..76fe74a4 100644
--- a/data/maps/5star.yaml
+++ b/data/maps/5star.yaml
@@ -15,29 +15,30 @@
 #
 score_baseline: 200
 hand_count: 2
+use_palettes: [default]
 map:
     - "             '''''''''''''    "
     - "  *''*''''''''*''''*'''*''*'  "
     - " ''''''''*''''''''*'''''''''  "
     - "'''██████████████████████''*' "
     - "'''█c..........|.......d█'''' "
-    - "'''▒tc..c...c..|..vvg..a▒'''' "
-    - " ''█c..ctc.ctc.█..v#g..a▒''*' "
+    - "'''▒tc..c...c..|..ppg..a▒'''' "
+    - " ''█c..ctc.ctc.█..p#g..a▒''*' "
     - " ''█...ctc.ctc.w.......b█''*' "
     - " ''█c...c...c..w..##e..b█X''  "
-    - "'''▒tc.........w..p#e..#█'''  "
+    - "'''▒tc.........w..f#e..#█'''  "
     - "'''▒tc.........w.....,..|--'' "
     - "'''█c...c...c..█...██||██'-*' "
     - "'''█...ctc.ctc.█s..█A..G█'-*' "
     - "'''█c..........█s..█B..H█'-*' "
     - " ''▒tc.ctc.ctc.██|██C..I█'-'' "
-    - " ''▒c...c...c..x..h█D..J█'-'' "
-    - " ''█...........x..#█E..K█'-'' "
-    - " ''█...........x..p█F..L█'-'' "
-    - " ''█.c......c..x..p██||██'-'' "
+    - " ''▒c...c...c..v..h█D..J█'-'' "
+    - " ''█...........v..#█E..K█'-'' "
+    - " ''█...........v..f█F..L█'-'' "
+    - " ''█.c......c..v..f██||██'-'' "
     - " ''▒ctc....ctc.█.......e█'-'' "
     - "'''▒ctc....ctc.|.......#█'-'' "
-    - "'''█.c......c..█ffoo####█'-'' "
+    - "'''█.c......c..█uuoo####█'-'' "
     - "'''██▒███||██▒██████▒██▒█'-'' "
     - "'''''''''--'''''''''''''''-'''"
     - "''''Ŧ''''--''''Ŧ'''''''Ŧ''-'''"
@@ -47,50 +48,6 @@ map:
     - "  ''''''''''''''''''''''''''' "
     - "     '''''''''''''''''''''    "
 
-tiles:
-    "#": counter
-    "p": counter -i=foodprocessor
-    "v": counter -i=plate
-    "w": counter-window -i=plate
-    "x": counter-window -i=glass
-    "d": deep-fryer -xi=basket
-    "s": sink
-    "o": oven -x
-    "a": stove -i=pot
-    "b": stove -i=pan
-    "f": freezer -x
-    "h": book --book
-    "g": rolling-board
-    "e": cutting-board
-    "X": trash -x
-
-    "A": crate:steak -x
-    "B": crate:coconut -x
-    "C": crate:strawberry -x
-    "D": crate:fish -x
-    "E": crate:rice -x
-    "F": crate:tomato -x
-    "G": crate:flour -x
-    "H": crate:leek -x
-    "I": crate:lettuce -x
-    "J": crate:cheese -x
-    "K": crate:mushroom -x
-    "L": crate:potato -x
-
-    ".": floor -w
-    ",": floor -w --chef-spawn
-    "'": grass -w
-    "t": table
-    "c": chair -w
-    "*": tree -c
-    "!": street -w --customer-spawn
-    "_": street -w
-    "-": path -w
-    "|": door -w
-    "█": wall -c
-    "▒": wall-window -c
-    "Ŧ": lamp -c
-
 entities:
     - !customers
       scaling_factor: 0.25
diff --git a/data/maps/junior.yaml b/data/maps/junior.yaml
index f166e30b..037b7eb7 100644
--- a/data/maps/junior.yaml
+++ b/data/maps/junior.yaml
@@ -14,18 +14,19 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #
 score_baseline: 200
+use_palettes: [default]
 map:
     - "*''''*'''*'''''*''*'''*''"
     - "'''*''''*'*'**'''''**'''*"
     - "''████▒████▒████▒███▒██*'"
     - "''█ctc.ctc.ctc.ctc.ctc█**"
     - "''▒.....c.............█''"
-    - "'*█c...c...████ww██dd██*'"
-    - "*'█tc.ctc..█sCC..fb..L█''"
-    - "''▒c...c...w....~....R█'*"
-    - "*'█c.......w.⌷⌷⌷⌷⌷⌷..T█*'"
-    - "'*█tc......w.........F█'*"
-    - "''█c.....ct█⌷⌷oo⌷SSS⌷X█''"
+    - "'*█c...c...████ww██||██*'"
+    - "*'█tc.ctc..█see..fh..I█''"
+    - "''▒c...c...w....,....A█'*"
+    - "*'█c.......w.######..F█*'"
+    - "'*█tc......w.........G█'*"
+    - "''█c.....ct█##oo#bbb#X█''"
     - "*'████dd██████▒████▒███*'"
     - "'*''''__''''''''''''''''*"
     - "*'*'''___________________"
@@ -33,32 +34,8 @@ map:
     - "'*'''''''''''''''''''''''"
 
 tiles:
-    "⌷": counter
-    "f": counter -i=foodprocessor
-    "p": counter -i=plate
-    "t": table
-    "w": counter-window -i=plate
-    "s": sink
-    "o": oven -x
-    "S": stove -i=pan
-    "b": book --book
-    "C": cutting-board
-    "R": crate:steak -x
-    "T": crate:tomato -x
-    "F": crate:flour -x
-    "L": crate:lettuce -x
-    "X": trash -x
-
-    "c": chair -w
-    "~": floor -w --chef-spawn
-    ".": floor -w
-    "'": grass -w
-    "*": tree -c
-    "!": path -w --customer-spawn
-    "_": path -w
-    "d": door -w
-    "▒": wall-window -c
-    "█": wall -c
+    "!": path --customer-spawn
+    "_": path
 
 entities:
     - !customers
diff --git a/data/maps/lobby.yaml b/data/maps/lobby.yaml
index b8a4529d..1c49ee63 100644
--- a/data/maps/lobby.yaml
+++ b/data/maps/lobby.yaml
@@ -40,46 +40,46 @@ tiles:
     # "6": table -i=dirty-plate
     # "7": table -i=plate:pizza:sliced-mushroom,sliced-cheese,tomato-juice
     # "8": table -i=plate:mushroom-soup
-    "~": [floor, --chef-spawn]
-    ".": [floor, --customer-spawn]
-    "'": [grass]
-    "g": [counter, cutting-board]
-    "h": [counter, rolling-board]
-    "e": [stove, -i=pot]
-    "f": [stove, -i=pan]
-    "x": [book, --book]
-    "o": [oven]
-    "a": [counter, -i=foodprocessor]
-    "Z": [freezer]
-    "z": [counter, -i=plate]
-    "k": [counter, -i=glass]
-    "i": [counter, deep-fryer, -i=basket]
-    "S": [screen]
+    "~": floor --chef-spawn
+    ".": floor --customer-spawn
+    "'": grass
+    "g": counter cutting-board
+    "h": counter rolling-board
+    "e": stove -i=pot
+    "f": stove -i=pan
+    "x": book --book
+    "o": oven
+    "a": counter -i=foodprocessor
+    "Z": freezer
+    "z": counter -i=plate
+    "k": counter -i=glass
+    "i": counter deep-fryer -i=basket
+    "S": screen
 
-    "0": [crate:rice]
-    "1": [crate:steak]
-    "2": [crate:tomato]
-    "3": [crate:leek]
-    "4": [crate:coconut]
-    "5": [crate:strawberry]
-    "6": [crate:flour]
-    "7": [crate:fish]
-    "8": [crate:cheese]
-    "9": [crate:lettuce]
-    "¹": [crate:mushroom]
-    "²": [crate:potato]
-    "³": [crate:bun]
-    "¼": [crate:noodles]
-    "°": [crate:tomato]
+    "0": floor crate:rice
+    "1": floor crate:steak
+    "2": floor crate:tomato
+    "3": floor crate:leek
+    "4": floor crate:coconut
+    "5": floor crate:strawberry
+    "6": floor crate:flour
+    "7": floor crate:fish
+    "8": floor crate:cheese
+    "9": floor crate:lettuce
+    "¹": floor crate:mushroom
+    "²": floor crate:potato
+    "³": floor crate:bun
+    "¼": floor crate:noodles
+    "°": floor crate:tomato
 
-    "p": [crate:plate]
-    "G": [crate:glass]
-    "½": [trash]
-    "*": [tree]
-    "⌷": [counter]
-    "█": [wall]
+    "p": floor crate:plate
+    "G": floor crate:glass
+    "½": floor trash
+    "*": grass tree
+    "⌷": floor counter
+    "█": wall
 
-    "<": [conveyor, "--conveyor=-1,0"]
-    ">": [conveyor, "--conveyor=1,0"]
-    "‹": [counter-window-conveyor, --demand-sink]
-    "›": [counter-window-conveyor, --demand-sink]
+    "<": conveyor "--conveyor=-1,0"
+    ">": conveyor "--conveyor=1,0"
+    "‹": counter-window-conveyor --demand-sink
+    "›": counter-window-conveyor --demand-sink
diff --git a/data/maps/senior.yaml b/data/maps/senior.yaml
index 94f5a860..d26732a0 100644
--- a/data/maps/senior.yaml
+++ b/data/maps/senior.yaml
@@ -18,53 +18,30 @@ map:
     - "*''''*'''*'''''*'''*'''*''''*'"
     - "'''*''''*'*'**'''*''**''*'*'''"
     - "''██▒██▒██▒███▒███▒████▒█▒█'*'"
-    - "''█ctc.ctc.ctc.ctc.ctc█ssh█'**"
-    - "''█.....c.............█..h█'''"
-    - "'*▒c...c...████www██d██.AB█'*'"
-    - "*'█tc.ctc..█zee...ff.d....█'''"
-    - "''▒c...c...w.....~...d..CD█''*"
-    - "*'█c.......w.⌷g⌷.⌷g⌷⌷█..EF█'*'"
+    - "''█ctc.ctc.ctc.ctc.ctc█ssp█'**"
+    - "''█.....c.............█..p█'''"
+    - "'*▒c...c...████www██|██.AB█'*'"
+    - "*'█tc.ctc..█hgg...ee.d....█'''"
+    - "''▒c...c...w.....,...d..CD█''*"
+    - "*'█c.......w.#f#.#f##█..EF█'*'"
     - "'*▒tc......w.........d....█'''"
-    - "''█c.....ct█⌷aaa⌷⌷bbb█X⌷GH█'*'"
+    - "''█c.....ct█#aaa##ooo█X#GH█'*'"
     - "*'████dd██████████▒██████▒█'*'"
-    - "'''*''__''''''''''''''''''''*'"
-    - "*'''*'________________________"
-    - "'*'*''_____________________!__"
+    - "'''*''--''''''''''''''''''''*'"
+    - "*'''*'------------------------"
+    - "'*'*''---------------------!--"
     - "*''*''''''''''''''''''''''''''"
 
 tiles:
-    "⌷": counter
-    "g": counter -i=foodprocessor
-    "h": counter -i=plate
-    "t": table
-    "w": counter-window -i=plate
-    "s": sink
-    "z": book --book
-    "b": oven -x
-    "a": stove -i=pot
-    "f": cutting-board
-    "e": rolling-board
-
-    "A": crate:rice -x
-    "B": crate:coconut -x
-    "C": crate:tomato -x
-    "D": crate:flour -x
-    "E": crate:leek -x
-    "F": crate:cheese -x
-    "G": crate:lettuce -x
-    "H": crate:mushroom -x
-    "X": trash -x
-
-    "c": chair -w
-    "~": floor -w --chef-spawn
-    ".": floor -w
-    "'": grass -w
-    "*": tree -c
-    "!": path -w --customer-spawn
-    "_": path -w
-    "d": door -w
-    "█": wall -c
-    "▒": wall-window -c
+    "A": [floor, crate:rice]
+    "B": [floor, crate:coconut]
+    "C": [floor, crate:tomato]
+    "D": [floor, crate:flour]
+    "E": [floor, crate:leek]
+    "F": [floor, crate:cheese]
+    "G": [floor, crate:lettuce]
+    "H": [floor, crate:mushroom]
+    "!": [path, --customer-spawn]
 
 entities:
     - !customers
diff --git a/data/palettes.yaml b/data/palettes.yaml
new file mode 100644
index 00000000..79ed1157
--- /dev/null
+++ b/data/palettes.yaml
@@ -0,0 +1,44 @@
+default:
+    "#": floor counter
+    "f": floor counter -i=foodprocessor
+    "p": floor counter -i=plate
+    "w": floor counter-window -i=plate
+    "v": floor counter-window -i=glass
+
+    "o": floor oven
+    "u": floor freezer
+    "a": floor stove -i=pot
+    "b": floor stove -i=pan
+    "s": floor counter sink
+    "d": floor counter deep-fryer -i=basket
+    "g": floor counter rolling-board
+    "e": floor counter cutting-board
+    "h": floor counter book --book
+
+    "A": floor crate:steak
+    "B": floor crate:coconut
+    "C": floor crate:strawberry
+    "D": floor crate:fish
+    "E": floor crate:rice
+    "F": floor crate:tomato
+    "G": floor crate:flour
+    "H": floor crate:leek
+    "I": floor crate:lettuce
+    "J": floor crate:cheese
+    "K": floor crate:mushroom
+    "L": floor crate:potato
+    "X": floor trash
+
+    ".": floor
+    ",": floor --chef-spawn
+    "'": grass
+    "t": floor table
+    "c": floor chair
+    "*": grass tree
+    "!": street --customer-spawn
+    "_": street
+    "-": path
+    "|": floor door
+    "█": wall
+    "▒": wall-window
+    "Ŧ": grass lamp
diff --git a/data/tiles.yaml b/data/tiles.yaml
new file mode 100644
index 00000000..730207e3
--- /dev/null
+++ b/data/tiles.yaml
@@ -0,0 +1,17 @@
+# e | interactable when empty
+# c | collider
+# a | all items placable
+# x | exclusive to items used in recipes
+
+book: e
+counter: ac
+counter-window: ac
+oven: c
+freezer: c
+stove: c
+tree: c
+wall: c
+lamp: c
+deep-fryer: x
+freezer: x
+oven: x