Skip to content

fix: Repair demon summon ship battle - #1490

Merged
EttyKitty merged 1 commit into
Adeptus-Dominus:mainfrom
The-Real-Nyx:Patch1
Aug 29, 2026
Merged

fix: Repair demon summon ship battle#1490
EttyKitty merged 1 commit into
Adeptus-Dominus:mainfrom
The-Real-Nyx:Patch1

Conversation

@The-Real-Nyx

@The-Real-Nyx The-Real-Nyx commented Aug 29, 2026

Copy link
Copy Markdown
Collaborator

Summary by cubic

Fixes the demon summon ship battle, which previously crashed with index-out-of-bounds errors during roster building and left map instances active over the battle.

  • Now iterates each company's valid bounds, so the first marine in each company can also join.
  • Performs the normal combat-scene handoff, applies the configured formation, and closes the Librarium after the battle is built.

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

Review in cubic

The roster scan probed slots 1 through 300 for each of 11 companies
regardless of the company's bounds. After Adeptus-Dominus#1414 removed the obj_ini.name
sentinel, probes past the end of a roster reached fetch_unit and
reported an index-out-of-bounds error for every invalid slot. The scan
now iterates each stored company over its valid zero-based bounds, which
also lets the first marine in each company join the battle.

The summon branch also skipped the normal combat-scene handoff, so map
instances remained active over the battle and the shared formation
columns could retain the previous battle's values. It now performs the
scene handoff before creating combat, applies its configured formation
before building the roster, and closes the Librarium once the battle is
built.
@github-actions github-actions Bot added Size: Tiny Type: Fix This is a fix for a bug labels Aug 29, 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.

2 issues found across 2 files

Confidence score: 5/5

  • In scripts/scr_ship_battle/scr_ship_battle.gml, the new okay and sofar locals violate the project’s non-loop variable naming convention; rename them to _okay and _sofar and update their references.
Prompt for AI agents (unresolved issues)

Check if these issues are valid — if so, understand the root cause of each and fix them. If appropriate, use sub-agents to investigate and fix each issue separately.


<file name="scripts/scr_ship_battle/scr_ship_battle.gml">

<violation number="1" location="scripts/scr_ship_battle/scr_ship_battle.gml:12">
P2: Custom agent: **Code Quality Review**

The added `sofar` local violates the required `_` prefix for non-loop `var` variables. Rename it to `_sofar` and update its references.</violation>

<violation number="2" location="scripts/scr_ship_battle/scr_ship_battle.gml:18">
P2: Custom agent: **Code Quality Review**

The added `okay` local violates the required `_` prefix for non-loop `var` variables. Rename it to `_okay` and update its references.</violation>
</file>

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

Re-trigger cubic

Comment thread scripts/scr_ship_battle/scr_ship_battle.gml
Comment thread scripts/scr_ship_battle/scr_ship_battle.gml
@EttyKitty
EttyKitty merged commit 037e027 into Adeptus-Dominus:main Aug 29, 2026
8 checks passed
@The-Real-Nyx
The-Real-Nyx deleted the Patch1 branch August 31, 2026 21:34
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.

2 participants