[Bug] Don't reset turn count or used moves array at the start of a new wave (fakeout and gigaton hammer) (#3606)

* Don't reset turn count or used moves array at the start of a new wave

* Add tests

src/phases/battle-end-phase.ts

@@ -23,12 +23,6 @@ export class BattleEndPhase extends BattlePhase {
       this.scene.unshiftPhase(new GameOverPhase(this.scene, true));
     }
 
-    for (const pokemon of this.scene.getField()) {
-      if (pokemon) {
-        pokemon.resetBattleSummonData();
-      }
-    }
-
     for (const pokemon of this.scene.getParty().filter(p => p.isAllowedInBattle())) {
       applyPostBattleAbAttrs(PostBattleAbAttr, pokemon);
     }

src/test/moves/fake_out.test.ts

@@ -0,0 +1,83 @@
+import GameManager from "#app/test/utils/gameManager";
+import { getMovePosition } from "#app/test/utils/gameManagerUtils";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+import { SPLASH_ONLY } from "../utils/testUtils";
+
+describe("Moves - Fake Out", () => {
+  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
+      .battleType("single")
+      .enemySpecies(Species.CORVIKNIGHT)
+      .starterSpecies(Species.FEEBAS)
+      .moveset([Moves.FAKE_OUT, Moves.SPLASH])
+      .enemyMoveset(SPLASH_ONLY)
+      .disableCrits();
+  });
+
+  it("can only be used on the first turn a pokemon is sent out", async() => {
+    await game.startBattle();
+
+    const enemy = game.scene.getEnemyPokemon()!;
+
+    game.doAttack(getMovePosition(game.scene, 0, Moves.FAKE_OUT));
+    await game.toNextTurn();
+
+    expect(enemy.hp).toBeLessThan(enemy.getMaxHp());
+    const postTurnOneHp = enemy.hp;
+
+    game.doAttack(getMovePosition(game.scene, 0, Moves.FAKE_OUT));
+    await game.toNextTurn();
+
+    expect(enemy.hp).toBe(postTurnOneHp);
+
+    game.doAttack(getMovePosition(game.scene, 0, Moves.SPLASH));
+    await game.doKillOpponents();
+    await game.toNextWave();
+
+    const newEnemy = game.scene.getEnemyPokemon()!;
+
+    game.doAttack(getMovePosition(game.scene, 0, Moves.FAKE_OUT));
+    await game.toNextTurn();
+
+    expect(newEnemy.hp).toBe(newEnemy.getMaxHp());
+  }, 20000);
+
+  it("can be used again if recalled and sent back out", async() => {
+    game.override.startingWave(4);
+    await game.startBattle();
+
+    const enemy1 = game.scene.getEnemyPokemon()!;
+
+    game.doAttack(getMovePosition(game.scene, 0, Moves.FAKE_OUT));
+    await game.phaseInterceptor.to("MoveEndPhase");
+
+    expect(enemy1.hp).toBeLessThan(enemy1.getMaxHp());
+
+    await game.doKillOpponents();
+    await game.toNextWave();
+
+    game.doAttack(getMovePosition(game.scene, 0, Moves.FAKE_OUT));
+    await game.toNextTurn();
+
+    const enemy2 = game.scene.getEnemyPokemon()!;
+
+    expect(enemy2.hp).toBeLessThan(enemy2.getMaxHp());
+  }, 20000);
+});

src/test/moves/gigaton_hammer.test.ts

@@ -0,0 +1,81 @@
+import { BattlerIndex } from "#app/battle.js";
+import GameManager from "#app/test/utils/gameManager";
+import { getMovePosition } from "#app/test/utils/gameManagerUtils";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+import { SPLASH_ONLY } from "../utils/testUtils";
+
+describe("Moves - Gigaton Hammer", () => {
+  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
+      .battleType("single")
+      .enemySpecies(Species.MAGIKARP)
+      .starterSpecies(Species.FEEBAS)
+      .moveset([Moves.GIGATON_HAMMER])
+      .startingLevel(10)
+      .enemyLevel(100)
+      .enemyMoveset(SPLASH_ONLY)
+      .disableCrits();
+  });
+
+  it("can't be used two turns in a row", async() => {
+    await game.startBattle();
+
+    const enemy1 = game.scene.getEnemyPokemon()!;
+
+    game.doAttack(getMovePosition(game.scene, 0, Moves.GIGATON_HAMMER));
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.phaseInterceptor.to("MoveEndPhase");
+
+    expect(enemy1.hp).toBeLessThan(enemy1.getMaxHp());
+
+    await game.doKillOpponents();
+    await game.toNextWave();
+
+    game.doAttack(getMovePosition(game.scene, 0, Moves.GIGATON_HAMMER));
+    await game.toNextTurn();
+
+    const enemy2 = game.scene.getEnemyPokemon()!;
+
+    expect(enemy2.hp).toBe(enemy2.getMaxHp());
+  }, 20000);
+
+  it("can be used again if recalled and sent back out", async() => {
+    game.override.startingWave(4);
+    await game.startBattle();
+
+    const enemy1 = game.scene.getEnemyPokemon()!;
+
+    game.doAttack(getMovePosition(game.scene, 0, Moves.GIGATON_HAMMER));
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.phaseInterceptor.to("MoveEndPhase");
+
+    expect(enemy1.hp).toBeLessThan(enemy1.getMaxHp());
+
+    await game.doKillOpponents();
+    await game.toNextWave();
+
+    game.doAttack(getMovePosition(game.scene, 0, Moves.GIGATON_HAMMER));
+    await game.toNextTurn();
+
+    const enemy2 = game.scene.getEnemyPokemon()!;
+
+    expect(enemy2.hp).toBeLessThan(enemy2.getMaxHp());
+  }, 20000);
+});