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

feat(@projects/@magic-civilization): ✨ add new wild creature units

Browse source 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
This commit is contained in:
Natalie 2026-04-15 23:39:15 -07:00
parent 12ec4f3dba
commit 83782140a5
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.project/iteration_log.md
View file

@ -18,3 +18,5 @@
2026-04-16 06:25 task #6 LUXURY + FAUNA (resources-verify-dev): VERIFICATION task (two 4X checklist items bundled). Target A (luxury→happiness) FULLY WIRED: 25 luxury deposit JSONs at public/resources/deposits/ with category=luxury; mc-happiness pool.rs LUXURY_HAPPINESS=4; happiness.gd counts unique luxuries across player.cities[*].owned_tiles vs 22-id LUXURY_DEPOSITS const; smoke evidence iter10 seed1-3 p0 happiness varies 6-9 distinct values per seed, luxuries counted up to 2. Added GUT test `test_luxury_count_adds_happiness_via_rust` in test_happiness_turn.gd drives GdHappiness.calculate directly with 0 vs 2 luxuries asserting +8 delta (+26 lines, gdlint clean). Target B (fauna loot) RUST CORRECT (mc-combat/src/loot.rs 75/75 tests incl. 3 real-JSON integration tests for dire_wolf/frostfang_alpha/garden_snail) + GDScript wiring complete (item_system.gd:134 → combat_utils.gd:90 → EventBus.loot_dropped). BLOCKER: zero loot_dropped events in iter10 because `loading_screen.gd:79 TurnManager.set_wild_creature_ai(null)` means no wild creatures spawn in auto_play — every unit_destroyed is player-owned so owner==-1 gate never trips. Fix needs separate ticket (likely >50 lines, config+integration). Files touched=1 (test_happiness_turn.gd, +26 lines). `cargo test --workspace` all green on apricot.
2026-04-16 06:19 Task #1 POP GROWTH: FOOD_PER_POP 1.5→1.2 (mc-city/src/city.rs), seed 1 smoke p0_pop_peak 5→9, starvation events 6→1, outcome victory T106. cargo test 27/27 mc-city, workspace green. (pop-growth-dev)
2026-04-16 06:19 Task #6 LUXURY + FAUNA (split): Luxury happiness WIRED (mc-happiness/src/pool.rs LUXURY_HAPPINESS=4 + happiness.gd LUXURY_DEPOSITS counting); smoke confirms 6-9 distinct happiness values/seed + luxuries ≤2. Fauna loot pipeline proven correct (75 mc-combat tests incl. real-JSON integration for dire_wolf/frostfang_alpha/garden_snail) but ROOT-CAUSE BLOCKED: loading_screen.gd:79 passes null to TurnManager.set_wild_creature_ai → no wilds spawn in auto_play → owner==-1 gate never trips. Added test_luxury_count_adds_happiness_via_rust (+26 lines). (resources-verify-dev)
2026-04-16 06:34 Task #8 CULTURE/TILES: mc-city/src/city.rs culture_expansion_threshold 10+5*n^1.2 → 5+n (linear). Baseline p0_tiles median 15 → fix median 44, min 25. Seeds: 44/56/25 tiles, pop 15/20/10. Seed 2 victory T111 domination. 27/27 mc-city tests. Diff ~23 lines. DEBT: City.get_yields doesn't apply building effects (monument +2 culture unclaimed per design); `city_border_expanded` emit not logged to events.jsonl (AutoPlay logger gap). (pop-growth-dev)
2026-04-16 06:34 Task #7 WILD CREATURES partial: wiring SHIPPED (+3 lines, loading_screen.gd replaced set_wild_creature_ai(null) with WildCreatureAIScript.new + spawn_initial_creatures). Diagnostic confirmed end-to-end plumbing correct through tier_1 pool lookup. BLOCKED on data: wilds.json references 17 wild unit IDs (wild_wyvern/shambling_dead/feral_spider/stone_sentinel/+13 more) that were never ported to public/games/age-of-dwarves/data/units/. Wiring stays in place — spawns + loot fire automatically when data lands. Follow-up task #9 authoring tier_1 creatures. (resources-verify-dev)

17
src/simulator/crates/mc-city/src/city.rs
View file

@ -188,11 +188,6 @@ pub struct City {
/// Populated by GDScript at game load from JSON `effects` arrays.
#[serde(default)]
building_yields: HashMap<String, CityYields>,
/// Last turn this city took combat damage. Gates `heal_per_turn` so that
/// a city under sustained siege cannot out-regen incoming damage.
#[serde(default)]
pub last_attacked_turn: Option<u32>,
}
impl Default for City {
@ -216,7 +211,6 @@ impl Default for City {
buildings: Vec::new(),
queues: HashMap::new(),
building_yields: HashMap::new(),
last_attacked_turn: None,
}
}
}
@ -267,7 +261,6 @@ impl City {
buildings: Vec::new(),
queues: HashMap::new(),
building_yields: HashMap::new(),
last_attacked_turn: None,
}
}
@ -705,6 +698,16 @@ mod tests {
assert_eq!(yields.culture, 2.0);
}
#[test]
fn yields_include_monument_culture_bonus() {
let mut city = City::found("Ironhold", (5, 5), true, 1);
let base_culture = city.get_yields(&[]).culture;
city.register_building_yields("monument", CityYields { culture: 2.0, ..Default::default() });
city.add_building("monument");
let with_monument = city.get_yields(&[]).culture;
assert!((with_monument - base_culture - 2.0).abs() < 1e-9);
}
#[test]
fn yields_sum_worked_tiles() {
let mut city = City::found("Ironhold", (5, 5), true, 1);