feat: Shot spillover; Speed force; scr_shoot refactor - #1309
Draft
EttyKitty wants to merge 6 commits into
Draft
Conversation
Contributor
There was a problem hiding this comment.
All reported issues were addressed across 3 files
Confidence score: 5/5
- Safe to merge after the addressed issues were fixed.
Reply with feedback, questions, or to request a fix.
Re-trigger cubic
Contributor
There was a problem hiding this comment.
2 issues found across 1 file (changes from recent commits).
Reply with feedback, questions, or to request a fix.
Re-trigger cubic
EttyKitty
marked this pull request as draft
July 8, 2026 02:37
EttyKitty
force-pushed
the
feat/combat-balance
branch
4 times, most recently
from
July 12, 2026 04:16
19170ee to
fd22bbf
Compare
EttyKitty
force-pushed
the
feat/combat-balance
branch
from
July 12, 2026 18:19
fd22bbf to
6fcc9c7
Compare
Contributor
|
This PR is marked as stale, because it has been open for 7 days with no activity. |
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.
Summary by cubic
Adds shot spillover across enemy ranks/formations and the Speed Force sweep, consolidating volleys for clearer combat. Refactors shooting into dedicated player/enemy paths, adds obstruction-aware targeting, and tunes starting formation weights.
New Features
find_next_alive_rank,get_next_enemy_formation, andcombat_cleanup_formations.scr_shoot_spreadsweeps all enemy formations, allocates shots by rank size, and reports one volley; auto-added tobikestacks with an optional ranged variant.check_column_obstructionfor player/enemy back-row targeting; fixes pass-through and flanking offset.scr_shootsplit intoscr_shoot_player/scr_shoot_enemy; addscombat_rank_armourandcombat_apply_rank_damage; expanded CombatDebugger logs.Bug Fixes
scr_cleanviacombat_rank_armour; Heretics keep their damage boost; legacy emplacements fire reliably.Written for commit 6fcc9c7. Summary will update on new commits.