Skip to content

fix: bulk armour painting and complex livery selection - #1452

Merged
OH296 merged 5 commits into
Adeptus-Dominus:mainfrom
OH296:sgt_helms
Aug 19, 2026
Merged

fix: bulk armour painting and complex livery selection#1452
OH296 merged 5 commits into
Adeptus-Dominus:mainfrom
OH296:sgt_helms

Conversation

@OH296

@OH296 OH296 commented Aug 19, 2026

Copy link
Copy Markdown
Collaborator

Summary by cubic

Fixes bulk armour painting and complex livery selection by splitting handling and using enums. Previously both modes misapplied colours and didn’t refresh controls; now Bulk updates role colours and buttons, Advanced updates per-area colours and buttons, with improved spacing and no popup tooltips.

  • Introduces enums eLIVERY_COLOURING_OPTIONS and eLIVERY_SELECTION_TYPES; replaces numeric checks in the popup flow, scr_livery_setup, and selection radios.
  • Routes LiveryPick by colouring option: Bulk validates role (1–7), writes the role field, and calls bulk_selection_buttons_setup(); Advanced writes complex_livery_data[role][area] and calls set_complex_livery_buttons().
  • Updates scr_livery_setup: branches on Standard/Bulk/Advanced via enums, hides role/company radios in Advanced, moves controls down (~y=220+), anchors Bulk “Update Sprite” to the preview box, positions Bulk armour pattern below the last button, and uses fnt_40k_14b for selection UIs.
  • Layout/spacing: normalizes Bulk button positions with dynamic vertical spacing, shifts complex-livery buttons down, and repositions colour radios; removes redundant tooltip fields and the popup tooltip drawing block from obj_creation_popup.

Migration

  • Replace numeric livery option checks with eLIVERY_COLOURING_OPTIONS/eLIVERY_SELECTION_TYPES.

Written for commit 7a1eeef. Summary will update on new commits.

Review in cubic

@github-actions github-actions Bot added Size: Small Type: Fix This is a fix for a bug labels Aug 19, 2026
@OH296

OH296 commented Aug 19, 2026

Copy link
Copy Markdown
Collaborator Author

\review

@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

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

Re-trigger cubic

Comment thread scripts/scr_livery_setup/scr_livery_setup.gml Outdated
Comment thread objects/obj_creation_popup/Create_0.gml Outdated
OH296 and others added 2 commits August 19, 2026 17:03
Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com>
Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com>
cubic-dev-ai[bot]
cubic-dev-ai Bot previously approved these changes Aug 19, 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).

Confidence score: 5/5

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

Re-trigger cubic

@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 2 files (changes from recent commits).

Tip: Review your code locally with the cubic CLI to iterate faster.

Re-trigger cubic

Comment thread scripts/scr_livery_setup/scr_livery_setup.gml
Comment thread scripts/scr_creation/scr_creation.gml
Comment thread scripts/scr_livery_setup/scr_livery_setup.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.

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

Confidence score: 5/5

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

Re-trigger cubic

@OH296
OH296 merged commit 7d17f9d into Adeptus-Dominus:main Aug 19, 2026
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant