admin/eagle0
1
0
Fork 0
mirror of https://github.com/nolen777/eagle0.git synced 2026-07-29 01:35:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Convert ExpandCommandSelector to use Scala types (#4809)

Browse Source 
- Convert ExpandCommandSelector from proto to Scala types (GameState, ProvinceT, FactionT)
- Add isAdjacentEnemy method to ProvinceUtils for protoless usage
- Add protoless overloads to ProvinceGoldSurplusCalculator
- Update ExpandCommandSelectorTest to use GameStateConverter.fromProto()
- Update DEPROTO_PLAN.md to reflect progress

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
admin
2025-12-25 07:58:21 -08:00
committed by GitHub
co-authored by Claude Opus 4.5
parent ded08187b2
commit dfd1da8b8a
10 changed files with 200 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/DEPROTO_PLAN.md
+25
View File
@@ -231,6 +231,31 @@ The following 5 actions still have proto usage:
**Completed:**
- `ChronicleEventGenerator` converted to return Scala `ChronicleEvent` types directly
### CommandChoiceHelpers Migration Status
Several command selectors have already been converted to use Scala types:
| File | Status | Notes |
|------|--------|-------|
| `AttackCommandChooser.scala` | ✅ **Protoless** | Uses Scala `GameState`, `HeroT`, `ProvinceT` |
| `AlmsCommandSelector.scala` | ✅ **Protoless** | Uses Scala `GameState`, `HeroT`, `ProvinceT` |
| `FoodConsumptionUtils.scala` | ✅ **Protoless** | Uses Scala `GameState`, `ProvinceT`, `RoundPhase` |
| `MarchSuppliesHelpers.scala` | ✅ **Protoless** | Uses `BattalionT` |
| `CombatUnitSelector.scala` | ✅ **Protoless** | Uses `HeroT`, `BattalionT`, `BattalionType` |
| `ExpandCommandSelector.scala` | ✅ **Protoless** | Uses Scala `GameState`, `ProvinceT`, `FactionT` |
| `CommandChoiceHelpers.scala` | ❌ Proto | Main entry point, converts to Scala when calling converted selectors |
| `ImproveCommandSelector.scala` | ❌ Proto | Uses proto `GameState`, `Hero` |
| `OrganizeCommandSelector.scala` | ❌ Proto | Uses proto `GameState` |
| `ProvinceGoldSurplusCalculator.scala` | **Partial** | Has both Scala and proto overloads |
| Other selectors | ❌ Proto | Various proto dependencies |
**Pattern**: `CommandChoiceHelpers` currently uses `GameStateConverter.fromProto(gameState)` when calling already-converted selectors like `AlmsCommandSelector` and `AttackCommandChooser`. This allows incremental migration.
**Next Steps**:
1. ~~Convert `ExpandCommandSelector` to Scala types~~ ✅ Done
2. Convert remaining selectors one at a time (`ImproveCommandSelector`, `OrganizeCommandSelector`, etc.)
3. Update `CommandChoiceHelpers` to accept Scala `GameState` once all selectors are converted
### Progress Summary
| Metric | Value |