fix: refine siege occupation and battle pacing - #25
Merged
Merged
Conversation
Keep siege combat on an adjacent staging tile, then move the victorious conquering army onto the settlement center before starting the occupation timer. Cancel active occupation if the army is no longer at its occupation destination.
Run combat rounds every three seconds and document the proportional attack-power model. Add regression coverage proving larger equivalent battles produce proportionally greater absolute casualties.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Outcome
Separates siege staging from settlement occupation and makes combat resolve in faster, size-proportional rounds. Conquering armies fight from beside a settlement, enter its center after victory, and must physically hold that center before ownership transfers.
Conquest changes
Battle pacing and casualties
Companion UI
The battle countdown and progress timing are updated in the companion web PR.
Verification
go test ./...go build ./...go vet ./...buf lintgoose -dir db/migrations validategit diff --check