mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-21 15:52:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix user ally using move when revived

Browse Source
This commit is contained in:
Dean 2025-01-17 17:52:22 -08:00
parent 1567ae9fed
commit a5c9b29495
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/field/pokemon.ts
View File

@ -83,6 +83,7 @@ import { BASE_HIDDEN_ABILITY_CHANCE, BASE_SHINY_CHANCE, SHINY_EPIC_CHANCE, SHINY
import { Nature } from "#enums/nature";
import { StatusEffect } from "#enums/status-effect";
import { doShinySparkleAnim } from "#app/field/anims";
import type { MovePhase } from "#app/phases/move-phase";
export enum LearnMoveSituation {
MISC,
@ -4366,12 +4367,8 @@ export class PlayerPokemon extends Pokemon {
if (globalScene.currentBattle.double && globalScene.getPlayerParty().length > 1) {
const allyPokemon = this.getAlly();
if (slotIndex <= 1) {
// Revived ally pokemon
globalScene.unshiftPhase(new SwitchSummonPhase(SwitchType.SWITCH, pokemon.getFieldIndex(), slotIndex, false, true));
globalScene.unshiftPhase(new ToggleDoublePositionPhase(true));
} else if (allyPokemon.isFainted()) {
// Revived party pokemon, and ally pokemon is fainted
if (allyPokemon.isFainted() || allyPokemon === pokemon) {
globalScene.findPhase((phase: MovePhase) => phase.pokemon === pokemon)?.cancel();
globalScene.unshiftPhase(new SwitchSummonPhase(SwitchType.SWITCH, allyPokemon.getFieldIndex(), slotIndex, false, true));
globalScene.unshiftPhase(new ToggleDoublePositionPhase(true));
}