mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-05 07:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Adjusts conditional for userSleptOrComatoseCondition, removes getCondition, fixes failing test

Browse Source
This commit is contained in:
Christopher Schmidt 2025-05-18 10:46:26 -04:00
parent 573c6c668c
commit c1a7862c29
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/data/moves/move.ts
View File

@ -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);