mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-27 10:42:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
TaylorLeLievre 2024-08-25 12:22:19 -04:00
parent 00ba2eebc8
commit a4bff58a99
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/phases/return-phase.ts
View File

@ -1,4 +1,5 @@
import BattleScene from "#app/battle-scene"; import BattleScene from "#app/battle-scene";
import { applyPreSwitchOutAbAttrs, PreSwitchOutAbAttr } from "#app/data/ability.js";
import { SpeciesFormChangeActiveTrigger } from "#app/data/pokemon-forms"; import { SpeciesFormChangeActiveTrigger } from "#app/data/pokemon-forms";
import { SwitchSummonPhase } from "./switch-summon-phase"; import { SwitchSummonPhase } from "./switch-summon-phase";
@ -8,6 +9,8 @@ export class ReturnPhase extends SwitchSummonPhase {
} }
switchAndSummon(): void { switchAndSummon(): void {
this.lastPokemon = this.getPokemon();
applyPreSwitchOutAbAttrs(PreSwitchOutAbAttr, this.lastPokemon);
this.end(); this.end();
} }

2
src/phases/switch-summon-phase.ts
View File

@ -18,7 +18,7 @@ export class SwitchSummonPhase extends SummonPhase {
private doReturn: boolean; private doReturn: boolean;
private batonPass: boolean; private batonPass: boolean;
private lastPokemon: Pokemon; protected lastPokemon: Pokemon;
/** /**
* Constructor for creating a new SwitchSummonPhase * Constructor for creating a new SwitchSummonPhase