From 2f31e97fae9807cdf5f859006e96c0f4ce4af201 Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 7 Jun 2024 17:16:58 -0600 Subject: [PATCH] Update damaging traps to affect Ghosts --- src/data/battler-tags.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts index ede8d029327..6555bf9ba7d 100644 --- a/src/data/battler-tags.ts +++ b/src/data/battler-tags.ts @@ -220,7 +220,9 @@ export class TrappedTag extends BattlerTag { onAdd(pokemon: Pokemon): void { super.onAdd(pokemon); - pokemon.scene.queueMessage(this.getTrapMessage(pokemon)); + if (!pokemon.isOfType(Type.GHOST)) { + pokemon.scene.queueMessage(this.getTrapMessage(pokemon)); + } } onRemove(pokemon: Pokemon): void { @@ -864,7 +866,7 @@ export abstract class DamagingTrapTag extends TrappedTag { } canAdd(pokemon: Pokemon): boolean { - return !pokemon.isOfType(Type.GHOST) && !pokemon.findTag(t => t instanceof DamagingTrapTag); + return !pokemon.findTag(t => t instanceof DamagingTrapTag); } lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {