-
-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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
[Bug] Prevent battle skip with Wimp Out #4931
Conversation
Couldn't you use |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems fine to me, a simple fix. We still need a test added though.
Co-authored-by: NightKev <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just a couple test nits.
Co-authored-by: NightKev <[email protected]>
Co-authored-by: NightKev <[email protected]>
Co-authored-by: NightKev <[email protected]>
@DayKev Added some more checks to |
Co-authored-by: PigeonBar <[email protected]>
Based on a quick search for other places where
Flame Burst splash damage: Line 1850 in de0d977
Grass + Fire Pledge arena effect: pokerogue/src/data/arena-tag.ts Line 1152 in de0d977
Bad Dreams ability: Line 3734 in de0d977
(There may be a cleaner approach than having to place |
Added checks in the mentioned places. |
ugh, I managed to trigger a battle skip when testing, but i wasn't recording so i don't remember exactly how 😭 edit: Good news, I have it on tape. Bad news, the first time I did it it was a double battle, and the second time was a single battle... |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
pretty sure my issues when testing were related to multi hit moves as I couldn't reproduce them without. lgtm
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Time to find out what this green button does
For a moment I thought you were talking about the merge button :D |
What are the changes the user will see?
Wimp Out triggering in a double battle shouldn't skip battles
Why am I making these changes?
Bug: https://discord.com/channels/1125469663833370665/1290778513363959941
What are the changes from a developer perspective?
Pokémon are prevented from taking damage if they're switching out or fleeing, via checks of
Pokemon.switchOutStatus
.Checks also added to
turn-end-phase.ts
andweather-effect-phase.ts
to prevent messages showing up for fled pokemonScreenshots/Videos
Wimpod
https://github.com/user-attachments/assets/650fa836-bf52-4874-9369-ca8cc2f669af
Thundercage (Posturn effect)
thundercage.mp4
Toxic
toxic.mp4
Weather
weather.mp4
How to test the changes?
Double battle with Wimpods, target Right Wimpod with a priority move to make it flee, target both with a spread move. It shouldn't skip battles.
Checklist
beta
as my base branchnpm run test
)npm run create-test
) or updated existing tests related to the PR's changes?Are there any localization additions or changes? If so: