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

Fixes toxic spikes poison damage turn 0

pull/895/head
Jesse Lerner 2024-05-15 01:36:21 -04:00
parent 7e0e4ecd6d
commit b796a4ee97
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/phases.ts
View File

@ -2043,8 +2043,7 @@ export class TurnStartPhase extends FieldPhase {
this.scene.pushPhase(new WeatherEffectPhase(this.scene, this.scene.arena.weather)); this.scene.pushPhase(new WeatherEffectPhase(this.scene, this.scene.arena.weather));
for (let o of order) { for (let o of order) {
if (field[o].status && field[o].status.isPostTurn()) this.scene.pushPhase(new PostTurnStatusEffectPhase(this.scene, o));
this.scene.pushPhase(new PostTurnStatusEffectPhase(this.scene, o));
} }
this.scene.pushPhase(new TurnEndPhase(this.scene)); this.scene.pushPhase(new TurnEndPhase(this.scene));
@ -2968,8 +2967,6 @@ export class ObtainStatusEffectPhase extends PokemonPhase {
pokemon.updateInfo(true); pokemon.updateInfo(true);
new CommonBattleAnim(CommonAnim.POISON + (this.statusEffect - 1), pokemon).play(this.scene, () => { new CommonBattleAnim(CommonAnim.POISON + (this.statusEffect - 1), pokemon).play(this.scene, () => {
this.scene.queueMessage(getPokemonMessage(pokemon, getStatusEffectObtainText(this.statusEffect, this.sourceText))); this.scene.queueMessage(getPokemonMessage(pokemon, getStatusEffectObtainText(this.statusEffect, this.sourceText)));
if (pokemon.status.isPostTurn())
this.scene.pushPhase(new PostTurnStatusEffectPhase(this.scene, this.battlerIndex));
this.end(); this.end();
}); });
return; return;