feat: all admin mapping features working

15 files changed, 113 insertions, 98 deletions

diff --git a/data/rooms/intro/1001.yaml b/data/rooms/intro/1001.yaml
index 66e1908..98eebab 100644
--- a/data/rooms/intro/1001.yaml
+++ b/data/rooms/intro/1001.yaml
@@ -2,17 +2,10 @@ id: 1001
 name: Inside Transport Shuttle
 color: ""
 description:
-  - text: A dim, windowless shuttle interior with a few uncomfortable rows of steel seats facing forward. A large framed sign hangs next to the closed cockpit door. The piston-powered staircase is firmly closed at the rear of the craft.
-    condition:
-      flag: ""
-      value: null
-      not: true
-      player_flag: 1001_touchdown
-      has_item: ""
-      min_credits: 0
-      all_of: []
-      any_of: []
-  - text: A dim, windowless shuttle interior with a few uncomfortable rows of steel seats facing forward. A large {11}framed sign{/} hangs next to the closed cockpit door. A piston-powered staircase leads down out the back of the small craft with a smiling attendant ready to help disembark.
+  - text: |-
+      A dim, windowless shuttle interior with a few uncomfortable rows of steel seats facing forward. A large framed sign hangs next to the closed cockpit door. The piston-powered staircase is firmly closed at the rear of the craft.
+
+      A dim, windowless shuttle interior with a few uncomfortable rows of steel seats facing forward. A large {11}framed sign{/} hangs next to the closed cockpit door. A piston-powered staircase leads down out the back of the small craft with a smiling attendant ready to help disembark.
 exits:
   down:
     room: 1002
@@ -28,8 +21,6 @@ exits:
     blocked_message: The piston-powered staircase is firmly closed.
   east:
     room: 2001
-  up:
-    room: 6
 objects:
   - name: framed sign
     hidden: true
diff --git a/data/rooms/intro/1005.yaml b/data/rooms/intro/1005.yaml
index 21c6633..5d34027 100644
--- a/data/rooms/intro/1005.yaml
+++ b/data/rooms/intro/1005.yaml
@@ -1,6 +1,6 @@
 id: 1005
 name: New Room
-color: ""
+color: CC
 description:
   - text: A featureless room.
 exits:
@@ -10,8 +10,6 @@ exits:
     room: 1016
   south:
     room: 1006
-  southeast:
-    room: 1007
   southwest:
     room: 2003
   west:
diff --git a/data/rooms/intro/1006.yaml b/data/rooms/intro/1006.yaml
index e4929a9..4f8b9ef 100644
--- a/data/rooms/intro/1006.yaml
+++ b/data/rooms/intro/1006.yaml
@@ -1,21 +1,19 @@
 id: 1006
 name: New Room
-color: ""
+color: E2
 description:
-    - text: A featureless room.
+  - text: A featureless room.
 exits:
-    east:
-        room: 1007
-    north:
-        room: 1005
-    northeast:
-        room: 1009
-    northwest:
-        room: 1008
-    up:
-        room: 1010
-    west:
-        room: 2003
+  north:
+    room: 1005
+  northeast:
+    room: 1009
+  northwest:
+    room: 1008
+  up:
+    room: 1010
+  west:
+    room: 2003
 objects: []
 item_spawns: []
 mobs: []
diff --git a/data/rooms/intro/1007.yaml b/data/rooms/intro/1007.yaml
index 4af0a79..3f40bc1 100644
--- a/data/rooms/intro/1007.yaml
+++ b/data/rooms/intro/1007.yaml
@@ -1,19 +1,12 @@
 id: 1007
-name: New Room
+name: 'Room #1007'
 color: ""
-description:
-  - text: A featureless room.
+description: []
 exits:
-  down:
-    room: 12
-  northwest:
-    room: 1005
-  south:
-    room: 1014
-  up:
-    room: 11
+  east:
+    room: 1013
   west:
-    room: 1006
+    room: 2004
 objects: []
 item_spawns: []
 mobs: []
diff --git a/data/rooms/intro/1008.yaml b/data/rooms/intro/1008.yaml
index c3fab06..fe5956a 100644
--- a/data/rooms/intro/1008.yaml
+++ b/data/rooms/intro/1008.yaml
@@ -1,5 +1,5 @@
 block_transport: false
-color: "33"
+color: A9
 description:
   - text: A featureless room.
 exits:
diff --git a/data/rooms/intro/1009.yaml b/data/rooms/intro/1009.yaml
index 7a0886d..087a680 100644
--- a/data/rooms/intro/1009.yaml
+++ b/data/rooms/intro/1009.yaml
@@ -1,6 +1,5 @@
-id: 1009
-name: New Room
-color: ""
+block_transport: false
+color: "27"
 description:
   - text: A featureless room.
 exits:
@@ -12,10 +11,13 @@ exits:
     room: 1006
   west:
     room: 1005
-objects: []
+hazard: ""
+id: 1009
 item_spawns: []
-mobs: []
+mobs:
+  - id: man
+  - id: man
+name: New Room
+objects: []
 on_enter: []
-hazard: ""
-block_transport: false
 triggers: []
diff --git a/data/rooms/intro/1013.yaml b/data/rooms/intro/1013.yaml
index 8d83946..35e3757 100644
--- a/data/rooms/intro/1013.yaml
+++ b/data/rooms/intro/1013.yaml
@@ -1,17 +1,16 @@
-id: 1013
-name: New Room
-color: ""
-description:
-  - text: A featureless room.
+block_transport: false
+color: "72"
+description: []
 exits:
-  north:
+  northeast:
     room: 1014
-  south:
-    room: 1018
-objects: []
+  west:
+    room: 1007
+hazard: ""
+id: 1013
 item_spawns: []
 mobs: []
+name: 'Room #1013'
+objects: []
 on_enter: []
-hazard: ""
-block_transport: false
 triggers: []
diff --git a/data/rooms/intro/1014.yaml b/data/rooms/intro/1014.yaml
index ce76c4c..a11adfd 100644
--- a/data/rooms/intro/1014.yaml
+++ b/data/rooms/intro/1014.yaml
@@ -1,19 +1,16 @@
-id: 1014
-name: New Room
-color: ""
-description:
-  - text: A featureless room.
+block_transport: false
+color: D5
+description: []
 exits:
-  north:
-    room: 1007
-  south:
-    room: 1013
-  up:
+  northeast:
     room: 1015
-objects: []
+  southwest:
+    room: 1013
+hazard: ""
+id: 1014
 item_spawns: []
 mobs: []
+name: 'Room #1014'
+objects: []
 on_enter: []
-hazard: ""
-block_transport: false
 triggers: []
diff --git a/data/rooms/intro/1015.yaml b/data/rooms/intro/1015.yaml
new file mode 100644
index 0000000..eaec278
--- /dev/null
+++ b/data/rooms/intro/1015.yaml
@@ -0,0 +1,16 @@
+block_transport: false
+color: 0C
+description: []
+exits:
+  northwest:
+    room: 1018
+  southwest:
+    room: 1014
+hazard: ""
+id: 1015
+item_spawns: []
+mobs: []
+name: 'Room #1015'
+objects: []
+on_enter: []
+triggers: []
diff --git a/data/rooms/intro/1016.yaml b/data/rooms/intro/1016.yaml
index 3834f84..58eb906 100644
--- a/data/rooms/intro/1016.yaml
+++ b/data/rooms/intro/1016.yaml
@@ -6,6 +6,8 @@ description:
 exits:
   down:
     room: 1017
+  east:
+    room: 1018
   south:
     room: 1009
   southwest:
diff --git a/data/rooms/intro/1018.yaml b/data/rooms/intro/1018.yaml
index 38540b5..a696922 100644
--- a/data/rooms/intro/1018.yaml
+++ b/data/rooms/intro/1018.yaml
@@ -1,15 +1,16 @@
-id: 1018
-name: New Room
-color: ""
-description:
-  - text: A featureless room.
+block_transport: false
+color: D0
+description: []
 exits:
-  north:
-    room: 1013
-objects: []
+  southeast:
+    room: 1015
+  west:
+    room: 1016
+hazard: ""
+id: 1018
 item_spawns: []
 mobs: []
+name: 'Room #1018'
+objects: []
 on_enter: []
-hazard: ""
-block_transport: false
 triggers: []
diff --git a/data/rooms/intro/1019.yaml b/data/rooms/intro/1019.yaml
new file mode 100644
index 0000000..3ea9771
--- /dev/null
+++ b/data/rooms/intro/1019.yaml
@@ -0,0 +1,14 @@
+id: 1019
+name: 'Room #1019'
+color: ""
+description: []
+exits:
+  south:
+    room: 1020
+objects: []
+item_spawns: []
+mobs: []
+on_enter: []
+hazard: ""
+block_transport: false
+triggers: []
diff --git a/data/rooms/intro/1020.yaml b/data/rooms/intro/1020.yaml
new file mode 100644
index 0000000..256ea8b
--- /dev/null
+++ b/data/rooms/intro/1020.yaml
@@ -0,0 +1,4 @@
+exits:
+  north: 1019
+id: 1020
+name: 'Room #1020'
diff --git a/data/rooms/intro/2002.yaml b/data/rooms/intro/2002.yaml
index 744fbb2..2ac6ef1 100644
--- a/data/rooms/intro/2002.yaml
+++ b/data/rooms/intro/2002.yaml
@@ -1,21 +1,19 @@
-block_transport: false
+id: 2002
+name: Test Room
 color: ""
 description:
   - text: It's a test room
 exits:
   east:
     room: 2003
-  northwest:
-    room: 1
   southeast:
     room: 2004
   west:
     room: 2001
-hazard: ""
-id: 2002
+objects: []
 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 33b41f3..e90d370 100644
--- a/data/rooms/intro/2004.yaml
+++ b/data/rooms/intro/2004.yaml
@@ -2,14 +2,16 @@ id: 2004
 name: Test Room
 color: ""
 description:
-    - text: It's a test room
+  - text: It's a test room
 exits:
-    north:
-        room: 2003
-    northwest:
-        room: 2002
-    west:
-        room: 2005
+  east:
+    room: 1007
+  north:
+    room: 2003
+  northwest:
+    room: 2002
+  west:
+    room: 2005
 objects: []
 item_spawns: []
 mobs: []