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

fix: Player ship class and arrays #406

Merged
merged 3 commits into from
Jan 10, 2025

Conversation

OH296
Copy link
Collaborator

@OH296 OH296 commented Jan 10, 2025

Description of changes

  • fix a bundle of array issues with fleet and ship functions
  • make sure marines and vehicles are moved onto the correct ship index when killing ships

Reasons for changes

Related links

How have you tested your changes?

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

Summary by Sourcery

Fix issues with ship and fleet management functions to handle edge cases correctly.

Bug Fixes:

  • Fix an issue where invalid ship indices were accessed when merging fleets.
  • Fix an issue where units and vehicles were not correctly reassigned when a ship was destroyed.

Copy link
Contributor

sourcery-ai bot commented Jan 10, 2025

Reviewer's Guide by Sourcery

This PR fixes a bundle of array issues with fleet and ship functions to prevent crashes caused by invalid ship indices when merging or destroying ships.

File-Level Changes

Change Details Files
Fixed an issue that caused crashes when merging fleets containing invalid ship indices.
  • Added a check to ensure that the ship index is within the bounds of the obj_ini.ship array before moving the ship between fleets.
scripts/scr_player_fleet_functions/scr_player_fleet_functions.gml
Fixed an issue that caused crashes when destroying ships with units or vehicles assigned to them.
  • Added a check to ensure that the unit's ship location is valid before attempting to kill the unit.
  • Added logic to decrement the ship location of units and vehicles on ships with a higher index than the destroyed ship.
  • Cleared vehicle variables when a ship is destroyed.
scripts/scr_ini_ship_cleanup/scr_ini_ship_cleanup.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

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 @OH296 - I've reviewed your changes - here's some feedback:

Overall Comments:

  • The code changes look good, but please provide more details in the PR description about what specific array issues/bugs were being fixed. This helps with future maintenance and debugging.
Here's what I looked at during the review
  • 🟡 General issues: 1 issue found
  • 🟢 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.

scripts/scr_ini_ship_cleanup/scr_ini_ship_cleanup.gml Outdated Show resolved Hide resolved
@OH296
Copy link
Collaborator Author

OH296 commented Jan 10, 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 @OH296 - 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 changed the title Fix/player ship class fix: Player ship class and arrays Jan 10, 2025
@OH296 OH296 merged commit 884ac23 into Adeptus-Dominus:release/0.10.0.0 Jan 10, 2025
1 of 2 checks passed
@EttyKitty EttyKitty added the PR: Fix This is a fix for a bug label Jan 11, 2025
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants