From def36e32d1b95dad58e333f7538cdd35c5b37618 Mon Sep 17 00:00:00 2001 From: shayebeadlingkl Date: Fri, 26 Apr 2024 12:16:56 -0400 Subject: [PATCH 1/2] adds missing brackets to psycho shift attribute to fix unreachable condition --- src/data/move.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/data/move.ts b/src/data/move.ts index c963b951c..f56bd7fcb 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -1020,7 +1020,7 @@ export class PsychoShiftEffectAttr extends MoveEffectAttr { if (target.status) { return false; } - if (!target.status || (target.status.effect === statusToApply && move.chance < 0)) + if (!target.status || (target.status.effect === statusToApply && move.chance < 0)){ var statusAfflictResult = target.trySetStatus(statusToApply, true); if (statusAfflictResult) { user.scene.queueMessage(getPokemonMessage(user, getStatusEffectHealText(user.status.effect))); @@ -1028,6 +1028,7 @@ export class PsychoShiftEffectAttr extends MoveEffectAttr { user.updateInfo(); } return statusAfflictResult; + } return false; } From f9b999b744da1619f896b016078460958856b0ac Mon Sep 17 00:00:00 2001 From: shayebeadlingkl Date: Fri, 26 Apr 2024 12:18:01 -0400 Subject: [PATCH 2/2] spacing --- src/data/move.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/move.ts b/src/data/move.ts index f56bd7fcb..c9be9f9bd 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -1020,7 +1020,7 @@ export class PsychoShiftEffectAttr extends MoveEffectAttr { if (target.status) { return false; } - if (!target.status || (target.status.effect === statusToApply && move.chance < 0)){ + if (!target.status || (target.status.effect === statusToApply && move.chance < 0)) { var statusAfflictResult = target.trySetStatus(statusToApply, true); if (statusAfflictResult) { user.scene.queueMessage(getPokemonMessage(user, getStatusEffectHealText(user.status.effect)));