Merge d6c9209c42 into 1ff2701964

src/data/moves/move.ts

@@ -4090,30 +4090,6 @@ export class OpponentHighHpPowerAttr extends VariablePowerAttr {
   }
 }
 
-/**
- * Attribute to double this move's power if the target hasn't acted yet in the current turn.
- * Used by {@linkcode Moves.BOLT_BEAK} and {@linkcode Moves.FISHIOUS_REND}
- */
-export class FirstAttackDoublePowerAttr extends VariablePowerAttr {
-  /**
-   * Double this move's power if the user is acting before the target.
-   * @param user - Unused
-   * @param target - The {@linkcode Pokemon} being targeted by this move
-   * @param move - Unused
-   * @param args `[0]` - A {@linkcode NumberHolder} containing move base power
-   * @returns Whether the attribute was successfully applied
-   */
-  apply(_user: Pokemon, target: Pokemon, move: Move, args: [NumberHolder]): boolean {
-    if (target.turnData.acted) {
-      return false;
-    }
-
-    args[0].value *= 2;
-    return true;
-  }
-}
-
-
 export class TurnDamagedDoublePowerAttr extends VariablePowerAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     if (user.turnData.attacksReceived.find(r => r.damage && r.sourceId === target.id)) {
@@ -8293,7 +8269,6 @@ const MoveAttrs = Object.freeze({
   CompareWeightPowerAttr,
   HpPowerAttr,
   OpponentHighHpPowerAttr,
-  FirstAttackDoublePowerAttr,
   TurnDamagedDoublePowerAttr,
   MagnitudePowerAttr,
   AntiSunlightPowerDecreaseAttr,
@@ -9596,7 +9571,8 @@ export function initMoves() {
     new AttackMove(MoveId.CLOSE_COMBAT, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 120, 100, 5, -1, 0, 4)
       .attr(StatStageChangeAttr, [ Stat.DEF, Stat.SPDEF ], -1, true),
     new AttackMove(MoveId.PAYBACK, PokemonType.DARK, MoveCategory.PHYSICAL, 50, 100, 10, -1, 0, 4)
-      .attr(MovePowerMultiplierAttr, (user, target, move) => target.getLastXMoves(1).find(m => m.turn === globalScene.currentBattle.turn) || globalScene.currentBattle.turnCommands[target.getBattlerIndex()]?.command === Command.BALL ? 2 : 1),
+      // Payback boosts power on enemy item use
+      .attr(MovePowerMultiplierAttr, (_user, target) => target.turnData.acted || globalScene.currentBattle.turnCommands[target.getBattlerIndex()]?.command === Command.BALL ? 2 : 1),
     new AttackMove(MoveId.ASSURANCE, PokemonType.DARK, MoveCategory.PHYSICAL, 60, 100, 10, -1, 0, 4)
       .attr(MovePowerMultiplierAttr, (user, target, move) => target.turnData.damageTaken > 0 ? 2 : 1),
     new StatusMove(MoveId.EMBARGO, PokemonType.DARK, 100, 15, -1, 0, 4)
@@ -10808,9 +10784,9 @@ export function initMoves() {
       .condition(failIfGhostTypeCondition)
       .attr(AddBattlerTagAttr, BattlerTagType.OCTOLOCK, false, true, 1),
     new AttackMove(MoveId.BOLT_BEAK, PokemonType.ELECTRIC, MoveCategory.PHYSICAL, 85, 100, 10, -1, 0, 8)
-      .attr(FirstAttackDoublePowerAttr),
+      .attr(MovePowerMultiplierAttr, (_user, target) => target.turnData.acted ? 1 : 2),
     new AttackMove(MoveId.FISHIOUS_REND, PokemonType.WATER, MoveCategory.PHYSICAL, 85, 100, 10, -1, 0, 8)
-      .attr(FirstAttackDoublePowerAttr)
+      .attr(MovePowerMultiplierAttr, (_user, target) => target.turnData.acted ? 1 : 2)
       .bitingMove(),
     new StatusMove(MoveId.COURT_CHANGE, PokemonType.NORMAL, 100, 10, -1, 0, 8)
       .attr(SwapArenaTagsAttr, [ ArenaTagType.AURORA_VEIL, ArenaTagType.LIGHT_SCREEN, ArenaTagType.MIST, ArenaTagType.REFLECT, ArenaTagType.SPIKES, ArenaTagType.STEALTH_ROCK, ArenaTagType.STICKY_WEB, ArenaTagType.TAILWIND, ArenaTagType.TOXIC_SPIKES ]),

test/abilities/guard-dog.test.ts

@@ -0,0 +1,39 @@
+import { AbilityId } from "#enums/ability-id";
+import { SpeciesId } from "#enums/species-id";
+import { Stat } from "#enums/stat";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("Ability - Guard Dog", () => {
+  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(AbilityId.GUARD_DOG)
+      .battleStyle("single")
+      .enemySpecies(SpeciesId.MAGIKARP)
+      .enemyAbility(AbilityId.INTIMIDATE);
+  });
+
+  it("should raise attack by 1 stage when Intimidated instead of being lowered", async () => {
+    await game.classicMode.startBattle([SpeciesId.MABOSSTIFF]);
+
+    const mabostiff = game.field.getPlayerPokemon();
+    expect(mabostiff.getStatStage(Stat.ATK)).toBe(1);
+    expect(mabostiff.waveData.abilitiesApplied.has(AbilityId.GUARD_DOG)).toBe(true);
+    expect(game.phaseInterceptor.log.filter(l => l === "StatStageChangePhase")).toHaveLength(1);
+  });
+});

test/abilities/intimidate.test.ts

@@ -1,12 +1,11 @@
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import Phaser from "phaser";
 import GameManager from "#test/testUtils/gameManager";
-import { UiMode } from "#enums/ui-mode";
 import { Stat } from "#enums/stat";
-import { getMovePosition } from "#test/testUtils/gameManagerUtils";
 import { AbilityId } from "#enums/ability-id";
 import { MoveId } from "#enums/move-id";
 import { SpeciesId } from "#enums/species-id";
+import { BattleType } from "#enums/battle-type";
 
 describe("Abilities - Intimidate", () => {
   let phaserGame: Phaser.Game;
@@ -28,106 +27,65 @@ describe("Abilities - Intimidate", () => {
       .battleStyle("single")
       .enemySpecies(SpeciesId.RATTATA)
       .enemyAbility(AbilityId.INTIMIDATE)
-      .enemyPassiveAbility(AbilityId.HYDRATION)
       .ability(AbilityId.INTIMIDATE)
-      .startingWave(3)
+      .moveset(MoveId.SPLASH)
       .enemyMoveset(MoveId.SPLASH);
   });
 
-  it("should lower ATK stat stage by 1 of enemy Pokemon on entry and player switch", async () => {
-    await game.classicMode.runToSummon([SpeciesId.MIGHTYENA, SpeciesId.POOCHYENA]);
-    game.onNextPrompt(
-      "CheckSwitchPhase",
-      UiMode.CONFIRM,
-      () => {
-        game.setMode(UiMode.MESSAGE);
-        game.endPhase();
-      },
-      () => game.isCurrentPhase("CommandPhase") || game.isCurrentPhase("TurnInitPhase"),
-    );
-    await game.phaseInterceptor.to("CommandPhase", false);
+  it("should lower all opponents' ATK by 1 stage on entry and switch", async () => {
+    await game.classicMode.startBattle([SpeciesId.MIGHTYENA, SpeciesId.POOCHYENA]);
 
-    let playerPokemon = game.scene.getPlayerPokemon()!;
-    const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-    expect(playerPokemon.species.speciesId).toBe(SpeciesId.MIGHTYENA);
-    expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(-1);
-    expect(playerPokemon.getStatStage(Stat.ATK)).toBe(-1);
+    const enemy = game.field.getEnemyPokemon();
+    expect(enemy.getStatStage(Stat.ATK)).toBe(-1);
 
     game.doSwitchPokemon(1);
-    await game.phaseInterceptor.run("CommandPhase");
-    await game.phaseInterceptor.to("CommandPhase");
+    await game.toNextTurn();
 
-    playerPokemon = game.scene.getPlayerPokemon()!;
-    expect(playerPokemon.species.speciesId).toBe(SpeciesId.POOCHYENA);
-    expect(playerPokemon.getStatStage(Stat.ATK)).toBe(0);
-    expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(-2);
+    expect(enemy.getStatStage(Stat.ATK)).toBe(-2);
   });
 
-  it("should lower ATK stat stage by 1 for every enemy Pokemon in a double battle on entry", async () => {
-    game.override.battleStyle("double").startingWave(3);
-    await game.classicMode.runToSummon([SpeciesId.MIGHTYENA, SpeciesId.POOCHYENA]);
-    game.onNextPrompt(
-      "CheckSwitchPhase",
-      UiMode.CONFIRM,
-      () => {
-        game.setMode(UiMode.MESSAGE);
-        game.endPhase();
-      },
-      () => game.isCurrentPhase("CommandPhase") || game.isCurrentPhase("TurnInitPhase"),
-    );
-    await game.phaseInterceptor.to("CommandPhase", false);
+  it("should lower ATK of all opponents in a double battle", async () => {
+    game.override.battleStyle("double");
+    await game.classicMode.startBattle([SpeciesId.MIGHTYENA]);
 
-    const playerField = game.scene.getPlayerField()!;
-    const enemyField = game.scene.getEnemyField()!;
+    const [enemy1, enemy2] = game.scene.getEnemyField();
 
-    expect(enemyField[0].getStatStage(Stat.ATK)).toBe(-2);
-    expect(enemyField[1].getStatStage(Stat.ATK)).toBe(-2);
-    expect(playerField[0].getStatStage(Stat.ATK)).toBe(-2);
-    expect(playerField[1].getStatStage(Stat.ATK)).toBe(-2);
+    expect(enemy1.getStatStage(Stat.ATK)).toBe(-1);
+    expect(enemy2.getStatStage(Stat.ATK)).toBe(-1);
   });
 
-  it("should not activate again if there is no switch or new entry", async () => {
-    game.override.startingWave(2).moveset([MoveId.SPLASH]);
-    await game.classicMode.startBattle([SpeciesId.MIGHTYENA, SpeciesId.POOCHYENA]);
+  it("should not trigger on switching moves used by wild Pokemon", async () => {
+    game.override.enemyMoveset(MoveId.VOLT_SWITCH).battleType(BattleType.WILD);
+    await game.classicMode.startBattle([SpeciesId.MIGHTYENA]);
 
-    const playerPokemon = game.scene.getPlayerPokemon()!;
-    const enemyPokemon = game.scene.getEnemyPokemon()!;
-
-    expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(-1);
-    expect(playerPokemon.getStatStage(Stat.ATK)).toBe(-1);
+    const player = game.field.getPlayerPokemon();
+    expect(player.getStatStage(Stat.ATK)).toBe(-1);
 
     game.move.select(MoveId.SPLASH);
     await game.toNextTurn();
 
-    expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(-1);
-    expect(playerPokemon.getStatStage(Stat.ATK)).toBe(-1);
+    // doesn't lower attack due to not actually switching out
+    expect(player.getStatStage(Stat.ATK)).toBe(-1);
   });
 
-  it("should lower ATK stat stage by 1 for every switch", async () => {
-    game.override.moveset([MoveId.SPLASH]).enemyMoveset([MoveId.VOLT_SWITCH]).startingWave(5);
-    await game.classicMode.startBattle([SpeciesId.MIGHTYENA, SpeciesId.POOCHYENA]);
+  it("should trigger on moves that switch user/target out during trainer battles", async () => {
+    game.override.battleType(BattleType.TRAINER).passiveAbility(AbilityId.NO_GUARD);
 
-    const playerPokemon = game.scene.getPlayerPokemon()!;
-    let enemyPokemon = game.scene.getEnemyPokemon()!;
+    await game.classicMode.startBattle([SpeciesId.MIGHTYENA]);
 
-    expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(-1);
-    expect(playerPokemon.getStatStage(Stat.ATK)).toBe(-1);
+    const player = game.field.getPlayerPokemon();
+    expect(player.getStatStage(Stat.ATK)).toBe(-1);
 
-    game.move.select(getMovePosition(game.scene, 0, MoveId.SPLASH));
+    game.move.use(MoveId.SPLASH);
+    await game.move.forceEnemyMove(MoveId.TELEPORT);
     await game.toNextTurn();
 
-    enemyPokemon = game.scene.getEnemyPokemon()!;
+    expect(player.getStatStage(Stat.ATK)).toBe(-2);
 
-    expect(playerPokemon.getStatStage(Stat.ATK)).toBe(-2);
-    expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(0);
-
-    game.move.select(MoveId.SPLASH);
+    game.move.use(MoveId.DRAGON_TAIL);
+    await game.move.forceEnemyMove(MoveId.SPLASH);
     await game.toNextTurn();
 
-    enemyPokemon = game.scene.getEnemyPokemon()!;
-
-    expect(playerPokemon.getStatStage(Stat.ATK)).toBe(-3);
-    expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(0);
+    expect(player.getStatStage(Stat.ATK)).toBe(-3);
   });
 });

test/moves/ability-ignore-moves.test.ts

@@ -0,0 +1,109 @@
+import { BattlerIndex } from "#enums/battler-index";
+import { RandomMoveAttr } from "#app/data/moves/move";
+import { AbilityId } from "#enums/ability-id";
+import { MoveId } from "#enums/move-id";
+import { SpeciesId } from "#enums/species-id";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+
+describe("Moves - Ability-Ignoring Moves", () => {
+  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
+      .moveset([MoveId.MOONGEIST_BEAM, MoveId.SUNSTEEL_STRIKE, MoveId.PHOTON_GEYSER, MoveId.METRONOME])
+      .ability(AbilityId.BALL_FETCH)
+      .startingLevel(200)
+      .battleStyle("single")
+      .criticalHits(false)
+      .enemySpecies(SpeciesId.MAGIKARP)
+      .enemyAbility(AbilityId.STURDY)
+      .enemyMoveset(MoveId.SPLASH);
+  });
+
+  it.each<{ name: string; move: MoveId }>([
+    { name: "Sunsteel Strike", move: MoveId.SUNSTEEL_STRIKE },
+    { name: "Moongeist Beam", move: MoveId.MOONGEIST_BEAM },
+    { name: "Photon Geyser", move: MoveId.PHOTON_GEYSER },
+  ])("$name should ignore enemy abilities during move use", async ({ move }) => {
+    await game.classicMode.startBattle([SpeciesId.NECROZMA]);
+
+    const player = game.field.getPlayerPokemon();
+    const enemy = game.field.getEnemyPokemon();
+
+    game.move.select(move);
+    await game.phaseInterceptor.to("MoveEffectPhase");
+
+    expect(game.scene.arena.ignoreAbilities).toBe(true);
+    expect(game.scene.arena.ignoringEffectSource).toBe(player.getBattlerIndex());
+
+    await game.toEndOfTurn();
+    expect(game.scene.arena.ignoreAbilities).toBe(false);
+    expect(enemy.isFainted()).toBe(true);
+  });
+
+  it("should not ignore enemy abilities when called by metronome", async () => {
+    await game.classicMode.startBattle([SpeciesId.MILOTIC]);
+    vi.spyOn(RandomMoveAttr.prototype, "getMoveOverride").mockReturnValue(MoveId.PHOTON_GEYSER);
+
+    const enemy = game.field.getEnemyPokemon();
+    game.move.select(MoveId.METRONOME);
+    await game.toEndOfTurn();
+
+    expect(enemy.isFainted()).toBe(false);
+    expect(game.field.getPlayerPokemon().getLastXMoves()[0].move).toBe(MoveId.PHOTON_GEYSER);
+  });
+
+  it("should not ignore enemy abilities when called by Mirror Move", async () => {
+    game.override.moveset(MoveId.MIRROR_MOVE).enemyMoveset(MoveId.SUNSTEEL_STRIKE);
+
+    await game.classicMode.startBattle([SpeciesId.MILOTIC]);
+
+    const enemy = game.field.getEnemyPokemon();
+    game.move.select(MoveId.MIRROR_MOVE);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    await game.toEndOfTurn();
+
+    expect(enemy.isFainted()).toBe(false);
+    expect(game.scene.getPlayerPokemon()?.getLastXMoves()[0].move).toBe(MoveId.SUNSTEEL_STRIKE);
+  });
+
+  // TODO: Verify this behavior on cart
+  it("should ignore enemy abilities when called by Instruct", async () => {
+    game.override.moveset([MoveId.SUNSTEEL_STRIKE, MoveId.INSTRUCT]).battleStyle("double");
+    await game.classicMode.startBattle([SpeciesId.SOLGALEO, SpeciesId.LUNALA]);
+
+    const solgaleo = game.field.getPlayerPokemon();
+
+    game.move.select(MoveId.SUNSTEEL_STRIKE, BattlerIndex.PLAYER, BattlerIndex.ENEMY);
+    game.move.select(MoveId.INSTRUCT, BattlerIndex.PLAYER_2, BattlerIndex.PLAYER);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
+
+    await game.phaseInterceptor.to("MoveEffectPhase"); // initial attack
+    await game.phaseInterceptor.to("MoveEffectPhase"); // instruct
+    await game.phaseInterceptor.to("MoveEffectPhase"); // instructed move use
+
+    expect(game.scene.arena.ignoreAbilities).toBe(true);
+    expect(game.scene.arena.ignoringEffectSource).toBe(solgaleo.getBattlerIndex());
+
+    await game.toEndOfTurn();
+
+    // Both the initial and redirected instruct use ignored sturdy
+    const [enemy1, enemy2] = game.scene.getEnemyField();
+    expect(enemy1.isFainted()).toBe(true);
+    expect(enemy2.isFainted()).toBe(true);
+  });
+});

test/moves/first-attack-double-power.test.ts

@@ -0,0 +1,122 @@
+import { BattlerIndex } from "#enums/battler-index";
+import { allMoves } from "#app/data/data-lists";
+import { AbilityId } from "#enums/ability-id";
+import { BattleType } from "#enums/battle-type";
+import { MoveId } from "#enums/move-id";
+import { SpeciesId } from "#enums/species-id";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi, type MockInstance } from "vitest";
+import { MoveUseMode } from "#enums/move-use-mode";
+
+describe("Moves - Fishious Rend & Bolt Beak", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+  let powerSpy: MockInstance;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .ability(AbilityId.BALL_FETCH)
+      .battleStyle("single")
+      .battleType(BattleType.TRAINER)
+      .criticalHits(false)
+      .enemyLevel(100)
+      .enemySpecies(SpeciesId.DRACOVISH)
+      .enemyAbility(AbilityId.BALL_FETCH)
+      .enemyMoveset(MoveId.SPLASH);
+
+    powerSpy = vi.spyOn(allMoves[MoveId.BOLT_BEAK], "calculateBattlePower");
+  });
+
+  it.each<{ name: string; move: MoveId }>([
+    { name: "Bolt Beak", move: MoveId.BOLT_BEAK },
+    { name: "Fishious Rend", move: MoveId.FISHIOUS_REND },
+  ])("$name should double power if the user moves before the target", async ({ move }) => {
+    powerSpy = vi.spyOn(allMoves[move], "calculateBattlePower");
+    await game.classicMode.startBattle([SpeciesId.FEEBAS]);
+
+    // turn 1: enemy, then player (no boost)
+    game.move.use(move);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    await game.toNextTurn();
+
+    expect(powerSpy).toHaveLastReturnedWith(allMoves[move].power);
+
+    // turn 2: player, then enemy (boost)
+    game.move.use(move);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.toEndOfTurn();
+
+    expect(powerSpy).toHaveLastReturnedWith(allMoves[move].power * 2);
+  });
+
+  it("should only consider the selected target in Double Battles", async () => {
+    game.override.battleStyle("double");
+    await game.classicMode.startBattle([SpeciesId.FEEBAS, SpeciesId.MILOTIC]);
+
+    // Use move after everyone but P1 and enemy 1 have already moved
+    game.move.use(MoveId.BOLT_BEAK, BattlerIndex.PLAYER, BattlerIndex.ENEMY);
+    game.move.use(MoveId.SPLASH, BattlerIndex.PLAYER_2);
+    await game.setTurnOrder([BattlerIndex.PLAYER_2, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.toEndOfTurn();
+
+    expect(powerSpy).toHaveLastReturnedWith(allMoves[MoveId.BOLT_BEAK].power * 2);
+  });
+
+  it("should double power on the turn the target switches in", async () => {
+    await game.classicMode.startBattle([SpeciesId.FEEBAS]);
+
+    game.move.select(MoveId.BOLT_BEAK);
+    game.forceEnemyToSwitch();
+    await game.toEndOfTurn();
+
+    expect(powerSpy).toHaveLastReturnedWith(allMoves[MoveId.BOLT_BEAK].power * 2);
+  });
+
+  it("should double power on forced switch-induced sendouts", async () => {
+    await game.classicMode.startBattle([SpeciesId.FEEBAS]);
+
+    game.move.select(MoveId.BOLT_BEAK);
+    await game.move.forceEnemyMove(MoveId.U_TURN);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    await game.toEndOfTurn();
+
+    expect(powerSpy).toHaveLastReturnedWith(allMoves[MoveId.BOLT_BEAK].power * 2);
+  });
+
+  it.each<{ type: string; allyMove: MoveId }>([
+    { type: "a Dancer-induced", allyMove: MoveId.FIERY_DANCE },
+    { type: "an Instructed", allyMove: MoveId.INSTRUCT },
+  ])("should double power if $type move is used as the target's first action that turn", async ({ allyMove }) => {
+    game.override.battleStyle("double").enemyAbility(AbilityId.DANCER);
+    powerSpy = vi.spyOn(allMoves[MoveId.FISHIOUS_REND], "calculateBattlePower");
+    await game.classicMode.startBattle([SpeciesId.DRACOVISH, SpeciesId.ARCTOZOLT]);
+
+    // Simulate enemy having used splash last turn to allow Instruct to copy it
+    const enemy = game.field.getEnemyPokemon();
+    enemy.pushMoveHistory({
+      move: MoveId.SPLASH,
+      targets: [BattlerIndex.ENEMY],
+      turn: game.scene.currentBattle.turn - 1,
+      useMode: MoveUseMode.NORMAL,
+    });
+
+    game.move.use(MoveId.FISHIOUS_REND, BattlerIndex.PLAYER, BattlerIndex.ENEMY);
+    game.move.use(allyMove, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY);
+    await game.setTurnOrder([BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
+    await game.toEndOfTurn();
+
+    expect(powerSpy).toHaveLastReturnedWith(allMoves[MoveId.FISHIOUS_REND].power);
+  });
+});

test/moves/moongeist_beam.test.ts

@@ -1,61 +0,0 @@
-import { allMoves } from "#app/data/data-lists";
-import { AbilityId } from "#enums/ability-id";
-import { MoveId } from "#enums/move-id";
-import { SpeciesId } from "#enums/species-id";
-import GameManager from "#test/testUtils/gameManager";
-import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-
-describe("Moves - Moongeist Beam", () => {
-  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
-      .moveset([MoveId.MOONGEIST_BEAM, MoveId.METRONOME])
-      .ability(AbilityId.BALL_FETCH)
-      .startingLevel(200)
-      .battleStyle("single")
-      .criticalHits(false)
-      .enemySpecies(SpeciesId.MAGIKARP)
-      .enemyAbility(AbilityId.STURDY)
-      .enemyMoveset(MoveId.SPLASH);
-  });
-
-  // Also covers Photon Geyser and Sunsteel Strike
-  it("should ignore enemy abilities", async () => {
-    await game.classicMode.startBattle([SpeciesId.MILOTIC]);
-
-    const enemy = game.scene.getEnemyPokemon()!;
-
-    game.move.select(MoveId.MOONGEIST_BEAM);
-    await game.phaseInterceptor.to("BerryPhase");
-
-    expect(enemy.isFainted()).toBe(true);
-  });
-
-  // Also covers Photon Geyser and Sunsteel Strike
-  it("should not ignore enemy abilities when called by another move, such as metronome", async () => {
-    await game.classicMode.startBattle([SpeciesId.MILOTIC]);
-    vi.spyOn(allMoves[MoveId.METRONOME].getAttrs("RandomMoveAttr")[0], "getMoveOverride").mockReturnValue(
-      MoveId.MOONGEIST_BEAM,
-    );
-
-    game.move.select(MoveId.METRONOME);
-    await game.phaseInterceptor.to("BerryPhase");
-
-    expect(game.scene.getEnemyPokemon()!.isFainted()).toBe(false);
-    expect(game.scene.getPlayerPokemon()!.getLastXMoves()[0].move).toBe(MoveId.MOONGEIST_BEAM);
-  });
-});

test/moves/payback.test.ts

@@ -0,0 +1,68 @@
+import { allMoves, allSpecies } from "#app/data/data-lists";
+import { AbilityId } from "#enums/ability-id";
+import { BattlerIndex } from "#enums/battler-index";
+import { MoveId } from "#enums/move-id";
+import { SpeciesId } from "#enums/species-id";
+import GameManager from "#test/testUtils/gameManager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi, type MockInstance } from "vitest";
+
+describe("Move - Payback", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+  let powerSpy: MockInstance;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .ability(AbilityId.BALL_FETCH)
+      .battleStyle("single")
+      .criticalHits(false)
+      .enemyLevel(100)
+      .enemySpecies(SpeciesId.DRACOVISH)
+      .enemyAbility(AbilityId.BALL_FETCH)
+      .enemyMoveset(MoveId.SPLASH);
+
+    powerSpy = vi.spyOn(allMoves[MoveId.PAYBACK], "calculateBattlePower");
+  });
+
+  it("should double power if the user moves after the target", async () => {
+    await game.classicMode.startBattle([SpeciesId.FEEBAS]);
+
+    // turn 1: enemy, then player (boost)
+    game.move.use(MoveId.PAYBACK);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
+    await game.toNextTurn();
+
+    expect(powerSpy).toHaveLastReturnedWith(allMoves[MoveId.PAYBACK].power * 2);
+
+    // turn 2: player, then enemy (no boost)
+    game.move.use(MoveId.PAYBACK);
+    await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
+    await game.toEndOfTurn();
+
+    expect(powerSpy).toHaveLastReturnedWith(allMoves[MoveId.PAYBACK].power);
+  });
+
+  it("should trigger for enemies on player failed ball catch", async () => {
+    // Make dracovish uncatchable so we don't flake out
+    vi.spyOn(allSpecies[SpeciesId.DRACOVISH], "catchRate", "get").mockReturnValue(0);
+    await game.classicMode.startBattle([SpeciesId.FEEBAS]);
+
+    game.doThrowPokeball(0);
+    await game.move.forceEnemyMove(MoveId.PAYBACK);
+    await game.toEndOfTurn();
+
+    expect(powerSpy).toHaveLastReturnedWith(allMoves[MoveId.PAYBACK].power * 2);
+  });
+});