20 files changed, 55 insertions, 161 deletions
diff --git a/data/rooms/example_unused/town/9999917.yaml b/data/rooms/example_unused/town/9999917.yaml
index 5980181..c3202ee 100644
--- a/data/rooms/example_unused/town/9999917.yaml
+++ b/data/rooms/example_unused/town/9999917.yaml
@@ -1,9 +1,19 @@
-name: "Bonfire"
-description: "A ring of stones surrounds a bed of ash. A few unlit logs wait nearby. A narrow passage leads north toward what sounds like echoing footsteps and clanging metal."
+id: 9999917
+name: Bonfire
+color: ""
+description:
+  - text: A ring of stones surrounds a bed of ash. A few unlit logs wait nearby. A narrow passage leads north toward what sounds like echoing footsteps and clanging metal.
 exits:
-  east: 9999918
-  west: 9999916
-  north: 99999200
+  east:
+    room: 9999918
+  west:
+    room: 9999916
+objects: []
+item_spawns: []
 mobs:
   - id: scrap_bot
   - id: scrap_bot
+on_enter: []
+hazard: ""
+block_transport: false
+triggers: []
diff --git a/data/rooms/example_unused/town/999997.yaml b/data/rooms/example_unused/town/999997.yaml
index aff9a6c..9bd30a5 100644
--- a/data/rooms/example_unused/town/999997.yaml
+++ b/data/rooms/example_unused/town/999997.yaml
@@ -1,8 +1,16 @@
-name: "Deep Mine"
-description: "A deeper mine shaft. Higher quality ores can be found here. This area is not yet accessible."
-exits:
-  south: 999996
+id: 999997
+name: Deep Mine
+color: ""
+description:
+  - text: A deeper mine shaft. Higher quality ores can be found here. This area is not yet accessible.
+exits: {}
+objects: []
+item_spawns: []
 mobs:
   - id: goblin
   - id: goblin
   - id: bandit
+on_enter: []
+hazard: ""
+block_transport: false
+triggers: []
diff --git a/data/rooms/intro/1.yaml b/data/rooms/intro/1.yaml
deleted file mode 100644
index fb1ba49..0000000
--- a/data/rooms/intro/1.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-id: 1
-name: 'Room #1'
-color: ""
-description: []
-exits:
-  northwest:
-    room: 2
-  southeast:
-    room: 2002
-objects: []
-item_spawns: []
-mobs: []
-on_enter: []
-hazard: ""
-block_transport: false
-triggers: []
diff --git a/data/rooms/intro/10.yaml b/data/rooms/intro/10.yaml
deleted file mode 100644
index a98b261..0000000
--- a/data/rooms/intro/10.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-id: 10
-name: 'Room #10'
-color: ""
-description: []
-exits: {}
-objects: []
-item_spawns: []
-mobs: []
-on_enter: []
-hazard: ""
-block_transport: false
-triggers: []
diff --git a/data/rooms/intro/1008.yaml b/data/rooms/intro/1008.yaml
index a7a8a2f..c3fab06 100644
--- a/data/rooms/intro/1008.yaml
+++ b/data/rooms/intro/1008.yaml
@@ -1,5 +1,5 @@
 block_transport: false
-color: 00FFFF
+color: "33"
 description:
   - text: A featureless room.
 exits:
diff --git a/data/rooms/intro/1010.yaml b/data/rooms/intro/1010.yaml
index ef09603..fca6471 100644
--- a/data/rooms/intro/1010.yaml
+++ b/data/rooms/intro/1010.yaml
@@ -2,14 +2,12 @@ id: 1010
 name: New Room
 color: ""
 description:
-    - text: A featureless room.
+  - text: A featureless room.
 exits:
-    down:
-        room: 1006
-    east:
-        room: 1013
-    north:
-        room: 1011
+  down:
+    room: 1006
+  north:
+    room: 1011
 objects: []
 item_spawns: []
 mobs: []
diff --git a/data/rooms/intro/1012.yaml b/data/rooms/intro/1012.yaml
index 20f6aa8..93fc6d1 100644
--- a/data/rooms/intro/1012.yaml
+++ b/data/rooms/intro/1012.yaml
@@ -3,9 +3,7 @@ name: New Room
 color: ""
 description:
   - text: A featureless room.
-exits:
-  south:
-    room: 1013
+exits: {}
 objects: []
 item_spawns: []
 mobs: []
diff --git a/data/rooms/intro/1013.yaml b/data/rooms/intro/1013.yaml
index 9b7a7ce..8d83946 100644
--- a/data/rooms/intro/1013.yaml
+++ b/data/rooms/intro/1013.yaml
@@ -2,12 +2,12 @@ id: 1013
 name: New Room
 color: ""
 description:
-    - text: A featureless room.
+  - text: A featureless room.
 exits:
-    north:
-        room: 1012
-    west:
-        room: 1010
+  north:
+    room: 1014
+  south:
+    room: 1018
 objects: []
 item_spawns: []
 mobs: []
diff --git a/data/rooms/intro/1014.yaml b/data/rooms/intro/1014.yaml
index 7d23484..ce76c4c 100644
--- a/data/rooms/intro/1014.yaml
+++ b/data/rooms/intro/1014.yaml
@@ -2,12 +2,14 @@ id: 1014
 name: New Room
 color: ""
 description:
-    - text: A featureless room.
+  - text: A featureless room.
 exits:
-    north:
-        room: 1007
-    up:
-        room: 1015
+  north:
+    room: 1007
+  south:
+    room: 1013
+  up:
+    room: 1015
 objects: []
 item_spawns: []
 mobs: []
diff --git a/data/rooms/intro/1016.yaml b/data/rooms/intro/1016.yaml
index 8023b39..3834f84 100644
--- a/data/rooms/intro/1016.yaml
+++ b/data/rooms/intro/1016.yaml
@@ -1,4 +1,5 @@
-block_transport: false
+id: 1016
+name: New Room
 color: "97"
 description:
   - text: A featureless room.
@@ -9,11 +10,10 @@ exits:
     room: 1009
   southwest:
     room: 1005
-hazard: ""
-id: 1016
+objects: []
 item_spawns: []
 mobs: []
-name: New Room
-objects: []
 on_enter: []
+hazard: ""
+block_transport: false
 triggers: []
diff --git a/data/rooms/intro/1018.yaml b/data/rooms/intro/1018.yaml
index 1309d65..38540b5 100644
--- a/data/rooms/intro/1018.yaml
+++ b/data/rooms/intro/1018.yaml
@@ -1,11 +1,11 @@
-id: 0
+id: 1018
 name: New Room
 color: ""
 description:
-    - text: A featureless room.
+  - text: A featureless room.
 exits:
-    northwest:
-        room: 1016
+  north:
+    room: 1013
 objects: []
 item_spawns: []
 mobs: []
diff --git a/data/rooms/intro/12.yaml b/data/rooms/intro/12.yaml
deleted file mode 100644
index 89bfe35..0000000
--- a/data/rooms/intro/12.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-exits:
-  up: 1007
-id: 12
-name: 'Room #12'
diff --git a/data/rooms/intro/2.yaml b/data/rooms/intro/2.yaml
deleted file mode 100644
index 37f7c70..0000000
--- a/data/rooms/intro/2.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-id: 2
-name: 'Room #2'
-color: ""
-description: []
-exits:
-  northeast:
-    room: 3
-  southeast:
-    room: 1
-objects: []
-item_spawns: []
-mobs: []
-on_enter: []
-hazard: ""
-block_transport: false
-triggers: []
diff --git a/data/rooms/intro/3.yaml b/data/rooms/intro/3.yaml
deleted file mode 100644
index 75a05c5..0000000
--- a/data/rooms/intro/3.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-block_transport: false
-color: ""
-description: []
-exits:
-  south:
-    room: 5
-  southeast:
-    room: 4
-  southwest:
-    room: 2
-hazard: ""
-id: 3
-item_spawns: []
-mobs: []
-name: 'Room #3'
-objects: []
-on_enter: []
-triggers: []
diff --git a/data/rooms/intro/4.yaml b/data/rooms/intro/4.yaml
deleted file mode 100644
index e7b81a8..0000000
--- a/data/rooms/intro/4.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-id: 4
-name: 'Room #4'
-color: ""
-description: []
-exits:
-  northwest:
-    room: 3
-  west:
-    room: 5
-objects: []
-item_spawns: []
-mobs: []
-on_enter: []
-hazard: ""
-block_transport: false
-triggers: []
diff --git a/data/rooms/intro/5.yaml b/data/rooms/intro/5.yaml
deleted file mode 100644
index 0e11af4..0000000
--- a/data/rooms/intro/5.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-exits:
-  east: 4
-  north:
-    room: 3
-id: 5
-name: 'Room #5'
diff --git a/data/rooms/intro/6.yaml b/data/rooms/intro/6.yaml
deleted file mode 100644
index 5f16cfc..0000000
--- a/data/rooms/intro/6.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-exits:
-  down: 1001
-id: 6
-name: 'Room #6'
diff --git a/data/rooms/intro/7.yaml b/data/rooms/intro/7.yaml
deleted file mode 100644
index 9c73429..0000000
--- a/data/rooms/intro/7.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-exits:
-  south: 1008
-id: 7
-name: 'Room #7'
diff --git a/data/rooms/intro/8.yaml b/data/rooms/intro/8.yaml
deleted file mode 100644
index 2edf88c..0000000
--- a/data/rooms/intro/8.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-id: 8
-name: 'Room #8'
-color: ""
-description: []
-exits:
-  southeast:
-    room: 1009
-objects: []
-item_spawns: []
-mobs: []
-on_enter: []
-hazard: ""
-block_transport: false
-triggers: []
diff --git a/data/rooms/intro/9.yaml b/data/rooms/intro/9.yaml
deleted file mode 100644
index 2476d76..0000000
--- a/data/rooms/intro/9.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-id: 9
-name: 'Room #9'
-color: ""
-description: []
-exits: {}
-objects: []
-item_spawns: []
-mobs: []
-on_enter: []
-hazard: ""
-block_transport: false
-triggers: []