11 files changed, 113 insertions, 93 deletions
diff --git a/data/rooms/intro/1005.yaml b/data/rooms/intro/1005.yaml
new file mode 100644
index 0000000..271870e
--- /dev/null
+++ b/data/rooms/intro/1005.yaml
@@ -0,0 +1,18 @@
+id: 1005
+name: 'Room #1005'
+color: ""
+description: []
+exits:
+  east:
+    room: 1006
+  north:
+    room: 1007
+  west:
+    room: 2001
+objects: []
+item_spawns: []
+mobs: []
+on_enter: []
+hazard: ""
+block_transport: false
+triggers: []
diff --git a/data/rooms/intro/1006.yaml b/data/rooms/intro/1006.yaml
new file mode 100644
index 0000000..3f8aa24
--- /dev/null
+++ b/data/rooms/intro/1006.yaml
@@ -0,0 +1,14 @@
+id: 1006
+name: 'Room #1006'
+color: ""
+description: []
+exits:
+  west:
+    room: 1005
+objects: []
+item_spawns: []
+mobs: []
+on_enter: []
+hazard: ""
+block_transport: false
+triggers: []
diff --git a/data/rooms/intro/1007.yaml b/data/rooms/intro/1007.yaml
new file mode 100644
index 0000000..bc05da9
--- /dev/null
+++ b/data/rooms/intro/1007.yaml
@@ -0,0 +1,18 @@
+id: 1007
+name: 'Room #1007'
+color: ""
+description: []
+exits:
+  east:
+    room: 1010
+  north:
+    room: 1008
+  south:
+    room: 1005
+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
new file mode 100644
index 0000000..d8dd6c9
--- /dev/null
+++ b/data/rooms/intro/1008.yaml
@@ -0,0 +1,16 @@
+id: 1008
+name: 'Room #1008'
+color: ""
+description: []
+exits:
+  east:
+    room: 1009
+  south:
+    room: 1007
+objects: []
+item_spawns: []
+mobs: []
+on_enter: []
+hazard: ""
+block_transport: false
+triggers: []
diff --git a/data/rooms/intro/1009.yaml b/data/rooms/intro/1009.yaml
new file mode 100644
index 0000000..f75cd82
--- /dev/null
+++ b/data/rooms/intro/1009.yaml
@@ -0,0 +1,20 @@
+id: 1009
+name: 'Room #1009'
+color: ""
+description: []
+exits:
+  south:
+    room: 1010
+  southwest:
+    room: 1007
+    hidden: true
+    always_blocked: true
+  west:
+    room: 1008
+objects: []
+item_spawns: []
+mobs: []
+on_enter: []
+hazard: ""
+block_transport: false
+triggers: []
diff --git a/data/rooms/intro/1010.yaml b/data/rooms/intro/1010.yaml
new file mode 100644
index 0000000..57610a4
--- /dev/null
+++ b/data/rooms/intro/1010.yaml
@@ -0,0 +1,16 @@
+id: 1010
+name: 'Room #1010'
+color: ""
+description: []
+exits:
+  north:
+    room: 1009
+  west:
+    room: 1007
+objects: []
+item_spawns: []
+mobs: []
+on_enter: []
+hazard: ""
+block_transport: false
+triggers: []
diff --git a/data/rooms/intro/2001.yaml b/data/rooms/intro/2001.yaml
index 0f56257..2cfcd83 100644
--- a/data/rooms/intro/2001.yaml
+++ b/data/rooms/intro/2001.yaml
@@ -1,18 +1,23 @@
-block_transport: false
+id: 2001
+name: Test Room
 color: ""
 description:
   - text: It's a test room
 exits:
   east:
-    room: 2002
+    room: 1005
   south:
     room: 2006
   southeast:
     room: 2005
   west:
     room: 1001
-hazard: ""
-id: 2001
+objects:
+  - name: hidden guy
+    hidden: true
+    description:
+      - text: YOU FOUND HIM
+  - id: tree
 item_spawns:
   - id: bronze_axe
     quantity: 1
@@ -25,12 +30,7 @@ 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
deleted file mode 100644
index cb7fc97..0000000
--- a/data/rooms/intro/2002.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-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
-hazard: solar_radiation
-id: 2002
-item_spawns: []
-mobs: []
-name: Test Room
-objects: []
-on_enter: []
-triggers: []
diff --git a/data/rooms/intro/2003.yaml b/data/rooms/intro/2003.yaml
deleted file mode 100644
index fa7855b..0000000
--- a/data/rooms/intro/2003.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-block_transport: false
-color: "31"
-description:
-  - text: It's a test room
-exits:
-  south:
-    room: 2004
-  southwest:
-    room: 2005
-  west:
-    room: 2002
-hazard: solar_radiation
-id: 2003
-item_spawns: []
-mobs: []
-name: Test Room
-objects: []
-on_enter: []
-triggers: []
diff --git a/data/rooms/intro/2004.yaml b/data/rooms/intro/2004.yaml
deleted file mode 100644
index 4426c98..0000000
--- a/data/rooms/intro/2004.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-block_transport: false
-color: "31"
-description:
-  - text: It's a test room
-exits:
-  north:
-    room: 2003
-  northwest:
-    room: 2002
-  west:
-    room: 2005
-hazard: solar_radiation
-id: 2004
-item_spawns: []
-mobs: []
-name: Test Room
-objects: []
-on_enter: []
-triggers: []
diff --git a/data/rooms/intro/2005.yaml b/data/rooms/intro/2005.yaml
deleted file mode 100644
index a5368c5..0000000
--- a/data/rooms/intro/2005.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-block_transport: false
-color: "31"
-description:
-  - text: It's a test room
-exits:
-  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: []
-triggers: []