Skip to content

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

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

feat: Shot spillover; Speed force; scr_shoot refactor#1309
EttyKitty wants to merge 2 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 and formations and introduces the Speed Force sweep attack, producing a single consolidated volley. Refactors scr_shoot into modular helpers and splits enemy/player flows for clearer damage, AP, and cleanup.

  • New Features

    • Shot spillover: excess damage rolls to the next alive rank (prefers same vehicle type), then the nearest formation behind; cleans up and destroys emptied formations after the volley.
    • Speed Force: sweeps the whole field via scr_shoot_spread (bypasses range/targeting), allocates shots by rank size, and reports one volley; auto-added to bike stacks with an optional ranged variant.
    • Helpers: find_next_alive_rank, get_next_enemy_formation, combat_apply_rank_damage, combat_rank_armour, and formation cleanup; scr_clean now uses combat_rank_armour.
  • Bug Fixes

    • Correct AP application for infantry and vehicles; Heretics only get a damage boost (no AP boost).
    • Fixed legacy emplacement weapons (negative indices) so they reliably fire.

Written for commit 19170ee. 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 2 times, most recently from f52e991 to 48c0607 Compare July 8, 2026 21:08
@EttyKitty EttyKitty force-pushed the feat/combat-balance branch from 48c0607 to 19170ee Compare July 9, 2026 20:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Size: Huge Type: Feature Adds something new

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants