From 93f74cbee3bd87606e75b1ef4e8d640a15244210 Mon Sep 17 00:00:00 2001 From: JSLveil Date: Thu, 5 Sep 2024 22:08:20 -0700 Subject: [PATCH] Update ability.ts --- src/data/ability.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/data/ability.ts b/src/data/ability.ts index 8b7a7772efe..e29c3682c88 100644 --- a/src/data/ability.ts +++ b/src/data/ability.ts @@ -444,7 +444,12 @@ class TypeImmunityAddBattlerTagAbAttr extends TypeImmunityAbAttr { if (ret) { cancelled.value = true; // Suppresses "No Effect" message if (!simulated) { - pokemon.addTag(this.tagType, this.turnCount, undefined, pokemon.id); + if (!pokemon.getTag(this.tagType)) { + pokemon.addTag(this.tagType, this.turnCount, undefined, pokemon.id); + pokemon.scene.queueMessage(i18next.t("abilityTriggers:flashFire", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), typeName: Type[attacker.getMoveType(move)].charAt(0).toUpperCase() + Type[attacker.getMoveType(move)].slice(1).toLowerCase() })); + } else { + pokemon.scene.queueMessage(i18next.t(i18next.t("abilityTriggers:moveImmunity", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }))); + } } }