From c1a7862c29e58b2421498dc32009250242cb34c9 Mon Sep 17 00:00:00 2001 From: Christopher Schmidt Date: Sun, 18 May 2025 10:46:26 -0400 Subject: [PATCH] Adjusts conditional for userSleptOrComatoseCondition, removes getCondition, fixes failing test --- src/data/moves/move.ts | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/data/moves/move.ts b/src/data/moves/move.ts index 98a53b98898..8c6c28ffd43 100644 --- a/src/data/moves/move.ts +++ b/src/data/moves/move.ts @@ -2847,10 +2847,6 @@ export class BypassSleepAttr extends MoveAttr { return true; } - getCondition(): MoveConditionFunc { - return (user, target, move) => user.status?.effect === StatusEffect.SLEEP && user.status.sleepTurnsRemaining != undefined && user.status.sleepTurnsRemaining > 0; - } - /** * Returns arbitrarily high score when Pokemon is asleep, otherwise shouldn't be used * @param user @@ -7923,7 +7919,7 @@ const failIfDampCondition: MoveConditionFunc = (user, target, move) => { return !cancelled.value; }; -const userSleptOrComatoseCondition: MoveConditionFunc = (user: Pokemon, target: Pokemon, move: Move) => user.status?.effect === StatusEffect.SLEEP || user.hasAbility(Abilities.COMATOSE); +const userSleptOrComatoseCondition: MoveConditionFunc = (user: Pokemon, target: Pokemon, move: Move) => (user.status?.effect === StatusEffect.SLEEP && (user.status.sleepTurnsRemaining ?? 0) > 0) || user.hasAbility(Abilities.COMATOSE); const targetSleptOrComatoseCondition: MoveConditionFunc = (user: Pokemon, target: Pokemon, move: Move) => target.status?.effect === StatusEffect.SLEEP || target.hasAbility(Abilities.COMATOSE);