applications/magicciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2
2249 commits 15 branches 0 tags 1.1 GiB
Commit graph

2249 commits

This branch
This branch
All branches
Author SHA1 Message Date
Natalie
3fcc9d2c30 feat(victory): ✨ increase grace turns to 100 for war council 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 20:28:17 -07:00
Natalie
80c8504f7e feat(@projects/@magic-civilization): ✨ update tier-10 research findings and round-2 plan 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 20:23:07 -07:00
Natalie
938f4b3aa7 feat(@projects/@magic-civilization): ✨ add castle defensive upgrade objective 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 20:12:50 -07:00
Natalie
ee5b16c834 feat(@projects/@magic-civilization): ✨ update hex terrain visuals and edge labels 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 20:07:37 -07:00
Natalie
f02d3efecb Merge remote-tracking branch 'origin/main' 2026-04-26 20:05:54 -07:00
Natalie
a908554b8b feat(@projects/@magic-civilization): ✨ add edge terrain blending logic 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 19:52:21 -07:00
Natalie
3bcd58f024 feat(@projects/@magic-civilization): ✨ add tier 10 units 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 19:47:08 -07:00
Natalie
0bfc993545 feat(@projects/@magic-civilization): ✨ add age-of-dwarves units & audio system 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 19:42:00 -07:00
Natalie
e8697d4bc8 fix(merge): remove duplicate commit_improvement function 
The git auto-merger created a spurious second copy of commit_improvement
when reconciling the conflict in world_map_city_actions.gd. The first
copy had a stray '_pending_unit = null' injection that neither HEAD nor
origin/main had in their commit_improvement bodies.

Verified: function definitions now match both sides (6 funcs, including
the canonical commit_improvement that's byte-identical to origin/main).
gdformat clean, gdlint clean.

The hand-merged _on_popup_selected body (origin's superset with the
AI_ARENA fallback path) is unchanged — only the duplicate function
definition outside it was removed.
 2026-04-26 19:40:54 -07:00
Natalie
5edfa407d4 feat(@projects/@magic-civilization): ✨ add hex formation duality system 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 19:36:51 -07:00
Natalie
3280c93c5d Merge origin/main into main: ACS reconciliation 2026-04-26 
Diverged 2026-04-16 → 2026-04-26: local 27 commits (designs gallery, combat
calculator React app, culture-tree UI, hex-grid formation pages, design
tokens, dashboard status updates, threshold tweak, mc-trade crate scaffold)
vs origin 37 commits (HUD panels, scenes, AI turn-bridge, fog-of-war tests,
diplomacy, culture refinements, tactical tuning, improvement-preview system,
paused-state save/load).

17 files were edited on both sides since merge-base c70b43326. Findings:

  • 15 of 17 files: byte-identical between local and origin — the same
    autonomous agent applied the same edits on both hosts, so the merge
    is a no-op for those.
  • src/game/engine/scenes/world_map/world_map.gd: auto-merged cleanly.
    Local _sync_cities() definition + call kept; origin's improvement-
    preview system (89 lines) layered alongside. Final file has 2 refs
    to _sync_cities and 10 refs to preview symbols (preview_yields,
    building_placement_pick_requested, _confirm_building_placement,
    improvement_preview_requested).
  • src/game/engine/scenes/world_map/world_map_city_actions.gd: hand-
    merged. Origin's _on_popup_selected is a strict superset of local's
    — same preview-emit path PLUS an AI_ARENA fallback that calls
    _improvement_manager.start_improvement directly when no preview
    listener is connected. Took origin's version; tagged the merged
    block with a 'merged from local 9fd0a2ab5 + origin 07ad84d6c' note.

No commits dropped. All 27 local commits preserved in history.
Pure-additive local work (.project/designs/*, scripts/run/dev.sh designs
subcommand, mc-trade crate, combat calculator React app) carried through
the merge unchanged. All 165 origin-only added files (HUD .uid files,
proof-test scenes, integration tests, rendering/.uid files) integrated.

JSON validity verified: vocabulary.json + 6 culture/*.json all parse
cleanly. No conflict markers remain. Validation pending: ./run verify on
EDIT host; cargo check + ./run test:headless on apricot.
 2026-04-26 19:34:51 -07:00
Natalie
2f21485f81 feat(@projects/@magic-civilization): ✨ update courier diplomacy tiers to dwarven theme 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 19:31:41 -07:00
Natalie
17e69c6c41 feat(@projects/@magic-civilization): ✨ add dwarven courier tech audit blocker 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 18:56:09 -07:00
Natalie
3f15f8e581 feat(@projects/@magic-civilization): ✨ update diplomacy milestone status 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 18:45:58 -07:00
Natalie
1a503ed028 feat(@projects/@magic-civilization): ✨ add hex grid formation interactive page 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 18:40:48 -07:00
Natalie
7c123269b3 feat(data): ✨ add domain type for units 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 18:35:40 -07:00
Natalie
3d04d5cb65 docs(@projects/@magic-civilization): 📝 update hex grid and tech tree design docs 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 18:30:28 -07:00
Natalie
aab69c9dfc feat(@projects): ✨ add permutations combat solver 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 18:25:19 -07:00
Natalie
dd2385d806 feat(@projects/@magic-civilization): ✨ add combat calculator navigation link 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 18:20:11 -07:00
Natalie
eba9b32db8 feat(@projects/@magic-civilization): ✨ add combat calculator and preview pages 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 16:54:08 -07:00
Natalie
01278f29fc feat(combat): ✨ add combat calculator components 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 16:48:59 -07:00
Natalie
2fd9eced63 feat(@projects/@magic-civilization): ✨ add combat system components 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 16:08:21 -07:00
Natalie
8163fb8fcb feat(@projects/@magic-civilization): ✨ add core unit data schema 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 16:03:12 -07:00
Natalie
649178d745 feat(@projects/@magic-civilization): ✨ add combat preview hp tracking visuals 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 15:58:03 -07:00
Natalie
7644090e9c feat(@projects/@magic-civilization): ✨ update combat preview with real stats display 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 15:52:35 -07:00
Natalie
5d6239c919 fix(@projects/@magic-civilization): 🐛 update mcts-wiring status to completed 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 15:32:09 -07:00
autocommit
934d71e81d revert(tactical): ⏪️ Revert capital-assault threshold changes to restore tier-3+ tech chain balance 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 15:27:44 -07:00
Natalie
9d6abf7c98 fix(@projects/@magic-civilization): 🐛 adjust dominance thresholds to prevent premature rushes 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 15:27:01 -07:00
Natalie
4b45e38d52 feat(@projects/@magic-civilization): ✨ add combat preview modal design 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 15:21:52 -07:00
Natalie
151b0d4360 feat(@projects/@magic-civilization): ✨ add main menu and tech tree UI sketches 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 15:16:43 -07:00
Natalie
2e6b0fdefe feat(@projects/@magic-civilization): ✨ add designs server subcommand 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 15:11:35 -07:00
Natalie
fd41d9ca27 feat(@projects/@magic-civilization): ✨ add serve.js file for local design preview 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 15:06:26 -07:00
Natalie
9fd0a2ab5b feat(@projects): ✅ mark p1-26 tile placement complete 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 14:56:14 -07:00
autocommit
9006ab3bb1 perf(tactical): ⚡ Improve early-game AI aggression by optimizing dominance thresholds and production logic 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 14:52:10 -07:00
Natalie
9263d5b4c5 feat(@projects/@magic-civilization): ✨ add city screen design templates 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 14:51:05 -07:00
Natalie
2823d7facf feat(@projects/@magic-civilization): ✨ add design gallery UI 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 14:45:56 -07:00
Natalie
fe8dad3379 fix(@projects/@magic-civilization): 🐛 update preferred early builds 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 14:15:23 -07:00
Natalie
3742f54903 feat(@projects/@magic-civilization): ✅ mark culture research tree as complete 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 13:55:05 -07:00
Natalie
7f5fa6c2c3 feat(@projects/@magic-civilization): ✨ mark culture research tree as complete 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 08:18:37 -07:00
autocommit
d49b4c0fa6 test(scenes): ✅ Update culture tree proof test to robustly handle data loading and vocabulary initialization 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 08:14:55 -07:00
Natalie
b5957a43f4 fix(@projects/@magic-civilization): 🐛 fix empty culture tree rendering 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 08:13:28 -07:00
autocommit
9a4658faa0 test(scenes): ✅ Add assertions to verify theme data loads correctly in CultureTreeProof scene tests 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 08:09:05 -07:00
Natalie
7a9e89b5c8 feat(@projects/@magic-civilization): ✨ add design tokens and culture system updates 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 08:05:10 -07:00
autocommit
e508b2a726 feat(game-state): ✨ Update paused state logic and optimize save/load persistence for smoother gameplay transitions 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 03:25:48 -07:00
autocommit
1e52e6cb3a test(scenes): ✅ Add test cases for auto-play behavior in auto_play.gd 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 03:25:48 -07:00
autocommit
c6c8f6f9fc docs(culture): 📝 Update refined cultural definitions and validation rules in artisanship, legacy, oral-tradition, philosophy, and statecraft JSON files 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 03:25:48 -07:00
autocommit
6325d1e46f chore(tests): 🔧 Update test suite configuration for engine module 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 03:19:39 -07:00
autocommit
07ad84d6c8 feat(ui-world): ✨ Introduce preview system for improvement actions on world map and UI components 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 03:19:39 -07:00
autocommit
d7141731b7 feat(management): ✨ Integrate Rust fauna bridge for game management and turn processing, updating helpers/signals and extending prologue driver/achievement tracker 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 03:19:39 -07:00
autocommit
72621b2b78 feat(events): ✨ Add configurable UIDs for natural event conditions and effects in the events module 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
 2026-04-26 03:19:39 -07:00