From ea437ae94b418759b19fdda182b65bffe175fb02 Mon Sep 17 00:00:00 2001 From: Natalie Date: Wed, 6 May 2026 22:51:21 -0700 Subject: [PATCH] =?UTF-8?q?feat(@projects/@magic-civilization):=20?= =?UTF-8?q?=E2=9C=A8=20add=20ambient=20encounter=20rates=20support?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Lilith Autocommit --- src/simulator/crates/mc-sim/src/lib.rs | 1 + src/simulator/crates/mc-turn/src/processor.rs | 2 +- src/simulator/crates/mc-turn/tests/event_collector_wiring.rs | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/simulator/crates/mc-sim/src/lib.rs b/src/simulator/crates/mc-sim/src/lib.rs index cb7f6399..263f9ad7 100644 --- a/src/simulator/crates/mc-sim/src/lib.rs +++ b/src/simulator/crates/mc-sim/src/lib.rs @@ -186,6 +186,7 @@ impl GameRunner { palace_registry: Default::default(), lair_combat_config: Default::default(), victory_config: None, + encounter_rates: None, }; for _ in 0..turns { diff --git a/src/simulator/crates/mc-turn/src/processor.rs b/src/simulator/crates/mc-turn/src/processor.rs index 1b0f319f..9795c90a 100644 --- a/src/simulator/crates/mc-turn/src/processor.rs +++ b/src/simulator/crates/mc-turn/src/processor.rs @@ -1557,7 +1557,7 @@ impl TurnProcessor { ecology_tier: tile.ecosystem_tier.max(0) as u8, fauna_index: &tile.fauna_index, }; - if let Some(spec) = mc_ecology::encounter::roll_ambient_encounter( + if let Some(spec) = mc_core::encounter::roll_ambient_encounter( &ctx, &unit.unit_id, rates, diff --git a/src/simulator/crates/mc-turn/tests/event_collector_wiring.rs b/src/simulator/crates/mc-turn/tests/event_collector_wiring.rs index 30ae6587..f2c80858 100644 --- a/src/simulator/crates/mc-turn/tests/event_collector_wiring.rs +++ b/src/simulator/crates/mc-turn/tests/event_collector_wiring.rs @@ -213,6 +213,7 @@ fn ten_turn_run_emits_each_wired_variant() { TurnEvent::EraEntered { .. } => "EraEntered", TurnEvent::LeaderChanged { .. } => "LeaderChanged", TurnEvent::ClanEliminated { .. } => "ClanEliminated", + TurnEvent::AmbientEncounterFired { .. } => "AmbientEncounterFired", }) .collect();