21 files changed, 143 insertions, 83 deletions

diff --git a/data/rooms/1.yaml b/data/rooms/1.yaml
index 2f30f7e..77c49a0 100644
--- a/data/rooms/1.yaml
+++ b/data/rooms/1.yaml
@@ -1,18 +1,10 @@
 id: 1
-name: "Lumbridge Town Square"
-description: "A bustling town square in the heart of Lumbridge. Cobblestone paths lead in all directions. A fountain gurgles peacefully in the center."
+name: "Town Square"
+description: "The central square of Lumbridge. A fountain gurgles peacefully in the center. Paths lead west toward the gathering grounds and east toward the production district."
 map_symbol: "S"
 exits:
-  north: 2
-  west: 7
-  east: 3
+  east: 2
 objects:
   - id: lumby_fountain
-spawns:
-  - item_id: "copper_ore"
-    quantity: 1
-    respawn_ticks: 10
 mobs:
   - "newbie_trainer"
-  - "man"
-  - "man"
diff --git a/data/rooms/10.yaml b/data/rooms/10.yaml
index 98fba43..63d9fc7 100644
--- a/data/rooms/10.yaml
+++ b/data/rooms/10.yaml
@@ -1,20 +1,6 @@
 id: 10
-name: "Guard Post"
-description: "A checkpoint at the edge of the mine. A guard stands watch beside a heavy iron gate set into the north wall."
+name: "Farming Plot"
+description: "A small patch of tilled soil behind a weathered fence. This area is not yet accessible."
 exits:
-  west: 2
-  north:
-    room: 11
-    condition:
-      flag: gate_open
-      value: true
-    blocked_message: "A heavy iron gate blocks the way north. Maybe the guard can help."
-objects:
-  - id: iron_gate
-mobs:
-  - "guard"
-on_enter:
-  - message: "The Guard barks: \"State your business!\""
-    condition:
-      player_flag: talked_to_guard
-      not: true
+  west: 9
+  east: 11
diff --git a/data/rooms/11.yaml b/data/rooms/11.yaml
index dcc3b05..bf26577 100644
--- a/data/rooms/11.yaml
+++ b/data/rooms/11.yaml
@@ -1,17 +1,6 @@
 id: 11
-name: "Supply Room"
-description: "A dusty storage room filled with crates and barrels. This area is normally off-limits."
+name: "Kitchen"
+description: "A warm kitchen with a stone hearth and wooden counters. This area is not yet accessible."
 exits:
-  south:
-    room: 10
-    condition:
-      flag: gate_open
-      value: true
-    blocked_message: "The iron gate is closed."
-spawns:
-  - item_id: uncut_sapphire
-    quantity: 1
-    respawn_ticks: 100
-  - item_id: credits
-    quantity: 50
-    respawn_ticks: 200
+  east: 12
+  west: 10
diff --git a/data/rooms/12.yaml b/data/rooms/12.yaml
new file mode 100644
index 0000000..c9ab894
--- /dev/null
+++ b/data/rooms/12.yaml
@@ -0,0 +1,6 @@
+id: 12
+name: "Forge"
+description: "A blazing forge and anvil dominate this smoky workshop. This area is not yet accessible."
+exits:
+  east: 13
+  west: 11
diff --git a/data/rooms/13.yaml b/data/rooms/13.yaml
new file mode 100644
index 0000000..3b394af
--- /dev/null
+++ b/data/rooms/13.yaml
@@ -0,0 +1,6 @@
+id: 13
+name: "Workshop"
+description: "A well-equipped workshop with crafting tables and tool racks. This area is not yet accessible."
+exits:
+  east: 14
+  west: 12
diff --git a/data/rooms/14.yaml b/data/rooms/14.yaml
new file mode 100644
index 0000000..2e90539
--- /dev/null
+++ b/data/rooms/14.yaml
@@ -0,0 +1,6 @@
+id: 14
+name: "Fletching Bench"
+description: "A workbench covered in wood shavings, feathers, and arrowheads. This area is not yet accessible."
+exits:
+  east: 15
+  west: 13
diff --git a/data/rooms/15.yaml b/data/rooms/15.yaml
new file mode 100644
index 0000000..de48e37
--- /dev/null
+++ b/data/rooms/15.yaml
@@ -0,0 +1,6 @@
+id: 15
+name: "Alchemy Lab"
+description: "Shelves lined with glass vials, dried herbs, and bubbling cauldrons. This area is not yet accessible."
+exits:
+  east: 16
+  west: 14
diff --git a/data/rooms/16.yaml b/data/rooms/16.yaml
new file mode 100644
index 0000000..51ee392
--- /dev/null
+++ b/data/rooms/16.yaml
@@ -0,0 +1,6 @@
+id: 16
+name: "Construction Site"
+description: "A half-built structure surrounded by planks, nails, and blueprints. This area is not yet accessible."
+exits:
+  east: 17
+  west: 15
diff --git a/data/rooms/17.yaml b/data/rooms/17.yaml
new file mode 100644
index 0000000..80b1dfc
--- /dev/null
+++ b/data/rooms/17.yaml
@@ -0,0 +1,6 @@
+id: 17
+name: "Bonfire"
+description: "A ring of stones surrounds a bed of ash. A few unlit logs wait nearby. This area is not yet accessible."
+exits:
+  east: 18
+  west: 16
diff --git a/data/rooms/18.yaml b/data/rooms/18.yaml
new file mode 100644
index 0000000..9dfc446
--- /dev/null
+++ b/data/rooms/18.yaml
@@ -0,0 +1,6 @@
+id: 18
+name: "Thieves' Den"
+description: "A shadowy hideout with lockpicks, dark cloaks, and wanted posters on the walls. This area is not yet accessible."
+exits:
+  east: 19
+  west: 17
diff --git a/data/rooms/19.yaml b/data/rooms/19.yaml
new file mode 100644
index 0000000..35800a0
--- /dev/null
+++ b/data/rooms/19.yaml
@@ -0,0 +1,6 @@
+id: 19
+name: "Agility Course"
+description: "A training ground with balance beams, monkey bars, and climbing nets. This area is not yet accessible."
+exits:
+  east: 20
+  west: 18
diff --git a/data/rooms/2.yaml b/data/rooms/2.yaml
index 89913f7..39fcb9a 100644
--- a/data/rooms/2.yaml
+++ b/data/rooms/2.yaml
@@ -1,14 +1,17 @@
 id: 2
-name: "Copper Mine"
-description: "A small mining pit. The walls glint with copper veins."
+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."
+map_symbol: "F"
 exits:
-  south: 1
-  east: 10
+  east: 4
+  north: 3
+  west: 1
 objects:
-  - id: copper_rock
-  - id: copper_rock
-  - id: copper_rock
+  - id: bait_fishing_spot
 spawns:
-  - item_id: bronze_pickaxe
+  - item_id: fishing_rod
     quantity: 1
     respawn_ticks: 30
+  - item_id: fishing_bait
+    quantity: 20
+    respawn_ticks: 60
diff --git a/data/rooms/20.yaml b/data/rooms/20.yaml
new file mode 100644
index 0000000..379322b
--- /dev/null
+++ b/data/rooms/20.yaml
@@ -0,0 +1,6 @@
+id: 20
+name: "Assassin's Bureau"
+description: "A discreet office with job postings pinned to a corkboard. This area is not yet accessible."
+exits:
+  east: 21
+  west: 19
diff --git a/data/rooms/21.yaml b/data/rooms/21.yaml
new file mode 100644
index 0000000..987f5ea
--- /dev/null
+++ b/data/rooms/21.yaml
@@ -0,0 +1,13 @@
+id: 21
+name: "Combat Arena"
+description: "A sandy training ground with practice dummies and sparring rings. Several men wander here looking for a fight."
+map_symbol: "C"
+exits:
+  west: 20
+mobs:
+  - id: man
+    wander_interval: 10
+  - id: man
+    wander_interval: 12
+  - id: man
+    wander_interval: 15
diff --git a/data/rooms/3.yaml b/data/rooms/3.yaml
index 57a7cb1..b54546f 100644
--- a/data/rooms/3.yaml
+++ b/data/rooms/3.yaml
@@ -1,6 +1,14 @@
 id: 3
-name: "Lumbridge General Store"
-description: "A small but well-stocked general store. Shelves line the walls with various goods."
-map_symbol: "G"
+name: "Fly Fishing Pool"
+description: "A calm pool where insects hover over the water. Perfect for fly fishing."
 exits:
-  west: 1
+  south: 2
+objects:
+  - id: fly_fishing_spot
+spawns:
+  - item_id: fly_fishing_rod
+    quantity: 1
+    respawn_ticks: 30
+  - item_id: feather
+    quantity: 15
+    respawn_ticks: 60
diff --git a/data/rooms/4.yaml b/data/rooms/4.yaml
index 49280fe..f1d7d08 100644
--- a/data/rooms/4.yaml
+++ b/data/rooms/4.yaml
@@ -1,7 +1,14 @@
 id: 4
-name: "Lumbridge Forest Edge"
-description: "The road ends here at the edge of a dark forest. Towering oak trees loom ahead to the north."
-map_symbol: "F"
+name: "Woodcutting Glade"
+description: "A sunny glade at the edge of the forest. A sturdy tree stands here, perfect for practicing woodcutting."
+map_symbol: "W"
 exits:
-  south: 2
+  east: 6
   north: 5
+  west: 2
+objects:
+  - id: tree
+spawns:
+  - item_id: bronze_axe
+    quantity: 1
+    respawn_ticks: 60
diff --git a/data/rooms/5.yaml b/data/rooms/5.yaml
index 3c16a41..195c098 100644
--- a/data/rooms/5.yaml
+++ b/data/rooms/5.yaml
@@ -1,6 +1,12 @@
 id: 5
-name: "Deep Forest"
-description: "Thick trees surround you on all sides. Shafts of light pierce through the canopy above."
-map_symbol: "T"
+name: "Oak Grove"
+description: "A stand of young oak trees. The wood here is tougher but more valuable."
+map_symbol: "O"
 exits:
   south: 4
+objects:
+  - id: oak_tree
+spawns:
+  - item_id: iron_axe
+    quantity: 1
+    respawn_ticks: 60
diff --git a/data/rooms/6.yaml b/data/rooms/6.yaml
index b4bae5b..66d8d85 100644
--- a/data/rooms/6.yaml
+++ b/data/rooms/6.yaml
@@ -1,6 +1,16 @@
 id: 6
-name: "Abandoned Mine"
-description: "A dark, dusty mine shaft. Veins of copper and tin run through the walls. A single lantern flickers overhead."
+name: "Mining Pit"
+description: "A small mining pit. The rocky walls glint with veins of copper ore."
 map_symbol: "M"
 exits:
-  west: 2
+  east: 8
+  north: 7
+  west: 4
+objects:
+  - id: copper_rock
+  - id: copper_rock
+  - id: copper_rock
+spawns:
+  - item_id: bronze_pickaxe
+    quantity: 1
+    respawn_ticks: 30
diff --git a/data/rooms/7.yaml b/data/rooms/7.yaml
index f9168ec..c153d68 100644
--- a/data/rooms/7.yaml
+++ b/data/rooms/7.yaml
@@ -1,6 +1,5 @@
 id: 7
-name: "Lake West Shore"
-description: "The western edge of a placid lake. Reeds rustle in the breeze."
+name: "Deep Mine"
+description: "A deeper mine shaft. Higher quality ores can be found here. This area is not yet accessible."
 exits:
-  east: 8
-  south: 1
+  south: 6
diff --git a/data/rooms/8.yaml b/data/rooms/8.yaml
index 46e29f3..4e36af4 100644
--- a/data/rooms/8.yaml
+++ b/data/rooms/8.yaml
@@ -1,14 +1,6 @@
 id: 8
-name: "Lake Center Shore"
-description: "The center of the lake's southern shore. A good spot to cast a line."
+name: "Hacking Lab"
+description: "A dimly lit room filled with old terminals and flickering screens. This area is not yet accessible."
 exits:
-  west: 7
   east: 9
-objects:
-  - id: fishing_spot
-    wander_rooms: [7, 8, 9]
-    wander_interval: 12
-spawns:
-  - item_id: fishing_rod
-    quantity: 1
-    respawn_ticks: 30
+  west: 6
diff --git a/data/rooms/9.yaml b/data/rooms/9.yaml
index b5ea278..aca7ec2 100644
--- a/data/rooms/9.yaml
+++ b/data/rooms/9.yaml
@@ -1,5 +1,6 @@
 id: 9
-name: "Lake East Shore"
-description: "The eastern shore of the lake. A fallen log offers a comfortable seat."
+name: "Scavenging Post"
+description: "A cluttered yard full of scrap metal and discarded technology. This area is not yet accessible."
 exits:
+  east: 10
   west: 8