Skip to content

refactor: Cleanup ComplexSet code layout and skeletonize its JSDoc's.#1284

Merged
EttyKitty merged 2 commits into
Adeptus-Dominus:mainfrom
carys-the-weed-cloud:main
Jun 30, 2026
Merged

refactor: Cleanup ComplexSet code layout and skeletonize its JSDoc's.#1284
EttyKitty merged 2 commits into
Adeptus-Dominus:mainfrom
carys-the-weed-cloud:main

Conversation

@carys-the-weed-cloud

@carys-the-weed-cloud carys-the-weed-cloud commented Jun 30, 2026

Copy link
Copy Markdown
Collaborator

I added barebones JSDoc styling where i could in ComplexSet and tangentally scr_population_influence as well. I did slip in a few code changes here and there as they caught my eye but nothing that should cause a regression.

In ComplexSet I also rearranged things so all variable definitions are at the top of the file instead of interspersed throughout.


Summary by cubic

Reorganized ComplexSet into a clean top‑to‑bottom layout and expanded lightweight JSDoc across its API and scr_population_influence. Improves readability, type hints, and maintainability without changing expected behavior.

  • Refactors

    • Hoisted fields, statics, and shader handles; grouped helpers; normalized parameter names and early returns.
    • Added @param, @return, and @self JSDoc across ComplexSet methods; typed helpers like scr_has_style, valid_sprite_transform_data, and sprite_get_uvs_transformed.
    • Centralized default draw order and deduplicated purity‑seal positioning across armour types.
    • Created global.base_component_surface up front; call base_armour() before Techmarine overlays.
    • assign_modulars: use position = "" to opt‑in override; simplified style checks and array early‑exit.
  • Bug Fixes

    • merge_influences: pass id into adjust_influence and updated @self to Asset.GMObject.obj_star.
    • Added sprite‑existence guards when computing shadow UV transforms.
    • assign_modulars: respect provided position for non‑weapon items so they render in the right area.

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

Review in cubic

@github-actions github-actions Bot added Size: Big Type: Refactor Rewriting/restructuring code, while keeping general behavior labels Jun 30, 2026
@carys-the-weed-cloud carys-the-weed-cloud marked this pull request as ready for review June 30, 2026 16:51

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

1 issue found across 2 files

Confidence score: 2/5

  • In scripts/scr_ComplexSet/scr_ComplexSet.gml, the default assign_modulars() behavior appears to clear each modular item's position, so global.modular_drawing_items are no longer added to the ComplexSet and modular visuals may silently disappear at runtime; only override position when a caller explicitly provides one (such as weapon visual overrides) before merging.

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

Re-trigger cubic

Comment thread scripts/scr_ComplexSet/scr_ComplexSet.gml Outdated
@carys-the-weed-cloud carys-the-weed-cloud force-pushed the main branch 2 times, most recently from 5498088 to cf4d93a Compare June 30, 2026 18:06
@carys-the-weed-cloud carys-the-weed-cloud marked this pull request as draft June 30, 2026 18:22
@carys-the-weed-cloud carys-the-weed-cloud marked this pull request as ready for review June 30, 2026 18:22
cubic-dev-ai[bot]
cubic-dev-ai Bot previously approved these changes Jun 30, 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 2 files

Confidence score: 5/5

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

Re-trigger cubic

cubic-dev-ai[bot]
cubic-dev-ai Bot previously approved these changes Jun 30, 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 2 files

Confidence score: 5/5

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

Re-trigger cubic

Comment thread scripts/scr_population_influence/scr_population_influence.gml Outdated
Comment thread scripts/scr_ComplexSet/scr_ComplexSet.gml Outdated

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

Re-trigger cubic

@EttyKitty EttyKitty merged commit 628b37d into Adeptus-Dominus:main Jun 30, 2026
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Size: Big Type: Refactor Rewriting/restructuring code, while keeping general behavior

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants