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

Fixed phase order

Browse Source
This commit is contained in:
Frutescens 2024-07-02 21:09:14 -07:00
parent a59865afd5
commit 52478efd96
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/phases.ts
View File

@ -4891,7 +4891,8 @@ export class AttemptCapturePhase extends PokemonPhase {
} }
}, },
onComplete: () => { onComplete: () => {
this.scene.unshiftPhase(new VictoryPhase(this.scene, this.battlerIndex)); this.catch(); this.scene.gameData.setPokemonCaught(pokemon);
this.catch();
} }
}); });
}; };
@ -4958,6 +4959,7 @@ export class AttemptCapturePhase extends PokemonPhase {
this.scene.ui.showText(i18next.t("battle:pokemonCaught", { pokemonName: pokemon.name }), null, () => { this.scene.ui.showText(i18next.t("battle:pokemonCaught", { pokemonName: pokemon.name }), null, () => {
const end = () => { const end = () => {
this.scene.unshiftPhase(new VictoryPhase(this.scene, this.battlerIndex));
this.scene.pokemonInfoContainer.hide(); this.scene.pokemonInfoContainer.hide();
this.removePb(); this.removePb();
this.end(); this.end();
@ -4986,7 +4988,7 @@ export class AttemptCapturePhase extends PokemonPhase {
} }
}); });
}; };
Promise.all([pokemon.hideInfo(), this.scene.gameData.setPokemonCaught(pokemon)]).then(() => { Promise.all([pokemon.hideInfo()]).then(() => {
if (this.scene.getParty().length === 6) { if (this.scene.getParty().length === 6) {
const promptRelease = () => { const promptRelease = () => {
this.scene.ui.showText(i18next.t("battle:partyFull", { pokemonName: pokemon.name }), null, () => { this.scene.ui.showText(i18next.t("battle:partyFull", { pokemonName: pokemon.name }), null, () => {