From 1de78ee550eb8a4d2d27cf1a110a0a185a1adbd9 Mon Sep 17 00:00:00 2001 From: frutescens Date: Fri, 4 Oct 2024 20:59:35 -0700 Subject: [PATCH] ingrain fixes --- src/data/battler-tags.ts | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts index 087080028c7..e58a0d5f2a1 100644 --- a/src/data/battler-tags.ts +++ b/src/data/battler-tags.ts @@ -964,6 +964,11 @@ export class IngrainTag extends TrappedTag { super(BattlerTagType.INGRAIN, BattlerTagLapseType.TURN_END, 1, Moves.INGRAIN, sourceId); } + override onAdd(pokemon: Pokemon) { + super.onAdd(pokemon); + pokemon.addTag(BattlerTagType.IGNORE_FLYING, undefined, Moves.INGRAIN, this.sourceId); + } + /** * Check if the Ingrain tag can be added to the pokemon * @param pokemon {@linkcode Pokemon} The pokemon to check if the tag can be added to @@ -993,6 +998,11 @@ export class IngrainTag extends TrappedTag { return ret; } + override onRemove(pokemon: Pokemon) { + super.onRemove(pokemon); + pokemon.removeTag(BattlerTagType.IGNORE_FLYING); + } + getTrapMessage(pokemon: Pokemon): string { return i18next.t("battlerTags:ingrainOnTrap", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }); } @@ -2686,16 +2696,10 @@ export class TelekinesisTag extends BattlerTag { pokemon.addTag(BattlerTagType.FLOATING, 3, this.sourceMove); } - override lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean { - return --this.turnCount > 0; - } - override onRemove(pokemon: Pokemon) { pokemon.removeTag(BattlerTagType.TELEKINESIS); pokemon.removeTag(BattlerTagType.FLOATING); } - - } /**