From cd94244cc6a02090e2e22b790b129147efddc3dd Mon Sep 17 00:00:00 2001 From: Natalie Date: Sat, 2 May 2026 18:47:16 -0400 Subject: [PATCH] =?UTF-8?q?feat(@projects/@magic-civilization):=20?= =?UTF-8?q?=E2=9C=A8=20add=20cavalry=20actions=20and=20combat=20defaults?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Lilith Autocommit --- .../games/age-of-dwarves/data/unit_actions.json | 2 +- src/simulator/crates/mc-combat/src/lib.rs | 1 + src/simulator/crates/mc-combat/tests/golden.rs | 1 + src/simulator/crates/mc-core/src/action.rs | 16 ++++++++++++++++ 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/public/games/age-of-dwarves/data/unit_actions.json b/public/games/age-of-dwarves/data/unit_actions.json index 65ff2b5e..380d67c9 100644 --- a/public/games/age-of-dwarves/data/unit_actions.json +++ b/public/games/age-of-dwarves/data/unit_actions.json @@ -15,9 +15,9 @@ "arcing": [], "amphibious": ["embark", "disembark"], "sentry": ["sentry"], + "cavalry": ["charge", "pursue", "wheel"], "infantry_line": ["shield_wall", "brace", "shove"], "infantry_shock": ["rage", "cleave", "war_cry"], - "cavalry": ["charge", "pursue", "wheel"], "engineer": ["build_bridge", "sap_wall", "breach_charge", "fortify_hex", "demolish"], "medic": ["triage", "field_aura", "stabilise", "remove_status"], "scout": ["stealth", "lookout", "ambush", "mark_trail"] diff --git a/src/simulator/crates/mc-combat/src/lib.rs b/src/simulator/crates/mc-combat/src/lib.rs index 64fa72e4..5dca9dc6 100644 --- a/src/simulator/crates/mc-combat/src/lib.rs +++ b/src/simulator/crates/mc-combat/src/lib.rs @@ -68,6 +68,7 @@ mod resurrection_tests { city_wall_tier: 0, city_has_garrison: false, attacker_is_siege: false, + ..Default::default() }; let result = CombatResolver::resolve(¶ms); diff --git a/src/simulator/crates/mc-combat/tests/golden.rs b/src/simulator/crates/mc-combat/tests/golden.rs index feeb6381..0677591d 100644 --- a/src/simulator/crates/mc-combat/tests/golden.rs +++ b/src/simulator/crates/mc-combat/tests/golden.rs @@ -186,6 +186,7 @@ fn build_params(case: &CombatCase) -> CombatParams { city_wall_tier: case.city_wall_tier, city_has_garrison: case.city_has_garrison, attacker_is_siege: case.attacker_is_siege, + ..Default::default() } } diff --git a/src/simulator/crates/mc-core/src/action.rs b/src/simulator/crates/mc-core/src/action.rs index 6d2dc514..aa11be89 100644 --- a/src/simulator/crates/mc-core/src/action.rs +++ b/src/simulator/crates/mc-core/src/action.rs @@ -1351,6 +1351,10 @@ mod tests { is_braced: false, rage_turns_remaining: 0, war_cry_used_this_battle: false, + multi_turn_in_progress: false, + is_stealthed: false, + is_field_aura: false, + is_ambushing: false, } } @@ -1414,6 +1418,10 @@ mod tests { is_braced: false, rage_turns_remaining: 0, war_cry_used_this_battle: false, + multi_turn_in_progress: false, + is_stealthed: false, + is_field_aura: false, + is_ambushing: false, } } @@ -1472,6 +1480,10 @@ mod tests { is_braced, rage_turns_remaining: 0, war_cry_used_this_battle: false, + multi_turn_in_progress: false, + is_stealthed: false, + is_field_aura: false, + is_ambushing: false, } } @@ -1494,6 +1506,10 @@ mod tests { is_braced: false, rage_turns_remaining: rage_turns, war_cry_used_this_battle: war_cry_used, + multi_turn_in_progress: false, + is_stealthed: false, + is_field_aura: false, + is_ambushing: false, } }