Skip to content

fix: Promote issues - #1634

Merged
EttyKitty merged 2 commits into
mainfrom
fix/promote
Oct 9, 2026
Merged

EttyKitty merged 2 commits into
mainfrom
fix/promote

Conversation

@EttyKitty

@EttyKitty EttyKitty commented Oct 9, 2026 •

Copy link
Copy Markdown
Collaborator

Closes #1633


Summary by cubic

Fixes several issues with the promote action and save loading that caused crashes and incorrect role data.

  • Promotions now update all affected companies, not just the source and target, and skip invalid company indices.
  • The promote button is only enabled during an active management session, and the promotion selection resets after a successful promotion or when leaving manage mode.
  • player_role_data is now applied before marine structs load, so role overrides survive deserialization correctly. Closes [main/2026-10-08-1819] scr_company_order:143 #1633.

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

View guided diff

@github-actions github-actions Bot added Size: Small Type: Fix This is a fix for a bug labels Oct 9, 2026
@EttyKitty

Copy link
Copy Markdown
Collaborator Author

/review

@lyra-cactus lyra-cactus 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.

LGTM. Verified all 6 files: multi-company reorder in scr_promote correctly captures source companies before move_to_company and includes target; scr_company_order guard matches valid 0..companies range; promote gating on managing > 0 plus sel_promoting resets (Alarm_6 else, group_selection) correctly close the adhoc/stale-state crash; player_role_data reorder before marine load is a pure move with no logic change and preserves overrides. No bugs, regressions, or style violations found. ASCII clean.

@EttyKitty
EttyKitty merged commit 5820386 into main Oct 9, 2026
4 checks passed
@EttyKitty
EttyKitty deleted the fix/promote branch October 9, 2026 14:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[main/2026-10-08-1819] scr_company_order:143

1 participant