Skip to content

feat: A bunch of stuff#1308

Merged
EttyKitty merged 6 commits into
Adeptus-Dominus:mainfrom
EttyKitty:pr/stuff
Jul 8, 2026
Merged

feat: A bunch of stuff#1308
EttyKitty merged 6 commits into
Adeptus-Dominus:mainfrom
EttyKitty:pr/stuff

Conversation

@EttyKitty

@EttyKitty EttyKitty commented Jul 8, 2026

Copy link
Copy Markdown
Collaborator

Summary by cubic

Refines forge completion popups with company assignment and grouped hangar locations. Updates weapons: HK Missile AP set to 4 and removes incorrect "dreadnought" tags.

  • New Features

    • CountingMap now supports custom callbacks and faster joins; used to format equipment totals and forge location summaries.
  • Bug Fixes

    • Forge: clear player_forge_data.vehicle_hanger on end turn and hide empty "In total..." equipment summary.
    • Armory: dreadnought ranged list no longer shows non-dread weapons.

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

Review in cubic

@github-actions github-actions Bot added Area: JSON Changes to external JSON files or their under-the-hood functionality Size: Small Type: Feature Adds something new labels Jul 8, 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 4 files

Confidence score: 3/5

  • In datafiles/data/weapons.json, the available-only filtering can hide Twin Linked Assault Cannon Mount for Dreadnoughts even though it remains in push_dreadnought_ranged_weapons_item_names, which can remove a valid player loadout option after merge — align the available-equipment filter logic with the Dreadnought item-name list before merging.
  • In scripts/scr_struct_functions/scr_struct_functions.gml, get_custom_string duplicates the same iteration/string-assembly pattern as get_total_string, increasing the chance of drift and inconsistent output when one path is updated later — extract/shared helper logic (or otherwise deduplicate) to reduce near-term regression risk.
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_struct_functions/scr_struct_functions.gml">

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

The new `get_custom_string` method duplicates the same iteration and string-building structure from `get_total_string` (declaring a result string, calling `struct_get_names(map)`, looping over keys with `array_length`, concatenating to the result, and returning it). This boilerplate duplication means any change to iteration logic, ordering, or error handling needs to happen in both places. Consider extracting a shared helper that handles the key enumeration and string concatenation, letting each method supply only its formatting logic, to keep maintenance centralized.</violation>
</file>

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

Re-trigger cubic

Comment thread scripts/scr_struct_functions/scr_struct_functions.gml
Comment thread datafiles/data/weapons.json
EttyKitty added 3 commits July 8, 2026 03:54
These weapons shouldn't be used on dreads.
- Support custom callback for any string format
- Avoid string concatenation performance hit with string_join_ext

@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 6 files

Confidence score: 5/5

  • In objects/obj_mass_equip/Step_0.gml, when all equipment slots are empty the generated summary can render as "In total they are equipped with: .", which is a minor visible text-quality issue rather than a functional regression; since this appears pre-existing, merge risk is low, but it should be cleaned up by guarding the trailing punctuation when no items are listed before or shortly after merge.
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="objects/obj_mass_equip/Step_0.gml">

<violation number="1" location="objects/obj_mass_equip/Step_0.gml:269">
P3: Edge case: if all equipment entries are empty (e.g., a role with no defined gear), the sentence ends with "In total they are equipped with: ." due to the orphaned period. Pre-existing behavior but visible with this change. Consider wrapping the assignment to skip the sentence entirely when _totals_string is empty, e.g. `if (_totals_string != "") all_equip = ...`</violation>
</file>

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

Re-trigger cubic

Comment thread objects/obj_mass_equip/Step_0.gml Outdated
@EttyKitty EttyKitty merged commit 6768d39 into Adeptus-Dominus:main Jul 8, 2026
5 checks passed
@EttyKitty EttyKitty deleted the pr/stuff branch July 8, 2026 01:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Area: JSON Changes to external JSON files or their under-the-hood functionality Size: Small Type: Feature Adds something new

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant