From 851bb7e544edb572a690b2e0643376fb9232b6fd Mon Sep 17 00:00:00 2001 From: Wlowscha <54003515+Wlowscha@users.noreply.github.com> Date: Fri, 27 Dec 2024 11:37:13 +0100 Subject: [PATCH] Added condition to require that mon is on field in order to apply ability, accounting for exceptions --- src/field/pokemon.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index fcfc2ff7536..0e1d98e40d8 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -1479,7 +1479,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { return false; } } - return (this.hp > 0 || ability.isBypassFaint) && !ability.conditions.find(condition => !condition(this)); + return (((this.isOnField() || ability.isBypassOnField) && this.hp > 0) || ability.isBypassFaint) && !ability.conditions.find(condition => !condition(this)); } /**