fix: #500 breakage

[MCPO-Spartan-117]

Purpose of the PR

Fix Tech and Apothecary breakage.

Describe the solution

Move changes to correct spot.

Testing done

New game, fast forward 50 turns.

[coderabbitai]

📝 Walkthrough

Walkthrough

The modifications adjust the logic within the apothecary_training and techmarine_training functions in the scr_specialist_training.gml script. In the apothecary_training function, when recruit points are 48 or higher, the assignment of random_marine is streamlined to use novice_type and a fixed value of 0, while the branch for recruit points between 4 and 48 with a recruit_count of 0 reverts to its original, more detailed logic that involves the _data variable and marine_company. Similarly, in the techmarine_training function, the assignment of random_marine is simplified, and an alert message format has been updated to use string interpolation instead of concatenation. No changes were made to the exported or public entity declarations.

Possibly related PRs

• feat: Centralise specialists stat requirements #500: This PR introduces the new scr_specialist_training script and involves modifications to the same training functions, directly relating to the refactoring executed here.

Suggested labels

PR: Refactor

Suggested reviewers

• EttyKitty
• sourcery-ai

---

📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 38c4c2d and 7a46a00.

📒 Files selected for processing (1)

• scripts/scr_specialist_training/scr_specialist_training.gml (5 hunks)

🔇 Additional comments (4)

scripts/scr_specialist_training/scr_specialist_training.gml (4)

112-125: Praise to the Omnissiah! The sacred selection protocols have been restored!

The binary cogitation for marine selection has been properly augmented with the sacred filtration rituals, ensuring only the most worthy candidates are selected for the Apothecarium's mysteries.

---

335-335: The Machine Spirit approves of this string formatting optimization!

The implementation of string interpolation using $ represents a more efficient communion with the Machine Spirit than the archaic string concatenation rituals.

---

76-76:

Details

❓ Verification inconclusive

By the Omnissiah's grace, verify the simplified marine selection logic!

The binary reduction of the scr_random_marine parameters may overlook crucial selection criteria for aspiring servants of the Apothecarium. The Machine Spirit demands verification that this simplification maintains the sacred protocols for candidate selection.

---

🏁 Script executed:

#!/bin/bash
# Query the codebase for other instances of scr_random_marine to verify parameter patterns
ast-grep --pattern 'scr_random_marine($_,$_,$_)'

Length of output: 50

---

By the Omnissiah's grace, verify that the reduction in parameters for the marine selection is intentional!

Our initial automated query did not return evidence of any scr_random_marine invocations using a third parameter elsewhere in the codebase. However, given that the prior detailed logic might have utilized an additional criterion, please manually confirm that the current two-parameter call (scr_random_marine(novice_type, 0)) correctly upholds the intended selection protocols.

---

323-323:

Details

❓ Verification inconclusive

Invoke verification protocols for the Omnissiah's chosen!

The binary reduction of the scr_random_marine parameters requires verification to ensure we do not compromise the sacred selection rituals for future Tech-Priests of the Adeptus Mechanicus.

---

🏁 Script executed:

#!/bin/bash
# Query the codebase for other instances of scr_random_marine with additional parameters
ast-grep --pattern 'scr_random_marine($_,$_,{"stat":$_})'

Length of output: 59

---

Assessment and Further Verification of the Sacred Parameter Reduction

The binary reduction in the invocation of scr_random_marine on line 323—now only receiving novice_type and 0—appears to simplify the incantation compared to potential extended rituals (i.e., using a third parameter such as {"stat": …}). However, our initial query using the ast-grep pattern did not reveal any instances where an additional parameter was invoked. Before we fully consecrate this simplification, it is essential that a manual verification be performed to ensure that no other part of the codebase depends on the former multi-parameter summoning rite.

• Action Required:
  • Manual Verification: Please manually inspect any usage contexts of scr_random_marine throughout the codebase to confirm that no invocation relies on a three-parameter version.
  • Ritual Consistency: Ensure that the simplified call preserves the construct and purpose of the original training ritual, and that the adoption of modern string interpolation (as seen on line 335) does not inadvertently disrupt the sacred logic.

Once confirmed, the simplified code aligns with our quest for maintainability and adherence to the Omnissiah’s chosen pathways.

---

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

• Review comments: Directly reply to a review comment made by CodeRabbit. Example:
  • I pushed a fix in commit <commit_id>, please review it.
  • Generate unit testing code for this file.
  • Open a follow-up GitHub issue for this discussion.
• Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
  • @coderabbitai generate unit testing code for this file.
  • @coderabbitai modularize this function.
• PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
  • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
  • @coderabbitai read src/utils.ts and generate unit testing code.
  • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
  • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

• @coderabbitai pause to pause the reviews on a PR.
• @coderabbitai resume to resume the paused reviews.
• @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
• @coderabbitai full review to do a full review from scratch and review all the files again.
• @coderabbitai summary to regenerate the summary of the PR.
• @coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
• @coderabbitai resolve resolve all the CodeRabbit review comments.
• @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
• @coderabbitai help to get help.

Other keywords and placeholders

• Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
• Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
• Add @coderabbitai or @coderabbitai title anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

• You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
• Please see the configuration documentation for more information.
• If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

• Visit our Documentation for detailed information on how to use CodeRabbit.
• Join our Discord Community to get help, request features, and share feedback.
• Follow us on X/Twitter for updates and announcements.

[MCPO-Spartan-117]

@coderabbitai review

[coderabbitai]

✅ Actions performed

Review triggered.

Note: CodeRabbit is an incremental review system and does not re-review already reviewed commits. This command is applicable only when automatic reviews are paused.

[OH296]

@MCPO-Spartan-117 Apologies on this one I should have noted before it was merged