From 42d00e208e3a88de453361fdf5516bb477480a64 Mon Sep 17 00:00:00 2001 From: Frederico Santos Date: Sun, 4 Aug 2024 04:09:06 +0100 Subject: [PATCH] Revert "[Bug] fixed switch out bug when fainted single -> double (#3288)" (#3330) This reverts commit 89d38a3b6bae56d8e4e86a29ddad33908a9b3b56. --- src/phases.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/phases.ts b/src/phases.ts index 14c8e53aa73..7e2d8058aef 100644 --- a/src/phases.ts +++ b/src/phases.ts @@ -4462,10 +4462,9 @@ export class SwitchPhase extends BattlePhase { start() { super.start(); - const availablePartyMembers = this.scene.getParty().filter(p => !p.isFainted()); // Skip modal switch if impossible - if (this.isModal && (!availablePartyMembers.filter(p => !p.isActive(true)).length || (!this.scene.currentBattle.started && availablePartyMembers.length === 1))) { + if (this.isModal && !this.scene.getParty().filter(p => p.isAllowedInBattle() && !p.isActive(true)).length) { return super.end(); } @@ -4475,7 +4474,7 @@ export class SwitchPhase extends BattlePhase { } // Override field index to 0 in case of double battle where 2/3 remaining legal party members fainted at once - const fieldIndex = this.scene.currentBattle.getBattlerCount() === 1 || availablePartyMembers.length > 1 ? this.fieldIndex : 0; + const fieldIndex = this.scene.currentBattle.getBattlerCount() === 1 || this.scene.getParty().filter(p => p.isAllowedInBattle()).length > 1 ? this.fieldIndex : 0; this.scene.ui.setMode(Mode.PARTY, this.isModal ? PartyUiMode.FAINT_SWITCH : PartyUiMode.POST_BATTLE_SWITCH, fieldIndex, (slotIndex: integer, option: PartyOption) => { if (slotIndex >= this.scene.currentBattle.getBattlerCount() && slotIndex < 6) {