refactor: simplify yaml, remove support for old scalar fields

18 files changed, 131 insertions, 75 deletions

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