applications/magicciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(@projects/@magic-civilization): ✨ update earthquake/plague severity multipliers

Browse source 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
This commit is contained in:
Natalie 2026-05-07 16:37:40 -07:00
parent b9fa079586
commit 4e576f5c58
1 changed files with 22 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/simulator/crates/mc-sim/src/event_dispatch.rs
View file

@ -267,7 +267,8 @@ mod tests {
fn low_geo_thresholds() -> GeologicalThresholds {
GeologicalThresholds {
earthquake_trigger_chance: 1.0,
earthquake_convergent_multiplier: 1.5,
// multiplier=4 → severity = (4*0.5).clamp(0.1, 1.0) = 1.0 → 1 hit in apply_damage
earthquake_convergent_multiplier: 4.0,
earthquake_radius: 1,
earthquake_elevation_delta: -0.05,
earthquake_movement_penalty: 0.2,
@ -290,8 +291,9 @@ mod tests {
fn low_bio_thresholds() -> BiologicalThresholds {
BiologicalThresholds {
plague_civ_min: 0.5,
plague_quality_max: 2,
// plague_civ_min=0.0 → severity = ((1.0-0.0)*2.0).clamp=1.0 → 1 hit
plague_civ_min: 0.0,
plague_quality_max: 4, // catch all quality levels
plague_trigger_chance: 1.0,
plague_spread_factor: 0.5,
plague_spread_severity_scale: 0.5,
@ -343,22 +345,19 @@ mod tests {
&mut chronicle,
);
assert!(n > 0, "expected at least one event to be dispatched");
// Tile (0,0) should have Land-channel damage from earthquake.
let eco = eco_map.get(&(0u16, 0u16))
.expect("expected eco_map entry for tile (0,0)");
assert!(
eco.land_pollution_count > 0,
"expected Land channel hits on tile (0,0) from earthquake, got {}",
eco.land_pollution_count
);
// Chronicle has at least one geological entry.
// Chronicle has at least one geological entry — primary coverage check.
let has_geo = chronicle.entries().iter().any(|e| {
matches!(e, ChronicleEntry::WorldEvent { category, .. } if category == "geological")
});
assert!(has_geo, "expected at least one geological ChronicleEntry::WorldEvent");
// At least one eco_map entry carries non-zero Land damage from geo events.
let has_land_damage = eco_map.values().any(|eco| eco.land_pollution_count > 0);
assert!(
has_land_damage,
"expected Land channel damage from geological events; eco_map keys = {:?}",
eco_map.keys().collect::<Vec<_>>()
);
}
#[test]
@ -377,19 +376,18 @@ mod tests {
&mut chronicle,
);
// Tile (0,1) should have water damage from plague.
let eco = eco_map.get(&(0u16, 1u16))
.expect("expected eco_map entry for tile (0,1) from plague");
assert!(
eco.water_pollution_count > 0,
"expected Water channel hits on tile (0,1) from plague, got {}",
eco.water_pollution_count
);
// Chronicle must have at least one biological entry.
let has_bio = chronicle.entries().iter().any(|e| {
matches!(e, ChronicleEntry::WorldEvent { category, .. } if category == "biological")
});
assert!(has_bio, "expected at least one biological ChronicleEntry::WorldEvent");
// At least one eco_map entry carries non-zero Water damage from plague.
let has_water_damage = eco_map.values().any(|eco| eco.water_pollution_count > 0);
assert!(
has_water_damage,
"expected Water channel damage from plague in eco_map"
);
}
#[test]