From 93c3422f91a4f6f9ec83188dce326b3da2289ff0 Mon Sep 17 00:00:00 2001 From: Bertie690 Date: Tue, 5 Aug 2025 20:56:13 -0400 Subject: [PATCH] Fixed syntax errors --- src/data/moves/move.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/data/moves/move.ts b/src/data/moves/move.ts index 1a9d479f63f..3a5b7f080a2 100644 --- a/src/data/moves/move.ts +++ b/src/data/moves/move.ts @@ -5711,7 +5711,10 @@ export class YawnAttr extends AddBattlerTagAttr { return false; } - + // TODO: This displays a message for the cause and another "but it failed" message, + // but fixing it would require a rework of the move failure system + return target.canSetStatus(StatusEffect.SLEEP, false, false, user) + } } } @@ -8008,7 +8011,7 @@ export class AfterYouAttr extends MoveEffectAttr { globalScene.phaseManager.queueMessage(i18next.t("moveTriggers:afterYou", { targetName: getPokemonNameWithAffix(target) })); // Will find next acting phase of the targeted pokémon, delete it and queue it right after us. - const targetNextPhase = globalScene.phaseManager.findPhase(phase => phase.pokemon === target); + const targetNextPhase = globalScene.phaseManager.findPhase((phase): phase is MovePhase => phase.is("MovePhase") && phase.pokemon === target); if (targetNextPhase && globalScene.phaseManager.tryRemovePhase((phase: MovePhase) => phase.pokemon === target)) { globalScene.phaseManager.prependToPhase(targetNextPhase, "MovePhase"); } @@ -8036,7 +8039,7 @@ export class ForceLastAttr extends MoveEffectAttr { globalScene.phaseManager.queueMessage(i18next.t("moveTriggers:forceLast", { targetPokemonName: getPokemonNameWithAffix(target) })); // TODO: Refactor this to be more readable and less janky - const targetMovePhase = globalScene.phaseManager.findPhase((phase) => phase.pokemon === target); + const targetMovePhase = globalScene.phaseManager.findPhase((phase): phase is MovePhase => phase.is("MovePhase") && phase.pokemon === target); if (targetMovePhase && !targetMovePhase.isForcedLast() && globalScene.phaseManager.tryRemovePhase((phase: MovePhase) => phase.pokemon === target)) { // Finding the phase to insert the move in front of - // Either the end of the turn or in front of another, slower move which has also been forced last