1 files changed, 18 insertions, 50 deletions
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