From a025e30200329850fee8185915a6f9927c114ceb Mon Sep 17 00:00:00 2001 From: Felix Staud Date: Thu, 25 Jul 2024 16:12:56 -0700 Subject: [PATCH] apply missing game.override.startingLevel --- src/test/abilities/hustle.test.ts | 4 ++-- src/test/items/leftovers.test.ts | 2 +- src/test/moves/stockpile.test.ts | 17 ++++++++--------- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/test/abilities/hustle.test.ts b/src/test/abilities/hustle.test.ts index a99415d6954..5a9bfe88be6 100644 --- a/src/test/abilities/hustle.test.ts +++ b/src/test/abilities/hustle.test.ts @@ -29,7 +29,7 @@ describe("Abilities - Hustle", () => { game = new GameManager(phaserGame); game.override.ability(Abilities.HUSTLE); game.override.moveset([Moves.TACKLE, Moves.GIGA_DRAIN, Moves.FISSURE]); - vi.spyOn(overrides, "STARTING_LEVEL_OVERRIDE", "get").mockReturnValue(5); + game.override.startingLevel(5); vi.spyOn(overrides, "NEVER_CRIT_OVERRIDE", "get").mockReturnValue(true); game.override.enemyLevel(5); game.override.enemyMoveset(SPLASH_ONLY); @@ -80,7 +80,7 @@ describe("Abilities - Hustle", () => { }); it("does not affect OHKO moves", async () => { - vi.spyOn(overrides, "STARTING_LEVEL_OVERRIDE", "get").mockReturnValue(100); + game.override.startingLevel(100); game.override.enemyLevel(30); await game.startBattle([Species.PIKACHU]); diff --git a/src/test/items/leftovers.test.ts b/src/test/items/leftovers.test.ts index aff1596ad9e..ad7cb6b07e6 100644 --- a/src/test/items/leftovers.test.ts +++ b/src/test/items/leftovers.test.ts @@ -26,7 +26,7 @@ describe("Items - Leftovers", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override.battleType("single"); - vi.spyOn(overrides, "STARTING_LEVEL_OVERRIDE", "get").mockReturnValue(2000); + game.override.startingLevel(2000); game.override.ability(Abilities.UNNERVE); game.override.moveset([Moves.SPLASH]); game.override.enemySpecies(Species.SHUCKLE); diff --git a/src/test/moves/stockpile.test.ts b/src/test/moves/stockpile.test.ts index 9157cf247be..81bd65ce582 100644 --- a/src/test/moves/stockpile.test.ts +++ b/src/test/moves/stockpile.test.ts @@ -1,15 +1,14 @@ -import {afterEach, beforeAll, beforeEach, describe, expect, it, vi} from "vitest"; -import Phaser from "phaser"; -import GameManager from "#app/test/utils/gameManager"; -import overrides from "#app/overrides"; -import { CommandPhase, TurnInitPhase } from "#app/phases"; -import { getMovePosition } from "#app/test/utils/gameManagerUtils"; import { BattleStat } from "#app/data/battle-stat"; +import { StockpilingTag } from "#app/data/battler-tags.js"; +import { MoveResult, TurnMove } from "#app/field/pokemon.js"; +import { CommandPhase, TurnInitPhase } from "#app/phases"; +import GameManager from "#app/test/utils/gameManager"; +import { getMovePosition } from "#app/test/utils/gameManagerUtils"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import { StockpilingTag } from "#app/data/battler-tags.js"; -import { MoveResult, TurnMove } from "#app/field/pokemon.js"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; import { SPLASH_ONLY } from "../utils/testUtils"; describe("Moves - Stockpile", () => { @@ -34,7 +33,7 @@ describe("Moves - Stockpile", () => { game.override.enemyMoveset(SPLASH_ONLY); game.override.enemyAbility(Abilities.NONE); - vi.spyOn(overrides, "STARTING_LEVEL_OVERRIDE", "get").mockReturnValue(2000); + game.override.startingLevel(2000); game.override.moveset([Moves.STOCKPILE, Moves.SPLASH]); game.override.ability(Abilities.NONE); });