Fixes toxic spikes poison damage turn 0
parent
7e0e4ecd6d
commit
b796a4ee97
|
@ -2043,7 +2043,6 @@ 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));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -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;
|
||||||
|
|
Loading…
Reference in New Issue