diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index f163755eb53..f98b8f2c008 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -4537,7 +4537,7 @@ export class PokemonTurnData { public flinched: boolean = false; public acted: boolean = false; public hitCount: number = 0; - public hitsLeft: number = 0; + public hitsLeft: number = -1; public damageDealt: number = 0; public currDamageDealt: number = 0; public damageTaken: number = 0; diff --git a/src/phases/move-effect-phase.ts b/src/phases/move-effect-phase.ts index 9b22c520e19..e0ab8bb3ee6 100644 --- a/src/phases/move-effect-phase.ts +++ b/src/phases/move-effect-phase.ts @@ -69,7 +69,7 @@ export class MoveEffectPhase extends PokemonPhase { * resolve the move's total hit count. This block combines the * effects of the move itself, Parental Bond, and Multi-Lens to do so. */ - if (user.turnData.hitsLeft === undefined) { + if (user.turnData.hitsLeft === -1) { const hitCount = new Utils.IntegerHolder(1); // Assume single target for multi hit applyMoveAttrs(MultiHitAttr, user, this.getTarget() ?? null, move, hitCount); diff --git a/src/phases/move-phase.ts b/src/phases/move-phase.ts index a2573abf3a1..a2a72061053 100644 --- a/src/phases/move-phase.ts +++ b/src/phases/move-phase.ts @@ -83,11 +83,11 @@ export class MovePhase extends BattlePhase { this.pokemon.turnData.hitCount = 0; } - /** - * Check move to see if arena.ignoreAbilities should be true. - */ + // Check move to see if arena.ignoreAbilities should be true. if (!this.followUp) { - this.scene.arena.ignoreAbilities = this.move.getMove().checkFlag(MoveFlags.IGNORE_ABILITIES, this.pokemon, null); + if (this.move.getMove().checkFlag(MoveFlags.IGNORE_ABILITIES, this.pokemon, null)) { + this.scene.arena.setIgnoreAbilities(); + } } this.resolveRedirectTarget();