Migrate remaining maps

10 files changed, 195 insertions, 483 deletions

diff --git a/data/maps/bar.yaml b/data/maps/bar.yaml
index 6b817096..380a98f8 100644
--- a/data/maps/bar.yaml
+++ b/data/maps/bar.yaml
@@ -34,59 +34,34 @@ map:
 
 tiles:
     "⌷": counter
-    "f": counter
-    "p": counter
+    "f": counter -i=foodprocessor
+    "p": counter -i=plate
     "t": table
-    "w": counter-window
     "s": sink
     "o": oven
-    "S": stove
-    "P": stove
-    "b": book
+    "S": stove -i=pot
+    "P": stove -i=pan
+    "b": book --book
     "C": cutting-board
-    "R": steak-crate
-    "T": tomato-crate
-    "F": flour-crate
-    "L": leek-crate
-    "Y": rice-crate
-    "Z": coconut-crate
-    "V": cheese-crate
-    "X": trash
+    "R": steak-crate -x
+    "T": tomato-crate -x
+    "F": flour-crate -x
+    "L": leek-crate -x
+    "Y": rice-crate -x
+    "Z": coconut-crate -x
+    "V": cheese-crate -x
+    "X": trash -x
 
-    "c": chair
-    ".": floor
-    "'": grass
-    "*": tree
-    "!": path
-    "_": path
-    "d": door
-    "▒": wall-window
-    "█": wall
-    "~": path
-
-items:
-    "S": pot
-    "w": plate
-    "p": plate
-    "P": pan
-    "f": foodprocessor
+    "c": chair -w
+    ".": floor -w
+    "'": grass -w
+    "*": tree -c
+    "!": path -w --customer-spawn
+    "_": path -w
+    "d": door -w
+    "▒": wall-window -c
+    "█": wall -c
+    "~": path -w --chef-spawn
 
 entities:
     - !customers
-tile_entities:
-    "b": !book
-
-chef_spawn: "~"
-customer_spawn: "!"
-
-walkable:
-    - door
-    - floor
-    - chair
-    - grass
-    - path
-
-collider:
-    - wall
-    - wall-window
-    - tree
diff --git a/data/maps/bbq.yaml b/data/maps/bbq.yaml
index 5d1bfbb7..bb6e24cd 100644
--- a/data/maps/bbq.yaml
+++ b/data/maps/bbq.yaml
@@ -32,53 +32,27 @@ map:
 
 tiles:
     "#": counter
-    "f": counter
-    "p": counter
+    "f": counter -i=foodprocessor
+    "p": counter -i=plate
     "t": table
-    "w": counter-window
     "s": sink
     "o": oven
-    "S": stove
+    "S": stove -i=pan
     "C": cutting-board
-    "R": steak-crate
-    "T": tomato-crate
-    "F": flour-crate
-    "L": lettuce-crate
-    "W": cheese-crate
-    "X": trash
+    "R": steak-crate -x
+    "T": tomato-crate -x
+    "F": flour-crate -x
+    "L": lettuce-crate -x
+    "W": cheese-crate -x
+    "X": trash -x
 
-    "c": chair
-    ".": floor
-    "'": grass
-    "*": tree
-    "~": path
-    "!": path
-    "_": path
-    "d": door
-    "█": wall
-
-items:
-    "S": pan
-    "w": plate
-    "p": plate
-    "f": foodprocessor
+    "c": chair -w
+    "'": grass -w
+    "*": tree -c
+    "~": path -w --customer-spawn --chef-spawn
+    "_": path -w
+    "█": wall -c
 
 entities:
     - !customers
       scaling_factor: 0.3
-
-chef_spawn: "~"
-customer_spawn: "~"
-
-walkable:
-    - door
-    - floor
-    - chair
-    - grass
-    - path
-
-collider:
-    - wall
-    - tree
-    - wall-window
-
diff --git a/data/maps/burgers_inc.yaml b/data/maps/burgers_inc.yaml
index c3b4312e..25dac3bc 100644
--- a/data/maps/burgers_inc.yaml
+++ b/data/maps/burgers_inc.yaml
@@ -41,61 +41,34 @@ map:
 
 tiles:
     "#": counter
-    "f": counter
-    "W": counter
-    "p": counter
+    "f": counter -i=foodprocessor
+    "W": counter -i=glass
+    "p": counter -i=plate
     "t": table
-    "w": counter-window:red
+    "w": counter-window:red -i=plate
     "s": sink
-    "o": oven
-    "P": stove
-    "B": bun-crate
+    "P": stove -i=pan
     "C": cutting-board
-    "H": cheese-crate
-    "A": lettuce-crate
-    "R": steak-crate
-    "T": tomato-crate
-    "D": coconut-crate
-    "V": strawberry-crate
-    "F": flour-crate
-    "L": leek-crate
-    "X": trash
+    "B": bun-crate -x
+    "H": cheese-crate -x
+    "A": lettuce-crate -x
+    "R": steak-crate -x
+    "T": tomato-crate -x
+    "D": coconut-crate -x
+    "V": strawberry-crate -x
+    "X": trash -x
 
-    "c": chair
-    ".": floor
-    "'": grass
-    "*": tree
-    "~": path
-    "!": path
-    "_": path
-    "d": door:red
-    "█": wall:red
-    "▒": wall-window:red
-    "=": fence
-
-items:
-    "P": pan
-    "p": plate
-    "f": foodprocessor
-    "W": glass
-    "w": plate
+    "c": chair -w
+    ".": floor -w
+    "'": grass -w
+    "*": tree -c
+    "~": path -w --chef-spawn
+    "!": path -w --customer-spawn
+    "_": path -w
+    "d": door:red -w
+    "█": wall:red -c
+    "▒": wall-window:red -c
 
 entities:
     - !customers
       scaling_factor: 0.2
-
-chef_spawn: "~"
-customer_spawn: "!"
-
-walkable:
-    - door:red
-    - floor
-    - chair
-    - grass
-    - path
-
-collider:
-    - wall:red
-    - tree
-    - wall-window:red
-    - fence
diff --git a/data/maps/bus.yaml b/data/maps/bus.yaml
index 50d58ab9..60cab10f 100644
--- a/data/maps/bus.yaml
+++ b/data/maps/bus.yaml
@@ -41,77 +41,43 @@ map:
 
 tiles:
     "#": counter
-    "f": counter
-    "p": counter
-    ">": conveyor
-    "<": conveyor
-    "^": conveyor
-    "v": conveyor
+    "f": counter -i=foodprocessor
+    "p": counter -i=plate
+    ">": conveyor --conveyor=1,0
+    "<": conveyor --conveyor=-1,0
+    "^": conveyor --conveyor=0,-1
+    "v": conveyor --conveyor=0,1
     "t": table
-    "‹": counter-window
-    "›": counter-window
-    "„": counter-window
-    "“": counter-window
+    "‹": counter-window --conveyor=-1,0
+    "›": counter-window --conveyor=1,0
+    "„": counter-window --conveyor=0,1
+    "“": counter-window --conveyor=0,-1
     "s": sink
     "o": oven
-    "S": stove
-    "Y": stove
+    "S": stove -i=pot
+    "Y": stove -i=pan
     "C": cutting-board
-    "R": steak-crate
-    "T": tomato-crate
-    "F": flour-crate
-    "L": leek-crate
-    "Z": lettuce-crate
-    "W": cheese-crate
-    "U": strawberry-crate
-    "X": trash
+    "R": steak-crate -x
+    "T": tomato-crate -x
+    "F": flour-crate -x
+    "L": leek-crate -x
+    "Z": lettuce-crate -x
+    "W": cheese-crate -x
+    "U": strawberry-crate -x
+    "X": trash -x
 
-    "c": chair
-    ".": floor
-    "'": grass
-    "*": tree
-    "~": path
-    "!": path
-    "_": path
-    "«": path
-    "»": path
-    "d": door
-    "█": wall
-    "▒": wall-window
-
-tile_entities:
-    ">": !conveyor { dir: [1, 0] }
-    "<": !conveyor { dir: [-1, 0] }
-    "»": !conveyor { dir: [1, 0] }
-    "«": !conveyor { dir: [-1, 0] }
-    "›": !conveyor { dir: [1, 0] }
-    "‹": !conveyor { dir: [-1, 0] }
-    "v": !conveyor { dir: [0, 1] }
-    "^": !conveyor { dir: [0, -1] }
-    "„": !conveyor { dir: [0, 1] }
-    "“": !conveyor { dir: [0, -1] }
-
-items:
-    "S": pot
-    "Y": pan
-    "w": plate
-    "p": plate
-    "f": foodprocessor
+    "c": chair -w
+    ".": floor -w
+    "'": grass -w
+    "*": tree -c
+    "~": path -w --chef-spawn
+    "!": path -w --customer-spawn
+    "_": path -w
+    "«": path --conveyor=-1,0
+    "»": path --conveyor=1,0
+    "d": door -w
+    "█": wall -c
+    "▒": wall-window -c
 
 entities:
     - !customers
-
-chef_spawn: "~"
-customer_spawn: "~"
-
-walkable:
-    - door
-    - floor
-    - chair
-    - grass
-    - path
-
-collider:
-    - wal
-    - wall-windowl
-    - tree
diff --git a/data/maps/campaign/lobby.yaml b/data/maps/campaign/lobby.yaml
index 5af0fc80..27350267 100644
--- a/data/maps/campaign/lobby.yaml
+++ b/data/maps/campaign/lobby.yaml
@@ -35,22 +35,21 @@ map:
 tiles:
     "t": table
     "T": table
-    "s": sink
-    "c": chair
-    "~": grass
-    ".": floor
-    "1": floor
-    "2": floor
-    "3": floor
-    "4": floor
-    "5": floor
-    "a": floor
-    "b": floor
-    "c": floor
+    "c": chair -w
+    "~": grass -w
+    ".": floor -w
+    "1": floor -w
+    "2": floor -w
+    "3": floor -w
+    "4": floor -w
+    "5": floor -w
+    "a": floor -w
+    "b": floor -w
+    "c": floor -w
     "§": book
     "'": grass
     "*": tree
-    "█": wall
+    "█": wall -c
 
 chef_spawn: "~"
 customer_spawn: "!"
@@ -65,10 +64,3 @@ tile_entities:
     "b": !gate { condition: !all [!stars [campaign/01, 3], !stars [campaign/02, 1]] }
     "c": !gate { condition: !any [!stars [campaign/03, 3], !stars [campaign/04, 3]] }
     "§": !book
-
-walkable:
-    - floor
-    - chair
-    - grass
-collider:
-    - wall
diff --git a/data/maps/debug2.yaml b/data/maps/debug2.yaml
index 54f7e3cf..b4a578da 100644
--- a/data/maps/debug2.yaml
+++ b/data/maps/debug2.yaml
@@ -38,59 +38,17 @@ map:
     - ".............'''''''''''"
 
 tiles:
-    "⌷": counter
-    "f": counter
-    "p": counter
-    "t": table
-    "w": counter-window
-    "s": sink
-    "o": oven
-    "z": freezer
-    "S": stove
-    "b": book
-    "C": cutting-board
-    "0": rice-crate
-    "1": steak-crate
-    "2": tomato-crate
-    "3": leek-crate
-    "4": coconut-crate
-    "5": strawberry-crate
-    "6": flour-crate
-    "7": fish-crate
-    "8": cheese-crate
-    "9": lettuce-crate
-    "X": trash
-
-    "¹": black-hole-counter
-    "²": white-hole-counter
-    "³": black-hole
-    "⁴": white-hole
-    "l": lamp
-    "c": chair
-    "~": floor
-    ".": floor
-    "'": grass
-    "*": tree
-    "!": path
-    "_": path
-    "d": door
-    "▒": wall-window
-    "█": wall
-    "H": house-wall
-    "+": house-balcony
-    "R": house-roof
-    "T": house-roof-chimney
-    "|": house-side
-    "@": house-oriel
-    "D": house-door
-items:
-    "S": pot
-    "w": plate
-    "p": plate
-    "f": foodprocessor
-    "}": foodprocessor
-    "]": foodprocessor
-    "ö": pot
+    "l": lamp -c
+    "~": floor -w --chef-spawn
+    ".": floor -w
+    "'": grass -w
+    "H": house-wall -c
+    "+": house-balcony -c
+    "R": house-roof -c
+    "T": house-roof-chimney -c
+    "|": house-side -c
+    "@": house-oriel -c
+    "D": house-door -c
 
 entities:
     - !environment_effect { name: rain, on: 60, off: 40 }
@@ -105,22 +63,3 @@ entities:
       points: [[7, 7], [19, 7], [19, 13], [7, 13]]
       spawn_delay: 0.5
       spawn_delay_stdev: 1
-
-chef_spawn: "~"
-customer_spawn: "!"
-
-walkable:
-    - door
-    - floor
-    - chair
-    - grass
-    - path
-    - black-hole
-    - chandelier
-
-collider:
-    - wall
-    - wall-window
-    - tree
-    - lamp
-    - white-hole
diff --git a/data/maps/line.yaml b/data/maps/line.yaml
index 180a0e0d..66217c92 100644
--- a/data/maps/line.yaml
+++ b/data/maps/line.yaml
@@ -26,51 +26,30 @@ map:
 
 tiles:
     "#": counter
-    "f": counter
-    "p": counter
+    "f": counter -i=foodprocessor
+    "p": counter -i=plate
     "t": table
-    "w": counter-window
     "s": sink
     "o": oven
-    "S": stove
-    "P": stove
+    "S": stove -i=pot
+    "P": stove -i=pan
     "C": cutting-board
-    "R": steak-crate
-    "T": tomato-crate
-    "F": flour-crate
-    "L": leek-crate
-    "K": cheese-crate
-    "X": trash
+    "R": steak-crate -x
+    "T": tomato-crate -x
+    "F": flour-crate -x
+    "L": leek-crate -x
+    "K": cheese-crate -x
+    "X": trash -x
 
-    "c": chair
-    ".": floor
-    "'": grass
-    "~": path
-    "!": path
-    "_": path
-    "d": door
-    "█": wall
-
-items:
-    "S": pot
-    "P": pan
-    "w": plate
-    "p": plate
-    "f": foodprocessor
-
-chef_spawn: "~"
-customer_spawn: "!"
+    "c": chair -w
+    ".": floor -w 
+    "'": grass -w
+    "~": path -w --chef-spawn
+    "!": path -w --customer-spawn
+    "_": path -w
+    "d": door -w
+    "█": wall -c
 
 entities:
     - !customers
       scaling_factor: 0.5
-
-walkable:
-    - door
-    - floor
-    - chair
-    - grass
-    - path
-
-collider:
-    - wall
diff --git a/data/maps/sushibar.yaml b/data/maps/sushibar.yaml
index 59aeeb3f..56ed8dde 100644
--- a/data/maps/sushibar.yaml
+++ b/data/maps/sushibar.yaml
@@ -34,62 +34,30 @@ map:
 
 tiles:
     "⌷": counter
-    "f": counter
-    "#": counter
-    "g": counter
-    "t": table
-    "w": counter-window
+    "f": counter -i=foodprocessor
+    "#": counter -i=plate
+    "g": counter -i=glass
     "s": sink
     "o": oven
-    "S": stove
-    "b": book
+    "S": stove -i=pot
     "C": cutting-board
-    "R": rice-crate
-    "G": flour-crate
-    "H": steak-crate
-    "I": tomato-crate
-    "T": coconut-crate
-    "F": fish-crate
-    "L": strawberry-crate
-    "X": trash
+    "R": rice-crate -x
+    "T": coconut-crate -x
+    "F": fish-crate -x
+    "L": strawberry-crate -x
+    "X": trash -x
     "Z": freezer
 
-    "c": chair
-    "~": floor
-    ".": floor
-    "'": grass
-    "*": tree
-    "!": path
-    "_": path
-    "d": door
-    "▒": wall-window
-    "█": wall
-
-items:
-    "S": pot
-    "#": plate
-    "p": plate
-    "g": glass
-    "f": foodprocessor
+    "c": chair -w
+    "~": floor -w --chef-spawn
+    ".": floor -w
+    "'": grass -w
+    "*": tree -c
+    "!": path -w --customer-spawn
+    "_": path -w
+    "d": door -w
+    "█": wall -c
 
 entities:
     - !customers
       scaling_factor: 0.5
-
-tile_entities:
-    "b": !book
-
-chef_spawn: "~"
-customer_spawn: "!"
-
-walkable:
-    - door
-    - floor
-    - chair
-    - grass
-    - path
-
-collider:
-    - wall
-    - wall-window
-    - tree
diff --git a/data/maps/village.yaml b/data/maps/village.yaml
index aea209b3..2a83c005 100644
--- a/data/maps/village.yaml
+++ b/data/maps/village.yaml
@@ -42,56 +42,32 @@ map:
 
 tiles:
     "#": counter
-    "f": counter
-    "p": counter
+    "f": counter -i=foodprocessor
+    "p": counter -i=plate
     "t": table
-    "w": counter-window
     "s": sink
     "o": oven
-    "S": stove
-    "U": stove
+    "S": stove -i=pot
+    "U": stove -i=pan
     "C": cutting-board
-    "R": steak-crate
-    "T": tomato-crate
-    "F": flour-crate
-    "L": leek-crate
-    "K": lettuce-crate
-    "D": cheese-crate
-    "X": trash
+    "R": steak-crate -x
+    "T": tomato-crate -x
+    "F": flour-crate -x
+    "L": leek-crate -x
+    "K": lettuce-crate -x
+    "D": cheese-crate -x
+    "X": trash -x
 
-    "c": chair
-    ".": floor
-    "'": grass
-    "*": tree
-    "~": path
-    "!": path
-    "_": path
-    "d": door
-    "█": wall
-    "=": fence
-
-items:
-    "S": pot
-    "U": pan
-    "w": plate
-    "p": plate
-    "f": foodprocessor
+    "c": chair -w
+    ".": floor -w
+    "'": grass -w
+    "~": path -w --chef-spawn
+    "!": path -w --customer-spawn
+    "_": path -w
+    "d": door -w
+    "█": wall -c
+    "=": fence -w
 
 entities:
     - !customers
       scaling_factor: 0.1
-
-chef_spawn: "~"
-customer_spawn: "!"
-
-walkable:
-    - door
-    - floor
-    - chair
-    - grass
-    - path
-
-collider:
-    - wall
-    - tree
-    - fence
diff --git a/data/maps/zigzag.yaml b/data/maps/zigzag.yaml
index 6660cdf5..08a03ce1 100644
--- a/data/maps/zigzag.yaml
+++ b/data/maps/zigzag.yaml
@@ -20,11 +20,11 @@ map:
     - "'''██████████████████''*''"
     - "'''█Xoof#MNF#█..ctc.█'''''"
     - "'*'█s........d...c..█'*'''"
-    - "'''█#..ssppp#█c....c█'''''"
+    - "'''█#..SSppp#█c....c█'''''"
     - "'''█#.......#█tc...t█'''''"
-    - "'*'█##C###...d......d__*''"
+    - "'*'█##C###..~d......d__*''"
     - "'''█#.......#█tc...c█'*'''"
-    - "*''█#..ssppp#█c....t█'''''"
+    - "*''█#..PPppp#█c....t█'''''"
     - "'''█s........d...c..█'''''"
     - "'''█Xoof#LRT#█..ctc.█'''''"
     - "*''██████████████████'''''"
@@ -33,62 +33,32 @@ map:
 
 tiles:
     "#": counter
-    "v": conveyor
-    "^": conveyor
-    "f": counter
-    "p": counter
+    "f": counter -i=foodprocessor
+    "p": counter -i=plate
     "t": table
-    "w": counter-window
     "s": sink
     "o": oven
-    "S": stove
-    "P": stove
+    "S": stove -i=pot
+    "P": stove -i=pan
     "C": cutting-board
-    "R": steak-crate
-    "T": tomato-crate
-    "F": flour-crate
-    "L": leek-crate
-    "M": lettuce-crate
-    "N": coconut-crate
-    "X": trash
+    "R": steak-crate -x
+    "T": tomato-crate -x
+    "F": flour-crate -x
+    "L": leek-crate -x
+    "M": lettuce-crate -x
+    "N": coconut-crate -x
+    "X": trash -x
 
-    "c": chair
-    ".": floor
-    "'": grass
-    "*": tree
-    "d": door
-    "~": floor
-    "!": path
-    "_": path
-    "█": wall
-
-tile_entities:
-    ">": !conveyor { dir: [1, 0] }
-    "<": !conveyor { dir: [-1, 0] }
-    "v": !conveyor { dir: [0, 1] }
-    "^": !conveyor { dir: [0, -1] }
-
-items:
-    "S": pot
-    "P": pan
-    "w": plate
-    "p": plate
-    "f": foodprocessor
+    "c": chair -w
+    ".": floor -w
+    "'": grass -w
+    "*": tree -c
+    "d": door -w
+    "~": floor -w --chef-spawn
+    "!": path -w --customer-spawn
+    "_": path -w
+    "█": wall -c
 
 entities:
     - !customers
       scaling_factor: 0.35
-
-chef_spawn: "~"
-customer_spawn: "!"
-
-walkable:
-    - door
-    - floor
-    - chair
-    - grass
-    - path
-
-collider:
-    - wall
-    - tree