From b0dd1ce9b4b1cc7c3b6f33bd917c962151bf62c3 Mon Sep 17 00:00:00 2001 From: innerthunder Date: Sun, 18 Aug 2024 20:35:17 -0700 Subject: [PATCH] Fix imports post-phase migration --- src/test/battlerTags/substitute.test.ts | 18 +++++++++--------- src/test/moves/substitute.test.ts | 9 ++++++--- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/test/battlerTags/substitute.test.ts b/src/test/battlerTags/substitute.test.ts index e53f739f0b4..83447319d2b 100644 --- a/src/test/battlerTags/substitute.test.ts +++ b/src/test/battlerTags/substitute.test.ts @@ -1,13 +1,13 @@ import { beforeEach, describe, expect, it, vi } from "vitest"; -import Pokemon, { MoveResult, PokemonTurnData, TurnMove, PokemonMove } from "#app/field/pokemon.js"; -import BattleScene from "#app/battle-scene.js"; -import { BattlerTagLapseType, SubstituteTag, TrappedTag } from "#app/data/battler-tags.js"; -import { BattlerTagType } from "#app/enums/battler-tag-type.js"; -import { Moves } from "#app/enums/moves.js"; -import { PokemonAnimType } from "#app/enums/pokemon-anim-type.js"; -import * as messages from "#app/messages.js"; -import { MoveEffectPhase } from "#app/phases.js"; -import { allMoves } from "#app/data/move.js"; +import Pokemon, { MoveResult, PokemonTurnData, TurnMove, PokemonMove } from "#app/field/pokemon"; +import BattleScene from "#app/battle-scene"; +import { BattlerTagLapseType, SubstituteTag, TrappedTag } from "#app/data/battler-tags"; +import { BattlerTagType } from "#app/enums/battler-tag-type"; +import { Moves } from "#app/enums/moves"; +import { PokemonAnimType } from "#app/enums/pokemon-anim-type"; +import * as messages from "#app/messages"; +import { allMoves } from "#app/data/move"; +import { MoveEffectPhase } from "#app/phases/move-effect-phase"; vi.mock("#app/battle-scene.js"); diff --git a/src/test/moves/substitute.test.ts b/src/test/moves/substitute.test.ts index 705bb950ef7..4dde94381d2 100644 --- a/src/test/moves/substitute.test.ts +++ b/src/test/moves/substitute.test.ts @@ -5,7 +5,6 @@ import { Species } from "#app/enums/species"; import { Abilities } from "#app/enums/abilities"; import { Moves } from "#app/enums/moves"; import { getMovePosition } from "../utils/gameManagerUtils"; -import { BerryPhase, CommandPhase, MoveEndPhase, MovePhase } from "#app/phases"; import { BattlerTagType } from "#app/enums/battler-tag-type"; import { BattleStat } from "#app/data/battle-stat"; import { allMoves, StealHeldItemChanceAttr } from "#app/data/move"; @@ -13,8 +12,12 @@ import { SubstituteTag, TrappedTag } from "#app/data/battler-tags"; import { StatusEffect } from "#app/data/status-effect"; import { BerryType } from "#app/enums/berry-type"; import { SPLASH_ONLY } from "../utils/testUtils"; -import { Mode } from "#app/ui/ui.js"; -import { Command } from "#app/ui/command-ui-handler.js"; +import { Mode } from "#app/ui/ui"; +import { Command } from "#app/ui/command-ui-handler"; +import { MoveEndPhase } from "#app/phases/move-end-phase"; +import { BerryPhase } from "#app/phases/berry-phase"; +import { CommandPhase } from "#app/phases/command-phase"; +import { MovePhase } from "#app/phases/move-phase"; const TIMEOUT = 20 * 1000; // 20 sec timeout