From 6f3fa3137ac48ebebea8e13532c1327634645781 Mon Sep 17 00:00:00 2001 From: NightKev <34855794+DayKev@users.noreply.github.com> Date: Mon, 30 Jun 2025 06:19:15 -0700 Subject: [PATCH] Misc fixes --- scripts/create-test/create-test.js | 4 ++-- scripts/decrypt-save.js | 6 +++--- src/@types/modifier-types.ts | 5 ++--- src/data/abilities/ability.ts | 1 - src/modifier/init-modifier-pools.ts | 1 - src/modifier/modifier-pools.ts | 2 +- test/daily_mode.test.ts | 2 -- test/items/dire_hit.test.ts | 4 ++-- test/items/eviolite.test.ts | 4 ++-- test/items/exp_booster.test.ts | 4 ++-- test/items/grip_claw.test.ts | 4 ++-- test/items/leek.test.ts | 4 ++-- test/items/light_ball.test.ts | 4 ++-- test/items/lock_capsule.test.ts | 4 ++-- test/items/metal_powder.test.ts | 4 ++-- test/items/mystical_rock.test.ts | 4 ++-- test/items/quick_powder.test.ts | 4 ++-- test/items/scope_lens.test.ts | 4 ++-- test/items/temp_stat_stage_booster.test.ts | 4 ++-- test/items/thick_club.test.ts | 4 ++-- test/misc.test.ts | 1 - test/testUtils/helpers/overridesHelper.ts | 4 ++++ 22 files changed, 38 insertions(+), 40 deletions(-) diff --git a/scripts/create-test/create-test.js b/scripts/create-test/create-test.js index 133155bf14e..f24aac548fc 100644 --- a/scripts/create-test/create-test.js +++ b/scripts/create-test/create-test.js @@ -1,7 +1,7 @@ -/** +/* * This script creates a test boilerplate file in the appropriate * directory based on the type selected. - * @example pnpm test:create + * Usage: `pnpm test:create` */ import fs from "node:fs"; diff --git a/scripts/decrypt-save.js b/scripts/decrypt-save.js index e92f1d3750d..219cdb47bed 100644 --- a/scripts/decrypt-save.js +++ b/scripts/decrypt-save.js @@ -1,8 +1,8 @@ +// Usage: node decrypt-save.js [save-file] + // biome-ignore lint/performance/noNamespaceImport: This is how you import fs from node import * as fs from "node:fs"; -import pkg from "crypto-js"; - -const { AES, enc } = pkg; +import { AES, enc } from "crypto-js"; const SAVE_KEY = "x0i2O7WRiANTqPmZ"; diff --git a/src/@types/modifier-types.ts b/src/@types/modifier-types.ts index 89468e163d3..28b39d1a151 100644 --- a/src/@types/modifier-types.ts +++ b/src/@types/modifier-types.ts @@ -1,10 +1,9 @@ -/** - * Re-exports of all the types defined in the modifier module. - */ +// Intentionally re-exports `ModifierConstructorMap` from `modifier.ts` import type { Pokemon } from "#field/pokemon"; import type { ModifierConstructorMap } from "#modifiers/modifier"; import type { ModifierType, WeightedModifierType } from "#modifiers/modifier-type"; + export type ModifierTypeFunc = () => ModifierType; export type WeightedModifierTypeWeightFunc = (party: Pokemon[], rerollCount?: number) => number; diff --git a/src/data/abilities/ability.ts b/src/data/abilities/ability.ts index cadedbaafff..c57f6520d56 100644 --- a/src/data/abilities/ability.ts +++ b/src/data/abilities/ability.ts @@ -1,7 +1,6 @@ /* biome-ignore-start lint/correctness/noUnusedImports: tsdoc imports */ import type { BattleScene } from "#app/battle-scene"; import type { SpeciesFormChangeRevertWeatherFormTrigger } from "#data/form-change-triggers"; - /* biome-ignore-end lint/correctness/noUnusedImports: tsdoc imports */ import { applyAbAttrs } from "#abilities/apply-ab-attrs"; diff --git a/src/modifier/init-modifier-pools.ts b/src/modifier/init-modifier-pools.ts index 6732b22a591..316d4dae741 100644 --- a/src/modifier/init-modifier-pools.ts +++ b/src/modifier/init-modifier-pools.ts @@ -1,6 +1,5 @@ /* biome-ignore-start lint/correctness/noUnusedImports: tsdoc imports */ import type { initModifierTypes } from "#modifiers/modifier-type"; - /* biome-ignore-end lint/correctness/noUnusedImports: tsdoc imports */ import { timedEventManager } from "#app/global-event-manager"; diff --git a/src/modifier/modifier-pools.ts b/src/modifier/modifier-pools.ts index 2b730b4f179..d66511e3239 100644 --- a/src/modifier/modifier-pools.ts +++ b/src/modifier/modifier-pools.ts @@ -1,4 +1,4 @@ -/** +/* * Contains modifier pools for different contexts in the game. * Can be safely imported without worrying about circular dependencies. */ diff --git a/test/daily_mode.test.ts b/test/daily_mode.test.ts index 42caa668c94..0fa7c0dc846 100644 --- a/test/daily_mode.test.ts +++ b/test/daily_mode.test.ts @@ -8,8 +8,6 @@ import { GameManager } from "#test/testUtils/gameManager"; import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -//const TIMEOUT = 20 * 1000; - describe("Daily Mode", () => { let phaserGame: Phaser.Game; let game: GameManager; diff --git a/test/items/dire_hit.test.ts b/test/items/dire_hit.test.ts index f36f56dc475..9b68706c804 100644 --- a/test/items/dire_hit.test.ts +++ b/test/items/dire_hit.test.ts @@ -11,7 +11,7 @@ import { TurnEndPhase } from "#phases/turn-end-phase"; import { TurnInitPhase } from "#phases/turn-init-phase"; import { GameManager } from "#test/testUtils/gameManager"; import type { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; -import Phase from "phaser"; +import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; describe("Items - Dire Hit", () => { @@ -19,7 +19,7 @@ describe("Items - Dire Hit", () => { let game: GameManager; beforeAll(() => { - phaserGame = new Phase.Game({ + phaserGame = new Phaser.Game({ type: Phaser.HEADLESS, }); }); diff --git a/test/items/eviolite.test.ts b/test/items/eviolite.test.ts index f3bd45a3dc9..74aff03616c 100644 --- a/test/items/eviolite.test.ts +++ b/test/items/eviolite.test.ts @@ -3,14 +3,14 @@ import { Stat } from "#enums/stat"; import { StatBoosterModifier } from "#modifiers/modifier"; import { GameManager } from "#test/testUtils/gameManager"; import { NumberHolder, randItem } from "#utils/common"; -import Phase from "phaser"; +import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; describe("Items - Eviolite", () => { let phaserGame: Phaser.Game; let game: GameManager; beforeAll(() => { - phaserGame = new Phase.Game({ + phaserGame = new Phaser.Game({ type: Phaser.HEADLESS, }); }); diff --git a/test/items/exp_booster.test.ts b/test/items/exp_booster.test.ts index 14c50a3c187..6c8c16d08f4 100644 --- a/test/items/exp_booster.test.ts +++ b/test/items/exp_booster.test.ts @@ -2,7 +2,7 @@ import { AbilityId } from "#enums/ability-id"; import { PokemonExpBoosterModifier } from "#modifiers/modifier"; import { GameManager } from "#test/testUtils/gameManager"; import { NumberHolder } from "#utils/common"; -import Phase from "phaser"; +import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; describe("EXP Modifier Items", () => { @@ -10,7 +10,7 @@ describe("EXP Modifier Items", () => { let game: GameManager; beforeAll(() => { - phaserGame = new Phase.Game({ + phaserGame = new Phaser.Game({ type: Phaser.HEADLESS, }); }); diff --git a/test/items/grip_claw.test.ts b/test/items/grip_claw.test.ts index 4add1b1264e..6e25cdf6c08 100644 --- a/test/items/grip_claw.test.ts +++ b/test/items/grip_claw.test.ts @@ -6,7 +6,7 @@ import { SpeciesId } from "#enums/species-id"; import type { Pokemon } from "#field/pokemon"; import type { ContactHeldItemTransferChanceModifier } from "#modifiers/modifier"; import { GameManager } from "#test/testUtils/gameManager"; -import Phase from "phaser"; +import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; describe("Items - Grip Claw", () => { @@ -14,7 +14,7 @@ describe("Items - Grip Claw", () => { let game: GameManager; beforeAll(() => { - phaserGame = new Phase.Game({ + phaserGame = new Phaser.Game({ type: Phaser.HEADLESS, }); }); diff --git a/test/items/leek.test.ts b/test/items/leek.test.ts index 7bb865e6a04..7ee3dff23d6 100644 --- a/test/items/leek.test.ts +++ b/test/items/leek.test.ts @@ -3,7 +3,7 @@ import { SpeciesId } from "#enums/species-id"; import { TurnEndPhase } from "#phases/turn-end-phase"; import { GameManager } from "#test/testUtils/gameManager"; import { randInt } from "#utils/common"; -import Phase from "phaser"; +import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; describe("Items - Leek", () => { @@ -11,7 +11,7 @@ describe("Items - Leek", () => { let game: GameManager; beforeAll(() => { - phaserGame = new Phase.Game({ + phaserGame = new Phaser.Game({ type: Phaser.HEADLESS, }); }); diff --git a/test/items/light_ball.test.ts b/test/items/light_ball.test.ts index 97e202c5e7c..eebcc81c224 100644 --- a/test/items/light_ball.test.ts +++ b/test/items/light_ball.test.ts @@ -5,7 +5,7 @@ import { SpeciesStatBoosterModifier } from "#modifiers/modifier"; import i18next from "#plugins/i18n"; import { GameManager } from "#test/testUtils/gameManager"; import { NumberHolder } from "#utils/common"; -import Phase from "phaser"; +import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; describe("Items - Light Ball", () => { @@ -13,7 +13,7 @@ describe("Items - Light Ball", () => { let game: GameManager; beforeAll(() => { - phaserGame = new Phase.Game({ + phaserGame = new Phaser.Game({ type: Phaser.HEADLESS, }); }); diff --git a/test/items/lock_capsule.test.ts b/test/items/lock_capsule.test.ts index 468447a2f93..e98e6880eb1 100644 --- a/test/items/lock_capsule.test.ts +++ b/test/items/lock_capsule.test.ts @@ -4,7 +4,7 @@ import { MoveId } from "#enums/move-id"; import { UiMode } from "#enums/ui-mode"; import { SelectModifierPhase } from "#phases/select-modifier-phase"; import { GameManager } from "#test/testUtils/gameManager"; -import Phase from "phaser"; +import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; describe("Items - Lock Capsule", () => { @@ -12,7 +12,7 @@ describe("Items - Lock Capsule", () => { let game: GameManager; beforeAll(() => { - phaserGame = new Phase.Game({ + phaserGame = new Phaser.Game({ type: Phaser.HEADLESS, }); }); diff --git a/test/items/metal_powder.test.ts b/test/items/metal_powder.test.ts index ddcc3680008..17baa057fd5 100644 --- a/test/items/metal_powder.test.ts +++ b/test/items/metal_powder.test.ts @@ -5,7 +5,7 @@ import { SpeciesStatBoosterModifier } from "#modifiers/modifier"; import i18next from "#plugins/i18n"; import { GameManager } from "#test/testUtils/gameManager"; import { NumberHolder } from "#utils/common"; -import Phase from "phaser"; +import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; describe("Items - Metal Powder", () => { @@ -13,7 +13,7 @@ describe("Items - Metal Powder", () => { let game: GameManager; beforeAll(() => { - phaserGame = new Phase.Game({ + phaserGame = new Phaser.Game({ type: Phaser.HEADLESS, }); }); diff --git a/test/items/mystical_rock.test.ts b/test/items/mystical_rock.test.ts index 9775a044362..f1e9bb91ecf 100644 --- a/test/items/mystical_rock.test.ts +++ b/test/items/mystical_rock.test.ts @@ -3,7 +3,7 @@ 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 Phase from "phaser"; +import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; describe("Items - Mystical Rock", () => { @@ -11,7 +11,7 @@ describe("Items - Mystical Rock", () => { let game: GameManager; beforeAll(() => { - phaserGame = new Phase.Game({ + phaserGame = new Phaser.Game({ type: Phaser.HEADLESS, }); }); diff --git a/test/items/quick_powder.test.ts b/test/items/quick_powder.test.ts index e085bf0a927..6c8cb0751c3 100644 --- a/test/items/quick_powder.test.ts +++ b/test/items/quick_powder.test.ts @@ -5,7 +5,7 @@ import { SpeciesStatBoosterModifier } from "#modifiers/modifier"; import i18next from "#plugins/i18n"; import { GameManager } from "#test/testUtils/gameManager"; import { NumberHolder } from "#utils/common"; -import Phase from "phaser"; +import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; describe("Items - Quick Powder", () => { @@ -13,7 +13,7 @@ describe("Items - Quick Powder", () => { let game: GameManager; beforeAll(() => { - phaserGame = new Phase.Game({ + phaserGame = new Phaser.Game({ type: Phaser.HEADLESS, }); }); diff --git a/test/items/scope_lens.test.ts b/test/items/scope_lens.test.ts index 359cd8a96cb..866164629f8 100644 --- a/test/items/scope_lens.test.ts +++ b/test/items/scope_lens.test.ts @@ -2,7 +2,7 @@ import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { TurnEndPhase } from "#phases/turn-end-phase"; import { GameManager } from "#test/testUtils/gameManager"; -import Phase from "phaser"; +import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; describe("Items - Scope Lens", () => { @@ -10,7 +10,7 @@ describe("Items - Scope Lens", () => { let game: GameManager; beforeAll(() => { - phaserGame = new Phase.Game({ + phaserGame = new Phaser.Game({ type: Phaser.HEADLESS, }); }); diff --git a/test/items/temp_stat_stage_booster.test.ts b/test/items/temp_stat_stage_booster.test.ts index 03a5572044f..454a469700a 100644 --- a/test/items/temp_stat_stage_booster.test.ts +++ b/test/items/temp_stat_stage_booster.test.ts @@ -9,7 +9,7 @@ import { TempStatStageBoosterModifier } from "#modifiers/modifier"; import { TurnEndPhase } from "#phases/turn-end-phase"; import { GameManager } from "#test/testUtils/gameManager"; import type { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; -import Phase from "phaser"; +import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; describe("Items - Temporary Stat Stage Boosters", () => { @@ -17,7 +17,7 @@ describe("Items - Temporary Stat Stage Boosters", () => { let game: GameManager; beforeAll(() => { - phaserGame = new Phase.Game({ + phaserGame = new Phaser.Game({ type: Phaser.HEADLESS, }); }); diff --git a/test/items/thick_club.test.ts b/test/items/thick_club.test.ts index 70cae25264b..3a993d64a0c 100644 --- a/test/items/thick_club.test.ts +++ b/test/items/thick_club.test.ts @@ -5,7 +5,7 @@ import { SpeciesStatBoosterModifier } from "#modifiers/modifier"; import i18next from "#plugins/i18n"; import { GameManager } from "#test/testUtils/gameManager"; import { NumberHolder, randInt } from "#utils/common"; -import Phase from "phaser"; +import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; describe("Items - Thick Club", () => { @@ -13,7 +13,7 @@ describe("Items - Thick Club", () => { let game: GameManager; beforeAll(() => { - phaserGame = new Phase.Game({ + phaserGame = new Phaser.Game({ type: Phaser.HEADLESS, }); }); diff --git a/test/misc.test.ts b/test/misc.test.ts index a25cf7e93a6..5afd8f898c6 100644 --- a/test/misc.test.ts +++ b/test/misc.test.ts @@ -1,4 +1,3 @@ -// import { apiFetch } from "#app/utils"; import { GameManager } from "#test/testUtils/gameManager"; import { waitUntil } from "#test/testUtils/gameManagerUtils"; import Phaser from "phaser"; diff --git a/test/testUtils/helpers/overridesHelper.ts b/test/testUtils/helpers/overridesHelper.ts index 34ad8c3ddd8..e8074443e75 100644 --- a/test/testUtils/helpers/overridesHelper.ts +++ b/test/testUtils/helpers/overridesHelper.ts @@ -1,3 +1,7 @@ +/** biome-ignore-start lint/correctness/noUnusedImports: tsdoc imports */ +import type { NewArenaEvent } from "#app/events/battle-scene"; +/** biome-ignore-end lint/correctness/noUnusedImports: tsdoc imports */ + import type { BattleStyle, RandomTrainerOverride } from "#app/overrides"; import Overrides, { defaultOverrides } from "#app/overrides"; import { Weather } from "#data/weather";