1 files changed, 32 insertions, 66 deletions
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