Reverted unneeded test file changes

This commit is contained in:
Bertie690 2025-08-03 19:31:56 -04:00
parent d2250dc5ee
commit 1da7637ab3
2 changed files with 86 additions and 121 deletions

View File

@ -47,7 +47,7 @@ describe("Abilities - Disguise", () => {
await game.phaseInterceptor.to("MoveEndPhase");
expect(mimikyu.hp).toBe(maxHp - disguiseDamage);
expect(mimikyu.hp).equals(maxHp - disguiseDamage);
expect(mimikyu.formIndex).toBe(bustedForm);
});
@ -79,12 +79,12 @@ describe("Abilities - Disguise", () => {
// First hit
await game.phaseInterceptor.to("MoveEffectPhase");
expect(mimikyu.hp).toBe(maxHp - disguiseDamage);
expect(mimikyu.hp).equals(maxHp - disguiseDamage);
expect(mimikyu.formIndex).toBe(disguisedForm);
// Second hit
await game.phaseInterceptor.to("MoveEffectPhase");
expect(mimikyu.hp).toBeLessThan(maxHp - disguiseDamage);
expect(mimikyu.hp).lessThan(maxHp - disguiseDamage);
expect(mimikyu.formIndex).toBe(bustedForm);
});
@ -118,7 +118,7 @@ describe("Abilities - Disguise", () => {
await game.phaseInterceptor.to("TurnEndPhase");
expect(mimikyu.formIndex).toBe(bustedForm);
expect(mimikyu.hp).toBe(maxHp - disguiseDamage);
expect(mimikyu.hp).equals(maxHp - disguiseDamage);
await game.toNextTurn();
game.doSwitchPokemon(1);

View File

@ -1,10 +1,10 @@
import { allMoves } from "#data/data-lists";
import { AbilityId } from "#enums/ability-id";
import { BattlerIndex } from "#enums/battler-index";
import { HitResult } from "#enums/hit-result";
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 { PokemonInstantReviveModifier } from "#modifiers/modifier";
import type { PokemonInstantReviveModifier } from "#modifiers/modifier";
import { GameManager } from "#test/test-utils/game-manager";
import Phaser from "phaser";
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
@ -26,146 +26,112 @@ describe("Items - Reviver Seed", () => {
beforeEach(() => {
game = new GameManager(phaserGame);
game.override
.moveset([MoveId.SPLASH, MoveId.TACKLE, MoveId.ENDURE])
.ability(AbilityId.BALL_FETCH)
.battleStyle("single")
.criticalHits(false)
.enemySpecies(SpeciesId.MAGIKARP)
.enemyAbility(AbilityId.NO_GUARD)
.enemyAbility(AbilityId.BALL_FETCH)
.startingHeldItems([{ name: "REVIVER_SEED" }])
.enemyHeldItems([{ name: "REVIVER_SEED" }])
.enemyMoveset(MoveId.SPLASH)
.startingLevel(100)
.enemyLevel(100); // makes hp tests more accurate due to rounding
});
it("should be consumed upon fainting to revive the holder, removing temporary effects and healing to 50% max HP", async () => {
await game.classicMode.startBattle([SpeciesId.MAGIKARP]);
const enemy = game.field.getEnemyPokemon();
enemy.hp = 1;
enemy.setStatStage(Stat.ATK, 6);
expect(enemy.getHeldItems()[0]).toBeInstanceOf(PokemonInstantReviveModifier);
game.move.use(MoveId.TACKLE);
await game.toEndOfTurn();
// Enemy ate seed, was revived and healed to half HP, clearing its attack boost at the same time.
expect(enemy).not.toHaveFainted();
expect(enemy.getHpRatio()).toBeCloseTo(0.5);
expect(enemy.getHeldItems()[0]).toBeUndefined();
expect(enemy).toHaveStatStage(Stat.ATK, 0);
expect(enemy.turnData.acted).toBe(true);
});
it("should nullify move effects on the killing blow and interrupt multi hits", async () => {
// Give player a 4 hit lumina crash that lowers spdef by 2 stages per hit
game.override.ability(AbilityId.PARENTAL_BOND).startingHeldItems([
{ name: "REVIVER_SEED", count: 1 },
{ name: "MULTI_LENS", count: 2 },
]);
await game.classicMode.startBattle([SpeciesId.MAGIKARP]);
// give enemy 3 hp, dying 3 hits into the move
const enemy = game.field.getEnemyPokemon();
enemy.hp = 3;
vi.spyOn(enemy, "getAttackDamage").mockReturnValue({ cancelled: false, damage: 1, result: HitResult.EFFECTIVE });
game.move.use(MoveId.LUMINA_CRASH);
await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
await game.phaseInterceptor.to("FaintPhase", false);
// killing hit effect got nullified due to fainting the target
expect(enemy).toHaveStatStage(Stat.SPDEF, 4);
expect(enemy.getAttackDamage).toHaveBeenCalledTimes(3);
await game.toEndOfTurn();
// Attack was cut short due to lack of targets, after which the enemy was revived and their stat stages reset
expect(enemy).not.toHaveFainted();
expect(enemy).toHaveStatStage(Stat.SPDEF, 0);
expect(enemy.getHpRatio()).toBeCloseTo(0.5);
expect(enemy.getHeldItems()[0]).toBeUndefined();
const player = game.field.getPlayerPokemon();
expect(player.turnData.hitsLeft).toBe(1);
.enemyMoveset(MoveId.SPLASH);
vi.spyOn(allMoves[MoveId.SHEER_COLD], "accuracy", "get").mockReturnValue(100);
vi.spyOn(allMoves[MoveId.LEECH_SEED], "accuracy", "get").mockReturnValue(100);
vi.spyOn(allMoves[MoveId.WHIRLPOOL], "accuracy", "get").mockReturnValue(100);
vi.spyOn(allMoves[MoveId.WILL_O_WISP], "accuracy", "get").mockReturnValue(100);
});
it.each([
{ moveType: "Physical Moves", move: MoveId.TACKLE },
{ moveType: "Special Moves", move: MoveId.WATER_GUN },
{ moveType: "Fixed Damage Moves", move: MoveId.SEISMIC_TOSS },
{ moveType: "Special Move", move: MoveId.WATER_GUN },
{ moveType: "Physical Move", move: MoveId.TACKLE },
{ moveType: "Fixed Damage Move", move: MoveId.SEISMIC_TOSS },
{ moveType: "Final Gambit", move: MoveId.FINAL_GAMBIT },
{ moveType: "Counter Moves", move: MoveId.COUNTER },
{ moveType: "OHKOs", move: MoveId.SHEER_COLD },
{ moveType: "Confusion Self-hits", move: MoveId.CONFUSE_RAY },
])("should activate from $moveType", async ({ move }) => {
game.override.confusionActivation(true);
{ moveType: "Counter", move: MoveId.COUNTER },
{ moveType: "OHKO", move: MoveId.SHEER_COLD },
])("should activate the holder's reviver seed from a $moveType", async ({ move }) => {
game.override.enemyLevel(100).startingLevel(1).enemyMoveset(move);
await game.classicMode.startBattle([SpeciesId.MAGIKARP, SpeciesId.FEEBAS]);
const player = game.field.getPlayerPokemon();
player.hp = 1;
const player = game.scene.getPlayerPokemon()!;
player.damageAndUpdate(player.hp - 1);
const reviverSeed = player.getHeldItems()[0] as PokemonInstantReviveModifier;
const seedSpy = vi.spyOn(reviverSeed, "apply");
vi.spyOn(reviverSeed, "apply");
game.move.use(MoveId.TACKLE);
await game.move.forceEnemyMove(move);
await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
await game.toEndOfTurn();
game.move.select(MoveId.TACKLE);
await game.phaseInterceptor.to("BerryPhase");
expect(player).not.toHaveFainted();
expect(seedSpy).toHaveBeenCalled();
expect(player.isFainted()).toBeFalsy();
});
// Damaging tests
it.each([
{ moveType: "Salt Cure", move: MoveId.SALT_CURE },
{ moveType: "Leech Seed", move: MoveId.LEECH_SEED },
{ moveType: "Partial Trapping Move", move: MoveId.WHIRLPOOL },
{ moveType: "Status Effect", move: MoveId.WILL_O_WISP },
{ moveType: "Weather", move: MoveId.SANDSTORM },
])("should not activate from $moveType damage", async ({ move }) => {
game.override.enemyMoveset(MoveId.ENDURE);
it("should activate the holder's reviver seed from confusion self-hit", async () => {
game.override.enemyLevel(1).startingLevel(100).enemyMoveset(MoveId.SPLASH);
await game.classicMode.startBattle([SpeciesId.MAGIKARP, SpeciesId.FEEBAS]);
const enemy = game.field.getEnemyPokemon();
enemy.hp = 2;
// Mock any direct attacks to deal 1 damage (ensuring Whirlpool/etc do not kill)
vi.spyOn(enemy, "getAttackDamage").mockReturnValueOnce({
cancelled: false,
damage: 1,
result: HitResult.EFFECTIVE,
});
const player = game.scene.getPlayerPokemon()!;
player.damageAndUpdate(player.hp - 1);
player.addTag(BattlerTagType.CONFUSED, 3);
game.move.use(move);
await game.toEndOfTurn();
const reviverSeed = player.getHeldItems()[0] as PokemonInstantReviveModifier;
vi.spyOn(reviverSeed, "apply");
expect(enemy).toHaveFainted();
vi.spyOn(player, "randBattleSeedInt").mockReturnValue(0); // Force confusion self-hit
game.move.select(MoveId.TACKLE);
await game.phaseInterceptor.to("BerryPhase");
expect(player.isFainted()).toBeFalsy();
});
// Damaging opponents tests
it.each([
{ moveType: "Damaging Move Chip Damage", move: MoveId.SALT_CURE },
{ moveType: "Chip Damage", move: MoveId.LEECH_SEED },
{ moveType: "Trapping Chip Damage", move: MoveId.WHIRLPOOL },
{ moveType: "Status Effect Damage", move: MoveId.WILL_O_WISP },
{ moveType: "Weather", move: MoveId.SANDSTORM },
])("should not activate the holder's reviver seed from $moveType", async ({ move }) => {
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.scene.getEnemyPokemon()!;
enemy.damageAndUpdate(enemy.hp - 1);
game.move.select(move);
await game.phaseInterceptor.to("TurnEndPhase");
expect(enemy.isFainted()).toBeTruthy();
});
// Self-damage tests
it.each([
{ moveType: "Recoil", move: MoveId.DOUBLE_EDGE },
{ moveType: "Sacrificial", move: MoveId.EXPLOSION },
{ moveType: "Ghost-type Curse", move: MoveId.CURSE },
{ moveType: "Self-KO", move: MoveId.EXPLOSION },
{ moveType: "Self-Deduction", move: MoveId.CURSE },
{ moveType: "Liquid Ooze", move: MoveId.GIGA_DRAIN },
])("should not activate from $moveType self-damage", async ({ move }) => {
game.override.enemyAbility(AbilityId.LIQUID_OOZE);
])("should not activate the holder's reviver seed from $moveType", async ({ move }) => {
game.override
.enemyLevel(100)
.startingLevel(1)
.enemySpecies(SpeciesId.MAGIKARP)
.moveset(move)
.enemyAbility(AbilityId.LIQUID_OOZE)
.enemyMoveset(MoveId.SPLASH);
await game.classicMode.startBattle([SpeciesId.GASTLY, SpeciesId.FEEBAS]);
const player = game.field.getPlayerPokemon();
player.hp = 1;
const player = game.scene.getPlayerPokemon()!;
player.damageAndUpdate(player.hp - 1);
const playerSeed = player.getHeldItems()[0] as PokemonInstantReviveModifier;
const seedSpy = vi.spyOn(playerSeed, "apply");
vi.spyOn(playerSeed, "apply");
game.move.use(move);
await game.toEndOfTurn();
game.move.select(move);
await game.phaseInterceptor.to("TurnEndPhase");
expect(player).toHaveFainted();
expect(seedSpy).not.toHaveBeenCalled();
expect(player.isFainted()).toBeTruthy();
});
it("should not activate from Destiny Bond fainting", async () => {
it("should not activate the holder's reviver seed from Destiny Bond fainting", async () => {
game.override
.enemyLevel(100)
.startingLevel(1)
@ -174,15 +140,14 @@ describe("Items - Reviver Seed", () => {
.startingHeldItems([]) // reset held items to nothing so user doesn't revive and not trigger Destiny Bond
.enemyMoveset(MoveId.TACKLE);
await game.classicMode.startBattle([SpeciesId.MAGIKARP, SpeciesId.FEEBAS]);
const player = game.scene.getPlayerPokemon()!;
player.damageAndUpdate(player.hp - 1);
const enemy = game.scene.getEnemyPokemon()!;
const player = game.field.getPlayerPokemon();
player.hp = 1;
const enemy = game.field.getEnemyPokemon();
game.move.use(MoveId.DESTINY_BOND);
game.move.select(MoveId.DESTINY_BOND);
await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
await game.toEndOfTurn();
await game.phaseInterceptor.to("TurnEndPhase");
expect(enemy).toHaveFainted();
expect(enemy.isFainted()).toBeTruthy();
});
});