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.

Sign up for GitHub

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

Jump to bottom

[Hotfix] Fix status damage triggering before berry usage #4732

Merged
merged 4 commits into from
Oct 27, 2024
Merged

[Hotfix] Fix status damage triggering before berry usage #4732

merged 4 commits into from
Oct 27, 2024

Conversation

innerthunder
Copy link
Collaborator

What are the changes the user will see?

Lum Berry should now proc before status damage is taken into account.

Why am I making these changes?

Reported in the Discord

What are the changes from a developer perspective?

turn-start-phase: Swapped the push-order of BerryPhase and CheckStatusEffectPhase

Screenshots/Videos

How to test the changes?

  • In overrides, give your Pokemon Poison and a Lum Berry
  • At the end of the first turn, the Lum Berry should be consumed before Poison damage has a chance to trigger.

Checklist

  • [n/a] I'm using beta as my base branch
  • There is no overlap with another PR?
  • The PR is self-contained and cannot be split into smaller PRs?
  • Have I provided a clear explanation of the changes?
  • Have I considered writing automated tests for the issue?
  • If I have text, did I make it translatable and add a key in the English locale file(s)?
  • Have I tested the changes (manually)?
    • Are all unit tests still passing? (npm run test)
  • Are the changes visual?
    • Have I provided screenshots/videos of the changes?

@innerthunder innerthunder requested a review from a team as a code owner October 26, 2024 23:01
@innerthunder innerthunder changed the title Fix status damage triggering before berry usage [Hotfix] Fix status damage triggering before berry usage Oct 26, 2024
@innerthunder innerthunder added P2 Bug Minor. Non crashing Incorrect move/ability/interaction Miscellaneous Changes that don't fit under any other label labels Oct 26, 2024
@Snailman11
Copy link
Collaborator

Just a link to the post in #bug-reports

https://discord.com/channels/1125469663833370665/1299860595226443786

@f-fsantos f-fsantos merged commit 9a56f08 into pagefaultgames:main Oct 27, 2024
14 checks passed
MokaStitcher added a commit that referenced this pull request Oct 28, 2024
@MokaStitcher @f-fsantos
@innerthunder @PigeonBar @chaosgrimmon @pom-eranian
Main -> Beta (1.1.6) (#4751)
cab74f7 
* Comment out startGame call on manifest fetch failure

* [Hotfix] Fix status damage triggering before berry usage (#4732)

* [Hotfix] Fix Eternatus egg tier (#4734)

* [Hotfix] Fix manifest getting loaded before the game is initialized (#4739)

* fix locales path for offline builds (#4739)

* [Sprite] Hotfix cut off Binacle sprite (#4741)

* [Sprite][hotfix] Fixed cropping on 658 static greninja and ash greninja (#4743)

* [Sprite][hotfix] Fixed cropping on static greninja and ash greninja

* [Hotfix] Fix crash when Mist would block a stat drop (#4746)

---------

Co-authored-by: Frederico Santos <[email protected]>
Co-authored-by: innerthunder <[email protected]>
Co-authored-by: PigeonBar <[email protected]>
Co-authored-by: chaosgrimmon <[email protected]>
Co-authored-by: pom-eranian <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@frutescens frutescens frutescens approved these changes

@flx-sta flx-sta Awaiting requested review from flx-sta flx-sta is a code owner automatically assigned from pagefaultgames/junior-dev-team

@MokaStitcher MokaStitcher Awaiting requested review from MokaStitcher MokaStitcher is a code owner automatically assigned from pagefaultgames/junior-dev-team

@Tempo-anon Tempo-anon Awaiting requested review from Tempo-anon Tempo-anon is a code owner automatically assigned from pagefaultgames/junior-dev-team

Assignees
No one assigned
Labels
Miscellaneous Changes that don't fit under any other label P2 Bug Minor. Non crashing Incorrect move/ability/interaction
Projects
PokéRogue Bug Management
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@innerthunder @Snailman11 @frutescens @f-fsantos