Commit graph

2426 commits

Author SHA1 Message Date
ACS-Recovery
8ab4239bf3 Merge remote-tracking branch 'origin/main' into acs2-recovery-candidate 2026-04-29 21:39:53 -07:00
Natalie
dd675b3402 Merge origin/main: ACS-2 reconciliation 2026-04-30
Diverged 2026-04-26 → 2026-04-29 from base 59dea7f35: local 59 commits
(Natalie autocommit), origin 103 commits (apricot autocommit).

458 dual-edit files, 448 byte-identical (same agent generating same
content on both hosts). 10 actual conflicts resolved:

  • .project/designs/app/tsconfig.tsbuildinfo — kept HEAD (superset of
    tracked files; will regenerate on next tsc).
  • public/games/age-of-dwarves/data/buildings/manifest.json — DELETED
    per post-p1-40 architecture (single source of truth at
    public/resources/<category>/, no override layer in data/<category>/).
  • .project/objectives/README.md — kept HEAD (adds p1-41 row + updated
    totals 110/155).
  • .project/objectives/p1-38-biome-economy-coupling.md — kept HEAD (proof
    scene captured 2026-04-29, was [x]).
  • .project/objectives/p2-36-data-resources-building-duplicates.md —
    kept HEAD (status: done with closure note absorbed by p1-40).
  • public/games/age-of-dwarves/data/objectives.json — kept HEAD (later
    timestamp 2026-04-30T04:20Z, includes p1-41 entry, totals 110/155).
  • tools/audio-batch-12-defeat-pool.tsv — kept HEAD's swap from Action1
    to Exploration2 for defeat_domination (Action1 collided with
    victory_domination_b — same cue for win + loss of same type).
  • src/simulator/crates/mc-core/src/grid/mod.rs — kept HEAD's added
    exports (zoc_from_centre, zoc_from_edge, ZocReach).
  • src/simulator/crates/mc-core/src/grid/terrain_blend.rs — kept HEAD's
    canonical resources/tiles/ path (post-p1-40) over origin's stale
    games/<game>/data/terrain/ path.
  • src/simulator/crates/mc-core/src/grid/edge.rs — kept HEAD's ZOC
    implementation (ZocReach, zoc_from_centre, zoc_from_edge) + 3
    accompanying unit tests. Origin lacked them; mod.rs already exports.

No commits dropped. Validation: ./run validate green pre-commit.
2026-04-30 00:36:05 -04:00
autocommit
78957450bb feat(tactical): Implement tactical state management with pathfinding and formation strategies for AI system integration
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-29 21:35:41 -07:00
autocommit
a617ec0023 feat(audio): Refactor AudioManager with new loading, playback, and management methods + update unit tests
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-29 21:35:41 -07:00
autocommit
ee2dd7d310 remove(audio-specific): 🔥 Clean up outdated audio assets by removing 12 legacy SFX files and updating audio metadata/configuration
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-29 21:35:41 -07:00
autocommit
e889d783e4 chore(age-dwarves): 🔧 Add Age of Dwarves game pack manifest with name, version, and description metadata
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-29 21:29:33 -07:00
autocommit
5e7509e9eb feat(data-loader): Implement manifest-based resource filtering in DataLoader for selective subscriptions
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-29 21:29:33 -07:00
Natalie
b7f3965915 feat(@projects/@magic-civilization): resolve building ID duplicates via single-source resources
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-30 00:27:28 -04:00
Natalie
b59a083f3f fix(@projects/@magic-civilization): 🐛 update terrain blend file paths
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-30 00:21:48 -04:00
Natalie
2a6323e98d feat(@projects/@magic-civilization): add age-of-dwarves game manifest
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-30 00:16:14 -04:00
Natalie
e02cb440fc feat(@projects/@magic-civilization): add game-pack subscription manifest task
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-29 23:37:52 -04:00
Natalie
bdc82daeb8 feat(@projects/@magic-civilization): implement hex edge system with identity, terrain, and movement rules
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-29 21:26:57 -04:00
autocommit
58df5e5f3d fix(audio): 🐛 Fix broken audio source reference for "defeat_domination.ogg" in sources.csv
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-29 15:02:07 -07:00
autocommit
833249d9a2 docs(audio): 📝 Update license documentation for defeat_domination.ogg in LICENSES.md
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-29 15:02:07 -07:00
Natalie
433634ac8d feat(@projects/@magic-civilization): update defeat_domination audio details
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-29 17:59:37 -04:00
autocommit
5ee89ccb31 feat(age-dwarves): Add defeat_domination.ogg audio track and update defeat-by-domination metadata in audio.json
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-29 14:56:05 -07:00
autocommit
0cdb3d36ec feat(tools): Add validation rules for game data and introduce defeat audio assets in batch 12
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-29 13:13:23 -07:00
autocommit
f08d12c9d7 docs(objectives): 📝 Clarify and refine P1-40 objective documentation to improve clarity and completeness in README and resource truth documentation
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-29 13:13:23 -07:00
autocommit
78863ab8b0 test(engine): Add proof-of-concept test for biome-economy coupling and enhance audio management with dynamic switching
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-29 13:13:23 -07:00
autocommit
a5c616f8aa feat(audio): Add defeat-themed music tracks (culture, domination, economic, science) and update audio configurations for victory conditions
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-29 13:13:23 -07:00
autocommit
4cfedd96aa feat(age-dwarves): Introduce new terrain blend configurations and resource definitions for expanded game content
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-29 13:13:23 -07:00
autocommit
9c4d635df3 feat(grid): Introduce terrain blending system with new structs/enums and blending functions for smooth transitions.
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-29 13:13:23 -07:00
autocommit
666907f986 feat(buildings): Add culture-specific building attributes, tiers, and effects like "clan_moot_stone" and "covenant_stone"
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-29 13:13:22 -07:00
autocommit
a675f464c8 deps-upgrade(simulator): ⬆️ Update Rust dependencies in simulator module to latest compatible versions
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-29 13:13:22 -07:00
Natalie
9c42109dd6 feat(@projects/@magic-civilization): update objectives dashboard documentation
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-29 16:10:03 -04:00
autocommit
80ea038fce feat(audio-specific): Replace all audio SFX and music files, update game data, and integrate new audio system into UI and engine
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-29 13:06:45 -07:00
autocommit
b1566a716c chore(audio-batch): 🔧 Update TSV metadata files for audio batch processing categories and quality fixes
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-29 13:06:44 -07:00
autocommit
0be86d58ca refactor(audio-tools): ♻️ Update audio asset scripts to support cross-theme resources and improve URL processing for batch fetching, options handling, and license rendering
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-29 13:06:44 -07:00
autocommit
8d9eb02d99 chore(objectives): 🔧 Update p1-39-md milestone documentation and configuration
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-29 13:06:44 -07:00
autocommit
f3210d7f9c docs(courier): 📝 Update courier diplomacy, route resolution, and per-hex improvement documentation
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-29 13:06:44 -07:00
autocommit
9990986720 docs(objectives-specific): 📝 Update P2 milestone documentation for data resources, unit audio cues, and chronicle hall unlocks with detailed descriptions and implementation notes
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-29 13:06:44 -07:00
autocommit
876a7de3a2 docs(objectives): 📝 Revise P1 objectives documentation to clarify anti-early-domination, AI personalities, resource systems, and biome-economy coupling in updated Markdown (p1-29, p1-31, p1-36, p1-37, p1-38, p1-39, p1-40).
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-29 13:06:44 -07:00
autocommit
364bfc13e3 docs(objectives): 📝 Update dashboard categories, completed objectives documentation, README, and objectives metadata in JSON config
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-29 13:06:44 -07:00
autocommit
def26d2883 feat(units): Add 88 new unit definitions with JSON configs for stats, abilities, and properties
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-29 13:06:44 -07:00
autocommit
e2f1b3d4c8 feat(buildings): Add 65 new building JSON configs (academy, foundry, observatory) with shared metadata for name, cost, production, and requirements
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-29 13:06:43 -07:00
autocommit
b85de09181 feat(audio): Add 19 new OGG sound effects for game creature actions (attack, death, hit, etc.)
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-29 13:06:43 -07:00
autocommit
463c17a7bb remove(audio): 🔥 Delete 20 SFX audio files (combat, research, victory, unit actions) from game assets
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-29 13:06:43 -07:00
autocommit
6725ba0c36 remove(audio): 🔥 Remove 11 victory music tracks from audio assets
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-29 13:06:43 -07:00
autocommit
716b9f5652 remove(audio): 🔥 Remove 7 OGG music files for overworld and golden age themes
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-29 13:06:43 -07:00
autocommit
b44a8e601d remove(audio): 🔥 Remove generic spawn sound effect file from fauna audio assets
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-29 13:06:42 -07:00
autocommit
65eefbf47a remove(audio): 🔥 Delete predator sound effect files (attack, death, hurt, spawn) from fauna audio assets
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-29 13:06:42 -07:00
autocommit
dd0cdb3cc4 remove(audio): 🔥 Remove omnivore sound effect files (attack, death, hit, spawn) from audio assets
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-29 13:06:42 -07:00
autocommit
dedbd5af75 remove(audio): 🔥 Remove herbivore sound effects (attack, call, death, hit) from game audio library
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-29 13:06:42 -07:00
autocommit
3945ddaf6f remove(fauna): 🔥 Remove apex predator sound effect files (attack, death, hit, roar) from fauna audio assets
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-29 13:06:42 -07:00
autocommit
824af6524c chore(config): 🔧 Update configuration defaults for new environment variables
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-29 13:06:42 -07:00
autocommit
9bb1ab1fdc deps-upgrade(simulator): ⬆️ Update Rust dependencies in Cargo.lock to latest compatible versions
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-29 13:06:42 -07:00
Natalie
11b4477283 fix(@projects/@magic-civilization): 🗑️ consolidate building data
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-29 16:04:27 -04:00
Natalie
526dd29775 fix(@projects): 🐛 remove unused audio files and update paths
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-29 15:58:29 -04:00
autocommit
28e2fe05b8 docs(audio): 📝 Update audio licensing terms and metadata with new compliance agreements
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-29 12:57:27 -07:00
autocommit
c6d1ce2f0a feat(audio): Add victory condition-specific victory tracks with 3 OGG variants each for culture, domination, economic, and science victory types
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
2026-04-29 12:57:27 -07:00