From 91c083cec82a35aefc7b700968b236709266ad95 Mon Sep 17 00:00:00 2001 From: Dean Date: Fri, 21 Mar 2025 14:15:34 -0700 Subject: [PATCH] Switch unsuppressable to unswappable --- src/data/moves/move.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/data/moves/move.ts b/src/data/moves/move.ts index c85ec7db295..2fe02dbf587 100644 --- a/src/data/moves/move.ts +++ b/src/data/moves/move.ts @@ -7383,7 +7383,7 @@ export class AbilityChangeAttr extends MoveEffectAttr { } getCondition(): MoveConditionFunc { - return (user, target, move) => !(this.selfTarget ? user : target).getAbility().hasAttr(UnsuppressableAbilityAbAttr) && (this.selfTarget ? user : target).getAbility().id !== this.ability; + return (user, target, move) => !(this.selfTarget ? user : target).getAbility().hasAttr(UnswappableAbilityAbAttr) && (this.selfTarget ? user : target).getAbility().id !== this.ability; } } @@ -7415,9 +7415,9 @@ export class AbilityCopyAttr extends MoveEffectAttr { getCondition(): MoveConditionFunc { return (user, target, move) => { - let ret = !target.getAbility().hasAttr(UncopiableAbilityAbAttr) && !user.getAbility().hasAttr(UnsuppressableAbilityAbAttr); + let ret = !target.getAbility().hasAttr(UncopiableAbilityAbAttr) && !user.getAbility().hasAttr(UnswappableAbilityAbAttr); if (this.copyToPartner && globalScene.currentBattle?.double) { - ret = ret && (!user.getAlly().hp || !user.getAlly().getAbility().hasAttr(UnsuppressableAbilityAbAttr)); + ret = ret && (!user.getAlly().hp || !user.getAlly().getAbility().hasAttr(UnswappableAbilityAbAttr)); } else { ret = ret && user.getAbility().id !== target.getAbility().id; } @@ -7446,7 +7446,7 @@ export class AbilityGiveAttr extends MoveEffectAttr { } getCondition(): MoveConditionFunc { - return (user, target, move) => !user.getAbility().hasAttr(UncopiableAbilityAbAttr) && !target.getAbility().hasAttr(UnsuppressableAbilityAbAttr) && user.getAbility().id !== target.getAbility().id; + return (user, target, move) => !user.getAbility().hasAttr(UncopiableAbilityAbAttr) && !target.getAbility().hasAttr(UnswappableAbilityAbAttr) && user.getAbility().id !== target.getAbility().id; } }