From 462eb6da7465854c66b8ca7ec1db8ac0f0f8237f Mon Sep 17 00:00:00 2001 From: schmidtc1 <62030095+schmidtc1@users.noreply.github.com> Date: Sun, 29 Dec 2024 10:56:34 -0500 Subject: [PATCH] Update src/data/move.ts Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com> --- src/data/move.ts | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/data/move.ts b/src/data/move.ts index b9edf9d0454..a7026499226 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -8193,10 +8193,16 @@ export function getMoveTargets(user: Pokemon, move: Moves, replaceTarget?: MoveT const variableTarget = new Utils.NumberHolder(0); user.getOpponents().forEach(p => applyMoveAttrs(VariableTargetAttr, user, p, allMoves[move], variableTarget)); - const moveTarget = allMoves[move].hasAttr(VariableTargetAttr) ? variableTarget.value : - replaceTarget !== undefined ? replaceTarget : - move ? allMoves[move].moveTarget : - move === undefined ? MoveTarget.NEAR_ENEMY : []; + let moveTarget: MoveTarget | undefined; + if (allMoves[move].hasAttr(VariableTargetAttr)) { + moveTarget = variableTarget.value; + } else if (replaceTarget !== undefined) { + moveTarget = replaceTarget; + } else if (move) { + moveTarget = allMoves[move].moveTarget; + } else if (move === undefined) { + moveTarget = MoveTarget.NEAR_ENEMY; + } const opponents = user.getOpponents(); let set: Pokemon[] = [];