refactor: simplify yaml, remove support for old scalar fields

37 files changed, 254 insertions, 152 deletions

diff --git a/data/rooms/example_unused/player_housing/99999301.yaml b/data/rooms/example_unused/player_housing/99999301.yaml
index 7341508..19a38e9 100644
--- a/data/rooms/example_unused/player_housing/99999301.yaml
+++ b/data/rooms/example_unused/player_housing/99999301.yaml
@@ -1,7 +1,9 @@
 name: "Player House: Workshop"
-description: "A well-lit workshop with a sturdy workbench covered in tools and blueprints. Wood shavings litter the floor around the bench."
+description:
+  - text: "A well-lit workshop with a sturdy workbench covered in tools and blueprints. Wood shavings litter the floor around the bench."
 exits:
-  south: 99999300
+  south:
+    room: 99999300
 objects:
   - id: workbench
   - id: bank_booth
diff --git a/data/rooms/example_unused/town/9999910.yaml b/data/rooms/example_unused/town/9999910.yaml
index 6c9614a..43bfbb5 100644
--- a/data/rooms/example_unused/town/9999910.yaml
+++ b/data/rooms/example_unused/town/9999910.yaml
@@ -1,8 +1,11 @@
 name: "Farming Plot"
-description: "A small patch of tilled soil behind a weathered fence. This area is not yet accessible."
+description:
+  - text: "A small patch of tilled soil behind a weathered fence. This area is not yet accessible."
 exits:
-  west: 999999
-  east: 9999911
+  west:
+    room: 999999
+  east:
+    room: 9999911
 mobs:
   - id: skeleton
   - id: skeleton
diff --git a/data/rooms/example_unused/town/9999912.yaml b/data/rooms/example_unused/town/9999912.yaml
index 60d55a2..0df117e 100644
--- a/data/rooms/example_unused/town/9999912.yaml
+++ b/data/rooms/example_unused/town/9999912.yaml
@@ -1,27 +1,30 @@
 name: "Forge"
-description: "A blazing forge and anvil dominate this smoky workshop. The heat from the furnace is intense."
+description:
+- text: "A blazing forge and anvil dominate this smoky workshop. The heat from the furnace is intense."
 exits:
-  east: 9999913
-  west: 9999911
+  east:
+    room: 9999913
+  west:
+    room: 9999911
 mobs:
-  - "weapons_smith"
+- id: weapons_smith
 objects:
-  - id: furnace
-  - id: anvil
-  - id: bank_booth
+- id: furnace
+- id: anvil
+- id: bank_booth
 item_spawns:
-  - id: copper_ore
-    quantity: 3
-    respawn_ticks: 30
-  - id: tin_ore
-    quantity: 3
-    respawn_ticks: 30
-  - id: iron_ore
-    quantity: 3
-    respawn_ticks: 30
-  - id: coal
-    quantity: 5
-    respawn_ticks: 30
-  - id: hammer
-    quantity: 1
-    respawn_ticks: 30
+- id: copper_ore
+  quantity: 3
+  respawn_ticks: 30
+- id: tin_ore
+  quantity: 3
+  respawn_ticks: 30
+- id: iron_ore
+  quantity: 3
+  respawn_ticks: 30
+- id: coal
+  quantity: 5
+  respawn_ticks: 30
+- id: hammer
+  quantity: 1
+  respawn_ticks: 30
diff --git a/data/rooms/example_unused/town/9999913.yaml b/data/rooms/example_unused/town/9999913.yaml
index 24339bf..318369c 100644
--- a/data/rooms/example_unused/town/9999913.yaml
+++ b/data/rooms/example_unused/town/9999913.yaml
@@ -1,8 +1,11 @@
 name: "Crafting Workshop"
-description: "A bustling workshop filled with crafting stations. A {130}spinning wheel{/} sits in one corner, a {173}pottery wheel{/} and {196}pottery oven{/} in another. Racks of tools and raw materials line the walls. The forge is just to the west."
+description:
+  - text: "A bustling workshop filled with crafting stations. A {130}spinning wheel{/} sits in one corner, a {173}pottery wheel{/} and {196}pottery oven{/} in another. Racks of tools and raw materials line the walls. The forge is just to the west."
 exits:
-  east: 9999914
-  west: 9999912
+  east:
+    room: 9999914
+  west:
+    room: 9999912
 objects:
   - id: spinning_wheel
   - id: pottery_wheel
diff --git a/data/rooms/example_unused/town/9999918.yaml b/data/rooms/example_unused/town/9999918.yaml
index 1afdc73..31e81bc 100644
--- a/data/rooms/example_unused/town/9999918.yaml
+++ b/data/rooms/example_unused/town/9999918.yaml
@@ -1,5 +1,8 @@
 name: "Thieves' Den"
-description: "A shadowy hideout with lockpicks, dark cloaks, and wanted posters on the walls. This area is not yet accessible."
+description:
+  - text: "A shadowy hideout with lockpicks, dark cloaks, and wanted posters on the walls. This area is not yet accessible."
 exits:
-  east: 9999919
-  west: 9999917
+  east:
+    room: 9999919
+  west:
+    room: 9999917
diff --git a/data/rooms/example_unused/town/9999919.yaml b/data/rooms/example_unused/town/9999919.yaml
index 2b199ef..a25b884 100644
--- a/data/rooms/example_unused/town/9999919.yaml
+++ b/data/rooms/example_unused/town/9999919.yaml
@@ -1,5 +1,8 @@
 name: "Agility Course"
-description: "A training ground with balance beams, monkey bars, and climbing nets. This area is not yet accessible."
+description:
+  - text: "A training ground with balance beams, monkey bars, and climbing nets. This area is not yet accessible."
 exits:
-  east: 9999920
-  west: 9999918
+  east:
+    room: 9999920
+  west:
+    room: 9999918
diff --git a/data/rooms/example_unused/town/999992.yaml b/data/rooms/example_unused/town/999992.yaml
index f37ec6a..3ac13a1 100644
--- a/data/rooms/example_unused/town/999992.yaml
+++ b/data/rooms/example_unused/town/999992.yaml
@@ -1,9 +1,13 @@
 name: "Fishing Spot"
-description: "A quiet spot along the riverbank. The water is clear and fish can be seen swimming beneath the surface. You can cast a line here with a fishing rod and bait."
+description:
+  - text: "A quiet spot along the riverbank. The water is clear and fish can be seen swimming beneath the surface. You can cast a line here with a fishing rod and bait."
 exits:
-  east: 999994
-  north: 999993
-  west: 999991
+  east:
+    room: 999994
+  north:
+    room: 999993
+  west:
+    room: 999991
 objects:
   - id: bait_fishing_spot
 item_spawns:
diff --git a/data/rooms/example_unused/town/9999920.yaml b/data/rooms/example_unused/town/9999920.yaml
index f097b04..67ad606 100644
--- a/data/rooms/example_unused/town/9999920.yaml
+++ b/data/rooms/example_unused/town/9999920.yaml
@@ -1,5 +1,8 @@
 name: "Assassin's Bureau"
-description: "A discreet office with job postings pinned to a corkboard. This area is not yet accessible."
+description:
+  - text: "A discreet office with job postings pinned to a corkboard. This area is not yet accessible."
 exits:
-  east: 9999921
-  west: 9999919
+  east:
+    room: 9999921
+  west:
+    room: 9999919
diff --git a/data/rooms/example_unused/town/9999921.yaml b/data/rooms/example_unused/town/9999921.yaml
index 5d7b270..d1b1739 100644
--- a/data/rooms/example_unused/town/9999921.yaml
+++ b/data/rooms/example_unused/town/9999921.yaml
@@ -1,7 +1,9 @@
 name: "Combat Arena"
-description: "A sandy training ground with practice dummies and sparring rings. Several men wander here looking for a fight."
+description:
+  - text: "A sandy training ground with practice dummies and sparring rings. Several men wander here looking for a fight."
 exits:
-  west: 9999920
+  west:
+    room: 9999920
 mobs:
   - id: man
     wander_interval: 10
diff --git a/data/rooms/example_unused/town/9999922.yaml b/data/rooms/example_unused/town/9999922.yaml
index 7084650..90683bb 100644
--- a/data/rooms/example_unused/town/9999922.yaml
+++ b/data/rooms/example_unused/town/9999922.yaml
@@ -1,5 +1,8 @@
 name: "West of Town Square"
-description: ""
+description:
+  - text: ""
 exits:
-  east: 999991
-  west: 9999923
+  east:
+    room: 999991
+  west:
+    room: 9999923
diff --git a/data/rooms/example_unused/town/9999923.yaml b/data/rooms/example_unused/town/9999923.yaml
index 95f8b2f..83613d2 100644
--- a/data/rooms/example_unused/town/9999923.yaml
+++ b/data/rooms/example_unused/town/9999923.yaml
@@ -1,5 +1,8 @@
 name: "West of West of Town Square"
-description: "Here is a description of where we are!"
+description:
+  - text: "Here is a description of where we are!"
 exits:
-  east: 9999922
-  south: 9999924
+  east:
+    room: 9999922
+  south:
+    room: 9999924
diff --git a/data/rooms/example_unused/town/9999924.yaml b/data/rooms/example_unused/town/9999924.yaml
index 78ce26f..7d6e175 100644
--- a/data/rooms/example_unused/town/9999924.yaml
+++ b/data/rooms/example_unused/town/9999924.yaml
@@ -1,5 +1,8 @@
 name: "South of West of West of Town Square"
-description: "Here is a description of where we are!"
+description:
+  - text: "Here is a description of where we are!"
 exits:
-  north: 9999923
-  east: 9999925
+  north:
+    room: 9999923
+  east:
+    room: 9999925
diff --git a/data/rooms/example_unused/town/9999925.yaml b/data/rooms/example_unused/town/9999925.yaml
index 50c2a5d..741d5da 100644
--- a/data/rooms/example_unused/town/9999925.yaml
+++ b/data/rooms/example_unused/town/9999925.yaml
@@ -1,5 +1,8 @@
 name: "East of South of West of West of Town Square"
-description: "Here is a description of where we are!"
+description:
+  - text: "Here is a description of where we are!"
 exits:
-  west: 9999924
-  east: 9999926
+  west:
+    room: 9999924
+  east:
+    room: 9999926
diff --git a/data/rooms/example_unused/town/9999926.yaml b/data/rooms/example_unused/town/9999926.yaml
index 72c6d5b..e6efc47 100644
--- a/data/rooms/example_unused/town/9999926.yaml
+++ b/data/rooms/example_unused/town/9999926.yaml
@@ -1,5 +1,8 @@
 name: "East of South of West of West of Town Square"
-description: "Here is a description of where we are!"
+description:
+  - text: "Here is a description of where we are!"
 exits:
-  west: 9999925
-  south: 9999927
+  west:
+    room: 9999925
+  south:
+    room: 9999927
diff --git a/data/rooms/example_unused/town/9999927.yaml b/data/rooms/example_unused/town/9999927.yaml
index 145e1bd..5862463 100644
--- a/data/rooms/example_unused/town/9999927.yaml
+++ b/data/rooms/example_unused/town/9999927.yaml
@@ -1,5 +1,8 @@
 name: "East of South of West of West of Town Square"
-description: "Here is a description of where we are!"
+description:
+  - text: "Here is a description of where we are!"
 exits:
-  west: 9999928
-  north: 9999926
+  west:
+    room: 9999928
+  north:
+    room: 9999926
diff --git a/data/rooms/example_unused/town/9999928.yaml b/data/rooms/example_unused/town/9999928.yaml
index 40f92ec..a0f7734 100644
--- a/data/rooms/example_unused/town/9999928.yaml
+++ b/data/rooms/example_unused/town/9999928.yaml
@@ -1,4 +1,6 @@
 name: "East of South of West of West of Town Square"
-description: "Here is a description of where we are!"
+description:
+  - text: "Here is a description of where we are!"
 exits:
-  east: 9999927
+  east:
+    room: 9999927
diff --git a/data/rooms/example_unused/town/999996.yaml b/data/rooms/example_unused/town/999996.yaml
index 22a2cb5..2106b86 100644
--- a/data/rooms/example_unused/town/999996.yaml
+++ b/data/rooms/example_unused/town/999996.yaml
@@ -1,9 +1,13 @@
 name: "Mining Pit"
-description: "A small mining pit. The rocky walls glint with veins of copper ore."
+description:
+  - text: "A small mining pit. The rocky walls glint with veins of copper ore."
 exits:
-  east: 999998
-  north: 999997
-  west: 999994
+  east:
+    room: 999998
+  north:
+    room: 999997
+  west:
+    room: 999994
 objects:
   - id: copper_rock
   - id: copper_rock
diff --git a/data/rooms/example_unused/town/999998.yaml b/data/rooms/example_unused/town/999998.yaml
index 1fd0de5..81d06e1 100644
--- a/data/rooms/example_unused/town/999998.yaml
+++ b/data/rooms/example_unused/town/999998.yaml
@@ -1,8 +1,11 @@
 name: "Hacking Lab"
-description: "A dimly lit room filled with old terminals and flickering screens. Cables dangle from the ceiling, some still sparking. The air smells of ozone and burnt circuitry. A {40}basic terminal{/} against the far wall still has power."
+description:
+  - text: "A dimly lit room filled with old terminals and flickering screens. Cables dangle from the ceiling, some still sparking. The air smells of ozone and burnt circuitry. A {40}basic terminal{/} against the far wall still has power."
 exits:
-  east: 999999
-  west: 999996
+  east:
+    room: 999999
+  west:
+    room: 999996
 objects:
   - id: terminal_basic
   - id: terminal_advanced
diff --git a/data/rooms/example_unused/town/999999.yaml b/data/rooms/example_unused/town/999999.yaml
index 3bc9938..1b8106e 100644
--- a/data/rooms/example_unused/town/999999.yaml
+++ b/data/rooms/example_unused/town/999999.yaml
@@ -1,10 +1,15 @@
 name: "Scavenging Post"
-description: "A cluttered yard full of {243}scrap{/} and discarded technology. Piles of salvageable debris are scattered across the ground. The air smells of ozone and rust."
+description:
+  - text: "A cluttered yard full of {243}scrap{/} and discarded technology. Piles of salvageable debris are scattered across the ground. The air smells of ozone and rust."
 exits:
-  east: 9999910
-  west: 999998
-  north: 99999150
-  south: 99999151
+  east:
+    room: 9999910
+  west:
+    room: 999998
+  north:
+    room: 99999150
+  south:
+    room: 99999151
 objects:
   - id: scrap_pile
   - id: scrap_pile
diff --git a/data/rooms/example_unused/underground2/9999954.yaml b/data/rooms/example_unused/underground2/9999954.yaml
index 8348801..cee1ccd 100644
--- a/data/rooms/example_unused/underground2/9999954.yaml
+++ b/data/rooms/example_unused/underground2/9999954.yaml
@@ -1,8 +1,11 @@
 name: "The Void Chamber"
-description: "A vast cavern where reality seems to thin. The air shimmers with {141}spectral energy{/} and strange whispers fill your mind."
+description:
+- text: "A vast cavern where reality seems to thin. The air shimmers with {141}spectral energy{/} and strange whispers fill your mind."
 exits:
-  north: 9999953
-  down: 9999955
+  north:
+    room: 9999953
+  down:
+    room: 9999955
 mobs:
-  - "phantom"
-  - "phantom"
+- id: phantom
+- id: phantom
diff --git a/data/rooms/example_unused/underground2/9999955.yaml b/data/rooms/example_unused/underground2/9999955.yaml
index 2cce00a..f12e556 100644
--- a/data/rooms/example_unused/underground2/9999955.yaml
+++ b/data/rooms/example_unused/underground2/9999955.yaml
@@ -1,11 +1,18 @@
 name: "The Deeper Tunnels"
-description: "A junction deep beneath the void chamber. The walls here are reinforced with pre-regression alloys. Several passages branch off into the darkness, and you can hear the sounds of machinery echoing from all directions. A steep shaft descends further into the depths."
+description:
+  - text: "A junction deep beneath the void chamber. The walls here are reinforced with pre-regression alloys. Several passages branch off into the darkness, and you can hear the sounds of machinery echoing from all directions. A steep shaft descends further into the depths."
 exits:
-  up: 9999954
-  north: 9999956
-  east: 9999957
-  south: 9999958
-  west: 9999960
-  down: 9999962
+  up:
+    room: 9999954
+  north:
+    room: 9999956
+  east:
+    room: 9999957
+  south:
+    room: 9999958
+  west:
+    room: 9999960
+  down:
+    room: 9999962
 mobs:
   - id: security_turret
diff --git a/data/rooms/example_unused/underground2/9999956.yaml b/data/rooms/example_unused/underground2/9999956.yaml
index b5996ae..a82c068 100644
--- a/data/rooms/example_unused/underground2/9999956.yaml
+++ b/data/rooms/example_unused/underground2/9999956.yaml
@@ -1,7 +1,9 @@
 name: "Irradiated Sector"
-description: "Warning symbols cover every surface, their paint long since faded. A faint green glow emanates from cracks in the walls. The air is thick with the taste of old radiation."
+description:
+  - text: "Warning symbols cover every surface, their paint long since faded. A faint green glow emanates from cracks in the walls. The air is thick with the taste of old radiation."
 exits:
-  south: 9999955
+  south:
+    room: 9999955
 mobs:
   - id: ghoul
   - id: ghoul
diff --git a/data/rooms/example_unused/underground2/9999957.yaml b/data/rooms/example_unused/underground2/9999957.yaml
index be20359..501619d 100644
--- a/data/rooms/example_unused/underground2/9999957.yaml
+++ b/data/rooms/example_unused/underground2/9999957.yaml
@@ -1,7 +1,9 @@
 name: "Drone Assembly"
-description: "A long-abandoned drone manufacturing bay. Conveyor belts lie still, and half-assembled drone chassis hang from the ceiling. A few of them still twitch with residual power."
+description:
+  - text: "A long-abandoned drone manufacturing bay. Conveyor belts lie still, and half-assembled drone chassis hang from the ceiling. A few of them still twitch with residual power."
 exits:
-  west: 9999955
+  west:
+    room: 9999955
 mobs:
   - id: war_drone
   - id: war_drone
diff --git a/data/rooms/example_unused/underground2/9999958.yaml b/data/rooms/example_unused/underground2/9999958.yaml
index 09bd869..3b02c46 100644
--- a/data/rooms/example_unused/underground2/9999958.yaml
+++ b/data/rooms/example_unused/underground2/9999958.yaml
@@ -1,7 +1,10 @@
 name: "Security Checkpoint"
-description: "A fortified security station with blast shields and a decommissioned weapons locker. Scorch marks on the walls tell the story of a last stand."
+description:
+  - text: "A fortified security station with blast shields and a decommissioned weapons locker. Scorch marks on the walls tell the story of a last stand."
 exits:
-  north: 9999955
-  south: 9999959
+  north:
+    room: 9999955
+  south:
+    room: 9999959
 mobs:
   - id: enforcer_bot
diff --git a/data/rooms/example_unused/underground2/9999959.yaml b/data/rooms/example_unused/underground2/9999959.yaml
index 29ca4fc..65797eb 100644
--- a/data/rooms/example_unused/underground2/9999959.yaml
+++ b/data/rooms/example_unused/underground2/9999959.yaml
@@ -1,7 +1,9 @@
 name: "Plasma Core"
-description: "A massive plasma containment chamber with cracked magnetic coils lining the walls. Streams of superheated gas leak from the containment vessel, forming shimmering wraith-like shapes in the air."
+description:
+  - text: "A massive plasma containment chamber with cracked magnetic coils lining the walls. Streams of superheated gas leak from the containment vessel, forming shimmering wraith-like shapes in the air."
 exits:
-  north: 9999958
+  north:
+    room: 9999958
 mobs:
   - id: plasma_wraith
   - id: plasma_wraith
diff --git a/data/rooms/example_unused/underground2/9999960.yaml b/data/rooms/example_unused/underground2/9999960.yaml
index 56cca24..12c050d 100644
--- a/data/rooms/example_unused/underground2/9999960.yaml
+++ b/data/rooms/example_unused/underground2/9999960.yaml
@@ -1,7 +1,10 @@
 name: "Heavy Mech Bay"
-description: "An enormous maintenance bay built to house assault mechs. A gantry crane hangs overhead, and hydraulic lifts dot the floor. The bay's occupant is still active — and it has noticed you."
+description:
+  - text: "An enormous maintenance bay built to house assault mechs. A gantry crane hangs overhead, and hydraulic lifts dot the floor. The bay's occupant is still active — and it has noticed you."
 exits:
-  east: 9999955
-  west: 9999961
+  east:
+    room: 9999955
+  west:
+    room: 9999961
 mobs:
   - id: heavy_mech
diff --git a/data/rooms/example_unused/underground2/9999961.yaml b/data/rooms/example_unused/underground2/9999961.yaml
index 2d1e75c..e9124d8 100644
--- a/data/rooms/example_unused/underground2/9999961.yaml
+++ b/data/rooms/example_unused/underground2/9999961.yaml
@@ -1,6 +1,8 @@
 name: "Synth Lab"
-description: "A sterile laboratory where combat androids were designed and assembled. White panels line the walls, some splattered with old coolant stains. Diagnostic screens flicker with corrupted data."
+description:
+  - text: "A sterile laboratory where combat androids were designed and assembled. White panels line the walls, some splattered with old coolant stains. Diagnostic screens flicker with corrupted data."
 exits:
-  east: 9999960
+  east:
+    room: 9999960
 mobs:
   - id: elite_synth
diff --git a/data/rooms/example_unused/underground2/9999962.yaml b/data/rooms/example_unused/underground2/9999962.yaml
index b5b89c4..1e41704 100644
--- a/data/rooms/example_unused/underground2/9999962.yaml
+++ b/data/rooms/example_unused/underground2/9999962.yaml
@@ -1,7 +1,10 @@
 name: "Abandoned Bunker"
-description: "A fortified bunker from some forgotten conflict. Sandbags are piled in the corners and spent shell casings litter the floor. A solitary figure stands watch over the remains."
+description:
+  - text: "A fortified bunker from some forgotten conflict. Sandbags are piled in the corners and spent shell casings litter the floor. A solitary figure stands watch over the remains."
 exits:
-  up: 9999955
-  down: 9999963
+  up:
+    room: 9999955
+  down:
+    room: 9999963
 mobs:
   - id: veteran_merc
diff --git a/data/rooms/example_unused/underground2/9999963.yaml b/data/rooms/example_unused/underground2/9999963.yaml
index fca468e..5963fd2 100644
--- a/data/rooms/example_unused/underground2/9999963.yaml
+++ b/data/rooms/example_unused/underground2/9999963.yaml
@@ -1,7 +1,10 @@
 name: "Magma Conduit"
-description: "A geothermal vent has been tapped and routed through industrial conduits. The heat is oppressive, and molten rivulets course through channels in the floor. Something moves within the glowing flow."
+description:
+  - text: "A geothermal vent has been tapped and routed through industrial conduits. The heat is oppressive, and molten rivulets course through channels in the floor. Something moves within the glowing flow."
 exits:
-  up: 9999962
-  down: 9999964
+  up:
+    room: 9999962
+  down:
+    room: 9999964
 mobs:
   - id: molten_elemental
diff --git a/data/rooms/example_unused/underground2/9999964.yaml b/data/rooms/example_unused/underground2/9999964.yaml
index 4e74383..646ad15 100644
--- a/data/rooms/example_unused/underground2/9999964.yaml
+++ b/data/rooms/example_unused/underground2/9999964.yaml
@@ -1,7 +1,10 @@
 name: "The Foundry"
-description: "A vast smelting facility where sentinels were once forged. Massive crucibles hang from chains, and rivers of cooled slag form a maze-like floor. A single iron sentinel stands guard over the dormant machinery."
+description:
+  - text: "A vast smelting facility where sentinels were once forged. Massive crucibles hang from chains, and rivers of cooled slag form a maze-like floor. A single iron sentinel stands guard over the dormant machinery."
 exits:
-  up: 9999963
-  down: 9999965
+  up:
+    room: 9999963
+  down:
+    room: 9999965
 mobs:
   - id: iron_sentinel
diff --git a/data/rooms/example_unused/wilderness/99999161.yaml b/data/rooms/example_unused/wilderness/99999161.yaml
index 033c816..9ac309f 100644
--- a/data/rooms/example_unused/wilderness/99999161.yaml
+++ b/data/rooms/example_unused/wilderness/99999161.yaml
@@ -9,13 +9,13 @@ item_spawns: []
 mobs:
   - id: farmer
     wander_rooms:
-      - 161
+      - 99999161
   - id: farmer
     wander_rooms:
-      - 161
+      - 99999161
   - id: bioengineer
     wander_rooms:
-      - 161
+      - 99999161
 on_enter: []
 hazard: ""
 block_transport: false
diff --git a/data/rooms/example_unused/wilderness/99999180.yaml b/data/rooms/example_unused/wilderness/99999180.yaml
index de7773d..1753086 100644
--- a/data/rooms/example_unused/wilderness/99999180.yaml
+++ b/data/rooms/example_unused/wilderness/99999180.yaml
@@ -1,4 +1,6 @@
 name: "Construction Yard Entrance"
-description: "A fenced staging area at the edge of the terraforming works. Crates of brackets and coils of cable are stacked under a sturdy section of atmospheric dome. To the {220}north{/} the dome shielding gives out and the open solar array field begins."
+description:
+  - text: "A fenced staging area at the edge of the terraforming works. Crates of brackets and coils of cable are stacked under a sturdy section of atmospheric dome. To the {220}north{/} the dome shielding gives out and the open solar array field begins."
 exits:
-  north: 99999181
+  north:
+    room: 99999181
diff --git a/data/rooms/example_unused/wilderness/99999181.yaml b/data/rooms/example_unused/wilderness/99999181.yaml
index a5af7be..9253347 100644
--- a/data/rooms/example_unused/wilderness/99999181.yaml
+++ b/data/rooms/example_unused/wilderness/99999181.yaml
@@ -1,10 +1,12 @@
 name: "Exposed Solar Array"
-description: "A wide field of steel frames stretches under a torn section of the atmospheric dome. Raw sunlight blazes down with nothing to filter it. Half-built {220}solar panel frames{/} wait to be finished. A jagged {248}rock outcrop{/} on the south edge throws a patch of shade. The yard entrance lies back to the {34}south{/}."
+description:
+- text: "A wide field of steel frames stretches under a torn section of the atmospheric dome. Raw sunlight blazes down with nothing to filter it. Half-built {220}solar panel frames{/} wait to be finished. A jagged {248}rock outcrop{/} on the south edge throws a patch of shade. The yard entrance lies back to the {34}south{/}."
 hazard: solar_radiation
 exits:
-  south: 99999180
+  south:
+    room: 99999180
 objects:
-  - id: rock_outcrop
+- id: rock_outcrop
 mobs:
-  - solar_panel_frame
-  - solar_panel_frame
+- id: solar_panel_frame
+- id: solar_panel_frame
diff --git a/data/rooms/intro/1002.yaml b/data/rooms/intro/1002.yaml
index c7195ea..ca34347 100644
--- a/data/rooms/intro/1002.yaml
+++ b/data/rooms/intro/1002.yaml
@@ -42,9 +42,11 @@ objects:
         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."
   - name: building
     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."
+    description:
+      - text: "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: sign
-    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."
+    description:
+      - text: "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."
 exits:
   up:
     room: 1001
diff --git a/data/rooms/intro/1003.yaml b/data/rooms/intro/1003.yaml
index 77cb096..c6d3d8a 100644
--- a/data/rooms/intro/1003.yaml
+++ b/data/rooms/intro/1003.yaml
@@ -2,26 +2,26 @@ id: 1003
 name: Processing Building
 color: ""
 description:
-    - text: A short tunnel-like building with queue ropes and desks on each side, and signs directing "Departures" and "Arrivals" above each. An attendant stands doing paperwork on the Departures side. No one is on the Arrivals side.
+- text: A short tunnel-like building with queue ropes and desks on each side, and signs directing "Departures" and "Arrivals" above each. An attendant stands doing paperwork on the Departures side. No one is on the Arrivals side.
 exits:
-    north:
-        room: 1004
-        condition:
-          player_flag: 1003_talked
-    south:
-        room: 1002
+  north:
+    room: 1004
+    condition:
+      player_flag: 1003_talked
+  south:
+    room: 1002
 objects: []
 item_spawns: []
 mobs:
-  - spaceport_attendant
+- id: spaceport_attendant
 on_enter:
-    - condition:
-        player_flag: 1003_first_time
-        not: true
-      delay: 5
-      message: "{bold}The ground rumbles as the shuttle departs the pad behind you!{/}"
-      set_player_flags:
-        1003_first_time: true
+- condition:
+    player_flag: 1003_first_time
+    not: true
+  delay: 5
+  message: "{bold}The ground rumbles as the shuttle departs the pad behind you!{/}"
+  set_player_flags:
+    1003_first_time: true
 hazard: ""
 block_transport: false
 triggers: []
diff --git a/data/rooms/intro/2001.yaml b/data/rooms/intro/2001.yaml
index 5b79018..eb7bd59 100644
--- a/data/rooms/intro/2001.yaml
+++ b/data/rooms/intro/2001.yaml
@@ -1,4 +1,5 @@
-block_transport: false
+id: 2001
+name: Test Room
 color: ""
 description:
   - text: It's a test room
@@ -9,8 +10,14 @@ exits:
     room: 2006
   southeast:
     room: 2005
-hazard: ""
-id: 2001
+  west:
+    room: 1001
+objects:
+  - name: hidden guy
+    hidden: true
+    description:
+      - text: YOU FOUND HIM
+  - id: tree
 item_spawns:
   - id: bronze_axe
     quantity: 1
@@ -23,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/2006.yaml b/data/rooms/intro/2006.yaml
index 74dd657..7ab682f 100644
--- a/data/rooms/intro/2006.yaml
+++ b/data/rooms/intro/2006.yaml
@@ -1,5 +1,8 @@
 name: "Test Room"
-description: "It's a test room"
+description:
+  - text: "It's a test room"
 exits:
-  east: 2005
-  north: 2001
+  east:
+    room: 2005
+  north:
+    room: 2001