Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: First company command gear/size assign #402

Merged
merged 1 commit into from
Jan 12, 2025

Conversation

EttyKitty
Copy link
Contributor

@EttyKitty EttyKitty commented Jan 10, 2025

Description of changes

  • Streamline how first command squad gets their equipment assigned.
  • Do the same for their unit size.
  • Move all unit generation of the first comp under the vet+term check, as I see no reason not to.
  • Remove unused var _spawn_unit.
  • Replace a weird for loop on rhino spawn with repeat(4).

Reasons for changes

  • Fix Librarian loadout.
  • Make stuff more readable and less typo prone, I hope.

Related links

How have you tested your changes?

  • Compile
  • New game
  • Next turn
  • Space Travel
  • Ground Battle

Summary by Sourcery

Refactor the first company command squad gear and size assignment logic. Apply veteran and terminator checks to all unit generation. Replace the rhino spawn loop with a repeat loop.

Enhancements:

  • Streamline the equipment and unit size assignment for the first company command squad.

Tests:

  • Compile and start a new game to test changes.

Copy link
Contributor

sourcery-ai bot commented Jan 10, 2025

Reviewer's Guide by Sourcery

This PR refactors the first company command squad gear and size assignment logic, applying veteran and terminator checks to all unit generations and simplifying the equipment and unit size assignments. It also replaces a for loop with a repeat loop for rhino spawns and removes an unused variable.

File-Level Changes

Change Details Files
Streamlined first company command squad gear/size assignment.
  • Defined helper functions _is_terminator to check for terminator armor and variables to manage first company armor, weapons, and size based on veteran/terminator status.
  • Used these variables and functions to streamline the logic for assigning gear and size to the first company command squad based on the presence of terminators and veterans.
  • Removed repetitive armor assignment blocks within the veteran check.
scripts/scr_initialize_custom/scr_initialize_custom.gml
Moved unit generation under veteran/terminator check.
  • Moved all unit generation logic for the first company under the veteran + terminator check.
scripts/scr_initialize_custom/scr_initialize_custom.gml
Removed unused variable and replaced for loop.
  • Removed the unused _spawn_unit variable.
  • Replaced the for loop used for Rhino spawning with a repeat(4) loop.
scripts/scr_initialize_custom/scr_initialize_custom.gml

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time. You can also use
    this command to specify where the summary should be inserted.

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@github-actions github-actions bot added the PR: Refactor Rewriting/restructuring code, while keeping general behaviour label Jan 10, 2025
sourcery-ai[bot]
sourcery-ai bot previously approved these changes Jan 10, 2025
Copy link
Contributor

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @EttyKitty - I've reviewed your changes - here's some feedback:

Overall Comments:

  • Remove commented debug message on line 2582
Here's what I looked at during the review
  • 🟢 General issues: all looks good
  • 🟢 Security: all looks good
  • 🟢 Testing: all looks good
  • 🟢 Complexity: all looks good
  • 🟢 Documentation: all looks good

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

@EttyKitty EttyKitty added the PR: Fix This is a fix for a bug label Jan 10, 2025
@EttyKitty EttyKitty added this to the v0.10.1 milestone Jan 10, 2025
@OH296 OH296 changed the base branch from release/0.10.0.0 to main January 12, 2025 21:28
@OH296 OH296 dismissed sourcery-ai[bot]’s stale review January 12, 2025 21:28

The base branch was changed.

@OH296
Copy link
Collaborator

OH296 commented Jan 12, 2025

@sourcery-ai review

@OH296 OH296 enabled auto-merge (squash) January 12, 2025 21:28
Copy link
Contributor

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @EttyKitty - I've reviewed your changes and they look great!

Here's what I looked at during the review
  • 🟢 General issues: all looks good
  • 🟢 Security: all looks good
  • 🟢 Testing: all looks good
  • 🟢 Complexity: all looks good
  • 🟢 Documentation: all looks good

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

@OH296 OH296 merged commit cab5a2d into Adeptus-Dominus:main Jan 12, 2025
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
PR: Fix This is a fix for a bug PR: Refactor Rewriting/restructuring code, while keeping general behaviour
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants