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

fix(@projects/@magic-civilization): 🐛 adjust siege dampening thresholds

Browse source 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
This commit is contained in:
Natalie 2026-04-16 12:45:12 -07:00
parent 75b11f7940
commit fc8e3b7d74
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.project/iteration_log.md
View file

@ -36,3 +36,5 @@
2026-04-16 12:10 REGRESSION BATCH 3 (ttv-dev final siege tuning): 11 PASS / 3 FAIL. REGRESSED from batch 2 (12/2). Seeds 1/2/3: victory T75 / max_turns T300 / max_turns T300. Siege dampening went TOO far — seed 1 still fast capture (AI issue, not math), seeds 2+3 now stalemate (no captures in 300t). FAIL: victories 1/3 (33%, need 50-80%), median TTV 75, both-p5m4-T100 1/3. Root cause per ttv-dev: p1 garrison dies T69, doesn't rebuild. That's AI not combat. ACTION: revert melee_city_fraction 0.40→0.50 + spawn p1-defense-dev.
2026-04-16 12:20 Task #4 P1 GARRISON COMPLETE (e82bfc871): simple_heuristic_ai.gd +27 lines. Before per-city queue gate, if mil_now==0 AND enemy within 10 hexes → preempt queue with warrior. Fixes mid-build blocker where walls/founder production kept AI from re-deciding on threat. Seed 1 smoke T150 (no victory): p1 went from "dead T75" to 3 cities 15 pop 6 mil, AHEAD of p0. (p1-defense-dev)
2026-04-16 12:26 BATCH 4 (after ttv-dev HP bumps + p1-defense-dev garrison fix): 11 PASS / 3 FAIL. Seeds: victory T126 / max_turns T300 / max_turns T300. Same result as batch 3 — ttv-dev's cumulative tuning (BASE_CITY_HP 300, HEAL_PER_TURN 26, melee_fraction 0.40) creates stalemates. Batch 2 was the best (12/14) at earlier values. p1-defense-dev's garrison fix is good but buried by overaggressive siege dampening. Seed 1 T126 victory = +51 from batch 3's T75 (improvement) but still below 200 target. Seeds 2+3 can't CAPTURE at all. Action: revert ttv-dev HP+heal+melee to batch-2 values (260/20/0.50), keep garrison fix + wall penalties.
2026-04-16 12:40 BATCH 5 (p1-defense-dev garrison + ttv-dev 280/23/0.40): 12 PASS / 2 FAIL. Seeds: max_turns / max_turns / max_turns. FAIL: victories 0/3 (STALEMATE — worst yet), both-p5m4-T100 1/3. PASS: everything else. pop 38/35/34 (massive), combats 413/423/211 (massive), techs 43/42/33, 5 loot_dropped (fauna engagement works!). The compose OVERDAMPED siege. Batch 2 had victories 2/3 at original values. ACTION: revert ALL siege values to batch 2 (HP 280→260, heal 23→20, melee 0.40→0.50) while keeping p1-defense-dev garrison fix + wall penalties.
2026-04-16 12:42 Task #2 FAUNA ENGAGEMENT COMPLETE: city-drift behavior triggering loot events organically. Batch 5 confirmed 5 loot_dropped across 3 seeds (target ≥1 MET). (fauna-dev)

8
src/simulator/crates/mc-combat/src/resolver.rs
View file

@ -406,10 +406,10 @@ impl CombatResolver {
// Melee vs city: only a fraction of unit damage translates to
// city structural HP. Siege units are the intended counter to
// walls (via Siege combat_type which applies siege_city_bonus).
// 0.33 required because seed 1's p1 doesn't build walls before
// p0 can amass a 6–8 warrior rush stack; at 0.40 the capital
// fell T76 despite garrison maintenance being fixed in AI.
let melee_city_fraction: f32 = 0.33;
// 0.37 is the narrow sweet spot — 0.40 let seed 1 fall T76,
// 0.33 stalled all 3 seeds at max_turns. 0.37 should stretch
// seed 1 while keeping seed 2 decidable.
let melee_city_fraction: f32 = 0.37;
let city_dmg = (damage_to_defender as f32 * melee_city_fraction).round() as i32;
(city_dmg, (city_hp - city_dmg).max(0))
}