From 4038b9d6293f0d9305b54e520f18d1723ad5a2da Mon Sep 17 00:00:00 2001 From: Tiduzz Date: Tue, 7 May 2024 14:37:05 -0300 Subject: [PATCH] Fixes sturdy to stop popping up even if not used --- src/data/ability.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/data/ability.ts b/src/data/ability.ts index 07aecbdcc91..7449f7f4cde 100644 --- a/src/data/ability.ts +++ b/src/data/ability.ts @@ -249,10 +249,11 @@ export class PreDefendFormChangeAbAttr extends PreDefendAbAttr { } export class PreDefendFullHpEndureAbAttr extends PreDefendAbAttr { applyPreDefend(pokemon: Pokemon, passive: boolean, attacker: Pokemon, move: PokemonMove, cancelled: Utils.BooleanHolder, args: any[]): boolean { - if (pokemon.getMaxHp() <= 1 && (pokemon.getHpRatio() < 1 || (args[0] as Utils.NumberHolder).value < pokemon.hp)) - return false; - - return pokemon.addTag(BattlerTagType.STURDY, 1); + if (pokemon.hp === pokemon.getMaxHp() && (args[0] as Utils.NumberHolder).value >= pokemon.hp){ //Checks if pokemon hp is full and if the damage is higher or equal to defender hp + return pokemon.addTag(BattlerTagType.STURDY, 1); //activates sturdy + } else { + return + } } }