Zone definition split (#398)

Volte6 · web-flow · commit 44284cfaf2fc · 2025-06-19T12:20:23.000-07:00
# Description

This splits zone configuration outside of the root room definition file.

## Changes

- zone config is from a file called `zone-config.yaml` in the room/zone folder.
- Changed fileloader Load/Save functions, allows for file patterns to match when loading. 
- Eliminated JSON as a fileformat. Wasn't really supported anyways.
- Room ZoneConfig now a pointer, expected to be null
  - If not null, uses data to generate a new `zone-config.yaml`
diff --git a/_datafiles/world/default/rooms/catacombs/32.yaml b/_datafiles/world/default/rooms/catacombs/32.yaml
@@ -1,11 +1,5 @@
 roomid: 32
 zone: Catacombs
-zoneconfig:
-  roomid: 32
-  autoscale:
-    minimum: 8
-    maximum: 13
-  musicfile: static/audio/music/catacombs.mp3
 title: Entrance to the Catacombs
 description: Beneath the Sanctuary of the Benevolent Heart lies the labyrinthine expanse
   known as the Catacombs. A network of narrow, winding tunnels and chambers, the Catacombs
diff --git a/_datafiles/world/default/rooms/catacombs/zone-config.yaml b/_datafiles/world/default/rooms/catacombs/zone-config.yaml
@@ -0,0 +1,7 @@
+name: Catacombs
+roomid: 32
+autoscale:
+  minimum: 8
+  maximum: 13
+musicfile: static/audio/music/catacombs.mp3
+defaultbiome: dungeon
diff --git a/_datafiles/world/default/rooms/dark_forest/300.yaml b/_datafiles/world/default/rooms/dark_forest/300.yaml
@@ -1,10 +1,5 @@
 roomid: 300
 zone: Dark Forest
-zoneconfig:
-  roomid: 300
-  mutators:
-  - mutatorid: forest-mist
-  musicfile: static/audio/music/dark-forest.mp3
 title: Forest Road
 description: As you venture further along the old road, it leads you into the heart
   of the foreboding Dark Forest. The transition from the tranquil Frost Lake to this
diff --git a/_datafiles/world/default/rooms/dark_forest/zone-config.yaml b/_datafiles/world/default/rooms/dark_forest/zone-config.yaml
@@ -0,0 +1,6 @@
+name: Dark Forest
+roomid: 300
+mutators:
+  - mutatorid: forest-mist
+musicfile: static/audio/music/dark-forest.mp3
+defaultbiome: forest
diff --git a/_datafiles/world/default/rooms/endless_trashheap/139.yaml b/_datafiles/world/default/rooms/endless_trashheap/139.yaml
@@ -1,7 +1,5 @@
 roomid: 139
 zone: Endless Trashheap
-zoneconfig:
-  roomid: 139
 title: The wasteland
 description: The Endless Trashheap stretches to the horizon, a bizarre landscape of
   discarded wealth where mountains of forgotten relics rise like the ruins of a once-glorious
diff --git a/_datafiles/world/default/rooms/endless_trashheap/zone-config.yaml b/_datafiles/world/default/rooms/endless_trashheap/zone-config.yaml
@@ -0,0 +1,2 @@
+name: Endless Trashheap
+roomid: 139
diff --git a/_datafiles/world/default/rooms/frost_lake/304.yaml b/_datafiles/world/default/rooms/frost_lake/304.yaml
@@ -1,11 +1,5 @@
 roomid: 304
 zone: Frost Lake
-zoneconfig:
-  roomid: 304
-  autoscale:
-    minimum: 10
-    maximum: 13
-  musicfile: static/audio/music/frost-lake.mp3
 title: Frost Lake Shore
 description: The stillness here is profound, the world holding its breath in reverence
   for this enchanting realm. The silence is broken only by the soft, melodic chime
diff --git a/_datafiles/world/default/rooms/frost_lake/zone-config.yaml b/_datafiles/world/default/rooms/frost_lake/zone-config.yaml
@@ -0,0 +1,7 @@
+name: Frost Lake
+roomid: 304
+autoscale:
+  minimum: 10
+  maximum: 13
+musicfile: static/audio/music/frost-lake.mp3
+defaultbiome: shore
diff --git a/_datafiles/world/default/rooms/frostfang/1.yaml b/_datafiles/world/default/rooms/frostfang/1.yaml
@@ -1,13 +1,5 @@
 roomid: 1
 zone: Frostfang
-zoneconfig:
-  roomid: 1
-  autoscale:
-    minimum: 1
-    maximum: 5
-  idlemessages:
-  - A cold wind blows through the city.
-  musicfile: static/audio/music/frostfang.mp3
 title: Town Square
 description: In the shimmering heart of Frostfang, a city wrapped in a perpetual blanket
   of snow and illuminated by the ethereal glow of the auroras, lies the Town Square.
diff --git a/_datafiles/world/default/rooms/frostfang/zone-config.yaml b/_datafiles/world/default/rooms/frostfang/zone-config.yaml
@@ -0,0 +1,9 @@
+name: Frostfang
+roomid: 1
+autoscale:
+  minimum: 1
+  maximum: 5
+idlemessages:
+  - A cold wind blows through the city.
+musicfile: static/audio/music/frostfang.mp3
+defaultbiome: city
diff --git a/_datafiles/world/default/rooms/frostfang_slums/439.yaml b/_datafiles/world/default/rooms/frostfang_slums/439.yaml
@@ -1,13 +1,5 @@
 roomid: 439
 zone: Frostfang Slums
-zoneconfig:
-  roomid: 439
-  autoscale:
-    minimum: 5
-    maximum: 10
-  mutators:
-  - mutatorid: pvp-enabled
-  musicfile: static/audio/music/frostfang-slums.mp3
 title: Poorly Lit Street
 description: 'Tucked away in the heart of Frostfang''s sprawling slums, a dimly lit
   alleyway meanders from the bustling Beggars Lane. This concealed corner, a world
diff --git a/_datafiles/world/default/rooms/frostfang_slums/zone-config.yaml b/_datafiles/world/default/rooms/frostfang_slums/zone-config.yaml
@@ -0,0 +1,9 @@
+name: Frostfang Slums
+roomid: 439
+autoscale:
+  minimum: 5
+  maximum: 10
+mutators:
+  - mutatorid: pvp-enabled
+musicfile: static/audio/music/frostfang-slums.mp3
+defaultbiome: city
diff --git a/_datafiles/world/default/rooms/mirror_caves/218.yaml b/_datafiles/world/default/rooms/mirror_caves/218.yaml
@@ -1,8 +1,5 @@
 roomid: 218
 zone: Mirror Caves
-zoneconfig:
-  roomid: 218
-  musicfile: static/audio/music/mirror-caves.mp3
 title: Cave Entrance
 description: "As you cautiously step into the entrance of the mirror caves, a chilling
   draft greets you, carrying the faint scent of earth and ancient stone. The cave's
diff --git a/_datafiles/world/default/rooms/mirror_caves/zone-config.yaml b/_datafiles/world/default/rooms/mirror_caves/zone-config.yaml
@@ -0,0 +1,4 @@
+name: Mirror Caves
+roomid: 218
+musicfile: static/audio/music/mirror-caves.mp3
+defaultbiome: cave
diff --git a/_datafiles/world/default/rooms/mystarion/612.yaml b/_datafiles/world/default/rooms/mystarion/612.yaml
@@ -1,8 +1,5 @@
 roomid: 612
 zone: Mystarion
-zoneconfig:
-  roomid: 612
-  musicfile: static/audio/music/mystarion.mp3
 title: Main road
 description: The road itself becomes a cobblestone path, the stones worn smooth by
   centuries of use, each one seemingly placed with intention, leading inexorably towards
diff --git a/_datafiles/world/default/rooms/mystarion/zone-config.yaml b/_datafiles/world/default/rooms/mystarion/zone-config.yaml
@@ -0,0 +1,4 @@
+name: Mystarion
+roomid: 612
+musicfile: static/audio/music/mystarion.mp3
+defaultbiome: city
diff --git a/_datafiles/world/default/rooms/nowhere/-1.yaml b/_datafiles/world/default/rooms/nowhere/-1.yaml
@@ -1,7 +1,5 @@
 roomid: -1
 zone: Nowhere
-zoneconfig:
-  roomid: -1
 title: The Void
 description: As your senses attune to the stillness around, you find yourself engulfed
   in an impenetrable void, a realm where darkness reigns supreme. The abyss seems
diff --git a/_datafiles/world/default/rooms/nowhere/zone-config.yaml b/_datafiles/world/default/rooms/nowhere/zone-config.yaml
@@ -0,0 +1,2 @@
+name: Nowhere
+roomid: -1
diff --git a/_datafiles/world/default/rooms/shadow_realm/75.yaml b/_datafiles/world/default/rooms/shadow_realm/75.yaml
@@ -1,7 +1,5 @@
 roomid: 75
 zone: Shadow Realm
-zoneconfig:
-  roomid: 75
 title: Waiting room
 description: You find yourself in the heart of the Shadow Realm, a place suspended
   between the corporeal and the ethereal. The air is heavy with a palpable stillness,
diff --git a/_datafiles/world/default/rooms/shadow_realm/zone-config.yaml b/_datafiles/world/default/rooms/shadow_realm/zone-config.yaml
@@ -0,0 +1,2 @@
+name: Shadow Realm
+roomid: 75
diff --git a/_datafiles/world/default/rooms/stormshards/575.yaml b/_datafiles/world/default/rooms/stormshards/575.yaml
@@ -1,8 +1,5 @@
 roomid: 575
 zone: Stormshards
-zoneconfig:
-  roomid: 575
-  musicfile: static/audio/music/stormshards.mp3
 title: Mountain path
 description: As the path ascends, the terrain becomes more rugged; the trees thin
   out, giving way to rocky outcrops and steep, craggy inclines. The earth underfoot
diff --git a/_datafiles/world/default/rooms/stormshards/zone-config.yaml b/_datafiles/world/default/rooms/stormshards/zone-config.yaml
@@ -0,0 +1,4 @@
+name: Stormshards
+roomid: 575
+musicfile: static/audio/music/stormshards.mp3
+defaultbiome: mountains
diff --git a/_datafiles/world/default/rooms/stormwatchers_keep/880.yaml b/_datafiles/world/default/rooms/stormwatchers_keep/880.yaml
@@ -1,11 +1,5 @@
 roomid: 880
 zone: Stormwatchers Keep
-zoneconfig:
-  roomid: 880
-  autoscale:
-    minimum: 15
-    maximum: 25
-  musicfile: static/audio/music/whispering-wastes.mp3
 title: Stormwatchers Keep
 description: The Halls of Stormwatchers Keep are a labyrinthine network of grand corridors
   and chambers carved into the heart of a colossal glacier. Each hall is adorned with
diff --git a/_datafiles/world/default/rooms/stormwatchers_keep/zone-config.yaml b/_datafiles/world/default/rooms/stormwatchers_keep/zone-config.yaml
@@ -0,0 +1,7 @@
+name: Stormwatchers Keep
+roomid: 880
+autoscale:
+  minimum: 15
+  maximum: 25
+musicfile: static/audio/music/whispering-wastes.mp3
+defaultbiome: city
diff --git a/_datafiles/world/default/rooms/sun_anvil/1000.yaml b/_datafiles/world/default/rooms/sun_anvil/1000.yaml
@@ -1,10 +1,5 @@
 roomid: 1000
 zone: Sun Anvil
-zoneconfig:
-  roomid: 1000
-  mutators:
-  - mutatorid: desert-sun
-  musicfile: static/audio/music/sun-anvil.mp3
 title: Desert's Edge
 description: You find yourself at the threshold of the Sun Anvil Desert, where the
   air itself seems to shimmer under the relentless glare of a merciless sun. The ground
diff --git a/_datafiles/world/default/rooms/sun_anvil/zone-config.yaml b/_datafiles/world/default/rooms/sun_anvil/zone-config.yaml
@@ -0,0 +1,6 @@
+name: Sun Anvil
+roomid: 1000
+mutators:
+- mutatorid: desert-sun
+musicfile: static/audio/music/sun-anvil.mp3
+defaultbiome: desert
diff --git a/_datafiles/world/default/rooms/tutorial/900.yaml b/_datafiles/world/default/rooms/tutorial/900.yaml
@@ -1,7 +1,5 @@
 roomid: 900
 zone: Tutorial
-zoneconfig:
-  roomid: 900
 title: Learning to Look
 description: You are at the Newbie School. Here you will learn the very basics of
   how to navigate and interact with the world. Pay attention, because once you complete
diff --git a/_datafiles/world/default/rooms/tutorial/zone-config.yaml b/_datafiles/world/default/rooms/tutorial/zone-config.yaml
@@ -0,0 +1,2 @@
+name: Tutorial
+roomid: 900
diff --git a/_datafiles/world/default/rooms/whispering_wastes/168.yaml b/_datafiles/world/default/rooms/whispering_wastes/168.yaml
@@ -1,13 +1,5 @@
 roomid: 168
 zone: Whispering Wastes
-zoneconfig:
-  roomid: 168
-  autoscale:
-    minimum: 5
-    maximum: 15
-  mutators:
-  - mutatorid: freezing-cold
-  musicfile: static/audio/music/whispering-wastes.mp3
 title: Frozen Wasteland
 description: The relentless blizzard swallows the world in a veil of white. The sky,
   a perpetual twilight, casts a surreal glow over the endless expanse of snow and
diff --git a/_datafiles/world/default/rooms/whispering_wastes/zone-config.yaml b/_datafiles/world/default/rooms/whispering_wastes/zone-config.yaml
@@ -0,0 +1,9 @@
+name: Whispering Wastes
+roomid: 168
+autoscale:
+  minimum: 5
+  maximum: 15
+mutators:
+- mutatorid: freezing-cold
+musicfile: static/audio/music/whispering-wastes.mp3
+defaultbiome: snow
diff --git a/_datafiles/world/empty/rooms/endless_trashheap/139.yaml b/_datafiles/world/empty/rooms/endless_trashheap/139.yaml
@@ -1,7 +1,5 @@
 roomid: 139
 zone: Endless Trashheap
-zoneconfig:
-  roomid: 139
 title: The wasteland
 description: The Endless Trashheap stretches to the horizon, a bizarre landscape of
   discarded wealth where mountains of forgotten relics rise like the ruins of a once-glorious
diff --git a/_datafiles/world/empty/rooms/endless_trashheap/zone-config.yaml b/_datafiles/world/empty/rooms/endless_trashheap/zone-config.yaml
@@ -0,0 +1,2 @@
+name: Endless Trashheap
+roomid: 139
diff --git a/_datafiles/world/empty/rooms/shadow_realm/75.yaml b/_datafiles/world/empty/rooms/shadow_realm/75.yaml
@@ -1,7 +1,5 @@
 roomid: 75
 zone: Shadow Realm
-zoneconfig:
-  roomid: 75
 title: Waiting room
 description: You find yourself in the heart of the Shadow Realm, a place suspended
   between the corporeal and the ethereal. The air is heavy with a palpable stillness,
diff --git a/_datafiles/world/empty/rooms/shadow_realm/zone-config.yaml b/_datafiles/world/empty/rooms/shadow_realm/zone-config.yaml
@@ -0,0 +1,2 @@
+name: Shadow Realm
+roomid: 75
diff --git a/_datafiles/world/empty/rooms/startland/1.yaml b/_datafiles/world/empty/rooms/startland/1.yaml
@@ -1,10 +1,5 @@
 roomid: 1
 zone: Startland
-zoneconfig:
-  roomid: 1
-  autoscale:
-    minimum: 1
-    maximum: 5
 title: Town Square
 description: You stand at the town square of startland. This is the first room you
   enter upon completing training and beginning the mud.
diff --git a/_datafiles/world/empty/rooms/startland/zone-config.yaml b/_datafiles/world/empty/rooms/startland/zone-config.yaml
@@ -0,0 +1,6 @@
+name: Startland
+roomid: 1
+autoscale:
+  minimum: 1
+  maximum: 5
+defaultbiome: city
diff --git a/_datafiles/world/empty/rooms/tutorial/900.yaml b/_datafiles/world/empty/rooms/tutorial/900.yaml
@@ -1,7 +1,5 @@
 roomid: 900
 zone: Tutorial
-zoneconfig:
-  roomid: 900
 title: Learning to Look
 description: You are at the Newbie School. Here you will learn the very basics of
   how to navigate and interact with the world. Pay attention, because once you complete
diff --git a/_datafiles/world/empty/rooms/tutorial/zone-config.yaml b/_datafiles/world/empty/rooms/tutorial/zone-config.yaml
@@ -0,0 +1,2 @@
+name: Tutorial
+roomid: 900
diff --git a/internal/fileloader/fileloader.go b/internal/fileloader/fileloader.go
diff --git a/internal/hooks/NewRound_UpdateZoneMutators.go b/internal/hooks/NewRound_UpdateZoneMutators.go
diff --git a/internal/rooms/biomes.go b/internal/rooms/biomes.go
diff --git a/internal/rooms/ephemeral.go b/internal/rooms/ephemeral.go
diff --git a/internal/rooms/roommanager.go b/internal/rooms/roommanager.go
diff --git a/internal/rooms/rooms.go b/internal/rooms/rooms.go
diff --git a/internal/rooms/save_and_load.go b/internal/rooms/save_and_load.go
diff --git a/internal/rooms/zoneconfig.go b/internal/rooms/zoneconfig.go
diff --git a/internal/usercommands/admin.zone.go b/internal/usercommands/admin.zone.go
diff --git a/internal/web/admin.rooms.go b/internal/web/admin.rooms.go
diff --git a/main.go b/main.go
diff --git a/modules/webhelp/webhelp.go b/modules/webhelp/webhelp.go

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+name: Endless Trashheap`
	`2`	`+roomid: 139`