Skip to content

fix: Activate player units for STC theft battle - #1498

Merged
EttyKitty merged 1 commit into
Adeptus-Dominus:mainfrom
The-Real-Nyx:Patch2
Sep 3, 2026
Merged

fix: Activate player units for STC theft battle#1498
EttyKitty merged 1 commit into
Adeptus-Dominus:mainfrom
The-Real-Nyx:Patch2

Conversation

@The-Real-Nyx

@The-Real-Nyx The-Real-Nyx commented Sep 3, 2026

Copy link
Copy Markdown
Collaborator

Closes #1494

Tested by reproducing the reported crash in game prior to the fix. Post fix the crash could not be reproduced.


Summary by cubic

Fixes the crash in the Mechanicus STC theft battle by reactivating player unit columns alongside combat units.

Closes #1494. The battle deactivated all instances but only reactivated obj_ncombat, leaving obj_pnunit columns inactive. instance_nearest ignores deactivated instances, so marine placement columns were skipped and the setup alarm threw an error.

Written for commit ad77c39. Summary will update on new commits.

Review in cubic

The Mechanicus STC theft battle created obj_ncombat and its obj_pnunit
formation columns, then called instance_deactivate_all_safe before
reactivating only obj_ncombat.
The following roster setup uses instance_nearest to select each unit's
destination column. Because instance_nearest ignores deactivated
instances, it returned noone for every marine, so their placement
blocks were skipped. The obj_ncombat setup alarm then had no populated
column against which to measure the player formation and threw an error.

Refs: Adeptus-Dominus#1494
@github-actions github-actions Bot added Size: Tiny Type: Fix This is a fix for a bug labels Sep 3, 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.

No issues found across 1 file

Confidence score: 5/5

  • Automated review surfaced no issues in the provided summaries.
  • No files require special attention.

Re-trigger cubic

@EttyKitty
EttyKitty merged commit 22a49f9 into Adeptus-Dominus:main Sep 3, 2026
5 checks passed
@The-Real-Nyx
The-Real-Nyx deleted the Patch2 branch September 3, 2026 04:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Size: Tiny Type: Fix This is a fix for a bug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[main/2026-08-29-1605] obj_ncombat_Alarm_0:90

2 participants