Prevent sameMoveTurns from incrementing when unable to use move #6167
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Bassoonian
added
category: battle-mechanic
Bassoonian
approved these changes
Feb 2, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The MOVEEND_SAME_MOVE_TURNS case did not take into account Pokemon being unable to use their move (sleep, flinch, etc.) when checking to increment the
sameMoveTurnscounter. This resulted in a disparity in damage when, e.g., an Amaura was flinched when selecting Echoed Voice. Selecting it again next turn would have the counter be higher than it should be. This is unintended behavior and as such, a bug; confirmed by testing it against Smogon's engine.Description
Adds a hitmarker check for
HITMARKER_UNABLE_TO_USE_MOVEin theMOVEEND_SAME_MOVE_TURNScase inCmd_moveend.Issue(s) that this PR fixes
#6165
Discord contact info
viridian.