Merge 3583174ac9
into 44c0d29c1d
commit
a309009eeb
|
@ -3012,19 +3012,23 @@ export class PostTurnStatusEffectPhase extends PokemonPhase {
|
|||
if (!cancelled.value) {
|
||||
this.scene.queueMessage(getPokemonMessage(pokemon, getStatusEffectActivationText(pokemon.status.effect)));
|
||||
let damage: integer = 0;
|
||||
let statusDamage: boolean = false;
|
||||
switch (pokemon.status.effect) {
|
||||
case StatusEffect.POISON:
|
||||
damage = Math.max(pokemon.getMaxHp() >> 3, 1);
|
||||
statusDamage = true;
|
||||
break;
|
||||
case StatusEffect.TOXIC:
|
||||
damage = Math.max(Math.floor((pokemon.getMaxHp() / 16) * pokemon.status.turnCount), 1);
|
||||
statusDamage = true;
|
||||
break;
|
||||
case StatusEffect.BURN:
|
||||
damage = Math.max(pokemon.getMaxHp() >> 4, 1);
|
||||
statusDamage = true;
|
||||
break;
|
||||
}
|
||||
if (damage) {
|
||||
this.scene.damageNumberHandler.add(this.getPokemon(), pokemon.damage(damage));
|
||||
this.scene.damageNumberHandler.add(this.getPokemon(), pokemon.damage(damage, false, statusDamage));
|
||||
pokemon.updateInfo();
|
||||
}
|
||||
new CommonBattleAnim(CommonAnim.POISON + (pokemon.status.effect - 1), pokemon).play(this.scene, () => this.end());
|
||||
|
|
Loading…
Reference in New Issue