42 files changed, 31 insertions, 95 deletions

diff --git a/data/rooms/1001.yaml b/data/rooms/1001.yaml
deleted file mode 100644
index 6403b12..0000000
--- a/data/rooms/1001.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
-description:
-  - condition:
-      not: true
-      player_flag: 1002_intro_done
-    text: A large, circular, concrete landing pad sits in the middle of a blue ocean with a transport shuttle taking up nearly all of the walkable area. A crowd of perhaps a dozen people are shambling out of a squat, doorless building to the north. A sign above the entryway reads "Processing"
-  - text: A large, circular, concrete landing pad sits empty in the middle of a blue ocean that stretches to the horizon. North is a concrete path through a squat, doorless building with sign above the entryway reading "Processing"
-exits:
-  north:
-    blocked_message: A mass of people is still pouring out of the building!
-    condition:
-      player_flag: 1002_lined_up
-    room: 1003
-    set_player_flags:
-      1002_intro_done: true
-  up:
-    blocked_message: You have no ticket, or reason, to leave Vesta.
-    condition:
-      player_flag: always_false
-    room: 1001
-id: 123
-name: Landing Pad
-objects:
-  - aliases:
-      - line
-      - group
-      - passengers
-    description:
-      - condition:
-          all_of:
-            - not: true
-              player_flag: 1002_intro_done
-            - player_flag: 1002_lined_up
-        text: A mass of people still onto the crowded platform, blocking your exit!
-      - condition:
-          all_of:
-            - not: true
-              player_flag: 1002_intro_done
-            - not: true
-              player_flag: 1002_lined_up
-        text: A dozen or so passengers ready to leave, all with luggage. Their eyes are a mix of impatience, anxiety, and perhaps suspicion.
-    hidden: true
-    name: crowd of people
-  - aliases:
-      - shuttle
-      - ship
-    description:
-      - condition:
-          not: true
-          player_flag: 1002_intro_done
-        text: The small white craft has short, cute wings, a wide snub-nosed cockpit, and the rear hatch opened into a staircase. The low hum of its power plant vibrates the platform as it idles. You might guess it's a 95 ton Type-QS Passenger Shuttle. Just a guess though.
-    hidden: true
-    name: landing craft
-  - description:
-      - condition:
-          all_of:
-            - not: true
-              player_flag: 1002_intro_done
-            - player_flag: 1002_lined_up
-        text: The pilot stands straight as if about to escort royalty looking down his nose a bit at the passengers. He is quickly and professionally checking tickets.
-    hidden: true
-    name: pilot
-  - aliases:
-      - processing
-    description: A building with no door on this side that looks like a giant cup of tea spilled towards you. It's built from large chunks of gray rock that must've come from the surface of Vesta.
-    name: building
-  - description: The sign simply says 'Processing' in bold red letters. Beneath in smaller text it says 'Welcome to Vesta', seemingly added afterwards to try to give the sign some warmth.
-    name: sign
-on_enter:
-  - condition:
-      not: true
-      player_flag: 1002_lined_up
-    delay: 7
-    message: A young boy the crowd openly look you up and down a little bemused, as if you're heading the wrong direction.
-  - condition:
-      not: true
-      player_flag: 1002_lined_up
-    delay: 7
-    message: The pilot pops out of the hatch of the craft and calls out "Shuttle to Passenger Barge Denali. Tickets out, please! Nice and orderly!"
-  - condition:
-      not: true
-      player_flag: 1002_lined_up
-    delay: 7
-    message: The people all shuffle into a line, dragging their luggage out of the path to clear the way for you.
-    set_player_flags:
-      1002_lined_up: true
diff --git a/data/rooms/example_unused/agility/99999200.yaml b/data/rooms/example_unused/agility2/99999200.yaml
index 7397d5d..7397d5d 100644
--- a/data/rooms/example_unused/agility/99999200.yaml
+++ b/data/rooms/example_unused/agility2/99999200.yaml
diff --git a/data/rooms/example_unused/agility/99999201.yaml b/data/rooms/example_unused/agility2/99999201.yaml
index fcc25c1..fcc25c1 100644
--- a/data/rooms/example_unused/agility/99999201.yaml
+++ b/data/rooms/example_unused/agility2/99999201.yaml
diff --git a/data/rooms/example_unused/agility/99999202.yaml b/data/rooms/example_unused/agility2/99999202.yaml
index 7b4c6f9..7b4c6f9 100644
--- a/data/rooms/example_unused/agility/99999202.yaml
+++ b/data/rooms/example_unused/agility2/99999202.yaml
diff --git a/data/rooms/example_unused/agility/99999203.yaml b/data/rooms/example_unused/agility2/99999203.yaml
index f1d1a7f..f1d1a7f 100644
--- a/data/rooms/example_unused/agility/99999203.yaml
+++ b/data/rooms/example_unused/agility2/99999203.yaml
diff --git a/data/rooms/example_unused/agility/99999204.yaml b/data/rooms/example_unused/agility2/99999204.yaml
index 1555dbc..1555dbc 100644
--- a/data/rooms/example_unused/agility/99999204.yaml
+++ b/data/rooms/example_unused/agility2/99999204.yaml
diff --git a/data/rooms/example_unused/agility/99999205.yaml b/data/rooms/example_unused/agility2/99999205.yaml
index 2fc75c2..2fc75c2 100644
--- a/data/rooms/example_unused/agility/99999205.yaml
+++ b/data/rooms/example_unused/agility2/99999205.yaml
diff --git a/data/rooms/example_unused/agility/99999210.yaml b/data/rooms/example_unused/agility2/99999210.yaml
index de1d928..de1d928 100644
--- a/data/rooms/example_unused/agility/99999210.yaml
+++ b/data/rooms/example_unused/agility2/99999210.yaml
diff --git a/data/rooms/example_unused/agility/99999211.yaml b/data/rooms/example_unused/agility2/99999211.yaml
index 88fa6a9..88fa6a9 100644
--- a/data/rooms/example_unused/agility/99999211.yaml
+++ b/data/rooms/example_unused/agility2/99999211.yaml
diff --git a/data/rooms/example_unused/agility/99999212.yaml b/data/rooms/example_unused/agility2/99999212.yaml
index 2477956..2477956 100644
--- a/data/rooms/example_unused/agility/99999212.yaml
+++ b/data/rooms/example_unused/agility2/99999212.yaml
diff --git a/data/rooms/example_unused/agility/99999213.yaml b/data/rooms/example_unused/agility2/99999213.yaml
index 8918dbe..8918dbe 100644
--- a/data/rooms/example_unused/agility/99999213.yaml
+++ b/data/rooms/example_unused/agility2/99999213.yaml
diff --git a/data/rooms/example_unused/agility/99999214.yaml b/data/rooms/example_unused/agility2/99999214.yaml
index 13f759a..13f759a 100644
--- a/data/rooms/example_unused/agility/99999214.yaml
+++ b/data/rooms/example_unused/agility2/99999214.yaml
diff --git a/data/rooms/example_unused/agility/99999215.yaml b/data/rooms/example_unused/agility2/99999215.yaml
index 062d4a1..062d4a1 100644
--- a/data/rooms/example_unused/agility/99999215.yaml
+++ b/data/rooms/example_unused/agility2/99999215.yaml
diff --git a/data/rooms/example_unused/agility/99999220.yaml b/data/rooms/example_unused/agility2/99999220.yaml
index 7fa4b8d..7fa4b8d 100644
--- a/data/rooms/example_unused/agility/99999220.yaml
+++ b/data/rooms/example_unused/agility2/99999220.yaml
diff --git a/data/rooms/example_unused/agility/99999221.yaml b/data/rooms/example_unused/agility2/99999221.yaml
index 010bd44..010bd44 100644
--- a/data/rooms/example_unused/agility/99999221.yaml
+++ b/data/rooms/example_unused/agility2/99999221.yaml
diff --git a/data/rooms/example_unused/agility/99999222.yaml b/data/rooms/example_unused/agility2/99999222.yaml
index 0f8f4b9..0f8f4b9 100644
--- a/data/rooms/example_unused/agility/99999222.yaml
+++ b/data/rooms/example_unused/agility2/99999222.yaml
diff --git a/data/rooms/example_unused/agility/99999223.yaml b/data/rooms/example_unused/agility2/99999223.yaml
index 5eccf14..5eccf14 100644
--- a/data/rooms/example_unused/agility/99999223.yaml
+++ b/data/rooms/example_unused/agility2/99999223.yaml
diff --git a/data/rooms/example_unused/agility/99999224.yaml b/data/rooms/example_unused/agility2/99999224.yaml
index 274c425..274c425 100644
--- a/data/rooms/example_unused/agility/99999224.yaml
+++ b/data/rooms/example_unused/agility2/99999224.yaml
diff --git a/data/rooms/example_unused/agility/99999225.yaml b/data/rooms/example_unused/agility2/99999225.yaml
index e4aa70e..e4aa70e 100644
--- a/data/rooms/example_unused/agility/99999225.yaml
+++ b/data/rooms/example_unused/agility2/99999225.yaml
diff --git a/data/rooms/example_unused/agility/99999226.yaml b/data/rooms/example_unused/agility2/99999226.yaml
index 6c35e88..6c35e88 100644
--- a/data/rooms/example_unused/agility/99999226.yaml
+++ b/data/rooms/example_unused/agility2/99999226.yaml
diff --git a/data/rooms/example_unused/player_housing/99999300.yaml b/data/rooms/example_unused/player_housing/99999300.yaml
index 986d1dd..ae9cbf9 100644
--- a/data/rooms/example_unused/player_housing/99999300.yaml
+++ b/data/rooms/example_unused/player_housing/99999300.yaml
@@ -1,7 +1,16 @@
-name: "Player House: Entrance Hall"
-description: "A cozy entrance hall with polished floors and warm lighting. A welcome mat greets visitors at the door."
+id: 99999300
+name: 'Player House: Entrance Hall'
+color: ""
+description:
+  - text: A cozy entrance hall with polished floors and warm lighting. A welcome mat greets visitors at the door.
 exits:
-  south: 99999170
-  north: 99999301
+  north:
+    room: 99999301
 objects:
   - id: charging_station
+item_spawns: []
+mobs: []
+on_enter: []
+hazard: ""
+block_transport: false
+triggers: []
diff --git a/data/rooms/example_unused/underground/9999950.yaml b/data/rooms/example_unused/underground/9999950.yaml
deleted file mode 100644
index 8701533..0000000
--- a/data/rooms/example_unused/underground/9999950.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: "The Assassin's Den"
-description: "A dimly lit basement accessible through a trapdoor. Tactical maps and bounty posters line the walls. The air smells of gun oil and burnt ozone. {141}The Client{/} sits behind a reinforced desk."
-exits:
-  up: 9999931
-mobs:
-  - "client"
diff --git a/data/rooms/example_unused/underground2/9999950.yaml b/data/rooms/example_unused/underground2/9999950.yaml
new file mode 100644
index 0000000..3d01f72
--- /dev/null
+++ b/data/rooms/example_unused/underground2/9999950.yaml
@@ -0,0 +1,16 @@
+id: 9999950
+name: The Assassin's Den
+color: ""
+description:
+  - text: A dimly lit basement accessible through a trapdoor. Tactical maps and bounty posters line the walls. The air smells of gun oil and burnt ozone. {141}The Client{/} sits behind a reinforced desk.
+exits:
+  up:
+    room: 9999931
+objects: []
+item_spawns: []
+mobs:
+  - id: client
+on_enter: []
+hazard: ""
+block_transport: false
+triggers: []
diff --git a/data/rooms/example_unused/underground/9999951.yaml b/data/rooms/example_unused/underground2/9999951.yaml
index 9c7707a..9c7707a 100644
--- a/data/rooms/example_unused/underground/9999951.yaml
+++ b/data/rooms/example_unused/underground2/9999951.yaml
diff --git a/data/rooms/example_unused/underground/9999952.yaml b/data/rooms/example_unused/underground2/9999952.yaml
index 40c89a9..40c89a9 100644
--- a/data/rooms/example_unused/underground/9999952.yaml
+++ b/data/rooms/example_unused/underground2/9999952.yaml
diff --git a/data/rooms/example_unused/underground/9999953.yaml b/data/rooms/example_unused/underground2/9999953.yaml
index 4396cfb..4396cfb 100644
--- a/data/rooms/example_unused/underground/9999953.yaml
+++ b/data/rooms/example_unused/underground2/9999953.yaml
diff --git a/data/rooms/example_unused/underground/9999954.yaml b/data/rooms/example_unused/underground2/9999954.yaml
index 8348801..8348801 100644
--- a/data/rooms/example_unused/underground/9999954.yaml
+++ b/data/rooms/example_unused/underground2/9999954.yaml
diff --git a/data/rooms/example_unused/underground/9999955.yaml b/data/rooms/example_unused/underground2/9999955.yaml
index 2cce00a..2cce00a 100644
--- a/data/rooms/example_unused/underground/9999955.yaml
+++ b/data/rooms/example_unused/underground2/9999955.yaml
diff --git a/data/rooms/example_unused/underground/9999956.yaml b/data/rooms/example_unused/underground2/9999956.yaml
index b5996ae..b5996ae 100644
--- a/data/rooms/example_unused/underground/9999956.yaml
+++ b/data/rooms/example_unused/underground2/9999956.yaml
diff --git a/data/rooms/example_unused/underground/9999957.yaml b/data/rooms/example_unused/underground2/9999957.yaml
index be20359..be20359 100644
--- a/data/rooms/example_unused/underground/9999957.yaml
+++ b/data/rooms/example_unused/underground2/9999957.yaml
diff --git a/data/rooms/example_unused/underground/9999958.yaml b/data/rooms/example_unused/underground2/9999958.yaml
index 09bd869..09bd869 100644
--- a/data/rooms/example_unused/underground/9999958.yaml
+++ b/data/rooms/example_unused/underground2/9999958.yaml
diff --git a/data/rooms/example_unused/underground/9999959.yaml b/data/rooms/example_unused/underground2/9999959.yaml
index 29ca4fc..29ca4fc 100644
--- a/data/rooms/example_unused/underground/9999959.yaml
+++ b/data/rooms/example_unused/underground2/9999959.yaml
diff --git a/data/rooms/example_unused/underground/9999960.yaml b/data/rooms/example_unused/underground2/9999960.yaml
index 56cca24..56cca24 100644
--- a/data/rooms/example_unused/underground/9999960.yaml
+++ b/data/rooms/example_unused/underground2/9999960.yaml
diff --git a/data/rooms/example_unused/underground/9999961.yaml b/data/rooms/example_unused/underground2/9999961.yaml
index 2d1e75c..2d1e75c 100644
--- a/data/rooms/example_unused/underground/9999961.yaml
+++ b/data/rooms/example_unused/underground2/9999961.yaml
diff --git a/data/rooms/example_unused/underground/9999962.yaml b/data/rooms/example_unused/underground2/9999962.yaml
index b5b89c4..b5b89c4 100644
--- a/data/rooms/example_unused/underground/9999962.yaml
+++ b/data/rooms/example_unused/underground2/9999962.yaml
diff --git a/data/rooms/example_unused/underground/9999963.yaml b/data/rooms/example_unused/underground2/9999963.yaml
index fca468e..fca468e 100644
--- a/data/rooms/example_unused/underground/9999963.yaml
+++ b/data/rooms/example_unused/underground2/9999963.yaml
diff --git a/data/rooms/example_unused/underground/9999964.yaml b/data/rooms/example_unused/underground2/9999964.yaml
index 4e74383..4e74383 100644
--- a/data/rooms/example_unused/underground/9999964.yaml
+++ b/data/rooms/example_unused/underground2/9999964.yaml
diff --git a/data/rooms/example_unused/underground/9999965.yaml b/data/rooms/example_unused/underground2/9999965.yaml
index 424a4cd..424a4cd 100644
--- a/data/rooms/example_unused/underground/9999965.yaml
+++ b/data/rooms/example_unused/underground2/9999965.yaml
diff --git a/data/rooms/example_unused/underground/9999966.yaml b/data/rooms/example_unused/underground2/9999966.yaml
index a876453..a876453 100644
--- a/data/rooms/example_unused/underground/9999966.yaml
+++ b/data/rooms/example_unused/underground2/9999966.yaml
diff --git a/data/rooms/example_unused/underground/9999967.yaml b/data/rooms/example_unused/underground2/9999967.yaml
index 494fe9e..494fe9e 100644
--- a/data/rooms/example_unused/underground/9999967.yaml
+++ b/data/rooms/example_unused/underground2/9999967.yaml
diff --git a/data/rooms/example_unused/underground/9999968.yaml b/data/rooms/example_unused/underground2/9999968.yaml
index 6fe1aa0..6fe1aa0 100644
--- a/data/rooms/example_unused/underground/9999968.yaml
+++ b/data/rooms/example_unused/underground2/9999968.yaml
diff --git a/data/rooms/test222/1.yaml b/data/rooms/test222/1.yaml
new file mode 100644
index 0000000..e110b2e
--- /dev/null
+++ b/data/rooms/test222/1.yaml
@@ -0,0 +1,2 @@
+description: An empty room.
+name: New Room