Weather above ground: rain puts out fires, fog shortens sight, storms strike with lightning

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

src/bridges.rs

@@ -56,7 +56,8 @@ impl Game {
             return;
         }
         let i = idx(tx, ty);
-        if !self.wooden_bridge(i) || self.burning(i) {
+        // nothing catches fire in the rain
+        if !self.wooden_bridge(i) || self.burning(i) || self.rain_at(i) {
             return;
         }
         self.bridgework.burning.push((i, 0.0));

src/fog.rs

@@ -137,7 +137,7 @@ impl Game {
             }
         }
         // what the creatures and towers see along open ground (walls stop the view)
-        let mut eyes: Vec<(usize, i32)> = self.ents.iter().filter(|e| e.alive && !e.held && !e.hero && (e.side == self.me_side || self.allied(self.me_side, e.side)) && !e.chained).map(|e| (e.tile(), SIGHT)).collect();
+        let mut eyes: Vec<(usize, i32)> = self.ents.iter().filter(|e| e.alive && !e.held && !e.hero && (e.side == self.me_side || self.allied(self.me_side, e.side)) && !e.chained).map(|e| (e.tile(), self.sight_at(e.tile(), SIGHT))).collect();
         let solo = self.masters.is_empty();
         eyes.extend(self.towers.iter().filter(|t| !t.hero && (solo || allies.contains(&self.map.t[t.tile].owner))).map(|t| (t.tile, t.range() as i32 + 1)));
         let mut stamp = vec![0u32; n];

src/game.rs

@@ -636,6 +636,8 @@ pub struct Game {
     #[serde(default)]
     pub bridgework: crate::bridges::BridgeWork, // burning and worn bridges
     #[serde(default)]
+    pub weather: crate::weather::Weather, // above ground (weather.rs)
+    #[serde(default)]
     pub trading: crate::traders::Trading, // the visiting trader (traders.rs)
     #[serde(default)]
     pub happenings: Option<crate::events::Events>, // random events (free games and versus), see events.rs
@@ -991,6 +993,7 @@ impl Game {
             vrng: crate::particles::vrng(),
             dwarf_caves: Vec::new(),
             bridgework: Default::default(),
+            weather: Default::default(),
             trading: Default::default(),
             happenings: None,
             snares: Vec::new(),
@@ -1805,6 +1808,7 @@ impl Game {
             self.update_rivals(dt);
         }
         self.update_dwarves(dt);
+        self.update_weather(dt);
         self.update_bridges(dt);
         self.update_wood(dt);
         self.update_events(dt);

src/main.rs

@@ -31,6 +31,7 @@ mod research;
 mod rival;
 mod rogues;
 mod talents;
+mod weather;
 mod render3d;
 mod rooms;
 mod save;

src/render3d.rs

@@ -512,6 +512,11 @@ fn room_level_at(map: &Map, t: &Tile) -> u8 {
 }
 
 // Ambient light field: own territory is lit, foreign areas are dim
+thread_local! {
+    // daylight above ground (bad weather dims it), in tenths
+    static SKY_LIGHT: std::cell::Cell<u32> = const { std::cell::Cell::new(16) };
+}
+
 fn ambient_field(map: &Map) -> Vec<f32> {
     let mut f = vec![0.0f32; n()];
     for (i, t) in map.t.iter().enumerate() {
@@ -522,7 +527,7 @@ fn ambient_field(map: &Map) -> Vec<f32> {
         };
         // daylight above ground (cliffs and trees too)
         if map.sky(i) {
-            f[i] = 1.6;
+            f[i] = SKY_LIGHT.with(|s| s.get()) as f32 / 10.0;
         }
         // rooms of a higher level shine brighter
         let lv = room_level_at(map, t);
@@ -1279,6 +1284,14 @@ impl R3d {
     fn update_chunks(&mut self, g: &Game, gfx: &Gfx, m: &Mat4) {
         self.ensure_chunks();
         let side = g.me.side().min(7);
+        // the weather dims the daylight: the chunks above ground are lit again in steps
+        let sky = ((1.6 * (1.0 - g.weather.gloom())) * 10.0).round() as u32;
+        if SKY_LIGHT.with(|s| s.get()) != sky {
+            SKY_LIGHT.with(|s| s.set(sky));
+            for ch in self.chunks.iter_mut() {
+                ch.sig = 0;
+            }
+        }
         if view_side() != side {
             // another master looks: the marks change colour
             VIEW_SIDE.with(|v| v.set(side));
@@ -1609,6 +1622,7 @@ impl R3d {
         }
         draw_traps_glow(g, t);
         draw_parts_glow(g);
+        draw_weather(g, cam, t);
         gl_use_default_material();
         crate::ui::begin_ui();
         if let (Some((_, _, k)), Some((rt, tw, th))) = (pix, self.target.as_ref()) {
@@ -1629,7 +1643,7 @@ impl R3d {
             let (ix, iz) = (x as i32, z as i32);
             let own = g.map.get(ix, iz).map_or(false, |t| matches!(t.owner, Owner::Player | Owner::Rival1 | Owner::Rival2 | Owner::Rival3));
             if inb(ix, iz) && g.map.sky(idx(ix, iz)) {
-                0.95
+                0.95 * (1.0 - 0.6 * g.weather.gloom())
             } else if own {
                 0.75
             } else {
@@ -2489,6 +2503,69 @@ fn draw_landmarks_solid(g: &Game, t: f32) {
     let _ = t;
 }
 
+// rain streaks and fog veils over the land above ground near the camera; a storm's lightning
+// lights the sky up for a moment
+fn draw_weather(g: &Game, cam: &Cam, t: f32) {
+    let w = &g.weather;
+    if w.level <= 0.01 || g.map.sky.is_empty() {
+        return;
+    }
+    let (cx, cz) = (cam.rx as i32, cam.rz as i32);
+    let reach = (cam.view_h() * 1.2) as i32 + 4;
+    let sky = |x: i32, z: i32| inb(x, z) && g.map.sky(idx(x, z));
+    // fog: veils at two heights, one plane per run of open sky tiles in a row
+    let fog = w.fog();
+    if fog > 0.01 {
+        for (h, a) in [(0.7f32, 0.22f32), (1.6, 0.16)] {
+            let col = Color::new(0.75, 0.78, 0.8, a * fog);
+            for z in cz - reach..=cz + reach {
+                let mut x = cx - reach;
+                while x <= cx + reach {
+                    if !sky(x, z) {
+                        x += 1;
+                        continue;
+                    }
+                    let x0 = x;
+                    while x <= cx + reach && sky(x, z) {
+                        x += 1;
+                    }
+                    let len = (x - x0) as f32;
+                    let drift = (t * 0.2 + z as f32 * 0.7).sin() * 0.15;
+                    draw_plane(vec3(x0 as f32 + len * 0.5 + drift, h, z as f32 + 0.5), vec2(len * 0.5, 0.5), None, col);
+                }
+            }
+        }
+    }
+    // rain: slanted streaks falling over the open land
+    let rain = w.rain();
+    if rain > 0.01 {
+        let n = (1100.0 * rain) as u32;
+        let col = Color::new(0.75, 0.82, 0.95, 0.8);
+        let span = (2 * reach + 1) as u32;
+        for k in 0..n {
+            let h = k.wrapping_mul(2654435761) ^ 0x9e37_79b9;
+            let x = cx - reach + (h % span) as i32;
+            let z = cz - reach + ((h >> 11) % span) as i32;
+            if !sky(x, z) {
+                continue;
+            }
+            let fx = x as f32 + ((h >> 3) % 100) as f32 / 100.0;
+            let fz = z as f32 + ((h >> 17) % 100) as f32 / 100.0;
+            let fall = (t * 1.6 + (h % 1000) as f32 / 1000.0).fract();
+            let y = 3.0 * (1.0 - fall);
+            line3(vec3(fx, y + 0.5, fz - 0.08), vec3(fx + 0.05, y, fz + 0.08), 0.035, col);
+        }
+    }
+    // the flash of a lightning bolt
+    let since = g.time - w.flash;
+    if w.flash > 0.0 && (0.0..0.25).contains(&since) {
+        let a = 0.35 * (1.0 - since / 0.25);
+        for z in (cz - reach..=cz + reach).step_by(4) {
+            draw_plane(vec3(cx as f32, 0.05, z as f32 + 2.0), vec2(reach as f32, 2.0), None, Color::new(0.9, 0.92, 1.0, a));
+        }
+    }
+}
+
 // growth stage of a giant mushroom: 0 a sprout .. 4 fully grown (felling only then)
 fn mushroom_stage(t: &Tile) -> u32 {
     if t.grown() {

src/scenes.rs

@@ -264,3 +264,22 @@ fn export_rogues_scene() {
     g.snares.push(idx(cx + 7, cy + 3));
     save("rogues", &mut g, cx as f32 + 6.5, cy as f32 + 4.5, 8.0, 0.0, false);
 }
+
+// weather above ground: rain and fog over the land
+#[test]
+#[ignore]
+fn export_weather_scenes() {
+    std::fs::create_dir_all("/tmp/scenes").unwrap();
+    for (name, kind) in [("weather-rain", crate::weather::RAIN), ("weather-fog", crate::weather::FOG), ("weather-storm", crate::weather::STORM)] {
+        let mut g = Game::new(7, 96, 96);
+        g.add_surface(7, 0.5, 3);
+        g.weather = crate::weather::Weather { kind, shown: kind, level: 1.0, left: 900.0, ..Default::default() };
+        // the camera on the land above ground, near the edge of the dungeon side
+        let i = (0..g.map.t.len()).filter(|&i| g.map.sky(i)).min_by_key(|&i| {
+            let (x, y) = xy(i);
+            (x - 52).abs() + (y - 48).abs()
+        }).unwrap();
+        let (x, y) = xy(i);
+        save(name, &mut g, x as f32 + 4.5, y as f32 + 0.5, 18.0, 0.0, false);
+    }
+}

src/ui.rs

@@ -809,6 +809,13 @@ impl Ui {
             };
             segs.insert(3, vec![txt(tr(key), col), Part::Gap, Part::Bar(rv.hp / crate::rival::RIVAL_CORE_HP, col)]);
         }
+        // the weather above ground (maps with land above ground only)
+        if g.has_sky() {
+            let w = &g.weather;
+            let k = if w.level > 0.05 { w.shown } else { crate::weather::FAIR };
+            let col = [GOLD, Color::new(0.55, 0.7, 1.0, 1.0), Color::new(0.75, 0.78, 0.8, 1.0), Color::new(0.75, 0.6, 1.0, 1.0)][k as usize];
+            segs.push(vec![txt(tr(crate::weather::NAMES[k as usize]), col)]);
+        }
         if g.waves_on() {
             segs.push(vec![txt(trf("hud.wave", &[(g.wave + 1).to_string()]), wave_col), Part::Gap, txt(mmss(g.wave_timer), TXT)]);
         }

src/weather.rs

@@ -0,0 +1,240 @@
+// Weather above ground: mostly fair, now and then rain, fog or a storm, each for a few minutes
+// with soft changes. Rain puts out burning bridges and keeps fire from catching; fog shortens the
+// sight of everyone outside; a storm brings both rain and lightning that strikes units and trees.
+// Only maps with land above ground have weather. It runs in the shared simulation (same on every
+// computer of a match).
+
+use crate::game::*;
+use crate::map::*;
+use serde::{Deserialize, Serialize};
+
+pub const FAIR: u8 = 0;
+pub const RAIN: u8 = 1;
+pub const FOG: u8 = 2;
+pub const STORM: u8 = 3;
+pub const NAMES: [&str; 4] = ["weather.fair", "weather.rain", "weather.fog", "weather.storm"];
+
+// seconds for a change to fade in or out
+const FADE: f32 = 20.0;
+// damage of a lightning strike
+pub const BOLT_DAMAGE: f32 = 40.0;
+
+#[derive(Clone, Debug, Default, Serialize, Deserialize)]
+pub struct Weather {
+    pub kind: u8,       // the weather that is coming or here
+    pub shown: u8,      // the weather that is felt now (changes when the old one has faded out)
+    pub level: f32,     // how strong it is: 0 none .. 1 full
+    pub left: f32,      // seconds until the next change
+    pub strike_t: f32,  // seconds until the next lightning (storm)
+    pub flash: f32,     // game time of the last lightning (the sky lights up)
+}
+
+// the weather that comes next: about 60% fair, 20% rain, 12% fog, 8% storm
+fn pick(r: f32) -> u8 {
+    if r < 0.6 {
+        FAIR
+    } else if r < 0.8 {
+        RAIN
+    } else if r < 0.92 {
+        FOG
+    } else {
+        STORM
+    }
+}
+
+impl Weather {
+    // strength of an effect: rain falls in rain and storms, fog in fog (a little in storms)
+    pub fn rain(&self) -> f32 {
+        if matches!(self.shown, RAIN | STORM) { self.level } else { 0.0 }
+    }
+    pub fn fog(&self) -> f32 {
+        match self.shown {
+            FOG => self.level,
+            STORM => self.level * 0.4,
+            _ => 0.0,
+        }
+    }
+    // how much the daylight is dimmed (0 .. 1)
+    pub fn gloom(&self) -> f32 {
+        self.level
+            * match self.shown {
+                RAIN => 0.3,
+                FOG => 0.2,
+                STORM => 0.55,
+                _ => 0.0,
+            }
+    }
+}
+
+impl Game {
+    pub fn has_sky(&self) -> bool {
+        self.map.sky.iter().any(|&s| s)
+    }
+
+    // it rains on tile i right now (enough to put out fire)
+    pub fn rain_at(&self, i: usize) -> bool {
+        self.weather.rain() > 0.4 && self.map.sky(i)
+    }
+
+    // sight of a unit standing on tile i (fog outside shortens it)
+    pub fn sight_at(&self, i: usize, base: i32) -> i32 {
+        if !self.map.sky(i) {
+            return base;
+        }
+        ((base as f32) * (1.0 - 0.5 * self.weather.fog())).round().max(2.0) as i32
+    }
+
+    pub(crate) fn update_weather(&mut self, dt: f32) {
+        if self.map.sky.is_empty() {
+            return;
+        }
+        let w = &mut self.weather;
+        w.left -= dt;
+        if w.left <= 0.0 {
+            // after bad weather it clears up more often
+            let r = self.rng.f();
+            let next = if w.kind != FAIR && r < 0.5 { FAIR } else { pick(self.rng.f()) };
+            let w = &mut self.weather;
+            w.kind = next;
+            w.left = if next == FAIR { 180.0 + self.rng.f() * 240.0 } else { 90.0 + self.rng.f() * 150.0 };
+            let w = &mut self.weather;
+            if w.kind != w.shown || w.level < 0.99 {
+                let key = ["msg.weather_clear", "msg.weather_rain", "msg.weather_fog", "msg.weather_storm"][next as usize];
+                if next != FAIR || w.shown != FAIR {
+                    self.tell_local(key, vec![], None);
+                }
+            }
+        }
+        // soft changes: the old weather fades out before the new one fades in
+        let w = &mut self.weather;
+        if w.shown != w.kind {
+            w.level -= dt / FADE;
+            if w.level <= 0.0 {
+                w.level = 0.0;
+                w.shown = w.kind;
+            }
+        } else if w.kind != FAIR {
+            w.level = (w.level + dt / FADE).min(1.0);
+        } else {
+            w.level = (w.level - dt / FADE).max(0.0);
+        }
+        // rain puts out the burning bridges outside
+        if self.weather.rain() > 0.4 && !self.bridgework.burning.is_empty() {
+            let map = &self.map;
+            self.bridgework.burning.retain(|b| !map.sky(b.0));
+        }
+        // lightning in a storm
+        if self.weather.shown == STORM && self.weather.level > 0.6 {
+            self.weather.strike_t -= dt;
+            if self.weather.strike_t <= 0.0 {
+                self.weather.strike_t = 6.0 + self.rng.f() * 14.0;
+                self.lightning_strike();
+            }
+        }
+    }
+
+    // a bolt from the sky: a unit outside (now and then) or a tree, else bare land
+    pub(crate) fn lightning_strike(&mut self) {
+        let outside: Vec<usize> = (0..self.ents.len()).filter(|&j| {
+            let e = &self.ents[j];
+            e.alive && !e.held && e.captive == 0 && self.map.sky(e.tile())
+        }).collect();
+        let r = self.rng.f();
+        let (x, y) = if r < 0.35 && !outside.is_empty() {
+            let j = outside[(self.rng.next() as usize) % outside.len()];
+            let e = &mut self.ents[j];
+            e.hp -= BOLT_DAMAGE;
+            e.flash = 0.3;
+            let (x, y, side, kind, hero, dead) = (e.x, e.y, e.side, e.kind, e.hero, e.hp <= 0.0);
+            if !hero && side == self.local_side {
+                self.tell_local("msg.lightning_unit", vec![format!("@{}", st(kind).name)], None);
+            }
+            if dead {
+                self.kill(j);
+            }
+            (x, y)
+        } else {
+            let trees: Vec<usize> = (0..self.map.t.len()).filter(|&i| self.map.t[i].kind == Kind::Tree && self.map.sky(i)).collect();
+            if let Some(&i) = trees.get((self.rng.next() as usize) % trees.len().max(1)) {
+                // the tree is split and burns down
+                let t = &mut self.map.t[i];
+                t.kind = Kind::Floor;
+                t.owner = Owner::None;
+                t.marked = false;
+                t.hp = 0.0;
+                let (tx, ty) = xy(i);
+                self.fx(3, tx as f32 + 0.5, ty as f32 + 0.5, 0.0, 0.0, 1.2, 0xff304050);
+                (tx as f32 + 0.5, ty as f32 + 0.5)
+            } else {
+                let sky: Vec<usize> = (0..self.map.t.len()).filter(|&i| self.map.sky(i)).collect();
+                let Some(&i) = sky.get((self.rng.next() as usize) % sky.len().max(1)) else { return };
+                let (tx, ty) = xy(i);
+                (tx as f32 + 0.5, ty as f32 + 0.5)
+            }
+        };
+        self.weather.flash = self.time;
+        self.fx(1, x, y, 0.0, 0.0, 0.5, 0xffffeeaa);
+        self.sfx(Sfx::Lightning, x, y);
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn surface_game() -> Game {
+        let mut g = Game::new(7, 96, 96);
+        g.add_surface(7, 0.5, 3);
+        assert!(g.has_sky());
+        g
+    }
+
+    #[test]
+    fn the_weather_changes_and_is_mostly_fair() {
+        let mut g = surface_game();
+        let mut seen = [0usize; 4];
+        for _ in 0..(4 * 60 * 60) {
+            g.update_weather(1.0);
+            seen[g.weather.shown as usize] += 1;
+        }
+        assert!(seen[FAIR as usize] > seen.iter().sum::<usize>() / 3, "{:?}", seen);
+        assert!(seen.iter().filter(|&&n| n > 0).count() >= 3, "several kinds of weather: {:?}", seen);
+        // no weather underground only
+        let mut u = Game::new(7, 96, 96);
+        u.weather.left = 0.0;
+        u.update_weather(1.0);
+        assert_eq!(u.weather.level, 0.0);
+    }
+
+    #[test]
+    fn rain_puts_out_fires_and_fog_shortens_sight() {
+        let mut g = surface_game();
+        let i = (0..g.map.t.len()).find(|&i| g.map.sky(i)).unwrap();
+        g.bridgework.burning.push((i, 0.0));
+        g.weather = Weather { kind: RAIN, shown: RAIN, level: 1.0, left: 100.0, ..Default::default() };
+        g.update_weather(0.1);
+        assert!(g.bridgework.burning.is_empty(), "rain puts the fire out");
+        assert!(g.rain_at(i));
+        g.weather = Weather { kind: FOG, shown: FOG, level: 1.0, left: 100.0, ..Default::default() };
+        assert!(g.sight_at(i, 6) < 6);
+        let under = (0..g.map.t.len()).find(|&i| !g.map.sky(i)).unwrap();
+        assert_eq!(g.sight_at(under, 6), 6, "underground nothing changes");
+    }
+
+    #[test]
+    fn storms_strike_with_lightning() {
+        let mut g = surface_game();
+        let trees0 = g.map.t.iter().filter(|t| t.kind == Kind::Tree).count();
+        let i = (0..g.map.t.len()).find(|&i| g.map.sky(i) && g.map.t[i].walkable()).unwrap();
+        let (x, y) = xy(i);
+        let id = g.spawn(EK::Knight, true, x as f32 + 0.5, y as f32 + 0.5, 1);
+        g.weather = Weather { kind: STORM, shown: STORM, level: 1.0, left: 1000.0, ..Default::default() };
+        for _ in 0..30 {
+            g.lightning_strike();
+        }
+        let trees = g.map.t.iter().filter(|t| t.kind == Kind::Tree).count();
+        let hurt = g.ents.iter().find(|e| e.id == id).map_or(true, |e| e.hp < e.max_hp);
+        assert!(trees < trees0 || hurt, "lightning hit something");
+        assert!(g.weather.flash > 0.0 || g.time == 0.0);
+    }
+}