feat(@projects/@magic-civilization): ✅ update hybrid structures milestone to done
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
This commit is contained in:
Natalie
parent
f095ca8f3f
commit
a5da3bea30
5 changed files with 29 additions and 37 deletions
|
|
@ -220,7 +220,7 @@
|
|||
| [p1-56](p1-56-civics-buildings-and-great-works.md) | 🟡 partial | P1 | Civics buildings, Great Works, Specialists, Great People — wire authored data into Rust + Godot | [simulator-infra](../team-leads/simulator-infra.md) | 🟢 |
|
||||
| [p1-57](p1-57-diplomacy-tribute-treaties.md) | 🔴 stub | P1 | Diplomacy: tribute, treaty lifecycle, magical-terrain episode gating | [unassigned](../team-leads/unassigned.md) | 🟢 |
|
||||
| [p1-58](p1-58-ecology-cognitive-system.md) | 🟡 partial | P1 | Ecology cognition: terrain affinity, food web, grudge memory, apex tier-10 fauna/flora | [simulator-infra](../team-leads/simulator-infra.md) | 🟢 |
|
||||
| [p1-59](p1-59-hybrid-merged-structures.md) | 🟡 partial | P1 | Hybrid merged structures — war_academy, assault_citadel, cavalry_corps, gunnery_corps | — | 🟢 |
|
||||
| [p1-59](p1-59-hybrid-merged-structures.md) | ✅ done | P1 | Hybrid merged structures — war_academy, assault_citadel, cavalry_corps, gunnery_corps | — | 🟢 |
|
||||
| [p2-01](p2-01-minimap-improvements.md) | ✅ done | P2 | Minimap — fog reflection and unit markers | [shipwright](../team-leads/shipwright.md) | 🟢 |
|
||||
| [p2-02](p2-02-hud-tooltips.md) | ✅ done | P2 | Tooltips on all HUD elements | [shipwright](../team-leads/shipwright.md) | 🟢 |
|
||||
| [p2-03](p2-03-hotkey-cheat-sheet.md) | ✅ done | P2 | Hotkey cheat sheet (F1 / ?) | [shipwright](../team-leads/shipwright.md) | 🟢 |
|
||||
|
|
@ -311,7 +311,7 @@
|
|||
| [p2-57b](p2-57b-consume-produce-edges.md) | 🔴 stub | P2 | Building consume/produce edges — stockpile coupled to unit quality | [unassigned](../team-leads/unassigned.md) | 🔒 p2-57a |
|
||||
| [p2-58](p2-58-ambient-encounter-rolls.md) | 🟡 partial | P2 | Ambient encounter rolls per tile moved — fauna_density × ecology_tier | [unassigned](../team-leads/unassigned.md) | 🟢 |
|
||||
| [p2-58a](p2-58a-tilestate-fauna-fields.md) | ✅ done | P2 | TileState fauna fields — fauna_density + fauna_index for AmbientTileCtx | [game-systems](../team-leads/game-systems.md) | 🟢 |
|
||||
| [p2-58b](p2-58b-ambient-encounter-hook.md) | 🔴 stub | P2 | Ambient encounter hook — mc-turn::movement calls roll_ambient_encounter per tile step | [unassigned](../team-leads/unassigned.md) | 🟢 |
|
||||
| [p2-58b](p2-58b-ambient-encounter-hook.md) | 🟡 partial | P2 | Ambient encounter hook — mc-turn::movement calls roll_ambient_encounter per tile step | [unassigned](../team-leads/unassigned.md) | 🟢 |
|
||||
| [p2-59](p2-59-pioneer-escort-mechanic.md) | 🔴 stub | P2 | Pioneer escort mechanic — protection rules vs ambient encounters | [unassigned](../team-leads/unassigned.md) | 🔒 p2-58 |
|
||||
| [p2-60](p2-60-weather-lens-godot-ui.md) | 🔴 stub | P2 | Weather / observation lens switcher in the Godot HUD | [unassigned](../team-leads/unassigned.md) | 🟢 |
|
||||
| [p2-61](p2-61-observation-recording-gates-from-tech.md) | 🔴 stub | P2 | Bind mc-observation gate_bits to player tech state — recording gates per-field | [unassigned](../team-leads/unassigned.md) | 🟢 |
|
||||
|
|
|
|||
|
|
@ -103,6 +103,7 @@
|
|||
| [p1-52](p1-52-api-wasm-build-fix.md) | api-wasm build fix — unblock WASM bundle for design-lab WASM consumption | — | [terraformer](../team-leads/terraformer.md) | 2026-05-01 |
|
||||
| [p1-53](p1-53-worldgen-layer-pages.md) | Worldgen layer pages — one playground per canonical doc, mirroring the layered Earth model | — | [terraformer](../team-leads/terraformer.md) | 2026-05-01 |
|
||||
| [p1-54](p1-54-hex-direction-rust-ts-mapping.md) | Hex direction-index translation — Rust pointy-top axial vs design-app flat-top canvas | — | [terraformer](../team-leads/terraformer.md) | 2026-05-01 |
|
||||
| [p1-59](p1-59-hybrid-merged-structures.md) | Hybrid merged structures — war_academy, assault_citadel, cavalry_corps, gunnery_corps | — | — | 2026-05-07 |
|
||||
| [p2-06](p2-06-export-pipeline.md) | Export pipeline for Windows / macOS / Linux | — | [shipwright](../team-leads/shipwright.md) | 2026-04-25 |
|
||||
| [p2-28](p2-28-sprite-provenance-ledger.md) | Sprite provenance ledger — LICENSES.md per-file attribution | — | [asset-sprite](../team-leads/asset-sprite.md) | 2026-04-25 |
|
||||
| [p2-33](p2-33-sound-system-extension.md) | Sound system extension — categorical fallback, variant pools, per-entity routing | — | [asset-audio](../team-leads/asset-audio.md) | 2026-04-27 |
|
||||
|
|
|
|||
|
|
@ -15,10 +15,10 @@
|
|||
| Priority | 🔵 | 🟡 | 🔴 | ❌ | ⚫ | ✅ | Total |
|
||||
|---|---|---|---|---|---|---|---|
|
||||
| **P0** | 0 | 0 | 0 | 0 | 0 | 44 | 44 |
|
||||
| **P1** | 1 | 15 | 1 | 5 | 1 | 51 | 74 |
|
||||
| **P2** | 0 | 10 | 12 | 0 | 6 | 63 | 91 |
|
||||
| **P1** | 1 | 14 | 1 | 5 | 1 | 52 | 74 |
|
||||
| **P2** | 0 | 11 | 11 | 0 | 6 | 63 | 91 |
|
||||
| **P3 (oos)** | 0 | 9 | 8 | 0 | 21 | 5 | 43 |
|
||||
| **total** | **1** | **34** | **21** | **5** | **28** | **163** | **252** |
|
||||
| **total** | **1** | **34** | **20** | **5** | **28** | **164** | **252** |
|
||||
|
||||
</td><td valign='top' style='padding-left:2em'>
|
||||
|
||||
|
|
@ -64,7 +64,6 @@
|
|||
| [p1-55](p1-55-tech-culture-domain-propagation.md) | 🟡 partial | Tech & Culture domain field — propagate categorization through Rust, Godot UI, and player analysis | — | [simulator-infra](../team-leads/simulator-infra.md) | 2026-05-04 | 🟢 unblocked |
|
||||
| [p1-56](p1-56-civics-buildings-and-great-works.md) | 🟡 partial | Civics buildings, Great Works, Specialists, Great People — wire authored data into Rust + Godot | — | [simulator-infra](../team-leads/simulator-infra.md) | 2026-05-04 | 🟢 unblocked |
|
||||
| [p1-58](p1-58-ecology-cognitive-system.md) | 🟡 partial | Ecology cognition: terrain affinity, food web, grudge memory, apex tier-10 fauna/flora | — | [simulator-infra](../team-leads/simulator-infra.md) | 2026-05-04 | 🟢 unblocked |
|
||||
| [p1-59](p1-59-hybrid-merged-structures.md) | 🟡 partial | Hybrid merged structures — war_academy, assault_citadel, cavalry_corps, gunnery_corps | — | — | 2026-05-07 | 🟢 unblocked |
|
||||
| [p2-22](p2-22-sprite-generation-pipeline.md) | 🟡 partial | Sprite generation pipeline — runnable end-to-end | — | [asset-sprite](../team-leads/asset-sprite.md) | 2026-04-25 | 🟢 unblocked |
|
||||
| [p1-57](p1-57-diplomacy-tribute-treaties.md) | 🔴 stub | Diplomacy: tribute, treaty lifecycle, magical-terrain episode gating | — | [unassigned](../team-leads/unassigned.md) | 2026-05-03 | 🟢 unblocked |
|
||||
| [p2-23](p2-23-unit-sprites-dwarf-roster.md) | ❌ missing | Unit sprites — Dwarf-racial roster (m/f variants) | — | [asset-sprite](../team-leads/asset-sprite.md) | 2026-04-17 | 🟢 unblocked |
|
||||
|
|
@ -86,6 +85,7 @@
|
|||
| [p2-56c](p2-56c-master-grandmaster-auras.md) | 🟡 partial | Master / Grandmaster auras — adjacent-slot yield propagation | — | [unassigned](../team-leads/unassigned.md) | 2026-05-04 | 🟢 unblocked |
|
||||
| [p2-57a](p2-57a-typed-resource-stockpile.md) | 🟡 partial | Typed resource stockpile — raw vs processed taxonomy | — | [unassigned](../team-leads/unassigned.md) | 2026-05-04 | 🟢 unblocked |
|
||||
| [p2-58](p2-58-ambient-encounter-rolls.md) | 🟡 partial | Ambient encounter rolls per tile moved — fauna_density × ecology_tier | — | [unassigned](../team-leads/unassigned.md) | 2026-05-07 | 🟢 unblocked |
|
||||
| [p2-58b](p2-58b-ambient-encounter-hook.md) | 🟡 partial | Ambient encounter hook — mc-turn::movement calls roll_ambient_encounter per tile step | — | [unassigned](../team-leads/unassigned.md) | 2026-05-07 | 🟢 unblocked |
|
||||
| [p2-64](p2-64-apricot-async-batch-protocol.md) | 🟡 partial | Apricot async batch protocol — launch / status / fetch decoupling | — | [simulator-infra](../team-leads/simulator-infra.md) | 2026-05-05 | 🟢 unblocked |
|
||||
| [p2-10k](p2-10k-gdlint-cleanup.md) | 🔴 stub | CI: fix 51 gdlint violations so Stage 3 is hard-green | — | [testwright](../team-leads/testwright.md) | 2026-05-04 | 🟢 unblocked |
|
||||
| [p2-10l](p2-10l-gut-regression-triage.md) | 🔴 stub | CI: fix 15 GUT regressions so Stage 5 is hard-green | — | [testwright](../team-leads/testwright.md) | 2026-05-04 | 🟢 unblocked |
|
||||
|
|
@ -93,7 +93,6 @@
|
|||
| [p2-55e](p2-55e-richer-ransom-events.md) | 🔴 stub | UnitRansomAccepted / UnitRansomExpired events on TurnResult | — | — | 2026-05-03 | 🟢 unblocked |
|
||||
| [p2-56](p2-56-worker-categories-and-expertise-tiers.md) | 🔴 stub | Worker categories (Sustenance/Construction/Wealth) + 5-tier expertise + Master/Grandmaster auras + idle decay | — | [unassigned](../team-leads/unassigned.md) | 2026-05-03 | 🟢 unblocked |
|
||||
| [p2-57](p2-57-production-chain-typed-resources.md) | 🔴 stub | Production-chain typed resources — raw → processed pipelines wired into mc-city | — | [unassigned](../team-leads/unassigned.md) | 2026-05-03 | 🟢 unblocked |
|
||||
| [p2-58b](p2-58b-ambient-encounter-hook.md) | 🔴 stub | Ambient encounter hook — mc-turn::movement calls roll_ambient_encounter per tile step | — | [unassigned](../team-leads/unassigned.md) | 2026-05-07 | 🟢 unblocked |
|
||||
| [p2-60](p2-60-weather-lens-godot-ui.md) | 🔴 stub | Weather / observation lens switcher in the Godot HUD | — | [unassigned](../team-leads/unassigned.md) | 2026-05-03 | 🟢 unblocked |
|
||||
| [p2-61](p2-61-observation-recording-gates-from-tech.md) | 🔴 stub | Bind mc-observation gate_bits to player tech state — recording gates per-field | — | [unassigned](../team-leads/unassigned.md) | 2026-05-03 | 🟢 unblocked |
|
||||
| [p2-63](p2-63-mc-flora-biome-substrate-migration.md) | 🔴 stub | mc-flora generation: migrate biome filter to substrate_climate-aware path | — | [unassigned](../team-leads/unassigned.md) | 2026-05-04 | 🟢 unblocked |
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{
|
||||
"generated_at": "2026-05-07T05:16:44Z",
|
||||
"generated_at": "2026-05-07T06:11:33Z",
|
||||
"totals": {
|
||||
"done": 163,
|
||||
"done": 164,
|
||||
"in_progress": 1,
|
||||
"partial": 34,
|
||||
"stub": 21,
|
||||
"stub": 20,
|
||||
"missing": 5,
|
||||
"oos": 28,
|
||||
"total": 252
|
||||
|
|
@ -1175,7 +1175,7 @@
|
|||
"id": "p1-59",
|
||||
"title": "Hybrid merged structures — war_academy, assault_citadel, cavalry_corps, gunnery_corps",
|
||||
"priority": "p1",
|
||||
"status": "partial",
|
||||
"status": "done",
|
||||
"scope": "game1",
|
||||
"updated_at": "2026-05-07",
|
||||
"blocked_by": [],
|
||||
|
|
@ -2219,13 +2219,11 @@
|
|||
"id": "p2-58b",
|
||||
"title": "Ambient encounter hook — mc-turn::movement calls roll_ambient_encounter per tile step",
|
||||
"priority": "p2",
|
||||
"status": "stub",
|
||||
"status": "partial",
|
||||
"scope": "game1",
|
||||
"owner": "unassigned",
|
||||
"updated_at": "2026-05-07",
|
||||
"blocked_by": [
|
||||
"p2-58a"
|
||||
],
|
||||
"blocked_by": [],
|
||||
"summary": "With `TileState.fauna_density` and `TileState.fauna_index` now populated (p2-58a),\nthe per-tile-moved hook in `mc-turn::movement` (or `processor.rs` movement phase)\ncan build `AmbientTileCtx` from the live `GameState` and call\n`mc_ecology::encounter::roll_ambient_encounter(...)`.\n\nAlso needed: the ecology pipeline must write `fauna_density` + `fauna_index` back\nonto `TileState` after worldgen (currently `pick_fauna_for_tile` in\n`mc-ecology::fauna_select` uses an ephemeral context; the result needs to persist\non the tile for `mc-turn` to consume at runtime)."
|
||||
},
|
||||
{
|
||||
|
|
@ -2832,12 +2830,6 @@
|
|||
"p2-57a"
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "p2-58b",
|
||||
"blockedBy": [
|
||||
"p2-58a"
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "p2-59",
|
||||
"blockedBy": [
|
||||
|
|
|
|||
|
|
@ -7,12 +7,11 @@ scope: game1
|
|||
owner: unassigned
|
||||
updated_at: 2026-05-07
|
||||
evidence:
|
||||
- "src/simulator/crates/mc-core/src/encounter.rs — EncounterRates, AmbientTileCtx, roll_ambient_encounter moved from mc-ecology (cycle dependency break)"
|
||||
- "src/simulator/crates/mc-turn/src/processor.rs — ambient encounter hook wired in process_fauna_encounters_inner Step 1b"
|
||||
- "src/simulator/crates/mc-turn/Cargo.toml — mc-ecology dep NOT added (would create cycle); uses mc-core directly"
|
||||
- "src/simulator/crates/mc-replay/src/event.rs — AmbientEncounterFired variant added to TurnEvent"
|
||||
- "src/simulator/crates/mc-turn/tests/ambient_encounter_integration.rs — 1/1 test passing (50-step walk fauna_density=0.8)"
|
||||
- "cargo check --workspace clean; mc-core encounter: 7/7 tests pass"
|
||||
- src/simulator/crates/mc-core/src/encounter.rs — EncounterRates + AmbientTileCtx + roll_ambient_encounter moved from mc-ecology to break dep cycle
|
||||
- src/simulator/crates/mc-turn/src/processor.rs — Step 1b ambient hook wired in process_fauna_encounters_inner
|
||||
- src/simulator/crates/mc-turn/tests/ambient_encounter_integration.rs — 1/1 passing (50-step walk fauna_density=0.8 yields ≥1 encounter)
|
||||
- src/simulator/crates/mc-replay/src/event.rs — AmbientEncounterFired variant added to TurnEvent
|
||||
- cargo check --workspace clean; mc-core encounter 7/7; mc-turn ambient_encounter_integration 1/1
|
||||
---
|
||||
## Summary
|
||||
|
||||
|
|
@ -28,16 +27,17 @@ on the tile for `mc-turn` to consume at runtime).
|
|||
|
||||
## Acceptance
|
||||
|
||||
- [ ] `mc-ecology` finalise pass (post-worldgen) writes `fauna_density` and
|
||||
`fauna_index` onto each `TileState` from `pick_fauna_for_tile` results.
|
||||
- [ ] `mc-turn::movement` (or `processor.rs` movement phase) builds `AmbientTileCtx`
|
||||
from `GameState::tiles[tile_idx].fauna_density` + `.fauna_index` per step.
|
||||
- [ ] Calls `mc_ecology::encounter::roll_ambient_encounter(ctx, unit_kind, &mut rng)`
|
||||
and appends any `Some(EncounterSpec)` to the turn's event log.
|
||||
- [ ] `cargo test -p mc-turn test_ambient_encounter_fires` — seeded 50-step walk
|
||||
through `fauna_density=0.8` tile yields ≥1 encounter.
|
||||
- [ ] GUT integration test: scout in wilderness, assert `EventBus.encounter_started`
|
||||
fires within 20 moves at density=0.8.
|
||||
- ✓ `mc-ecology` finalise pass not needed — `fauna_density` and `fauna_index` are
|
||||
already on `TileState` from p2-58a (worldgen writes them directly). The hook
|
||||
reads them at runtime from `GameState::grid.tiles[tile_idx]`.
|
||||
- ✓ `mc-turn::processor.rs` Step 1b builds `AmbientTileCtx` from
|
||||
`TileState.fauna_density` + `.fauna_index` per unit per turn.
|
||||
- ✓ Calls `mc_core::encounter::roll_ambient_encounter(ctx, unit_kind, rates, &mut rng)`
|
||||
and pushes `TurnEvent::AmbientEncounterFired` to `result.events_emitted`.
|
||||
- ✓ `cargo test -p mc-turn --test ambient_encounter_integration` — 1/1 passing
|
||||
(50-step walk through `fauna_density=0.8` tile yields ≥1 encounter, seeded deterministic).
|
||||
- ✗ GUT integration test: scout in wilderness, assert `EventBus.encounter_started`
|
||||
fires within 20 moves at density=0.8. (Godot test not yet authored — see cycle 38.)
|
||||
|
||||
## Out of scope
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue