IAmChrisAMA
/
pokerogue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash when returning shiny

pull/2/head
Flashfyre 2023-07-05 16:13:00 -04:00
parent 4b61e50d72
commit a005c7c850
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/battle-phases.ts
View File

@ -550,11 +550,7 @@ export class SummonPhase extends PartyMemberPokemonPhase {
}); });
} }
queuePostSummon() { onEnd(): void {
this.scene.pushPhase(new PostSummonPhase(this.scene, this.getPokemon().getBattlerIndex()));
}
end() {
const pokemon = this.getPokemon(); const pokemon = this.getPokemon();
if (pokemon.shiny) if (pokemon.shiny)
@ -563,6 +559,14 @@ export class SummonPhase extends PartyMemberPokemonPhase {
pokemon.resetTurnData(); pokemon.resetTurnData();
this.queuePostSummon(); this.queuePostSummon();
}
queuePostSummon(): void {
this.scene.pushPhase(new PostSummonPhase(this.scene, this.getPokemon().getBattlerIndex()));
}
end() {
this.onEnd();
super.end(); super.end();
} }
@ -632,19 +636,19 @@ export class SwitchSummonPhase extends SummonPhase {
this.end(); this.end();
} }
queuePostSummon() { onEnd(): void {
this.scene.unshiftPhase(new PostSummonPhase(this.scene, this.getPokemon().getBattlerIndex())); super.onEnd();
}
end() {
const pokemon = this.getPokemon(); const pokemon = this.getPokemon();
if (this.batonPass && pokemon) if (this.batonPass && pokemon)
pokemon.transferSummon(this.lastPokemon); pokemon.transferSummon(this.lastPokemon);
this.lastPokemon?.resetSummonData(); this.lastPokemon?.resetSummonData();
}
super.end(); queuePostSummon(): void {
this.scene.unshiftPhase(new PostSummonPhase(this.scene, this.getPokemon().getBattlerIndex()));
} }
} }
@ -659,7 +663,12 @@ export class ReturnPhase extends SwitchSummonPhase {
summon(): void { } summon(): void { }
queuePostSummon() { } onEnd(): void {
const pokemon = this.getPokemon();
pokemon.resetTurnData();
pokemon.resetSummonData();
}
} }
export class ToggleDoublePositionPhase extends BattlePhase { export class ToggleDoublePositionPhase extends BattlePhase {