Merge 6866248b41 into 375587213e

src/data/moves/move.ts

@@ -5912,21 +5912,20 @@ export class ProtectAttr extends AddBattlerTagAttr {
   getCondition(): MoveConditionFunc {
     return ((user, target, move): boolean => {
       let timesUsed = 0;
+      const moveHistory = user.getLastXMoves();
+      let turnMove: TurnMove | undefined;
 
-      for (const turnMove of user.getLastXMoves(-1).slice()) {
+      while (moveHistory.length) {
-        if (
+        turnMove = moveHistory.shift();
-          // Quick & Wide guard increment the Protect counter without using it for fail chance
+        if (!allMoves[turnMove?.move ?? MoveId.NONE].hasAttr("ProtectAttr") || turnMove?.result !== MoveResult.SUCCESS) {
-          !(allMoves[turnMove.move].hasAttr("ProtectAttr") || 
-          [MoveId.QUICK_GUARD, MoveId.WIDE_GUARD].includes(turnMove.move)) || 
-          turnMove.result !== MoveResult.SUCCESS
-        ) {
           break;
         }
-
+        timesUsed++;
-        timesUsed++
       }
-
+      if (timesUsed) {
-      return timesUsed === 0 || user.randBattleSeedInt(Math.pow(3, timesUsed)) === 0;
+        return !user.randBattleSeedInt(Math.pow(3, timesUsed));
+      }
+      return true;
     });
   }
 }

src/data/pokemon/pokemon-data.ts

@@ -253,6 +253,7 @@ export class PokemonTempSummonData {
    * Only currently used for positioning the battle cursor.
    */
   turnCount = 1;
+
   /**
    * The number of turns this pokemon has spent in the active position since the start of the wave
    * without switching out.

src/field/pokemon.ts

@@ -5094,7 +5094,6 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
    */
   resetWaveData(): void {
     this.waveData = new PokemonWaveData();
-    this.tempSummonData.waveTurnCount = 1;
   }
 
   resetTera(): void {

src/phases/battle-end-phase.ts

@@ -58,6 +58,12 @@ export class BattleEndPhase extends BattlePhase {
       globalScene.phaseManager.unshiftNew("GameOverPhase", true);
     }
 
+    for (const pokemon of globalScene.getField()) {
+      if (pokemon) {
+        pokemon.tempSummonData.waveTurnCount = 1;
+      }
+    }
+
     for (const pokemon of globalScene.getPokemonAllowedInBattle()) {
       applyAbAttrs("PostBattleAbAttr", { pokemon, victory: this.isVictory });
     }

test/moves/baneful-bunker.test.ts

@@ -5,7 +5,7 @@ import { SpeciesId } from "#enums/species-id";
 import { StatusEffect } from "#enums/status-effect";
 import { GameManager } from "#test/test-utils/game-manager";
 import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
 
 describe("Moves - Baneful Bunker", () => {
   let phaserGame: Phaser.Game;
@@ -26,51 +26,55 @@ describe("Moves - Baneful Bunker", () => {
 
     game.override
       .battleStyle("single")
-      .moveset([MoveId.SLASH, MoveId.FLASH_CANNON])
+      .moveset(MoveId.SLASH)
-      .enemySpecies(SpeciesId.TOXAPEX)
+      .enemySpecies(SpeciesId.SNORLAX)
       .enemyAbility(AbilityId.INSOMNIA)
       .enemyMoveset(MoveId.BANEFUL_BUNKER)
       .startingLevel(100)
       .enemyLevel(100);
   });
-
+  test("should protect the user and poison attackers that make contact", async () => {
-  function expectProtected() {
-    expect(game.scene.getEnemyPokemon()?.hp).toBe(game.scene.getEnemyPokemon()?.getMaxHp());
-    expect(game.scene.getPlayerPokemon()?.status?.effect).toBe(StatusEffect.POISON);
-  }
-
-  it("should protect the user and poison attackers that make contact", async () => {
     await game.classicMode.startBattle([SpeciesId.CHARIZARD]);
 
+    const leadPokemon = game.field.getPlayerPokemon();
+    const enemyPokemon = game.field.getEnemyPokemon();
+
     game.move.select(MoveId.SLASH);
     await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.phaseInterceptor.to("BerryPhase", false);
-
+    expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp());
-    expectProtected();
+    expect(leadPokemon.status?.effect === StatusEffect.POISON).toBeTruthy();
   });
-
+  test("should protect the user and poison attackers that make contact, regardless of accuracy checks", async () => {
-  it("should ignore accuracy checks", async () => {
     await game.classicMode.startBattle([SpeciesId.CHARIZARD]);
 
+    const leadPokemon = game.field.getPlayerPokemon();
+    const enemyPokemon = game.field.getEnemyPokemon();
+
     game.move.select(MoveId.SLASH);
-    await game.phaseInterceptor.to("MoveEndPhase"); // baneful bunker
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    await game.phaseInterceptor.to("MoveEffectPhase");
+
     await game.move.forceMiss();
-
     await game.phaseInterceptor.to("BerryPhase", false);
-
+    expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp());
-    expectProtected();
+    expect(leadPokemon.status?.effect === StatusEffect.POISON).toBeTruthy();
   });
 
-  it("should block non-contact moves without poisoning attackers", async () => {
+  test("should not poison attackers that don't make contact", async () => {
+    game.override.moveset(MoveId.FLASH_CANNON);
     await game.classicMode.startBattle([SpeciesId.CHARIZARD]);
 
-    const charizard = game.field.getPlayerPokemon();
+    const leadPokemon = game.field.getPlayerPokemon();
-    const toxapex = game.field.getEnemyPokemon();
+    const enemyPokemon = game.field.getEnemyPokemon();
 
     game.move.select(MoveId.FLASH_CANNON);
-    await game.phaseInterceptor.to("BerryPhase", false);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    await game.phaseInterceptor.to("MoveEffectPhase");
 
-    expect(toxapex.hp).toBe(toxapex.getMaxHp());
+    await game.move.forceMiss();
-    expect(charizard.status?.effect).toBeUndefined();
+    await game.phaseInterceptor.to("BerryPhase", false);
+    expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp());
+    expect(leadPokemon.status?.effect === StatusEffect.POISON).toBeFalsy();
   });
 });

test/moves/crafty-shield.test.ts

@@ -1,14 +1,12 @@
 import { AbilityId } from "#enums/ability-id";
-import { ArenaTagSide } from "#enums/arena-tag-side";
-import { ArenaTagType } from "#enums/arena-tag-type";
-import { BattlerIndex } from "#enums/battler-index";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { MoveId } from "#enums/move-id";
 import { SpeciesId } from "#enums/species-id";
 import { Stat } from "#enums/stat";
+import { BerryPhase } from "#phases/berry-phase";
 import { GameManager } from "#test/test-utils/game-manager";
 import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
 
 describe("Moves - Crafty Shield", () => {
   let phaserGame: Phaser.Game;
@@ -29,100 +27,68 @@ describe("Moves - Crafty Shield", () => {
 
     game.override
       .battleStyle("double")
-      .enemySpecies(SpeciesId.DUSKNOIR)
+      .moveset([MoveId.CRAFTY_SHIELD, MoveId.SPLASH, MoveId.SWORDS_DANCE])
-      .enemyMoveset(MoveId.GROWL)
+      .enemySpecies(SpeciesId.SNORLAX)
+      .enemyMoveset([MoveId.GROWL])
       .enemyAbility(AbilityId.INSOMNIA)
       .startingLevel(100)
       .enemyLevel(100);
   });
 
-  it("should protect the user and allies from status moves", async () => {
+  test("should protect the user and allies from status moves", async () => {
     await game.classicMode.startBattle([SpeciesId.CHARIZARD, SpeciesId.BLASTOISE]);
 
-    const [charizard, blastoise] = game.scene.getPlayerField();
+    const leadPokemon = game.scene.getPlayerField();
-    game.move.use(MoveId.CRAFTY_SHIELD, BattlerIndex.PLAYER);
-    game.move.use(MoveId.SPLASH, BattlerIndex.PLAYER_2);
-    await game.move.forceEnemyMove(MoveId.GROWL);
-    await game.move.forceEnemyMove(MoveId.GROWL);
 
-    await game.phaseInterceptor.to("TurnEndPhase");
+    game.move.select(MoveId.CRAFTY_SHIELD);
+    game.move.select(MoveId.SPLASH, 1);
 
-    expect(charizard.getStatStage(Stat.ATK)).toBe(0);
+    await game.phaseInterceptor.to(BerryPhase, false);
-    expect(blastoise.getStatStage(Stat.ATK)).toBe(0);
+
+    leadPokemon.forEach(p => expect(p.getStatStage(Stat.ATK)).toBe(0));
   });
 
-  it("should not protect the user and allies from attack moves", async () => {
+  test("should not protect the user and allies from attack moves", async () => {
-    game.override.enemyMoveset(MoveId.TACKLE);
+    game.override.enemyMoveset([MoveId.TACKLE]);
+
     await game.classicMode.startBattle([SpeciesId.CHARIZARD, SpeciesId.BLASTOISE]);
 
-    const [charizard, blastoise] = game.scene.getPlayerField();
+    const leadPokemon = game.scene.getPlayerField();
 
-    game.move.use(MoveId.CRAFTY_SHIELD, BattlerIndex.PLAYER);
+    game.move.select(MoveId.CRAFTY_SHIELD);
-    game.move.use(MoveId.SPLASH, BattlerIndex.PLAYER_2);
+    game.move.select(MoveId.SPLASH, 1);
-    await game.move.forceEnemyMove(MoveId.TACKLE, BattlerIndex.PLAYER);
-    await game.move.forceEnemyMove(MoveId.TACKLE, BattlerIndex.PLAYER_2);
-    await game.phaseInterceptor.to("TurnEndPhase");
 
-    expect(charizard.isFullHp()).toBe(false);
+    await game.phaseInterceptor.to(BerryPhase, false);
-    expect(blastoise.isFullHp()).toBe(false);
+
+    expect(leadPokemon.some(p => p.hp < p.getMaxHp())).toBeTruthy();
   });
 
-  it("should not block entry hazards and field-targeted moves", async () => {
+  test("should protect the user and allies from moves that ignore other protection", async () => {
-    game.override.enemyMoveset([MoveId.PERISH_SONG, MoveId.TOXIC_SPIKES]);
+    game.override.enemySpecies(SpeciesId.DUSCLOPS).enemyMoveset([MoveId.CURSE]);
+
     await game.classicMode.startBattle([SpeciesId.CHARIZARD, SpeciesId.BLASTOISE]);
 
-    const [charizard, blastoise] = game.scene.getPlayerField();
+    const leadPokemon = game.scene.getPlayerField();
 
-    game.move.use(MoveId.CRAFTY_SHIELD, BattlerIndex.PLAYER);
+    game.move.select(MoveId.CRAFTY_SHIELD);
-    game.move.use(MoveId.SPLASH, BattlerIndex.PLAYER_2);
+    game.move.select(MoveId.SPLASH, 1);
-    await game.move.forceEnemyMove(MoveId.PERISH_SONG);
-    await game.move.forceEnemyMove(MoveId.TOXIC_SPIKES);
-    await game.phaseInterceptor.to("TurnEndPhase");
 
-    expect(game.scene.arena.getTagOnSide(ArenaTagType.TOXIC_SPIKES, ArenaTagSide.PLAYER)).toBeDefined();
+    await game.phaseInterceptor.to(BerryPhase, false);
-    expect(charizard.getTag(BattlerTagType.PERISH_SONG)).toBeDefined();
+
-    expect(blastoise.getTag(BattlerTagType.PERISH_SONG)).toBeDefined();
+    leadPokemon.forEach(p => expect(p.getTag(BattlerTagType.CURSED)).toBeUndefined());
   });
 
-  it("should protect the user and allies from moves that ignore other protection", async () => {
+  test("should not block allies' self-targeted moves", async () => {
-    game.override.moveset(MoveId.CURSE);
-
     await game.classicMode.startBattle([SpeciesId.CHARIZARD, SpeciesId.BLASTOISE]);
 
-    const [charizard, blastoise] = game.scene.getPlayerField();
+    const leadPokemon = game.scene.getPlayerField();
 
-    game.move.use(MoveId.CRAFTY_SHIELD, BattlerIndex.PLAYER);
+    game.move.select(MoveId.CRAFTY_SHIELD);
-    game.move.use(MoveId.SPLASH, BattlerIndex.PLAYER_2);
+    game.move.select(MoveId.SWORDS_DANCE, 1);
-    await game.move.forceEnemyMove(MoveId.CURSE, BattlerIndex.PLAYER);
-    await game.move.forceEnemyMove(MoveId.CURSE, BattlerIndex.PLAYER_2);
 
-    await game.toEndOfTurn();
+    await game.phaseInterceptor.to(BerryPhase, false);
 
-    expect(charizard.getTag(BattlerTagType.CURSED)).toBeUndefined();
+    expect(leadPokemon[0].getStatStage(Stat.ATK)).toBe(0);
-    expect(blastoise.getTag(BattlerTagType.CURSED)).toBeUndefined();
+    expect(leadPokemon[1].getStatStage(Stat.ATK)).toBe(2);
-
-    const [dusknoir1, dusknoir2] = game.scene.getEnemyField();
-    expect(dusknoir1).toHaveFullHp();
-    expect(dusknoir2).toHaveFullHp();
-  });
-
-  it("should not block allies' self or ally-targeted moves", async () => {
-    await game.classicMode.startBattle([SpeciesId.CHARIZARD, SpeciesId.BLASTOISE]);
-
-    const [charizard, blastoise] = game.scene.getPlayerField();
-
-    game.move.use(MoveId.CRAFTY_SHIELD, BattlerIndex.PLAYER);
-    game.move.use(MoveId.SWORDS_DANCE, BattlerIndex.PLAYER_2);
-    await game.phaseInterceptor.to("TurnEndPhase");
-
-    expect(charizard.getStatStage(Stat.ATK)).toBe(0);
-    expect(blastoise.getStatStage(Stat.ATK)).toBe(2);
-
-    game.move.use(MoveId.HOWL, BattlerIndex.PLAYER);
-    game.move.use(MoveId.CRAFTY_SHIELD, BattlerIndex.PLAYER_2);
-    await game.phaseInterceptor.to("TurnEndPhase");
-
-    expect(charizard.getStatStage(Stat.ATK)).toBe(1);
-    expect(blastoise.getStatStage(Stat.ATK)).toBe(3);
   });
 });

test/moves/endure.test.ts

@@ -1,10 +1,9 @@
 import { AbilityId } from "#enums/ability-id";
-import { HitResult } from "#enums/hit-result";
 import { MoveId } from "#enums/move-id";
 import { SpeciesId } from "#enums/species-id";
 import { GameManager } from "#test/test-utils/game-manager";
 import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
 describe("Moves - Endure", () => {
   let phaserGame: Phaser.Game;
@@ -23,7 +22,7 @@ describe("Moves - Endure", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([MoveId.THUNDER, MoveId.BULLET_SEED, MoveId.SHEER_COLD])
+      .moveset([MoveId.THUNDER, MoveId.BULLET_SEED, MoveId.TOXIC, MoveId.SHEER_COLD])
       .ability(AbilityId.SKILL_LINK)
       .startingLevel(100)
       .battleStyle("single")
@@ -33,7 +32,7 @@ describe("Moves - Endure", () => {
       .enemyMoveset(MoveId.ENDURE);
   });
 
-  it("should let the pokemon survive with 1 HP from attacks", async () => {
+  it("should let the pokemon survive with 1 HP", async () => {
     await game.classicMode.startBattle([SpeciesId.ARCEUS]);
 
     game.move.select(MoveId.THUNDER);
@@ -42,7 +41,7 @@ describe("Moves - Endure", () => {
     expect(game.field.getEnemyPokemon().hp).toBe(1);
   });
 
-  it("should let the pokemon survive with 1 HP from multi-strike moves", async () => {
+  it("should let the pokemon survive with 1 HP when hit with a multihit move", async () => {
     await game.classicMode.startBattle([SpeciesId.ARCEUS]);
 
     game.move.select(MoveId.BULLET_SEED);
@@ -58,27 +57,30 @@ describe("Moves - Endure", () => {
     game.move.select(MoveId.SHEER_COLD);
     await game.phaseInterceptor.to("TurnEndPhase");
 
-    expect(enemy.hp).toBe(1);
+    expect(enemy.isFainted()).toBeFalsy();
   });
 
   // comprehensive indirect damage test copied from Reviver Seed test
   it.each([
-    { moveType: "Damaging Move Chip", move: MoveId.SALT_CURE },
+    { moveType: "Damaging Move Chip Damage", move: MoveId.SALT_CURE },
-    { moveType: "Status Move Chip", move: MoveId.LEECH_SEED },
+    { moveType: "Chip Damage", move: MoveId.LEECH_SEED },
-    { moveType: "Partial Trapping move", move: MoveId.WHIRLPOOL },
+    { moveType: "Trapping Chip Damage", move: MoveId.WHIRLPOOL },
-    { moveType: "Status Effect", move: MoveId.TOXIC },
+    { moveType: "Status Effect Damage", move: MoveId.TOXIC },
     { moveType: "Weather", move: MoveId.SANDSTORM },
-  ])("should not prevent fainting from $moveType Damage", async ({ move }) => {
+  ])("should not prevent fainting from $moveType", async ({ move }) => {
-    game.override.moveset(move).enemyLevel(100);
+    game.override
+      .enemyLevel(1)
+      .startingLevel(100)
+      .enemySpecies(SpeciesId.MAGIKARP)
+      .moveset(move)
+      .enemyMoveset(MoveId.ENDURE);
     await game.classicMode.startBattle([SpeciesId.MAGIKARP, SpeciesId.FEEBAS]);
     const enemy = game.field.getEnemyPokemon();
-    enemy.hp = 2;
+    enemy.damageAndUpdate(enemy.hp - 1);
-    // force attack to do 1 dmg (for salt cure)
-    vi.spyOn(enemy, "getAttackDamage").mockReturnValue({ cancelled: false, result: HitResult.EFFECTIVE, damage: 1 });
 
     game.move.select(move);
     await game.phaseInterceptor.to("TurnEndPhase");
 
-    expect(enemy.isFainted()).toBe(true);
+    expect(enemy.isFainted()).toBeTruthy();
   });
 });

test/moves/protect.test.ts

@@ -1,14 +1,15 @@
+import { ArenaTrapTag } from "#data/arena-tag";
 import { allMoves } from "#data/data-lists";
 import { AbilityId } from "#enums/ability-id";
+import { ArenaTagSide } from "#enums/arena-tag-side";
 import { BattlerIndex } from "#enums/battler-index";
 import { MoveId } from "#enums/move-id";
 import { MoveResult } from "#enums/move-result";
-import { MoveUseMode } from "#enums/move-use-mode";
 import { SpeciesId } from "#enums/species-id";
 import { Stat } from "#enums/stat";
 import { GameManager } from "#test/test-utils/game-manager";
 import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vitest";
 
 describe("Moves - Protect", () => {
   let phaserGame: Phaser.Game;
@@ -26,210 +27,90 @@ describe("Moves - Protect", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
+
     game.override
       .battleStyle("single")
-      .moveset([MoveId.PROTECT, MoveId.SPIKY_SHIELD, MoveId.ENDURE, MoveId.SPLASH])
+      .moveset([MoveId.PROTECT])
       .enemySpecies(SpeciesId.SNORLAX)
       .enemyAbility(AbilityId.INSOMNIA)
-      .enemyMoveset(MoveId.LUMINA_CRASH)
+      .enemyMoveset([MoveId.TACKLE])
       .startingLevel(100)
       .enemyLevel(100);
   });
 
-  it("should protect the user from attacks and their secondary effects", async () => {
+  test("should protect the user from attacks", async () => {
     await game.classicMode.startBattle([SpeciesId.CHARIZARD]);
 
-    const charizard = game.field.getPlayerPokemon();
+    const leadPokemon = game.field.getPlayerPokemon();
 
     game.move.select(MoveId.PROTECT);
+
     await game.phaseInterceptor.to("BerryPhase", false);
 
-    expect(charizard.hp).toBe(charizard.getMaxHp());
+    expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp());
-    expect(charizard.getStatStage(Stat.SPDEF)).toBe(0);
-    expect(charizard);
   });
 
-  it.each<{ numTurns: number; chance: number }>([
+  test("should prevent secondary effects from the opponent's attack", async () => {
-    { numTurns: 1, chance: 3 },
+    game.override.enemyMoveset([MoveId.CEASELESS_EDGE]);
-    { numTurns: 2, chance: 9 },
+    vi.spyOn(allMoves[MoveId.CEASELESS_EDGE], "accuracy", "get").mockReturnValue(100);
-    { numTurns: 3, chance: 27 },
+
-    { numTurns: 4, chance: 81 },
-  ])("should have a 1/$chance success rate after $numTurns successful uses", async ({ numTurns, chance }) => {
     await game.classicMode.startBattle([SpeciesId.CHARIZARD]);
 
-    const charizard = game.scene.getPlayerPokemon()!;
+    const leadPokemon = game.field.getPlayerPokemon();
-
-    // mock RNG roll to suceed unless exactly the desired chance is hit
-    vi.spyOn(charizard, "randBattleSeedInt").mockImplementation(range => (range !== chance ? 0 : 1));
-    const conditionSpy = vi.spyOn(allMoves[MoveId.PROTECT]["conditions"][0], "apply");
-
-    // click protect many times
-    for (let x = 0; x < numTurns; x++) {
-      game.move.select(MoveId.PROTECT);
-      await game.toNextTurn();
-
-      expect(charizard.hp).toBe(charizard.getMaxHp());
-      expect(charizard.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS);
-      expect(conditionSpy).toHaveLastReturnedWith(true);
-    }
 
     game.move.select(MoveId.PROTECT);
-    await game.toNextTurn();
 
-    expect(charizard.hp).toBeLessThan(charizard.getMaxHp());
+    await game.phaseInterceptor.to("BerryPhase", false);
-    expect(charizard.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
+
-    expect(conditionSpy).toHaveLastReturnedWith(false);
+    expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp());
+    expect(game.scene.arena.getTagOnSide(ArenaTrapTag, ArenaTagSide.ENEMY)).toBeUndefined();
   });
 
-  it("should share fail chance with all move variants", async () => {
+  test("should protect the user from status moves", async () => {
+    game.override.enemyMoveset([MoveId.CHARM]);
+
     await game.classicMode.startBattle([SpeciesId.CHARIZARD]);
 
-    const charizard = game.field.getPlayerPokemon();
+    const leadPokemon = game.field.getPlayerPokemon();
-    charizard.summonData.moveHistory = [
-      { move: MoveId.ENDURE, result: MoveResult.SUCCESS, targets: [BattlerIndex.PLAYER], useMode: MoveUseMode.NORMAL },
-      {
-        move: MoveId.SPIKY_SHIELD,
-        result: MoveResult.SUCCESS,
-        targets: [BattlerIndex.PLAYER],
-        useMode: MoveUseMode.NORMAL,
-      },
-    ];
-    // force protect to fail on anything >=2 uses (1/9 chance)
-    vi.spyOn(charizard, "randBattleSeedInt").mockImplementation(range => (range >= 9 ? 1 : 0));
 
     game.move.select(MoveId.PROTECT);
-    await game.toNextTurn();
 
-    expect(charizard.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    expect(leadPokemon.getStatStage(Stat.ATK)).toBe(0);
   });
 
-  it("should reset fail chance on move failure", async () => {
+  test("should stop subsequent hits of a multi-hit move", async () => {
-    await game.classicMode.startBattle([SpeciesId.CHARIZARD]);
-
-    const charizard = game.scene.getPlayerPokemon()!;
-    // force protect to always fail if RNG roll attempt is made
-    vi.spyOn(charizard, "randBattleSeedInt").mockReturnValue(1);
-
-    game.move.select(MoveId.PROTECT);
-    await game.toNextTurn();
-    expect(charizard.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS);
-
-    game.move.select(MoveId.SPIKY_SHIELD);
-    await game.toNextTurn();
-    expect(charizard.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
-
-    game.move.select(MoveId.SPIKY_SHIELD);
-    await game.toNextTurn();
-    expect(charizard.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS);
-  });
-
-  it("should reset fail chance on using another move", async () => {
-    await game.classicMode.startBattle([SpeciesId.CHARIZARD]);
-
-    const charizard = game.scene.getPlayerPokemon()!;
-    // force protect to always fail if RNG roll attempt is made
-    vi.spyOn(charizard, "randBattleSeedInt").mockReturnValue(1);
-
-    game.move.select(MoveId.PROTECT);
-    await game.toNextTurn();
-    expect(charizard.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS);
-
-    game.move.select(MoveId.SPLASH);
-    await game.toNextTurn();
-
-    game.move.select(MoveId.PROTECT);
-    await game.toNextTurn();
-    expect(charizard.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS);
-  });
-
-  it("should reset fail chance on starting a new wave", async () => {
-    await game.classicMode.startBattle([SpeciesId.CHARIZARD]);
-
-    const charizard = game.field.getPlayerPokemon();
-    // force protect to always fail if RNG roll attempt is made
-    vi.spyOn(charizard, "randBattleSeedInt").mockReturnValue(1);
-
-    game.move.select(MoveId.PROTECT);
-    // Wait until move end phase to kill opponent to ensure protect doesn't fail due to going last
-    await game.phaseInterceptor.to("MoveEndPhase");
-    await game.doKillOpponents();
-    await game.toNextWave();
-    expect(charizard.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS);
-
-    game.move.select(MoveId.SPIKY_SHIELD);
-    expect(charizard.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS);
-  });
-
-  it("should not be blocked by Psychic Terrain", async () => {
-    game.override.ability(AbilityId.PSYCHIC_SURGE);
-    await game.classicMode.startBattle([SpeciesId.CHARIZARD]);
-
-    const charizard = game.scene.getPlayerPokemon()!;
-    game.move.select(MoveId.PROTECT);
-    await game.toNextTurn();
-
-    expect(charizard.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS);
-  });
-
-  it("should stop subsequent hits of multi-hit moves", async () => {
     game.override.enemyMoveset([MoveId.TACHYON_CUTTER]);
+
     await game.classicMode.startBattle([SpeciesId.CHARIZARD]);
 
-    const charizard = game.field.getPlayerPokemon();
+    const leadPokemon = game.field.getPlayerPokemon();
     const enemyPokemon = game.field.getEnemyPokemon();
 
     game.move.select(MoveId.PROTECT);
+
     await game.phaseInterceptor.to("BerryPhase", false);
 
-    expect(charizard.hp).toBe(charizard.getMaxHp());
+    expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp());
     expect(enemyPokemon.turnData.hitCount).toBe(1);
   });
 
-  it("should fail if the user moves last in the turn", async () => {
+  test("should fail if the user is the last to move in the turn", async () => {
-    game.override.enemyMoveset(MoveId.PROTECT);
+    game.override.enemyMoveset([MoveId.PROTECT]);
+
     await game.classicMode.startBattle([SpeciesId.CHARIZARD]);
 
-    const charizard = game.field.getPlayerPokemon();
+    const leadPokemon = game.field.getPlayerPokemon();
     const enemyPokemon = game.field.getEnemyPokemon();
 
     game.move.select(MoveId.PROTECT);
+
     await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+
     await game.phaseInterceptor.to("BerryPhase", false);
 
     expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS);
-    expect(charizard.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
+    expect(leadPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
   });
-
-  it("should not block Protection-bypassing moves or Future Sight", async () => {
-    game.override.enemyMoveset([MoveId.FUTURE_SIGHT, MoveId.MIGHTY_CLEAVE, MoveId.SPORE]);
-    await game.classicMode.startBattle([SpeciesId.AGGRON]);
-
-    const aggron = game.scene.getPlayerPokemon()!;
-    vi.spyOn(aggron, "randBattleSeedInt").mockReturnValue(0);
-
-    // Turn 1: setup future sight
-    game.move.select(MoveId.PROTECT);
-    await game.move.forceEnemyMove(MoveId.FUTURE_SIGHT);
-    await game.toNextTurn();
-
-    // Turn 2: mighty cleave
-    game.move.select(MoveId.PROTECT);
-    await game.move.forceEnemyMove(MoveId.MIGHTY_CLEAVE);
-    await game.toNextTurn();
-
-    expect(aggron.hp).toBeLessThan(aggron.getMaxHp());
-
-    aggron.hp = aggron.getMaxHp();
-
-    // turn 3: Future Sight hits
-    game.move.select(MoveId.PROTECT);
-    await game.move.forceEnemyMove(MoveId.SPORE);
-    await game.toNextTurn();
-
-    expect(aggron.hp).toBeLessThan(aggron.getMaxHp());
-    expect(aggron.status?.effect).toBeUndefined(); // check that protect actually worked
-  });
-
-  // TODO: Add test
-  it.todo("should not reset counter when throwing balls");
 });

test/moves/quick-guard.test.ts

@@ -3,9 +3,10 @@ import { BattlerIndex } from "#enums/battler-index";
 import { MoveId } from "#enums/move-id";
 import { MoveResult } from "#enums/move-result";
 import { SpeciesId } from "#enums/species-id";
+import { Stat } from "#enums/stat";
 import { GameManager } from "#test/test-utils/game-manager";
 import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
 
 describe("Moves - Quick Guard", () => {
   let phaserGame: Phaser.Game;
@@ -26,72 +27,74 @@ describe("Moves - Quick Guard", () => {
 
     game.override
       .battleStyle("double")
-      .moveset([MoveId.QUICK_GUARD, MoveId.SPLASH, MoveId.SPIKY_SHIELD])
+      .moveset([MoveId.QUICK_GUARD, MoveId.SPLASH, MoveId.FOLLOW_ME])
       .enemySpecies(SpeciesId.SNORLAX)
-      .enemyMoveset(MoveId.QUICK_ATTACK)
+      .enemyMoveset([MoveId.QUICK_ATTACK])
-      .enemyAbility(AbilityId.BALL_FETCH)
+      .enemyAbility(AbilityId.INSOMNIA)
       .startingLevel(100)
       .enemyLevel(100);
   });
 
-  it("should protect the user and allies from priority moves", async () => {
+  test("should protect the user and allies from priority moves", async () => {
     await game.classicMode.startBattle([SpeciesId.CHARIZARD, SpeciesId.BLASTOISE]);
 
-    const [charizard, blastoise] = game.scene.getPlayerField();
+    const playerPokemon = game.scene.getPlayerField();
+
+    game.move.select(MoveId.QUICK_GUARD);
+    game.move.select(MoveId.SPLASH, 1);
 
-    game.move.select(MoveId.QUICK_GUARD, BattlerIndex.PLAYER);
-    game.move.select(MoveId.SPLASH, BattlerIndex.PLAYER_2);
-    await game.move.forceEnemyMove(MoveId.QUICK_ATTACK, BattlerIndex.PLAYER);
-    await game.move.forceEnemyMove(MoveId.QUICK_ATTACK, BattlerIndex.PLAYER_2);
     await game.phaseInterceptor.to("BerryPhase", false);
 
-    expect(charizard.hp).toBe(charizard.getMaxHp());
+    playerPokemon.forEach(p => expect(p.hp).toBe(p.getMaxHp()));
-    expect(blastoise.hp).toBe(blastoise.getMaxHp());
   });
 
-  it.each<{ name: string; move: MoveId; ability: AbilityId }>([
+  test("should protect the user and allies from Prankster-boosted moves", async () => {
-    { name: "Prankster", move: MoveId.SPORE, ability: AbilityId.PRANKSTER },
+    game.override.enemyAbility(AbilityId.PRANKSTER).enemyMoveset([MoveId.GROWL]);
-    { name: "Gale Wings", move: MoveId.BRAVE_BIRD, ability: AbilityId.GALE_WINGS },
+
-  ])("should protect the user and allies from $name-boosted moves", async ({ move, ability }) => {
-    game.override.enemyMoveset(move).enemyAbility(ability);
     await game.classicMode.startBattle([SpeciesId.CHARIZARD, SpeciesId.BLASTOISE]);
 
-    const [charizard, blastoise] = game.scene.getPlayerField();
+    const playerPokemon = game.scene.getPlayerField();
+
+    game.move.select(MoveId.QUICK_GUARD);
+    game.move.select(MoveId.SPLASH, 1);
 
-    game.move.select(MoveId.QUICK_GUARD, BattlerIndex.PLAYER);
-    game.move.select(MoveId.SPLASH, BattlerIndex.PLAYER_2);
-    await game.move.forceEnemyMove(move, BattlerIndex.PLAYER);
-    await game.move.forceEnemyMove(move, BattlerIndex.PLAYER_2);
     await game.phaseInterceptor.to("BerryPhase", false);
 
-    expect(charizard.hp).toBe(charizard.getMaxHp());
+    playerPokemon.forEach(p => expect(p.getStatStage(Stat.ATK)).toBe(0));
-    expect(blastoise.hp).toBe(blastoise.getMaxHp());
-    expect(charizard.status?.effect).toBeUndefined();
-    expect(blastoise.status?.effect).toBeUndefined();
   });
 
-  it("should increment (but not respect) other protection moves' fail counters", async () => {
+  test("should stop subsequent hits of a multi-hit priority move", async () => {
-    game.override.battleStyle("single");
+    game.override.enemyMoveset([MoveId.WATER_SHURIKEN]);
+
+    await game.classicMode.startBattle([SpeciesId.CHARIZARD, SpeciesId.BLASTOISE]);
+
+    const playerPokemon = game.scene.getPlayerField();
+    const enemyPokemon = game.scene.getEnemyField();
+
+    game.move.select(MoveId.QUICK_GUARD);
+    game.move.select(MoveId.FOLLOW_ME, 1);
+
+    await game.phaseInterceptor.to("BerryPhase", false);
+
+    playerPokemon.forEach(p => expect(p.hp).toBe(p.getMaxHp()));
+    enemyPokemon.forEach(p => expect(p.turnData.hitCount).toBe(1));
+  });
+
+  test("should fail if the user is the last to move in the turn", async () => {
+    game.override.battleStyle("single").enemyMoveset([MoveId.QUICK_GUARD]);
+
     await game.classicMode.startBattle([SpeciesId.CHARIZARD]);
 
-    const charizard = game.scene.getPlayerPokemon()!;
+    const playerPokemon = game.field.getPlayerPokemon();
-    // force protect to fail on anything >0 uses
+    const enemyPokemon = game.field.getEnemyPokemon();
-    vi.spyOn(charizard, "randBattleSeedInt").mockReturnValue(1);
 
     game.move.select(MoveId.QUICK_GUARD);
-    await game.toNextTurn();
 
-    expect(charizard.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
 
-    game.move.select(MoveId.QUICK_GUARD);
+    await game.phaseInterceptor.to("BerryPhase", false);
-    await game.toNextTurn();
 
-    // ignored fail chance
+    expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS);
-    expect(charizard.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS);
+    expect(playerPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
-
-    game.move.select(MoveId.SPIKY_SHIELD);
-    await game.toNextTurn();
-
-    expect(charizard.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
   });
 });

test/moves/wide-guard.test.ts

@@ -1,12 +1,11 @@
 import { AbilityId } from "#enums/ability-id";
-import { BattlerIndex } from "#enums/battler-index";
 import { MoveId } from "#enums/move-id";
-import { MoveResult } from "#enums/move-result";
 import { SpeciesId } from "#enums/species-id";
 import { Stat } from "#enums/stat";
+import { BerryPhase } from "#phases/berry-phase";
 import { GameManager } from "#test/test-utils/game-manager";
 import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
 
 describe("Moves - Wide Guard", () => {
   let phaserGame: Phaser.Game;
@@ -27,84 +26,71 @@ describe("Moves - Wide Guard", () => {
 
     game.override
       .battleStyle("double")
-      .moveset([MoveId.WIDE_GUARD, MoveId.SPLASH, MoveId.SURF, MoveId.SPIKY_SHIELD])
+      .moveset([MoveId.WIDE_GUARD, MoveId.SPLASH, MoveId.SURF])
       .enemySpecies(SpeciesId.SNORLAX)
-      .enemyMoveset([MoveId.SWIFT, MoveId.GROWL, MoveId.TACKLE])
+      .enemyMoveset(MoveId.SWIFT)
       .enemyAbility(AbilityId.INSOMNIA)
       .startingLevel(100)
       .enemyLevel(100);
   });
 
-  it("should protect the user and allies from multi-target attack and status moves", async () => {
+  test("should protect the user and allies from multi-target attack moves", async () => {
-    await game.classicMode.startBattle([SpeciesId.CHARIZARD, SpeciesId.BLASTOISE]);
-    const [charizard, blastoise] = game.scene.getPlayerField();
-
-    game.move.select(MoveId.WIDE_GUARD, BattlerIndex.PLAYER);
-    game.move.select(MoveId.SPLASH, BattlerIndex.PLAYER_2);
-    await game.move.forceEnemyMove(MoveId.SWIFT);
-    await game.move.forceEnemyMove(MoveId.GROWL);
-    await game.phaseInterceptor.to("TurnEndPhase");
-
-    expect(charizard.hp).toBe(charizard.getMaxHp());
-    expect(blastoise.hp).toBe(blastoise.getMaxHp());
-    expect(charizard.getStatStage(Stat.ATK)).toBe(0);
-    expect(blastoise.getStatStage(Stat.ATK)).toBe(0);
-  });
-
-  it("should not protect the user and allies from single-target moves", async () => {
     await game.classicMode.startBattle([SpeciesId.CHARIZARD, SpeciesId.BLASTOISE]);
 
-    const [charizard, blastoise] = game.scene.getPlayerField();
+    const leadPokemon = game.scene.getPlayerField();
-    game.move.select(MoveId.WIDE_GUARD, BattlerIndex.PLAYER);
-    game.move.select(MoveId.SPLASH, BattlerIndex.PLAYER_2);
-    await game.move.forceEnemyMove(MoveId.TACKLE, BattlerIndex.PLAYER);
-    await game.move.forceEnemyMove(MoveId.TACKLE, BattlerIndex.PLAYER_2);
-    await game.phaseInterceptor.to("TurnEndPhase");
-
-    expect(charizard.hp).toBeLessThan(charizard.getMaxHp());
-    expect(blastoise.hp).toBeLessThan(blastoise.getMaxHp());
-  });
-
-  it("should protect the user from its ally's multi-target move", async () => {
-    game.override.enemyMoveset(MoveId.SPLASH);
-
-    await game.classicMode.startBattle([SpeciesId.CHARIZARD, SpeciesId.BLASTOISE]);
-
-    const charizard = game.scene.getPlayerPokemon()!;
-    const [snorlax1, snorlax2] = game.scene.getEnemyField();
-
-    game.move.select(MoveId.WIDE_GUARD, BattlerIndex.PLAYER);
-    game.move.select(MoveId.SURF, BattlerIndex.PLAYER_2);
-    await game.phaseInterceptor.to("TurnEndPhase");
-
-    expect(charizard.hp).toBe(charizard.getMaxHp());
-    expect(snorlax1.hp).toBeLessThan(snorlax1.getMaxHp());
-    expect(snorlax2.hp).toBeLessThan(snorlax2.getMaxHp());
-  });
-
-  it("should increment (but not respect) other protection moves' fail counters", async () => {
-    game.override.battleStyle("single");
-    await game.classicMode.startBattle([SpeciesId.CHARIZARD]);
-
-    const charizard = game.scene.getPlayerPokemon()!;
-    // force protect to fail on anything other than a guaranteed success
-    vi.spyOn(charizard, "randBattleSeedInt").mockReturnValue(1);
 
     game.move.select(MoveId.WIDE_GUARD);
-    await game.toNextTurn();
+    game.move.select(MoveId.SPLASH, 1);
 
-    expect(charizard.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS);
+    await game.phaseInterceptor.to(BerryPhase, false);
+
+    leadPokemon.forEach(p => expect(p.hp).toBe(p.getMaxHp()));
+  });
+
+  test("should protect the user and allies from multi-target status moves", async () => {
+    game.override.enemyMoveset([MoveId.GROWL]);
+
+    await game.classicMode.startBattle([SpeciesId.CHARIZARD, SpeciesId.BLASTOISE]);
+
+    const leadPokemon = game.scene.getPlayerField();
 
-    // ignored fail chance
     game.move.select(MoveId.WIDE_GUARD);
-    await game.toNextTurn();
+    game.move.select(MoveId.SPLASH, 1);
 
-    expect(charizard.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS);
+    await game.phaseInterceptor.to(BerryPhase, false);
 
-    game.move.select(MoveId.SPIKY_SHIELD);
+    leadPokemon.forEach(p => expect(p.getStatStage(Stat.ATK)).toBe(0));
-    await game.toNextTurn();
+  });
 
-    // ignored fail chance
+  test("should not protect the user and allies from single-target moves", async () => {
-    expect(charizard.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
+    game.override.enemyMoveset([MoveId.TACKLE]);
+
+    await game.classicMode.startBattle([SpeciesId.CHARIZARD, SpeciesId.BLASTOISE]);
+
+    const leadPokemon = game.scene.getPlayerField();
+
+    game.move.select(MoveId.WIDE_GUARD);
+    game.move.select(MoveId.SPLASH, 1);
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+
+    expect(leadPokemon.some(p => p.hp < p.getMaxHp())).toBeTruthy();
+  });
+
+  test("should protect the user from its ally's multi-target move", async () => {
+    game.override.enemyMoveset([MoveId.SPLASH]);
+
+    await game.classicMode.startBattle([SpeciesId.CHARIZARD, SpeciesId.BLASTOISE]);
+
+    const leadPokemon = game.scene.getPlayerField();
+    const enemyPokemon = game.scene.getEnemyField();
+
+    game.move.select(MoveId.WIDE_GUARD);
+    game.move.select(MoveId.SURF, 1);
+
+    await game.phaseInterceptor.to(BerryPhase, false);
+
+    expect(leadPokemon[0].hp).toBe(leadPokemon[0].getMaxHp());
+    enemyPokemon.forEach(p => expect(p.hp).toBeLessThan(p.getMaxHp()));
   });
 });