From 9305b4a3ec9fc10931a2a60d645ae7ba3a86596c Mon Sep 17 00:00:00 2001 From: muscode Date: Sat, 2 Nov 2024 09:28:31 -0600 Subject: [PATCH] simplify multi hit check Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com> --- src/data/ability.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/ability.ts b/src/data/ability.ts index 006e2faa01e..734912fafcb 100644 --- a/src/data/ability.ts +++ b/src/data/ability.ts @@ -5042,7 +5042,7 @@ export class PostDamageForceSwitchAbAttr extends PostDamageAbAttr { return false; } const multiHitModifier = source.getHeldItems().find(m => m instanceof PokemonMultiHitModifier); - if (allMoves[enemyLastMoveUsed.move].hasAttr(MultiHitAttr) || multiHitModifier || source.hasAbilityWithAttr(AddSecondStrikeAbAttr)) { + if (source.turnData.hitCount > 1) { damage = pokemon.turnData.damageTaken; } }