From 8943e92f03ac65db60aaf7793036671aeda2f842 Mon Sep 17 00:00:00 2001
From: frutescens <info@laptop>
Date: Tue, 5 Nov 2024 12:43:23 -0800
Subject: [PATCH] Test + documentation

---
 src/data/battler-tags.ts      | 14 +++++++-
 src/test/moves/grudge.test.ts | 62 +++++++++++++++++++++++++++++++----
 2 files changed, 68 insertions(+), 8 deletions(-)

diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts
index c8ca8c1effb..34fd06b4010 100644
--- a/src/data/battler-tags.ts
+++ b/src/data/battler-tags.ts
@@ -2827,6 +2827,11 @@ export class PowerTrickTag extends BattlerTag {
   }
 }
 
+/**
+ * Tag associated with the move Grudge.
+ * If this tag is active when the bearer faints from an opponent's move, the tag reduces that move's PP to 0.
+ * Otherwise, it lapses when the bearer makes another move.
+ */
 export class GrudgeTag extends BattlerTag {
   constructor() {
     super(BattlerTagType.GRUDGE, [ BattlerTagLapseType.CUSTOM, BattlerTagLapseType.PRE_MOVE ], 1, Moves.GRUDGE);
@@ -2837,9 +2842,16 @@ export class GrudgeTag extends BattlerTag {
     pokemon.scene.queueMessage(i18next.t("battlerTags:grudgeOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
   }
 
+  /**
+   * Activates Grudge's special effect on the attacking Pokemon and lapses the tag.
+   * @param pokemon
+   * @param lapseType
+   * @param sourcePokemon {@linkcode Pokemon} the source of the move that fainted the tag's bearer
+   * @returns `false` if Grudge activates its effect or lapses
+   */
   override lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType, sourcePokemon?: Pokemon): boolean {
     if (lapseType === BattlerTagLapseType.CUSTOM && sourcePokemon) {
-      if (sourcePokemon.isActive()) {
+      if (sourcePokemon.isActive() && pokemon.getOpponents().includes(sourcePokemon)) {
         const lastMove = pokemon.turnData.attacksReceived[0];
         const lastMoveData = sourcePokemon.getMoveset().find(m => m?.moveId === lastMove.move);
         if (lastMoveData && lastMove.move !== Moves.STRUGGLE) {
diff --git a/src/test/moves/grudge.test.ts b/src/test/moves/grudge.test.ts
index cc124d7fb64..340808929ab 100644
--- a/src/test/moves/grudge.test.ts
+++ b/src/test/moves/grudge.test.ts
@@ -1,6 +1,7 @@
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
+import { BattlerIndex } from "#app/battle";
 import GameManager from "#test/utils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
@@ -22,21 +23,68 @@ describe("Moves - Grudge", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.SPLASH ])
+      .moveset([ Moves.EMBER, Moves.SPLASH ])
       .ability(Abilities.BALL_FETCH)
       .battleType("single")
       .disableCrits()
-      .enemySpecies(Species.MAGIKARP)
-      .enemyAbility(Abilities.BALL_FETCH)
-      .enemyMoveset(Moves.SPLASH);
+      .enemySpecies(Species.SHEDINJA)
+      .enemyAbility(Abilities.WONDER_GUARD)
+      .enemyMoveset([ Moves.GRUDGE, Moves.SPLASH ]);
   });
 
-  it("should do X", async () => {
+  it("should reduce the PP of the Pokemon's move to 0 when the user has fainted", async () => {
     await game.classicMode.startBattle([ Species.FEEBAS ]);
 
-    game.move.select(Moves.SPLASH);
+    const playerPokemon = game.scene.getPlayerPokemon();
+    game.move.select(Moves.EMBER);
+    await game.forceEnemyMove(Moves.GRUDGE);
+    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
     await game.phaseInterceptor.to("BerryPhase");
 
-    expect(true).toBe(true);
+    const playerMove = playerPokemon?.getMoveset().find(m => m?.moveId === Moves.EMBER);
+
+    expect(playerMove?.getPpRatio()).toBe(0);
+  });
+
+  it("should remain in effect until the user's next move", async () => {
+    await game.classicMode.startBattle([ Species.FEEBAS ]);
+
+    const playerPokemon = game.scene.getPlayerPokemon();
+    game.move.select(Moves.SPLASH);
+    await game.forceEnemyMove(Moves.GRUDGE);
+    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.toNextTurn();
+
+    game.move.select(Moves.EMBER);
+    await game.forceEnemyMove(Moves.SPLASH);
+    await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    const playerMove = playerPokemon?.getMoveset().find(m => m?.moveId === Moves.EMBER);
+
+    expect(playerMove?.getPpRatio()).toBe(0);
+  });
+
+  it("should not reduce the opponent's PP if the user dies to weather/indirect damage", async () => {
+    // Opponent will be reduced to 1 HP by False Swipe, then faint to Sandstorm
+    game.override
+      .moveset([ Moves.FALSE_SWIPE ])
+      .startingLevel(100)
+      .ability(Abilities.SAND_STREAM)
+      .enemySpecies(Species.RATTATA);
+    await game.classicMode.startBattle([ Species.GEODUDE ]);
+
+    const enemyPokemon = game.scene.getEnemyPokemon();
+    const playerPokemon = game.scene.getPlayerPokemon();
+
+    game.move.select(Moves.FALSE_SWIPE);
+    await game.forceEnemyMove(Moves.GRUDGE);
+    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
+    await game.phaseInterceptor.to("BerryPhase");
+
+    expect(enemyPokemon?.isFainted()).toBe(true);
+
+    const playerMove = playerPokemon?.getMoveset().find(m => m?.moveId === Moves.FALSE_SWIPE);
+    expect(playerMove?.getPpRatio()).toBeGreaterThan(0);
   });
 });