From a778537ccadcfe23a39766abcf8afee7b287ca09 Mon Sep 17 00:00:00 2001
From: Mumble <171087428+frutescens@users.noreply.github.com>
Date: Thu, 10 Oct 2024 08:43:50 -0700
Subject: [PATCH] [P2] Sketch Failure Bug involving multiple Sketch-s in a
 moveset (#4618)

* Sketch bug fix

* Added test

---------

Co-authored-by: frutescens <info@laptop>
---
 src/phases/turn-start-phase.ts     |  2 +-
 src/test/moves/sketch.test.ts      | 53 ++++++++++++++++++++++++++++++
 src/test/utils/gameManagerUtils.ts |  2 +-
 3 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 src/test/moves/sketch.test.ts

diff --git a/src/phases/turn-start-phase.ts b/src/phases/turn-start-phase.ts
index 95d55986185..53623f933f2 100644
--- a/src/phases/turn-start-phase.ts
+++ b/src/phases/turn-start-phase.ts
@@ -158,7 +158,7 @@ export class TurnStartPhase extends FieldPhase {
         if (!queuedMove) {
           continue;
         }
-        const move = pokemon.getMoveset().find(m => m?.moveId === queuedMove.move) || new PokemonMove(queuedMove.move);
+        const move = pokemon.getMoveset().find(m => m?.moveId === queuedMove.move && m?.ppUsed < m?.getMovePp()) || new PokemonMove(queuedMove.move);
         if (move.getMove().hasAttr(MoveHeaderAttr)) {
           this.scene.unshiftPhase(new MoveHeaderPhase(this.scene, pokemon, move));
         }
diff --git a/src/test/moves/sketch.test.ts b/src/test/moves/sketch.test.ts
new file mode 100644
index 00000000000..2e3eb97a76c
--- /dev/null
+++ b/src/test/moves/sketch.test.ts
@@ -0,0 +1,53 @@
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { MoveResult } from "#app/field/pokemon";
+import GameManager from "#test/utils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("Moves - Sketch", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .ability(Abilities.BALL_FETCH)
+      .battleType("single")
+      .disableCrits()
+      .enemySpecies(Species.SHUCKLE)
+      .enemyAbility(Abilities.BALL_FETCH)
+      .enemyMoveset(Moves.SPLASH);
+  });
+
+  it("Sketch should not fail even if a previous Sketch failed to retrieve a valid move and ran out of PP", async () => {
+    game.override.moveset([ Moves.SKETCH, Moves.SKETCH ]);
+
+    await game.classicMode.startBattle([ Species.REGIELEKI ]);
+    const playerPokemon = game.scene.getPlayerPokemon();
+
+    game.move.select(Moves.SKETCH);
+    await game.phaseInterceptor.to("TurnEndPhase");
+    expect(playerPokemon?.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
+    const moveSlot0 = playerPokemon?.getMoveset()[0];
+    expect(moveSlot0?.moveId).toBe(Moves.SKETCH);
+    expect(moveSlot0?.getPpRatio()).toBe(0);
+
+    await game.toNextTurn();
+    game.move.select(Moves.SKETCH);
+    await game.phaseInterceptor.to("TurnEndPhase");
+    expect(playerPokemon?.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS);
+    // Can't verify if the player Pokemon's moveset was successfully changed because of overrides.
+  });
+});
diff --git a/src/test/utils/gameManagerUtils.ts b/src/test/utils/gameManagerUtils.ts
index 700d93082d8..543ee9627fe 100644
--- a/src/test/utils/gameManagerUtils.ts
+++ b/src/test/utils/gameManagerUtils.ts
@@ -86,7 +86,7 @@ export function waitUntil(truth) {
 export function getMovePosition(scene: BattleScene, pokemonIndex: 0 | 1, move: Moves) {
   const playerPokemon = scene.getPlayerField()[pokemonIndex];
   const moveSet = playerPokemon.getMoveset();
-  const index = moveSet.findIndex((m) => m?.moveId === move);
+  const index = moveSet.findIndex((m) => m?.moveId === move && m?.ppUsed < m?.getMovePp());
   console.log(`Move position for ${Moves[move]} (=${move}):`, index);
   return index;
 }