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

feat: Edits to robes, psy hood and daemon binders #403

Merged
merged 2 commits into from
Jan 12, 2025

Conversation

EttyKitty
Copy link
Collaborator

@EttyKitty EttyKitty commented Jan 10, 2025

Description of changes

  • Streamline Psy Hood drawing code, as I think the old one was deprecated.
  • Disable Psy Hood on Terminator Armour, as it wasn't looking very good.
  • Refactor robe chance calculation, to be more simple and readable.
  • Daemon Binders trait now replaces second robe variant on all marines, instead of 100% on all librarians.
  • Minor Daemon Binders robe sprite edits, to add outlines where missed.
  • Minor Daemon Binders mask edits: add colorable eyes, fix position.

How have you tested your changes?

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

Summary by Sourcery

Update the psy hood and daemon binder features, and refactor robe chance calculations.

Enhancements:

  • Simplified robe chance calculations for improved readability.
  • Removed deprecated psy hood drawing code.
  • Standardized the application of Daemon Binders to replace the second robe variant on all marines.

Copy link
Contributor

sourcery-ai bot commented Jan 10, 2025

Reviewer's Guide by Sourcery

This PR refactors the robe and psy hood system, disables psy hoods on Terminator Armour, and implements changes to the Daemon Binders trait.

File-Level Changes

Change Details Files
Refactored psy hood drawing code
  • Changed psy_hood variable type from numeric to boolean.
  • Simplified psy hood drawing logic based on the boolean psy_hood variable.
  • Removed conditional checks and sprite assignments based on specific armour types.
  • Added check to disable psy hoods on Terminator armour.
  • Moved old psy hood sprites to unused folder.
scripts/scr_draw_unit_image/scr_draw_unit_image.gml
Refactored robe chance calculation
  • Simplified robe chance calculation to be more readable.
  • Introduced a new variable _robe_chance to store the base robe chance.
  • Modified robe chance based on chapter name.
  • Removed old robe and hood assignment logic.
  • Added new logic to assign robes based on _robe_chance.
scripts/scr_marine_struct/scr_marine_struct.gml
Modified Daemon Binders trait implementation
  • Daemon Binders trait now replaces the second robe variant on all marines.
  • Added new sprites for Daemon Binders robes and hood.
  • Adjusted the position and size of the Daemon Binders hood and robe sprites.
  • Added outlines to Daemon Binders robe sprites.
  • Added colorable eyes to Daemon Binders mask and fixed its position.
scripts/scr_draw_unit_image/scr_draw_unit_image.gml
sprites/spr_gear_hood2/spr_gear_hood2.yy
sprites/spr_binders_robes/spr_binders_robes.yy

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 PR: Sprites Changes to sprites/images PR: Feature Adds something new labels Jan 10, 2025
@EttyKitty
Copy link
Collaborator Author

@sourcery-ai review

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:

  • The removal of the terminator-specific psy hood positioning (y_offset) should be documented in the PR description if this is an intentional change.
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 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:29
@OH296 OH296 dismissed sourcery-ai[bot]’s stale review January 12, 2025 21:29

The base branch was changed.

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

OH296 commented Jan 12, 2025

@sourcery-ai review

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 8574f40 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: Feature Adds something new PR: Sprites Changes to sprites/images
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants