format de fitxers room

data/room/01.yaml

@@ -1,6 +1,5 @@
 # THE JAIL
 room:
-  number: "01"
   name: "THE JAIL"
   bgColor: bright_blue
   border: blue
@@ -11,14 +10,14 @@ room:
     up: null
     down: null
     left: null
-    right: "02"
+    right: 02.yaml
 
   # Item display colors
   itemColor1: yellow
   itemColor2: magenta
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,90 +45,72 @@ enemies:
     position: {x: 1, y: 13}
     velocity: {x: 0, y: 0}
     boundaries:
-      x1: 1
+      position1: {x: 1, y: 13}
-      y1: 13
+      position2: {x: 1, y: 13}
-      x2: 1
-      y2: 13
     color: white
 
   - animation: jailer_#3.yaml
     position: {x: 4, y: 13}
     velocity: {x: 0, y: 0}
     boundaries:
-      x1: 4
+      position1: {x: 4, y: 13}
-      y1: 13
+      position2: {x: 4, y: 13}
-      x2: 4
-      y2: 13
     color: white
 
   - animation: jailer_#1.yaml
     position: {x: 7, y: 13}
     velocity: {x: 0, y: 0}
     boundaries:
-      x1: 7
+      position1: {x: 7, y: 13}
-      y1: 13
+      position2: {x: 7, y: 13}
-      x2: 7
-      y2: 13
     color: white
 
   - animation: jailer_#2.yaml
     position: {x: 10, y: 13}
     velocity: {x: 0, y: 0}
     boundaries:
-      x1: 10
+      position1: {x: 10, y: 13}
-      y1: 13
+      position2: {x: 10, y: 13}
-      x2: 10
-      y2: 13
     color: white
 
   - animation: jailer_#1.yaml
     position: {x: 13, y: 13}
     velocity: {x: 0, y: 0}
     boundaries:
-      x1: 13
+      position1: {x: 13, y: 13}
-      y1: 13
+      position2: {x: 13, y: 13}
-      x2: 13
-      y2: 13
     color: white
 
   - animation: elsa.yaml
     position: {x: 3, y: 9}
     velocity: {x: 0, y: 0}
     boundaries:
-      x1: 3
+      position1: {x: 3, y: 9}
-      y1: 9
+      position2: {x: 3, y: 9}
-      x2: 3
-      y2: 9
     color: white
 
   - animation: elsa.yaml
     position: {x: 6, y: 9}
     velocity: {x: 0, y: 0}
     boundaries:
-      x1: 6
+      position1: {x: 6, y: 9}
-      y1: 9
+      position2: {x: 6, y: 9}
-      x2: 6
-      y2: 9
     color: white
 
   - animation: lamp.yaml
     position: {x: 23, y: 6}
     velocity: {x: 0, y: 0}
     boundaries:
-      x1: 23
+      position1: {x: 23, y: 6}
-      y1: 6
+      position2: {x: 23, y: 6}
-      x2: 23
-      y2: 6
     color: white
 
   - animation: bry.yaml
     position: {x: 17, y: 13}
     velocity: {x: 0, y: 0}
     boundaries:
-      x1: 17
+      position1: {x: 17, y: 13}
-      y1: 13
+      position2: {x: 17, y: 13}
-      x2: 17
-      y2: 13
     color: white
 
 # No items in this room

data/room/02.yaml

@@ -1,6 +1,5 @@
 # ROAD TO THE JAIL
 room:
-  number: "02"
   name: "ROAD TO THE JAIL"
   bgColor: black
   border: blue
@@ -9,16 +8,16 @@ room:
   # Room connections (null for no connection)
   connections:
     up: null
-    down: "04"
+    down: 04.yaml
-    left: "01"
+    left: 01.yaml
-    right: "03"
+    right: 03.yaml
 
   # Item display colors
   itemColor1: yellow
   itemColor2: bright_yellow
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,20 +45,16 @@ enemies:
     position: {x: 4, y: 7}
     velocity: {x: 36.0, y: 0}
     boundaries:
-      x1: 4
+      position1: {x: 4, y: 7}
-      y1: 7
+      position2: {x: 25, y: 7}
-      x2: 25
-      y2: 7
     color: green
 
   - animation: upv_student.yaml
     position: {x: 4, y: 13}
     velocity: {x: 36.0, y: 0}
     boundaries:
-      x1: 4
+      position1: {x: 4, y: 13}
-      y1: 13
+      position2: {x: 19, y: 13}
-      x2: 19
-      y2: 13
     color: cyan
     flip: true
 

data/room/03.yaml

@@ -1,6 +1,5 @@
 # VOID MAIN
 room:
-  number: "03"
   name: "VOID MAIN"
   bgColor: black
   border: magenta
@@ -10,7 +9,7 @@ room:
   connections:
     up: null
     down: null
-    left: "02"
+    left: 02.yaml
     right: null
 
   # Item display colors
@@ -18,7 +17,7 @@ room:
   itemColor2: yellow
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: -1
+  autoSurface: left
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,10 +45,8 @@ enemies:
     position: {x: 3, y: 2}
     velocity: {x: 24.0, y: 0}
     boundaries:
-      x1: 3
+      position1: {x: 3, y: 2}
-      y1: 2
+      position2: {x: 27, y: 2}
-      x2: 27
-      y2: 2
     color: yellow
 
 # Items in this room

data/room/04.yaml

@@ -1,6 +1,5 @@
 # JUMP THROUGH
 room:
-  number: "04"
   name: "JUMP THROUGH"
   bgColor: black
   border: cyan
@@ -8,17 +7,17 @@ room:
 
   # Room connections (null for no connection)
   connections:
-    up: "02"
+    up: 02.yaml
     down: null
-    left: "07"
+    left: 07.yaml
-    right: "05"
+    right: 05.yaml
 
   # Item display colors
   itemColor1: white
   itemColor2: green
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,20 +45,16 @@ enemies:
     position: {x: 24, y: 12}
     velocity: {x: 18.0, y: 0}
     boundaries:
-      x1: 24
+      position1: {x: 24, y: 12}
-      y1: 12
+      position2: {x: 31, y: 12}
-      x2: 31
-      y2: 12
     color: magenta
 
   - animation: chip.yaml
     position: {x: 4, y: 2}
     velocity: {x: 0, y: 24.0}
     boundaries:
-      x1: 4
+      position1: {x: 4, y: 2}
-      y1: 2
+      position2: {x: 4, y: 12}
-      x2: 4
-      y2: 12
     color: yellow
 
 # Items in this room

data/room/05.yaml

@@ -1,6 +1,5 @@
 # BIG JUMP
 room:
-  number: "05"
   name: "BIG JUMP"
   bgColor: black
   border: red
@@ -9,16 +8,16 @@ room:
   # Room connections (null for no connection)
   connections:
     up: null
-    down: "60"
+    down: 60.yaml
-    left: "04"
+    left: 04.yaml
-    right: "06"
+    right: 06.yaml
 
   # Item display colors
   itemColor1: bright_green
   itemColor2: green
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,20 +45,16 @@ enemies:
     position: {x: 15, y: 4}
     velocity: {x: 0, y: 48.0}
     boundaries:
-      x1: 15
+      position1: {x: 15, y: 0}
-      y1: 0
+      position2: {x: 15, y: 11}
-      x2: 15
-      y2: 11
     color: magenta
 
   - animation: congo.yaml
     position: {x: 21, y: 12}
     velocity: {x: 24.0, y: 0}
     boundaries:
-      x1: 21
+      position1: {x: 21, y: 12}
-      y1: 12
+      position2: {x: 28, y: 12}
-      x2: 28
-      y2: 12
     color: yellow
     flip: true
 

data/room/06.yaml

@@ -1,6 +1,5 @@
 # WELCOME TO MY ABBEY
 room:
-  number: "06"
   name: "WELCOME TO MY ABBEY"
   bgColor: blue
   border: yellow
@@ -8,17 +7,17 @@ room:
 
   # Room connections (null for no connection)
   connections:
-    up: "15"
+    up: 15.yaml
     down: null
-    left: "05"
+    left: 05.yaml
-    right: "25"
+    right: 25.yaml
 
   # Item display colors
   itemColor1: green
   itemColor2: bright_blue
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,10 +45,8 @@ enemies:
     position: {x: 1, y: 13}
     velocity: {x: 48.0, y: 0}
     boundaries:
-      x1: 1
+      position1: {x: 1, y: 13}
-      y1: 13
+      position2: {x: 23, y: 13}
-      x2: 23
-      y2: 13
     color: yellow
     flip: true
 
@@ -57,10 +54,8 @@ enemies:
     position: {x: 24, y: 4}
     velocity: {x: 0, y: 48.0}
     boundaries:
-      x1: 24
+      position1: {x: 24, y: 2}
-      y1: 2
+      position2: {x: 24, y: 7}
-      x2: 24
-      y2: 7
     color: green
 
 # Items in this room

data/room/07.yaml

@@ -1,6 +1,5 @@
 # SIGMASUA > TELEGRAM
 room:
-  number: "07"
   name: "SIGMASUA > TELEGRAM"
   bgColor: black
   border: blue
@@ -10,15 +9,15 @@ room:
   connections:
     up: null
     down: null
-    left: "08"
+    left: 08.yaml
-    right: "04"
+    right: 04.yaml
 
   # Item display colors
   itemColor1: magenta
   itemColor2: red
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,60 +45,48 @@ enemies:
     position: {x: 15, y: 7}
     velocity: {x: 48.0, y: 0}
     boundaries:
-      x1: 7
+      position1: {x: 7, y: 7}
-      y1: 7
+      position2: {x: 23, y: 7}
-      x2: 23
-      y2: 7
     color: cyan
 
   - animation: sigmasua.yaml
     position: {x: 15, y: 4}
     velocity: {x: -30.0, y: 0}
     boundaries:
-      x1: 7
+      position1: {x: 7, y: 4}
-      y1: 4
+      position2: {x: 23, y: 4}
-      x2: 23
-      y2: 4
     color: blue
 
   - animation: sigmasua.yaml
     position: {x: 3, y: 8}
     velocity: {x: 0, y: 24.0}
     boundaries:
-      x1: 3
+      position1: {x: 3, y: 5}
-      y1: 5
+      position2: {x: 3, y: 13}
-      x2: 3
-      y2: 13
     color: bright_red
 
   - animation: sigmasua.yaml
     position: {x: 27, y: 8}
     velocity: {x: 0, y: -24.0}
     boundaries:
-      x1: 27
+      position1: {x: 27, y: 5}
-      y1: 5
+      position2: {x: 27, y: 13}
-      x2: 27
-      y2: 13
     color: yellow
 
   - animation: sigmasua.yaml
     position: {x: 12, y: 10}
     velocity: {x: 0, y: 18.0}
     boundaries:
-      x1: 12
+      position1: {x: 12, y: 10}
-      y1: 10
+      position2: {x: 12, y: 13}
-      x2: 12
-      y2: 13
     color: bright_magenta
 
   - animation: sigmasua.yaml
     position: {x: 17, y: 13}
     velocity: {x: 0, y: -18.0}
     boundaries:
-      x1: 17
+      position1: {x: 17, y: 10}
-      y1: 10
+      position2: {x: 17, y: 13}
-      x2: 17
-      y2: 13
     color: bright_green
 
 # Items in this room

data/room/08.yaml

@@ -1,6 +1,5 @@
 # THE GARDEN
 room:
-  number: "08"
   name: "THE GARDEN"
   bgColor: black
   border: cyan
@@ -8,17 +7,17 @@ room:
 
   # Room connections (null for no connection)
   connections:
-    up: "09"
+    up: 09.yaml
     down: null
-    left: "16"
+    left: 16.yaml
-    right: "07"
+    right: 07.yaml
 
   # Item display colors
   itemColor1: yellow
   itemColor2: magenta
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,10 +45,8 @@ enemies:
     position: {x: 4, y: 13}
     velocity: {x: 24.0, y: 0}
     boundaries:
-      x1: 2
+      position1: {x: 2, y: 13}
-      y1: 13
+      position2: {x: 10, y: 13}
-      x2: 10
-      y2: 13
     color: green
     flip: true
 

data/room/09.yaml

@@ -1,6 +1,5 @@
 # THE BIG TREE
 room:
-  number: "09"
   name: "THE BIG TREE"
   bgColor: black
   border: bright_blue
@@ -8,8 +7,8 @@ room:
 
   # Room connections (null for no connection)
   connections:
-    up: "10"
+    up: 10.yaml
-    down: "08"
+    down: 08.yaml
     left: null
     right: null
 
@@ -18,7 +17,7 @@ room:
   itemColor2: green
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,10 +45,8 @@ enemies:
     position: {x: 10, y: 12}
     velocity: {x: 24.0, y: 0}
     boundaries:
-      x1: 10
+      position1: {x: 10, y: 12}
-      y1: 12
+      position2: {x: 20, y: 12}
-      x2: 20
-      y2: 12
     color: yellow
     flip: true
 
@@ -57,10 +54,8 @@ enemies:
     position: {x: 12, y: 6}
     velocity: {x: 36.0, y: 0}
     boundaries:
-      x1: 12
+      position1: {x: 12, y: 6}
-      y1: 6
+      position2: {x: 17, y: 6}
-      x2: 17
-      y2: 6
     color: white
     flip: true
 

data/room/10.yaml

@@ -1,6 +1,5 @@
 # TREE TOP
 room:
-  number: "10"
   name: "TREE TOP"
   bgColor: bright_black
   border: blue
@@ -9,16 +8,16 @@ room:
   # Room connections (null for no connection)
   connections:
     up: null
-    down: "09"
+    down: 09.yaml
     left: null
-    right: "11"
+    right: 11.yaml
 
   # Item display colors
   itemColor1: green
   itemColor2: red
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)

data/room/11.yaml

@@ -1,6 +1,5 @@
 # LAZY ROOM
 room:
-  number: "11"
   name: "LAZY ROOM"
   bgColor: black
   border: blue
@@ -10,15 +9,15 @@ room:
   connections:
     up: null
     down: null
-    left: "10"
+    left: 10.yaml
-    right: "12"
+    right: 12.yaml
 
   # Item display colors
   itemColor1: yellow
   itemColor2: magenta
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,50 +45,40 @@ enemies:
     position: {x: 7, y: 10}
     velocity: {x: 0, y: 0}
     boundaries:
-      x1: 7
+      position1: {x: 7, y: 10}
-      y1: 10
+      position2: {x: 7, y: 10}
-      x2: 7
-      y2: 10
     color: magenta
 
   - animation: lamp.yaml
     position: {x: 21, y: 10}
     velocity: {x: 0, y: 0}
     boundaries:
-      x1: 21
+      position1: {x: 21, y: 10}
-      y1: 10
+      position2: {x: 21, y: 10}
-      x2: 21
-      y2: 10
     color: magenta
 
   - animation: bin.yaml
     position: {x: 12, y: 14}
     velocity: {x: 48.0, y: 0}
     boundaries:
-      x1: 3
+      position1: {x: 3, y: 14}
-      y1: 14
+      position2: {x: 27, y: 14}
-      x2: 27
-      y2: 14
     color: green
 
   - animation: wave.yaml
     position: {x: 7, y: 6}
     velocity: {x: 30.0, y: 0}
     boundaries:
-      x1: 0
+      position1: {x: 0, y: 6}
-      y1: 6
+      position2: {x: 14, y: 6}
-      x2: 14
-      y2: 6
     color: green
 
   - animation: wave.yaml
     position: {x: 23, y: 6}
     velocity: {x: -30.0, y: 0}
     boundaries:
-      x1: 16
+      position1: {x: 16, y: 6}
-      y1: 6
+      position2: {x: 31, y: 6}
-      x2: 31
-      y2: 6
     color: green
 
 # No items in this room

data/room/12.yaml

@@ -1,6 +1,5 @@
 # THE PASSAGE
 room:
-  number: "12"
   name: "THE PASSAGE"
   bgColor: black
   border: green
@@ -10,15 +9,15 @@ room:
   connections:
     up: null
     down: null
-    left: "11"
+    left: 11.yaml
-    right: "13"
+    right: 13.yaml
 
   # Item display colors
   itemColor1: red
   itemColor2: magenta
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,20 +45,16 @@ enemies:
     position: {x: 9, y: 10}
     velocity: {x: 36.0, y: 0}
     boundaries:
-      x1: 4
+      position1: {x: 4, y: 10}
-      y1: 10
+      position2: {x: 22, y: 10}
-      x2: 22
-      y2: 10
     color: green
 
   - animation: floppy.yaml
     position: {x: 1, y: 0}
     velocity: {x: 0, y: 30.0}
     boundaries:
-      x1: 1
+      position1: {x: 1, y: 0}
-      y1: 0
+      position2: {x: 1, y: 7}
-      x2: 1
-      y2: 7
     color: yellow
 
 # Items in this room

data/room/13.yaml

@@ -1,6 +1,5 @@
 # TUNO KILLER
 room:
-  number: "13"
   name: "TUNO KILLER"
   bgColor: black
   border: blue
@@ -10,15 +9,15 @@ room:
   connections:
     up: null
     down: null
-    left: "12"
+    left: 12.yaml
-    right: "14"
+    right: 14.yaml
 
   # Item display colors
   itemColor1: yellow
   itemColor2: cyan
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,40 +45,32 @@ enemies:
     position: {x: 5, y: 1}
     velocity: {x: 0, y: 60.0}
     boundaries:
-      x1: 5
+      position1: {x: 5, y: 1}
-      y1: 1
+      position2: {x: 5, y: 13}
-      x2: 5
-      y2: 13
     color: bright_blue
 
   - animation: tuno.yaml
     position: {x: 12, y: 4}
     velocity: {x: 0, y: 66.0}
     boundaries:
-      x1: 12
+      position1: {x: 12, y: 1}
-      y1: 1
+      position2: {x: 12, y: 13}
-      x2: 12
-      y2: 13
     color: red
 
   - animation: tuno.yaml
     position: {x: 19, y: 7}
     velocity: {x: 0, y: 54.0}
     boundaries:
-      x1: 19
+      position1: {x: 19, y: 1}
-      y1: 1
+      position2: {x: 19, y: 13}
-      x2: 19
-      y2: 13
     color: yellow
 
   - animation: tuno.yaml
     position: {x: 26, y: 11}
     velocity: {x: 0, y: 42.0}
     boundaries:
-      x1: 26
+      position1: {x: 26, y: 1}
-      y1: 1
+      position2: {x: 26, y: 13}
-      x2: 26
-      y2: 13
     color: magenta
 
 # Items in this room

data/room/14.yaml

@@ -1,6 +1,5 @@
 # KILLING SPREE
 room:
-  number: "14"
   name: "KILLING SPREE"
   bgColor: black
   border: blue
@@ -9,16 +8,16 @@ room:
   # Room connections (null for no connection)
   connections:
     up: null
-    down: "15"
+    down: 15.yaml
-    left: "13"
+    left: 13.yaml
-    right: "45"
+    right: 45.yaml
 
   # Item display colors
   itemColor1: yellow
   itemColor2: cyan
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,30 +45,24 @@ enemies:
     position: {x: 6, y: 5}
     velocity: {x: 18.0, y: 0}
     boundaries:
-      x1: 5
+      position1: {x: 5, y: 5}
-      y1: 5
+      position2: {x: 10, y: 5}
-      x2: 10
-      y2: 5
     color: bright_green
 
   - animation: tuno.yaml
     position: {x: 21, y: 2}
     velocity: {x: 0, y: 24.0}
     boundaries:
-      x1: 21
+      position1: {x: 21, y: 2}
-      y1: 2
+      position2: {x: 21, y: 13}
-      x2: 21
-      y2: 13
     color: red
 
   - animation: tuno.yaml
     position: {x: 28, y: 6}
     velocity: {x: 0, y: -24.0}
     boundaries:
-      x1: 28
+      position1: {x: 28, y: 2}
-      y1: 2
+      position2: {x: 28, y: 13}
-      x2: 28
-      y2: 13
     color: magenta
 
 # Items in this room

data/room/15.yaml

@@ -1,6 +1,5 @@
 # NOW THIS IS THE BATCAVE!
 room:
-  number: "15"
   name: "NOW THIS IS THE BATCAVE!"
   bgColor: black
   border: black
@@ -8,8 +7,8 @@ room:
 
   # Room connections (null for no connection)
   connections:
-    up: "14"
+    up: 14.yaml
-    down: "06"
+    down: 06.yaml
     left: null
     right: null
 
@@ -18,7 +17,7 @@ room:
   itemColor2: red
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,10 +45,8 @@ enemies:
     position: {x: 17, y: 13}
     velocity: {x: 48.0, y: 0}
     boundaries:
-      x1: 7
+      position1: {x: 7, y: 13}
-      y1: 13
+      position2: {x: 29, y: 13}
-      x2: 29
-      y2: 13
     color: white
     flip: true
 
@@ -57,30 +54,24 @@ enemies:
     position: {x: 14, y: 2}
     velocity: {x: 30.0, y: 0}
     boundaries:
-      x1: 9
+      position1: {x: 9, y: 2}
-      y1: 2
+      position2: {x: 30, y: 2}
-      x2: 30
-      y2: 2
     color: bright_blue
 
   - animation: bat.yaml
     position: {x: 10, y: 10}
     velocity: {x: 30.0, y: 0}
     boundaries:
-      x1: 1
+      position1: {x: 1, y: 10}
-      y1: 10
+      position2: {x: 30, y: 10}
-      x2: 30
-      y2: 10
     color: cyan
 
   - animation: bat.yaml
     position: {x: 15, y: 1}
     velocity: {x: 0, y: 42.0}
     boundaries:
-      x1: 15
+      position1: {x: 15, y: 1}
-      y1: 1
+      position2: {x: 15, y: 11}
-      x2: 15
-      y2: 11
     color: red
 
 # Items in this room

data/room/16.yaml

@@ -1,6 +1,5 @@
 # THE FRIDGE
 room:
-  number: "16"
   name: "THE FRIDGE"
   bgColor: blue
   border: blue
@@ -8,17 +7,17 @@ room:
 
   # Room connections (null for no connection)
   connections:
-    up: "44"
+    up: 44.yaml
     down: null
-    left: "17"
+    left: 17.yaml
-    right: "08"
+    right: 08.yaml
 
   # Item display colors
   itemColor1: bright_cyan
   itemColor2: yellow
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,30 +45,24 @@ enemies:
     position: {x: 7, y: 3}
     velocity: {x: 60.0, y: 0}
     boundaries:
-      x1: 2
+      position1: {x: 2, y: 3}
-      y1: 3
+      position2: {x: 13, y: 3}
-      x2: 13
-      y2: 3
     color: magenta
 
   - animation: chip.yaml
     position: {x: 30, y: 7}
     velocity: {x: -48.0, y: 0}
     boundaries:
-      x1: 10
+      position1: {x: 10, y: 7}
-      y1: 7
+      position2: {x: 30, y: 7}
-      x2: 30
-      y2: 7
     color: bright_white
 
   - animation: wave.yaml
     position: {x: 15, y: 12}
     velocity: {x: 30.0, y: 0}
     boundaries:
-      x1: 15
+      position1: {x: 15, y: 12}
-      y1: 12
+      position2: {x: 30, y: 12}
-      x2: 30
-      y2: 12
     color: bright_magenta
 
 # Items in this room

data/room/17.yaml

@@ -1,6 +1,5 @@
 # I DID NOT COPY THIS ONE
 room:
-  number: "17"
   name: "I DID NOT COPY THIS ONE"
   bgColor: black
   border: magenta
@@ -9,16 +8,16 @@ room:
   # Room connections (null for no connection)
   connections:
     up: null
-    down: "18"
+    down: 18.yaml
-    left: "49"
+    left: 49.yaml
-    right: "16"
+    right: 16.yaml
 
   # Item display colors
   itemColor1: yellow
   itemColor2: red
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,30 +45,24 @@ enemies:
     position: {x: 5, y: 6}
     velocity: {x: 0, y: 24.0}
     boundaries:
-      x1: 5
+      position1: {x: 5, y: 4}
-      y1: 4
+      position2: {x: 5, y: 10}
-      x2: 5
-      y2: 10
     color: green
 
   - animation: floppy.yaml
     position: {x: 12, y: 3}
     velocity: {x: 0, y: 24.0}
     boundaries:
-      x1: 12
+      position1: {x: 12, y: 2}
-      y1: 2
+      position2: {x: 12, y: 9}
-      x2: 12
-      y2: 9
     color: cyan
 
   - animation: chip.yaml
     position: {x: 8, y: 13}
     velocity: {x: 24.0, y: 0}
     boundaries:
-      x1: 8
+      position1: {x: 8, y: 13}
-      y1: 13
+      position2: {x: 18, y: 13}
-      x2: 18
-      y2: 13
     color: yellow
 
 # Items in this room

data/room/18.yaml

@@ -1,6 +1,5 @@
 # MAKE MONEY
 room:
-  number: "18"
   name: "MAKE MONEY"
   bgColor: black
   border: yellow
@@ -8,9 +7,9 @@ room:
 
   # Room connections (null for no connection)
   connections:
-    up: "17"
+    up: 17.yaml
-    down: "54"
+    down: 54.yaml
-    left: "19"
+    left: 19.yaml
     right: null
 
   # Item display colors
@@ -18,7 +17,7 @@ room:
   itemColor2: bright_yellow
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: -1
+  autoSurface: left
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,30 +45,24 @@ enemies:
     position: {x: 19, y: 6}
     velocity: {x: 24.0, y: 0}
     boundaries:
-      x1: 18
+      position1: {x: 18, y: 6}
-      y1: 6
+      position2: {x: 29, y: 6}
-      x2: 29
-      y2: 6
     color: magenta
 
   - animation: spider.yaml
     position: {x: 14, y: 10}
     velocity: {x: 36.0, y: 0}
     boundaries:
-      x1: 14
+      position1: {x: 14, y: 10}
-      y1: 10
+      position2: {x: 28, y: 10}
-      x2: 28
-      y2: 10
     color: yellow
 
   - animation: spider.yaml
     position: {x: 23, y: 12}
     velocity: {x: 36.0, y: 0}
     boundaries:
-      x1: 23
+      position1: {x: 23, y: 12}
-      y1: 12
+      position2: {x: 28, y: 12}
-      x2: 28
-      y2: 12
     color: magenta
     mirror: true
 
@@ -77,20 +70,16 @@ enemies:
     position: {x: 19, y: 1}
     velocity: {x: 0, y: 0}
     boundaries:
-      x1: 19
+      position1: {x: 19, y: 1}
-      y1: 1
+      position2: {x: 19, y: 1}
-      x2: 19
-      y2: 1
     color: yellow
 
   - animation: lamp.yaml
     position: {x: 26, y: 1}
     velocity: {x: 0, y: 0}
     boundaries:
-      x1: 26
+      position1: {x: 26, y: 1}
-      y1: 1
+      position2: {x: 26, y: 1}
-      x2: 26
-      y2: 1
     color: yellow
 
 # Items in this room

data/room/19.yaml

@@ -1,6 +1,5 @@
 # THIS CAN'T BE THE BATCAVE
 room:
-  number: "19"
   name: "THIS CAN'T BE THE BATCAVE"
   bgColor: black
   border: cyan
@@ -10,15 +9,15 @@ room:
   connections:
     up: null
     down: null
-    left: "20"
+    left: 20.yaml
-    right: "18"
+    right: 18.yaml
 
   # Item display colors
   itemColor1: cyan
   itemColor2: blue
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,10 +45,8 @@ enemies:
     position: {x: 10, y: 13}
     velocity: {x: 48.0, y: 0}
     boundaries:
-      x1: 5
+      position1: {x: 5, y: 13}
-      y1: 13
+      position2: {x: 26, y: 13}
-      x2: 26
-      y2: 13
     color: bright_cyan
     flip: true
 
@@ -57,10 +54,8 @@ enemies:
     position: {x: 0, y: 1}
     velocity: {x: 36.0, y: 0}
     boundaries:
-      x1: 1
+      position1: {x: 1, y: 1}
-      y1: 1
+      position2: {x: 31, y: 1}
-      x2: 31
-      y2: 1
     color: cyan
     mirror: true
 

data/room/20.yaml

@@ -1,6 +1,5 @@
 # ENTRANCE TO THE VALLEY
 room:
-  number: "20"
   name: "ENTRANCE TO THE VALLEY"
   bgColor: black
   border: red
@@ -10,15 +9,15 @@ room:
   connections:
     up: null
     down: null
-    left: "21"
+    left: 21.yaml
-    right: "19"
+    right: 19.yaml
 
   # Item display colors
   itemColor1: magenta
   itemColor2: green
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,20 +45,16 @@ enemies:
     position: {x: 8, y: 12}
     velocity: {x: 60.0, y: 0}
     boundaries:
-      x1: 8
+      position1: {x: 8, y: 12}
-      y1: 12
+      position2: {x: 24, y: 12}
-      x2: 24
-      y2: 12
     color: green
 
   - animation: code.yaml
     position: {x: 13, y: 2}
     velocity: {x: 0, y: 30.0}
     boundaries:
-      x1: 13
+      position1: {x: 13, y: 2}
-      y1: 2
+      position2: {x: 13, y: 9}
-      x2: 13
-      y2: 9
     color: yellow
 
 # Items in this room

data/room/21.yaml

@@ -1,6 +1,5 @@
 # ENTER PAKU SIMBEL
 room:
-  number: "21"
   name: "ENTER PAKU SIMBEL"
   bgColor: bright_black
   border: yellow
@@ -8,17 +7,17 @@ room:
 
   # Room connections (null for no connection)
   connections:
-    up: "23"
+    up: 23.yaml
     down: null
-    left: "22"
+    left: 22.yaml
-    right: "20"
+    right: 20.yaml
 
   # Item display colors
   itemColor1: magenta
   itemColor2: yellow
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,10 +45,8 @@ enemies:
     position: {x: 13, y: 13}
     velocity: {x: 18.0, y: 0}
     boundaries:
-      x1: 9
+      position1: {x: 9, y: 13}
-      y1: 13
+      position2: {x: 18, y: 13}
-      x2: 18
-      y2: 13
     color: yellow
     flip: true
 
@@ -57,10 +54,8 @@ enemies:
     position: {x: 13, y: 9}
     velocity: {x: 36.0, y: 0}
     boundaries:
-      x1: 4
+      position1: {x: 4, y: 9}
-      y1: 9
+      position2: {x: 21, y: 9}
-      x2: 21
-      y2: 9
     color: bright_green
     flip: true
 

data/room/22.yaml

@@ -1,6 +1,5 @@
 # AEE REMAKE, PLEASE
 room:
-  number: "22"
   name: "AEE REMAKE, PLEASE"
   bgColor: bright_black
   border: yellow
@@ -11,14 +10,14 @@ room:
     up: null
     down: null
     left: null
-    right: "21"
+    right: 21.yaml
 
   # Item display colors
   itemColor1: yellow
   itemColor2: magenta
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,10 +45,8 @@ enemies:
     position: {x: 15, y: 13}
     velocity: {x: 18.0, y: 0}
     boundaries:
-      x1: 12
+      position1: {x: 12, y: 13}
-      y1: 13
+      position2: {x: 21, y: 13}
-      x2: 21
-      y2: 13
     color: yellow
     flip: true
 
@@ -57,10 +54,8 @@ enemies:
     position: {x: 13, y: 8}
     velocity: {x: 18.0, y: 0}
     boundaries:
-      x1: 13
+      position1: {x: 13, y: 8}
-      y1: 8
+      position2: {x: 19, y: 8}
-      x2: 19
-      y2: 8
     color: bright_yellow
     flip: true
 
@@ -68,10 +63,8 @@ enemies:
     position: {x: 22, y: 8}
     velocity: {x: 24.0, y: 0}
     boundaries:
-      x1: 22
+      position1: {x: 22, y: 8}
-      y1: 8
+      position2: {x: 28, y: 8}
-      x2: 28
-      y2: 8
     color: bright_yellow
     flip: true
 

data/room/23.yaml

@@ -1,6 +1,5 @@
 # INNER CHAMBER
 room:
-  number: "23"
   name: "INNER CHAMBER"
   bgColor: black
   border: bright_yellow
@@ -9,8 +8,8 @@ room:
   # Room connections (null for no connection)
   connections:
     up: null
-    down: "21"
+    down: 21.yaml
-    left: "24"
+    left: 24.yaml
     right: null
 
   # Item display colors
@@ -18,7 +17,7 @@ room:
   itemColor2: magenta
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,30 +45,24 @@ enemies:
     position: {x: 7, y: 7}
     velocity: {x: 0, y: 48.0}
     boundaries:
-      x1: 7
+      position1: {x: 7, y: 3}
-      y1: 3
+      position2: {x: 7, y: 14}
-      x2: 7
-      y2: 14
     color: magenta
 
   - animation: shock.yaml
     position: {x: 20, y: 10}
     velocity: {x: 0, y: 48.0}
     boundaries:
-      x1: 20
+      position1: {x: 20, y: 3}
-      y1: 3
+      position2: {x: 20, y: 14}
-      x2: 20
-      y2: 14
     color: magenta
 
   - animation: shock.yaml
     position: {x: 27, y: 10}
     velocity: {x: 0, y: -48.0}
     boundaries:
-      x1: 27
+      position1: {x: 27, y: 3}
-      y1: 3
+      position2: {x: 27, y: 14}
-      x2: 27
-      y2: 14
     color: magenta
 
 # Items in this room

data/room/24.yaml

@@ -1,6 +1,5 @@
 # PLAY IT AGAIN, SAM
 room:
-  number: "24"
   name: "PLAY IT AGAIN, SAM"
   bgColor: black
   border: bright_yellow
@@ -11,14 +10,14 @@ room:
     up: null
     down: null
     left: null
-    right: "23"
+    right: 23.yaml
 
   # Item display colors
   itemColor1: yellow
   itemColor2: magenta
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,30 +45,24 @@ enemies:
     position: {x: 4, y: 2}
     velocity: {x: 0, y: 0}
     boundaries:
-      x1: 4
+      position1: {x: 4, y: 2}
-      y1: 2
+      position2: {x: 4, y: 2}
-      x2: 4
-      y2: 2
     color: white
 
   - animation: shock.yaml
     position: {x: 5, y: 11}
     velocity: {x: 0, y: 30.0}
     boundaries:
-      x1: 5
+      position1: {x: 5, y: 11}
-      y1: 11
+      position2: {x: 5, y: 14}
-      x2: 5
-      y2: 14
     color: bright_green
 
   - animation: spider.yaml
     position: {x: 25, y: 1}
     velocity: {x: 0, y: 30.0}
     boundaries:
-      x1: 25
+      position1: {x: 25, y: 1}
-      y1: 1
+      position2: {x: 25, y: 10}
-      x2: 25
-      y2: 10
     color: bright_green
 
 # Items in this room

data/room/25.yaml

@@ -1,6 +1,5 @@
 # THE CHAPPEL
 room:
-  number: "25"
   name: "THE CHAPPEL"
   bgColor: blue
   border: yellow
@@ -10,15 +9,15 @@ room:
   connections:
     up: null
     down: null
-    left: "06"
+    left: 06.yaml
-    right: "26"
+    right: 26.yaml
 
   # Item display colors
   itemColor1: yellow
   itemColor2: cyan
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,60 +45,48 @@ enemies:
     position: {x: 28, y: 13}
     velocity: {x: 0, y: 0}
     boundaries:
-      x1: 28
+      position1: {x: 28, y: 13}
-      y1: 13
+      position2: {x: 28, y: 13}
-      x2: 28
-      y2: 13
     color: cyan
 
   - animation: bell.yaml
     position: {x: 28, y: 10}
     velocity: {x: 0, y: 0}
     boundaries:
-      x1: 28
+      position1: {x: 28, y: 10}
-      y1: 10
+      position2: {x: 28, y: 10}
-      x2: 28
-      y2: 10
     color: cyan
 
   - animation: bell.yaml
     position: {x: 6, y: 2}
     velocity: {x: 0, y: 0}
     boundaries:
-      x1: 6
+      position1: {x: 6, y: 2}
-      y1: 2
+      position2: {x: 6, y: 2}
-      x2: 6
-      y2: 2
     color: cyan
 
   - animation: dong.yaml
     position: {x: 6, y: 4}
     velocity: {x: 0, y: 24.0}
     boundaries:
-      x1: 6
+      position1: {x: 6, y: 4}
-      y1: 4
+      position2: {x: 6, y: 13}
-      x2: 6
-      y2: 13
     color: cyan
 
   - animation: bell.yaml
     position: {x: 20, y: 2}
     velocity: {x: 0, y: 0}
     boundaries:
-      x1: 20
+      position1: {x: 20, y: 2}
-      y1: 2
+      position2: {x: 20, y: 2}
-      x2: 20
-      y2: 2
     color: cyan
 
   - animation: dong.yaml
     position: {x: 20, y: 13}
     velocity: {x: 0, y: -30.0}
     boundaries:
-      x1: 20
+      position1: {x: 20, y: 4}
-      y1: 4
+      position2: {x: 20, y: 13}
-      x2: 20
-      y2: 13
     color: cyan
 
 # Items in this room

data/room/26.yaml

@@ -1,6 +1,5 @@
 # JINGLE BELLS
 room:
-  number: "26"
   name: "JINGLE BELLS"
   bgColor: blue
   border: yellow
@@ -10,15 +9,15 @@ room:
   connections:
     up: null
     down: null
-    left: "25"
+    left: 25.yaml
-    right: "27"
+    right: 27.yaml
 
   # Item display colors
   itemColor1: magenta
   itemColor2: red
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,80 +45,64 @@ enemies:
     position: {x: 1, y: 13}
     velocity: {x: 0, y: 0}
     boundaries:
-      x1: 1
+      position1: {x: 1, y: 13}
-      y1: 13
+      position2: {x: 1, y: 13}
-      x2: 1
-      y2: 13
     color: cyan
 
   - animation: abad_bell.yaml
     position: {x: 29, y: 13}
     velocity: {x: 0, y: 0}
     boundaries:
-      x1: 29
+      position1: {x: 29, y: 13}
-      y1: 13
+      position2: {x: 29, y: 13}
-      x2: 29
-      y2: 13
     color: cyan
 
   - animation: bell.yaml
     position: {x: 1, y: 4}
     velocity: {x: 36.0, y: 0}
     boundaries:
-      x1: 1
+      position1: {x: 1, y: 4}
-      y1: 4
+      position2: {x: 29, y: 4}
-      x2: 29
-      y2: 4
     color: yellow
 
   - animation: dong.yaml
     position: {x: 1, y: 2}
     velocity: {x: 0, y: 0}
     boundaries:
-      x1: 1
+      position1: {x: 1, y: 2}
-      y1: 2
+      position2: {x: 1, y: 2}
-      x2: 1
-      y2: 2
     color: yellow
 
   - animation: bell.yaml
     position: {x: 26, y: 7}
     velocity: {x: -36.0, y: 0}
     boundaries:
-      x1: 1
+      position1: {x: 1, y: 7}
-      y1: 7
+      position2: {x: 29, y: 7}
-      x2: 29
-      y2: 7
     color: yellow
 
   - animation: dong.yaml
     position: {x: 28, y: 2}
     velocity: {x: -0, y: 0}
     boundaries:
-      x1: 28
+      position1: {x: 28, y: 2}
-      y1: 2
+      position2: {x: 28, y: 2}
-      x2: 28
-      y2: 2
     color: yellow
 
   - animation: bell.yaml
     position: {x: 1, y: 10}
     velocity: {x: 36.0, y: 0}
     boundaries:
-      x1: 1
+      position1: {x: 1, y: 10}
-      y1: 10
+      position2: {x: 29, y: 10}
-      x2: 29
-      y2: 10
     color: yellow
 
   - animation: bell.yaml
     position: {x: 26, y: 13}
     velocity: {x: -36.0, y: 0}
     boundaries:
-      x1: 4
+      position1: {x: 4, y: 13}
-      y1: 13
+      position2: {x: 26, y: 13}
-      x2: 26
-      y2: 13
     color: yellow
 
 # Items in this room

data/room/27.yaml

@@ -1,6 +1,5 @@
 # THE BACKYARD
 room:
-  number: "27"
   name: "THE BACKYARD"
   bgColor: blue
   border: cyan
@@ -8,9 +7,9 @@ room:
 
   # Room connections (null for no connection)
   connections:
-    up: "28"
+    up: 28.yaml
-    down: "29"
+    down: 29.yaml
-    left: "26"
+    left: 26.yaml
     right: null
 
   # Item display colors
@@ -18,7 +17,7 @@ room:
   itemColor2: magenta
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)

data/room/28.yaml

@@ -1,6 +1,5 @@
 # YOU SHALL NOT PASS
 room:
-  number: "28"
   name: "YOU SHALL NOT PASS"
   bgColor: bright_black
   border: black
@@ -8,17 +7,17 @@ room:
 
   # Room connections (null for no connection)
   connections:
-    up: "32"
+    up: 32.yaml
-    down: "27"
+    down: 27.yaml
     left: null
-    right: "31"
+    right: 31.yaml
 
   # Item display colors
   itemColor1: bright_magenta
   itemColor2: bright_green
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,10 +45,8 @@ enemies:
     position: {x: 0, y: 5}
     velocity: {x: 0, y: 0}
     boundaries:
-      x1: 0
+      position1: {x: 0, y: 5}
-      y1: 5
+      position2: {x: 0, y: 5}
-      x2: 0
-      y2: 5
     color: yellow
 
 # Items in this room

data/room/29.yaml

@@ -1,6 +1,5 @@
 # QUO VOIDIS
 room:
-  number: "29"
   name: "QUO VOIDIS"
   bgColor: blue
   border: bright_black
@@ -8,9 +7,9 @@ room:
 
   # Room connections (null for no connection)
   connections:
-    up: "27"
+    up: 27.yaml
     down: null
-    left: "30"
+    left: 30.yaml
     right: null
 
   # Item display colors
@@ -18,7 +17,7 @@ room:
   itemColor2: magenta
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,40 +45,32 @@ enemies:
     position: {x: 7, y: 1}
     velocity: {x: 0, y: 48.0}
     boundaries:
-      x1: 7
+      position1: {x: 7, y: 1}
-      y1: 1
+      position2: {x: 7, y: 13}
-      x2: 7
-      y2: 13
     color: magenta
 
   - animation: qvoid.yaml
     position: {x: 12, y: 6}
     velocity: {x: 0, y: 36.0}
     boundaries:
-      x1: 12
+      position1: {x: 12, y: 1}
-      y1: 1
+      position2: {x: 12, y: 13}
-      x2: 12
-      y2: 13
     color: green
 
   - animation: qvoid.yaml
     position: {x: 17, y: 8}
     velocity: {x: 0, y: 54.0}
     boundaries:
-      x1: 17
+      position1: {x: 17, y: 1}
-      y1: 1
+      position2: {x: 17, y: 13}
-      x2: 17
-      y2: 13
     color: green
 
   - animation: qvoid.yaml
     position: {x: 22, y: 10}
     velocity: {x: 0, y: 42.0}
     boundaries:
-      x1: 22
+      position1: {x: 22, y: 1}
-      y1: 1
+      position2: {x: 22, y: 13}
-      x2: 22
-      y2: 13
     color: magenta
 
 # Items in this room

data/room/30.yaml

@@ -1,6 +1,5 @@
 # QVOID IS A JAILGAME!
 room:
-  number: "30"
   name: "QVOID IS A JAILGAME!"
   bgColor: blue
   border: bright_black
@@ -11,14 +10,14 @@ room:
     up: null
     down: null
     left: null
-    right: "29"
+    right: 29.yaml
 
   # Item display colors
   itemColor1: yellow
   itemColor2: magenta
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,10 +45,8 @@ enemies:
     position: {x: 1, y: 1}
     velocity: {x: 42.0, y: 0}
     boundaries:
-      x1: 1
+      position1: {x: 1, y: 1}
-      y1: 1
+      position2: {x: 29, y: 1}
-      x2: 29
-      y2: 1
     color: white
     flip: true
 
@@ -57,10 +54,8 @@ enemies:
     position: {x: 29, y: 1}
     velocity: {x: -42.0, y: 0}
     boundaries:
-      x1: 1
+      position1: {x: 1, y: 1}
-      y1: 1
+      position2: {x: 29, y: 1}
-      x2: 29
-      y2: 1
     color: red
     flip: true
 
@@ -68,10 +63,8 @@ enemies:
     position: {x: 6, y: 7}
     velocity: {x: -30.0, y: 0}
     boundaries:
-      x1: 1
+      position1: {x: 1, y: 7}
-      y1: 7
+      position2: {x: 27, y: 7}
-      x2: 27
-      y2: 7
     color: green
     flip: true
 

data/room/31.yaml

@@ -1,6 +1,5 @@
 # 256 COLORS
 room:
-  number: "31"
   name: "256 COLORS"
   bgColor: black
   border: bright_magenta
@@ -10,7 +9,7 @@ room:
   connections:
     up: null
     down: null
-    left: "28"
+    left: 28.yaml
     right: null
 
   # Item display colors
@@ -18,7 +17,7 @@ room:
   itemColor2: bright_cyan
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: -1
+  autoSurface: left
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,40 +45,32 @@ enemies:
     position: {x: 13, y: 5}
     velocity: {x: 0, y: 36.0}
     boundaries:
-      x1: 13
+      position1: {x: 13, y: 5}
-      y1: 5
+      position2: {x: 13, y: 13}
-      x2: 13
-      y2: 13
     color: magenta
 
   - animation: sigmasua.yaml
     position: {x: 24, y: 2}
     velocity: {x: 0, y: 36.0}
     boundaries:
-      x1: 24
+      position1: {x: 24, y: 2}
-      y1: 2
+      position2: {x: 24, y: 9}
-      x2: 24
-      y2: 9
     color: red
 
   - animation: paco.yaml
     position: {x: 6, y: 2}
     velocity: {x: 0, y: 36.0}
     boundaries:
-      x1: 6
+      position1: {x: 6, y: 2}
-      y1: 2
+      position2: {x: 6, y: 8}
-      x2: 6
-      y2: 8
     color: yellow
 
   - animation: chip.yaml
     position: {x: 15, y: 9}
     velocity: {x: 36.0, y: 0}
     boundaries:
-      x1: 15
+      position1: {x: 15, y: 9}
-      y1: 9
+      position2: {x: 23, y: 9}
-      x2: 23
-      y2: 9
     color: green
 
 # Items in this room

data/room/32.yaml

@@ -1,6 +1,5 @@
 # ...?
 room:
-  number: "32"
   name: "...?"
   bgColor: black
   border: cyan
@@ -8,17 +7,17 @@ room:
 
   # Room connections (null for no connection)
   connections:
-    up: "34"
+    up: 34.yaml
-    down: "28"
+    down: 28.yaml
     left: null
-    right: "33"
+    right: 33.yaml
 
   # Item display colors
   itemColor1: yellow
   itemColor2: magenta
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,20 +45,16 @@ enemies:
     position: {x: 23, y: 4}
     velocity: {x: 0, y: 24.0}
     boundaries:
-      x1: 23
+      position1: {x: 23, y: 4}
-      y1: 4
+      position2: {x: 23, y: 13}
-      x2: 23
-      y2: 13
     color: yellow
 
   - animation: shooting_star.yaml
     position: {x: 10, y: 2}
     velocity: {x: 0, y: 0}
     boundaries:
-      x1: 10
+      position1: {x: 10, y: 2}
-      y1: 2
+      position2: {x: 10, y: 2}
-      x2: 10
-      y2: 2
     color: white
     frame: 0
 

data/room/33.yaml

@@ -1,6 +1,5 @@
 # } WE ALL LOVE JAILGAMES }
 room:
-  number: "33"
   name: "} WE ALL LOVE JAILGAMES }"
   bgColor: black
   border: bright_black
@@ -10,7 +9,7 @@ room:
   connections:
     up: null
     down: null
-    left: "32"
+    left: 32.yaml
     right: null
 
   # Item display colors
@@ -18,7 +17,7 @@ room:
   itemColor2: bright_yellow
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,30 +45,24 @@ enemies:
     position: {x: 2, y: 2}
     velocity: {x: 0, y: 3.0}
     boundaries:
-      x1: 2
+      position1: {x: 2, y: 2}
-      y1: 2
+      position2: {x: 2, y: 3}
-      x2: 2
-      y2: 3
     color: white
 
   - animation: aerojailer.yaml
     position: {x: 14, y: 5}
     velocity: {x: 0, y: -2.4}
     boundaries:
-      x1: 14
+      position1: {x: 14, y: 4}
-      y1: 4
+      position2: {x: 14, y: 6}
-      x2: 14
-      y2: 6
     color: white
 
   - animation: arounder.yaml
     position: {x: 22, y: 5}
     velocity: {x: 0, y: 1.8}
     boundaries:
-      x1: 22
+      position1: {x: 22, y: 5}
-      y1: 5
+      position2: {x: 22, y: 6}
-      x2: 22
-      y2: 6
     color: white
 
 # Items in this room

data/room/34.yaml

@@ -1,6 +1,5 @@
 # ULA HOP!
 room:
-  number: "34"
   name: "ULA HOP!"
   bgColor: black
   border: cyan
@@ -9,8 +8,8 @@ room:
   # Room connections (null for no connection)
   connections:
     up: null
-    down: "32"
+    down: 32.yaml
-    left: "35"
+    left: 35.yaml
     right: null
 
   # Item display colors
@@ -18,7 +17,7 @@ room:
   itemColor2: red
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,30 +45,24 @@ enemies:
     position: {x: 20, y: 1}
     velocity: {x: 0, y: 48.0}
     boundaries:
-      x1: 20
+      position1: {x: 20, y: 1}
-      y1: 1
+      position2: {x: 20, y: 13}
-      x2: 20
-      y2: 13
     color: cyan
 
   - animation: spark.yaml
     position: {x: 11, y: 4}
     velocity: {x: 30.0, y: 0}
     boundaries:
-      x1: 11
+      position1: {x: 11, y: 4}
-      y1: 4
+      position2: {x: 18, y: 4}
-      x2: 18
-      y2: 4
     color: cyan
 
   - animation: spark.yaml
     position: {x: 1, y: 1}
     velocity: {x: 60.0, y: 0}
     boundaries:
-      x1: 1
+      position1: {x: 1, y: 1}
-      y1: 1
+      position2: {x: 29, y: 1}
-      x2: 29
-      y2: 1
     color: yellow
     mirror: true
 
@@ -77,20 +70,16 @@ enemies:
     position: {x: 1, y: 6}
     velocity: {x: 30.0, y: 0}
     boundaries:
-      x1: 1
+      position1: {x: 1, y: 6}
-      y1: 6
+      position2: {x: 10, y: 6}
-      x2: 10
-      y2: 6
     color: yellow
 
   - animation: wave.yaml
     position: {x: 17, y: 8}
     velocity: {x: 54.0, y: 0}
     boundaries:
-      x1: 17
+      position1: {x: 17, y: 8}
-      y1: 8
+      position2: {x: 29, y: 8}
-      x2: 29
-      y2: 8
     color: yellow
 
 # Items in this room

data/room/35.yaml

@@ -1,6 +1,5 @@
 # SILICON BOOBS
 room:
-  number: "35"
   name: "SILICON BOOBS"
   bgColor: black
   border: bright_green
@@ -10,15 +9,15 @@ room:
   connections:
     up: null
     down: null
-    left: "36"
+    left: 36.yaml
-    right: "34"
+    right: 34.yaml
 
   # Item display colors
   itemColor1: green
   itemColor2: red
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: -1
+  autoSurface: left
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,10 +45,8 @@ enemies:
     position: {x: 6, y: 13}
     velocity: {x: 30.0, y: 0}
     boundaries:
-      x1: 6
+      position1: {x: 6, y: 13}
-      y1: 13
+      position2: {x: 14, y: 13}
-      x2: 14
-      y2: 13
     color: yellow
     flip: true
 
@@ -57,10 +54,8 @@ enemies:
     position: {x: 16, y: 13}
     velocity: {x: 24.0, y: 0}
     boundaries:
-      x1: 16
+      position1: {x: 16, y: 13}
-      y1: 13
+      position2: {x: 28, y: 13}
-      x2: 28
-      y2: 13
     color: cyan
     flip: true
 
@@ -68,10 +63,8 @@ enemies:
     position: {x: 7, y: 9}
     velocity: {x: 36.0, y: 0}
     boundaries:
-      x1: 7
+      position1: {x: 7, y: 9}
-      y1: 9
+      position2: {x: 15, y: 9}
-      x2: 15
-      y2: 9
     color: red
     flip: true
 
@@ -79,10 +72,8 @@ enemies:
     position: {x: 16, y: 9}
     velocity: {x: 24.0, y: 0}
     boundaries:
-      x1: 16
+      position1: {x: 16, y: 9}
-      y1: 9
+      position2: {x: 27, y: 9}
-      x2: 27
-      y2: 9
     color: white
     flip: true
 
@@ -90,10 +81,8 @@ enemies:
     position: {x: 5, y: 5}
     velocity: {x: 30.0, y: 0}
     boundaries:
-      x1: 5
+      position1: {x: 5, y: 5}
-      y1: 5
+      position2: {x: 12, y: 5}
-      x2: 12
-      y2: 5
     color: green
     flip: true
 
@@ -101,10 +90,8 @@ enemies:
     position: {x: 16, y: 5}
     velocity: {x: 24.0, y: 0}
     boundaries:
-      x1: 16
+      position1: {x: 16, y: 5}
-      y1: 5
+      position2: {x: 26, y: 5}
-      x2: 26
-      y2: 5
     color: yellow
     flip: true
 

data/room/36.yaml

@@ -1,6 +1,5 @@
 # BE CAREFUL WITH THE FUSE
 room:
-  number: "36"
   name: "BE CAREFUL WITH THE FUSE"
   bgColor: black
   border: bright_cyan
@@ -10,15 +9,15 @@ room:
   connections:
     up: null
     down: null
-    left: "37"
+    left: 37.yaml
-    right: "35"
+    right: 35.yaml
 
   # Item display colors
   itemColor1: green
   itemColor2: red
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,30 +45,24 @@ enemies:
     position: {x: 6, y: 13}
     velocity: {x: 24.0, y: 0}
     boundaries:
-      x1: 2
+      position1: {x: 2, y: 13}
-      y1: 13
+      position2: {x: 14, y: 13}
-      x2: 14
-      y2: 13
     color: yellow
 
   - animation: spark.yaml
     position: {x: 21, y: 13}
     velocity: {x: 24.0, y: 0}
     boundaries:
-      x1: 17
+      position1: {x: 17, y: 13}
-      y1: 13
+      position2: {x: 29, y: 13}
-      x2: 29
-      y2: 13
     color: yellow
 
   - animation: spark.yaml
     position: {x: 2, y: 10}
     velocity: {x: 24.0, y: 0}
     boundaries:
-      x1: 2
+      position1: {x: 2, y: 10}
-      y1: 10
+      position2: {x: 14, y: 10}
-      x2: 14
-      y2: 10
     color: yellow
     mirror: true
 
@@ -77,10 +70,8 @@ enemies:
     position: {x: 17, y: 10}
     velocity: {x: 24.0, y: 0}
     boundaries:
-      x1: 17
+      position1: {x: 17, y: 10}
-      y1: 10
+      position2: {x: 29, y: 10}
-      x2: 29
-      y2: 10
     color: yellow
     mirror: true
 
@@ -88,60 +79,48 @@ enemies:
     position: {x: 13, y: 2}
     velocity: {x: 0, y: 24.0}
     boundaries:
-      x1: 13
+      position1: {x: 13, y: 2}
-      y1: 2
+      position2: {x: 13, y: 7}
-      x2: 13
-      y2: 7
     color: bright_yellow
 
   - animation: shock.yaml
     position: {x: 10, y: 4}
     velocity: {x: 0, y: 30.0}
     boundaries:
-      x1: 10
+      position1: {x: 10, y: 2}
-      y1: 2
+      position2: {x: 10, y: 7}
-      x2: 10
-      y2: 7
     color: bright_yellow
 
   - animation: shock.yaml
     position: {x: 7, y: 6}
     velocity: {x: 0, y: 36.0}
     boundaries:
-      x1: 7
+      position1: {x: 7, y: 2}
-      y1: 2
+      position2: {x: 7, y: 7}
-      x2: 7
-      y2: 7
     color: bright_yellow
 
   - animation: shock.yaml
     position: {x: 24, y: 2}
     velocity: {x: 0, y: 24.0}
     boundaries:
-      x1: 24
+      position1: {x: 24, y: 2}
-      y1: 2
+      position2: {x: 24, y: 7}
-      x2: 24
-      y2: 7
     color: bright_yellow
 
   - animation: shock.yaml
     position: {x: 21, y: 4}
     velocity: {x: 0, y: 30.0}
     boundaries:
-      x1: 21
+      position1: {x: 21, y: 2}
-      y1: 2
+      position2: {x: 21, y: 7}
-      x2: 21
-      y2: 7
     color: bright_yellow
 
   - animation: shock.yaml
     position: {x: 18, y: 6}
     velocity: {x: 0, y: 36.0}
     boundaries:
-      x1: 18
+      position1: {x: 18, y: 2}
-      y1: 2
+      position2: {x: 18, y: 7}
-      x2: 18
-      y2: 7
     color: bright_yellow
 
 # Items in this room

data/room/37.yaml

@@ -1,6 +1,5 @@
 # CHIP'N CHIP
 room:
-  number: "37"
   name: "CHIP'N CHIP"
   bgColor: black
   border: bright_green
@@ -10,15 +9,15 @@ room:
   connections:
     up: null
     down: null
-    left: "38"
+    left: 38.yaml
-    right: "36"
+    right: 36.yaml
 
   # Item display colors
   itemColor1: green
   itemColor2: red
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,50 +45,40 @@ enemies:
     position: {x: 15, y: 1}
     velocity: {x: 0, y: 18.0}
     boundaries:
-      x1: 15
+      position1: {x: 15, y: 1}
-      y1: 1
+      position2: {x: 15, y: 10}
-      x2: 15
-      y2: 10
     color: bright_green
 
   - animation: chip.yaml
     position: {x: 1, y: 8}
     velocity: {x: 18.0, y: 0}
     boundaries:
-      x1: 1
+      position1: {x: 1, y: 8}
-      y1: 8
+      position2: {x: 6, y: 8}
-      x2: 6
-      y2: 8
     color: bright_green
 
   - animation: chip.yaml
     position: {x: 28, y: 8}
     velocity: {x: 18.0, y: 0}
     boundaries:
-      x1: 25
+      position1: {x: 25, y: 8}
-      y1: 8
+      position2: {x: 30, y: 8}
-      x2: 30
-      y2: 8
     color: bright_green
 
   - animation: shock.yaml
     position: {x: 8, y: 1}
     velocity: {x: 0, y: 60.0}
     boundaries:
-      x1: 8
+      position1: {x: 8, y: 1}
-      y1: 1
+      position2: {x: 8, y: 14}
-      x2: 8
-      y2: 14
     color: bright_green
 
   - animation: shock.yaml
     position: {x: 23, y: 7}
     velocity: {x: 0, y: 60.0}
     boundaries:
-      x1: 23
+      position1: {x: 23, y: 1}
-      y1: 1
+      position2: {x: 23, y: 14}
-      x2: 23
-      y2: 14
     color: bright_green
 
 # Items in this room

data/room/38.yaml

@@ -1,6 +1,5 @@
 # THE FINAL CROSSOVER
 room:
-  number: "38"
   name: "THE FINAL CROSSOVER"
   bgColor: bright_black
   border: yellow
@@ -10,15 +9,15 @@ room:
   connections:
     up: null
     down: null
-    left: "39"
+    left: 39.yaml
-    right: "37"
+    right: 37.yaml
 
   # Item display colors
   itemColor1: yellow
   itemColor2: magenta
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,30 +45,24 @@ enemies:
     position: {x: 9, y: 11}
     velocity: {x: 0, y: 0}
     boundaries:
-      x1: 9
+      position1: {x: 9, y: 11}
-      y1: 11
+      position2: {x: 9, y: 11}
-      x2: 9
-      y2: 11
     color: white
 
   - animation: stopped_arounder.yaml
     position: {x: 18, y: 11}
     velocity: {x: 0, y: 0}
     boundaries:
-      x1: 18
+      position1: {x: 18, y: 11}
-      y1: 11
+      position2: {x: 18, y: 11}
-      x2: 18
-      y2: 11
     color: white
 
   - animation: walking_arounder.yaml
     position: {x: 12, y: 1}
     velocity: {x: 30.0, y: 0}
     boundaries:
-      x1: 11
+      position1: {x: 11, y: 1}
-      y1: 1
+      position2: {x: 16, y: 1}
-      x2: 16
-      y2: 1
     color: white
     flip: true
 
@@ -77,10 +70,8 @@ enemies:
     position: {x: 9, y: 0}
     velocity: {x: 0, y: 0}
     boundaries:
-      x1: 9
+      position1: {x: 9, y: 0}
-      y1: 0
+      position2: {x: 9, y: 0}
-      x2: 9
-      y2: 0
     color: yellow
     flip: true
 
@@ -88,10 +79,8 @@ enemies:
     position: {x: 3, y: 1}
     velocity: {x: 0, y: 42.0}
     boundaries:
-      x1: 3
+      position1: {x: 3, y: 1}
-      y1: 1
+      position2: {x: 3, y: 9}
-      x2: 3
-      y2: 9
     color: white
     flip: true
 
@@ -99,10 +88,8 @@ enemies:
     position: {x: 12, y: 10}
     velocity: {x: 12.0, y: 0}
     boundaries:
-      x1: 10
+      position1: {x: 10, y: 10}
-      y1: 10
+      position2: {x: 17, y: 10}
-      x2: 17
-      y2: 10
     color: bright_yellow
     flip: true
 

data/room/39.yaml

@@ -1,6 +1,5 @@
 # YOU'LL BELIEVE AROUNDER CAN FLY
 room:
-  number: "39"
   name: "YOU'LL BELIEVE AROUNDER CAN FLY"
   bgColor: black
   border: cyan
@@ -10,15 +9,15 @@ room:
   connections:
     up: null
     down: null
-    left: "40"
+    left: 40.yaml
-    right: "38"
+    right: 38.yaml
 
   # Item display colors
   itemColor1: magenta
   itemColor2: cyan
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,20 +45,16 @@ enemies:
     position: {x: 3, y: 1}
     velocity: {x: 0, y: 0}
     boundaries:
-      x1: 3
+      position1: {x: 3, y: 1}
-      y1: 1
+      position2: {x: 3, y: 1}
-      x2: 3
-      y2: 1
     color: white
 
   - animation: flying_arounder.yaml
     position: {x: 9, y: 1}
     velocity: {x: 0, y: 42.0}
     boundaries:
-      x1: 9
+      position1: {x: 9, y: 1}
-      y1: 1
+      position2: {x: 9, y: 10}
-      x2: 9
-      y2: 10
     color: white
     flip: true
 
@@ -67,10 +62,8 @@ enemies:
     position: {x: 15, y: 0}
     velocity: {x: 0, y: 42.0}
     boundaries:
-      x1: 15
+      position1: {x: 15, y: 0}
-      y1: 0
+      position2: {x: 15, y: 14}
-      x2: 15
-      y2: 14
     color: white
     flip: true
 
@@ -78,10 +71,8 @@ enemies:
     position: {x: 22, y: 10}
     velocity: {x: 0, y: 42.0}
     boundaries:
-      x1: 22
+      position1: {x: 22, y: 0}
-      y1: 0
+      position2: {x: 22, y: 14}
-      x2: 22
-      y2: 14
     color: white
     flip: true
 
@@ -89,10 +80,8 @@ enemies:
     position: {x: 16, y: 5}
     velocity: {x: 0, y: 42.0}
     boundaries:
-      x1: 16
+      position1: {x: 16, y: 0}
-      y1: 0
+      position2: {x: 16, y: 10}
-      x2: 16
-      y2: 10
     color: white
     flip: true
 

data/room/40.yaml

@@ -1,6 +1,5 @@
 # PREVENT THE CRISIS
 room:
-  number: "40"
   name: "PREVENT THE CRISIS"
   bgColor: black
   border: bright_magenta
@@ -10,15 +9,15 @@ room:
   connections:
     up: null
     down: null
-    left: "41"
+    left: 41.yaml
-    right: "39"
+    right: 39.yaml
 
   # Item display colors
   itemColor1: yellow
   itemColor2: magenta
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,20 +45,16 @@ enemies:
     position: {x: 7, y: 1}
     velocity: {x: 0, y: 0}
     boundaries:
-      x1: 7
+      position1: {x: 7, y: 1}
-      y1: 1
+      position2: {x: 7, y: 1}
-      x2: 7
-      y2: 1
     color: red
 
   - animation: walking_arounder.yaml
     position: {x: 10, y: 12}
     velocity: {x: 24.0, y: 0}
     boundaries:
-      x1: 7
+      position1: {x: 7, y: 12}
-      y1: 12
+      position2: {x: 26, y: 12}
-      x2: 26
-      y2: 12
     color: white
     flip: true
 
@@ -67,10 +62,8 @@ enemies:
     position: {x: 15, y: 12}
     velocity: {x: 24.0, y: 0}
     boundaries:
-      x1: 7
+      position1: {x: 7, y: 12}
-      y1: 12
+      position2: {x: 26, y: 12}
-      x2: 26
-      y2: 12
     color: green
     flip: true
 
@@ -78,10 +71,8 @@ enemies:
     position: {x: 20, y: 12}
     velocity: {x: 24.0, y: 0}
     boundaries:
-      x1: 7
+      position1: {x: 7, y: 12}
-      y1: 12
+      position2: {x: 26, y: 12}
-      x2: 26
-      y2: 12
     color: yellow
     flip: true
 
@@ -89,10 +80,8 @@ enemies:
     position: {x: 14, y: 2}
     velocity: {x: 24.0, y: 0}
     boundaries:
-      x1: 11
+      position1: {x: 11, y: 2}
-      y1: 2
+      position2: {x: 18, y: 2}
-      x2: 18
-      y2: 2
     color: cyan
     flip: true
 

data/room/41.yaml

@@ -1,6 +1,5 @@
 # AROUND WITH ME
 room:
-  number: "41"
   name: "AROUND WITH ME"
   bgColor: black
   border: blue
@@ -10,15 +9,15 @@ room:
   connections:
     up: null
     down: null
-    left: "42"
+    left: 42.yaml
-    right: "40"
+    right: 40.yaml
 
   # Item display colors
   itemColor1: yellow
   itemColor2: magenta
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,50 +45,40 @@ enemies:
     position: {x: 6, y: 2}
     velocity: {x: 0, y: 0}
     boundaries:
-      x1: 6
+      position1: {x: 6, y: 2}
-      y1: 2
+      position2: {x: 6, y: 2}
-      x2: 6
-      y2: 2
     color: bright_cyan
 
   - animation: stopped_arounder.yaml
     position: {x: 8, y: 12}
     velocity: {x: 0, y: 0}
     boundaries:
-      x1: 8
+      position1: {x: 8, y: 12}
-      y1: 12
+      position2: {x: 8, y: 12}
-      x2: 8
-      y2: 12
     color: bright_cyan
 
   - animation: stopped_arounder.yaml
     position: {x: 11, y: 3}
     velocity: {x: 0, y: 0}
     boundaries:
-      x1: 11
+      position1: {x: 11, y: 3}
-      y1: 3
+      position2: {x: 11, y: 3}
-      x2: 11
-      y2: 3
     color: bright_cyan
 
   - animation: stopped_arounder.yaml
     position: {x: 24, y: 12}
     velocity: {x: 0, y: 0}
     boundaries:
-      x1: 24
+      position1: {x: 24, y: 12}
-      y1: 12
+      position2: {x: 24, y: 12}
-      x2: 24
-      y2: 12
     color: bright_cyan
 
   - animation: walking_arounder.yaml
     position: {x: 12, y: 12}
     velocity: {x: 18.0, y: 0}
     boundaries:
-      x1: 9
+      position1: {x: 9, y: 12}
-      y1: 12
+      position2: {x: 23, y: 12}
-      x2: 23
-      y2: 12
     color: bright_cyan
     flip: true
 
@@ -97,10 +86,8 @@ enemies:
     position: {x: 14, y: 12}
     velocity: {x: -24.0, y: 0}
     boundaries:
-      x1: 9
+      position1: {x: 9, y: 12}
-      y1: 12
+      position2: {x: 23, y: 12}
-      x2: 23
-      y2: 12
     color: bright_cyan
     flip: true
 
@@ -108,10 +95,8 @@ enemies:
     position: {x: 14, y: 6}
     velocity: {x: -24.0, y: 0}
     boundaries:
-      x1: 12
+      position1: {x: 12, y: 6}
-      y1: 6
+      position2: {x: 20, y: 6}
-      x2: 20
-      y2: 6
     color: bright_cyan
     flip: true
 

data/room/42.yaml

@@ -1,6 +1,5 @@
 # P.A.C.O. ON THE GO
 room:
-  number: "42"
   name: "P.A.C.O. ON THE GO"
   bgColor: black
   border: blue
@@ -9,16 +8,16 @@ room:
   # Room connections (null for no connection)
   connections:
     up: null
-    down: "43"
+    down: 43.yaml
-    left: "53"
+    left: 53.yaml
-    right: "41"
+    right: 41.yaml
 
   # Item display colors
   itemColor1: magenta
   itemColor2: red
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,20 +45,16 @@ enemies:
     position: {x: 10, y: 2}
     velocity: {x: 0, y: 30.0}
     boundaries:
-      x1: 10
+      position1: {x: 10, y: 2}
-      y1: 2
+      position2: {x: 10, y: 11}
-      x2: 10
-      y2: 11
     color: magenta
 
   - animation: abad.yaml
     position: {x: 15, y: 13}
     velocity: {x: 48.0, y: 0}
     boundaries:
-      x1: 4
+      position1: {x: 4, y: 13}
-      y1: 13
+      position2: {x: 19, y: 13}
-      x2: 19
-      y2: 13
     color: bright_cyan
     flip: true
 

data/room/43.yaml

@@ -1,6 +1,5 @@
 # THE TUBE
 room:
-  number: "43"
   name: "THE TUBE"
   bgColor: black
   border: blue
@@ -8,8 +7,8 @@ room:
 
   # Room connections (null for no connection)
   connections:
-    up: "42"
+    up: 42.yaml
-    down: "44"
+    down: 44.yaml
     left: null
     right: null
 
@@ -18,7 +17,7 @@ room:
   itemColor2: red
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,20 +45,16 @@ enemies:
     position: {x: 20, y: 5}
     velocity: {x: 18.0, y: 0}
     boundaries:
-      x1: 20
+      position1: {x: 20, y: 5}
-      y1: 5
+      position2: {x: 23, y: 5}
-      x2: 23
-      y2: 5
     color: cyan
 
   - animation: spider.yaml
     position: {x: 22, y: 11}
     velocity: {x: 18.0, y: 0}
     boundaries:
-      x1: 20
+      position1: {x: 20, y: 11}
-      y1: 11
+      position2: {x: 23, y: 11}
-      x2: 23
-      y2: 11
     color: green
 
 # Items in this room

data/room/44.yaml

@@ -1,6 +1,5 @@
 # SANDWITCH AND COUNTER
 room:
-  number: "44"
   name: "SANDWITCH AND COUNTER"
   bgColor: black
   border: cyan
@@ -8,8 +7,8 @@ room:
 
   # Room connections (null for no connection)
   connections:
-    up: "43"
+    up: 43.yaml
-    down: "16"
+    down: 16.yaml
     left: null
     right: null
 
@@ -18,7 +17,7 @@ room:
   itemColor2: red
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,10 +45,8 @@ enemies:
     position: {x: 2, y: 4}
     velocity: {x: 30.0, y: 0}
     boundaries:
-      x1: 2
+      position1: {x: 2, y: 4}
-      y1: 4
+      position2: {x: 14, y: 4}
-      x2: 14
-      y2: 4
     color: green
     flip: true
 
@@ -57,10 +54,8 @@ enemies:
     position: {x: 23, y: 4}
     velocity: {x: 0, y: 48.0}
     boundaries:
-      x1: 23
+      position1: {x: 23, y: 4}
-      y1: 4
+      position2: {x: 23, y: 13}
-      x2: 23
-      y2: 13
     color: yellow
 
 # Items in this room

data/room/45.yaml

@@ -1,6 +1,5 @@
 # FEEL THE PRESSURE
 room:
-  number: "45"
   name: "FEEL THE PRESSURE"
   bgColor: bright_black
   border: bright_yellow
@@ -10,15 +9,15 @@ room:
   connections:
     up: null
     down: null
-    left: "14"
+    left: 14.yaml
-    right: "46"
+    right: 46.yaml
 
   # Item display colors
   itemColor1: yellow
   itemColor2: green
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,30 +45,24 @@ enemies:
     position: {x: 4, y: 5}
     velocity: {x: 0, y: 60.0}
     boundaries:
-      x1: 4
+      position1: {x: 4, y: 2}
-      y1: 2
+      position2: {x: 4, y: 13}
-      x2: 4
-      y2: 13
     color: green
 
   - animation: chip.yaml
     position: {x: 10, y: 4}
     velocity: {x: 0, y: 60.0}
     boundaries:
-      x1: 10
+      position1: {x: 10, y: 2}
-      y1: 2
+      position2: {x: 10, y: 13}
-      x2: 10
-      y2: 13
     color: bright_blue
 
   - animation: chip.yaml
     position: {x: 16, y: 3}
     velocity: {x: 0, y: 60.0}
     boundaries:
-      x1: 16
+      position1: {x: 16, y: 2}
-      y1: 2
+      position2: {x: 16, y: 13}
-      x2: 16
-      y2: 13
     color: magenta
 
 # Items in this room

data/room/46.yaml

@@ -1,6 +1,5 @@
 # FEEL THE HEAT
 room:
-  number: "46"
   name: "FEEL THE HEAT"
   bgColor: bright_black
   border: bright_yellow
@@ -10,7 +9,7 @@ room:
   connections:
     up: null
     down: null
-    left: "45"
+    left: 45.yaml
     right: null
 
   # Item display colors
@@ -18,7 +17,7 @@ room:
   itemColor2: magenta
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: -1
+  autoSurface: left
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,10 +45,8 @@ enemies:
     position: {x: 10, y: 13}
     velocity: {x: 78.0, y: 0}
     boundaries:
-      x1: 0
+      position1: {x: 0, y: 13}
-      y1: 13
+      position2: {x: 29, y: 13}
-      x2: 29
-      y2: 13
     color: cyan
     flip: true
 
@@ -57,20 +54,16 @@ enemies:
     position: {x: 11, y: 7}
     velocity: {x: 0, y: 30.0}
     boundaries:
-      x1: 11
+      position1: {x: 11, y: 1}
-      y1: 1
+      position2: {x: 11, y: 12}
-      x2: 11
-      y2: 12
     color: green
 
   - animation: heavy.yaml
     position: {x: 18, y: 2}
     velocity: {x: 0, y: 48.0}
     boundaries:
-      x1: 18
+      position1: {x: 18, y: 1}
-      y1: 1
+      position2: {x: 18, y: 12}
-      x2: 18
-      y2: 12
     color: green
 
 # Items in this room

data/room/47.yaml

@@ -1,6 +1,5 @@
 # THE BATTLE NEVER ENDS
 room:
-  number: "47"
   name: "THE BATTLE NEVER ENDS"
   bgColor: black
   border: white
@@ -8,9 +7,9 @@ room:
 
   # Room connections (null for no connection)
   connections:
-    up: "51"
+    up: 51.yaml
     down: null
-    left: "48"
+    left: 48.yaml
     right: null
 
   # Item display colors
@@ -18,7 +17,7 @@ room:
   itemColor2: yellow
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,10 +45,8 @@ enemies:
     position: {x: 10, y: 3}
     velocity: {x: 48.0, y: 0}
     boundaries:
-      x1: 3
+      position1: {x: 3, y: 3}
-      y1: 3
+      position2: {x: 27, y: 3}
-      x2: 27
-      y2: 3
     color: green
     flip: true
 
@@ -57,10 +54,8 @@ enemies:
     position: {x: 25, y: 4}
     velocity: {x: 0, y: 48.0}
     boundaries:
-      x1: 25
+      position1: {x: 25, y: 4}
-      y1: 4
+      position2: {x: 25, y: 10}
-      x2: 25
-      y2: 10
     color: yellow
     flip: true
 
@@ -68,10 +63,8 @@ enemies:
     position: {x: 7, y: 6}
     velocity: {x: 0, y: 30.0}
     boundaries:
-      x1: 7
+      position1: {x: 7, y: 6}
-      y1: 6
+      position2: {x: 7, y: 13}
-      x2: 7
-      y2: 13
     color: red
     flip: true
 
@@ -79,10 +72,8 @@ enemies:
     position: {x: 18, y: 13}
     velocity: {x: 30.0, y: 0}
     boundaries:
-      x1: 15
+      position1: {x: 15, y: 13}
-      y1: 13
+      position2: {x: 27, y: 13}
-      x2: 27
-      y2: 13
     color: cyan
     flip: true
 

data/room/48.yaml

@@ -1,6 +1,5 @@
 # WELCOME TO THE JAILBATTLE
 room:
-  number: "48"
   name: "WELCOME TO THE JAILBATTLE"
   bgColor: green
   border: bright_green
@@ -9,16 +8,16 @@ room:
   # Room connections (null for no connection)
   connections:
     up: null
-    down: "49"
+    down: 49.yaml
     left: null
-    right: "47"
+    right: 47.yaml
 
   # Item display colors
   itemColor1: white
   itemColor2: green
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,10 +45,8 @@ enemies:
     position: {x: 17, y: 6}
     velocity: {x: 30.0, y: 0}
     boundaries:
-      x1: 12
+      position1: {x: 12, y: 6}
-      y1: 6
+      position2: {x: 27, y: 6}
-      x2: 27
-      y2: 6
     color: white
     flip: true
 
@@ -57,10 +54,8 @@ enemies:
     position: {x: 2, y: 13}
     velocity: {x: 36.0, y: 0}
     boundaries:
-      x1: 2
+      position1: {x: 2, y: 13}
-      y1: 13
+      position2: {x: 16, y: 13}
-      x2: 16
-      y2: 13
     color: white
     flip: true
 
@@ -68,10 +63,8 @@ enemies:
     position: {x: 24, y: 10}
     velocity: {x: 0, y: 30.0}
     boundaries:
-      x1: 24
+      position1: {x: 24, y: 9}
-      y1: 9
+      position2: {x: 24, y: 13}
-      x2: 24
-      y2: 13
     color: white
     flip: true
 

data/room/49.yaml

@@ -1,6 +1,5 @@
 # WE NEED A ROBOT
 room:
-  number: "49"
   name: "WE NEED A ROBOT"
   bgColor: black
   border: red
@@ -8,17 +7,17 @@ room:
 
   # Room connections (null for no connection)
   connections:
-    up: "48"
+    up: 48.yaml
     down: null
-    left: "50"
+    left: 50.yaml
-    right: "17"
+    right: 17.yaml
 
   # Item display colors
   itemColor1: yellow
   itemColor2: magenta
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,10 +45,8 @@ enemies:
     position: {x: 10, y: 8}
     velocity: {x: 42.0, y: 0}
     boundaries:
-      x1: 1
+      position1: {x: 1, y: 8}
-      y1: 8
+      position2: {x: 29, y: 8}
-      x2: 29
-      y2: 8
     color: yellow
     flip: true
 

data/room/50.yaml

@@ -1,6 +1,5 @@
 # STORED JAILGAMES
 room:
-  number: "50"
   name: "STORED JAILGAMES"
   bgColor: black
   border: blue
@@ -11,14 +10,14 @@ room:
     up: null
     down: null
     left: null
-    right: "49"
+    right: 49.yaml
 
   # Item display colors
   itemColor1: yellow
   itemColor2: magenta
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,20 +45,16 @@ enemies:
     position: {x: 7, y: 2}
     velocity: {x: 0, y: 30.0}
     boundaries:
-      x1: 7
+      position1: {x: 7, y: 2}
-      y1: 2
+      position2: {x: 7, y: 12}
-      x2: 7
-      y2: 12
     color: magenta
 
   - animation: floppy.yaml
     position: {x: 20, y: 6}
     velocity: {x: 0, y: 30.0}
     boundaries:
-      x1: 20
+      position1: {x: 20, y: 2}
-      y1: 2
+      position2: {x: 20, y: 12}
-      x2: 20
-      y2: 12
     color: yellow
 
 # Items in this room

data/room/51.yaml

@@ -1,6 +1,5 @@
 # MINI ASCII
 room:
-  number: "51"
   name: "MINI ASCII"
   bgColor: black
   border: black
@@ -8,9 +7,9 @@ room:
 
   # Room connections (null for no connection)
   connections:
-    up: "53"
+    up: 53.yaml
-    down: "47"
+    down: 47.yaml
-    left: "52"
+    left: 52.yaml
     right: null
 
   # Item display colors
@@ -18,7 +17,7 @@ room:
   itemColor2: black
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,30 +45,24 @@ enemies:
     position: {x: 1, y: 6}
     velocity: {x: 72.0, y: 0}
     boundaries:
-      x1: 1
+      position1: {x: 1, y: 6}
-      y1: 6
+      position2: {x: 30, y: 6}
-      x2: 30
-      y2: 6
     color: white
 
   - animation: amstrad_cs.yaml
     position: {x: 19, y: 1}
     velocity: {x: 0, y: 72.0}
     boundaries:
-      x1: 19
+      position1: {x: 19, y: 1}
-      y1: 1
+      position2: {x: 19, y: 14}
-      x2: 19
-      y2: 14
     color: yellow
 
   - animation: amstrad_cs.yaml
     position: {x: 5, y: 6}
     velocity: {x: 0, y: 72.0}
     boundaries:
-      x1: 5
+      position1: {x: 5, y: 1}
-      y1: 1
+      position2: {x: 5, y: 12}
-      x2: 5
-      y2: 12
     color: green
 
 # Items in this room

data/room/52.yaml

@@ -1,6 +1,5 @@
 # BREAKOUT.LUA
 room:
-  number: "52"
   name: "BREAKOUT.LUA"
   bgColor: black
   border: black
@@ -11,14 +10,14 @@ room:
     up: null
     down: null
     left: null
-    right: "51"
+    right: 51.yaml
 
   # Item display colors
   itemColor1: bright_white
   itemColor2: black
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,10 +45,8 @@ enemies:
     position: {x: 1, y: 6}
     velocity: {x: 132.0, y: 0}
     boundaries:
-      x1: 1
+      position1: {x: 1, y: 6}
-      y1: 6
+      position2: {x: 22, y: 6}
-      x2: 22
-      y2: 6
     color: white
 
 # Items in this room

data/room/53.yaml

@@ -1,6 +1,5 @@
 # P.A.C.O. WORKSHOP
 room:
-  number: "53"
   name: "P.A.C.O. WORKSHOP"
   bgColor: black
   border: yellow
@@ -9,16 +8,16 @@ room:
   # Room connections (null for no connection)
   connections:
     up: null
-    down: "51"
+    down: 51.yaml
     left: null
-    right: "42"
+    right: 42.yaml
 
   # Item display colors
   itemColor1: magenta
   itemColor2: red
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,40 +45,32 @@ enemies:
     position: {x: 6, y: 6}
     velocity: {x: 18.0, y: 0}
     boundaries:
-      x1: 6
+      position1: {x: 6, y: 6}
-      y1: 6
+      position2: {x: 13, y: 6}
-      x2: 13
-      y2: 6
     color: yellow
 
   - animation: paco.yaml
     position: {x: 16, y: 2}
     velocity: {x: 0, y: 48.0}
     boundaries:
-      x1: 16
+      position1: {x: 16, y: 2}
-      y1: 2
+      position2: {x: 16, y: 13}
-      x2: 16
-      y2: 13
     color: bright_red
 
   - animation: wave.yaml
     position: {x: 1, y: 10}
     velocity: {x: 24.0, y: 0}
     boundaries:
-      x1: 1
+      position1: {x: 1, y: 10}
-      y1: 10
+      position2: {x: 14, y: 10}
-      x2: 14
-      y2: 10
     color: bright_yellow
 
   - animation: lamp.yaml
     position: {x: 22, y: 2}
     velocity: {x: 0, y: 0}
     boundaries:
-      x1: 22
+      position1: {x: 22, y: 2}
-      y1: 2
+      position2: {x: 22, y: 2}
-      x2: 22
-      y2: 2
     color: bright_yellow
 
 # Items in this room

data/room/54.yaml

@@ -1,6 +1,5 @@
 # THE BASEMENT
 room:
-  number: "54"
   name: "THE BASEMENT"
   bgColor: black
   border: blue
@@ -8,17 +7,17 @@ room:
 
   # Room connections (null for no connection)
   connections:
-    up: "18"
+    up: 18.yaml
     down: null
     left: null
-    right: "55"
+    right: 55.yaml
 
   # Item display colors
   itemColor1: yellow
   itemColor2: blue
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,30 +45,24 @@ enemies:
     position: {x: 2, y: 14}
     velocity: {x: 30.0, y: 0}
     boundaries:
-      x1: 2
+      position1: {x: 2, y: 14}
-      y1: 14
+      position2: {x: 18, y: 14}
-      x2: 18
-      y2: 14
     color: magenta
 
   - animation: spider.yaml
     position: {x: 10, y: 1}
     velocity: {x: 0, y: 60.0}
     boundaries:
-      x1: 10
+      position1: {x: 10, y: 1}
-      y1: 1
+      position2: {x: 10, y: 6}
-      x2: 10
-      y2: 6
     color: yellow
 
   - animation: spider.yaml
     position: {x: 7, y: 11}
     velocity: {x: 18.0, y: 0}
     boundaries:
-      x1: 7
+      position1: {x: 7, y: 11}
-      y1: 11
+      position2: {x: 14, y: 11}
-      x2: 14
-      y2: 11
     color: cyan
 
 # Items in this room

data/room/55.yaml

@@ -1,6 +1,5 @@
 # THAT'S A GUITAR
 room:
-  number: "55"
   name: "THAT'S A GUITAR"
   bgColor: black
   border: black
@@ -10,15 +9,15 @@ room:
   connections:
     up: null
     down: null
-    left: "54"
+    left: 54.yaml
-    right: "56"
+    right: 56.yaml
 
   # Item display colors
   itemColor1: magenta
   itemColor2: red
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: -1
+  autoSurface: left
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,20 +45,16 @@ enemies:
     position: {x: 15, y: 13}
     velocity: {x: 36.0, y: 0}
     boundaries:
-      x1: 9
+      position1: {x: 9, y: 13}
-      y1: 13
+      position2: {x: 25, y: 13}
-      x2: 25
-      y2: 13
     color: cyan
 
   - animation: guitar.yaml
     position: {x: 16, y: 4}
     velocity: {x: 0, y: 18.0}
     boundaries:
-      x1: 16
+      position1: {x: 16, y: 4}
-      y1: 4
+      position2: {x: 16, y: 10}
-      x2: 16
-      y2: 10
     color: red
 
 # Items in this room

data/room/56.yaml

@@ -1,6 +1,5 @@
 # HEAVY DEMONS ON LEGGINS
 room:
-  number: "56"
   name: "HEAVY DEMONS ON LEGGINS"
   bgColor: black
   border: black
@@ -10,15 +9,15 @@ room:
   connections:
     up: null
     down: null
-    left: "55"
+    left: 55.yaml
-    right: "57"
+    right: 57.yaml
 
   # Item display colors
   itemColor1: bright_red
   itemColor2: green
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: -1
+  autoSurface: left
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,20 +45,16 @@ enemies:
     position: {x: 12, y: 3}
     velocity: {x: 0, y: 30.0}
     boundaries:
-      x1: 12
+      position1: {x: 12, y: 3}
-      y1: 3
+      position2: {x: 12, y: 12}
-      x2: 12
-      y2: 12
     color: red
 
   - animation: demon.yaml
     position: {x: 18, y: 5}
     velocity: {x: 0, y: 30.0}
     boundaries:
-      x1: 18
+      position1: {x: 18, y: 3}
-      y1: 3
+      position2: {x: 18, y: 12}
-      x2: 18
-      y2: 12
     color: red
 
 # Items in this room

data/room/57.yaml

@@ -1,6 +1,5 @@
 # JAILGAMES GO TO HELL
 room:
-  number: "57"
   name: "JAILGAMES GO TO HELL"
   bgColor: red
   border: bright_red
@@ -10,15 +9,15 @@ room:
   connections:
     up: null
     down: null
-    left: "56"
+    left: 56.yaml
-    right: "58"
+    right: 58.yaml
 
   # Item display colors
   itemColor1: yellow
   itemColor2: green
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: -1
+  autoSurface: left
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,30 +45,24 @@ enemies:
     position: {x: 13, y: 12}
     velocity: {x: 54.0, y: 0}
     boundaries:
-      x1: 4
+      position1: {x: 4, y: 12}
-      y1: 12
+      position2: {x: 21, y: 12}
-      x2: 21
-      y2: 12
     color: green
 
   - animation: heavy.yaml
     position: {x: 17, y: 5}
     velocity: {x: 0, y: 36.0}
     boundaries:
-      x1: 17
+      position1: {x: 17, y: 2}
-      y1: 2
+      position2: {x: 17, y: 10}
-      x2: 17
-      y2: 10
     color: white
 
   - animation: heavy.yaml
     position: {x: 10, y: 8}
     velocity: {x: 0, y: 36.0}
     boundaries:
-      x1: 10
+      position1: {x: 10, y: 2}
-      y1: 2
+      position2: {x: 10, y: 10}
-      x2: 10
-      y2: 10
     color: yellow
 
 # Items in this room

data/room/58.yaml

@@ -1,6 +1,5 @@
 # CHIRPING
 room:
-  number: "58"
   name: "CHIRPING"
   bgColor: black
   border: magenta
@@ -10,15 +9,15 @@ room:
   connections:
     up: null
     down: null
-    left: "57"
+    left: 57.yaml
-    right: "59"
+    right: 59.yaml
 
   # Item display colors
   itemColor1: yellow
   itemColor2: magenta
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,30 +45,24 @@ enemies:
     position: {x: 4, y: 2}
     velocity: {x: 0, y: 30.0}
     boundaries:
-      x1: 4
+      position1: {x: 4, y: 2}
-      y1: 2
+      position2: {x: 4, y: 12}
-      x2: 4
-      y2: 12
     color: yellow
 
   - animation: bird.yaml
     position: {x: 9, y: 11}
     velocity: {x: 0, y: -30.0}
     boundaries:
-      x1: 9
+      position1: {x: 9, y: 0}
-      y1: 0
+      position2: {x: 9, y: 10}
-      x2: 9
-      y2: 10
     color: green
 
   - animation: bird.yaml
     position: {x: 26, y: 5}
     velocity: {x: 0, y: -30.0}
     boundaries:
-      x1: 26
+      position1: {x: 26, y: 2}
-      y1: 2
+      position2: {x: 26, y: 12}
-      x2: 26
-      y2: 12
     color: white
 
 # Items in this room

data/room/59.yaml

@@ -1,6 +1,5 @@
 # STATIC
 room:
-  number: "59"
   name: "STATIC"
   bgColor: black
   border: bright_magenta
@@ -8,9 +7,9 @@ room:
 
   # Room connections (null for no connection)
   connections:
-    up: "60"
+    up: 60.yaml
     down: null
-    left: "58"
+    left: 58.yaml
     right: null
 
   # Item display colors
@@ -18,7 +17,7 @@ room:
   itemColor2: magenta
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,30 +45,24 @@ enemies:
     position: {x: 1, y: 10}
     velocity: {x: 48.0, y: 0}
     boundaries:
-      x1: 1
+      position1: {x: 1, y: 10}
-      y1: 10
+      position2: {x: 30, y: 10}
-      x2: 30
-      y2: 10
     color: magenta
 
   - animation: wave.yaml
     position: {x: 30, y: 4}
     velocity: {x: -48.0, y: 0}
     boundaries:
-      x1: 1
+      position1: {x: 1, y: 4}
-      y1: 4
+      position2: {x: 30, y: 4}
-      x2: 30
-      y2: 4
     color: cyan
 
   - animation: wave.yaml
     position: {x: 15, y: 14}
     velocity: {x: -24.0, y: 0}
     boundaries:
-      x1: 3
+      position1: {x: 3, y: 14}
-      y1: 14
+      position2: {x: 30, y: 14}
-      x2: 30
-      y2: 14
     color: green
 
 # Items in this room

data/room/60.yaml

@@ -1,6 +1,5 @@
 # MAGNETIC FIELDS
 room:
-  number: "60"
   name: "MAGNETIC FIELDS"
   bgColor: black
   border: bright_red
@@ -8,8 +7,8 @@ room:
 
   # Room connections (null for no connection)
   connections:
-    up: "05"
+    up: 05.yaml
-    down: "59"
+    down: 59.yaml
     left: null
     right: null
 
@@ -18,7 +17,7 @@ room:
   itemColor2: green
 
   # Conveyor belt direction: left (-1), none (0), right (1)
-  autoSurface: 0
+  autoSurface: none
 
 # Tilemap: 16 rows × 32 columns (256×192 pixels @ 8px/tile)
 # Values are 0-based tile indices (0 = empty)
@@ -46,20 +45,16 @@ enemies:
     position: {x: 7, y: 2}
     velocity: {x: 0, y: 90.0}
     boundaries:
-      x1: 7
+      position1: {x: 7, y: 1}
-      y1: 1
+      position2: {x: 7, y: 14}
-      x2: 7
-      y2: 14
     color: yellow
 
   - animation: shock.yaml
     position: {x: 24, y: 6}
     velocity: {x: 0, y: -90.0}
     boundaries:
-      x1: 24
+      position1: {x: 24, y: 1}
-      y1: 1
+      position2: {x: 24, y: 14}
-      x2: 24
-      y2: 14
     color: yellow
 
 # Items in this room

source/game/gameplay/room_loader.cpp

@@ -8,15 +8,31 @@
 #include "utils/defines.hpp"                   // Para TILE_SIZE
 #include "utils/utils.hpp"                     // Para stringToColor
 
-// Convierte room connection de YAML a formato con extensión
+// Convierte room connection de YAML a formato interno
 auto RoomLoader::convertRoomConnection(const std::string& value) -> std::string {
     if (value == "null" || value.empty()) {
         return "0";
     }
-    // "02" → "02.yaml"
+    // Si ya tiene .yaml, devolverlo tal cual; si no, añadirlo
+    if (value.size() > 5 && value.substr(value.size() - 5) == ".yaml") {
+        return value;
+    }
     return value + ".yaml";
 }
 
+// Convierte string de autoSurface a int
+auto RoomLoader::convertAutoSurface(const fkyaml::node& node) -> int {
+    if (node.is_integer()) {
+        return node.get_value<int>();
+    }
+    if (node.is_string()) {
+        const std::string value = node.get_value<std::string>();
+        if (value == "left") return -1;
+        if (value == "right") return 1;
+    }
+    return 0;  // "none" o default
+}
+
 // Convierte un tilemap 2D a vector 1D flat
 auto RoomLoader::flattenTilemap(const std::vector<std::vector<int>>& tilemap_2d) -> std::vector<int> {
     std::vector<int> tilemap_flat;
@@ -114,9 +130,9 @@ auto RoomLoader::loadYAML(const std::string& file_path, bool verbose) -> Room::D
                 room.item_color2 = "magenta";
             }
 
-            // Conveyor belt direction
+            // Conveyor belt direction (puede ser int o string "left"/"none"/"right")
             if (room_node.contains("autoSurface")) {
-                room.conveyor_belt_direction = room_node["autoSurface"].get_value_or<int>(0);
+                room.conveyor_belt_direction = convertAutoSurface(room_node["autoSurface"]);
             } else {
                 room.conveyor_belt_direction = 0;
             }
@@ -186,8 +202,31 @@ auto RoomLoader::loadYAML(const std::string& file_path, bool verbose) -> Room::D
                 }
 
                 // Boundaries (in tiles, convert to pixels)
+                // Soporta formato nuevo (position1/position2) y antiguo (x1/y1/x2/y2)
                 if (enemy_node.contains("boundaries")) {
                     const auto& bounds = enemy_node["boundaries"];
+
+                    // Nuevo formato: position1 y position2
+                    if (bounds.contains("position1")) {
+                        const auto& pos1 = bounds["position1"];
+                        if (pos1.contains("x")) {
+                            enemy.x1 = pos1["x"].get_value<int>() * TILE_SIZE;
+                        }
+                        if (pos1.contains("y")) {
+                            enemy.y1 = pos1["y"].get_value<int>() * TILE_SIZE;
+                        }
+                    }
+                    if (bounds.contains("position2")) {
+                        const auto& pos2 = bounds["position2"];
+                        if (pos2.contains("x")) {
+                            enemy.x2 = pos2["x"].get_value<int>() * TILE_SIZE;
+                        }
+                        if (pos2.contains("y")) {
+                            enemy.y2 = pos2["y"].get_value<int>() * TILE_SIZE;
+                        }
+                    }
+
+                    // Formato antiguo: x1/y1/x2/y2 (compatibilidad)
                     if (bounds.contains("x1")) {
                         enemy.x1 = bounds["x1"].get_value<int>() * TILE_SIZE;
                     }

source/game/gameplay/room_loader.hpp

@@ -3,9 +3,10 @@
 #include <string>  // Para string
 #include <vector>  // Para vector
 
-#include "game/entities/enemy.hpp"  // Para Enemy::Data
+#include "external/fkyaml_node.hpp"  // Para fkyaml::node
-#include "game/entities/item.hpp"   // Para Item::Data
+#include "game/entities/enemy.hpp"   // Para Enemy::Data
-#include "game/gameplay/room.hpp"   // Para Room::Data
+#include "game/entities/item.hpp"    // Para Item::Data
+#include "game/gameplay/room.hpp"    // Para Room::Data
 
 /**
  * @brief Cargador de archivos de habitaciones en formato YAML
@@ -48,12 +49,19 @@ class RoomLoader {
 
     private:
         /**
-         * @brief Convierte room connection de YAML a formato con extensión
+         * @brief Convierte room connection de YAML a formato interno
-         * @param value Valor del YAML (null o "02")
+         * @param value Valor del YAML (vacío, "02" o "02.yaml")
-         * @return String con extensión YAML ("0" para null, "02.yaml" para "02")
+         * @return "0" para sin conexión, o nombre del archivo con extensión
          */
         static auto convertRoomConnection(const std::string& value) -> std::string;
 
+        /**
+         * @brief Convierte autoSurface de YAML a int
+         * @param node Nodo YAML (puede ser int o string "left"/"none"/"right")
+         * @return -1 para left, 0 para none, 1 para right
+         */
+        static auto convertAutoSurface(const fkyaml::node& node) -> int;
+
         /**
          * @brief Convierte un tilemap 2D a vector 1D flat
          * @param tilemap_2d Array 2D de tiles (16 rows × 32 cols)