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: whelp better give it a go ruins shit (just go with it) #408

Merged
merged 1 commit into from
Jan 10, 2025

Conversation

OH296
Copy link
Collaborator

@OH296 OH296 commented Jan 10, 2025

Description of changes

Reasons for changes

Related links

How have you tested your changes?

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

Summary by Sourcery

Bug Fixes:

  • Fix a softlock caused by surprise attacks in ancient ruins.

Copy link
Contributor

sourcery-ai bot commented Jan 10, 2025

Reviewer's Guide by Sourcery

This PR fixes a bug where the game crashes after a surprise attack in the ancient ruins. The fix involves activating and deactivating specific game objects to ensure the game state is correctly managed before and after the battle. Also, the battle roster function now uses the correct location and planet information from the obj_ground_mission object, preventing potential issues with incorrect battle setups.

File-Level Changes

Change Details Files
Corrected battle setup to use the location and planet information from the obj_ground_mission object.
  • Changed the scr_battle_roster function call to use obj_ground_mission.loc and _planet as arguments.
  • Updated the obj_ncombat object's battle_object and battle_loc properties to use the correct values from obj_ground_mission.
scripts/scr_ancient_ruins/scr_ancient_ruins.gml
Improved game object activation and deactivation to prevent crashes after surprise attacks.
  • Added activation for obj_star_select and obj_ground_mission objects before the battle.
  • Added deactivation of several objects, including obj_popup, obj_star_select, obj_ground_mission, and obj_ncombat, after the battle to clean up the game state and prevent potential crashes.
scripts/scr_ancient_ruins/scr_ancient_ruins.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: Fix This is a fix for a bug label 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:

  • Please use a meaningful PR title that describes what you're fixing. For example: 'fix(ruins): Handle object lifecycle in surprise attacks'
  • The description section is empty. Please explain what bug this fixes, how to reproduce it, and how you've verified the fix works.
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 a7ead39 into Adeptus-Dominus:release/0.10.0.0 Jan 10, 2025
3 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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant