Skip to content

feat: Shot spillover; Speed force; scr_shoot refactor - #1309

Draft
EttyKitty wants to merge 6 commits into
Adeptus-Dominus:mainfrom
EttyKitty:feat/combat-balance
Draft

feat: Shot spillover; Speed force; scr_shoot refactor#1309
EttyKitty wants to merge 6 commits into
Adeptus-Dominus:mainfrom
EttyKitty:feat/combat-balance

Conversation

@EttyKitty

@EttyKitty EttyKitty commented Jul 8, 2026

Copy link
Copy Markdown
Collaborator

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

    • Shot spillover: excess shots roll to the next alive rank (prefers same vehicle type), then the nearest formation; cleans up with find_next_alive_rank, get_next_enemy_formation, and combat_cleanup_formations.
    • Speed Force: scr_shoot_spread sweeps all enemy formations, allocates shots by rank size, and reports one volley; auto-added to bike stacks with an optional ranged variant.
    • Targeting obstruction: check_column_obstruction for player/enemy back-row targeting; fixes pass-through and flanking offset.
    • Shooting refactor: scr_shoot split into scr_shoot_player/scr_shoot_enemy; adds combat_rank_armour and combat_apply_rank_damage; expanded CombatDebugger logs.
    • Balance: updated starting formation weights (e.g., Tacticals 3, Terminators 4, Rhinos/Predators/Land Raiders 5).
  • Bug Fixes

    • Correct armour/AP handling for infantry and vehicles in scr_clean via combat_rank_armour; Heretics keep their damage boost; legacy emplacements fire reliably.

Written for commit 6fcc9c7. Summary will update on new commits.

Review in cubic

@github-actions github-actions Bot added Size: Huge Type: Feature Adds something new labels Jul 8, 2026

@cubic-dev-ai cubic-dev-ai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Comment thread scripts/scr_shoot/scr_shoot.gml Outdated
Comment thread scripts/scr_shoot/scr_shoot.gml
Comment thread scripts/scr_shoot/scr_shoot.gml

@cubic-dev-ai cubic-dev-ai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2 issues found across 1 file (changes from recent commits).

Reply with feedback, questions, or to request a fix.

Re-trigger cubic

Comment thread scripts/scr_shoot/scr_shoot.gml Outdated
Comment thread scripts/scr_shoot/scr_shoot.gml Outdated
cubic-dev-ai[bot]
cubic-dev-ai Bot previously approved these changes Jul 8, 2026

@cubic-dev-ai cubic-dev-ai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

0 issues found across 1 file (changes from recent commits).

Re-trigger cubic

@EttyKitty
EttyKitty marked this pull request as draft July 8, 2026 02:37
@EttyKitty
EttyKitty force-pushed the feat/combat-balance branch 4 times, most recently from 19170ee to fd22bbf Compare July 12, 2026 04:16
@github-actions

Copy link
Copy Markdown
Contributor

This PR is marked as stale, because it has been open for 7 days with no activity.

@github-actions github-actions Bot added the Status: Stale No activity for more than a week label Jul 19, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Size: Huge Status: Stale No activity for more than a week Type: Feature Adds something new

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants