From 89b5893f82dfa97ef061e21fed46b8d40a700eb5 Mon Sep 17 00:00:00 2001 From: NightKev <34855794+DayKev@users.noreply.github.com> Date: Wed, 4 Sep 2024 19:46:34 -0700 Subject: [PATCH] Remove partial Magic Bounce implementation --- src/phases/move-effect-phase.ts | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/phases/move-effect-phase.ts b/src/phases/move-effect-phase.ts index 51068fa39d5..1670e1e192c 100644 --- a/src/phases/move-effect-phase.ts +++ b/src/phases/move-effect-phase.ts @@ -14,7 +14,6 @@ import { PokemonMultiHitModifier, FlinchChanceModifier, EnemyAttackStatusEffectC import i18next from "i18next"; import * as Utils from "#app/utils.js"; import { PokemonPhase } from "./pokemon-phase"; -import { Abilities } from "#enums/abilities"; export class MoveEffectPhase extends PokemonPhase { public move: PokemonMove; @@ -125,10 +124,6 @@ export class MoveEffectPhase extends PokemonPhase { /** Has the move successfully hit a target (for damage) yet? */ let hasHit: boolean = false; - /** Hazards bounce if any opposing Pokémon has the ability **/ - /** TODO: Update to support future Magic Coat / Magic Bounce implementation **/ - let hazardBounce: boolean = false; - for (const target of targets) { /** * If the move missed a target, stop all future hits against that target @@ -163,17 +158,6 @@ export class MoveEffectPhase extends PokemonPhase { /** Does this phase represent the invoked move's first strike? */ const firstHit = (user.turnData.hitsLeft === user.turnData.hitCount); - /** Check if current target is affected by Magic Bounce or used Magic Coat - * If they did, then field hazards should be bounced back in their entirety - */ - const bounceStatus = target.hasAbility(Abilities.MAGIC_BOUNCE) || (this.scene.currentBattle.turnCommands[target.getBattlerIndex()]?.move?.move === Moves.MAGIC_COAT); - hazardBounce = hazardBounce && bounceStatus; - - // Prevent ENEMY_SIDE targeted moves from occurring twice in double battles - if (move.moveTarget === MoveTarget.ENEMY_SIDE && target !== targets[targets.length-1]) { - continue; - } - // Only log the move's result on the first strike if (firstHit) { user.pushMoveHistory(moveHistoryEntry);