migrate anitcurry, auto_sushi, salad, senior, sophomore, station,

streetfood, teeny

8 files changed, 166 insertions, 342 deletions

diff --git a/data/maps/anticurry.yaml b/data/maps/anticurry.yaml
index c519fd6f..9976cc3d 100644
--- a/data/maps/anticurry.yaml
+++ b/data/maps/anticurry.yaml
@@ -28,57 +28,36 @@ map:
 
 tiles:
     "#": counter
-    "f": counter
-    "p": counter
+    "f": counter -i=foodprocessor
+    "p": counter -i=plate
     "t": table
-    "w": counter-window
-    "s": sink
+    "s": sink -x
     "o": oven
     "h": freezer
-    "S": stove
-    "P": stove
+    "S": stove -i=pot
+    "P": stove -i=pan
     "C": cutting-board
-    "R": steak-crate
-    "D": coconut-crate
-    "V": strawberry-crate
-    "F": fish-crate
-    "U": rice-crate
-    "T": tomato-crate
-    "G": flour-crate
-    "L": leek-crate
-    "A": lettuce-crate
-    "E": cheese-crate
-    "X": trash
+    "R": steak-crate -x
+    "D": coconut-crate -x
+    "V": strawberry-crate -x
+    "F": fish-crate -x
+    "U": rice-crate -x
+    "T": tomato-crate -x
+    "G": flour-crate -x
+    "L": leek-crate -x
+    "A": lettuce-crate -x
+    "E": cheese-crate -x
+    "X": trash -x
 
-    "c": chair
-    ".": floor
-    "'": grass
-    "~": floor
-    "!": floor
-    "_": 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
+    "~": floor -w --chef-spawn
+    "!": floor -w --customer-spawn
+    "_": path -w
+    "d": door -w
+    "█": wall -c
 
 entities:
     - !customers
       scaling_factor: 0.7
-
-walkable:
-    - door
-    - floor
-    - chair
-    - grass
-    - path
-
-collider:
-    - wall
diff --git a/data/maps/auto_sushi.yaml b/data/maps/auto_sushi.yaml
index bb5cb1a9..b42c257e 100644
--- a/data/maps/auto_sushi.yaml
+++ b/data/maps/auto_sushi.yaml
@@ -38,9 +38,9 @@ map:
 
 tiles:
     "#": counter
-    "f": counter
-    "p": counter
-    "P": counter
+    "f": counter -i=foodprocessor
+    "p": counter -i=plate
+    "P": counter -i=pot
     ">": conveyor
     "<": conveyor
     "^": conveyor
@@ -48,28 +48,28 @@ tiles:
     "‹": counter-window
     "›": counter-window
     "0": wall-window
-    "s": sink
+    "s": sink -x
     "o": oven
-    "S": stove
+    "S": stove -i=pot
     "C": cutting-board
-    "R": fish-crate
-    "T": tomato-crate
-    "F": rice-crate
-    "Y": coconut-crate
-    "L": leek-crate
-    "X": trash
+    "R": fish-crate -x
+    "T": tomato-crate -x
+    "F": rice-crate -x
+    "Y": coconut-crate -x
+    "L": leek-crate -x
+    "X": trash -x
 
     "t": table
-    "c": chair
-    ".": floor
-    "'": grass
-    "=": fence
-    "*": tree
-    "~": path
-    "!": path
-    "_": path
-    "d": door
-    "█": wall
+    "c": chair -w
+    ".": floor -w
+    "'": grass -w
+    "=": fence -c
+    "*": tree -c
+    "~": path -w --chef-spawn
+    "!": path -w --customer-spawn
+    "_": path -w
+    "d": door -w
+    "█": wall -c
 
 tile_entities:
     ">": !conveyor { dir: [1, 0] }
@@ -80,27 +80,5 @@ tile_entities:
     "^": !conveyor { dir: [0, -1] }
     "X": !conveyor { dir: [0, -1] }
 
-items:
-    "S": pot
-    "P": pot
-    "w": plate
-    "p": plate
-    "f": foodprocessor
-
 entities:
     - !customers
-
-chef_spawn: "~"
-customer_spawn: "!"
-
-walkable:
-    - door
-    - floor
-    - chair
-    - grass
-    - path
-
-collider:
-    - wall
-    - tree
-    - fence
diff --git a/data/maps/salad.yaml b/data/maps/salad.yaml
index ecd99a85..65bee85a 100644
--- a/data/maps/salad.yaml
+++ b/data/maps/salad.yaml
@@ -37,26 +37,25 @@ map:
 
 tiles:
     "⌷": counter
-    "f": counter
-    "p": counter
+    "p": counter -i=plate
     "t": table
-    "w": counter-window
-    "s": sink
-    "C": cutting-board
-    "T": tomato-crate
-    "L": lettuce-crate
-    "X": trash
+    "w": counter-window -i=plate
+    "s": sink -x
+    "C": cutting-board -x
+    "T": tomato-crate -x
+    "L": lettuce-crate -x
+    "X": trash -x
 
-    "c": chair
-    "~": floor
-    ".": floor
-    "'": grass
-    "*": tree
-    "!": path
-    "_": path
-    "d": door
-    "▒": wall-window
-    "█": wall
+    "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
 
 items:
     "w": plate
@@ -64,18 +63,3 @@ items:
 
 entities:
     - !customers
-
-chef_spawn: "~"
-customer_spawn: "!"
-
-walkable:
-    - door
-    - floor
-    - chair
-    - grass
-    - path
-
-collider:
-    - wall
-    - wall-window
-    - tree
diff --git a/data/maps/senior.yaml b/data/maps/senior.yaml
index 161f4c64..d5fe54ed 100644
--- a/data/maps/senior.yaml
+++ b/data/maps/senior.yaml
@@ -34,14 +34,13 @@ map:
 
 tiles:
     "⌷": counter
-    "f": counter
-    "p": counter
+    "f": counter -i=foodprocessor
     "t": table
-    "w": counter-window
-    "s": sink
-    "b": book
+    "w": counter-window -i=plate
+    "s": sink -x -i=plate
+    "b": book --book
     "o": oven
-    "S": stove
+    "S": stove -i=pot
     "W": stove
     "C": cutting-board
     "R": rice-crate
@@ -51,43 +50,19 @@ tiles:
     "L": leek-crate
     "Y": cheese-crate
     "Z": lettuce-crate
-    "X": trash
+    "X": trash -x
 
-    "c": chair
-    "~": floor
-    ".": floor
-    "'": grass
-    "*": tree
-    "!": path
-    "_": path
-    "d": door
-    "█": wall
-    "▒": wall-window
-
-items:
-    "S": pot
-    "w": plate
-    "s": plate
-    "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
+    "▒": wall-window -c
 
 entities:
     - !customers
       scaling_factor: 0.3
-
-tile_entities:
-    "b": !book
-
-chef_spawn: "~"
-customer_spawn: "!"
-
-walkable:
-    - door
-    - floor
-    - chair
-    - grass
-    - path
-
-collider:
-    - wall
-    - wall-window
-    - tree
diff --git a/data/maps/sophomore.yaml b/data/maps/sophomore.yaml
index 0602b6ff..6941e5b8 100644
--- a/data/maps/sophomore.yaml
+++ b/data/maps/sophomore.yaml
@@ -32,53 +32,31 @@ map:
 
 tiles:
     "⌷": counter
-    "f": counter
-    "p": counter
+    "f": counter -i=foodprocessor
+    "p": counter -i=plate
     "t": table
-    "w": counter-window
-    "s": sink
+    "w": counter-window -i=plate
+    "s": sink -x
     "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
-    "X": trash
+    "R": steak-crate -x
+    "T": tomato-crate -x
+    "F": flour-crate -x
+    "L": leek-crate -x
+    "X": trash -x
 
-    "c": chair
-    "~": floor
-    ".": floor
-    "'": grass
-    "*": tree
-    "!": path
-    "_": path
-    "d": door
-    "▒": wall-window
-    "█": wall
-
-items:
-    "S": pot
-    "P": pan
-    "w": plate
-    "p": plate
-    "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-window -c
+    "█": wall -c
 
 entities:
     - !customers
-
-chef_spawn: "~"
-customer_spawn: "!"
-
-walkable:
-    - door
-    - floor
-    - chair
-    - grass
-    - path
-
-collider:
-    - wall
-    - wall-window
-    - tree
diff --git a/data/maps/station.yaml b/data/maps/station.yaml
index d69eee85..2e3aa818 100644
--- a/data/maps/station.yaml
+++ b/data/maps/station.yaml
@@ -33,55 +33,34 @@ map:
 
 tiles:
     "#": counter
-    "f": counter
-    "p": counter
+    "f": counter -i=foodprocessor
+    "p": counter -i=plate
     "t": table
     "w": counter-window
-    "s": sink
+    "s": sink -x
     "o": oven
-    "P": stove
+    "P": stove -i=pan
     "C": cutting-board
-    "A": lettuce-crate
-    "R": steak-crate
-    "D": cheese-crate
-    "T": tomato-crate
-    "F": flour-crate
-    "L": leek-crate
-    "X": trash
+    "A": lettuce-crate -x
+    "R": steak-crate -x
+    "D": cheese-crate -x
+    "T": tomato-crate -x
+    "F": flour-crate -x
+    "L": leek-crate -x
+    "X": trash -x
 
     "c": chair
-    ".": floor
-    "'": grass
-    "*": tree
-    "~": path
-    "!": path
-    "_": path
-    "d": door
-    "█": wall
-    "▒": wall-window
-    "=": fence
-
-items:
-    "P": pan
-    "p": plate
-    "f": foodprocessor
+    ".": floor -w
+    "'": grass -w
+    "*": tree -c
+    "~": path -w --chef-spawn
+    "!": path -w --customer-spawn
+    "_": path -w
+    "d": door -w
+    "█": wall -c
+    "▒": wall-window -c
+    "=": fence -c
 
 entities:
     - !customers
       scaling_factor: 0.7
-
-chef_spawn: "~"
-customer_spawn: "!"
-
-walkable:
-    - door
-    - floor
-    - chair
-    - grass
-    - path
-
-collider:
-    - wall
-    - tree
-    - wall-window
-    - fence
diff --git a/data/maps/streetfood.yaml b/data/maps/streetfood.yaml
index b9a954cb..50647511 100644
--- a/data/maps/streetfood.yaml
+++ b/data/maps/streetfood.yaml
@@ -32,39 +32,31 @@ map:
 
 tiles:
     "#": counter
-    "p": counter
-    "G": counter
+    "p": counter -i=plate
+    "G": counter -i=glass
     "t": table
-    "s": sink
-    "Y": stove
+    "s": sink -x
+    "Y": stove -i=pan
     "C": cutting-board
-    "R": steak-crate
-    "T": tomato-crate
-    "F": flour-crate
-    "L": leek-crate
-    "B": lettuce-crate
-    "D": cheese-crate
+    "R": steak-crate -x
+    "T": tomato-crate -x
+    "B": lettuce-crate -x
     "X": trash
-    "l": lamp
-    "8": chandelier
-    "1": ceiling-lamp
+    "l": lamp -c
+    "8": chandelier -w
+    "1": ceiling-lamp -w
 
-    "c": chair
-    ".": floor
-    "'": grass
-    "*": tree
-    "_": path
-    "~": street
-    "!": street
-    "-": street
-    "d": door
-    "█": wall
-    "▒": wall-window
-
-items:
-    "Y": pan
-    "p": plate
-    "G": glass
+    "c": chair -w
+    ".": floor -w
+    "'": grass -w
+    "*": tree -c
+    "_": path -w
+    "~": street -w --chef-spawn
+    "!": street -w --customer-spawn
+    "-": street -w
+    "d": door -w
+    "█": wall -c
+    "▒": wall-window -c
 
 entities:
     - !customers
@@ -85,23 +77,3 @@ entities:
       points: [[15, 12], [14, 4], [15, 0]]
       spawn_delay: 2.0
       spawn_delay_stdev: 1
-
-
-chef_spawn: "~"
-customer_spawn: "!"
-
-walkable:
-    - door
-    - floor
-    - chair
-    - grass
-    - path
-    - street
-    - chandelier
-    - ceiling-lamp
-
-collider:
-    - wall
-    - tree
-    - wall-window
-    - lamp
diff --git a/data/maps/teeny.yaml b/data/maps/teeny.yaml
index 5d2e6ade..7725e115 100644
--- a/data/maps/teeny.yaml
+++ b/data/maps/teeny.yaml
@@ -15,70 +15,49 @@
 #
 score_baseline: 200
 map:
-    - "''''''''_'''''''''''''''"
-    - "'██████'_''''''''██████'"
+    - "''''''''_'''''*'''''''''"
+    - "'██████'_'''*''''██████'"
     - "'█ooPP█X_''''''''█LRTF█'"
     - "'█....d__________d...C█'"
     - "'█f...█''''__''''█...s█'"
     - "'█f...██ww█dd█ww██...#█'"
     - "'██www█tt......tt█www██'"
-    - "'''___▒cc......cc▒___'''"
-    - "''''__d..........d__''''"
+    - "'*'___▒cc......cc▒___'''"
+    - "''''__d..........d__'''*"
     - "''cc_'▒ctc....ctc▒'_cc''"
     - "''tt_'▒ctc....ctc▒'_tt''"
     - "''cc_'█..........█'_cc''"
     - "''''_'█▒▒▒▒dd▒▒▒▒█'_''''"
     - "''''________________''''"
-    - "'''''''''''__'''''''''''"
-    - "'''''''''''~_'''''''''''"
+    - "'''*'''''''__'''''*'''''"
+    - "'''''''''''~_''''''''''*"
 
 tiles:
     "#": counter
-    "f": counter
-    "p": counter
+    "f": counter -i=foodprocessor
+    "p": counter -i=plate
     "t": table
-    "w": counter-window
-    "s": sink
+    "w": counter-window -i=plate
+    "s": sink -x
     "o": oven
-    "P": stove
+    "P": stove -i=pan
     "C": cutting-board
-    "R": steak-crate
-    "T": tomato-crate
-    "F": flour-crate
-    "L": lettuce-crate
-    "X": trash
+    "R": steak-crate -x
+    "T": tomato-crate -x
+    "F": flour-crate -x
+    "L": lettuce-crate -x
+    "X": trash -x
 
-    "c": chair
-    ".": floor
-    "'": grass
-    "*": tree
-    "~": path
-    "_": path
-    "d": door
-    "█": wall
-    "▒": wall-window
-
-items:
-    "P": pan
-    "w": plate
-    "p": plate
-    "f": foodprocessor
+    "c": chair -w
+    ".": floor -w
+    "'": grass -w
+    "*": tree -c
+    "~": path -w --chef-spawn --customer-spawn
+    "_": path -w
+    "d": door -w
+    "█": wall -c
+    "▒": wall-window -c
 
 entities:
     - !customers
       scaling_factor: 0.3
-
-chef_spawn: "~"
-customer_spawn: "~"
-
-walkable:
-    - door
-    - floor
-    - chair
-    - grass
-    - path
-
-collider:
-    - wall
-    - wall-window
-    - tree