fix: skip 2nd Pokemon action on forfeit confirmation in doubles#144
Merged
Conversation
When forfeiting in a double battle (Frontier/Trainer Hill), the battle now ends immediately after confirmation instead of asking for the 2nd Pokemon's action. Sets partner's action to RUN and marks confirmed.
Contributor
Author
|
Resolves #143 |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Description:
Fixes an issue where confirming a forfeit in double battle formats (Frontier/Trainer Hill) would still prompt for the 2nd Pokemon's action instead of ending the battle immediately.
Changes:
BattleScript_AskIfWantsToForfeitMatch, the partner battler's action is set to RUN and the battle jumps directly toHandleEndTurn_RanFromBattleBATTLE_TYPE_FRONTIERandBATTLE_TYPE_TRAINER_HILLdouble battles (the only formats where the forfeit prompt exists)Does not affect:
HandleEndTurn_FinishBattlewhich still runs normally)