From 901f6a6812d77e0ae0bfc5883f690dd62b47d047 Mon Sep 17 00:00:00 2001
From: Acelynn Zhang <102631387+acelynnzhang@users.noreply.github.com>
Date: Thu, 31 Jul 2025 16:18:11 -0400
Subject: [PATCH] [Bug] Fix Truant behavior (#6171)

---
 src/data/battler-tags.ts      |  2 +-
 test/abilities/truant.test.ts | 72 +++++++++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 test/abilities/truant.test.ts

diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts
index e21065c184f..f3cfe4e7d99 100644
--- a/src/data/battler-tags.ts
+++ b/src/data/battler-tags.ts
@@ -2038,7 +2038,7 @@ export class TruantTag extends AbilityBattlerTag {
 
     const lastMove = pokemon.getLastXMoves()[0];
 
-    if (!lastMove) {
+    if (!lastMove || lastMove.move === MoveId.NONE) {
       // Don't interrupt move if last move was `Moves.NONE` OR no prior move was found
       return true;
     }
diff --git a/test/abilities/truant.test.ts b/test/abilities/truant.test.ts
new file mode 100644
index 00000000000..0d71cd393b0
--- /dev/null
+++ b/test/abilities/truant.test.ts
@@ -0,0 +1,72 @@
+import { getPokemonNameWithAffix } from "#app/messages";
+import { AbilityId } from "#enums/ability-id";
+import { MoveId } from "#enums/move-id";
+import { MoveResult } from "#enums/move-result";
+import { SpeciesId } from "#enums/species-id";
+import { GameManager } from "#test/test-utils/game-manager";
+import i18next from "i18next";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
+
+describe("Ability - Truant", () => {
+  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
+      .battleStyle("single")
+      .criticalHits(false)
+      .moveset([MoveId.SPLASH, MoveId.TACKLE])
+      .ability(AbilityId.TRUANT)
+      .enemySpecies(SpeciesId.MAGIKARP)
+      .enemyAbility(AbilityId.BALL_FETCH)
+      .enemyMoveset(MoveId.SPLASH);
+  });
+
+  it("should loaf around and prevent using moves every other turn", async () => {
+    await game.classicMode.startBattle([SpeciesId.FEEBAS]);
+
+    const player = game.field.getPlayerPokemon();
+    const enemy = game.field.getEnemyPokemon();
+
+    // Turn 1: Splash succeeds
+    game.move.select(MoveId.SPLASH);
+    await game.toNextTurn();
+
+    expect(player.getLastXMoves(1)[0]).toEqual(
+      expect.objectContaining({ move: MoveId.SPLASH, result: MoveResult.SUCCESS }),
+    );
+
+    // Turn 2: Truant activates, cancelling tackle and displaying message
+    game.move.select(MoveId.TACKLE);
+    await game.toNextTurn();
+
+    expect(player.getLastXMoves(1)[0]).toEqual(expect.objectContaining({ move: MoveId.NONE, result: MoveResult.FAIL }));
+    expect(enemy.hp).toBe(enemy.getMaxHp());
+    expect(game.textInterceptor.logs).toContain(
+      i18next.t("battlerTags:truantLapse", {
+        pokemonNameWithAffix: getPokemonNameWithAffix(player),
+      }),
+    );
+
+    // Turn 3: Truant didn't activate, tackle worked
+    game.move.select(MoveId.TACKLE);
+    await game.toNextTurn();
+
+    expect(player.getLastXMoves(1)[0]).toEqual(
+      expect.objectContaining({ move: MoveId.TACKLE, result: MoveResult.SUCCESS }),
+    );
+    expect(enemy.hp).toBeLessThan(enemy.getMaxHp());
+  });
+});