ShuriZma
/
pokerogue
mirror of https://github.com/pagefaultgames/pokerogue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Move] fix for sparkly swirl apply check (#1059) 

fix for sparkly swirl apply check

Update move.ts

Co-authored-by: Temps Ray <temps.ray@gmail.com>
This commit is contained in:
Charlie Giang 2024-06-09 15:08:33 -05:00 committed by GitHub
parent aba9310ddf
commit c746d0723f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/data/move.ts Executable file → Normal file
View File

@ -1251,11 +1251,18 @@ export class PartyStatusCureAttr extends MoveEffectAttr {
this.abilityCondition = abilityCondition; this.abilityCondition = abilityCondition;
} }
//The same as MoveEffectAttr.canApply, except it doesn't check for the target's HP.
canApply(user: Pokemon, target: Pokemon, move: Move, args: any[]) {
const isTargetValid =
(this.selfTarget && user.hp && !user.getTag(BattlerTagType.FRENZY)) ||
(!this.selfTarget && (!target.getTag(BattlerTagType.PROTECTED) || move.hasFlag(MoveFlags.IGNORE_PROTECT)));
return !!isTargetValid;
}
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
if (!super.apply(user, target, move, args)) { if (!this.canApply(user, target, move, args)) {
return false; return false;
} }
this.addPartyCurePhase(user); this.addPartyCurePhase(user);
} }