Skip to content

Add defender counter war goals - #97

Merged
Drefvelin merged 3 commits into
mainfrom
feat/war-counter-goals
Oct 1, 2026
Merged

Drefvelin merged 3 commits into
mainfrom
feat/war-counter-goals

Conversation

@Drefvelin

Copy link
Copy Markdown
Contributor

Summary

  • Let the defending nation leader choose a counter goal from the active war screen before the first battle begins.
  • Keep war reparations as the default counter; selecting another goal replaces reparations on defender victory.
  • Apply counter goals against the attacker and persist the selection and battle-start lock.
  • Lock edits when a live, raid, or autoresolved first battle starts.

Dependency

Depends on #96 (war reparations trade tariff).

Validation

  • Reviewed the diff and ran git diff --check.
  • Build and tests not run.

@coderabbitai

coderabbitai Bot commented Oct 1, 2026 •

Copy link
Copy Markdown

Review in Change Stack →

Navigate logical layers of code changes, visualize relationships, and explore their blast radius.

Note

Currently processing new changes in this PR. This may take a few minutes, please wait...

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Advanced

Run ID: 7ac8184d-c807-4b0d-8d1c-e188ebd91d5c

📥 Commits

Reviewing files that changed from the base of the PR and between 84bb104 and 96b842d.

📒 Files selected for processing (14)
  • src/main/java/net/tfminecraft/simplefactions/database/WarData.java
  • src/main/java/net/tfminecraft/simplefactions/enums/SFGUI.java
  • src/main/java/net/tfminecraft/simplefactions/managers/InventoryManager.java
  • src/main/java/net/tfminecraft/simplefactions/managers/inventory/WarCreator.java
  • src/main/java/net/tfminecraft/simplefactions/managers/inventory/WarView.java
  • src/main/java/net/tfminecraft/simplefactions/war/battle/campaign/CampaignBattleLaunchService.java
  • src/main/java/net/tfminecraft/simplefactions/war/battle/engine/core/BattleManager.java
  • src/main/java/net/tfminecraft/simplefactions/war/campaign/raid/fight/CampaignRaidBattleService.java
  • src/main/java/net/tfminecraft/simplefactions/war/campaign/runtime/BattleAutoresolveService.java
  • src/main/java/net/tfminecraft/simplefactions/war/core/War.java
  • src/main/java/net/tfminecraft/simplefactions/war/core/WarMapper.java
  • src/main/java/net/tfminecraft/simplefactions/war/resolution/WarOutcomeService.java
  • src/test/java/net/tfminecraft/simplefactions/war/core/WarMapperTest.java
  • src/test/java/net/tfminecraft/simplefactions/war/resolution/WarOutcomeServiceTest.java
  • Autopilot · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Autopilot is currently an internal CodeRabbit preview.


Comment @coderabbitai help to get the list of available commands.

@Drefvelin
Drefvelin force-pushed the feat/war-counter-goals branch from 8e5d5c7 to 6d04ece Compare October 1, 2026 14:58
Base automatically changed from feat/war-reparations-trade-tariff to main October 1, 2026 15:19
@Drefvelin
Drefvelin force-pushed the feat/war-counter-goals branch from 6d04ece to 96b842d Compare October 1, 2026 15:21
@Drefvelin
Drefvelin merged commit 0ea90db into main Oct 1, 2026
1 of 2 checks passed
@Drefvelin
Drefvelin deleted the feat/war-counter-goals branch October 1, 2026 15:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant