Switch unsuppressable to unswappable

This commit is contained in:
Dean 2025-03-21 14:15:34 -07:00
parent 4149d3600a
commit 5c473d28f9

View File

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