From e6e58131c19591e8aecb907a1d1fca1f61e46962 Mon Sep 17 00:00:00 2001 From: NxKarim <43686802+NxKarim@users.noreply.github.com> Date: Mon, 29 Jul 2024 17:27:03 -0600 Subject: [PATCH] [Ability] Fix Shield Dust and Sparkling Aria interaction (#3170) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Shield Dust and Sparkling Aria interaction. Shield Dust prevents a Pokémon's burn being cured by Sparkling Aria if it is the only target of the attack. * Update src/data/move.ts * Fix lint issue --------- Co-authored-by: Tempoanon <163687446+Tempo-anon@users.noreply.github.com> --- src/data/move.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/data/move.ts b/src/data/move.ts index ccdb5e85630..148aa420fbe 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -2156,6 +2156,12 @@ export class HealStatusEffectAttr extends MoveEffectAttr { return false; } + // Special edge case for shield dust blocking Sparkling Aria curing burn + const moveTargets = getMoveTargets(user, move.id); + if (target.hasAbilityWithAttr(IgnoreMoveEffectsAbAttr) && move.id === Moves.SPARKLING_ARIA && moveTargets.targets.length === 1) { + return false; + } + const pokemon = this.selfTarget ? user : target; if (pokemon.status && this.effects.includes(pokemon.status.effect)) { pokemon.scene.queueMessage(getStatusEffectHealText(pokemon.status.effect, getPokemonNameWithAffix(pokemon)));