Add the desert part of the radfields

blastmud_game/src/db.rs

@@ -407,7 +407,7 @@ impl DBTrans {
         Ok(())
     }
 
-    #[warn(dead_code)]
+    #[cfg_attr(test, allow(dead_code))]
     pub async fn find_by_username<'a>(self: &'a Self, username: &'a str) -> DResult<Option<User>> {
         if let Some(details_json) = self
             .pg_trans()?

blastmud_game/src/static_content/room/northern_radfields.yaml

@@ -26,6 +26,7 @@
   code: northrad_s6
   name: Melbs outskirts
   short: <yellow>||<reset>
+  should_caption: false
   grid_coords:
     x: 6
     y: 19
@@ -39,6 +40,7 @@
 - zone: northern_radfields
   code: northrad_r6
   name: Outside the abandoned windfarm
+  should_caption: false
   short: <yellow>||<reset>
   grid_coords:
     x: 6
@@ -53,6 +55,7 @@
 - zone: northern_radfields
   code: northrad_q6
   name: Crystal clear pond
+  should_caption: false
   short: <yellow>||<reset>
   grid_coords:
     x: 6
@@ -67,6 +70,7 @@
 - zone: northern_radfields
   code: northrad_p5
   name: The Bend Community Hall
+  should_caption: false
   short: <yellow>||<reset>
   grid_coords:
     x: 5
@@ -81,6 +85,7 @@
 - zone: northern_radfields
   code: northrad_o5
   name: Gorge Southbank
+  should_caption: false
   short: <yellow>||<reset>
   grid_coords:
     x: 5
@@ -106,6 +111,10 @@
   description: "A river of slowly moving water at the bottom of a gorge. The water is icy cold, and seems quite deep, and the cliffs on either side are high"
   material_type: !WaterSurface
   exits:
+  - direction: north
+    exit_climb:
+      height: 12
+      difficulty: 12
   - direction: down
   - direction: south
     exit_climb:
@@ -114,6 +123,7 @@
 - zone: northern_radfields
   code: northrad_n5_deep
   name: Beneath the gorge River
+  should_caption: false
   short: <bgwhite><blue>~~<reset>
   grid_coords:
     x: 5
@@ -123,3 +133,563 @@
   material_type: !Underwater
   exits:
   - direction: up
+- zone: northern_radfields
+  code: northrad_m5
+  name: Dune Gap
+  should_caption: false
+  short: <yellow>||<reset>
+  grid_coords:
+    x: 5
+    y: 13
+    z: 0
+  description: "A narrow gap between two large red sand dunes. The sun beats 
+down relentlessly, casting long shadows across the sand. The air is filled 
+with the grit and dust kicked up by the wind, stinging your eyes and coating 
+your skin"
+  radiation: 100
+  exits:
+  - direction: north
+  - direction: south
+    exit_climb:
+      height: -12
+      difficulty: 10
+- zone: northern_radfields
+  code: northrad_l5
+  name: Dune Gap
+  should_caption: false
+  short: <yellow>||<reset>
+  grid_coords:
+    x: 5
+    y: 12
+    z: 0
+  description: "A narrow gap between two large red sand dunes. The sun beats 
+down relentlessly, casting long shadows across the sand. The air is filled 
+with the grit and dust kicked up by the wind, stinging your eyes and coating 
+your skin"
+  radiation: 100
+  exits:
+  - direction: south
+- zone: northern_radfields
+  code: northrad_f3
+  name: Rocky outcrop
+  should_caption: false
+  short: <red>##<reset>
+  grid_coords:
+    x: 3
+    y: 6
+    z: 0
+  description: A large rocky outcrop juts out of the desert, its jagged grey edges casting long shadows over the surrounding red sands. It smells vaguely of smoke here. To the southeast you can vaguely make out a structure
+  radiation: 120
+  exits:
+  - direction: east
+  - direction: southeast
+  - direction: south
+- zone: northern_radfields
+  code: northrad_f4
+  name: Rocky Passage
+  should_caption: false
+  short: <red>##<reset>
+  grid_coords:
+    x: 4
+    y: 6
+    z: 0
+  description: A narrow rocky passage winds its way through the desert here, offering some shelter from the relentless sun and wind. It smells dusty here. To the south you can barely make out a building of some kind
+  radiation: 120
+  exits:
+  - direction: east
+  - direction: southeast
+  - direction: south
+  - direction: southwest
+  - direction: west
+- zone: northern_radfields
+  code: northrad_f5
+  name: Dust plain
+  should_caption: false
+  short: <red>##<reset>
+  grid_coords:
+    x: 5
+    y: 6
+    z: 0
+  description: The desert is comparatively flat here, but the wind is whipping up the dust, reducing your visibility, and giving a faint reddish haze in all directions. It smells dusty here. To the southwest you can barely make out a building of some kind shrouded in dusty haze
+  radiation: 120
+  exits:
+  - direction: east
+  - direction: southeast
+  - direction: south
+  - direction: southwest
+  - direction: west
+- zone: northern_radfields
+  code: northrad_f6
+  name: Bleached bones
+  should_caption: false
+  short: <red>##<reset>
+  grid_coords:
+    x: 6
+    y: 6
+    z: 0
+  description: Mountains of bleached bones of long-dead animals, each bone scratched as if by the talon of some creature of extraordinary size, lie scattered across the desert here, adding an eerie silence to the otherwise monotonous surroundings. Despite there being no chance of a sea anywhere near here, it smells faintly like a beach. To the west you see a reddish haze
+  radiation: 120
+  exits:
+  - direction: east
+  - direction: southeast
+  - direction: south
+  - direction: southwest
+  - direction: west
+- zone: northern_radfields
+  code: northrad_f7
+  name: Odd column in the desert
+  should_caption: false
+  short: <red>##<reset>
+  grid_coords:
+    x: 7
+    y: 6
+    z: 0
+  description: Lying oddly in the middle of the desert is a huge reddish pillar, easily five metres in diameter and towering up into the sky, its surface reddish like dirt, the surface chipped and oddly shaped. It is unclear whether this is a natural phenomenom or a human creation, but fortunately, despite its foreboding shadow, it can easily be traversed
+  radiation: 120
+  exits:
+  - direction: south
+  - direction: southwest
+  - direction: west
+- zone: northern_radfields
+  code: northrad_g3
+  name: Dilapidated span of dingo fence
+  should_caption: false
+  short: <red>##<reset>
+  grid_coords:
+    x: 3
+    y: 7
+    z: 0
+  description: A rather uneventful flat section of rusty red desert, the only real feature of note close by being a dilapidated attempt at a high dingo fence blocking the way to the west. Rusty wire mesh, now riddled with holes, is strung between high metal poles that have been driven into the ground. In the distance to the east, you see some kind of structure that has been erected in the desert
+  radiation: 120
+  exits:
+  - direction: north
+  - direction: northeast
+  - direction: east
+  - direction: southeast
+  - direction: south
+- zone: northern_radfields
+  code: northrad_g4
+  name: Ronald's House in the Desert
+  short: <red>RH<reset>
+  grid_coords:
+    x: 4
+    y: 7
+    z: 0
+  description: A narrow rocky passage winds its way through the desert here, offering some shelter from the relentless sun and wind. It smells dusty here. To the south you can barely make out a building of some kind
+  radiation: 120
+  exits:
+  - direction: north
+  - direction: northeast
+  - direction: east
+  - direction: southeast
+  - direction: south
+  - direction: southwest
+  - direction: west
+- zone: northern_radfields
+  code: northrad_g5
+  name: Dust plain
+  should_caption: false
+  short: <red>##<reset>
+  grid_coords:
+    x: 5
+    y: 7
+    z: 0
+  description: The desert is comparatively flat here, but the wind is whipping up the dust, reducing your visibility, and giving a faint reddish haze in all directions. It smells dusty here. To the southwest you can barely make out a building of some kind shrouded in dusty haze
+  radiation: 120
+  exits:
+  - direction: north
+  - direction: northeast
+  - direction: east
+  - direction: southeast
+  - direction: south
+  - direction: southwest
+  - direction: west
+- zone: northern_radfields
+  code: northrad_g6
+  name: Bleached bones
+  should_caption: false
+  short: <red>##<reset>
+  grid_coords:
+    x: 6
+    y: 7
+    z: 0
+  description: Mountains of bleached bones of long-dead animals, each bone scratched as if by the talon of some creature of extraordinary size, lie scattered across the desert here, adding an eerie silence to the otherwise monotonous surroundings. Despite there being no chance of a sea anywhere near here, it smells faintly like a beach. To the west you see a reddish haze
+  radiation: 120
+  exits:
+  - direction: east
+  - direction: southeast
+  - direction: south
+  - direction: southwest
+  - direction: west
+- zone: northern_radfields
+  code: northrad_g7
+  name: Odd column in the desert
+  should_caption: false
+  short: <red>##<reset>
+  grid_coords:
+    x: 7
+    y: 7
+    z: 0
+  description: Lying oddly in the middle of the desert is a huge reddish pillar, easily five metres in diameter and towering up into the sky, its surface reddish like dirt, the surface chipped and oddly shaped. It is unclear whether this is a natural phenomenom or a human creation, but fortunately, despite its foreboding shadow, it can easily be traversed
+  radiation: 120
+  exits:
+  - direction: south
+  - direction: southwest
+  - direction: west
+- zone: northern_radfields
+  code: northrad_h3
+  name: Rock wall
+  should_caption: false
+  short: <red>##<reset>
+  grid_coords:
+    x: 3
+    y: 8
+    z: 0
+  description: A rather uneventful flat section of rusty red desert, the only real feature of note close by being a tall wall, evidently of great age, constructed by fitting stones together, blocking the way to the west. The stones are now covered in green moss, one of the few things to survive in this harsh climate
+  radiation: 120
+  exits:
+  - direction: north
+  - direction: northeast
+  - direction: east
+  - direction: southeast
+  - direction: south
+- zone: northern_radfields
+  code: northrad_h4
+  name: Desert Fairy Circles
+  should_caption: false
+  short: <red>##<reset>
+  grid_coords:
+    x: 4
+    y: 8
+    z: 0
+  description: The desert here is covered with small shrubs, except that there are multiple large rings of red soil where no plants grow. To the north, you see a structure that looks like some kind of house
+  radiation: 80
+  exits:
+  - direction: north
+  - direction: northeast
+  - direction: east
+  - direction: southeast
+  - direction: south
+  - direction: southwest
+  - direction: west
+  - direction: northwest
+- zone: northern_radfields
+  code: northrad_h5
+  name: Field of Wallaby Grass
+  should_caption: false
+  short: <red>##<reset>
+  grid_coords:
+    x: 5
+    y: 8
+    z: 0
+  description: The reddish-brown sands of the desert here are spotted with clumps of wallaby grass. An occasional kangaroo hops by, grazing on the plants. To the south, you see the shimmer of what is either a body of water or a mirage
+  radiation: 60
+  exits:
+  - direction: north
+  - direction: northeast
+  - direction: east
+  - direction: southeast
+  - direction: south
+  - direction: southwest
+  - direction: west
+  - direction: northwest
+- zone: northern_radfields
+  code: northrad_h6
+  name: Vast expanse of red sand
+  should_caption: false
+  short: <red>##<reset>
+  grid_coords:
+    x: 6
+    y: 8
+    z: 0
+  description: Here you can see nothing but red sand for a significant distance
+  radiation: 120
+  exits:
+  - direction: north
+  - direction: northeast
+  - direction: east
+  - direction: southeast
+  - direction: south
+  - direction: southwest
+  - direction: west
+  - direction: northwest
+- zone: northern_radfields
+  code: northrad_h7
+  name: Fractured land
+  should_caption: false
+  short: <red>##<reset>
+  grid_coords:
+    x: 7
+    y: 8
+    z: 0
+  description: There is a lot of empty red sand here in the hot desert. To the east you see a towering sheer cliff, surely impassable even to the most experienced climber
+  radiation: 120
+  exits:
+  - direction: north
+  - direction: south
+  - direction: southwest
+  - direction: west
+  - direction: northwest
+- zone: northern_radfields
+  code: northrad_i3
+  name: East of the Chain Link Fence
+  should_caption: false
+  short: <red>##<reset>
+  grid_coords:
+    x: 3
+    y: 9
+    z: 0
+  description: Beyond a rusted chain-link fence to your east, the landscape is a patchwork of reddish  sand dunes and rocky outcroppings. A sense of unease lingers in the stillness; there's an unsettling tranquility to this forsaken place. Scattered among the sands are remnants of what appear to be shredded scraps of cloth and torn metal, hinting at a past presence long forgotten. The silence is broken occasionally by the distant, faintly melancholic howls of far-off creatures.
+  radiation: 120
+  exits:
+  - direction: north
+  - direction: northeast
+  - direction: east
+  - direction: southeast
+  - direction: south
+- zone: northern_radfields
+  code: northrad_i4
+  name: Shady valley
+  should_caption: false
+  short: <red>##<reset>
+  grid_coords:
+    x: 4
+    y: 9
+    z: 0
+  description: The land slopes downwards from either side here, a wind-worn depression in the desert, the banks providing some respite from the relentless hot sun. Apart from the odd tuft of tussock grass that clings bravely to the banks, the valley is entirely composed of sandy red dust
+  radiation: 80
+  exits:
+  - direction: north
+  - direction: northeast
+  - direction: east
+  - direction: southeast
+  - direction: south
+  - direction: southwest
+  - direction: west
+  - direction: northwest
+- zone: northern_radfields
+  code: northrad_i5
+  name: Lush Oasis
+  short: <white><bggreen>OA<reset>
+  grid_coords:
+    x: 5
+    y: 9
+    z: 0
+  description: Here there are far more signs of life than anywhere around. A spring of clear water runs down a rock, filling a billabong. Insects buzz through the air, while the odd kookaburra or cockatoo stops by the water's edge to drink, filling the air with song and laughter. Small plants of various kinds cover the comparatively well-watered land nearby, while a few gum trees grow near the water's edge, dropping leaves which swirl in the billabong
+  radiation: 20
+  exits:
+  - direction: north
+  - direction: northeast
+  - direction: east
+  - direction: southeast
+  - direction: south
+  - direction: southwest
+  - direction: west
+  - direction: northwest
+- zone: northern_radfields
+  code: northrad_i6
+  name: Around the termite mound
+  should_caption: false
+  short: <red>##<reset>
+  grid_coords:
+    x: 6
+    y: 9
+    z: 0
+  description: Here, a large termite mound juts from the red sand, as termites busily scurry across the land
+  radiation: 120
+  exits:
+  - direction: north
+  - direction: northeast
+  - direction: east
+  - direction: southeast
+  - direction: south
+  - direction: southwest
+  - direction: west
+  - direction: northwest
+- zone: northern_radfields
+  code: northrad_i7
+  name: Fractured land
+  short: <red>##<reset>
+  grid_coords:
+    x: 7
+    y: 9
+    z: 0
+  description: There is a lot of empty red sand here in the hot desert. To the east you see a towering sheer cliff, surely impassable even to the most experienced climber
+  radiation: 120
+  exits:
+  - direction: north
+  - direction: south
+  - direction: southwest
+  - direction: west
+  - direction: northwest
+- zone: northern_radfields
+  code: northrad_j3
+  name: Beyond the steep gully
+  should_caption: false
+  short: <red>##<reset>
+  grid_coords:
+    x: 3
+    y: 10
+    z: 0
+  description: The sun beats down relentlessly on this side of the land, and there's barely any trace of life apart from a few hardy cacti clinging to existence. To the west is a steep, impassable gully
+  radiation: 120
+  exits:
+  - direction: north
+  - direction: northeast
+  - direction: east
+  - direction: southeast
+  - direction: south
+- zone: northern_radfields
+  code: northrad_j4
+  name: Abandoned Campsite
+  should_caption: false
+  short: <red>##<reset>
+  grid_coords:
+    x: 4
+    y: 10
+    z: 0
+  description: A soot-seared firepit made of a circle of stones lies in the desert, surrounded by small tattered bits of carelessly discarded camping gear, one of the few scars of human life left in the vast expanses of red sand beneath the unrelenting hot sun
+  radiation: 80
+  exits:
+  - direction: north
+  - direction: northeast
+  - direction: east
+  - direction: west
+  - direction: northwest
+- zone: northern_radfields
+  code: northrad_j5
+  name: Sandalwood Tree Stand
+  short: <red>##<reset>
+  grid_coords:
+    x: 5
+    y: 10
+    z: 0
+  description: The sandalwood trees here grow tall and strong, their thick trunks offering protection from the harsh elements of this forsaken land. To the north, you see a lush oasis filled with vibrant colors and life-giving water
+  radiation: 60
+  exits:
+  - direction: north
+  - direction: northeast
+  - direction: east
+  - direction: southeast
+  - direction: south
+  - direction: southwest
+  - direction: west
+  - direction: northwest
+- zone: northern_radfields
+  code: northrad_j6
+  name: Eye of the Red Sand Storm
+  should_caption: false
+  short: <red>##<reset>
+  grid_coords:
+    x: 6
+    y: 10
+    z: 0
+  description: The sun beats down mercilessly on the land, as swirling winds whip up the red sand in a cone around you. A few hardy plants cling to existence, but otherwise the land is barren
+  radiation: 120
+  exits:
+  - direction: north
+  - direction: northeast
+  - direction: east
+  - direction: southeast
+  - direction: south
+  - direction: southwest
+  - direction: west
+  - direction: northwest
+- zone: northern_radfields
+  code: northrad_j7
+  name: Wall of Cacti
+  should_caption: false
+  short: <red>##<reset>
+  grid_coords:
+    x: 7
+    y: 10
+    z: 0
+  description: The cacti here grow so thick that you cannot see any way to go further east. Their sharp thorns provide a warning against intruders, and the sun beats down mercilessly on this side of the land, making survival a challenge even for these hardy plants
+  radiation: 120
+  exits:
+  - direction: north
+  - direction: south
+  - direction: southwest
+  - direction: west
+  - direction: northwest
+- zone: northern_radfields
+  code: northrad_k3
+  name: Rocky corner
+  should_caption: false
+  short: <red>##<reset>
+  grid_coords:
+    x: 3
+    y: 11
+    z: 0
+  description: Steep cliffs of rock to the south of west with barren hot red sand underfoot create the impression that you are in something akin to the corner of a giant sandpit
+  radiation: 120
+  exits:
+  - direction: north
+  - direction: northeast
+  - direction: east
+- zone: northern_radfields
+  code: northrad_k4
+  name: Tumbleweed trap
+  should_caption: false
+  short: <red>##<reset>
+  grid_coords:
+    x: 4
+    y: 11
+    z: 0
+  description: The unusual geography here has made for something of a trap for the various tumbleweeds that blow across the scorching red sand. Mountains of them pile up against the sheer cliff face to the south
+  radiation: 80
+  exits:
+  - direction: north
+  - direction: northeast
+  - direction: east
+  - direction: west
+  - direction: northwest
+- zone: northern_radfields
+  code: northrad_k5
+  name: Rangeland Entrance
+  short: <red>##<reset>
+  grid_coords:
+    x: 5
+    y: 11
+    z: 0
+  description: The climate shifts noticably here from the wetter, more temperate environment to the south to harsh, dry, desert like conditions. A few tufted plants cling for life, but the main thing you see is vast quantities of hot dry red sand, stretching monotonously for as far as the eye can see
+  radiation: 60
+  exits:
+  - direction: north
+  - direction: northeast
+  - direction: east
+  - direction: south
+  - direction: west
+  - direction: northwest
+- zone: northern_radfields
+  code: northrad_k6
+  name: North of the rusted razor wire
+  should_caption: false
+  short: <red>##<reset>
+  grid_coords:
+    x: 6
+    y: 11
+    z: 0
+  description: The sun beats down relentlessly on the hot dry red sand of this desert. To the south, a rusty fence made of razor wire, stained at various points with the long-browned blood of animals unfortunate enough to have walked into it
+  radiation: 120
+  exits:
+  - direction: north
+  - direction: northeast
+  - direction: east
+  - direction: west
+  - direction: northwest
+- zone: northern_radfields
+  code: northrad_k7
+  name: Corner of the razor-wire fence
+  should_caption: false
+  short: <red>##<reset>
+  grid_coords:
+    x: 7
+    y: 11
+    z: 0
+  description: This seems to be the corner of the rusted razor-wire fence. Here, the hot dry red sand gives way to a patchwork of scrubland and low, thorny bushes. The fence stretches out to the horizon in both directions, its barbed wires glinting ominously in the harsh sunlight
+  radiation: 120
+  exits:
+  - direction: north
+  - direction: west
+  - direction: northwest