6 files changed, 50 insertions, 45 deletions
diff --git a/data/rooms/intro/2001.yaml b/data/rooms/intro/2001.yaml
index eb7bd59..0f56257 100644
--- a/data/rooms/intro/2001.yaml
+++ b/data/rooms/intro/2001.yaml
@@ -1,5 +1,4 @@
-id: 2001
-name: Test Room
+block_transport: false
 color: ""
 description:
   - text: It's a test room
@@ -12,12 +11,8 @@ exits:
     room: 2005
   west:
     room: 1001
-objects:
-  - name: hidden guy
-    hidden: true
-    description:
-      - text: YOU FOUND HIM
-  - id: tree
+hazard: ""
+id: 2001
 item_spawns:
   - id: bronze_axe
     quantity: 1
@@ -30,7 +25,12 @@ item_spawns:
     respawn_ticks: 1
 mobs:
   - id: man
+name: Test Room
+objects:
+  - description:
+      - text: YOU FOUND HIM
+    hidden: true
+    name: hidden guy
+  - id: tree
 on_enter: []
-hazard: ""
-block_transport: false
 triggers: []
diff --git a/data/rooms/intro/2002.yaml b/data/rooms/intro/2002.yaml
index 2ac6ef1..cb7fc97 100644
--- a/data/rooms/intro/2002.yaml
+++ b/data/rooms/intro/2002.yaml
@@ -1,19 +1,21 @@
-id: 2002
-name: Test Room
-color: ""
+block_transport: false
+color: "31"
 description:
   - text: It's a test room
 exits:
   east:
     room: 2003
+  south:
+    room: 2005
   southeast:
     room: 2004
   west:
     room: 2001
-objects: []
+hazard: solar_radiation
+id: 2002
 item_spawns: []
 mobs: []
+name: Test Room
+objects: []
 on_enter: []
-hazard: ""
-block_transport: false
 triggers: []
diff --git a/data/rooms/intro/2003.yaml b/data/rooms/intro/2003.yaml
index 6ca12a1..fa7855b 100644
--- a/data/rooms/intro/2003.yaml
+++ b/data/rooms/intro/2003.yaml
@@ -1,6 +1,5 @@
-id: 2003
-name: Test Room
-color: A5
+block_transport: false
+color: "31"
 description:
   - text: It's a test room
 exits:
@@ -10,10 +9,11 @@ exits:
     room: 2005
   west:
     room: 2002
-objects: []
+hazard: solar_radiation
+id: 2003
 item_spawns: []
 mobs: []
+name: Test Room
+objects: []
 on_enter: []
-hazard: ""
-block_transport: false
 triggers: []
diff --git a/data/rooms/intro/2004.yaml b/data/rooms/intro/2004.yaml
index 73d912e..4426c98 100644
--- a/data/rooms/intro/2004.yaml
+++ b/data/rooms/intro/2004.yaml
@@ -1,6 +1,5 @@
-id: 2004
-name: Test Room
-color: ""
+block_transport: false
+color: "31"
 description:
   - text: It's a test room
 exits:
@@ -10,10 +9,11 @@ exits:
     room: 2002
   west:
     room: 2005
-objects: []
+hazard: solar_radiation
+id: 2004
 item_spawns: []
 mobs: []
+name: Test Room
+objects: []
 on_enter: []
-hazard: ""
-block_transport: false
 triggers: []
diff --git a/data/rooms/intro/2005.yaml b/data/rooms/intro/2005.yaml
index 7af3fd2..a5368c5 100644
--- a/data/rooms/intro/2005.yaml
+++ b/data/rooms/intro/2005.yaml
@@ -1,21 +1,23 @@
-id: 2005
-name: Test Room
-color: ""
+block_transport: false
+color: "31"
 description:
-    - text: It's a test room
+  - text: It's a test room
 exits:
-    east:
-        room: 2004
-    northeast:
-        room: 2003
-    northwest:
-        room: 2001
-    west:
-        room: 2006
-objects: []
+  east:
+    room: 2004
+  north:
+    room: 2002
+  northeast:
+    room: 2003
+  northwest:
+    room: 2001
+  west:
+    room: 2006
+hazard: solar_radiation
+id: 2005
 item_spawns: []
 mobs: []
+name: Test Room
+objects: []
 on_enter: []
-hazard: ""
-block_transport: false
 triggers: []
diff --git a/data/rooms/intro/2006.yaml b/data/rooms/intro/2006.yaml
index 7ab682f..993216c 100644
--- a/data/rooms/intro/2006.yaml
+++ b/data/rooms/intro/2006.yaml
@@ -1,8 +1,9 @@
-name: "Test Room"
+block_transport: false
 description:
-  - text: "It's a test room"
+  - text: It's a test room
 exits:
   east:
     room: 2005
   north:
     room: 2001
+name: Test Room