From 33f6214dc71e3f102a0540f14f74ef2ffff8272c Mon Sep 17 00:00:00 2001 From: EmoUsedHM01 <131687820+EmoUsedHM01@users.noreply.github.com> Date: Sun, 14 Apr 2024 11:04:49 +0100 Subject: [PATCH] Added pokemon.getPassive check to support new passives --- src/phases.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/phases.ts b/src/phases.ts index b4b154bfe37..ecc0fd17352 100644 --- a/src/phases.ts +++ b/src/phases.ts @@ -2761,7 +2761,7 @@ export class PostTurnStatusEffectPhase extends PokemonPhase { this.scene.queueMessage(getPokemonMessage(pokemon, getStatusEffectActivationText(pokemon.status.effect))); let netEffect = 0; // This variable now handles both healing and damage - const isHealing = pokemon.getAbility().id === Abilities.POISON_HEAL; + const isHealing = pokemon.getAbility().id === Abilities.POISON_HEAL || pokemon.getPassive().id === Abilities.POISON_HEAL; // Added check for both Ability and the new Passives switch (pokemon.status.effect) { case StatusEffect.POISON: @@ -2772,7 +2772,7 @@ export class PostTurnStatusEffectPhase extends PokemonPhase { // Toxic damage increases over time, Poison does not netEffect = (pokemon.status.effect === StatusEffect.TOXIC) ? Math.max(Math.floor((pokemon.getMaxHp() / 16) * pokemon.status.turnCount), 1) : // Applies if Toxic - Math.max(pokemon.getMaxHp() >> 3, 1); // Damage logic for Poison otherwise + Math.max(pokemon.getMaxHp() >> 3, 1); // Damage logic for Poison otherwise } break; case StatusEffect.BURN: