From 07eb03f9815f261c1398ca12b8f6f827011ddb20 Mon Sep 17 00:00:00 2001 From: Bertie690 Date: Sat, 14 Jun 2025 15:06:17 -0400 Subject: [PATCH] hhhh --- src/data/moves/move.ts | 16 +++++++++------- test/moves/recovery-moves.test.ts | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/data/moves/move.ts b/src/data/moves/move.ts index fc578f130c6..a4c43623d96 100644 --- a/src/data/moves/move.ts +++ b/src/data/moves/move.ts @@ -1948,16 +1948,18 @@ export class HealAttr extends MoveEffectAttr { } override canApply(user: Pokemon, target: Pokemon, _move: Move, _args?: any[]): boolean { - return !(this.selfTarget ? user : target).isFullHp(); - } + if (!super.canApply(user, target, _move, _args)) { + return false; + } - override getFailedText(user: Pokemon, target: Pokemon, _move: Move): string | undefined { const healedPokemon = this.selfTarget ? user : target; - return healedPokemon.isFullHp() - ? i18next.t("battle:hpIsFull", { + if (healedPokemon.isFullHp()) { + globalScene.phaseManager.queueMessage(i18next.t("battle:hpIsFull", { pokemonName: getPokemonNameWithAffix(healedPokemon), - }) - : undefined; + })) + return false; + } + return true; } } diff --git a/test/moves/recovery-moves.test.ts b/test/moves/recovery-moves.test.ts index 89c97437367..92a481f7a7e 100644 --- a/test/moves/recovery-moves.test.ts +++ b/test/moves/recovery-moves.test.ts @@ -104,7 +104,7 @@ describe("Moves - Recovery Moves", () => { game.move.use(MoveId.MOONLIGHT); await game.toEndOfTurn(); - expect(blissey.getHpRatio()).toBeCloseTo(0.67, 1); + expect(blissey.getHpRatio()).toBeCloseTo(0.66, 1); }); const nonSunWTs = getEnumValues(WeatherType)