diff --git a/biome.jsonc b/biome.jsonc index ff541f4dcc2..ed5db201824 100644 --- a/biome.jsonc +++ b/biome.jsonc @@ -38,14 +38,13 @@ ] }, - // TODO: Configure and enable import sorting "assist": { "actions": { "source": { "organizeImports": { - "level": "off", + "level": "on", "options": { - "groups": [] + "groups": [":ALIAS:", ":NODE:", ":PACKAGE_WITH_PROTOCOL:", ":PACKAGE:", ":PATH:"] } } } diff --git a/scripts/create-test/create-test.js b/scripts/create-test/create-test.js index 3c667049658..f24aac548fc 100644 --- a/scripts/create-test/create-test.js +++ b/scripts/create-test/create-test.js @@ -1,14 +1,14 @@ -/** +/* * 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 chalk from "chalk"; -import inquirer from "inquirer"; import fs from "node:fs"; import path from "node:path"; import { fileURLToPath } from "node:url"; +import chalk from "chalk"; +import inquirer from "inquirer"; //#region Constants diff --git a/scripts/create-test/test-boilerplate.ts b/scripts/create-test/test-boilerplate.ts index 1fbd3c8040a..759f3afaec0 100644 --- a/scripts/create-test/test-boilerplate.ts +++ b/scripts/create-test/test-boilerplate.ts @@ -1,7 +1,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 { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/scripts/decrypt-save.js b/scripts/decrypt-save.js index a7239a40df6..219cdb47bed 100644 --- a/scripts/decrypt-save.js +++ b/scripts/decrypt-save.js @@ -1,7 +1,8 @@ -import pkg from "crypto-js"; -const { AES, enc } = pkg; -// biome-ignore lint: This is how you import fs from node +// 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 { AES, enc } from "crypto-js"; const SAVE_KEY = "x0i2O7WRiANTqPmZ"; diff --git a/src/@types/PokerogueAccountApi.ts b/src/@types/PokerogueAccountApi.ts index 68d0a5e7730..3b3e74ba41d 100644 --- a/src/@types/PokerogueAccountApi.ts +++ b/src/@types/PokerogueAccountApi.ts @@ -1,4 +1,4 @@ -import type { UserInfo } from "#app/@types/UserInfo"; +import type { UserInfo } from "#types/UserInfo"; export interface AccountInfoResponse extends UserInfo {} diff --git a/src/@types/PokerogueDailyApi.ts b/src/@types/PokerogueDailyApi.ts index 3f3d8eb61ca..838af2a2a34 100644 --- a/src/@types/PokerogueDailyApi.ts +++ b/src/@types/PokerogueDailyApi.ts @@ -1,4 +1,4 @@ -import type { ScoreboardCategory } from "#app/ui/daily-run-scoreboard"; +import type { ScoreboardCategory } from "#ui/daily-run-scoreboard"; export interface GetDailyRankingsRequest { category: ScoreboardCategory; diff --git a/src/@types/PokerogueSavedataApi.ts b/src/@types/PokerogueSavedataApi.ts index a313cd708c7..ebc80ac4ce0 100644 --- a/src/@types/PokerogueSavedataApi.ts +++ b/src/@types/PokerogueSavedataApi.ts @@ -1,4 +1,4 @@ -import type { SessionSaveData, SystemSaveData } from "#app/system/game-data"; +import type { SessionSaveData, SystemSaveData } from "#system/game-data"; export interface UpdateAllSavedataRequest { system: SystemSaveData; diff --git a/src/@types/PokerogueSystemSavedataApi.ts b/src/@types/PokerogueSystemSavedataApi.ts index 8ce160a5ec2..ded22c4c58c 100644 --- a/src/@types/PokerogueSystemSavedataApi.ts +++ b/src/@types/PokerogueSystemSavedataApi.ts @@ -1,4 +1,4 @@ -import type { SystemSaveData } from "#app/system/game-data"; +import type { SystemSaveData } from "#system/game-data"; export interface GetSystemSavedataRequest { clientSessionId: string; diff --git a/src/@types/SessionSaveMigrator.ts b/src/@types/SessionSaveMigrator.ts index c4b0ad8dda4..56518eaa8b7 100644 --- a/src/@types/SessionSaveMigrator.ts +++ b/src/@types/SessionSaveMigrator.ts @@ -1,4 +1,4 @@ -import type { SessionSaveData } from "#app/system/game-data"; +import type { SessionSaveData } from "#system/game-data"; export interface SessionSaveMigrator { version: string; diff --git a/src/@types/SystemSaveMigrator.ts b/src/@types/SystemSaveMigrator.ts index a22b5f6c93d..80fff9c7848 100644 --- a/src/@types/SystemSaveMigrator.ts +++ b/src/@types/SystemSaveMigrator.ts @@ -1,4 +1,4 @@ -import type { SystemSaveData } from "#app/system/game-data"; +import type { SystemSaveData } from "#system/game-data"; export interface SystemSaveMigrator { version: string; diff --git a/src/@types/ability-types.ts b/src/@types/ability-types.ts index 18516fadd40..8daca8a671d 100644 --- a/src/@types/ability-types.ts +++ b/src/@types/ability-types.ts @@ -1,13 +1,13 @@ -import type Move from "#app/data/moves/move"; -import type Pokemon from "#app/field/pokemon"; +import type { AbAttrConstructorMap } from "#abilities/ability"; import type { BattleStat } from "#enums/stat"; -import type { AbAttrConstructorMap } from "#app/data/abilities/ability"; +import type { Pokemon } from "#field/pokemon"; +import type { Move } from "#moves/move"; // intentionally re-export all types from abilities to have this be the centralized place to import ability types -export type * from "#app/data/abilities/ability"; +export type * from "#abilities/ability"; // biome-ignore lint/correctness/noUnusedImports: Used in a tsdoc comment -import type { applyAbAttrs } from "#app/data/abilities/apply-ab-attrs"; +import type { applyAbAttrs } from "#abilities/apply-ab-attrs"; export type AbAttrCondition = (pokemon: Pokemon) => boolean; export type PokemonAttackCondition = (user: Pokemon | null, target: Pokemon | null, move: Move) => boolean; diff --git a/src/@types/attack-move-result.ts b/src/@types/attack-move-result.ts index c6aedf8096d..495bb1e88ff 100644 --- a/src/@types/attack-move-result.ts +++ b/src/@types/attack-move-result.ts @@ -1,6 +1,6 @@ import type { BattlerIndex } from "#enums/battler-index"; -import type { DamageResult } from "#app/@types/damage-result"; import type { MoveId } from "#enums/move-id"; +import type { DamageResult } from "#types/damage-result"; export interface AttackMoveResult { move: MoveId; diff --git a/src/@types/held-modifier-config.ts b/src/@types/held-modifier-config.ts index 5617cf2446a..46ef67bf515 100644 --- a/src/@types/held-modifier-config.ts +++ b/src/@types/held-modifier-config.ts @@ -1,7 +1,7 @@ -import type { PokemonHeldItemModifierType } from "#app/modifier/modifier-type"; -import type { PokemonHeldItemModifier } from "#app/modifier/modifier"; +import type { PokemonHeldItemModifier } from "#modifiers/modifier"; +import type { PokemonHeldItemModifierType } from "#modifiers/modifier-type"; -export default interface HeldModifierConfig { +export interface HeldModifierConfig { modifier: PokemonHeldItemModifierType | PokemonHeldItemModifier; stackCount?: number; isTransferable?: boolean; diff --git a/src/@types/illusion-data.ts b/src/@types/illusion-data.ts index 98e39af11f5..854c98c8cc9 100644 --- a/src/@types/illusion-data.ts +++ b/src/@types/illusion-data.ts @@ -1,8 +1,8 @@ -import type { Gender } from "#app/data/gender"; -import type PokemonSpecies from "#app/data/pokemon-species"; -import type { Variant } from "#app/sprites/variant"; +import type { Gender } from "#data/gender"; +import type { PokemonSpecies } from "#data/pokemon-species"; import type { PokeballType } from "#enums/pokeball"; import type { SpeciesId } from "#enums/species-id"; +import type { Variant } from "#sprites/variant"; /** * Data pertaining to a Pokemon's Illusion. diff --git a/src/@types/modifier-types.ts b/src/@types/modifier-types.ts index 80b92c35622..28b39d1a151 100644 --- a/src/@types/modifier-types.ts +++ b/src/@types/modifier-types.ts @@ -1,14 +1,13 @@ -/** - * 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"; -import type Pokemon from "#app/field/pokemon"; -import type { ModifierConstructorMap } from "#app/modifier/modifier"; -import type { ModifierType, WeightedModifierType } from "#app/modifier/modifier-type"; export type ModifierTypeFunc = () => ModifierType; export type WeightedModifierTypeWeightFunc = (party: Pokemon[], rerollCount?: number) => number; -export type { ModifierConstructorMap } from "#app/modifier/modifier"; +export type { ModifierConstructorMap } from "#modifiers/modifier"; /** * Map of modifier names to their respective instance types diff --git a/src/@types/move-types.ts b/src/@types/move-types.ts index d9a06fd20ee..5f8d7e8777e 100644 --- a/src/@types/move-types.ts +++ b/src/@types/move-types.ts @@ -1,16 +1,16 @@ import type { AttackMove, - StatusMove, - SelfStatusMove, ChargingAttackMove, ChargingSelfStatusMove, - MoveAttrConstructorMap, MoveAttr, -} from "#app/data/moves/move"; + MoveAttrConstructorMap, + SelfStatusMove, + StatusMove, +} from "#moves/move"; export type MoveAttrFilter = (attr: MoveAttr) => boolean; -export type * from "#app/data/moves/move"; +export type * from "#moves/move"; /** * Map of move subclass names to their respective classes. diff --git a/src/@types/trainer-funcs.ts b/src/@types/trainer-funcs.ts index 0546dd53024..25d9dba7372 100644 --- a/src/@types/trainer-funcs.ts +++ b/src/@types/trainer-funcs.ts @@ -1,9 +1,9 @@ -import type { EnemyPokemon } from "#app/field/pokemon"; -import type { PersistentModifier } from "#app/modifier/modifier"; import type { PartyMemberStrength } from "#enums/party-member-strength"; import type { SpeciesId } from "#enums/species-id"; -import type { TrainerConfig } from "../data/trainers/trainer-config"; -import type { TrainerPartyTemplate } from "../data/trainers/TrainerPartyTemplate"; +import type { EnemyPokemon } from "#field/pokemon"; +import type { PersistentModifier } from "#modifiers/modifier"; +import type { TrainerPartyTemplate } from "#trainers/TrainerPartyTemplate"; +import type { TrainerConfig } from "#trainers/trainer-config"; export type PartyTemplateFunc = () => TrainerPartyTemplate; export type PartyMemberFunc = (level: number, strength: PartyMemberStrength) => EnemyPokemon; diff --git a/src/@types/type-helpers.ts b/src/@types/type-helpers.ts index 2d00b1faf4a..eac268cb189 100644 --- a/src/@types/type-helpers.ts +++ b/src/@types/type-helpers.ts @@ -3,7 +3,7 @@ */ // biome-ignore lint/correctness/noUnusedImports: Used in a tsdoc comment -import type { AbAttr } from "./ability-types"; +import type { AbAttr } from "#types/ability-types"; /** * Exactly matches the type of the argument, preventing adding additional properties. diff --git a/src/account.ts b/src/account.ts index 3416fa6ed5e..1bfb756b284 100644 --- a/src/account.ts +++ b/src/account.ts @@ -1,7 +1,7 @@ -import { pokerogueApi } from "#app/plugins/api/pokerogue-api"; -import type { UserInfo } from "#app/@types/UserInfo"; -import { bypassLogin } from "./global-vars/bypass-login"; -import { randomString } from "#app/utils/common"; +import { pokerogueApi } from "#api/pokerogue-api"; +import { bypassLogin } from "#app/global-vars/bypass-login"; +import type { UserInfo } from "#types/UserInfo"; +import { randomString } from "#utils/common"; export let loggedInUser: UserInfo | null = null; // This is a random string that is used to identify the client session - unique per session (tab or window) so that the game will only save on the one that the server is expecting diff --git a/src/battle-scene.ts b/src/battle-scene.ts index 57ca66e0dc4..422f3171110 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -1,27 +1,84 @@ -import Phaser from "phaser"; -import UI from "#app/ui/ui"; -import type Pokemon from "#app/field/pokemon"; -import { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon"; -import type { PokemonSpeciesFilter } from "#app/data/pokemon-species"; -import type PokemonSpecies from "#app/data/pokemon-species"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; -import { allSpecies } from "#app/data/data-lists"; +import { applyAbAttrs } from "#abilities/apply-ab-attrs"; +import type { FixedBattleConfig } from "#app/battle"; +import { Battle } from "#app/battle"; import { - fixedInt, - getIvsFromId, - randSeedInt, - getEnumValues, - randomString, - NumberHolder, - shiftCharCodes, - formatMoney, - isNullOrUndefined, - BooleanHolder, - type Constructor, - isBetween, -} from "#app/utils/common"; -import { deepMergeSpriteData } from "#app/utils/data"; -import type { Modifier, ModifierPredicate, TurnHeldItemTransferModifier } from "./modifier/modifier"; + ANTI_VARIANCE_WEIGHT_MODIFIER, + AVERAGE_ENCOUNTERS_PER_RUN_TARGET, + BASE_MYSTERY_ENCOUNTER_SPAWN_WEIGHT, + MYSTERY_ENCOUNTER_SPAWN_MAX_WEIGHT, +} from "#app/constants"; +import type { GameMode } from "#app/game-mode"; +import { getGameMode } from "#app/game-mode"; +import { timedEventManager } from "#app/global-event-manager"; +import { initGlobalScene } from "#app/global-scene"; +import { starterColors } from "#app/global-vars/starter-colors"; +import { InputsController } from "#app/inputs-controller"; +import { LoadingScene } from "#app/loading-scene"; +import Overrides from "#app/overrides"; +import type { Phase } from "#app/phase"; +import { PhaseManager } from "#app/phase-manager"; +import { FieldSpritePipeline } from "#app/pipelines/field-sprite"; +import { InvertPostFX } from "#app/pipelines/invert"; +import { SpritePipeline } from "#app/pipelines/sprite"; +import { SceneBase } from "#app/scene-base"; +import { startingWave } from "#app/starting-wave"; +import { TimedEventManager } from "#app/timed-event-manager"; +import { UiInputs } from "#app/ui-inputs"; +import { biomeDepths, getBiomeName } from "#balance/biomes"; +import { pokemonPrevolutions } from "#balance/pokemon-evolutions"; +import { FRIENDSHIP_GAIN_FROM_BATTLE } from "#balance/starters"; +import { + initCommonAnims, + initMoveAnim, + loadCommonAnimAssets, + loadMoveAnimAssets, + populateAnims, +} from "#data/battle-anims"; +import { allAbilities, allMoves, allSpecies, modifierTypes } from "#data/data-lists"; +import { battleSpecDialogue } from "#data/dialogue"; +import type { SpeciesFormChangeTrigger } from "#data/form-change-triggers"; +import { SpeciesFormChangeManualTrigger, SpeciesFormChangeTimeOfDayTrigger } from "#data/form-change-triggers"; +import { Gender } from "#data/gender"; +import type { SpeciesFormChange } from "#data/pokemon-forms"; +import { pokemonFormChanges } from "#data/pokemon-forms"; +import type { PokemonSpecies, PokemonSpeciesFilter } from "#data/pokemon-species"; +import { getTypeRgb } from "#data/type"; +import { BattleSpec } from "#enums/battle-spec"; +import { BattleStyle } from "#enums/battle-style"; +import { BattleType } from "#enums/battle-type"; +import { BattlerTagType } from "#enums/battler-tag-type"; +import { BiomeId } from "#enums/biome-id"; +import { EaseType } from "#enums/ease-type"; +import { ExpGainsSpeed } from "#enums/exp-gains-speed"; +import type { ExpNotification } from "#enums/exp-notification"; +import { FormChangeItem } from "#enums/form-change-item"; +import { GameModes } from "#enums/game-modes"; +import { ModifierPoolType } from "#enums/modifier-pool-type"; +import { MoneyFormat } from "#enums/money-format"; +import { MoveId } from "#enums/move-id"; +import { MysteryEncounterMode } from "#enums/mystery-encounter-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { Nature } from "#enums/nature"; +import { PlayerGender } from "#enums/player-gender"; +import { PokeballType } from "#enums/pokeball"; +import type { PokemonAnimType } from "#enums/pokemon-anim-type"; +import { PokemonType } from "#enums/pokemon-type"; +import { ShopCursorTarget } from "#enums/shop-cursor-target"; +import { SpeciesId } from "#enums/species-id"; +import { StatusEffect } from "#enums/status-effect"; +import type { TrainerSlot } from "#enums/trainer-slot"; +import { TrainerType } from "#enums/trainer-type"; +import { TrainerVariant } from "#enums/trainer-variant"; +import { UiTheme } from "#enums/ui-theme"; +import { NewArenaEvent } from "#events/battle-scene"; +import { Arena, ArenaBase } from "#field/arena"; +import { DamageNumberHandler } from "#field/damage-number-handler"; +import type { Pokemon } from "#field/pokemon"; +import { EnemyPokemon, PlayerPokemon } from "#field/pokemon"; +import { PokemonSpriteSparkleHandler } from "#field/pokemon-sprite-sparkle-handler"; +import { Trainer } from "#field/trainer"; +import type { Modifier, ModifierPredicate, TurnHeldItemTransferModifier } from "#modifiers/modifier"; import { ConsumableModifier, ConsumablePokemonModifier, @@ -39,22 +96,7 @@ import { PokemonHpRestoreModifier, PokemonIncrementingStatModifier, RememberMoveModifier, -} from "./modifier/modifier"; -import { PokeballType } from "#enums/pokeball"; -import { - initCommonAnims, - initMoveAnim, - loadCommonAnimAssets, - loadMoveAnimAssets, - populateAnims, -} from "#app/data/battle-anims"; -import type { Phase } from "#app/phase"; -import { initGameSpeed } from "#app/system/game-speed"; -import { Arena, ArenaBase } from "#app/field/arena"; -import { GameData } from "#app/system/game-data"; -import { addTextObject, getTextColor, TextStyle } from "#app/ui/text"; -import { allMoves } from "./data/data-lists"; -import { MusicPreference } from "#app/system/settings/settings"; +} from "#modifiers/modifier"; import { getDefaultModifierTypeForTier, getEnemyModifierTypesForWave, @@ -62,106 +104,58 @@ import { getLuckTextTint, getPartyLuckValue, PokemonHeldItemModifierType, -} from "#app/modifier/modifier-type"; -import { getModifierType } from "./utils/modifier-utils"; -import { modifierTypes } from "./data/data-lists"; -import { getModifierPoolForType } from "./utils/modifier-utils"; -import { ModifierPoolType } from "#enums/modifier-pool-type"; -import AbilityBar from "#app/ui/ability-bar"; -import { applyAbAttrs } from "./data/abilities/apply-ab-attrs"; -import { allAbilities } from "./data/data-lists"; -import type { FixedBattleConfig } from "#app/battle"; -import Battle from "#app/battle"; -import { BattleType } from "#enums/battle-type"; -import type { GameMode } from "#app/game-mode"; -import { getGameMode } from "#app/game-mode"; -import { GameModes } from "#enums/game-modes"; -import FieldSpritePipeline from "#app/pipelines/field-sprite"; -import SpritePipeline from "#app/pipelines/sprite"; -import PartyExpBar from "#app/ui/party-exp-bar"; -import type { TrainerSlot } from "./enums/trainer-slot"; -import { trainerConfigs } from "#app/data/trainers/trainer-config"; -import Trainer from "#app/field/trainer"; -import { TrainerVariant } from "#enums/trainer-variant"; -import type TrainerData from "#app/system/trainer-data"; -import SoundFade from "phaser3-rex-plugins/plugins/soundfade"; -import { pokemonPrevolutions } from "#app/data/balance/pokemon-evolutions"; -import PokeballTray from "#app/ui/pokeball-tray"; -import InvertPostFX from "#app/pipelines/invert"; -import type { Achv } from "#app/system/achv"; -import { achvs, ModifierAchv, MoneyAchv } from "#app/system/achv"; -import type { Voucher } from "#app/system/voucher"; -import { vouchers } from "#app/system/voucher"; -import { Gender } from "#app/data/gender"; -import type UIPlugin from "phaser3-rex-plugins/templates/ui/ui-plugin"; -import { addUiThemeOverrides } from "#app/ui/ui-theme"; -import type PokemonData from "#app/system/pokemon-data"; -import { Nature } from "#enums/nature"; -import type { SpeciesFormChange } from "#app/data/pokemon-forms"; -import type { SpeciesFormChangeTrigger } from "./data/pokemon-forms/form-change-triggers"; -import { pokemonFormChanges } from "#app/data/pokemon-forms"; -import { SpeciesFormChangeTimeOfDayTrigger } from "./data/pokemon-forms/form-change-triggers"; -import { SpeciesFormChangeManualTrigger } from "./data/pokemon-forms/form-change-triggers"; -import { FormChangeItem } from "#enums/form-change-item"; -import { getTypeRgb } from "#app/data/type"; -import { PokemonType } from "#enums/pokemon-type"; -import PokemonSpriteSparkleHandler from "#app/field/pokemon-sprite-sparkle-handler"; -import CharSprite from "#app/ui/char-sprite"; -import DamageNumberHandler from "#app/field/damage-number-handler"; -import PokemonInfoContainer from "#app/ui/pokemon-info-container"; -import { biomeDepths, getBiomeName } from "#app/data/balance/biomes"; -import { SceneBase } from "#app/scene-base"; -import CandyBar from "#app/ui/candy-bar"; -import type { Variant } from "#app/sprites/variant"; -import { variantData, clearVariantData } from "#app/sprites/variant"; -import type { Localizable } from "#app/@types/locales"; -import Overrides from "#app/overrides"; -import { InputsController } from "#app/inputs-controller"; -import { UiInputs } from "#app/ui-inputs"; -import { NewArenaEvent } from "#app/events/battle-scene"; -import { ArenaFlyout } from "#app/ui/arena-flyout"; -import { EaseType } from "#enums/ease-type"; -import { BattleSpec } from "#enums/battle-spec"; -import { BattleStyle } from "#enums/battle-style"; -import { BiomeId } from "#enums/biome-id"; -import type { ExpNotification } from "#enums/exp-notification"; -import { MoneyFormat } from "#enums/money-format"; -import { MoveId } from "#enums/move-id"; -import { PlayerGender } from "#enums/player-gender"; -import { SpeciesId } from "#enums/species-id"; -import { UiTheme } from "#enums/ui-theme"; -import { TimedEventManager } from "#app/timed-event-manager"; -import type { PokemonAnimType } from "#enums/pokemon-anim-type"; -import i18next from "i18next"; -import { TrainerType } from "#enums/trainer-type"; -import { battleSpecDialogue } from "#app/data/dialogue"; -import { LoadingScene } from "#app/loading-scene"; -import type { MovePhase } from "#app/phases/move-phase"; -import { ShopCursorTarget } from "#app/enums/shop-cursor-target"; -import MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; -import { allMysteryEncounters, mysteryEncountersByBiome } from "#app/data/mystery-encounters/mystery-encounters"; +} from "#modifiers/modifier-type"; +import { MysteryEncounter } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterSaveData } from "#mystery-encounters/mystery-encounter-save-data"; +import { allMysteryEncounters, mysteryEncountersByBiome } from "#mystery-encounters/mystery-encounters"; +import type { MovePhase } from "#phases/move-phase"; +import { expSpriteKeys } from "#sprites/sprite-keys"; +import { hasExpSprite } from "#sprites/sprite-utils"; +import type { Variant } from "#sprites/variant"; +import { clearVariantData, variantData } from "#sprites/variant"; +import type { Achv } from "#system/achv"; +import { achvs, ModifierAchv, MoneyAchv } from "#system/achv"; +import { GameData } from "#system/game-data"; +import { initGameSpeed } from "#system/game-speed"; +import type { PokemonData } from "#system/pokemon-data"; +import { MusicPreference } from "#system/settings"; +import type { TrainerData } from "#system/trainer-data"; +import type { Voucher } from "#system/voucher"; +import { vouchers } from "#system/voucher"; +import { trainerConfigs } from "#trainers/trainer-config"; +import type { HeldModifierConfig } from "#types/held-modifier-config"; +import type { Localizable } from "#types/locales"; +import { AbilityBar } from "#ui/ability-bar"; +import { ArenaFlyout } from "#ui/arena-flyout"; +import { CandyBar } from "#ui/candy-bar"; +import { CharSprite } from "#ui/char-sprite"; +import { PartyExpBar } from "#ui/party-exp-bar"; +import { PokeballTray } from "#ui/pokeball-tray"; +import { PokemonInfoContainer } from "#ui/pokemon-info-container"; +import { addTextObject, getTextColor, TextStyle } from "#ui/text"; +import { UI } from "#ui/ui"; +import { addUiThemeOverrides } from "#ui/ui-theme"; import { - ANTI_VARIANCE_WEIGHT_MODIFIER, - AVERAGE_ENCOUNTERS_PER_RUN_TARGET, - BASE_MYSTERY_ENCOUNTER_SPAWN_WEIGHT, - MYSTERY_ENCOUNTER_SPAWN_MAX_WEIGHT, -} from "./constants"; -import { MysteryEncounterSaveData } from "#app/data/mystery-encounters/mystery-encounter-save-data"; -import { MysteryEncounterType } from "#enums/mystery-encounter-type"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import type HeldModifierConfig from "#app/@types/held-modifier-config"; -import { MysteryEncounterMode } from "#enums/mystery-encounter-mode"; -import { ExpGainsSpeed } from "#enums/exp-gains-speed"; -import { BattlerTagType } from "#enums/battler-tag-type"; -import { FRIENDSHIP_GAIN_FROM_BATTLE } from "#app/data/balance/starters"; -import { StatusEffect } from "#enums/status-effect"; -import { initGlobalScene } from "#app/global-scene"; -import { expSpriteKeys } from "./sprites/sprite-keys"; -import { hasExpSprite } from "./sprites/sprite-utils"; -import { timedEventManager } from "./global-event-manager"; -import { starterColors } from "./global-vars/starter-colors"; -import { startingWave } from "./starting-wave"; -import { PhaseManager } from "./phase-manager"; + BooleanHolder, + type Constructor, + fixedInt, + formatMoney, + getEnumValues, + getIvsFromId, + isBetween, + isNullOrUndefined, + NumberHolder, + randomString, + randSeedInt, + shiftCharCodes, +} from "#utils/common"; +import { deepMergeSpriteData } from "#utils/data"; +import { getModifierPoolForType, getModifierType } from "#utils/modifier-utils"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; +import i18next from "i18next"; +import Phaser from "phaser"; +import SoundFade from "phaser3-rex-plugins/plugins/soundfade"; +import type UIPlugin from "phaser3-rex-plugins/templates/ui/ui-plugin"; const DEBUG_RNG = false; @@ -176,7 +170,7 @@ export interface InfoToggle { isActive(): boolean; } -export default class BattleScene extends SceneBase { +export class BattleScene extends SceneBase { public rexUI: UIPlugin; public inputController: InputsController; public uiInputs: UiInputs; diff --git a/src/battle.ts b/src/battle.ts index 878a539cecf..a95bbe252bd 100644 --- a/src/battle.ts +++ b/src/battle.ts @@ -1,41 +1,40 @@ +import type { GameMode } from "#app/game-mode"; import { globalScene } from "#app/global-scene"; -import type { Command } from "#enums/command"; -import { - randomString, - getEnumValues, - NumberHolder, - randSeedInt, - shiftCharCodes, - randSeedItem, - randInt, - randSeedFloat, -} from "#app/utils/common"; -import Trainer from "./field/trainer"; -import { TrainerVariant } from "#enums/trainer-variant"; -import type { GameMode } from "./game-mode"; -import { MoneyMultiplierModifier, type PokemonHeldItemModifier } from "./modifier/modifier"; -import type { PokeballType } from "#enums/pokeball"; -import { trainerConfigs } from "#app/data/trainers/trainer-config"; -import { SpeciesFormKey } from "#enums/species-form-key"; -import type { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon"; -import type { TurnMove } from "./@types/turn-move"; -import type Pokemon from "#app/field/pokemon"; import { ArenaTagType } from "#enums/arena-tag-type"; import { BattleSpec } from "#enums/battle-spec"; +import { BattleType } from "#enums/battle-type"; +import { BattlerIndex } from "#enums/battler-index"; +import type { Command } from "#enums/command"; +import { ClassicFixedBossWaves } from "#enums/fixed-boss-waves"; +import { ModifierTier } from "#enums/modifier-tier"; import type { MoveId } from "#enums/move-id"; +import { MysteryEncounterMode } from "#enums/mystery-encounter-mode"; +import type { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { PlayerGender } from "#enums/player-gender"; -import { MusicPreference } from "#app/system/settings/settings"; +import type { PokeballType } from "#enums/pokeball"; +import { SpeciesFormKey } from "#enums/species-form-key"; import { SpeciesId } from "#enums/species-id"; import { TrainerType } from "#enums/trainer-type"; -import i18next from "#app/plugins/i18n"; -import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterMode } from "#enums/mystery-encounter-mode"; -import type { CustomModifierSettings } from "#app/modifier/modifier-type"; -import { ModifierTier } from "#enums/modifier-tier"; -import type { MysteryEncounterType } from "#enums/mystery-encounter-type"; -import { BattleType } from "#enums/battle-type"; -import { ClassicFixedBossWaves } from "#enums/fixed-boss-waves"; -import { BattlerIndex } from "#enums/battler-index"; +import { TrainerVariant } from "#enums/trainer-variant"; +import type { EnemyPokemon, PlayerPokemon, Pokemon } from "#field/pokemon"; +import { Trainer } from "#field/trainer"; +import { MoneyMultiplierModifier, type PokemonHeldItemModifier } from "#modifiers/modifier"; +import type { CustomModifierSettings } from "#modifiers/modifier-type"; +import type { MysteryEncounter } from "#mystery-encounters/mystery-encounter"; +import i18next from "#plugins/i18n"; +import { MusicPreference } from "#system/settings"; +import { trainerConfigs } from "#trainers/trainer-config"; +import type { TurnMove } from "#types/turn-move"; +import { + getEnumValues, + NumberHolder, + randInt, + randomString, + randSeedFloat, + randSeedInt, + randSeedItem, + shiftCharCodes, +} from "#utils/common"; export interface TurnCommand { command: Command; @@ -55,7 +54,7 @@ interface TurnCommands { [key: number]: TurnCommand | null; } -export default class Battle { +export class Battle { protected gameMode: GameMode; public waveIndex: number; public battleType: BattleType; diff --git a/src/configs/inputs/cfg_keyboard_qwerty.ts b/src/configs/inputs/cfg_keyboard_qwerty.ts index 4f0353971e0..bca4f828d34 100644 --- a/src/configs/inputs/cfg_keyboard_qwerty.ts +++ b/src/configs/inputs/cfg_keyboard_qwerty.ts @@ -1,5 +1,5 @@ import { Button } from "#enums/buttons"; -import { SettingKeyboard } from "#app/system/settings/settings-keyboard"; +import { SettingKeyboard } from "#system/settings-keyboard"; const cfg_keyboard_qwerty = { padID: "default", diff --git a/src/configs/inputs/pad_dualshock.ts b/src/configs/inputs/pad_dualshock.ts index 51af1b2defd..100baa5efad 100644 --- a/src/configs/inputs/pad_dualshock.ts +++ b/src/configs/inputs/pad_dualshock.ts @@ -1,5 +1,5 @@ -import { SettingGamepad } from "../../system/settings/settings-gamepad"; import { Button } from "#enums/buttons"; +import { SettingGamepad } from "#system/settings-gamepad"; /** * Dualshock mapping diff --git a/src/configs/inputs/pad_generic.ts b/src/configs/inputs/pad_generic.ts index e47b7ce1ace..fc70f55fc7a 100644 --- a/src/configs/inputs/pad_generic.ts +++ b/src/configs/inputs/pad_generic.ts @@ -1,5 +1,5 @@ -import { SettingGamepad } from "../../system/settings/settings-gamepad"; import { Button } from "#enums/buttons"; +import { SettingGamepad } from "#system/settings-gamepad"; /** * Generic pad mapping diff --git a/src/configs/inputs/pad_procon.ts b/src/configs/inputs/pad_procon.ts index 61558c7365e..5667db01a85 100644 --- a/src/configs/inputs/pad_procon.ts +++ b/src/configs/inputs/pad_procon.ts @@ -1,5 +1,5 @@ -import { SettingGamepad } from "#app/system/settings/settings-gamepad"; import { Button } from "#enums/buttons"; +import { SettingGamepad } from "#system/settings-gamepad"; /** * Nintendo Pro Controller mapping diff --git a/src/configs/inputs/pad_unlicensedSNES.ts b/src/configs/inputs/pad_unlicensedSNES.ts index d0c4f41c8f5..7d5dc055507 100644 --- a/src/configs/inputs/pad_unlicensedSNES.ts +++ b/src/configs/inputs/pad_unlicensedSNES.ts @@ -1,5 +1,5 @@ -import { SettingGamepad } from "../../system/settings/settings-gamepad"; import { Button } from "#enums/buttons"; +import { SettingGamepad } from "#system/settings-gamepad"; /** * 081f-e401 - UnlicensedSNES diff --git a/src/configs/inputs/pad_xbox360.ts b/src/configs/inputs/pad_xbox360.ts index 60cbd9ab181..7c719e77446 100644 --- a/src/configs/inputs/pad_xbox360.ts +++ b/src/configs/inputs/pad_xbox360.ts @@ -1,5 +1,5 @@ -import { SettingGamepad } from "../../system/settings/settings-gamepad"; import { Button } from "#enums/buttons"; +import { SettingGamepad } from "#system/settings-gamepad"; /** * Generic pad mapping diff --git a/src/data/abilities/ability.ts b/src/data/abilities/ability.ts index 0aaf5b4b124..c57f6520d56 100644 --- a/src/data/abilities/ability.ts +++ b/src/data/abilities/ability.ts @@ -1,92 +1,80 @@ -import { MoveResult } from "#enums/move-result"; -import { HitResult } from "#enums/hit-result"; -import { - BooleanHolder, - NumberHolder, - toDmgValue, - isNullOrUndefined, - randSeedItem, - randSeedInt, - randSeedFloat, - coerceArray, -} from "#app/utils/common"; -import { getPokemonNameWithAffix } from "#app/messages"; -import { GroundedTag } from "#app/data/battler-tags"; -import { BattlerTagLapseType } from "#enums/battler-tag-lapse-type"; -import { - getNonVolatileStatusEffects, - getStatusEffectDescriptor, - getStatusEffectHealText, -} from "#app/data/status-effect"; -import { Gender } from "#app/data/gender"; -import { applyMoveAttrs } from "../moves/apply-attrs"; -import { allMoves } from "../data-lists"; -import { ArenaTagSide } from "#enums/arena-tag-side"; -import { BerryModifier, HitHealModifier, PokemonHeldItemModifier } from "#app/modifier/modifier"; -import { TerrainType } from "#app/data/terrain"; -import { pokemonFormChanges } from "../pokemon-forms"; -import { - SpeciesFormChangeWeatherTrigger, - SpeciesFormChangeAbilityTrigger, -} from "../pokemon-forms/form-change-triggers"; -import i18next from "i18next"; -import { Command } from "#enums/command"; -import { BerryModifierType } from "#app/modifier/modifier-type"; -import { getPokeballName } from "#app/data/pokeball"; -import { BattleType } from "#enums/battle-type"; -import { globalScene } from "#app/global-scene"; -import { allAbilities } from "#app/data/data-lists"; +/* 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 */ -// Enum imports -import { Stat, BATTLE_STATS, EFFECTIVE_STATS, getStatKey } from "#enums/stat"; -import { PokemonType } from "#enums/pokemon-type"; -import { PokemonAnimType } from "#enums/pokemon-anim-type"; -import { StatusEffect } from "#enums/status-effect"; -import { WeatherType } from "#enums/weather-type"; +import { applyAbAttrs } from "#abilities/apply-ab-attrs"; +import { globalScene } from "#app/global-scene"; +import { getPokemonNameWithAffix } from "#app/messages"; +import type { ArenaTrapTag, SuppressAbilitiesTag } from "#data/arena-tag"; +import type { BattlerTag } from "#data/battler-tags"; +import { GroundedTag } from "#data/battler-tags"; +import { getBerryEffectFunc } from "#data/berry"; +import { allAbilities, allMoves } from "#data/data-lists"; +import { SpeciesFormChangeAbilityTrigger, SpeciesFormChangeWeatherTrigger } from "#data/form-change-triggers"; +import { Gender } from "#data/gender"; +import { getPokeballName } from "#data/pokeball"; +import { pokemonFormChanges } from "#data/pokemon-forms"; +import { getNonVolatileStatusEffects, getStatusEffectDescriptor, getStatusEffectHealText } from "#data/status-effect"; +import { TerrainType } from "#data/terrain"; +import type { Weather } from "#data/weather"; import { AbilityId } from "#enums/ability-id"; +import { ArenaTagSide } from "#enums/arena-tag-side"; import { ArenaTagType } from "#enums/arena-tag-type"; +import { BattleType } from "#enums/battle-type"; +import type { BattlerIndex } from "#enums/battler-index"; +import { BattlerTagLapseType } from "#enums/battler-tag-lapse-type"; import { BattlerTagType } from "#enums/battler-tag-type"; -import { MoveId } from "#enums/move-id"; -import { SpeciesId } from "#enums/species-id"; -import { SwitchType } from "#enums/switch-type"; +import type { BerryType } from "#enums/berry-type"; +import { Command } from "#enums/command"; +import { HitResult } from "#enums/hit-result"; +import { MoveCategory } from "#enums/MoveCategory"; import { MoveFlags } from "#enums/MoveFlags"; import { MoveTarget } from "#enums/MoveTarget"; -import { MoveCategory } from "#enums/MoveCategory"; import { CommonAnim } from "#enums/move-anims-common"; -import { getBerryEffectFunc } from "#app/data/berry"; -import { BerryUsedEvent } from "#app/events/battle-scene"; -import { noAbilityTypeOverrideMoves } from "#app/data/moves/invalid-moves"; +import { MoveId } from "#enums/move-id"; +import { MoveResult } from "#enums/move-result"; import { MoveUseMode } from "#enums/move-use-mode"; - -// Type imports -import type { StatStageChangePhase } from "#app/phases/stat-stage-change-phase"; +import { PokemonAnimType } from "#enums/pokemon-anim-type"; +import { PokemonType } from "#enums/pokemon-type"; +import { SpeciesId } from "#enums/species-id"; import type { BattleStat, EffectiveStat } from "#enums/stat"; -import type { BerryType } from "#enums/berry-type"; -import type { EnemyPokemon } from "#app/field/pokemon"; -import type { PokemonMove } from "../moves/pokemon-move"; -import type Pokemon from "#app/field/pokemon"; -import type { Weather } from "#app/data/weather"; -import type { BattlerTag } from "#app/data/battler-tags"; +import { BATTLE_STATS, EFFECTIVE_STATS, getStatKey, Stat } from "#enums/stat"; +import { StatusEffect } from "#enums/status-effect"; +import { SwitchType } from "#enums/switch-type"; +import { WeatherType } from "#enums/weather-type"; +import { BerryUsedEvent } from "#events/battle-scene"; +import type { EnemyPokemon, Pokemon } from "#field/pokemon"; +import { BerryModifier, HitHealModifier, PokemonHeldItemModifier } from "#modifiers/modifier"; +import { BerryModifierType } from "#modifiers/modifier-type"; +import { applyMoveAttrs } from "#moves/apply-attrs"; +import { noAbilityTypeOverrideMoves } from "#moves/invalid-moves"; +import type { Move } from "#moves/move"; +import type { PokemonMove } from "#moves/pokemon-move"; +import type { StatStageChangePhase } from "#phases/stat-stage-change-phase"; import type { AbAttrCondition, + AbAttrMap, + AbAttrString, + PokemonAttackCondition, PokemonDefendCondition, PokemonStatStageChangeCondition, - PokemonAttackCondition, - AbAttrString, - AbAttrMap, -} from "#app/@types/ability-types"; -import type { BattlerIndex } from "#enums/battler-index"; -import type Move from "#app/data/moves/move"; -import type { ArenaTrapTag, SuppressAbilitiesTag } from "#app/data/arena-tag"; -import type { Constructor } from "#app/utils/common"; -import type { Localizable } from "#app/@types/locales"; -import { applyAbAttrs } from "./apply-ab-attrs"; -import type { Closed, Exact } from "#app/@types/type-helpers"; +} from "#types/ability-types"; +import type { Localizable } from "#types/locales"; +import type { Closed, Exact } from "#types/type-helpers"; +import type { Constructor } from "#utils/common"; +import { + BooleanHolder, + coerceArray, + isNullOrUndefined, + NumberHolder, + randSeedFloat, + randSeedInt, + randSeedItem, + toDmgValue, +} from "#utils/common"; +import i18next from "i18next"; -// biome-ignore-start lint/correctness/noUnusedImports: Used in TSDoc -import type BattleScene from "#app/battle-scene"; -import type { SpeciesFormChangeRevertWeatherFormTrigger } from "../pokemon-forms/form-change-triggers"; -// biome-ignore-end lint/correctness/noUnusedImports: Used in TSDoc export class Ability implements Localizable { public id: AbilityId; diff --git a/src/data/abilities/apply-ab-attrs.ts b/src/data/abilities/apply-ab-attrs.ts index 1571d64d170..e8f01a4bb36 100644 --- a/src/data/abilities/apply-ab-attrs.ts +++ b/src/data/abilities/apply-ab-attrs.ts @@ -1,6 +1,5 @@ -import type { AbAttrParamMap } from "#app/@types/ability-types"; -import type { AbAttrBaseParams, AbAttrString, CallableAbAttrString } from "#app/@types/ability-types"; import { globalScene } from "#app/global-scene"; +import type { AbAttrBaseParams, AbAttrParamMap, AbAttrString, CallableAbAttrString } from "#types/ability-types"; function applySingleAbAttrs( attrType: T, diff --git a/src/data/arena-tag.ts b/src/data/arena-tag.ts index 48fdebd745f..3a76958571e 100644 --- a/src/data/arena-tag.ts +++ b/src/data/arena-tag.ts @@ -1,26 +1,26 @@ +import { applyAbAttrs, applyOnGainAbAttrs, applyOnLoseAbAttrs } from "#abilities/apply-ab-attrs"; import { globalScene } from "#app/global-scene"; -import type { Arena } from "#app/field/arena"; -import { PokemonType } from "#enums/pokemon-type"; -import { BooleanHolder, NumberHolder, toDmgValue } from "#app/utils/common"; -import { allMoves } from "./data-lists"; -import { MoveTarget } from "#enums/MoveTarget"; -import { MoveCategory } from "#enums/MoveCategory"; import { getPokemonNameWithAffix } from "#app/messages"; -import type Pokemon from "#app/field/pokemon"; -import { HitResult } from "#enums/hit-result"; -import { StatusEffect } from "#enums/status-effect"; -import type { BattlerIndex } from "#enums/battler-index"; -import { applyAbAttrs, applyOnGainAbAttrs, applyOnLoseAbAttrs } from "./abilities/apply-ab-attrs"; -import { Stat } from "#enums/stat"; -import { CommonBattleAnim } from "#app/data/battle-anims"; -import { CommonAnim } from "#enums/move-anims-common"; -import i18next from "i18next"; +import { CommonBattleAnim } from "#data/battle-anims"; +import { allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; -import { ArenaTagType } from "#enums/arena-tag-type"; -import { BattlerTagType } from "#enums/battler-tag-type"; -import { MoveId } from "#enums/move-id"; import { ArenaTagSide } from "#enums/arena-tag-side"; +import { ArenaTagType } from "#enums/arena-tag-type"; +import type { BattlerIndex } from "#enums/battler-index"; +import { BattlerTagType } from "#enums/battler-tag-type"; +import { HitResult } from "#enums/hit-result"; +import { MoveCategory } from "#enums/MoveCategory"; +import { MoveTarget } from "#enums/MoveTarget"; +import { CommonAnim } from "#enums/move-anims-common"; +import { MoveId } from "#enums/move-id"; import { MoveUseMode } from "#enums/move-use-mode"; +import { PokemonType } from "#enums/pokemon-type"; +import { Stat } from "#enums/stat"; +import { StatusEffect } from "#enums/status-effect"; +import type { Arena } from "#field/arena"; +import type { Pokemon } from "#field/pokemon"; +import { BooleanHolder, NumberHolder, toDmgValue } from "#utils/common"; +import i18next from "i18next"; export abstract class ArenaTag { constructor( diff --git a/src/data/balance/biomes.ts b/src/data/balance/biomes.ts index 713ab9637ab..5ff060bf903 100644 --- a/src/data/balance/biomes.ts +++ b/src/data/balance/biomes.ts @@ -1,13 +1,12 @@ -import { PokemonType } from "#enums/pokemon-type"; -import { randSeedInt, getEnumValues } from "#app/utils/common"; -import type { SpeciesFormEvolution } from "#app/data/balance/pokemon-evolutions"; -import { pokemonEvolutions } from "#app/data/balance/pokemon-evolutions"; -import i18next from "i18next"; +import type { SpeciesFormEvolution } from "#balance/pokemon-evolutions"; +import { pokemonEvolutions } from "#balance/pokemon-evolutions"; import { BiomeId } from "#enums/biome-id"; +import { PokemonType } from "#enums/pokemon-type"; import { SpeciesId } from "#enums/species-id"; import { TimeOfDay } from "#enums/time-of-day"; import { TrainerType } from "#enums/trainer-type"; -// import beautify from "json-beautify"; +import { getEnumValues, randSeedInt } from "#utils/common"; +import i18next from "i18next"; export function getBiomeName(biome: BiomeId | -1) { if (biome === -1) { diff --git a/src/data/balance/egg-moves.ts b/src/data/balance/egg-moves.ts index fa89e558ba7..aa9285c15aa 100644 --- a/src/data/balance/egg-moves.ts +++ b/src/data/balance/egg-moves.ts @@ -1,7 +1,7 @@ -import { allMoves } from "../data-lists"; -import { getEnumKeys, getEnumValues } from "#app/utils/common"; +import { allMoves } from "#data/data-lists"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; +import { getEnumKeys, getEnumValues } from "#utils/common"; export const speciesEggMoves = { diff --git a/src/data/balance/pokemon-evolutions.ts b/src/data/balance/pokemon-evolutions.ts index 8714d6c0c9a..c5b4bb6d23f 100644 --- a/src/data/balance/pokemon-evolutions.ts +++ b/src/data/balance/pokemon-evolutions.ts @@ -1,21 +1,21 @@ import { globalScene } from "#app/global-scene"; -import { Gender, getGenderSymbol } from "#app/data/gender"; -import { PokeballType } from "#enums/pokeball"; -import type Pokemon from "#app/field/pokemon"; -import { PokemonType } from "#enums/pokemon-type"; -import { coerceArray, isNullOrUndefined, randSeedInt } from "#app/utils/common"; -import { WeatherType } from "#enums/weather-type"; -import { Nature } from "#enums/nature"; +import { speciesStarterCosts } from "#balance/starters"; +import { allMoves } from "#data/data-lists"; +import { Gender, getGenderSymbol } from "#data/gender"; import { BiomeId } from "#enums/biome-id"; import { MoveId } from "#enums/move-id"; -import { SpeciesId } from "#enums/species-id"; +import { Nature } from "#enums/nature"; +import { PokeballType } from "#enums/pokeball"; +import { PokemonType } from "#enums/pokemon-type"; import { SpeciesFormKey } from "#enums/species-form-key"; +import { SpeciesId } from "#enums/species-id"; import { TimeOfDay } from "#enums/time-of-day"; -import type { SpeciesStatBoosterItem, SpeciesStatBoosterModifierType } from "#app/modifier/modifier-type"; -import { speciesStarterCosts } from "./starters"; +import { WeatherType } from "#enums/weather-type"; +import type { Pokemon } from "#field/pokemon"; +import type { SpeciesStatBoosterItem, SpeciesStatBoosterModifierType } from "#modifiers/modifier-type"; +import { coerceArray, isNullOrUndefined, randSeedInt } from "#utils/common"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; import i18next from "i18next"; -import { allMoves } from "#app/data/data-lists"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; export enum SpeciesWildEvolutionDelay { NONE, diff --git a/src/data/balance/species-egg-tiers.ts b/src/data/balance/species-egg-tiers.ts index 4d953921e92..4c125fb07fa 100644 --- a/src/data/balance/species-egg-tiers.ts +++ b/src/data/balance/species-egg-tiers.ts @@ -1,5 +1,5 @@ -import { SpeciesId } from "#enums/species-id"; import { EggTier } from "#enums/egg-type"; +import { SpeciesId } from "#enums/species-id"; /** * Map of all starters and their respective {@linkcode EggTier}, which determines the type of egg the starter hatches from. diff --git a/src/data/battle-anims.ts b/src/data/battle-anims.ts index bed17fb0ebc..a9415b8f47b 100644 --- a/src/data/battle-anims.ts +++ b/src/data/battle-anims.ts @@ -1,22 +1,22 @@ import { globalScene } from "#app/global-scene"; -import { allMoves } from "#app/data/data-lists"; +import { allMoves } from "#data/data-lists"; +import type { BattlerIndex } from "#enums/battler-index"; +import { BattlerTagType } from "#enums/battler-tag-type"; +import { EncounterAnim } from "#enums/encounter-anims"; import { MoveFlags } from "#enums/MoveFlags"; -import type Pokemon from "#app/field/pokemon"; +import { AnimBlendType, AnimFocus, AnimFrameTarget, ChargeAnim, CommonAnim } from "#enums/move-anims-common"; +import { MoveId } from "#enums/move-id"; +import type { Pokemon } from "#field/pokemon"; import { - type nil, - getFrameMs, - getEnumKeys, - getEnumValues, animationFileName, coerceArray, + getEnumKeys, + getEnumValues, + getFrameMs, isNullOrUndefined, -} from "#app/utils/common"; -import type { BattlerIndex } from "#enums/battler-index"; -import { MoveId } from "#enums/move-id"; + type nil, +} from "#utils/common"; import Phaser from "phaser"; -import { EncounterAnim } from "#enums/encounter-anims"; -import { AnimBlendType, AnimFrameTarget, AnimFocus, ChargeAnim, CommonAnim } from "#enums/move-anims-common"; -import { BattlerTagType } from "#enums/battler-tag-type"; export class AnimConfig { public id: number; diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts index 0c6d1df7ad8..72fa6eaa64b 100644 --- a/src/data/battler-tags.ts +++ b/src/data/battler-tags.ts @@ -1,39 +1,37 @@ +import { applyAbAttrs } from "#abilities/apply-ab-attrs"; import { globalScene } from "#app/global-scene"; -import Overrides from "#app/overrides"; -import { applyAbAttrs } from "./abilities/apply-ab-attrs"; -import { allAbilities } from "./data-lists"; -import { CommonBattleAnim, MoveChargeAnim } from "#app/data/battle-anims"; -import { ChargeAnim, CommonAnim } from "#enums/move-anims-common"; -import type Move from "#app/data/moves/move"; -import { applyMoveAttrs } from "./moves/apply-attrs"; -import { allMoves } from "./data-lists"; -import { MoveFlags } from "#enums/MoveFlags"; -import { MoveCategory } from "#enums/MoveCategory"; -import { SpeciesFormChangeAbilityTrigger } from "./pokemon-forms/form-change-triggers"; -import { getStatusEffectHealText } from "#app/data/status-effect"; -import { TerrainType } from "#app/data/terrain"; -import { PokemonType } from "#enums/pokemon-type"; -import type Pokemon from "#app/field/pokemon"; -import { MoveResult } from "#enums/move-result"; -import { HitResult } from "#enums/hit-result"; import { getPokemonNameWithAffix } from "#app/messages"; -import type { MoveEffectPhase } from "#app/phases/move-effect-phase"; -import type { MovePhase } from "#app/phases/move-phase"; -import type { StatStageChangeCallback } from "#app/phases/stat-stage-change-phase"; -import i18next from "#app/plugins/i18n"; -import { BooleanHolder, coerceArray, getFrameMs, NumberHolder, toDmgValue } from "#app/utils/common"; +import Overrides from "#app/overrides"; +import { CommonBattleAnim, MoveChargeAnim } from "#data/battle-anims"; +import { allAbilities, allMoves } from "#data/data-lists"; +import { SpeciesFormChangeAbilityTrigger } from "#data/form-change-triggers"; +import { getStatusEffectHealText } from "#data/status-effect"; +import { TerrainType } from "#data/terrain"; import { AbilityId } from "#enums/ability-id"; +import { BattlerTagLapseType } from "#enums/battler-tag-lapse-type"; import { BattlerTagType } from "#enums/battler-tag-type"; +import { HitResult } from "#enums/hit-result"; +import { MoveCategory } from "#enums/MoveCategory"; +import { MoveFlags } from "#enums/MoveFlags"; +import { ChargeAnim, CommonAnim } from "#enums/move-anims-common"; import { MoveId } from "#enums/move-id"; +import { MoveResult } from "#enums/move-result"; +import { MoveUseMode } from "#enums/move-use-mode"; import { PokemonAnimType } from "#enums/pokemon-anim-type"; +import { PokemonType } from "#enums/pokemon-type"; import { SpeciesId } from "#enums/species-id"; -import { EFFECTIVE_STATS, getStatKey, Stat, type BattleStat, type EffectiveStat } from "#enums/stat"; +import { type BattleStat, EFFECTIVE_STATS, type EffectiveStat, getStatKey, Stat } from "#enums/stat"; import { StatusEffect } from "#enums/status-effect"; import { WeatherType } from "#enums/weather-type"; -import { isNullOrUndefined } from "#app/utils/common"; -import { MoveUseMode } from "#enums/move-use-mode"; -import { invalidEncoreMoves } from "./moves/invalid-moves"; -import { BattlerTagLapseType } from "#enums/battler-tag-lapse-type"; +import type { Pokemon } from "#field/pokemon"; +import { applyMoveAttrs } from "#moves/apply-attrs"; +import { invalidEncoreMoves } from "#moves/invalid-moves"; +import type { Move } from "#moves/move"; +import type { MoveEffectPhase } from "#phases/move-effect-phase"; +import type { MovePhase } from "#phases/move-phase"; +import type { StatStageChangeCallback } from "#phases/stat-stage-change-phase"; +import i18next from "#plugins/i18n"; +import { BooleanHolder, coerceArray, getFrameMs, isNullOrUndefined, NumberHolder, toDmgValue } from "#utils/common"; /** * A {@linkcode BattlerTag} represents a semi-persistent effect that can be attached to a {@linkcode Pokemon}. diff --git a/src/data/berry.ts b/src/data/berry.ts index be6e5c28f84..61235b75e21 100644 --- a/src/data/berry.ts +++ b/src/data/berry.ts @@ -1,14 +1,14 @@ -import { getPokemonNameWithAffix } from "../messages"; -import type Pokemon from "../field/pokemon"; -import { HitResult } from "#enums/hit-result"; -import { getStatusEffectHealText } from "./status-effect"; -import { NumberHolder, toDmgValue, randSeedInt } from "#app/utils/common"; -import { applyAbAttrs } from "./abilities/apply-ab-attrs"; -import i18next from "i18next"; +import { applyAbAttrs } from "#abilities/apply-ab-attrs"; +import { globalScene } from "#app/global-scene"; +import { getPokemonNameWithAffix } from "#app/messages"; +import { getStatusEffectHealText } from "#data/status-effect"; import { BattlerTagType } from "#enums/battler-tag-type"; import { BerryType } from "#enums/berry-type"; -import { Stat, type BattleStat } from "#app/enums/stat"; -import { globalScene } from "#app/global-scene"; +import { HitResult } from "#enums/hit-result"; +import { type BattleStat, Stat } from "#enums/stat"; +import type { Pokemon } from "#field/pokemon"; +import { NumberHolder, randSeedInt, toDmgValue } from "#utils/common"; +import i18next from "i18next"; export function getBerryName(berryType: BerryType): string { return i18next.t(`berry:${BerryType[berryType]}.name`); diff --git a/src/data/challenge.ts b/src/data/challenge.ts index 3fdd83c185d..938ee482d01 100644 --- a/src/data/challenge.ts +++ b/src/data/challenge.ts @@ -1,33 +1,33 @@ -import { BooleanHolder, type NumberHolder, randSeedItem } from "#app/utils/common"; -import { deepCopy } from "#app/utils/data"; -import i18next from "i18next"; -import type { DexAttrProps, GameData } from "#app/system/game-data"; -import { defaultStarterSpecies } from "#app/constants"; -import type PokemonSpecies from "#app/data/pokemon-species"; -import { getPokemonSpeciesForm } from "#app/data/pokemon-species"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; -import { speciesStarterCosts } from "#app/data/balance/starters"; -import type Pokemon from "#app/field/pokemon"; -import { PokemonMove } from "./moves/pokemon-move"; import type { FixedBattleConfig } from "#app/battle"; import { getRandomTrainerFunc } from "#app/battle"; -import { ClassicFixedBossWaves } from "#enums/fixed-boss-waves"; +import { defaultStarterSpecies } from "#app/constants"; +import { globalScene } from "#app/global-scene"; +import { pokemonEvolutions } from "#balance/pokemon-evolutions"; +import { speciesStarterCosts } from "#balance/starters"; +import { pokemonFormChanges } from "#data/pokemon-forms"; +import type { PokemonSpecies } from "#data/pokemon-species"; +import { getPokemonSpeciesForm } from "#data/pokemon-species"; import { BattleType } from "#enums/battle-type"; -import Trainer from "#app/field/trainer"; -import { TrainerVariant } from "#enums/trainer-variant"; -import { PokemonType } from "#enums/pokemon-type"; +import { ChallengeType } from "#enums/challenge-type"; import { Challenges } from "#enums/challenges"; +import { TypeColor, TypeShadow } from "#enums/color"; +import { ClassicFixedBossWaves } from "#enums/fixed-boss-waves"; +import { ModifierTier } from "#enums/modifier-tier"; +import type { MoveId } from "#enums/move-id"; +import type { MoveSourceType } from "#enums/move-source-type"; +import { Nature } from "#enums/nature"; +import { PokemonType } from "#enums/pokemon-type"; import { SpeciesId } from "#enums/species-id"; import { TrainerType } from "#enums/trainer-type"; -import { Nature } from "#enums/nature"; -import type { MoveId } from "#enums/move-id"; -import { TypeColor, TypeShadow } from "#enums/color"; -import { ModifierTier } from "#enums/modifier-tier"; -import { globalScene } from "#app/global-scene"; -import { pokemonFormChanges } from "./pokemon-forms"; -import { pokemonEvolutions } from "./balance/pokemon-evolutions"; -import { ChallengeType } from "#enums/challenge-type"; -import type { MoveSourceType } from "#enums/move-source-type"; +import { TrainerVariant } from "#enums/trainer-variant"; +import type { Pokemon } from "#field/pokemon"; +import { Trainer } from "#field/trainer"; +import { PokemonMove } from "#moves/pokemon-move"; +import type { DexAttrProps, GameData } from "#system/game-data"; +import { BooleanHolder, type NumberHolder, randSeedItem } from "#utils/common"; +import { deepCopy } from "#utils/data"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; +import i18next from "i18next"; /** A constant for the default max cost of the starting party before a run */ const DEFAULT_PARTY_MAX_COST = 10; diff --git a/src/data/daily-run.ts b/src/data/daily-run.ts index e869ba7f28f..e2cb2a8ca35 100644 --- a/src/data/daily-run.ts +++ b/src/data/daily-run.ts @@ -1,15 +1,15 @@ +import { pokerogueApi } from "#api/pokerogue-api"; +import { globalScene } from "#app/global-scene"; +import { speciesStarterCosts } from "#balance/starters"; +import type { PokemonSpeciesForm } from "#data/pokemon-species"; +import { getPokemonSpeciesForm, PokemonSpecies } from "#data/pokemon-species"; +import { BiomeId } from "#enums/biome-id"; import { PartyMemberStrength } from "#enums/party-member-strength"; import type { SpeciesId } from "#enums/species-id"; -import { globalScene } from "#app/global-scene"; -import { PlayerPokemon } from "#app/field/pokemon"; -import type { Starter } from "#app/ui/starter-select-ui-handler"; -import { randSeedGauss, randSeedInt, randSeedItem, getEnumValues } from "#app/utils/common"; -import type { PokemonSpeciesForm } from "#app/data/pokemon-species"; -import PokemonSpecies, { getPokemonSpeciesForm } from "#app/data/pokemon-species"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; -import { speciesStarterCosts } from "#app/data/balance/starters"; -import { pokerogueApi } from "#app/plugins/api/pokerogue-api"; -import { BiomeId } from "#enums/biome-id"; +import { PlayerPokemon } from "#field/pokemon"; +import type { Starter } from "#ui/starter-select-ui-handler"; +import { getEnumValues, randSeedGauss, randSeedInt, randSeedItem } from "#utils/common"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; export interface DailyRunConfig { seed: number; diff --git a/src/data/data-lists.ts b/src/data/data-lists.ts index ed172846fe1..ae3d0acc77f 100644 --- a/src/data/data-lists.ts +++ b/src/data/data-lists.ts @@ -1,7 +1,7 @@ -import type PokemonSpecies from "#app/data/pokemon-species"; -import type { ModifierTypes } from "#app/modifier/modifier-type"; -import type { Ability } from "./abilities/ability"; -import type Move from "./moves/move"; +import type { Ability } from "#abilities/ability"; +import type { PokemonSpecies } from "#data/pokemon-species"; +import type { ModifierTypes } from "#modifiers/modifier-type"; +import type { Move } from "#moves/move"; export const allAbilities: Ability[] = []; export const allMoves: Move[] = []; diff --git a/src/data/dialogue.ts b/src/data/dialogue.ts index 6bb96f0efb2..1296b0570e2 100644 --- a/src/data/dialogue.ts +++ b/src/data/dialogue.ts @@ -1,6 +1,6 @@ import { BattleSpec } from "#enums/battle-spec"; import { TrainerType } from "#enums/trainer-type"; -import { trainerConfigs } from "./trainers/trainer-config"; +import { trainerConfigs } from "#trainers/trainer-config"; export interface TrainerTypeMessages { encounter?: string | string[]; diff --git a/src/data/egg-hatch-data.ts b/src/data/egg-hatch-data.ts index e81ae69515c..6aead19eb7f 100644 --- a/src/data/egg-hatch-data.ts +++ b/src/data/egg-hatch-data.ts @@ -1,7 +1,7 @@ import { globalScene } from "#app/global-scene"; -import type { PlayerPokemon } from "#app/field/pokemon"; -import type { StarterDataEntry } from "#app/system/game-data"; -import type { DexEntry } from "#app/@types/dex-data"; +import type { PlayerPokemon } from "#field/pokemon"; +import type { StarterDataEntry } from "#system/game-data"; +import type { DexEntry } from "#types/dex-data"; /** * Stores data associated with a specific egg and the hatched pokemon diff --git a/src/data/egg.ts b/src/data/egg.ts index 4fd0bf27dbd..2c567686fc2 100644 --- a/src/data/egg.ts +++ b/src/data/egg.ts @@ -1,43 +1,43 @@ -import type BattleScene from "#app/battle-scene"; +import type { BattleScene } from "#app/battle-scene"; import { globalScene } from "#app/global-scene"; -import type PokemonSpecies from "#app/data/pokemon-species"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; -import { speciesStarterCosts } from "#app/data/balance/starters"; -import { VariantTier } from "#enums/variant-tier"; -import { randInt, randomString, randSeedInt, getIvsFromId } from "#app/utils/common"; import Overrides from "#app/overrides"; -import { pokemonPrevolutions } from "#app/data/balance/pokemon-evolutions"; -import type { PlayerPokemon } from "#app/field/pokemon"; -import i18next from "i18next"; -import { EggTier } from "#enums/egg-type"; -import { SpeciesId } from "#enums/species-id"; -import { EggSourceType } from "#enums/egg-source-types"; +import { pokemonPrevolutions } from "#balance/pokemon-evolutions"; import { - MANAPHY_EGG_MANAPHY_RATE, - SAME_SPECIES_EGG_HA_RATE, - GACHA_EGG_HA_RATE, - GACHA_DEFAULT_RARE_EGGMOVE_RATE, - SAME_SPECIES_EGG_RARE_EGGMOVE_RATE, - GACHA_MOVE_UP_RARE_EGGMOVE_RATE, - GACHA_DEFAULT_SHINY_RATE, - GACHA_SHINY_UP_SHINY_RATE, - SAME_SPECIES_EGG_SHINY_RATE, - EGG_PITY_LEGENDARY_THRESHOLD, EGG_PITY_EPIC_THRESHOLD, + EGG_PITY_LEGENDARY_THRESHOLD, EGG_PITY_RARE_THRESHOLD, - SHINY_VARIANT_CHANCE, - SHINY_EPIC_CHANCE, GACHA_DEFAULT_COMMON_EGG_THRESHOLD, - GACHA_DEFAULT_RARE_EGG_THRESHOLD, GACHA_DEFAULT_EPIC_EGG_THRESHOLD, + GACHA_DEFAULT_RARE_EGG_THRESHOLD, + GACHA_DEFAULT_RARE_EGGMOVE_RATE, + GACHA_DEFAULT_SHINY_RATE, + GACHA_EGG_HA_RATE, GACHA_LEGENDARY_UP_THRESHOLD_OFFSET, - HATCH_WAVES_MANAPHY_EGG, + GACHA_MOVE_UP_RARE_EGGMOVE_RATE, + GACHA_SHINY_UP_SHINY_RATE, HATCH_WAVES_COMMON_EGG, - HATCH_WAVES_RARE_EGG, HATCH_WAVES_EPIC_EGG, HATCH_WAVES_LEGENDARY_EGG, -} from "#app/data/balance/rates"; -import { speciesEggTiers } from "#app/data/balance/species-egg-tiers"; + HATCH_WAVES_MANAPHY_EGG, + HATCH_WAVES_RARE_EGG, + MANAPHY_EGG_MANAPHY_RATE, + SAME_SPECIES_EGG_HA_RATE, + SAME_SPECIES_EGG_RARE_EGGMOVE_RATE, + SAME_SPECIES_EGG_SHINY_RATE, + SHINY_EPIC_CHANCE, + SHINY_VARIANT_CHANCE, +} from "#balance/rates"; +import { speciesEggTiers } from "#balance/species-egg-tiers"; +import { speciesStarterCosts } from "#balance/starters"; +import type { PokemonSpecies } from "#data/pokemon-species"; +import { EggSourceType } from "#enums/egg-source-types"; +import { EggTier } from "#enums/egg-type"; +import { SpeciesId } from "#enums/species-id"; +import { VariantTier } from "#enums/variant-tier"; +import type { PlayerPokemon } from "#field/pokemon"; +import { getIvsFromId, randInt, randomString, randSeedInt } from "#utils/common"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; +import i18next from "i18next"; export const EGG_SEED = 1073741824; diff --git a/src/data/moves/apply-attrs.ts b/src/data/moves/apply-attrs.ts index 98e7b6d791f..3162ba02bde 100644 --- a/src/data/moves/apply-attrs.ts +++ b/src/data/moves/apply-attrs.ts @@ -1,11 +1,11 @@ -/** +/* * Module holding functions to apply move attributes. * Must not import anything that is not a type. */ -import type Pokemon from "#app/field/pokemon"; -import type { default as Move, MoveAttr } from "./move"; -import type { ChargingMove } from "#app/@types/move-types"; -import type { MoveAttrFilter, MoveAttrString } from "#app/@types/move-types"; + +import type { Pokemon } from "#field/pokemon"; +import type { Move, MoveAttr } from "#moves/move"; +import type { ChargingMove, MoveAttrFilter, MoveAttrString } from "#types/move-types"; function applyMoveAttrsInternal( attrFilter: MoveAttrFilter, diff --git a/src/data/moves/move-utils.ts b/src/data/moves/move-utils.ts index 20723ab0347..39891f595aa 100644 --- a/src/data/moves/move-utils.ts +++ b/src/data/moves/move-utils.ts @@ -1,14 +1,13 @@ -import type Pokemon from "#app/field/pokemon"; +import { allMoves } from "#data/data-lists"; import type { BattlerIndex } from "#enums/battler-index"; -import type { MoveId } from "#enums/move-id"; -import type { MoveTargetSet, UserMoveConditionFunc } from "./move"; -import type Move from "./move"; -import { NumberHolder, isNullOrUndefined } from "#app/utils/common"; -import { MoveTarget } from "#enums/MoveTarget"; -import { PokemonType } from "#enums/pokemon-type"; -import { allMoves } from "#app/data/data-lists"; -import { applyMoveAttrs } from "./apply-attrs"; import { BattlerTagType } from "#enums/battler-tag-type"; +import { MoveTarget } from "#enums/MoveTarget"; +import type { MoveId } from "#enums/move-id"; +import { PokemonType } from "#enums/pokemon-type"; +import type { Pokemon } from "#field/pokemon"; +import { applyMoveAttrs } from "#moves/apply-attrs"; +import type { Move, MoveTargetSet, UserMoveConditionFunc } from "#moves/move"; +import { isNullOrUndefined, NumberHolder } from "#utils/common"; /** * Return whether the move targets the field diff --git a/src/data/moves/move.ts b/src/data/moves/move.ts index 0878ece2f01..bfe17c048da 100644 --- a/src/data/moves/move.ts +++ b/src/data/moves/move.ts @@ -1,5 +1,14 @@ -import { MoveChargeAnim } from "../battle-anims"; -import { ChargeAnim } from "#enums/move-anims-common"; +import { AbAttrParamsWithCancel, PreAttackModifyPowerAbAttrParams } from "#abilities/ability"; +import { + applyAbAttrs +} from "#abilities/apply-ab-attrs"; +import { loggedInUser } from "#app/account"; +import type { GameMode } from "#app/game-mode"; +import { globalScene } from "#app/global-scene"; +import { getPokemonNameWithAffix } from "#app/messages"; +import type { ArenaTrapTag } from "#data/arena-tag"; +import { WeakenMoveTypeTag } from "#data/arena-tag"; +import { MoveChargeAnim } from "#data/battle-anims"; import { CommandedTag, EncoreTag, @@ -11,32 +20,53 @@ import { SubstituteTag, TrappedTag, TypeBoostTag, -} from "../battler-tags"; -import { getPokemonNameWithAffix } from "../../messages"; -import type { TurnMove } from "#app/@types/turn-move"; -import type { AttackMoveResult } from "#app/@types/attack-move-result"; -import type Pokemon from "../../field/pokemon"; -import type { EnemyPokemon } from "#app/field/pokemon"; -import { PokemonMove } from "./pokemon-move"; -import { MoveResult } from "#enums/move-result"; -import { HitResult } from "#enums/hit-result"; -import { FieldPosition } from "#enums/field-position"; +} from "#data/battler-tags"; +import { getBerryEffectFunc } from "#data/berry"; +import { applyChallenges } from "#data/challenge"; +import { allAbilities, allMoves } from "#data/data-lists"; +import { SpeciesFormChangeRevertWeatherFormTrigger } from "#data/form-change-triggers"; import { getNonVolatileStatusEffects, getStatusEffectHealText, isNonVolatileStatusEffect, -} from "../status-effect"; -import { getTypeDamageMultiplier } from "../type"; -import { PokemonType } from "#enums/pokemon-type"; -import { BooleanHolder, NumberHolder, isNullOrUndefined, toDmgValue, randSeedItem, randSeedInt, getEnumValues, toReadableString, type Constructor, randSeedFloat } from "#app/utils/common"; -import { WeatherType } from "#enums/weather-type"; -import type { ArenaTrapTag } from "../arena-tag"; -import { WeakenMoveTypeTag } from "../arena-tag"; +} from "#data/status-effect"; +import { TerrainType } from "#data/terrain"; +import { getTypeDamageMultiplier } from "#data/type"; +import { AbilityId } from "#enums/ability-id"; import { ArenaTagSide } from "#enums/arena-tag-side"; +import { ArenaTagType } from "#enums/arena-tag-type"; +import { BattleType } from "#enums/battle-type"; +import type { BattlerIndex } from "#enums/battler-index"; +import { BattlerTagType } from "#enums/battler-tag-type"; +import { BiomeId } from "#enums/biome-id"; +import { ChallengeType } from "#enums/challenge-type"; +import { Command } from "#enums/command"; +import { FieldPosition } from "#enums/field-position"; +import { HitResult } from "#enums/hit-result"; +import { ModifierPoolType } from "#enums/modifier-pool-type"; +import { ChargeAnim } from "#enums/move-anims-common"; +import { MoveId } from "#enums/move-id"; +import { MoveResult } from "#enums/move-result"; +import { isVirtual, MoveUseMode } from "#enums/move-use-mode"; +import { MoveCategory } from "#enums/MoveCategory"; +import { MoveEffectTrigger } from "#enums/MoveEffectTrigger"; +import { MoveFlags } from "#enums/MoveFlags"; +import { MoveTarget } from "#enums/MoveTarget"; +import { MultiHitType } from "#enums/MultiHitType"; +import { PokemonType } from "#enums/pokemon-type"; +import { SpeciesId } from "#enums/species-id"; import { - applyAbAttrs -} from "../abilities/apply-ab-attrs"; -import { allAbilities, allMoves } from "../data-lists"; + BATTLE_STATS, + type BattleStat, + type EffectiveStat, + getStatKey, + Stat, +} from "#enums/stat"; +import { StatusEffect } from "#enums/status-effect"; +import { SwitchType } from "#enums/switch-type"; +import { WeatherType } from "#enums/weather-type"; +import { MoveUsedEvent } from "#events/battle-scene"; +import type { EnemyPokemon, Pokemon } from "#field/pokemon"; import { AttackTypeBoosterModifier, BerryModifier, @@ -44,52 +74,21 @@ import { PokemonMoveAccuracyBoosterModifier, PokemonMultiHitModifier, PreserveBerryModifier, -} from "../../modifier/modifier"; -import type { BattlerIndex } from "#enums/battler-index"; -import { BattleType } from "#enums/battle-type"; -import { TerrainType } from "../terrain"; -import { ModifierPoolType } from "#enums/modifier-pool-type"; -import { Command } from "#enums/command"; +} from "#modifiers/modifier"; +import { applyMoveAttrs } from "#moves/apply-attrs"; +import { invalidAssistMoves, invalidCopycatMoves, invalidMetronomeMoves, invalidMirrorMoveMoves, invalidSketchMoves, invalidSleepTalkMoves } from "#moves/invalid-moves"; +import { frenzyMissFunc, getMoveTargets } from "#moves/move-utils"; +import { PokemonMove } from "#moves/pokemon-move"; +import { MoveEndPhase } from "#phases/move-end-phase"; +import { MovePhase } from "#phases/move-phase"; +import { PokemonHealPhase } from "#phases/pokemon-heal-phase"; +import { SwitchSummonPhase } from "#phases/switch-summon-phase"; +import type { AttackMoveResult } from "#types/attack-move-result"; +import type { Localizable } from "#types/locales"; +import type { ChargingMove, MoveAttrMap, MoveAttrString, MoveClassMap, MoveKindString } from "#types/move-types"; +import type { TurnMove } from "#types/turn-move"; +import { BooleanHolder, type Constructor, getEnumValues, isNullOrUndefined, NumberHolder, randSeedFloat, randSeedInt, randSeedItem, toDmgValue, toReadableString } from "#utils/common"; import i18next from "i18next"; -import type { Localizable } from "#app/@types/locales"; -import { getBerryEffectFunc } from "../berry"; -import { AbilityId } from "#enums/ability-id"; -import { ArenaTagType } from "#enums/arena-tag-type"; -import { BattlerTagType } from "#enums/battler-tag-type"; -import { BiomeId } from "#enums/biome-id"; -import { MoveId } from "#enums/move-id"; -import { SpeciesId } from "#enums/species-id"; -import { MoveUsedEvent } from "#app/events/battle-scene"; -import { - BATTLE_STATS, - type BattleStat, - type EffectiveStat, - getStatKey, - Stat, -} from "#app/enums/stat"; -import { MoveEndPhase } from "#app/phases/move-end-phase"; -import { MovePhase } from "#app/phases/move-phase"; -import { PokemonHealPhase } from "#app/phases/pokemon-heal-phase"; -import { SwitchSummonPhase } from "#app/phases/switch-summon-phase"; -import { SpeciesFormChangeRevertWeatherFormTrigger } from "../pokemon-forms/form-change-triggers"; -import type { GameMode } from "#app/game-mode"; -import { applyChallenges } from "../challenge"; -import { ChallengeType } from "#enums/challenge-type"; -import { SwitchType } from "#enums/switch-type"; -import { StatusEffect } from "#enums/status-effect"; -import { globalScene } from "#app/global-scene"; -import { loggedInUser } from "#app/account"; -import { MoveCategory } from "#enums/MoveCategory"; -import { MoveTarget } from "#enums/MoveTarget"; -import { MoveFlags } from "#enums/MoveFlags"; -import { MoveEffectTrigger } from "#enums/MoveEffectTrigger"; -import { MultiHitType } from "#enums/MultiHitType"; -import { invalidAssistMoves, invalidCopycatMoves, invalidMetronomeMoves, invalidMirrorMoveMoves, invalidSleepTalkMoves, invalidSketchMoves } from "./invalid-moves"; -import { isVirtual, MoveUseMode } from "#enums/move-use-mode"; -import type { ChargingMove, MoveAttrMap, MoveAttrString, MoveKindString, MoveClassMap } from "#app/@types/move-types"; -import { applyMoveAttrs } from "./apply-attrs"; -import { frenzyMissFunc, getMoveTargets } from "./move-utils"; -import { AbAttrBaseParams, AbAttrParamsWithCancel, PreAttackModifyPowerAbAttrParams } from "../abilities/ability"; /** * A function used to conditionally determine execution of a given {@linkcode MoveAttr}. @@ -98,7 +97,7 @@ import { AbAttrBaseParams, AbAttrParamsWithCancel, PreAttackModifyPowerAbAttrPar type MoveConditionFunc = (user: Pokemon, target: Pokemon, move: Move) => boolean; export type UserMoveConditionFunc = (user: Pokemon, move: Move) => boolean; -export default abstract class Move implements Localizable { +export abstract class Move implements Localizable { public id: MoveId; public name: string; private _type: PokemonType; diff --git a/src/data/moves/pokemon-move.ts b/src/data/moves/pokemon-move.ts index ab774c9fff9..ec5ae195bd6 100644 --- a/src/data/moves/pokemon-move.ts +++ b/src/data/moves/pokemon-move.ts @@ -1,8 +1,8 @@ -import type Pokemon from "#app/field/pokemon"; -import { toDmgValue } from "#app/utils/common"; +import { allMoves } from "#data/data-lists"; import type { MoveId } from "#enums/move-id"; -import { allMoves } from "../data-lists"; -import type Move from "./move"; +import type { Pokemon } from "#field/pokemon"; +import type { Move } from "#moves/move"; +import { toDmgValue } from "#utils/common"; /** * Wrapper class for the {@linkcode Move} class for Pokemon to interact with. diff --git a/src/data/mystery-encounters/encounters/a-trainers-test-encounter.ts b/src/data/mystery-encounters/encounters/a-trainers-test-encounter.ts index 7a1c9821e89..5b2805f9310 100644 --- a/src/data/mystery-encounters/encounters/a-trainers-test-encounter.ts +++ b/src/data/mystery-encounters/encounters/a-trainers-test-encounter.ts @@ -1,27 +1,27 @@ +import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; import { globalScene } from "#app/global-scene"; -import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { modifierTypes } from "#data/data-lists"; +import type { IEggOptions } from "#data/egg"; +import { EggSourceType } from "#enums/egg-source-types"; +import { EggTier } from "#enums/egg-type"; +import { ModifierTier } from "#enums/modifier-tier"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { SpeciesId } from "#enums/species-id"; +import { TrainerType } from "#enums/trainer-type"; +import type { EnemyPartyConfig } from "#mystery-encounters/encounter-phase-utils"; import { initBattleWithEnemyConfig, leaveEncounterWithoutBattle, setEncounterRewards, transitionMysteryEncounterIntroVisuals, -} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { trainerConfigs } from "#app/data/trainers/trainer-config"; -import { MysteryEncounterType } from "#enums/mystery-encounter-type"; -import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { TrainerType } from "#enums/trainer-type"; -import { SpeciesId } from "#enums/species-id"; -import { getSpriteKeysFromSpecies } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; -import { randSeedInt } from "#app/utils/common"; +} from "#mystery-encounters/encounter-phase-utils"; +import { getSpriteKeysFromSpecies } from "#mystery-encounters/encounter-pokemon-utils"; +import type { MysteryEncounter } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter"; +import { trainerConfigs } from "#trainers/trainer-config"; +import { randSeedInt } from "#utils/common"; import i18next from "i18next"; -import type { IEggOptions } from "#app/data/egg"; -import { EggSourceType } from "#enums/egg-source-types"; -import { EggTier } from "#enums/egg-type"; -import { ModifierTier } from "#enums/modifier-tier"; -import { modifierTypes } from "#app/data/data-lists"; -import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; /** the i18n namespace for the encounter */ const namespace = "mysteryEncounters/aTrainersTest"; diff --git a/src/data/mystery-encounters/encounters/absolute-avarice-encounter.ts b/src/data/mystery-encounters/encounters/absolute-avarice-encounter.ts index bec75288837..d6058eb9eaf 100644 --- a/src/data/mystery-encounters/encounters/absolute-avarice-encounter.ts +++ b/src/data/mystery-encounters/encounters/absolute-avarice-encounter.ts @@ -1,44 +1,44 @@ -import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { globalScene } from "#app/global-scene"; +import { modifierTypes } from "#data/data-lists"; +import { BattlerIndex } from "#enums/battler-index"; +import { BattlerTagType } from "#enums/battler-tag-type"; +import type { BerryType } from "#enums/berry-type"; +import { MoveId } from "#enums/move-id"; +import { MoveUseMode } from "#enums/move-use-mode"; +import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { PokeballType } from "#enums/pokeball"; +import { SpeciesId } from "#enums/species-id"; +import { Stat } from "#enums/stat"; +import { TrainerSlot } from "#enums/trainer-slot"; +import type { Pokemon } from "#field/pokemon"; +import { EnemyPokemon } from "#field/pokemon"; +import { BerryModifier, PokemonInstantReviveModifier } from "#modifiers/modifier"; +import type { BerryModifierType, PokemonHeldItemModifierType } from "#modifiers/modifier-type"; +import { PokemonMove } from "#moves/pokemon-move"; +import { queueEncounterMessage } from "#mystery-encounters/encounter-dialogue-utils"; +import type { EnemyPartyConfig } from "#mystery-encounters/encounter-phase-utils"; import { generateModifierType, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, setEncounterRewards, transitionMysteryEncounterIntroVisuals, -} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import type Pokemon from "#app/field/pokemon"; -import { EnemyPokemon } from "#app/field/pokemon"; -import { PokemonMove } from "#app/data/moves/pokemon-move"; -import type { BerryModifierType, PokemonHeldItemModifierType } from "#app/modifier/modifier-type"; -import { modifierTypes } from "#app/data/data-lists"; -import { MysteryEncounterType } from "#enums/mystery-encounter-type"; -import { SpeciesId } from "#enums/species-id"; -import { globalScene } from "#app/global-scene"; -import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; -import { PersistentModifierRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements"; -import { queueEncounterMessage } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import { BerryModifier, PokemonInstantReviveModifier } from "#app/modifier/modifier"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; -import { MoveId } from "#enums/move-id"; -import { BattlerTagType } from "#enums/battler-tag-type"; -import { randInt } from "#app/utils/common"; -import { BattlerIndex } from "#enums/battler-index"; +} from "#mystery-encounters/encounter-phase-utils"; import { applyModifierTypeToPlayerPokemon, catchPokemon, getHighestLevelPlayerPokemon, -} from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; -import { TrainerSlot } from "#enums/trainer-slot"; -import { PokeballType } from "#enums/pokeball"; -import type HeldModifierConfig from "#app/@types/held-modifier-config"; -import type { BerryType } from "#enums/berry-type"; -import { Stat } from "#enums/stat"; +} from "#mystery-encounters/encounter-pokemon-utils"; +import type { MysteryEncounter } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option"; +import { PersistentModifierRequirement } from "#mystery-encounters/mystery-encounter-requirements"; +import type { HeldModifierConfig } from "#types/held-modifier-config"; +import { randInt } from "#utils/common"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; import i18next from "i18next"; -import { MoveUseMode } from "#enums/move-use-mode"; /** the i18n namespace for this encounter */ const namespace = "mysteryEncounters/absoluteAvarice"; diff --git a/src/data/mystery-encounters/encounters/an-offer-you-cant-refuse-encounter.ts b/src/data/mystery-encounters/encounters/an-offer-you-cant-refuse-encounter.ts index f8a904cdb45..619acabe200 100644 --- a/src/data/mystery-encounters/encounters/an-offer-you-cant-refuse-encounter.ts +++ b/src/data/mystery-encounters/encounters/an-offer-you-cant-refuse-encounter.ts @@ -1,28 +1,28 @@ +import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; +import { globalScene } from "#app/global-scene"; +import { speciesStarterCosts } from "#balance/starters"; +import { modifierTypes } from "#data/data-lists"; +import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { SpeciesId } from "#enums/species-id"; import { generateModifierType, leaveEncounterWithoutBattle, setEncounterExp, updatePlayerMoney, -} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { modifierTypes } from "#app/data/data-lists"; -import { MysteryEncounterType } from "#enums/mystery-encounter-type"; -import { SpeciesId } from "#enums/species-id"; -import { globalScene } from "#app/global-scene"; -import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; +} from "#mystery-encounters/encounter-phase-utils"; +import { getHighestStatTotalPlayerPokemon } from "#mystery-encounters/encounter-pokemon-utils"; +import type { MysteryEncounter } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option"; import { AbilityRequirement, CombinationPokemonRequirement, MoveRequirement, -} from "#app/data/mystery-encounters/mystery-encounter-requirements"; -import { getHighestStatTotalPlayerPokemon } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; -import { EXTORTION_ABILITIES, EXTORTION_MOVES } from "#app/data/mystery-encounters/requirements/requirement-groups"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; -import { speciesStarterCosts } from "#app/data/balance/starters"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; +} from "#mystery-encounters/mystery-encounter-requirements"; +import { EXTORTION_ABILITIES, EXTORTION_MOVES } from "#mystery-encounters/requirement-groups"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; import i18next from "i18next"; /** the i18n namespace for this encounter */ diff --git a/src/data/mystery-encounters/encounters/berries-abound-encounter.ts b/src/data/mystery-encounters/encounters/berries-abound-encounter.ts index d86a8439804..d39f5930d46 100644 --- a/src/data/mystery-encounters/encounters/berries-abound-encounter.ts +++ b/src/data/mystery-encounters/encounters/berries-abound-encounter.ts @@ -1,5 +1,20 @@ -import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; -import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; +import { globalScene } from "#app/global-scene"; +import { getPokemonNameWithAffix } from "#app/messages"; +import { modifierTypes } from "#data/data-lists"; +import { BattlerTagType } from "#enums/battler-tag-type"; +import { BerryType } from "#enums/berry-type"; +import { ModifierPoolType } from "#enums/modifier-pool-type"; +import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { PERMANENT_STATS, Stat } from "#enums/stat"; +import type { PlayerPokemon, Pokemon } from "#field/pokemon"; +import { BerryModifier } from "#modifiers/modifier"; +import type { BerryModifierType, ModifierTypeOption } from "#modifiers/modifier-type"; +import { regenerateModifierPoolThresholds } from "#modifiers/modifier-type"; +import { queueEncounterMessage, showEncounterText } from "#mystery-encounters/encounter-dialogue-utils"; +import type { EnemyPartyConfig } from "#mystery-encounters/encounter-phase-utils"; import { generateModifierType, generateModifierTypeOption, @@ -8,36 +23,20 @@ import { leaveEncounterWithoutBattle, setEncounterExp, setEncounterRewards, -} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import type { PlayerPokemon } from "#app/field/pokemon"; -import type Pokemon from "#app/field/pokemon"; -import type { BerryModifierType, ModifierTypeOption } from "#app/modifier/modifier-type"; -import { regenerateModifierPoolThresholds } from "#app/modifier/modifier-type"; -import { modifierTypes } from "#app/data/data-lists"; -import { ModifierPoolType } from "#enums/modifier-pool-type"; -import { randSeedInt } from "#app/utils/common"; -import { BattlerTagType } from "#enums/battler-tag-type"; -import { MysteryEncounterType } from "#enums/mystery-encounter-type"; -import { globalScene } from "#app/global-scene"; -import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter"; -import { queueEncounterMessage, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; -import { getPokemonNameWithAffix } from "#app/messages"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +} from "#mystery-encounters/encounter-phase-utils"; import { applyModifierTypeToPlayerPokemon, getEncounterPokemonLevelForWave, getHighestStatPlayerPokemon, getSpriteKeysFromPokemon, STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER, -} from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; -import PokemonData from "#app/system/pokemon-data"; -import { BerryModifier } from "#app/modifier/modifier"; -import i18next from "#app/plugins/i18n"; -import { BerryType } from "#enums/berry-type"; -import { PERMANENT_STATS, Stat } from "#enums/stat"; -import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; +} from "#mystery-encounters/encounter-pokemon-utils"; +import type { MysteryEncounter } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option"; +import i18next from "#plugins/i18n"; +import { PokemonData } from "#system/pokemon-data"; +import { randSeedInt } from "#utils/common"; /** the i18n namespace for the encounter */ const namespace = "mysteryEncounters/berriesAbound"; diff --git a/src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts b/src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts index df06f40c159..299c14b21b6 100644 --- a/src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts +++ b/src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts @@ -1,4 +1,29 @@ -import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; +import { globalScene } from "#app/global-scene"; +import { allMoves, modifierTypes } from "#data/data-lists"; +import { ModifierTier } from "#enums/modifier-tier"; +import { MoveId } from "#enums/move-id"; +import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { PartyMemberStrength } from "#enums/party-member-strength"; +import { PokemonType } from "#enums/pokemon-type"; +import { SpeciesId } from "#enums/species-id"; +import { TrainerSlot } from "#enums/trainer-slot"; +import { TrainerType } from "#enums/trainer-type"; +import type { PlayerPokemon, Pokemon } from "#field/pokemon"; +import type { PokemonHeldItemModifier } from "#modifiers/modifier"; +import { + AttackTypeBoosterModifier, + BypassSpeedChanceModifier, + ContactHeldItemTransferChanceModifier, + GigantamaxAccessModifier, + MegaEvolutionAccessModifier, +} from "#modifiers/modifier"; +import type { AttackTypeBoosterModifierType, ModifierTypeOption } from "#modifiers/modifier-type"; +import { PokemonMove } from "#moves/pokemon-move"; +import { getEncounterText, showEncounterDialogue } from "#mystery-encounters/encounter-dialogue-utils"; +import type { EnemyPartyConfig } from "#mystery-encounters/encounter-phase-utils"; import { generateModifierType, generateModifierTypeOption, @@ -8,51 +33,23 @@ import { selectPokemonForOption, setEncounterRewards, transitionMysteryEncounterIntroVisuals, -} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { getRandomPartyMemberFunc, trainerConfigs } from "#app/data/trainers/trainer-config"; -import { TrainerPartyCompoundTemplate } from "#app/data/trainers/TrainerPartyTemplate"; -import { TrainerPartyTemplate } from "#app/data/trainers/TrainerPartyTemplate"; -import { TrainerSlot } from "#enums/trainer-slot"; -import { MysteryEncounterType } from "#enums/mystery-encounter-type"; -import { PartyMemberStrength } from "#enums/party-member-strength"; -import { globalScene } from "#app/global-scene"; -import { isNullOrUndefined, randSeedInt, randSeedShuffle } from "#app/utils/common"; -import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { TrainerType } from "#enums/trainer-type"; -import { SpeciesId } from "#enums/species-id"; -import type { PlayerPokemon } from "#app/field/pokemon"; -import type Pokemon from "#app/field/pokemon"; -import { PokemonMove } from "#app/data/moves/pokemon-move"; -import { getEncounterText, showEncounterDialogue } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; -import { MoveId } from "#enums/move-id"; -import type { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler"; -import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; -import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +} from "#mystery-encounters/encounter-phase-utils"; +import { getSpriteKeysFromSpecies } from "#mystery-encounters/encounter-pokemon-utils"; +import type { MysteryEncounter } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option"; import { AttackTypeBoosterHeldItemTypeRequirement, CombinationPokemonRequirement, HeldItemRequirement, TypeRequirement, -} from "#app/data/mystery-encounters/mystery-encounter-requirements"; -import { PokemonType } from "#enums/pokemon-type"; -import type { AttackTypeBoosterModifierType, ModifierTypeOption } from "#app/modifier/modifier-type"; -import { modifierTypes } from "#app/data/data-lists"; -import type { PokemonHeldItemModifier } from "#app/modifier/modifier"; -import { - AttackTypeBoosterModifier, - BypassSpeedChanceModifier, - ContactHeldItemTransferChanceModifier, - GigantamaxAccessModifier, - MegaEvolutionAccessModifier, -} from "#app/modifier/modifier"; +} from "#mystery-encounters/mystery-encounter-requirements"; +import { TrainerPartyCompoundTemplate, TrainerPartyTemplate } from "#trainers/TrainerPartyTemplate"; +import { getRandomPartyMemberFunc, trainerConfigs } from "#trainers/trainer-config"; +import type { OptionSelectItem } from "#ui/abstact-option-select-ui-handler"; +import { MoveInfoOverlay } from "#ui/move-info-overlay"; +import { isNullOrUndefined, randSeedInt, randSeedShuffle } from "#utils/common"; import i18next from "i18next"; -import MoveInfoOverlay from "#app/ui/move-info-overlay"; -import { allMoves } from "#app/data/data-lists"; -import { ModifierTier } from "#enums/modifier-tier"; -import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; -import { getSpriteKeysFromSpecies } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; /** the i18n namespace for the encounter */ const namespace = "mysteryEncounters/bugTypeSuperfan"; diff --git a/src/data/mystery-encounters/encounters/clowning-around-encounter.ts b/src/data/mystery-encounters/encounters/clowning-around-encounter.ts index 553c4deb74e..5e3ece7b301 100644 --- a/src/data/mystery-encounters/encounters/clowning-around-encounter.ts +++ b/src/data/mystery-encounters/encounters/clowning-around-encounter.ts @@ -1,4 +1,32 @@ -import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; +import { globalScene } from "#app/global-scene"; +import { EncounterBattleAnim } from "#data/battle-anims"; +import { allAbilities, modifierTypes } from "#data/data-lists"; +import { CustomPokemonData } from "#data/pokemon-data"; +import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; +import { BerryType } from "#enums/berry-type"; +import { Challenges } from "#enums/challenges"; +import { EncounterAnim } from "#enums/encounter-anims"; +import { MoveCategory } from "#enums/MoveCategory"; +import { ModifierPoolType } from "#enums/modifier-pool-type"; +import { ModifierTier } from "#enums/modifier-tier"; +import { MoveId } from "#enums/move-id"; +import { MoveUseMode } from "#enums/move-use-mode"; +import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { PartyMemberStrength } from "#enums/party-member-strength"; +import { PokemonType } from "#enums/pokemon-type"; +import { SpeciesId } from "#enums/species-id"; +import { TrainerType } from "#enums/trainer-type"; +import { UiMode } from "#enums/ui-mode"; +import type { PlayerPokemon } from "#field/pokemon"; +import { BerryModifier } from "#modifiers/modifier"; +import type { PokemonHeldItemModifierType } from "#modifiers/modifier-type"; +import { PokemonMove } from "#moves/pokemon-move"; +import { showEncounterDialogue, showEncounterText } from "#mystery-encounters/encounter-dialogue-utils"; +import type { EnemyPartyConfig } from "#mystery-encounters/encounter-phase-utils"; import { generateModifierType, initBattleWithEnemyConfig, @@ -7,49 +35,20 @@ import { selectPokemonForOption, setEncounterRewards, transitionMysteryEncounterIntroVisuals, -} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { trainerConfigs } from "#app/data/trainers/trainer-config"; -import { TrainerPartyCompoundTemplate } from "#app/data/trainers/TrainerPartyTemplate"; -import { TrainerPartyTemplate } from "#app/data/trainers/TrainerPartyTemplate"; -import { ModifierTier } from "#enums/modifier-tier"; -import type { PokemonHeldItemModifierType } from "#app/modifier/modifier-type"; -import { ModifierPoolType } from "#enums/modifier-pool-type"; -import { MysteryEncounterType } from "#enums/mystery-encounter-type"; -import { PartyMemberStrength } from "#enums/party-member-strength"; -import { globalScene } from "#app/global-scene"; -import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { SpeciesId } from "#enums/species-id"; -import { TrainerType } from "#enums/trainer-type"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; -import { AbilityId } from "#enums/ability-id"; +} from "#mystery-encounters/encounter-phase-utils"; import { applyAbilityOverrideToPokemon, applyModifierTypeToPlayerPokemon, -} from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; -import { PokemonType } from "#enums/pokemon-type"; -import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; -import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import { randSeedInt, randSeedShuffle } from "#app/utils/common"; -import { showEncounterDialogue, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; -import { UiMode } from "#enums/ui-mode"; +} from "#mystery-encounters/encounter-pokemon-utils"; +import type { MysteryEncounter } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option"; +import { TrainerPartyCompoundTemplate, TrainerPartyTemplate } from "#trainers/TrainerPartyTemplate"; +import { trainerConfigs } from "#trainers/trainer-config"; +import type { OptionSelectConfig } from "#ui/abstact-option-select-ui-handler"; +import { randSeedInt, randSeedShuffle } from "#utils/common"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; import i18next from "i18next"; -import type { OptionSelectConfig } from "#app/ui/abstact-option-select-ui-handler"; -import type { PlayerPokemon } from "#app/field/pokemon"; -import { PokemonMove } from "#app/data/moves/pokemon-move"; -import { BerryModifier } from "#app/modifier/modifier"; -import { BerryType } from "#enums/berry-type"; -import { BattlerIndex } from "#enums/battler-index"; -import { MoveId } from "#enums/move-id"; -import { EncounterBattleAnim } from "#app/data/battle-anims"; -import { MoveCategory } from "#enums/MoveCategory"; -import { CustomPokemonData } from "#app/data/pokemon/pokemon-data"; -import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; -import { EncounterAnim } from "#enums/encounter-anims"; -import { Challenges } from "#enums/challenges"; -import { MoveUseMode } from "#enums/move-use-mode"; -import { allAbilities, modifierTypes } from "#app/data/data-lists"; /** the i18n namespace for the encounter */ const namespace = "mysteryEncounters/clowningAround"; diff --git a/src/data/mystery-encounters/encounters/dancing-lessons-encounter.ts b/src/data/mystery-encounters/encounters/dancing-lessons-encounter.ts index cf24d1dd7e0..94006a43837 100644 --- a/src/data/mystery-encounters/encounters/dancing-lessons-encounter.ts +++ b/src/data/mystery-encounters/encounters/dancing-lessons-encounter.ts @@ -1,46 +1,45 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { globalScene } from "#app/global-scene"; -import { EncounterBattleAnim } from "#app/data/battle-anims"; -import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; -import { MoveRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements"; -import { DANCING_MOVES } from "#app/data/mystery-encounters/requirements/requirement-groups"; -import { getEncounterText, queueEncounterMessage } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; -import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { - initBattleWithEnemyConfig, - leaveEncounterWithoutBattle, - selectPokemonForOption, - setEncounterRewards, -} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { - catchPokemon, - getEncounterPokemonLevelForWave, - STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER, -} from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; -import { TrainerSlot } from "#enums/trainer-slot"; -import type { PlayerPokemon } from "#app/field/pokemon"; -import type Pokemon from "#app/field/pokemon"; -import { EnemyPokemon } from "#app/field/pokemon"; -import { PokemonMove } from "#app/data/moves/pokemon-move"; import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; -import { modifierTypes } from "#app/data/data-lists"; -import PokemonData from "#app/system/pokemon-data"; -import type { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler"; +import { globalScene } from "#app/global-scene"; +import { EncounterBattleAnim } from "#data/battle-anims"; +import { modifierTypes } from "#data/data-lists"; +import { BattlerIndex } from "#enums/battler-index"; import { BattlerTagType } from "#enums/battler-tag-type"; import { BiomeId } from "#enums/biome-id"; import { EncounterAnim } from "#enums/encounter-anims"; import { MoveId } from "#enums/move-id"; +import { MoveUseMode } from "#enums/move-use-mode"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { PokeballType } from "#enums/pokeball"; import { SpeciesId } from "#enums/species-id"; import { Stat } from "#enums/stat"; +import { TrainerSlot } from "#enums/trainer-slot"; +import type { PlayerPokemon, Pokemon } from "#field/pokemon"; +import { EnemyPokemon } from "#field/pokemon"; +import { PokemonMove } from "#moves/pokemon-move"; +import { getEncounterText, queueEncounterMessage } from "#mystery-encounters/encounter-dialogue-utils"; +import type { EnemyPartyConfig } from "#mystery-encounters/encounter-phase-utils"; +import { + initBattleWithEnemyConfig, + leaveEncounterWithoutBattle, + selectPokemonForOption, + setEncounterRewards, +} from "#mystery-encounters/encounter-phase-utils"; +import { + catchPokemon, + getEncounterPokemonLevelForWave, + STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER, +} from "#mystery-encounters/encounter-pokemon-utils"; +import type { MysteryEncounter } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option"; +import { MoveRequirement } from "#mystery-encounters/mystery-encounter-requirements"; +import { DANCING_MOVES } from "#mystery-encounters/requirement-groups"; +import { PokemonData } from "#system/pokemon-data"; +import type { OptionSelectItem } from "#ui/abstact-option-select-ui-handler"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; import i18next from "i18next"; -import { MoveUseMode } from "#enums/move-use-mode"; /** the i18n namespace for this encounter */ const namespace = "mysteryEncounters/dancingLessons"; diff --git a/src/data/mystery-encounters/encounters/dark-deal-encounter.ts b/src/data/mystery-encounters/encounters/dark-deal-encounter.ts index 4056ba3532e..29517ac2531 100644 --- a/src/data/mystery-encounters/encounters/dark-deal-encounter.ts +++ b/src/data/mystery-encounters/encounters/dark-deal-encounter.ts @@ -1,25 +1,22 @@ -import type { PokemonType } from "#enums/pokemon-type"; -import { isNullOrUndefined, randSeedInt } from "#app/utils/common"; -import { MysteryEncounterType } from "#enums/mystery-encounter-type"; -import { SpeciesId } from "#enums/species-id"; -import { globalScene } from "#app/global-scene"; -import { modifierTypes } from "#app/data/data-lists"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; -import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; -import type { EnemyPartyConfig, EnemyPokemonConfig } from "../utils/encounter-phase-utils"; -import { initBattleWithEnemyConfig, leaveEncounterWithoutBattle } from "../utils/encounter-phase-utils"; -import { - getRandomPlayerPokemon, - getRandomSpeciesByStarterCost, -} from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import type { PokemonHeldItemModifier } from "#app/modifier/modifier"; -import { PokemonFormChangeItemModifier } from "#app/modifier/modifier"; import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; +import { globalScene } from "#app/global-scene"; +import { modifierTypes } from "#data/data-lists"; import { Challenges } from "#enums/challenges"; +import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import type { PokemonType } from "#enums/pokemon-type"; +import { SpeciesId } from "#enums/species-id"; +import type { PokemonHeldItemModifier } from "#modifiers/modifier"; +import { PokemonFormChangeItemModifier } from "#modifiers/modifier"; +import type { EnemyPartyConfig, EnemyPokemonConfig } from "#mystery-encounters/encounter-phase-utils"; +import { initBattleWithEnemyConfig, leaveEncounterWithoutBattle } from "#mystery-encounters/encounter-phase-utils"; +import { getRandomPlayerPokemon, getRandomSpeciesByStarterCost } from "#mystery-encounters/encounter-pokemon-utils"; +import type { MysteryEncounter } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option"; +import { isNullOrUndefined, randSeedInt } from "#utils/common"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; /** i18n namespace for encounter */ const namespace = "mysteryEncounters/darkDeal"; diff --git a/src/data/mystery-encounters/encounters/delibirdy-encounter.ts b/src/data/mystery-encounters/encounters/delibirdy-encounter.ts index 842fc9d73bd..66f50f134dd 100644 --- a/src/data/mystery-encounters/encounters/delibirdy-encounter.ts +++ b/src/data/mystery-encounters/encounters/delibirdy-encounter.ts @@ -1,42 +1,41 @@ -import { globalScene } from "#app/global-scene"; -import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; -import { - CombinationPokemonRequirement, - HeldItemRequirement, - MoneyRequirement, -} from "#app/data/mystery-encounters/mystery-encounter-requirements"; -import { getEncounterText, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; -import { - generateModifierType, - leaveEncounterWithoutBattle, - selectPokemonForOption, - updatePlayerMoney, -} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { applyModifierTypeToPlayerPokemon } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; -import type { PlayerPokemon } from "#app/field/pokemon"; -import type Pokemon from "#app/field/pokemon"; import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; -import type { PokemonHeldItemModifier, PokemonInstantReviveModifier } from "#app/modifier/modifier"; +import { timedEventManager } from "#app/global-event-manager"; +import { globalScene } from "#app/global-scene"; +import { modifierTypes } from "#data/data-lists"; +import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { SpeciesId } from "#enums/species-id"; +import type { PlayerPokemon, Pokemon } from "#field/pokemon"; +import type { PokemonHeldItemModifier, PokemonInstantReviveModifier } from "#modifiers/modifier"; import { BerryModifier, HealingBoosterModifier, LevelIncrementBoosterModifier, MoneyMultiplierModifier, PreserveBerryModifier, -} from "#app/modifier/modifier"; -import type { PokemonHeldItemModifierType } from "#app/modifier/modifier-type"; -import { modifierTypes } from "#app/data/data-lists"; -import i18next from "#app/plugins/i18n"; -import type { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler"; -import { randSeedItem } from "#app/utils/common"; -import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { MysteryEncounterType } from "#enums/mystery-encounter-type"; -import { SpeciesId } from "#enums/species-id"; -import { timedEventManager } from "#app/global-event-manager"; +} from "#modifiers/modifier"; +import type { PokemonHeldItemModifierType } from "#modifiers/modifier-type"; +import { getEncounterText, showEncounterText } from "#mystery-encounters/encounter-dialogue-utils"; +import { + generateModifierType, + leaveEncounterWithoutBattle, + selectPokemonForOption, + updatePlayerMoney, +} from "#mystery-encounters/encounter-phase-utils"; +import { applyModifierTypeToPlayerPokemon } from "#mystery-encounters/encounter-pokemon-utils"; +import type { MysteryEncounter } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option"; +import { + CombinationPokemonRequirement, + HeldItemRequirement, + MoneyRequirement, +} from "#mystery-encounters/mystery-encounter-requirements"; +import i18next from "#plugins/i18n"; +import type { OptionSelectItem } from "#ui/abstact-option-select-ui-handler"; +import { randSeedItem } from "#utils/common"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; /** the i18n namespace for this encounter */ const namespace = "mysteryEncounters/delibirdy"; diff --git a/src/data/mystery-encounters/encounters/department-store-sale-encounter.ts b/src/data/mystery-encounters/encounters/department-store-sale-encounter.ts index 46152a7dc41..a45c5301a3e 100644 --- a/src/data/mystery-encounters/encounters/department-store-sale-encounter.ts +++ b/src/data/mystery-encounters/encounters/department-store-sale-encounter.ts @@ -1,16 +1,13 @@ -import { - leaveEncounterWithoutBattle, - setEncounterRewards, -} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import type { ModifierTypeFunc } from "#app/@types/modifier-types"; -import { modifierTypes } from "#app/data/data-lists"; -import { randSeedInt } from "#app/utils/common"; +import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; +import { modifierTypes } from "#data/data-lists"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { SpeciesId } from "#enums/species-id"; -import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; +import { leaveEncounterWithoutBattle, setEncounterRewards } from "#mystery-encounters/encounter-phase-utils"; +import type { MysteryEncounter } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter"; +import type { ModifierTypeFunc } from "#types/modifier-types"; +import { randSeedInt } from "#utils/common"; /** i18n namespace for encounter */ const namespace = "mysteryEncounters/departmentStoreSale"; diff --git a/src/data/mystery-encounters/encounters/field-trip-encounter.ts b/src/data/mystery-encounters/encounters/field-trip-encounter.ts index 6ab0f8a6a4b..84374c87e58 100644 --- a/src/data/mystery-encounters/encounters/field-trip-encounter.ts +++ b/src/data/mystery-encounters/encounters/field-trip-encounter.ts @@ -1,25 +1,25 @@ +import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; +import { globalScene } from "#app/global-scene"; +import { modifierTypes } from "#data/data-lists"; import { MoveCategory } from "#enums/MoveCategory"; -import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; +import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { Stat } from "#enums/stat"; +import type { PlayerPokemon } from "#field/pokemon"; +import type { PokemonMove } from "#moves/pokemon-move"; import { generateModifierTypeOption, leaveEncounterWithoutBattle, selectPokemonForOption, setEncounterExp, setEncounterRewards, -} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import type { PlayerPokemon } from "#app/field/pokemon"; -import type { PokemonMove } from "#app/data/moves/pokemon-move"; -import { modifierTypes } from "#app/data/data-lists"; -import type { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler"; -import { MysteryEncounterType } from "#enums/mystery-encounter-type"; -import { globalScene } from "#app/global-scene"; -import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import { Stat } from "#enums/stat"; +} from "#mystery-encounters/encounter-phase-utils"; +import type { MysteryEncounter } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option"; +import type { OptionSelectItem } from "#ui/abstact-option-select-ui-handler"; import i18next from "i18next"; -import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; /** i18n namespace for the encounter */ const namespace = "mysteryEncounters/fieldTrip"; diff --git a/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts b/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts index e8900f8def4..7d2583a00cb 100644 --- a/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts +++ b/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts @@ -1,52 +1,52 @@ -import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; -import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; +import { globalScene } from "#app/global-scene"; +import { EncounterBattleAnim } from "#data/battle-anims"; +import { allAbilities, modifierTypes } from "#data/data-lists"; +import { Gender } from "#data/gender"; +import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; +import { BattlerTagType } from "#enums/battler-tag-type"; +import { EncounterAnim } from "#enums/encounter-anims"; +import { MoveId } from "#enums/move-id"; +import { MoveUseMode } from "#enums/move-use-mode"; +import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { PokemonType } from "#enums/pokemon-type"; +import { SpeciesId } from "#enums/species-id"; +import { Stat } from "#enums/stat"; +import { StatusEffect } from "#enums/status-effect"; +import { WeatherType } from "#enums/weather-type"; +import type { Pokemon } from "#field/pokemon"; +import type { AttackTypeBoosterModifierType } from "#modifiers/modifier-type"; +import { PokemonMove } from "#moves/pokemon-move"; +import { queueEncounterMessage } from "#mystery-encounters/encounter-dialogue-utils"; +import type { EnemyPartyConfig } from "#mystery-encounters/encounter-phase-utils"; import { + generateModifierType, initBattleWithEnemyConfig, - loadCustomMovesForEncounter, leaveEncounterWithoutBattle, + loadCustomMovesForEncounter, setEncounterExp, setEncounterRewards, transitionMysteryEncounterIntroVisuals, - generateModifierType, -} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import type { AttackTypeBoosterModifierType } from "#app/modifier/modifier-type"; -import { MysteryEncounterType } from "#enums/mystery-encounter-type"; -import { globalScene } from "#app/global-scene"; -import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter"; -import { - AbilityRequirement, - CombinationPokemonRequirement, - TypeRequirement, -} from "#app/data/mystery-encounters/mystery-encounter-requirements"; -import { SpeciesId } from "#enums/species-id"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; -import { Gender } from "#app/data/gender"; -import { PokemonType } from "#enums/pokemon-type"; -import { BattlerIndex } from "#enums/battler-index"; -import type Pokemon from "#app/field/pokemon"; -import { PokemonMove } from "#app/data/moves/pokemon-move"; -import { MoveId } from "#enums/move-id"; -import { EncounterBattleAnim } from "#app/data/battle-anims"; -import { WeatherType } from "#enums/weather-type"; -import { isNullOrUndefined, randSeedInt } from "#app/utils/common"; -import { StatusEffect } from "#enums/status-effect"; -import { queueEncounterMessage } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; +} from "#mystery-encounters/encounter-phase-utils"; import { applyAbilityOverrideToPokemon, applyDamageToPokemon, applyModifierTypeToPlayerPokemon, -} from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import { EncounterAnim } from "#enums/encounter-anims"; -import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; -import { AbilityId } from "#enums/ability-id"; -import { BattlerTagType } from "#enums/battler-tag-type"; -import { Stat } from "#enums/stat"; -import { FIRE_RESISTANT_ABILITIES } from "#app/data/mystery-encounters/requirements/requirement-groups"; -import { MoveUseMode } from "#enums/move-use-mode"; -import { allAbilities, modifierTypes } from "#app/data/data-lists"; +} from "#mystery-encounters/encounter-pokemon-utils"; +import type { MysteryEncounter } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option"; +import { + AbilityRequirement, + CombinationPokemonRequirement, + TypeRequirement, +} from "#mystery-encounters/mystery-encounter-requirements"; +import { FIRE_RESISTANT_ABILITIES } from "#mystery-encounters/requirement-groups"; +import { isNullOrUndefined, randSeedInt } from "#utils/common"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; /** the i18n namespace for the encounter */ const namespace = "mysteryEncounters/fieryFallout"; diff --git a/src/data/mystery-encounters/encounters/fight-or-flight-encounter.ts b/src/data/mystery-encounters/encounters/fight-or-flight-encounter.ts index c53ff610c48..6ee2ebcdf67 100644 --- a/src/data/mystery-encounters/encounters/fight-or-flight-encounter.ts +++ b/src/data/mystery-encounters/encounters/fight-or-flight-encounter.ts @@ -1,35 +1,35 @@ -import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; -import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; +import { globalScene } from "#app/global-scene"; +import { BattlerTagType } from "#enums/battler-tag-type"; +import { ModifierPoolType } from "#enums/modifier-pool-type"; +import { ModifierTier } from "#enums/modifier-tier"; +import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import type { Pokemon } from "#field/pokemon"; +import type { ModifierTypeOption } from "#modifiers/modifier-type"; +import { getPlayerModifierTypeOptions, regenerateModifierPoolThresholds } from "#modifiers/modifier-type"; +import { queueEncounterMessage } from "#mystery-encounters/encounter-dialogue-utils"; +import type { EnemyPartyConfig } from "#mystery-encounters/encounter-phase-utils"; import { getRandomEncounterSpecies, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, setEncounterExp, setEncounterRewards, -} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { STEALING_MOVES } from "#app/data/mystery-encounters/requirements/requirement-groups"; -import type Pokemon from "#app/field/pokemon"; -import { ModifierTier } from "#enums/modifier-tier"; -import type { ModifierTypeOption } from "#app/modifier/modifier-type"; -import { getPlayerModifierTypeOptions, regenerateModifierPoolThresholds } from "#app/modifier/modifier-type"; -import { ModifierPoolType } from "#enums/modifier-pool-type"; -import { MysteryEncounterType } from "#enums/mystery-encounter-type"; -import { globalScene } from "#app/global-scene"; -import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter"; -import { MoveRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +} from "#mystery-encounters/encounter-phase-utils"; import { getEncounterPokemonLevelForWave, getSpriteKeysFromPokemon, STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER, -} from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; -import PokemonData from "#app/system/pokemon-data"; -import { BattlerTagType } from "#enums/battler-tag-type"; -import { queueEncounterMessage } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; -import { randSeedInt } from "#app/utils/common"; -import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; +} from "#mystery-encounters/encounter-pokemon-utils"; +import type { MysteryEncounter } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option"; +import { MoveRequirement } from "#mystery-encounters/mystery-encounter-requirements"; +import { STEALING_MOVES } from "#mystery-encounters/requirement-groups"; +import { PokemonData } from "#system/pokemon-data"; +import { randSeedInt } from "#utils/common"; /** the i18n namespace for the encounter */ const namespace = "mysteryEncounters/fightOrFlight"; diff --git a/src/data/mystery-encounters/encounters/fun-and-games-encounter.ts b/src/data/mystery-encounters/encounters/fun-and-games-encounter.ts index 9611560fe62..bf376c04843 100644 --- a/src/data/mystery-encounters/encounters/fun-and-games-encounter.ts +++ b/src/data/mystery-encounters/encounters/fun-and-games-encounter.ts @@ -1,35 +1,34 @@ +import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; +import { globalScene } from "#app/global-scene"; +import { getPokemonNameWithAffix } from "#app/messages"; +import { modifierTypes } from "#data/data-lists"; +import { SpeciesFormChangeActiveTrigger } from "#data/form-change-triggers"; +import { getPokeballAtlasKey, getPokeballTintColor } from "#data/pokeball"; +import { FieldPosition } from "#enums/field-position"; +import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { Nature } from "#enums/nature"; +import { PlayerGender } from "#enums/player-gender"; +import { SpeciesId } from "#enums/species-id"; +import { TrainerSlot } from "#enums/trainer-slot"; +import { addPokeballOpenParticles } from "#field/anims"; +import type { PlayerPokemon, Pokemon } from "#field/pokemon"; +import { queueEncounterMessage, showEncounterText } from "#mystery-encounters/encounter-dialogue-utils"; import { leaveEncounterWithoutBattle, selectPokemonForOption, setEncounterRewards, transitionMysteryEncounterIntroVisuals, updatePlayerMoney, -} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { MysteryEncounterType } from "#enums/mystery-encounter-type"; -import { globalScene } from "#app/global-scene"; -import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; -import { TrainerSlot } from "#enums/trainer-slot"; -import type { PlayerPokemon } from "#app/field/pokemon"; -import type Pokemon from "#app/field/pokemon"; -import { FieldPosition } from "#enums/field-position"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; -import { MoneyRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements"; -import { queueEncounterMessage, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import { SpeciesId } from "#enums/species-id"; +} from "#mystery-encounters/encounter-phase-utils"; +import { isPokemonValidForEncounterOptionSelection } from "#mystery-encounters/encounter-pokemon-utils"; +import type { MysteryEncounter } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option"; +import { MoneyRequirement } from "#mystery-encounters/mystery-encounter-requirements"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; import i18next from "i18next"; -import { getPokemonNameWithAffix } from "#app/messages"; -import { PlayerGender } from "#enums/player-gender"; -import { getPokeballAtlasKey, getPokeballTintColor } from "#app/data/pokeball"; -import { addPokeballOpenParticles } from "#app/field/anims"; -import { SpeciesFormChangeActiveTrigger } from "#app/data/pokemon-forms/form-change-triggers"; -import { modifierTypes } from "#app/data/data-lists"; -import { Nature } from "#enums/nature"; -import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; -import { isPokemonValidForEncounterOptionSelection } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; /** the i18n namespace for the encounter */ const namespace = "mysteryEncounters/funAndGames"; diff --git a/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts b/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts index 6bbc1a68772..b914927123a 100644 --- a/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts +++ b/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts @@ -1,58 +1,50 @@ -import { - leaveEncounterWithoutBattle, - selectPokemonForOption, - setEncounterRewards, -} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { TrainerSlot } from "#enums/trainer-slot"; -import { ModifierTier } from "#enums/modifier-tier"; -import { MusicPreference } from "#app/system/settings/settings"; -import type { ModifierTypeOption } from "#app/modifier/modifier-type"; -import { getPlayerModifierTypeOptions, regenerateModifierPoolThresholds } from "#app/modifier/modifier-type"; -import { ModifierPoolType } from "#enums/modifier-pool-type"; -import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; +import { timedEventManager } from "#app/global-event-manager"; import { globalScene } from "#app/global-scene"; -import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { SpeciesId } from "#enums/species-id"; -import type PokemonSpecies from "#app/data/pokemon-species"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; -import { allSpecies } from "#app/data/data-lists"; -import { getTypeRgb } from "#app/data/type"; -import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; +import { allSpecies } from "#data/data-lists"; +import { Gender, getGenderSymbol } from "#data/gender"; +import { getNatureName } from "#data/nature"; +import { getPokeballAtlasKey, getPokeballTintColor } from "#data/pokeball"; +import type { PokemonSpecies } from "#data/pokemon-species"; +import { getTypeRgb } from "#data/type"; +import { ModifierPoolType } from "#enums/modifier-pool-type"; +import { ModifierTier } from "#enums/modifier-tier"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import { - NumberHolder, - isNullOrUndefined, - randInt, - randSeedInt, - randSeedShuffle, - randSeedItem, -} from "#app/utils/common"; -import type { PlayerPokemon } from "#app/field/pokemon"; -import type Pokemon from "#app/field/pokemon"; -import { EnemyPokemon } from "#app/field/pokemon"; -import { PokemonMove } from "#app/data/moves/pokemon-move"; -import type { PokemonHeldItemModifier } from "#app/modifier/modifier"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import type { PokeballType } from "#enums/pokeball"; +import { SpeciesId } from "#enums/species-id"; +import { TrainerSlot } from "#enums/trainer-slot"; +import { TrainerType } from "#enums/trainer-type"; +import { doShinySparkleAnim } from "#field/anims"; +import type { PlayerPokemon, Pokemon } from "#field/pokemon"; +import { EnemyPokemon } from "#field/pokemon"; +import type { PokemonHeldItemModifier } from "#modifiers/modifier"; import { HiddenAbilityRateBoosterModifier, PokemonFormChangeItemModifier, ShinyRateBoosterModifier, SpeciesStatBoosterModifier, -} from "#app/modifier/modifier"; -import type { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler"; -import PokemonData from "#app/system/pokemon-data"; +} from "#modifiers/modifier"; +import type { ModifierTypeOption } from "#modifiers/modifier-type"; +import { getPlayerModifierTypeOptions, regenerateModifierPoolThresholds } from "#modifiers/modifier-type"; +import { PokemonMove } from "#moves/pokemon-move"; +import { getEncounterText, showEncounterText } from "#mystery-encounters/encounter-dialogue-utils"; +import { + leaveEncounterWithoutBattle, + selectPokemonForOption, + setEncounterRewards, +} from "#mystery-encounters/encounter-phase-utils"; +import { addPokemonDataToDexAndValidateAchievements } from "#mystery-encounters/encounter-pokemon-utils"; +import type { MysteryEncounter } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option"; +import { PokemonData } from "#system/pokemon-data"; +import { MusicPreference } from "#system/settings"; +import type { OptionSelectItem } from "#ui/abstact-option-select-ui-handler"; +import { isNullOrUndefined, NumberHolder, randInt, randSeedInt, randSeedItem, randSeedShuffle } from "#utils/common"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; import i18next from "i18next"; -import { Gender, getGenderSymbol } from "#app/data/gender"; -import { getNatureName } from "#app/data/nature"; -import { getPokeballAtlasKey, getPokeballTintColor } from "#app/data/pokeball"; -import { getEncounterText, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; -import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; -import { addPokemonDataToDexAndValidateAchievements } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; -import type { PokeballType } from "#enums/pokeball"; -import { doShinySparkleAnim } from "#app/field/anims"; -import { TrainerType } from "#enums/trainer-type"; -import { timedEventManager } from "#app/global-event-manager"; /** the i18n namespace for the encounter */ const namespace = "mysteryEncounters/globalTradeSystem"; diff --git a/src/data/mystery-encounters/encounters/lost-at-sea-encounter.ts b/src/data/mystery-encounters/encounters/lost-at-sea-encounter.ts index 2b54b0a42f5..10f45c21b68 100644 --- a/src/data/mystery-encounters/encounters/lost-at-sea-encounter.ts +++ b/src/data/mystery-encounters/encounters/lost-at-sea-encounter.ts @@ -1,17 +1,17 @@ -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; -import { MoveId } from "#enums/move-id"; -import { SpeciesId } from "#enums/species-id"; -import { MysteryEncounterType } from "#enums/mystery-encounter-type"; -import { globalScene } from "#app/global-scene"; -import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; -import { leaveEncounterWithoutBattle, setEncounterExp } from "../utils/encounter-phase-utils"; -import { applyDamageToPokemon } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; -import { PokemonMove } from "#app/data/moves/pokemon-move"; +import { globalScene } from "#app/global-scene"; +import { MoveId } from "#enums/move-id"; +import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { SpeciesId } from "#enums/species-id"; +import { PokemonMove } from "#moves/pokemon-move"; +import { leaveEncounterWithoutBattle, setEncounterExp } from "#mystery-encounters/encounter-phase-utils"; +import { applyDamageToPokemon } from "#mystery-encounters/encounter-pokemon-utils"; +import type { MysteryEncounter } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; const OPTION_1_REQUIRED_MOVE = MoveId.SURF; const OPTION_2_REQUIRED_MOVE = MoveId.FLY; diff --git a/src/data/mystery-encounters/encounters/mysterious-challengers-encounter.ts b/src/data/mystery-encounters/encounters/mysterious-challengers-encounter.ts index ae3d905cf91..f78f081b4ac 100644 --- a/src/data/mystery-encounters/encounters/mysterious-challengers-encounter.ts +++ b/src/data/mystery-encounters/encounters/mysterious-challengers-encounter.ts @@ -1,22 +1,21 @@ -import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { - initBattleWithEnemyConfig, - setEncounterRewards, -} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { trainerConfigs } from "#app/data/trainers/trainer-config"; -import { trainerPartyTemplates } from "#app/data/trainers/TrainerPartyTemplate"; -import { TrainerPartyCompoundTemplate } from "#app/data/trainers/TrainerPartyTemplate"; -import { TrainerPartyTemplate } from "#app/data/trainers/TrainerPartyTemplate"; +import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; +import { globalScene } from "#app/global-scene"; +import { modifierTypes } from "#data/data-lists"; import { ModifierTier } from "#enums/modifier-tier"; -import { modifierTypes } from "#app/data/data-lists"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { PartyMemberStrength } from "#enums/party-member-strength"; -import { globalScene } from "#app/global-scene"; -import { randSeedInt } from "#app/utils/common"; -import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; +import type { EnemyPartyConfig } from "#mystery-encounters/encounter-phase-utils"; +import { initBattleWithEnemyConfig, setEncounterRewards } from "#mystery-encounters/encounter-phase-utils"; +import type { MysteryEncounter } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter"; +import { + TrainerPartyCompoundTemplate, + TrainerPartyTemplate, + trainerPartyTemplates, +} from "#trainers/TrainerPartyTemplate"; +import { trainerConfigs } from "#trainers/trainer-config"; +import { randSeedInt } from "#utils/common"; /** the i18n namespace for the encounter */ const namespace = "mysteryEncounters/mysteriousChallengers"; diff --git a/src/data/mystery-encounters/encounters/mysterious-chest-encounter.ts b/src/data/mystery-encounters/encounters/mysterious-chest-encounter.ts index 321e65d7008..1bc2404dc27 100644 --- a/src/data/mystery-encounters/encounters/mysterious-chest-encounter.ts +++ b/src/data/mystery-encounters/encounters/mysterious-chest-encounter.ts @@ -1,28 +1,25 @@ -import { globalScene } from "#app/global-scene"; -import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; -import { queueEncounterMessage, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; -import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { - initBattleWithEnemyConfig, - leaveEncounterWithoutBattle, - setEncounterRewards, - transitionMysteryEncounterIntroVisuals, -} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { - getHighestLevelPlayerPokemon, - koPlayerPokemon, -} from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; +import { globalScene } from "#app/global-scene"; import { ModifierTier } from "#enums/modifier-tier"; -import { randSeedInt } from "#app/utils/common"; import { MoveId } from "#enums/move-id"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { SpeciesId } from "#enums/species-id"; +import { queueEncounterMessage, showEncounterText } from "#mystery-encounters/encounter-dialogue-utils"; +import type { EnemyPartyConfig } from "#mystery-encounters/encounter-phase-utils"; +import { + initBattleWithEnemyConfig, + leaveEncounterWithoutBattle, + setEncounterRewards, + transitionMysteryEncounterIntroVisuals, +} from "#mystery-encounters/encounter-phase-utils"; +import { getHighestLevelPlayerPokemon, koPlayerPokemon } from "#mystery-encounters/encounter-pokemon-utils"; +import type { MysteryEncounter } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option"; +import { randSeedInt } from "#utils/common"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; /** i18n namespace for encounter */ const namespace = "mysteryEncounters/mysteriousChest"; diff --git a/src/data/mystery-encounters/encounters/part-timer-encounter.ts b/src/data/mystery-encounters/encounters/part-timer-encounter.ts index 1074eaf8c81..a865de3b19d 100644 --- a/src/data/mystery-encounters/encounters/part-timer-encounter.ts +++ b/src/data/mystery-encounters/encounters/part-timer-encounter.ts @@ -1,4 +1,11 @@ -import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; +import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; +import { globalScene } from "#app/global-scene"; +import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { Stat } from "#enums/stat"; +import type { PlayerPokemon, Pokemon } from "#field/pokemon"; +import { showEncounterDialogue, showEncounterText } from "#mystery-encounters/encounter-dialogue-utils"; import { leaveEncounterWithoutBattle, selectPokemonForOption, @@ -6,22 +13,14 @@ import { setEncounterRewards, transitionMysteryEncounterIntroVisuals, updatePlayerMoney, -} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { MysteryEncounterType } from "#enums/mystery-encounter-type"; -import { globalScene } from "#app/global-scene"; -import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter"; -import { MoveRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import { Stat } from "#enums/stat"; -import { CHARMING_MOVES } from "#app/data/mystery-encounters/requirements/requirement-groups"; -import { showEncounterDialogue, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; +} from "#mystery-encounters/encounter-phase-utils"; +import { isPokemonValidForEncounterOptionSelection } from "#mystery-encounters/encounter-pokemon-utils"; +import type { MysteryEncounter } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option"; +import { MoveRequirement } from "#mystery-encounters/mystery-encounter-requirements"; +import { CHARMING_MOVES } from "#mystery-encounters/requirement-groups"; import i18next from "i18next"; -import type { PlayerPokemon } from "#app/field/pokemon"; -import type Pokemon from "#app/field/pokemon"; -import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; -import { isPokemonValidForEncounterOptionSelection } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; /** the i18n namespace for the encounter */ const namespace = "mysteryEncounters/partTimer"; diff --git a/src/data/mystery-encounters/encounters/safari-zone-encounter.ts b/src/data/mystery-encounters/encounters/safari-zone-encounter.ts index 207e6ca400d..c3400b41327 100644 --- a/src/data/mystery-encounters/encounters/safari-zone-encounter.ts +++ b/src/data/mystery-encounters/encounters/safari-zone-encounter.ts @@ -1,36 +1,36 @@ +import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; +import { globalScene } from "#app/global-scene"; +import { getPokemonNameWithAffix } from "#app/messages"; +import { NON_LEGEND_PARADOX_POKEMON } from "#balance/special-species-groups"; +import type { PokemonSpecies } from "#data/pokemon-species"; +import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { PlayerGender } from "#enums/player-gender"; +import { PokeballType } from "#enums/pokeball"; +import { TrainerSlot } from "#enums/trainer-slot"; +import type { EnemyPokemon } from "#field/pokemon"; +import { HiddenAbilityRateBoosterModifier, IvScannerModifier } from "#modifiers/modifier"; +import { getEncounterText, showEncounterText } from "#mystery-encounters/encounter-dialogue-utils"; import { initSubsequentOptionSelect, leaveEncounterWithoutBattle, transitionMysteryEncounterIntroVisuals, updatePlayerMoney, -} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { MysteryEncounterType } from "#enums/mystery-encounter-type"; -import { globalScene } from "#app/global-scene"; -import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter"; -import type MysteryEncounterOption from "#app/data/mystery-encounters/mystery-encounter-option"; -import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; -import { TrainerSlot } from "#enums/trainer-slot"; -import { HiddenAbilityRateBoosterModifier, IvScannerModifier } from "#app/modifier/modifier"; -import type { EnemyPokemon } from "#app/field/pokemon"; -import { PokeballType } from "#enums/pokeball"; -import { PlayerGender } from "#enums/player-gender"; -import { NumberHolder, randSeedInt } from "#app/utils/common"; -import type PokemonSpecies from "#app/data/pokemon-species"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; -import { MoneyRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements"; +} from "#mystery-encounters/encounter-phase-utils"; import { doPlayerFlee, doPokemonFlee, getRandomSpeciesByStarterCost, trainerThrowPokeball, -} from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; -import { getEncounterText, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; -import { getPokemonNameWithAffix } from "#app/messages"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; -import { NON_LEGEND_PARADOX_POKEMON } from "#app/data/balance/special-species-groups"; +} from "#mystery-encounters/encounter-pokemon-utils"; +import type { MysteryEncounter } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter"; +import type { MysteryEncounterOption } from "#mystery-encounters/mystery-encounter-option"; +import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option"; +import { MoneyRequirement } from "#mystery-encounters/mystery-encounter-requirements"; +import { NumberHolder, randSeedInt } from "#utils/common"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; /** the i18n namespace for the encounter */ const namespace = "mysteryEncounters/safariZone"; diff --git a/src/data/mystery-encounters/encounters/shady-vitamin-dealer-encounter.ts b/src/data/mystery-encounters/encounters/shady-vitamin-dealer-encounter.ts index 967c105c740..47317c12b50 100644 --- a/src/data/mystery-encounters/encounters/shady-vitamin-dealer-encounter.ts +++ b/src/data/mystery-encounters/encounters/shady-vitamin-dealer-encounter.ts @@ -1,32 +1,31 @@ +import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; +import { globalScene } from "#app/global-scene"; +import { modifierTypes } from "#data/data-lists"; +import { getNatureName } from "#data/nature"; +import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import type { Nature } from "#enums/nature"; +import { SpeciesId } from "#enums/species-id"; +import type { PlayerPokemon, Pokemon } from "#field/pokemon"; +import { getEncounterText, queueEncounterMessage } from "#mystery-encounters/encounter-dialogue-utils"; import { generateModifierType, leaveEncounterWithoutBattle, selectPokemonForOption, setEncounterExp, updatePlayerMoney, -} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import type { PlayerPokemon } from "#app/field/pokemon"; -import type Pokemon from "#app/field/pokemon"; -import { modifierTypes } from "#app/data/data-lists"; -import { randSeedInt } from "#app/utils/common"; -import { MysteryEncounterType } from "#enums/mystery-encounter-type"; -import { SpeciesId } from "#enums/species-id"; -import { globalScene } from "#app/global-scene"; -import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; -import { MoneyRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements"; -import { getEncounterText, queueEncounterMessage } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; +} from "#mystery-encounters/encounter-phase-utils"; import { applyDamageToPokemon, applyModifierTypeToPlayerPokemon, isPokemonValidForEncounterOptionSelection, -} from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import type { Nature } from "#enums/nature"; -import { getNatureName } from "#app/data/nature"; -import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; +} from "#mystery-encounters/encounter-pokemon-utils"; +import type { MysteryEncounter } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option"; +import { MoneyRequirement } from "#mystery-encounters/mystery-encounter-requirements"; +import { randSeedInt } from "#utils/common"; import i18next from "i18next"; /** the i18n namespace for this encounter */ diff --git a/src/data/mystery-encounters/encounters/slumbering-snorlax-encounter.ts b/src/data/mystery-encounters/encounters/slumbering-snorlax-encounter.ts index d6a85dee119..cddfef1ef76 100644 --- a/src/data/mystery-encounters/encounters/slumbering-snorlax-encounter.ts +++ b/src/data/mystery-encounters/encounters/slumbering-snorlax-encounter.ts @@ -1,15 +1,22 @@ -import { STEALING_MOVES } from "#app/data/mystery-encounters/requirements/requirement-groups"; -import type { PokemonHeldItemModifierType } from "#app/modifier/modifier-type"; -import { modifierTypes } from "#app/data/data-lists"; -import { MysteryEncounterType } from "#enums/mystery-encounter-type"; -import { SpeciesId } from "#enums/species-id"; import { globalScene } from "#app/global-scene"; +import { modifierTypes } from "#data/data-lists"; +import { CustomPokemonData } from "#data/pokemon-data"; +import { AiType } from "#enums/ai-type"; +import { BattlerIndex } from "#enums/battler-index"; +import { BerryType } from "#enums/berry-type"; +import { MoveId } from "#enums/move-id"; +import { MoveUseMode } from "#enums/move-use-mode"; +import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { Nature } from "#enums/nature"; +import { SpeciesId } from "#enums/species-id"; +import { Stat } from "#enums/stat"; import { StatusEffect } from "#enums/status-effect"; -import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; -import { MoveRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements"; -import type { EnemyPartyConfig, EnemyPokemonConfig } from "../utils/encounter-phase-utils"; +import type { PokemonHeldItemModifierType } from "#modifiers/modifier-type"; +import { PokemonMove } from "#moves/pokemon-move"; +import { queueEncounterMessage } from "#mystery-encounters/encounter-dialogue-utils"; +import type { EnemyPartyConfig, EnemyPokemonConfig } from "#mystery-encounters/encounter-phase-utils"; import { generateModifierType, initBattleWithEnemyConfig, @@ -17,21 +24,14 @@ import { loadCustomMovesForEncounter, setEncounterExp, setEncounterRewards, -} from "../utils/encounter-phase-utils"; -import { queueEncounterMessage } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; -import { Nature } from "#enums/nature"; -import { MoveId } from "#enums/move-id"; -import { BattlerIndex } from "#enums/battler-index"; -import { PokemonMove } from "#app/data/moves/pokemon-move"; -import { AiType } from "#enums/ai-type"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import { BerryType } from "#enums/berry-type"; -import { Stat } from "#enums/stat"; -import { CustomPokemonData } from "#app/data/pokemon/pokemon-data"; -import { randSeedInt } from "#app/utils/common"; -import { MoveUseMode } from "#enums/move-use-mode"; +} from "#mystery-encounters/encounter-phase-utils"; +import type { MysteryEncounter } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option"; +import { MoveRequirement } from "#mystery-encounters/mystery-encounter-requirements"; +import { STEALING_MOVES } from "#mystery-encounters/requirement-groups"; +import { randSeedInt } from "#utils/common"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; /** i18n namespace for the encounter */ const namespace = "mysteryEncounters/slumberingSnorlax"; diff --git a/src/data/mystery-encounters/encounters/teleporting-hijinks-encounter.ts b/src/data/mystery-encounters/encounters/teleporting-hijinks-encounter.ts index 9c9232612c6..acebb513c00 100644 --- a/src/data/mystery-encounters/encounters/teleporting-hijinks-encounter.ts +++ b/src/data/mystery-encounters/encounters/teleporting-hijinks-encounter.ts @@ -1,4 +1,21 @@ -import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; +import { globalScene } from "#app/global-scene"; +import { getPokemonNameWithAffix } from "#app/messages"; +import { modifierTypes } from "#data/data-lists"; +import { BattlerTagType } from "#enums/battler-tag-type"; +import { BiomeId } from "#enums/biome-id"; +import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { PokemonType } from "#enums/pokemon-type"; +import { Stat } from "#enums/stat"; +import { TrainerSlot } from "#enums/trainer-slot"; +import { getBiomeKey } from "#field/arena"; +import type { Pokemon } from "#field/pokemon"; +import { EnemyPokemon } from "#field/pokemon"; +import { getPartyLuckValue } from "#modifiers/modifier-type"; +import { queueEncounterMessage, showEncounterText } from "#mystery-encounters/encounter-dialogue-utils"; +import type { EnemyPartyConfig } from "#mystery-encounters/encounter-phase-utils"; import { generateModifierTypeOption, initBattleWithEnemyConfig, @@ -6,34 +23,17 @@ import { setEncounterRewards, transitionMysteryEncounterIntroVisuals, updatePlayerMoney, -} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { randSeedInt } from "#app/utils/common"; -import { MysteryEncounterType } from "#enums/mystery-encounter-type"; -import { globalScene } from "#app/global-scene"; -import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter"; -import { MoneyRequirement, WaveModulusRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements"; -import type Pokemon from "#app/field/pokemon"; -import { EnemyPokemon } from "#app/field/pokemon"; -import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; -import { queueEncounterMessage, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; -import PokemonData from "#app/system/pokemon-data"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import { BiomeId } from "#enums/biome-id"; -import { getBiomeKey } from "#app/field/arena"; -import { PokemonType } from "#enums/pokemon-type"; -import { getPartyLuckValue } from "#app/modifier/modifier-type"; -import { modifierTypes } from "#app/data/data-lists"; -import { TrainerSlot } from "#enums/trainer-slot"; -import { BattlerTagType } from "#enums/battler-tag-type"; -import { getPokemonNameWithAffix } from "#app/messages"; -import { Stat } from "#enums/stat"; -import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; +} from "#mystery-encounters/encounter-phase-utils"; import { getEncounterPokemonLevelForWave, STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER, -} from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; +} from "#mystery-encounters/encounter-pokemon-utils"; +import type { MysteryEncounter } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option"; +import { MoneyRequirement, WaveModulusRequirement } from "#mystery-encounters/mystery-encounter-requirements"; +import { PokemonData } from "#system/pokemon-data"; +import { randSeedInt } from "#utils/common"; /** the i18n namespace for this encounter */ const namespace = "mysteryEncounters/teleportingHijinks"; diff --git a/src/data/mystery-encounters/encounters/the-expert-pokemon-breeder-encounter.ts b/src/data/mystery-encounters/encounters/the-expert-pokemon-breeder-encounter.ts index 03c09f6918e..235bd322ef8 100644 --- a/src/data/mystery-encounters/encounters/the-expert-pokemon-breeder-encounter.ts +++ b/src/data/mystery-encounters/encounters/the-expert-pokemon-breeder-encounter.ts @@ -1,34 +1,34 @@ -import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { globalScene } from "#app/global-scene"; +import { speciesStarterCosts } from "#balance/starters"; +import { modifierTypes } from "#data/data-lists"; +import type { IEggOptions } from "#data/egg"; +import { getPokeballTintColor } from "#data/pokeball"; +import { BiomeId } from "#enums/biome-id"; +import { EggSourceType } from "#enums/egg-source-types"; +import { EggTier } from "#enums/egg-type"; +import { MoveId } from "#enums/move-id"; +import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { Nature } from "#enums/nature"; +import { PokemonType } from "#enums/pokemon-type"; +import { SpeciesId } from "#enums/species-id"; +import { TrainerType } from "#enums/trainer-type"; +import type { PlayerPokemon } from "#field/pokemon"; +import { getEncounterText } from "#mystery-encounters/encounter-dialogue-utils"; +import type { EnemyPartyConfig } from "#mystery-encounters/encounter-phase-utils"; import { handleMysteryEncounterBattleFailed, initBattleWithEnemyConfig, setEncounterRewards, -} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { trainerConfigs } from "#app/data/trainers/trainer-config"; -import { MysteryEncounterType } from "#enums/mystery-encounter-type"; -import { globalScene } from "#app/global-scene"; -import { randSeedShuffle } from "#app/utils/common"; -import type MysteryEncounter from "../mystery-encounter"; -import { MysteryEncounterBuilder } from "../mystery-encounter"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { BiomeId } from "#enums/biome-id"; -import { TrainerType } from "#enums/trainer-type"; +} from "#mystery-encounters/encounter-phase-utils"; +import type { MysteryEncounter } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option"; +import { trainerConfigs } from "#trainers/trainer-config"; +import { randSeedShuffle } from "#utils/common"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; import i18next from "i18next"; -import { SpeciesId } from "#enums/species-id"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; -import { speciesStarterCosts } from "#app/data/balance/starters"; -import { Nature } from "#enums/nature"; -import { MoveId } from "#enums/move-id"; -import type { PlayerPokemon } from "#app/field/pokemon"; -import { getEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; -import type { IEggOptions } from "#app/data/egg"; -import { EggSourceType } from "#enums/egg-source-types"; -import { EggTier } from "#enums/egg-type"; -import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; -import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import { modifierTypes } from "#app/data/data-lists"; -import { PokemonType } from "#enums/pokemon-type"; -import { getPokeballTintColor } from "#app/data/pokeball"; /** the i18n namespace for the encounter */ const namespace = "mysteryEncounters/theExpertPokemonBreeder"; diff --git a/src/data/mystery-encounters/encounters/the-pokemon-salesman-encounter.ts b/src/data/mystery-encounters/encounters/the-pokemon-salesman-encounter.ts index c3bcf9ceb24..91662993a51 100644 --- a/src/data/mystery-encounters/encounters/the-pokemon-salesman-encounter.ts +++ b/src/data/mystery-encounters/encounters/the-pokemon-salesman-encounter.ts @@ -1,35 +1,35 @@ +import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; +import { timedEventManager } from "#app/global-event-manager"; +import { globalScene } from "#app/global-scene"; +import { NON_LEGEND_PARADOX_POKEMON, NON_LEGEND_ULTRA_BEASTS } from "#balance/special-species-groups"; +import { speciesStarterCosts } from "#balance/starters"; +import type { PokemonSpecies } from "#data/pokemon-species"; +import { AbilityId } from "#enums/ability-id"; +import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { PokeballType } from "#enums/pokeball"; +import { SpeciesId } from "#enums/species-id"; +import type { EnemyPokemon } from "#field/pokemon"; +import { PlayerPokemon } from "#field/pokemon"; +import { showEncounterDialogue } from "#mystery-encounters/encounter-dialogue-utils"; import { leaveEncounterWithoutBattle, transitionMysteryEncounterIntroVisuals, updatePlayerMoney, -} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { isNullOrUndefined, randSeedInt, randSeedItem } from "#app/utils/common"; -import { MysteryEncounterType } from "#enums/mystery-encounter-type"; -import { globalScene } from "#app/global-scene"; -import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter"; -import { MoneyRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements"; +} from "#mystery-encounters/encounter-phase-utils"; import { catchPokemon, getRandomSpeciesByStarterCost, getSpriteKeysFromPokemon, -} from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; -import type PokemonSpecies from "#app/data/pokemon-species"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; -import { speciesStarterCosts } from "#app/data/balance/starters"; -import { SpeciesId } from "#enums/species-id"; -import { PokeballType } from "#enums/pokeball"; -import type { EnemyPokemon } from "#app/field/pokemon"; -import { PlayerPokemon } from "#app/field/pokemon"; -import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; -import { showEncounterDialogue } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; -import PokemonData from "#app/system/pokemon-data"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; -import { AbilityId } from "#enums/ability-id"; -import { NON_LEGEND_PARADOX_POKEMON, NON_LEGEND_ULTRA_BEASTS } from "#app/data/balance/special-species-groups"; -import { timedEventManager } from "#app/global-event-manager"; +} from "#mystery-encounters/encounter-pokemon-utils"; +import type { MysteryEncounter } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option"; +import { MoneyRequirement } from "#mystery-encounters/mystery-encounter-requirements"; +import { PokemonData } from "#system/pokemon-data"; +import { isNullOrUndefined, randSeedInt, randSeedItem } from "#utils/common"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; /** the i18n namespace for this encounter */ const namespace = "mysteryEncounters/thePokemonSalesman"; diff --git a/src/data/mystery-encounters/encounters/the-strong-stuff-encounter.ts b/src/data/mystery-encounters/encounters/the-strong-stuff-encounter.ts index b853539acf5..076c7ec5ce1 100644 --- a/src/data/mystery-encounters/encounters/the-strong-stuff-encounter.ts +++ b/src/data/mystery-encounters/encounters/the-strong-stuff-encounter.ts @@ -1,34 +1,34 @@ -import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { - initBattleWithEnemyConfig, - loadCustomMovesForEncounter, - leaveEncounterWithoutBattle, - setEncounterRewards, - transitionMysteryEncounterIntroVisuals, - generateModifierType, -} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import type { PokemonHeldItemModifierType } from "#app/modifier/modifier-type"; -import { modifierTypes } from "#app/data/data-lists"; -import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; import { globalScene } from "#app/global-scene"; -import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; -import { SpeciesId } from "#enums/species-id"; -import { Nature } from "#enums/nature"; -import type Pokemon from "#app/field/pokemon"; -import { PokemonMove } from "#app/data/moves/pokemon-move"; -import { queueEncounterMessage, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; -import { modifyPlayerPokemonBST } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; -import { MoveId } from "#enums/move-id"; +import { modifierTypes } from "#data/data-lists"; +import { CustomPokemonData } from "#data/pokemon-data"; import { BattlerIndex } from "#enums/battler-index"; import { BattlerTagType } from "#enums/battler-tag-type"; import { BerryType } from "#enums/berry-type"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { CustomPokemonData } from "#app/data/pokemon/pokemon-data"; -import { Stat } from "#enums/stat"; -import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; +import { MoveId } from "#enums/move-id"; import { MoveUseMode } from "#enums/move-use-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { Nature } from "#enums/nature"; +import { SpeciesId } from "#enums/species-id"; +import { Stat } from "#enums/stat"; +import type { Pokemon } from "#field/pokemon"; +import type { PokemonHeldItemModifierType } from "#modifiers/modifier-type"; +import { PokemonMove } from "#moves/pokemon-move"; +import { queueEncounterMessage, showEncounterText } from "#mystery-encounters/encounter-dialogue-utils"; +import type { EnemyPartyConfig } from "#mystery-encounters/encounter-phase-utils"; +import { + generateModifierType, + initBattleWithEnemyConfig, + leaveEncounterWithoutBattle, + loadCustomMovesForEncounter, + setEncounterRewards, + transitionMysteryEncounterIntroVisuals, +} from "#mystery-encounters/encounter-phase-utils"; +import { modifyPlayerPokemonBST } from "#mystery-encounters/encounter-pokemon-utils"; +import type { MysteryEncounter } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; /** the i18n namespace for the encounter */ const namespace = "mysteryEncounters/theStrongStuff"; diff --git a/src/data/mystery-encounters/encounters/the-winstrate-challenge-encounter.ts b/src/data/mystery-encounters/encounters/the-winstrate-challenge-encounter.ts index 6d28a710953..e17bf0575d7 100644 --- a/src/data/mystery-encounters/encounters/the-winstrate-challenge-encounter.ts +++ b/src/data/mystery-encounters/encounters/the-winstrate-challenge-encounter.ts @@ -1,4 +1,24 @@ -import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { applyAbAttrs } from "#abilities/apply-ab-attrs"; +import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; +import { globalScene } from "#app/global-scene"; +import { modifierTypes } from "#data/data-lists"; +import { SpeciesFormChangeAbilityTrigger } from "#data/form-change-triggers"; +import { AbilityId } from "#enums/ability-id"; +import { BattlerTagType } from "#enums/battler-tag-type"; +import { BerryType } from "#enums/berry-type"; +import { ModifierTier } from "#enums/modifier-tier"; +import { MoveId } from "#enums/move-id"; +import { MysteryEncounterMode } from "#enums/mystery-encounter-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { Nature } from "#enums/nature"; +import { PokemonType } from "#enums/pokemon-type"; +import { SpeciesId } from "#enums/species-id"; +import { Stat } from "#enums/stat"; +import { TrainerType } from "#enums/trainer-type"; +import type { PokemonHeldItemModifierType } from "#modifiers/modifier-type"; +import { showEncounterDialogue, showEncounterText } from "#mystery-encounters/encounter-dialogue-utils"; +import type { EnemyPartyConfig } from "#mystery-encounters/encounter-phase-utils"; import { generateModifierType, generateModifierTypeOption, @@ -6,31 +26,11 @@ import { leaveEncounterWithoutBattle, setEncounterRewards, transitionMysteryEncounterIntroVisuals, -} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import type { PokemonHeldItemModifierType } from "#app/modifier/modifier-type"; -import { modifierTypes } from "#app/data/data-lists"; -import { MysteryEncounterType } from "#enums/mystery-encounter-type"; -import { globalScene } from "#app/global-scene"; -import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { TrainerType } from "#enums/trainer-type"; -import { SpeciesId } from "#enums/species-id"; -import { AbilityId } from "#enums/ability-id"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; -import { MoveId } from "#enums/move-id"; -import { Nature } from "#enums/nature"; -import { PokemonType } from "#enums/pokemon-type"; -import { BerryType } from "#enums/berry-type"; -import { Stat } from "#enums/stat"; -import { SpeciesFormChangeAbilityTrigger } from "#app/data/pokemon-forms/form-change-triggers"; -import { applyAbAttrs } from "#app/data/abilities/apply-ab-attrs"; -import { showEncounterDialogue, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; -import { MysteryEncounterMode } from "#enums/mystery-encounter-mode"; +} from "#mystery-encounters/encounter-phase-utils"; +import type { MysteryEncounter } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; import i18next from "i18next"; -import { ModifierTier } from "#enums/modifier-tier"; -import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; -import { BattlerTagType } from "#enums/battler-tag-type"; /** the i18n namespace for the encounter */ const namespace = "mysteryEncounters/theWinstrateChallenge"; diff --git a/src/data/mystery-encounters/encounters/training-session-encounter.ts b/src/data/mystery-encounters/encounters/training-session-encounter.ts index 04e64083602..ec1b6c1cafc 100644 --- a/src/data/mystery-encounters/encounters/training-session-encounter.ts +++ b/src/data/mystery-encounters/encounters/training-session-encounter.ts @@ -1,36 +1,35 @@ -import type { Ability } from "#app/data/abilities/ability"; -import { allAbilities } from "#app/data/data-lists"; -import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import type { Ability } from "#abilities/ability"; +import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; +import { globalScene } from "#app/global-scene"; +import { speciesStarterCosts } from "#balance/starters"; +import { allAbilities } from "#data/data-lists"; +import { getNatureName } from "#data/nature"; +import { AbilityAttr } from "#enums/ability-attr"; +import { BattlerTagType } from "#enums/battler-tag-type"; +import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import type { Nature } from "#enums/nature"; +import { getStatKey } from "#enums/stat"; +import type { PlayerPokemon, Pokemon } from "#field/pokemon"; +import type { PokemonHeldItemModifier } from "#modifiers/modifier"; +import { queueEncounterMessage, showEncounterText } from "#mystery-encounters/encounter-dialogue-utils"; +import type { EnemyPartyConfig } from "#mystery-encounters/encounter-phase-utils"; import { initBattleWithEnemyConfig, leaveEncounterWithoutBattle, selectPokemonForOption, setEncounterRewards, -} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { getNatureName } from "#app/data/nature"; -import { speciesStarterCosts } from "#app/data/balance/starters"; -import type { PlayerPokemon } from "#app/field/pokemon"; -import type Pokemon from "#app/field/pokemon"; -import type { PokemonHeldItemModifier } from "#app/modifier/modifier"; -import { AbilityAttr } from "#enums/ability-attr"; -import PokemonData from "#app/system/pokemon-data"; -import type { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler"; -import { isNullOrUndefined, randSeedShuffle } from "#app/utils/common"; -import { BattlerTagType } from "#enums/battler-tag-type"; -import { MysteryEncounterType } from "#enums/mystery-encounter-type"; -import { globalScene } from "#app/global-scene"; -import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; -import { queueEncounterMessage, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import type HeldModifierConfig from "#app/@types/held-modifier-config"; +} from "#mystery-encounters/encounter-phase-utils"; +import { isPokemonValidForEncounterOptionSelection } from "#mystery-encounters/encounter-pokemon-utils"; +import type { MysteryEncounter } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option"; +import { PokemonData } from "#system/pokemon-data"; +import type { HeldModifierConfig } from "#types/held-modifier-config"; +import type { OptionSelectItem } from "#ui/abstact-option-select-ui-handler"; +import { isNullOrUndefined, randSeedShuffle } from "#utils/common"; import i18next from "i18next"; -import { getStatKey } from "#enums/stat"; -import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; -import { isPokemonValidForEncounterOptionSelection } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; -import type { Nature } from "#enums/nature"; /** The i18n namespace for the encounter */ const namespace = "mysteryEncounters/trainingSession"; diff --git a/src/data/mystery-encounters/encounters/trash-to-treasure-encounter.ts b/src/data/mystery-encounters/encounters/trash-to-treasure-encounter.ts index e2a740c4900..452a9a8bb4b 100644 --- a/src/data/mystery-encounters/encounters/trash-to-treasure-encounter.ts +++ b/src/data/mystery-encounters/encounters/trash-to-treasure-encounter.ts @@ -1,4 +1,19 @@ -import type { EnemyPartyConfig, EnemyPokemonConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; +import { globalScene } from "#app/global-scene"; +import { modifierTypes } from "#data/data-lists"; +import { BattlerIndex } from "#enums/battler-index"; +import { ModifierTier } from "#enums/modifier-tier"; +import { MoveId } from "#enums/move-id"; +import { MoveUseMode } from "#enums/move-use-mode"; +import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { SpeciesId } from "#enums/species-id"; +import { HitHealModifier, PokemonHeldItemModifier, TurnHealModifier } from "#modifiers/modifier"; +import type { PokemonHeldItemModifierType } from "#modifiers/modifier-type"; +import { PokemonMove } from "#moves/pokemon-move"; +import { showEncounterText } from "#mystery-encounters/encounter-dialogue-utils"; +import type { EnemyPartyConfig, EnemyPokemonConfig } from "#mystery-encounters/encounter-phase-utils"; import { generateModifierType, initBattleWithEnemyConfig, @@ -6,29 +21,14 @@ import { loadCustomMovesForEncounter, setEncounterRewards, transitionMysteryEncounterIntroVisuals, -} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import type { PokemonHeldItemModifierType } from "#app/modifier/modifier-type"; -import { modifierTypes } from "#app/data/data-lists"; -import { MysteryEncounterType } from "#enums/mystery-encounter-type"; -import { globalScene } from "#app/global-scene"; -import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import { SpeciesId } from "#enums/species-id"; -import { HitHealModifier, PokemonHeldItemModifier, TurnHealModifier } from "#app/modifier/modifier"; -import { applyModifierTypeToPlayerPokemon } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; -import { showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; -import i18next from "#app/plugins/i18n"; -import { ModifierTier } from "#enums/modifier-tier"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; -import { MoveId } from "#enums/move-id"; -import { BattlerIndex } from "#enums/battler-index"; -import { PokemonMove } from "#app/data/moves/pokemon-move"; -import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; -import { randSeedInt } from "#app/utils/common"; -import { MoveUseMode } from "#enums/move-use-mode"; +} from "#mystery-encounters/encounter-phase-utils"; +import { applyModifierTypeToPlayerPokemon } from "#mystery-encounters/encounter-pokemon-utils"; +import type { MysteryEncounter } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option"; +import i18next from "#plugins/i18n"; +import { randSeedInt } from "#utils/common"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; /** the i18n namespace for this encounter */ const namespace = "mysteryEncounters/trashToTreasure"; diff --git a/src/data/mystery-encounters/encounters/uncommon-breed-encounter.ts b/src/data/mystery-encounters/encounters/uncommon-breed-encounter.ts index 44e578540dd..c9e2ffedeec 100644 --- a/src/data/mystery-encounters/encounters/uncommon-breed-encounter.ts +++ b/src/data/mystery-encounters/encounters/uncommon-breed-encounter.ts @@ -1,42 +1,38 @@ -import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; -import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; +import { globalScene } from "#app/global-scene"; +import { BattlerIndex } from "#enums/battler-index"; +import { BattlerTagType } from "#enums/battler-tag-type"; +import type { MoveId } from "#enums/move-id"; +import { MoveUseMode } from "#enums/move-use-mode"; +import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { PokeballType } from "#enums/pokeball"; +import { Stat } from "#enums/stat"; +import type { EnemyPokemon, Pokemon } from "#field/pokemon"; +import { BerryModifier } from "#modifiers/modifier"; +import { PokemonMove } from "#moves/pokemon-move"; +import { queueEncounterMessage } from "#mystery-encounters/encounter-dialogue-utils"; +import type { EnemyPartyConfig } from "#mystery-encounters/encounter-phase-utils"; import { getRandomEncounterSpecies, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, setEncounterExp, setEncounterRewards, -} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { CHARMING_MOVES } from "#app/data/mystery-encounters/requirements/requirement-groups"; -import type Pokemon from "#app/field/pokemon"; -import type { EnemyPokemon } from "#app/field/pokemon"; -import { PokemonMove } from "#app/data/moves/pokemon-move"; -import { MysteryEncounterType } from "#enums/mystery-encounter-type"; -import { globalScene } from "#app/global-scene"; -import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter"; -import { - MoveRequirement, - PersistentModifierRequirement, -} from "#app/data/mystery-encounters/mystery-encounter-requirements"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +} from "#mystery-encounters/encounter-phase-utils"; import { catchPokemon, getHighestLevelPlayerPokemon, getSpriteKeysFromPokemon, -} from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; -import PokemonData from "#app/system/pokemon-data"; -import { isNullOrUndefined, randSeedInt } from "#app/utils/common"; -import type { MoveId } from "#enums/move-id"; -import { BattlerIndex } from "#enums/battler-index"; -import { PokeballType } from "#enums/pokeball"; -import { BattlerTagType } from "#enums/battler-tag-type"; -import { queueEncounterMessage } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; -import { BerryModifier } from "#app/modifier/modifier"; -import { Stat } from "#enums/stat"; -import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; -import { MoveUseMode } from "#enums/move-use-mode"; +} from "#mystery-encounters/encounter-pokemon-utils"; +import type { MysteryEncounter } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option"; +import { MoveRequirement, PersistentModifierRequirement } from "#mystery-encounters/mystery-encounter-requirements"; +import { CHARMING_MOVES } from "#mystery-encounters/requirement-groups"; +import { PokemonData } from "#system/pokemon-data"; +import { isNullOrUndefined, randSeedInt } from "#utils/common"; /** the i18n namespace for the encounter */ const namespace = "mysteryEncounters/uncommonBreed"; diff --git a/src/data/mystery-encounters/encounters/weird-dream-encounter.ts b/src/data/mystery-encounters/encounters/weird-dream-encounter.ts index 1ba756c7f5d..d0cc30c3272 100644 --- a/src/data/mystery-encounters/encounters/weird-dream-encounter.ts +++ b/src/data/mystery-encounters/encounters/weird-dream-encounter.ts @@ -1,49 +1,47 @@ -import { PokemonType } from "#enums/pokemon-type"; -import { MysteryEncounterType } from "#enums/mystery-encounter-type"; -import { SpeciesId } from "#enums/species-id"; import { globalScene } from "#app/global-scene"; -import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; -import type { EnemyPartyConfig, EnemyPokemonConfig } from "../utils/encounter-phase-utils"; +import { allSpecies, modifierTypes } from "#data/data-lists"; +import { getLevelTotalExp } from "#data/exp"; +import type { PokemonSpecies } from "#data/pokemon-species"; +import { Challenges } from "#enums/challenges"; +import { ModifierTier } from "#enums/modifier-tier"; +import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { Nature } from "#enums/nature"; +import { PartyMemberStrength } from "#enums/party-member-strength"; +import { PlayerGender } from "#enums/player-gender"; +import { PokemonType } from "#enums/pokemon-type"; +import { SpeciesId } from "#enums/species-id"; +import { Stat } from "#enums/stat"; +import { TrainerType } from "#enums/trainer-type"; +import type { PlayerPokemon, Pokemon } from "#field/pokemon"; +import type { PokemonHeldItemModifier } from "#modifiers/modifier"; +import { HiddenAbilityRateBoosterModifier, PokemonFormChangeItemModifier } from "#modifiers/modifier"; +import type { PokemonHeldItemModifierType } from "#modifiers/modifier-type"; +import { PokemonMove } from "#moves/pokemon-move"; +import { showEncounterText } from "#mystery-encounters/encounter-dialogue-utils"; +import type { EnemyPartyConfig, EnemyPokemonConfig } from "#mystery-encounters/encounter-phase-utils"; import { generateModifierType, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, setEncounterRewards, -} from "../utils/encounter-phase-utils"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import type { PlayerPokemon } from "#app/field/pokemon"; -import type Pokemon from "#app/field/pokemon"; -import { PokemonMove } from "#app/data/moves/pokemon-move"; -import { NumberHolder, isNullOrUndefined, randSeedInt, randSeedShuffle } from "#app/utils/common"; -import type PokemonSpecies from "#app/data/pokemon-species"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; -import { allSpecies } from "#app/data/data-lists"; -import type { PokemonHeldItemModifier } from "#app/modifier/modifier"; -import { HiddenAbilityRateBoosterModifier, PokemonFormChangeItemModifier } from "#app/modifier/modifier"; -import { achvs } from "#app/system/achv"; -import { showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; -import type { PokemonHeldItemModifierType } from "#app/modifier/modifier-type"; -import { modifierTypes } from "#app/data/data-lists"; -import i18next from "#app/plugins/i18n"; +} from "#mystery-encounters/encounter-phase-utils"; import { doPokemonTransformationSequence, TransformationScreenPosition, -} from "#app/data/mystery-encounters/utils/encounter-transformation-sequence"; -import { getLevelTotalExp } from "#app/data/exp"; -import { Stat } from "#enums/stat"; -import { Challenges } from "#enums/challenges"; -import { ModifierTier } from "#enums/modifier-tier"; -import { PlayerGender } from "#enums/player-gender"; -import { TrainerType } from "#enums/trainer-type"; -import PokemonData from "#app/system/pokemon-data"; -import { Nature } from "#enums/nature"; -import type HeldModifierConfig from "#app/@types/held-modifier-config"; -import { trainerConfigs } from "#app/data/trainers/trainer-config"; -import { TrainerPartyTemplate } from "#app/data/trainers/TrainerPartyTemplate"; -import { PartyMemberStrength } from "#enums/party-member-strength"; +} from "#mystery-encounters/encounter-transformation-sequence"; +import type { MysteryEncounter } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter"; +import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option"; +import i18next from "#plugins/i18n"; +import { achvs } from "#system/achv"; +import { PokemonData } from "#system/pokemon-data"; +import { TrainerPartyTemplate } from "#trainers/TrainerPartyTemplate"; +import { trainerConfigs } from "#trainers/trainer-config"; +import type { HeldModifierConfig } from "#types/held-modifier-config"; +import { isNullOrUndefined, NumberHolder, randSeedInt, randSeedShuffle } from "#utils/common"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; /** i18n namespace for encounter */ const namespace = "mysteryEncounters/weirdDream"; diff --git a/src/data/mystery-encounters/mystery-encounter-dialogue.ts b/src/data/mystery-encounters/mystery-encounter-dialogue.ts index 71e1b382f61..42383940755 100644 --- a/src/data/mystery-encounters/mystery-encounter-dialogue.ts +++ b/src/data/mystery-encounters/mystery-encounter-dialogue.ts @@ -1,4 +1,4 @@ -import type { TextStyle } from "#app/ui/text"; +import type { TextStyle } from "#ui/text"; export class TextDisplay { speaker?: string; @@ -67,7 +67,7 @@ export class EncounterOptionsDialogue { } * */ -export default class MysteryEncounterDialogue { +export class MysteryEncounterDialogue { intro?: TextDisplay[]; encounterOptionsDialogue?: EncounterOptionsDialogue; outro?: TextDisplay[]; diff --git a/src/data/mystery-encounters/mystery-encounter-option.ts b/src/data/mystery-encounters/mystery-encounter-option.ts index 53b53392bb8..24707683a82 100644 --- a/src/data/mystery-encounters/mystery-encounter-option.ts +++ b/src/data/mystery-encounters/mystery-encounter-option.ts @@ -1,19 +1,18 @@ -import type { OptionTextDisplay } from "#app/data/mystery-encounters/mystery-encounter-dialogue"; -import type { MoveId } from "#enums/move-id"; -import type { PlayerPokemon } from "#app/field/pokemon"; -import type Pokemon from "#app/field/pokemon"; import { globalScene } from "#app/global-scene"; +import type { MoveId } from "#enums/move-id"; +import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import type { PokemonType } from "#enums/pokemon-type"; +import type { PlayerPokemon, Pokemon } from "#field/pokemon"; +import type { CanLearnMoveRequirementOptions } from "#mystery-encounters/can-learn-move-requirement"; +import { CanLearnMoveRequirement } from "#mystery-encounters/can-learn-move-requirement"; +import type { OptionTextDisplay } from "#mystery-encounters/mystery-encounter-dialogue"; import { EncounterPokemonRequirement, EncounterSceneRequirement, MoneyRequirement, TypeRequirement, -} from "#app/data/mystery-encounters/mystery-encounter-requirements"; -import type { CanLearnMoveRequirementOptions } from "./requirements/can-learn-move-requirement"; -import { CanLearnMoveRequirement } from "./requirements/can-learn-move-requirement"; -import { isNullOrUndefined, randSeedInt } from "#app/utils/common"; -import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +} from "#mystery-encounters/mystery-encounter-requirements"; +import { isNullOrUndefined, randSeedInt } from "#utils/common"; // biome-ignore lint/suspicious/noConfusingVoidType: void unions in callbacks are OK export type OptionPhaseCallback = () => Promise; @@ -39,7 +38,7 @@ export interface IMysteryEncounterOption { onPostOptionPhase?: OptionPhaseCallback; } -export default class MysteryEncounterOption implements IMysteryEncounterOption { +export class MysteryEncounterOption implements IMysteryEncounterOption { optionMode: MysteryEncounterOptionMode; hasDexProgress: boolean; requirements: EncounterSceneRequirement[]; diff --git a/src/data/mystery-encounters/mystery-encounter-requirements.ts b/src/data/mystery-encounters/mystery-encounter-requirements.ts index 07fd155b2b2..d71964db4b8 100644 --- a/src/data/mystery-encounters/mystery-encounter-requirements.ts +++ b/src/data/mystery-encounters/mystery-encounter-requirements.ts @@ -1,21 +1,21 @@ import { globalScene } from "#app/global-scene"; -import { allAbilities } from "../data-lists"; -import { Nature } from "#enums/nature"; -import { pokemonFormChanges } from "#app/data/pokemon-forms"; -import { SpeciesFormChangeItemTrigger } from "../pokemon-forms/form-change-triggers"; -import { FormChangeItem } from "#enums/form-change-item"; -import { StatusEffect } from "#enums/status-effect"; -import { PokemonType } from "#enums/pokemon-type"; -import { WeatherType } from "#enums/weather-type"; -import type { PlayerPokemon } from "#app/field/pokemon"; -import { AttackTypeBoosterModifier } from "#app/modifier/modifier"; -import type { AttackTypeBoosterModifierType } from "#app/modifier/modifier-type"; -import { coerceArray, isNullOrUndefined } from "#app/utils/common"; +import { allAbilities } from "#data/data-lists"; +import { SpeciesFormChangeItemTrigger } from "#data/form-change-triggers"; +import { pokemonFormChanges } from "#data/pokemon-forms"; import type { AbilityId } from "#enums/ability-id"; +import { FormChangeItem } from "#enums/form-change-item"; import { MoveId } from "#enums/move-id"; import type { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { Nature } from "#enums/nature"; +import { PokemonType } from "#enums/pokemon-type"; import { SpeciesId } from "#enums/species-id"; +import { StatusEffect } from "#enums/status-effect"; import { TimeOfDay } from "#enums/time-of-day"; +import { WeatherType } from "#enums/weather-type"; +import type { PlayerPokemon } from "#field/pokemon"; +import { AttackTypeBoosterModifier } from "#modifiers/modifier"; +import type { AttackTypeBoosterModifierType } from "#modifiers/modifier-type"; +import { coerceArray, isNullOrUndefined } from "#utils/common"; export interface EncounterRequirement { meetsRequirement(): boolean; // Boolean to see if a requirement is met diff --git a/src/data/mystery-encounters/mystery-encounter-save-data.ts b/src/data/mystery-encounters/mystery-encounter-save-data.ts index 20c10c7c5b9..f04abccba5f 100644 --- a/src/data/mystery-encounters/mystery-encounter-save-data.ts +++ b/src/data/mystery-encounters/mystery-encounter-save-data.ts @@ -1,7 +1,7 @@ -import type { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { BASE_MYSTERY_ENCOUNTER_SPAWN_WEIGHT } from "#app/constants"; -import { isNullOrUndefined } from "#app/utils/common"; import type { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import type { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { isNullOrUndefined } from "#utils/common"; export class SeenEncounterData { type: MysteryEncounterType; diff --git a/src/data/mystery-encounters/mystery-encounter.ts b/src/data/mystery-encounters/mystery-encounter.ts index fa97a7f4d40..00e81598380 100644 --- a/src/data/mystery-encounters/mystery-encounter.ts +++ b/src/data/mystery-encounters/mystery-encounter.ts @@ -1,18 +1,22 @@ -import type { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import type { PlayerPokemon } from "#app/field/pokemon"; -import type { PokemonMove } from "../moves/pokemon-move"; -import type Pokemon from "#app/field/pokemon"; -import { capitalizeFirstLetter, coerceArray, isNullOrUndefined } from "#app/utils/common"; +import { globalScene } from "#app/global-scene"; +import type { BattlerIndex } from "#enums/battler-index"; +import type { Challenges } from "#enums/challenges"; +import type { EncounterAnim } from "#enums/encounter-anims"; +import type { GameModes } from "#enums/game-modes"; +import type { MoveUseMode } from "#enums/move-use-mode"; +import { MysteryEncounterMode } from "#enums/mystery-encounter-mode"; +import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import type { MysteryEncounterType } from "#enums/mystery-encounter-type"; -import type { MysteryEncounterSpriteConfig } from "#app/field/mystery-encounter-intro"; -import MysteryEncounterIntroVisuals from "#app/field/mystery-encounter-intro"; -import { randSeedInt } from "#app/utils/common"; import type { StatusEffect } from "#enums/status-effect"; -import type { OptionTextDisplay } from "./mystery-encounter-dialogue"; -import type MysteryEncounterDialogue from "./mystery-encounter-dialogue"; -import type { OptionPhaseCallback } from "./mystery-encounter-option"; -import type MysteryEncounterOption from "./mystery-encounter-option"; -import { MysteryEncounterOptionBuilder } from "./mystery-encounter-option"; +import type { MysteryEncounterSpriteConfig } from "#field/mystery-encounter-intro"; +import { MysteryEncounterIntroVisuals } from "#field/mystery-encounter-intro"; +import type { PlayerPokemon, Pokemon } from "#field/pokemon"; +import type { PokemonMove } from "#moves/pokemon-move"; +import type { EnemyPartyConfig } from "#mystery-encounters/encounter-phase-utils"; +import type { MysteryEncounterDialogue, OptionTextDisplay } from "#mystery-encounters/mystery-encounter-dialogue"; +import type { MysteryEncounterOption, OptionPhaseCallback } from "#mystery-encounters/mystery-encounter-option"; +import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option"; import { EncounterPokemonRequirement, EncounterSceneRequirement, @@ -20,16 +24,8 @@ import { PartySizeRequirement, StatusEffectRequirement, WaveRangeRequirement, -} from "./mystery-encounter-requirements"; -import type { BattlerIndex } from "#enums/battler-index"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { MysteryEncounterMode } from "#enums/mystery-encounter-mode"; -import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import type { GameModes } from "#enums/game-modes"; -import type { EncounterAnim } from "#enums/encounter-anims"; -import type { Challenges } from "#enums/challenges"; -import { globalScene } from "#app/global-scene"; -import type { MoveUseMode } from "#enums/move-use-mode"; +} from "#mystery-encounters/mystery-encounter-requirements"; +import { capitalizeFirstLetter, coerceArray, isNullOrUndefined, randSeedInt } from "#utils/common"; export interface EncounterStartOfBattleEffect { sourcePokemon?: Pokemon; @@ -91,7 +87,7 @@ export interface IMysteryEncounter { * These objects will be saved as part of session data any time the player is on a floor with an encounter * Unless you know what you're doing, you should use MysteryEncounterBuilder to create an instance for this class */ -export default class MysteryEncounter implements IMysteryEncounter { +export class MysteryEncounter implements IMysteryEncounter { // #region Required params encounterType: MysteryEncounterType; diff --git a/src/data/mystery-encounters/mystery-encounters.ts b/src/data/mystery-encounters/mystery-encounters.ts index 5ee289a6c56..34eac5cab94 100644 --- a/src/data/mystery-encounters/mystery-encounters.ts +++ b/src/data/mystery-encounters/mystery-encounters.ts @@ -1,38 +1,38 @@ +import { getBiomeName } from "#balance/biomes"; import { BiomeId } from "#enums/biome-id"; import { MysteryEncounterType } from "#enums/mystery-encounter-type"; -import { DarkDealEncounter } from "./encounters/dark-deal-encounter"; -import { DepartmentStoreSaleEncounter } from "./encounters/department-store-sale-encounter"; -import { FieldTripEncounter } from "./encounters/field-trip-encounter"; -import { FightOrFlightEncounter } from "./encounters/fight-or-flight-encounter"; -import { LostAtSeaEncounter } from "./encounters/lost-at-sea-encounter"; -import { MysteriousChallengersEncounter } from "./encounters/mysterious-challengers-encounter"; -import { MysteriousChestEncounter } from "./encounters/mysterious-chest-encounter"; -import { ShadyVitaminDealerEncounter } from "./encounters/shady-vitamin-dealer-encounter"; -import { SlumberingSnorlaxEncounter } from "./encounters/slumbering-snorlax-encounter"; -import { TrainingSessionEncounter } from "./encounters/training-session-encounter"; -import type MysteryEncounter from "./mystery-encounter"; -import { SafariZoneEncounter } from "#app/data/mystery-encounters/encounters/safari-zone-encounter"; -import { FieryFalloutEncounter } from "#app/data/mystery-encounters/encounters/fiery-fallout-encounter"; -import { TheStrongStuffEncounter } from "#app/data/mystery-encounters/encounters/the-strong-stuff-encounter"; -import { ThePokemonSalesmanEncounter } from "#app/data/mystery-encounters/encounters/the-pokemon-salesman-encounter"; -import { AnOfferYouCantRefuseEncounter } from "#app/data/mystery-encounters/encounters/an-offer-you-cant-refuse-encounter"; -import { DelibirdyEncounter } from "#app/data/mystery-encounters/encounters/delibirdy-encounter"; -import { AbsoluteAvariceEncounter } from "#app/data/mystery-encounters/encounters/absolute-avarice-encounter"; -import { ATrainersTestEncounter } from "#app/data/mystery-encounters/encounters/a-trainers-test-encounter"; -import { TrashToTreasureEncounter } from "#app/data/mystery-encounters/encounters/trash-to-treasure-encounter"; -import { BerriesAboundEncounter } from "#app/data/mystery-encounters/encounters/berries-abound-encounter"; -import { ClowningAroundEncounter } from "#app/data/mystery-encounters/encounters/clowning-around-encounter"; -import { PartTimerEncounter } from "#app/data/mystery-encounters/encounters/part-timer-encounter"; -import { DancingLessonsEncounter } from "#app/data/mystery-encounters/encounters/dancing-lessons-encounter"; -import { WeirdDreamEncounter } from "#app/data/mystery-encounters/encounters/weird-dream-encounter"; -import { TheWinstrateChallengeEncounter } from "#app/data/mystery-encounters/encounters/the-winstrate-challenge-encounter"; -import { TeleportingHijinksEncounter } from "#app/data/mystery-encounters/encounters/teleporting-hijinks-encounter"; -import { BugTypeSuperfanEncounter } from "#app/data/mystery-encounters/encounters/bug-type-superfan-encounter"; -import { FunAndGamesEncounter } from "#app/data/mystery-encounters/encounters/fun-and-games-encounter"; -import { UncommonBreedEncounter } from "#app/data/mystery-encounters/encounters/uncommon-breed-encounter"; -import { GlobalTradeSystemEncounter } from "#app/data/mystery-encounters/encounters/global-trade-system-encounter"; -import { TheExpertPokemonBreederEncounter } from "#app/data/mystery-encounters/encounters/the-expert-pokemon-breeder-encounter"; -import { getBiomeName } from "#app/data/balance/biomes"; +import { ATrainersTestEncounter } from "#mystery-encounters/a-trainers-test-encounter"; +import { AbsoluteAvariceEncounter } from "#mystery-encounters/absolute-avarice-encounter"; +import { AnOfferYouCantRefuseEncounter } from "#mystery-encounters/an-offer-you-cant-refuse-encounter"; +import { BerriesAboundEncounter } from "#mystery-encounters/berries-abound-encounter"; +import { BugTypeSuperfanEncounter } from "#mystery-encounters/bug-type-superfan-encounter"; +import { ClowningAroundEncounter } from "#mystery-encounters/clowning-around-encounter"; +import { DancingLessonsEncounter } from "#mystery-encounters/dancing-lessons-encounter"; +import { DarkDealEncounter } from "#mystery-encounters/dark-deal-encounter"; +import { DelibirdyEncounter } from "#mystery-encounters/delibirdy-encounter"; +import { DepartmentStoreSaleEncounter } from "#mystery-encounters/department-store-sale-encounter"; +import { FieldTripEncounter } from "#mystery-encounters/field-trip-encounter"; +import { FieryFalloutEncounter } from "#mystery-encounters/fiery-fallout-encounter"; +import { FightOrFlightEncounter } from "#mystery-encounters/fight-or-flight-encounter"; +import { FunAndGamesEncounter } from "#mystery-encounters/fun-and-games-encounter"; +import { GlobalTradeSystemEncounter } from "#mystery-encounters/global-trade-system-encounter"; +import { LostAtSeaEncounter } from "#mystery-encounters/lost-at-sea-encounter"; +import { MysteriousChallengersEncounter } from "#mystery-encounters/mysterious-challengers-encounter"; +import { MysteriousChestEncounter } from "#mystery-encounters/mysterious-chest-encounter"; +import type { MysteryEncounter } from "#mystery-encounters/mystery-encounter"; +import { PartTimerEncounter } from "#mystery-encounters/part-timer-encounter"; +import { SafariZoneEncounter } from "#mystery-encounters/safari-zone-encounter"; +import { ShadyVitaminDealerEncounter } from "#mystery-encounters/shady-vitamin-dealer-encounter"; +import { SlumberingSnorlaxEncounter } from "#mystery-encounters/slumbering-snorlax-encounter"; +import { TeleportingHijinksEncounter } from "#mystery-encounters/teleporting-hijinks-encounter"; +import { TheExpertPokemonBreederEncounter } from "#mystery-encounters/the-expert-pokemon-breeder-encounter"; +import { ThePokemonSalesmanEncounter } from "#mystery-encounters/the-pokemon-salesman-encounter"; +import { TheStrongStuffEncounter } from "#mystery-encounters/the-strong-stuff-encounter"; +import { TheWinstrateChallengeEncounter } from "#mystery-encounters/the-winstrate-challenge-encounter"; +import { TrainingSessionEncounter } from "#mystery-encounters/training-session-encounter"; +import { TrashToTreasureEncounter } from "#mystery-encounters/trash-to-treasure-encounter"; +import { UncommonBreedEncounter } from "#mystery-encounters/uncommon-breed-encounter"; +import { WeirdDreamEncounter } from "#mystery-encounters/weird-dream-encounter"; export const EXTREME_ENCOUNTER_BIOMES = [ BiomeId.SEA, diff --git a/src/data/mystery-encounters/requirements/can-learn-move-requirement.ts b/src/data/mystery-encounters/requirements/can-learn-move-requirement.ts index 0123ea7d6ba..26602b8ae31 100644 --- a/src/data/mystery-encounters/requirements/can-learn-move-requirement.ts +++ b/src/data/mystery-encounters/requirements/can-learn-move-requirement.ts @@ -1,9 +1,9 @@ -import type { MoveId } from "#enums/move-id"; -import type { PlayerPokemon } from "#app/field/pokemon"; -import { PokemonMove } from "#app/data/moves/pokemon-move"; -import { coerceArray, isNullOrUndefined } from "#app/utils/common"; -import { EncounterPokemonRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements"; import { globalScene } from "#app/global-scene"; +import type { MoveId } from "#enums/move-id"; +import type { PlayerPokemon } from "#field/pokemon"; +import { PokemonMove } from "#moves/pokemon-move"; +import { EncounterPokemonRequirement } from "#mystery-encounters/mystery-encounter-requirements"; +import { coerceArray, isNullOrUndefined } from "#utils/common"; /** * {@linkcode CanLearnMoveRequirement} options diff --git a/src/data/mystery-encounters/requirements/requirement-groups.ts b/src/data/mystery-encounters/requirements/requirement-groups.ts index 0140a5fe320..8981dfe173c 100644 --- a/src/data/mystery-encounters/requirements/requirement-groups.ts +++ b/src/data/mystery-encounters/requirements/requirement-groups.ts @@ -1,5 +1,5 @@ -import { MoveId } from "#enums/move-id"; import { AbilityId } from "#enums/ability-id"; +import { MoveId } from "#enums/move-id"; /** * Moves that "steal" things diff --git a/src/data/mystery-encounters/utils/encounter-dialogue-utils.ts b/src/data/mystery-encounters/utils/encounter-dialogue-utils.ts index e1055f57496..4f4af94a88d 100644 --- a/src/data/mystery-encounters/utils/encounter-dialogue-utils.ts +++ b/src/data/mystery-encounters/utils/encounter-dialogue-utils.ts @@ -1,8 +1,8 @@ import { globalScene } from "#app/global-scene"; -import type { TextStyle } from "#app/ui/text"; -import { getTextWithColors } from "#app/ui/text"; import { UiTheme } from "#enums/ui-theme"; -import { isNullOrUndefined } from "#app/utils/common"; +import type { TextStyle } from "#ui/text"; +import { getTextWithColors } from "#ui/text"; +import { isNullOrUndefined } from "#utils/common"; import i18next from "i18next"; /** diff --git a/src/data/mystery-encounters/utils/encounter-phase-utils.ts b/src/data/mystery-encounters/utils/encounter-phase-utils.ts index bd2dfa998f4..68c49e121ef 100644 --- a/src/data/mystery-encounters/utils/encounter-phase-utils.ts +++ b/src/data/mystery-encounters/utils/encounter-phase-utils.ts @@ -1,58 +1,57 @@ -import type Battle from "#app/battle"; -import { BattleType } from "#enums/battle-type"; -import { biomeLinks, BiomePoolTier } from "#app/data/balance/biomes"; -import type MysteryEncounterOption from "#app/data/mystery-encounters/mystery-encounter-option"; +import type { Battle } from "#app/battle"; import { AVERAGE_ENCOUNTERS_PER_RUN_TARGET, WEIGHT_INCREMENT_ON_SPAWN_MISS } from "#app/constants"; -import { showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; -import type { PlayerPokemon } from "#app/field/pokemon"; +import { timedEventManager } from "#app/global-event-manager"; +import { globalScene } from "#app/global-scene"; +import { getPokemonNameWithAffix } from "#app/messages"; +import { BiomePoolTier, biomeLinks } from "#balance/biomes"; +import { initMoveAnim, loadMoveAnimAssets } from "#data/battle-anims"; +import { modifierTypes } from "#data/data-lists"; +import type { IEggOptions } from "#data/egg"; +import { Egg } from "#data/egg"; +import type { Gender } from "#data/gender"; +import { getNatureName } from "#data/nature"; +import type { CustomPokemonData } from "#data/pokemon-data"; +import type { PokemonSpecies } from "#data/pokemon-species"; +import { Status } from "#data/status-effect"; import type { AiType } from "#enums/ai-type"; -import type Pokemon from "#app/field/pokemon"; -import { EnemyPokemon } from "#app/field/pokemon"; -import { PokemonMove } from "#app/data/moves/pokemon-move"; +import { BattleType } from "#enums/battle-type"; +import type { BattlerTagType } from "#enums/battler-tag-type"; +import { BiomeId } from "#enums/biome-id"; import { FieldPosition } from "#enums/field-position"; -import type { CustomModifierSettings, ModifierType } from "#app/modifier/modifier-type"; +import { ModifierPoolType } from "#enums/modifier-pool-type"; +import type { MoveId } from "#enums/move-id"; +import { MysteryEncounterMode } from "#enums/mystery-encounter-mode"; +import type { Nature } from "#enums/nature"; +import { PokemonType } from "#enums/pokemon-type"; +import { StatusEffect } from "#enums/status-effect"; +import { TrainerSlot } from "#enums/trainer-slot"; +import type { TrainerType } from "#enums/trainer-type"; +import { TrainerVariant } from "#enums/trainer-variant"; +import { UiMode } from "#enums/ui-mode"; +import type { PlayerPokemon, Pokemon } from "#field/pokemon"; +import { EnemyPokemon } from "#field/pokemon"; +import { Trainer } from "#field/trainer"; +import type { CustomModifierSettings, ModifierType } from "#modifiers/modifier-type"; import { getPartyLuckValue, ModifierTypeGenerator, ModifierTypeOption, regenerateModifierPoolThresholds, -} from "#app/modifier/modifier-type"; -import { modifierTypes } from "#app/data/data-lists"; -import { ModifierPoolType } from "#enums/modifier-pool-type"; -import type PokemonData from "#app/system/pokemon-data"; -import type { OptionSelectConfig, OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler"; -import type { PartyOption, PokemonSelectFilter } from "#app/ui/party-ui-handler"; -import { PartyUiMode } from "#app/ui/party-ui-handler"; -import { UiMode } from "#enums/ui-mode"; -import { isNullOrUndefined, randSeedInt, randomString, randSeedItem, coerceArray } from "#app/utils/common"; -import type { BattlerTagType } from "#enums/battler-tag-type"; -import { BiomeId } from "#enums/biome-id"; -import type { TrainerType } from "#enums/trainer-type"; +} from "#modifiers/modifier-type"; +import { PokemonMove } from "#moves/pokemon-move"; +import { showEncounterText } from "#mystery-encounters/encounter-dialogue-utils"; +import type { MysteryEncounterOption } from "#mystery-encounters/mystery-encounter-option"; +import type { Variant } from "#sprites/variant"; +import type { PokemonData } from "#system/pokemon-data"; +import type { TrainerConfig } from "#trainers/trainer-config"; +import { trainerConfigs } from "#trainers/trainer-config"; +import type { HeldModifierConfig } from "#types/held-modifier-config"; +import type { OptionSelectConfig, OptionSelectItem } from "#ui/abstact-option-select-ui-handler"; +import type { PartyOption, PokemonSelectFilter } from "#ui/party-ui-handler"; +import { PartyUiMode } from "#ui/party-ui-handler"; +import { coerceArray, isNullOrUndefined, randomString, randSeedInt, randSeedItem } from "#utils/common"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; import i18next from "i18next"; -import Trainer from "#app/field/trainer"; -import { TrainerVariant } from "#enums/trainer-variant"; -import type { Gender } from "#app/data/gender"; -import type { Nature } from "#enums/nature"; -import type { MoveId } from "#enums/move-id"; -import { initMoveAnim, loadMoveAnimAssets } from "#app/data/battle-anims"; -import { MysteryEncounterMode } from "#enums/mystery-encounter-mode"; -import { Status } from "#app/data/status-effect"; -import type { TrainerConfig } from "#app/data/trainers/trainer-config"; -import { trainerConfigs } from "#app/data/trainers/trainer-config"; -import { TrainerSlot } from "#enums/trainer-slot"; -import type PokemonSpecies from "#app/data/pokemon-species"; -import type { IEggOptions } from "#app/data/egg"; -import { Egg } from "#app/data/egg"; -import type { CustomPokemonData } from "#app/data/pokemon/pokemon-data"; -import type HeldModifierConfig from "#app/@types/held-modifier-config"; -import type { Variant } from "#app/sprites/variant"; -import { StatusEffect } from "#enums/status-effect"; -import { globalScene } from "#app/global-scene"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; -import { PokemonType } from "#enums/pokemon-type"; -import { getNatureName } from "#app/data/nature"; -import { getPokemonNameWithAffix } from "#app/messages"; -import { timedEventManager } from "#app/global-event-manager"; /** * Animates exclamation sprite over trainer's head at start of encounter diff --git a/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts b/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts index f3655217b5a..ac7011ab93c 100644 --- a/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts +++ b/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts @@ -1,42 +1,41 @@ import { globalScene } from "#app/global-scene"; -import i18next from "i18next"; -import { isNullOrUndefined, randSeedInt } from "#app/utils/common"; -import { PokemonHeldItemModifier } from "#app/modifier/modifier"; -import type { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon"; -import type Pokemon from "#app/field/pokemon"; +import { getPokemonNameWithAffix } from "#app/messages"; +import { speciesStarterCosts } from "#balance/starters"; +import { modifierTypes } from "#data/data-lists"; +import { Gender } from "#data/gender"; import { doPokeballBounceAnim, getPokeballAtlasKey, getPokeballCatchMultiplier, getPokeballTintColor, -} from "#app/data/pokeball"; +} from "#data/pokeball"; +import { CustomPokemonData } from "#data/pokemon-data"; +import type { PokemonSpecies } from "#data/pokemon-species"; +import { getStatusEffectCatchRateMultiplier } from "#data/status-effect"; +import type { AbilityId } from "#enums/ability-id"; import { PlayerGender } from "#enums/player-gender"; -import { addPokeballCaptureStars, addPokeballOpenParticles } from "#app/field/anims"; -import { getStatusEffectCatchRateMultiplier } from "#app/data/status-effect"; -import { achvs } from "#app/system/achv"; -import { UiMode } from "#enums/ui-mode"; -import type { PartyOption } from "#app/ui/party-ui-handler"; -import { PartyUiMode } from "#app/ui/party-ui-handler"; -import { SpeciesId } from "#enums/species-id"; +import type { PokeballType } from "#enums/pokeball"; import type { PokemonType } from "#enums/pokemon-type"; -import type PokemonSpecies from "#app/data/pokemon-species"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; -import { speciesStarterCosts } from "#app/data/balance/starters"; +import { SpeciesId } from "#enums/species-id"; +import type { PermanentStat } from "#enums/stat"; +import { StatusEffect } from "#enums/status-effect"; +import { UiMode } from "#enums/ui-mode"; +import { addPokeballCaptureStars, addPokeballOpenParticles } from "#field/anims"; +import type { EnemyPokemon, PlayerPokemon, Pokemon } from "#field/pokemon"; +import { PokemonHeldItemModifier } from "#modifiers/modifier"; +import type { PokemonHeldItemModifierType } from "#modifiers/modifier-type"; import { getEncounterText, queueEncounterMessage, showEncounterText, -} from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; -import { getPokemonNameWithAffix } from "#app/messages"; -import type { PokemonHeldItemModifierType } from "#app/modifier/modifier-type"; -import { modifierTypes } from "#app/data/data-lists"; -import { Gender } from "#app/data/gender"; -import type { PermanentStat } from "#enums/stat"; -import { SummaryUiMode } from "#app/ui/summary-ui-handler"; -import { CustomPokemonData } from "#app/data/pokemon/pokemon-data"; -import type { AbilityId } from "#enums/ability-id"; -import type { PokeballType } from "#enums/pokeball"; -import { StatusEffect } from "#enums/status-effect"; +} from "#mystery-encounters/encounter-dialogue-utils"; +import { achvs } from "#system/achv"; +import type { PartyOption } from "#ui/party-ui-handler"; +import { PartyUiMode } from "#ui/party-ui-handler"; +import { SummaryUiMode } from "#ui/summary-ui-handler"; +import { isNullOrUndefined, randSeedInt } from "#utils/common"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; +import i18next from "i18next"; /** Will give +1 level every 10 waves */ export const STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER = 1; diff --git a/src/data/mystery-encounters/utils/encounter-transformation-sequence.ts b/src/data/mystery-encounters/utils/encounter-transformation-sequence.ts index ebef47eac2d..c64bbf81fdb 100644 --- a/src/data/mystery-encounters/utils/encounter-transformation-sequence.ts +++ b/src/data/mystery-encounters/utils/encounter-transformation-sequence.ts @@ -1,8 +1,8 @@ -import type { PlayerPokemon } from "#app/field/pokemon"; -import { getFrameMs } from "#app/utils/common"; -import { cos, sin } from "#app/field/anims"; -import { getTypeRgb } from "#app/data/type"; import { globalScene } from "#app/global-scene"; +import { getTypeRgb } from "#data/type"; +import { cos, sin } from "#field/anims"; +import type { PlayerPokemon } from "#field/pokemon"; +import { getFrameMs } from "#utils/common"; export enum TransformationScreenPosition { CENTER, diff --git a/src/data/nature.ts b/src/data/nature.ts index 83b3ee7538d..4f4e627daf3 100644 --- a/src/data/nature.ts +++ b/src/data/nature.ts @@ -1,9 +1,9 @@ -import { toReadableString } from "#app/utils/common"; -import { TextStyle, getBBCodeFrag } from "../ui/text"; import { Nature } from "#enums/nature"; +import { EFFECTIVE_STATS, getShortenedStatKey, Stat } from "#enums/stat"; import { UiTheme } from "#enums/ui-theme"; +import { getBBCodeFrag, TextStyle } from "#ui/text"; +import { toReadableString } from "#utils/common"; import i18next from "i18next"; -import { Stat, EFFECTIVE_STATS, getShortenedStatKey } from "#enums/stat"; export function getNatureName( nature: Nature, diff --git a/src/data/phase-priority-queue.ts b/src/data/phase-priority-queue.ts index b815a6ac34f..88361b0f4fa 100644 --- a/src/data/phase-priority-queue.ts +++ b/src/data/phase-priority-queue.ts @@ -1,12 +1,12 @@ import { globalScene } from "#app/global-scene"; import type { Phase } from "#app/phase"; -import { ActivatePriorityQueuePhase } from "#app/phases/activate-priority-queue-phase"; -import type { PostSummonPhase } from "#app/phases/post-summon-phase"; -import { PostSummonActivateAbilityPhase } from "#app/phases/post-summon-activate-ability-phase"; -import { Stat } from "#enums/stat"; -import { BooleanHolder } from "#app/utils/common"; -import { TrickRoomTag } from "#app/data/arena-tag"; +import { TrickRoomTag } from "#data/arena-tag"; import { DynamicPhaseType } from "#enums/dynamic-phase-type"; +import { Stat } from "#enums/stat"; +import { ActivatePriorityQueuePhase } from "#phases/activate-priority-queue-phase"; +import { PostSummonActivateAbilityPhase } from "#phases/post-summon-activate-ability-phase"; +import type { PostSummonPhase } from "#phases/post-summon-phase"; +import { BooleanHolder } from "#utils/common"; /** * Stores a list of {@linkcode Phase}s diff --git a/src/data/pokeball.ts b/src/data/pokeball.ts index a479fd8068a..50ea5076aee 100644 --- a/src/data/pokeball.ts +++ b/src/data/pokeball.ts @@ -1,6 +1,6 @@ import { globalScene } from "#app/global-scene"; -import { NumberHolder } from "#app/utils/common"; import { PokeballType } from "#enums/pokeball"; +import { NumberHolder } from "#utils/common"; import i18next from "i18next"; export const MAX_PER_TYPE_POKEBALLS: number = 99; diff --git a/src/data/pokemon-forms.ts b/src/data/pokemon-forms.ts index ea129454034..6d1db296e55 100644 --- a/src/data/pokemon-forms.ts +++ b/src/data/pokemon-forms.ts @@ -1,14 +1,5 @@ -import type Pokemon from "../field/pokemon"; -import { allMoves } from "./data-lists"; -import { MoveCategory } from "#enums/MoveCategory"; -import type { Constructor, nil } from "#app/utils/common"; -import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/move-id"; -import { SpeciesId } from "#enums/species-id"; -import { WeatherType } from "#enums/weather-type"; -import { SpeciesFormKey } from "#enums/species-form-key"; import { globalScene } from "#app/global-scene"; -import { FormChangeItem } from "#enums/form-change-item"; +import { allMoves } from "#data/data-lists"; import { MeloettaFormChangePostMoveTrigger, SpeciesDefaultFormMatchTrigger, @@ -24,7 +15,16 @@ import { SpeciesFormChangeTeraTrigger, type SpeciesFormChangeTrigger, SpeciesFormChangeWeatherTrigger, -} from "./pokemon-forms/form-change-triggers"; +} from "#data/form-change-triggers"; +import { AbilityId } from "#enums/ability-id"; +import { FormChangeItem } from "#enums/form-change-item"; +import { MoveCategory } from "#enums/MoveCategory"; +import { MoveId } from "#enums/move-id"; +import { SpeciesFormKey } from "#enums/species-form-key"; +import { SpeciesId } from "#enums/species-id"; +import { WeatherType } from "#enums/weather-type"; +import type { Pokemon } from "#field/pokemon"; +import type { Constructor, nil } from "#utils/common"; export type SpeciesFormChangeConditionPredicate = (p: Pokemon) => boolean; export type SpeciesFormChangeConditionEnforceFunc = (p: Pokemon) => void; diff --git a/src/data/pokemon-forms/form-change-triggers.ts b/src/data/pokemon-forms/form-change-triggers.ts index 3726781d9e3..75734bf085b 100644 --- a/src/data/pokemon-forms/form-change-triggers.ts +++ b/src/data/pokemon-forms/form-change-triggers.ts @@ -1,18 +1,18 @@ -import i18next from "i18next"; -import { coerceArray, type Constructor } from "#app/utils/common"; -import type { TimeOfDay } from "#enums/time-of-day"; -import type Pokemon from "#app/field/pokemon"; -import type { SpeciesFormChange } from "#app/data/pokemon-forms"; -import type { PokemonFormChangeItemModifier } from "#app/modifier/modifier"; -import { getPokemonNameWithAffix } from "#app/messages"; import { globalScene } from "#app/global-scene"; -import { FormChangeItem } from "#enums/form-change-item"; +import { getPokemonNameWithAffix } from "#app/messages"; +import type { SpeciesFormChange } from "#data/pokemon-forms"; import { AbilityId } from "#enums/ability-id"; import { Challenges } from "#enums/challenges"; +import { FormChangeItem } from "#enums/form-change-item"; import { MoveId } from "#enums/move-id"; import { SpeciesFormKey } from "#enums/species-form-key"; import { StatusEffect } from "#enums/status-effect"; +import type { TimeOfDay } from "#enums/time-of-day"; import { WeatherType } from "#enums/weather-type"; +import type { Pokemon } from "#field/pokemon"; +import type { PokemonFormChangeItemModifier } from "#modifiers/modifier"; +import { type Constructor, coerceArray } from "#utils/common"; +import i18next from "i18next"; export abstract class SpeciesFormChangeTrigger { public description = ""; diff --git a/src/data/pokemon-species.ts b/src/data/pokemon-species.ts index d2a48495195..140b03e6d4c 100644 --- a/src/data/pokemon-species.ts +++ b/src/data/pokemon-species.ts @@ -1,49 +1,45 @@ -import type { Localizable } from "#app/@types/locales"; -import { AbilityId } from "#enums/ability-id"; -import { PartyMemberStrength } from "#enums/party-member-strength"; -import { SpeciesId } from "#enums/species-id"; -import { QuantizerCelebi, argbFromRgba, rgbaFromArgb } from "@material/material-color-utilities"; -import i18next from "i18next"; import type { AnySound } from "#app/battle-scene"; -import { globalScene } from "#app/global-scene"; import type { GameMode } from "#app/game-mode"; -import type { StarterMoveset } from "#app/system/game-data"; -import { DexAttr } from "#enums/dex-attr"; -import { - isNullOrUndefined, - capitalizeString, - randSeedInt, - randSeedGauss, - randSeedItem, - randSeedFloat, -} from "#app/utils/common"; -import { uncatchableSpecies } from "#app/data/balance/biomes"; -import { speciesEggMoves } from "#app/data/balance/egg-moves"; -import { GrowthRate } from "#app/data/exp"; -import type { EvolutionLevel } from "#app/data/balance/pokemon-evolutions"; -import { - SpeciesWildEvolutionDelay, - pokemonEvolutions, - pokemonPrevolutions, -} from "#app/data/balance/pokemon-evolutions"; -import { PokemonType } from "#enums/pokemon-type"; -import type { LevelMoves } from "#app/data/balance/pokemon-level-moves"; +import { globalScene } from "#app/global-scene"; +import { uncatchableSpecies } from "#balance/biomes"; +import { speciesEggMoves } from "#balance/egg-moves"; +import { starterPassiveAbilities } from "#balance/passives"; +import type { EvolutionLevel } from "#balance/pokemon-evolutions"; +import { pokemonEvolutions, pokemonPrevolutions, SpeciesWildEvolutionDelay } from "#balance/pokemon-evolutions"; +import type { LevelMoves } from "#balance/pokemon-level-moves"; import { pokemonFormLevelMoves, pokemonFormLevelMoves as pokemonSpeciesFormLevelMoves, pokemonSpeciesLevelMoves, -} from "#app/data/balance/pokemon-level-moves"; -import type { Stat } from "#enums/stat"; -import type { Variant, VariantSet } from "#app/sprites/variant"; -import { populateVariantColorCache, variantColorCache, variantData } from "#app/sprites/variant"; -import { speciesStarterCosts, POKERUS_STARTER_COUNT } from "#app/data/balance/starters"; +} from "#balance/pokemon-level-moves"; +import { POKERUS_STARTER_COUNT, speciesStarterCosts } from "#balance/starters"; +import { allSpecies } from "#data/data-lists"; +import { GrowthRate } from "#data/exp"; +import { Gender } from "#data/gender"; +import { AbilityId } from "#enums/ability-id"; +import { DexAttr } from "#enums/dex-attr"; +import { PartyMemberStrength } from "#enums/party-member-strength"; +import { PokemonType } from "#enums/pokemon-type"; import { SpeciesFormKey } from "#enums/species-form-key"; -import { starterPassiveAbilities } from "#app/data/balance/passives"; -import { loadPokemonVariantAssets } from "#app/sprites/pokemon-sprite"; -import { hasExpSprite } from "#app/sprites/sprite-utils"; -import { Gender } from "./gender"; -import { allSpecies } from "#app/data/data-lists"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; +import { SpeciesId } from "#enums/species-id"; +import type { Stat } from "#enums/stat"; +import { loadPokemonVariantAssets } from "#sprites/pokemon-sprite"; +import { hasExpSprite } from "#sprites/sprite-utils"; +import type { Variant, VariantSet } from "#sprites/variant"; +import { populateVariantColorCache, variantColorCache, variantData } from "#sprites/variant"; +import type { StarterMoveset } from "#system/game-data"; +import type { Localizable } from "#types/locales"; +import { + capitalizeString, + isNullOrUndefined, + randSeedFloat, + randSeedGauss, + randSeedInt, + randSeedItem, +} from "#utils/common"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; +import { argbFromRgba, QuantizerCelebi, rgbaFromArgb } from "@material/material-color-utilities"; +import i18next from "i18next"; export enum Region { NORMAL, @@ -759,7 +755,7 @@ export abstract class PokemonSpeciesForm { } } -export default class PokemonSpecies extends PokemonSpeciesForm implements Localizable { +export class PokemonSpecies extends PokemonSpeciesForm implements Localizable { public name: string; readonly subLegendary: boolean; readonly legendary: boolean; diff --git a/src/data/pokemon/pokemon-data.ts b/src/data/pokemon/pokemon-data.ts index db60b4ce1b4..6ae86bed5e7 100644 --- a/src/data/pokemon/pokemon-data.ts +++ b/src/data/pokemon/pokemon-data.ts @@ -1,17 +1,17 @@ -import { type BattlerTag, loadBattlerTag } from "#app/data/battler-tags"; -import type { Gender } from "#app/data/gender"; -import type { PokemonSpeciesForm } from "#app/data/pokemon-species"; -import type { TypeDamageMultiplier } from "#app/data/type"; -import { isNullOrUndefined } from "#app/utils/common"; +import { type BattlerTag, loadBattlerTag } from "#data/battler-tags"; +import type { Gender } from "#data/gender"; +import { PokemonMove } from "#data/moves/pokemon-move"; +import type { PokemonSpeciesForm } from "#data/pokemon-species"; +import type { TypeDamageMultiplier } from "#data/type"; import type { AbilityId } from "#enums/ability-id"; import type { BerryType } from "#enums/berry-type"; import type { MoveId } from "#enums/move-id"; -import type { PokemonType } from "#enums/pokemon-type"; -import { PokemonMove } from "#app/data/moves/pokemon-move"; -import type { TurnMove } from "#app/@types/turn-move"; -import type { AttackMoveResult } from "#app/@types/attack-move-result"; import type { Nature } from "#enums/nature"; -import type { IllusionData } from "#app/@types/illusion-data"; +import type { PokemonType } from "#enums/pokemon-type"; +import type { AttackMoveResult } from "#types/attack-move-result"; +import type { IllusionData } from "#types/illusion-data"; +import type { TurnMove } from "#types/turn-move"; +import { isNullOrUndefined } from "#utils/common"; /** * Permanent data that can customize a Pokemon in non-standard ways from its Species. diff --git a/src/data/status-effect.ts b/src/data/status-effect.ts index a90304c9f7d..211e265ccf6 100644 --- a/src/data/status-effect.ts +++ b/src/data/status-effect.ts @@ -1,5 +1,5 @@ -import { randIntRange } from "#app/utils/common"; import { StatusEffect } from "#enums/status-effect"; +import { randIntRange } from "#utils/common"; import type { ParseKeys } from "i18next"; import i18next from "i18next"; diff --git a/src/data/terrain.ts b/src/data/terrain.ts index bcb28558de6..f44fd4f35e7 100644 --- a/src/data/terrain.ts +++ b/src/data/terrain.ts @@ -1,9 +1,9 @@ -import type Pokemon from "../field/pokemon"; -import type Move from "./moves/move"; -import { PokemonType } from "#enums/pokemon-type"; -import type { BattlerIndex } from "#enums/battler-index"; -import i18next from "i18next"; import { getPokemonNameWithAffix } from "#app/messages"; +import type { BattlerIndex } from "#enums/battler-index"; +import { PokemonType } from "#enums/pokemon-type"; +import type { Pokemon } from "#field/pokemon"; +import type { Move } from "#moves/move"; +import i18next from "i18next"; export enum TerrainType { NONE, diff --git a/src/data/trainer-names.ts b/src/data/trainer-names.ts index 8714dad0fc9..6b882d1ddc1 100644 --- a/src/data/trainer-names.ts +++ b/src/data/trainer-names.ts @@ -1,5 +1,5 @@ import { TrainerType } from "#enums/trainer-type"; -import { toReadableString } from "#app/utils/common"; +import { toReadableString } from "#utils/common"; class TrainerNameConfig { public urls: string[]; diff --git a/src/data/trainers/TrainerPartyTemplate.ts b/src/data/trainers/TrainerPartyTemplate.ts index 135fe669825..d4e7fe7a261 100644 --- a/src/data/trainers/TrainerPartyTemplate.ts +++ b/src/data/trainers/TrainerPartyTemplate.ts @@ -1,8 +1,8 @@ -import { startingWave } from "#app/starting-wave"; import { globalScene } from "#app/global-scene"; -import { PartyMemberStrength } from "#enums/party-member-strength"; -import { GameModes } from "#enums/game-modes"; +import { startingWave } from "#app/starting-wave"; import { ClassicFixedBossWaves } from "#enums/fixed-boss-waves"; +import { GameModes } from "#enums/game-modes"; +import { PartyMemberStrength } from "#enums/party-member-strength"; export class TrainerPartyTemplate { public size: number; diff --git a/src/data/trainers/evil-admin-trainer-pools.ts b/src/data/trainers/evil-admin-trainer-pools.ts index 74ee3e8cb3d..ad08a17d29f 100644 --- a/src/data/trainers/evil-admin-trainer-pools.ts +++ b/src/data/trainers/evil-admin-trainer-pools.ts @@ -1,6 +1,6 @@ -import type { TrainerTierPools } from "#app/@types/trainer-funcs"; -import { TrainerPoolTier } from "#enums/trainer-pool-tier"; import { SpeciesId } from "#enums/species-id"; +import { TrainerPoolTier } from "#enums/trainer-pool-tier"; +import type { TrainerTierPools } from "#types/trainer-funcs"; /** Team Rocket's admin trainer pool. */ const ROCKET: TrainerTierPools = { diff --git a/src/data/trainers/trainer-config.ts b/src/data/trainers/trainer-config.ts index 7c8b5b29fcd..f21888923cc 100644 --- a/src/data/trainers/trainer-config.ts +++ b/src/data/trainers/trainer-config.ts @@ -1,23 +1,28 @@ +import { timedEventManager } from "#app/global-event-manager"; import { globalScene } from "#app/global-scene"; -import { modifierTypes } from "../data-lists"; -import { PokemonMove } from "../moves/pokemon-move"; -import { - toReadableString, - isNullOrUndefined, - randSeedItem, - randSeedInt, - coerceArray, - randSeedIntRange, -} from "#app/utils/common"; -import { pokemonEvolutions, pokemonPrevolutions } from "#app/data/balance/pokemon-evolutions"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; -import { tmSpecies } from "#app/data/balance/tms"; -import { doubleBattleDialogue } from "../double-battle-dialogue"; +import { pokemonEvolutions, pokemonPrevolutions } from "#balance/pokemon-evolutions"; +import { signatureSpecies } from "#balance/signature-species"; +import { tmSpecies } from "#balance/tms"; +import { modifierTypes } from "#data/data-lists"; +import { doubleBattleDialogue } from "#data/double-battle-dialogue"; +import { Gender } from "#data/gender"; +import type { PokemonSpecies, PokemonSpeciesFilter } from "#data/pokemon-species"; +import { AbilityId } from "#enums/ability-id"; +import { MoveId } from "#enums/move-id"; +import { PartyMemberStrength } from "#enums/party-member-strength"; +import { PokeballType } from "#enums/pokeball"; +import { PokemonType } from "#enums/pokemon-type"; +import { SpeciesId } from "#enums/species-id"; +import { TeraAIMode } from "#enums/tera-ai-mode"; +import { TrainerPoolTier } from "#enums/trainer-pool-tier"; +import { TrainerSlot } from "#enums/trainer-slot"; +import { TrainerType } from "#enums/trainer-type"; import { TrainerVariant } from "#enums/trainer-variant"; -import { getIsInitialized, initI18n } from "#app/plugins/i18n"; -import i18next from "i18next"; -import { Gender } from "#app/data/gender"; -import { signatureSpecies } from "../balance/signature-species"; +import type { EnemyPokemon } from "#field/pokemon"; +import { PokemonMove } from "#moves/pokemon-move"; +import { getIsInitialized, initI18n } from "#plugins/i18n"; +import type { EvilTeam } from "#trainers/evil-admin-trainer-pools"; +import { evilAdminTrainerPools } from "#trainers/evil-admin-trainer-pools"; import { getEvilGruntPartyTemplate, getGymLeaderPartyTemplate, @@ -25,37 +30,27 @@ import { TrainerPartyCompoundTemplate, TrainerPartyTemplate, trainerPartyTemplates, -} from "./TrainerPartyTemplate"; -import { evilAdminTrainerPools } from "./evil-admin-trainer-pools"; - -// Enum imports -import { PartyMemberStrength } from "#enums/party-member-strength"; -import { SpeciesId } from "#enums/species-id"; -import { PokeballType } from "#enums/pokeball"; -import { PokemonType } from "#enums/pokemon-type"; -import { MoveId } from "#enums/move-id"; -import { AbilityId } from "#enums/ability-id"; -import { TeraAIMode } from "#enums/tera-ai-mode"; -import { TrainerPoolTier } from "#enums/trainer-pool-tier"; -import { TrainerSlot } from "#enums/trainer-slot"; -import { TrainerType } from "#enums/trainer-type"; -import { timedEventManager } from "#app/global-event-manager"; - -// Type imports -import type { PokemonSpeciesFilter } from "#app/data/pokemon-species"; -import type PokemonSpecies from "#app/data/pokemon-species"; -import type { ModifierTypeFunc } from "#app/@types/modifier-types"; -import type { EnemyPokemon } from "#app/field/pokemon"; -import type { EvilTeam } from "./evil-admin-trainer-pools"; +} from "#trainers/TrainerPartyTemplate"; +import type { ModifierTypeFunc } from "#types/modifier-types"; import type { - PartyMemberFunc, - GenModifiersFunc, GenAIFunc, - PartyTemplateFunc, - TrainerTierPools, - TrainerConfigs, + GenModifiersFunc, + PartyMemberFunc, PartyMemberFuncs, -} from "../../@types/trainer-funcs"; + PartyTemplateFunc, + TrainerConfigs, + TrainerTierPools, +} from "#types/trainer-funcs"; +import { + coerceArray, + isNullOrUndefined, + randSeedInt, + randSeedIntRange, + randSeedItem, + toReadableString, +} from "#utils/common"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; +import i18next from "i18next"; /** Minimum BST for Pokemon generated onto the Elite Four's teams */ const ELITE_FOUR_MINIMUM_BST = 460; diff --git a/src/data/weather.ts b/src/data/weather.ts index 3fde932a1d7..62a03aa0832 100644 --- a/src/data/weather.ts +++ b/src/data/weather.ts @@ -1,15 +1,15 @@ -import { BiomeId } from "#enums/biome-id"; -import { WeatherType } from "#enums/weather-type"; -import { getPokemonNameWithAffix } from "../messages"; -import type Pokemon from "../field/pokemon"; -import { PokemonType } from "#enums/pokemon-type"; -import type Move from "./moves/move"; -import { randSeedInt } from "#app/utils/common"; -import i18next from "i18next"; -import { globalScene } from "#app/global-scene"; -import type { Arena } from "#app/field/arena"; +import type { SuppressWeatherEffectAbAttr } from "#abilities/ability"; import { timedEventManager } from "#app/global-event-manager"; -import type { SuppressWeatherEffectAbAttr } from "./abilities/ability"; +import { globalScene } from "#app/global-scene"; +import { getPokemonNameWithAffix } from "#app/messages"; +import { BiomeId } from "#enums/biome-id"; +import { PokemonType } from "#enums/pokemon-type"; +import { WeatherType } from "#enums/weather-type"; +import type { Arena } from "#field/arena"; +import type { Pokemon } from "#field/pokemon"; +import type { Move } from "#moves/move"; +import { randSeedInt } from "#utils/common"; +import i18next from "i18next"; export class Weather { public weatherType: WeatherType; diff --git a/src/enums/move-use-mode.ts b/src/enums/move-use-mode.ts index 31694ad4081..1bb9d6374b7 100644 --- a/src/enums/move-use-mode.ts +++ b/src/enums/move-use-mode.ts @@ -1,4 +1,4 @@ -import type { PostDancingMoveAbAttr } from "#app/data/abilities/ability"; +import type { PostDancingMoveAbAttr } from "#abilities/ability"; import type { BattlerTagLapseType } from "#enums/battler-tag-lapse-type"; /** diff --git a/src/events/arena.ts b/src/events/arena.ts index 3b65506db98..5415b8eb026 100644 --- a/src/events/arena.ts +++ b/src/events/arena.ts @@ -1,6 +1,6 @@ +import type { TerrainType } from "#data/terrain"; import type { ArenaTagSide } from "#enums/arena-tag-side"; import type { ArenaTagType } from "#enums/arena-tag-type"; -import type { TerrainType } from "#app/data/terrain"; import type { WeatherType } from "#enums/weather-type"; /** Alias for all {@linkcode ArenaEvent} type strings */ diff --git a/src/events/battle-scene.ts b/src/events/battle-scene.ts index 83d260bd7d2..29aee1053cd 100644 --- a/src/events/battle-scene.ts +++ b/src/events/battle-scene.ts @@ -1,5 +1,5 @@ -import type Move from "../data/moves/move"; -import type { BerryModifier } from "../modifier/modifier"; +import type { BerryModifier } from "#modifiers/modifier"; +import type { Move } from "#moves/move"; /** Alias for all {@linkcode BattleScene} events */ export enum BattleSceneEventType { diff --git a/src/field/anims.ts b/src/field/anims.ts index 2fd23e4262b..2491fa658a4 100644 --- a/src/field/anims.ts +++ b/src/field/anims.ts @@ -1,7 +1,7 @@ import { globalScene } from "#app/global-scene"; import { PokeballType } from "#enums/pokeball"; -import type { Variant } from "#app/sprites/variant"; -import { getFrameMs, randGauss } from "#app/utils/common"; +import type { Variant } from "#sprites/variant"; +import { getFrameMs, randGauss } from "#utils/common"; export function addPokeballOpenParticles(x: number, y: number, pokeballType: PokeballType): void { switch (pokeballType) { diff --git a/src/field/arena.ts b/src/field/arena.ts index 4479748667c..72fdd2f60af 100644 --- a/src/field/arena.ts +++ b/src/field/arena.ts @@ -1,40 +1,37 @@ +import { applyAbAttrs } from "#abilities/apply-ab-attrs"; import { globalScene } from "#app/global-scene"; -import type { BiomeTierTrainerPools, PokemonPools } from "#app/data/balance/biomes"; -import { biomePokemonPools, BiomePoolTier, biomeTrainerPools } from "#app/data/balance/biomes"; -import { randSeedInt, NumberHolder, isNullOrUndefined, type Constructor } from "#app/utils/common"; -import type PokemonSpecies from "#app/data/pokemon-species"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; +import Overrides from "#app/overrides"; +import type { BiomeTierTrainerPools, PokemonPools } from "#balance/biomes"; +import { BiomePoolTier, biomePokemonPools, biomeTrainerPools } from "#balance/biomes"; +import type { ArenaTag } from "#data/arena-tag"; +import { ArenaTrapTag, getArenaTag } from "#data/arena-tag"; +import { SpeciesFormChangeRevertWeatherFormTrigger, SpeciesFormChangeWeatherTrigger } from "#data/form-change-triggers"; +import type { PokemonSpecies } from "#data/pokemon-species"; +import { getTerrainClearMessage, getTerrainStartMessage, Terrain, TerrainType } from "#data/terrain"; import { + getLegendaryWeatherContinuesMessage, getWeatherClearMessage, getWeatherStartMessage, - getLegendaryWeatherContinuesMessage, Weather, -} from "#app/data/weather"; -import { CommonAnim } from "#enums/move-anims-common"; -import type { PokemonType } from "#enums/pokemon-type"; -import type Move from "#app/data/moves/move"; -import type { ArenaTag } from "#app/data/arena-tag"; -import { ArenaTrapTag, getArenaTag } from "#app/data/arena-tag"; +} from "#data/weather"; +import { AbilityId } from "#enums/ability-id"; import { ArenaTagSide } from "#enums/arena-tag-side"; -import type { BattlerIndex } from "#enums/battler-index"; -import { Terrain, TerrainType, getTerrainClearMessage, getTerrainStartMessage } from "#app/data/terrain"; -import { applyAbAttrs } from "#app/data/abilities/apply-ab-attrs"; -import type Pokemon from "#app/field/pokemon"; -import Overrides from "#app/overrides"; -import { TagAddedEvent, TagRemovedEvent, TerrainChangedEvent, WeatherChangedEvent } from "#app/events/arena"; import type { ArenaTagType } from "#enums/arena-tag-type"; +import type { BattlerIndex } from "#enums/battler-index"; import { BiomeId } from "#enums/biome-id"; +import { CommonAnim } from "#enums/move-anims-common"; import type { MoveId } from "#enums/move-id"; +import type { PokemonType } from "#enums/pokemon-type"; import { SpeciesId } from "#enums/species-id"; import { TimeOfDay } from "#enums/time-of-day"; import { TrainerType } from "#enums/trainer-type"; -import { AbilityId } from "#enums/ability-id"; -import { - SpeciesFormChangeRevertWeatherFormTrigger, - SpeciesFormChangeWeatherTrigger, -} from "#app/data/pokemon-forms/form-change-triggers"; import { WeatherType } from "#enums/weather-type"; -import { FieldEffectModifier } from "#app/modifier/modifier"; +import { TagAddedEvent, TagRemovedEvent, TerrainChangedEvent, WeatherChangedEvent } from "#events/arena"; +import type { Pokemon } from "#field/pokemon"; +import { FieldEffectModifier } from "#modifiers/modifier"; +import type { Move } from "#moves/move"; +import { type Constructor, isNullOrUndefined, NumberHolder, randSeedInt } from "#utils/common"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; export class Arena { public biomeType: BiomeId; diff --git a/src/field/damage-number-handler.ts b/src/field/damage-number-handler.ts index 24c5e107d15..acb279a17a0 100644 --- a/src/field/damage-number-handler.ts +++ b/src/field/damage-number-handler.ts @@ -1,14 +1,14 @@ -import { TextStyle, addTextObject } from "../ui/text"; -import type { DamageResult } from "../@types/damage-result"; -import type Pokemon from "./pokemon"; -import { HitResult } from "#enums/hit-result"; -import { formatStat, fixedInt } from "#app/utils/common"; -import type { BattlerIndex } from "#enums/battler-index"; import { globalScene } from "#app/global-scene"; +import type { BattlerIndex } from "#enums/battler-index"; +import { HitResult } from "#enums/hit-result"; +import type { Pokemon } from "#field/pokemon"; +import type { DamageResult } from "#types/damage-result"; +import { addTextObject, TextStyle } from "#ui/text"; +import { fixedInt, formatStat } from "#utils/common"; type TextAndShadowArr = [string | null, string | null]; -export default class DamageNumberHandler { +export class DamageNumberHandler { private damageNumbers: Map; constructor() { diff --git a/src/field/mystery-encounter-intro.ts b/src/field/mystery-encounter-intro.ts index f6702c690bd..d3776f349e6 100644 --- a/src/field/mystery-encounter-intro.ts +++ b/src/field/mystery-encounter-intro.ts @@ -1,13 +1,14 @@ -import type { GameObjects } from "phaser"; import { globalScene } from "#app/global-scene"; -import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; import type { SpeciesId } from "#enums/species-id"; -import { isNullOrUndefined } from "#app/utils/common"; -import { getSpriteKeysFromSpecies } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; -import type { Variant } from "#app/sprites/variant"; -import { doShinySparkleAnim } from "#app/field/anims"; -import { loadPokemonVariantAssets } from "#app/sprites/pokemon-sprite"; -import PlayAnimationConfig = Phaser.Types.Animations.PlayAnimationConfig; +import { doShinySparkleAnim } from "#field/anims"; +import { getSpriteKeysFromSpecies } from "#mystery-encounters/encounter-pokemon-utils"; +import type { MysteryEncounter } from "#mystery-encounters/mystery-encounter"; +import { loadPokemonVariantAssets } from "#sprites/pokemon-sprite"; +import type { Variant } from "#sprites/variant"; +import { isNullOrUndefined } from "#utils/common"; +import type { GameObjects } from "phaser"; + +type PlayAnimationConfig = Phaser.Types.Animations.PlayAnimationConfig; type KnownFileRoot = | "arenas" @@ -77,7 +78,7 @@ export class MysteryEncounterSpriteConfig { * These slide in with the field as part of standard field change cycle, and will typically be hidden after the player has selected an option for the encounter * Note: intro visuals are not "Trainers" or any other specific game object, though they may contain trainer sprites */ -export default class MysteryEncounterIntroVisuals extends Phaser.GameObjects.Container { +export class MysteryEncounterIntroVisuals extends Phaser.GameObjects.Container { public encounter: MysteryEncounter; public spriteConfigs: MysteryEncounterSpriteConfig[]; public enterFromRight: boolean; diff --git a/src/field/pokemon-sprite-sparkle-handler.ts b/src/field/pokemon-sprite-sparkle-handler.ts index bda9414bb92..725229ce723 100644 --- a/src/field/pokemon-sprite-sparkle-handler.ts +++ b/src/field/pokemon-sprite-sparkle-handler.ts @@ -1,8 +1,8 @@ import { globalScene } from "#app/global-scene"; -import Pokemon from "./pokemon"; -import { fixedInt, coerceArray, randInt } from "#app/utils/common"; +import { Pokemon } from "#field/pokemon"; +import { coerceArray, fixedInt, randInt } from "#utils/common"; -export default class PokemonSpriteSparkleHandler { +export class PokemonSpriteSparkleHandler { private sprites: Set; setup(): void { diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 0a8e8469115..6572c69325e 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -1,155 +1,56 @@ -import Phaser from "phaser"; -import type { AnySound } from "#app/battle-scene"; -import type BattleScene from "#app/battle-scene"; +import type { Ability, PreAttackModifyDamageAbAttrParams } from "#abilities/ability"; +import { applyAbAttrs, applyOnGainAbAttrs, applyOnLoseAbAttrs } from "#abilities/apply-ab-attrs"; +import type { AnySound, BattleScene } from "#app/battle-scene"; +import { PLAYER_PARTY_MAX_SIZE } from "#app/constants"; +import { timedEventManager } from "#app/global-event-manager"; import { globalScene } from "#app/global-scene"; -import type { Variant } from "#app/sprites/variant"; -import { populateVariantColors, variantColorCache } from "#app/sprites/variant"; -import { variantData } from "#app/sprites/variant"; -import BattleInfo from "#app/ui/battle-info/battle-info"; -import { EnemyBattleInfo } from "#app/ui/battle-info/enemy-battle-info"; -import { PlayerBattleInfo } from "#app/ui/battle-info/player-battle-info"; -import type Move from "#app/data/moves/move"; -import { getMoveTargets } from "#app/data/moves/move-utils"; -import { applyMoveAttrs } from "#app/data/moves/apply-attrs"; -import { allMoves } from "#app/data/data-lists"; -import { MoveTarget } from "#enums/MoveTarget"; -import { MoveCategory } from "#enums/MoveCategory"; -import type { PokemonSpeciesForm } from "#app/data/pokemon-species"; -import { default as PokemonSpecies, getFusedSpeciesName, getPokemonSpeciesForm } from "#app/data/pokemon-species"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; -import { getStarterValueFriendshipCap, speciesStarterCosts } from "#app/data/balance/starters"; -import { - NumberHolder, - randSeedInt, - getIvsFromId, - BooleanHolder, - randSeedItem, - isNullOrUndefined, - getEnumValues, - toDmgValue, - fixedInt, - rgbaToInt, - rgbHexToRgba, - rgbToHsv, - deltaRgb, - isBetween, - randSeedFloat, - type Constructor, - randSeedIntRange, - coerceArray, -} from "#app/utils/common"; -import type { TypeDamageMultiplier } from "#app/data/type"; -import { getTypeDamageMultiplier, getTypeRgb } from "#app/data/type"; -import { PokemonType } from "#enums/pokemon-type"; -import { getLevelTotalExp } from "#app/data/exp"; -import { - Stat, - type PermanentStat, - type BattleStat, - type EffectiveStat, - PERMANENT_STATS, - BATTLE_STATS, - EFFECTIVE_STATS, -} from "#enums/stat"; -import { - EnemyDamageBoosterModifier, - EnemyDamageReducerModifier, - EnemyFusionChanceModifier, - HiddenAbilityRateBoosterModifier, - BaseStatModifier, - PokemonFriendshipBoosterModifier, - PokemonHeldItemModifier, - PokemonNatureWeightModifier, - ShinyRateBoosterModifier, - SurviveDamageModifier, - TempStatStageBoosterModifier, - TempCritBoosterModifier, - StatBoosterModifier, - CritBoosterModifier, - PokemonBaseStatFlatModifier, - PokemonBaseStatTotalModifier, - PokemonIncrementingStatModifier, - EvoTrackerModifier, - PokemonMultiHitModifier, -} from "#app/modifier/modifier"; -import { PokeballType } from "#enums/pokeball"; -import { Gender } from "#app/data/gender"; -import { Status, getRandomStatus } from "#app/data/status-effect"; -import type { SpeciesFormEvolution } from "#app/data/balance/pokemon-evolutions"; +import { getPokemonNameWithAffix } from "#app/messages"; +import Overrides from "#app/overrides"; +import { speciesEggMoves } from "#balance/egg-moves"; +import type { SpeciesFormEvolution } from "#balance/pokemon-evolutions"; import { + FusionSpeciesFormEvolution, pokemonEvolutions, pokemonPrevolutions, - FusionSpeciesFormEvolution, validateShedinjaEvo, -} from "#app/data/balance/pokemon-evolutions"; -import { reverseCompatibleTms, tmSpecies, tmPoolTiers } from "#app/data/balance/tms"; +} from "#balance/pokemon-evolutions"; +import type { LevelMoves } from "#balance/pokemon-level-moves"; +import { EVOLVE_MOVE, RELEARN_MOVE } from "#balance/pokemon-level-moves"; +import { BASE_HIDDEN_ABILITY_CHANCE, BASE_SHINY_CHANCE, SHINY_EPIC_CHANCE, SHINY_VARIANT_CHANCE } from "#balance/rates"; +import { getStarterValueFriendshipCap, speciesStarterCosts } from "#balance/starters"; +import { reverseCompatibleTms, tmPoolTiers, tmSpecies } from "#balance/tms"; +import type { SuppressAbilitiesTag } from "#data/arena-tag"; +import { NoCritTag, WeakenMoveScreenTag } from "#data/arena-tag"; import { - BattlerTag, - EncoreTag, - GroundedTag, - HighestStatBoostTag, - SubstituteTag, - TypeImmuneTag, - getBattlerTag, - SemiInvulnerableTag, - MoveRestrictionBattlerTag, - ExposedTag, - DragonCheerTag, - CritBoostTag, - TrappedTag, - TarShotTag, AutotomizedTag, - PowerTrickTag, + BattlerTag, + CritBoostTag, + DragonCheerTag, + EncoreTag, + ExposedTag, + GroundedTag, type GrudgeTag, -} from "../data/battler-tags"; -import { BattlerTagLapseType } from "#enums/battler-tag-lapse-type"; -import { WeatherType } from "#enums/weather-type"; -import { NoCritTag, WeakenMoveScreenTag } from "#app/data/arena-tag"; -import { ArenaTagSide } from "#enums/arena-tag-side"; -import type { SuppressAbilitiesTag } from "#app/data/arena-tag"; -import type { Ability, PreAttackModifyDamageAbAttrParams } from "#app/data/abilities/ability"; -import { applyAbAttrs, applyOnGainAbAttrs, applyOnLoseAbAttrs } from "#app/data/abilities/apply-ab-attrs"; -import { allAbilities } from "#app/data/data-lists"; -import type PokemonData from "#app/system/pokemon-data"; -import { BattlerIndex } from "#enums/battler-index"; -import { UiMode } from "#enums/ui-mode"; -import type { PartyOption } from "#app/ui/party-ui-handler"; -import PartyUiHandler, { PartyUiMode } from "#app/ui/party-ui-handler"; -import SoundFade from "phaser3-rex-plugins/plugins/soundfade"; -import type { LevelMoves } from "#app/data/balance/pokemon-level-moves"; -import { EVOLVE_MOVE, RELEARN_MOVE } from "#app/data/balance/pokemon-level-moves"; -import { achvs } from "#app/system/achv"; -import type { StarterDataEntry, StarterMoveset } from "#app/system/game-data"; -import { DexAttr } from "#enums/dex-attr"; -import { QuantizerCelebi, argbFromRgba, rgbaFromArgb } from "@material/material-color-utilities"; -import { getNatureStatMultiplier } from "#app/data/nature"; -import type { SpeciesFormChange } from "#app/data/pokemon-forms"; + getBattlerTag, + HighestStatBoostTag, + MoveRestrictionBattlerTag, + PowerTrickTag, + SemiInvulnerableTag, + SubstituteTag, + TarShotTag, + TrappedTag, + TypeImmuneTag, +} from "#data/battler-tags"; +import { applyChallenges } from "#data/challenge"; +import { allAbilities, allMoves } from "#data/data-lists"; +import { getLevelTotalExp } from "#data/exp"; import { SpeciesFormChangeActiveTrigger, SpeciesFormChangeLapseTeraTrigger, SpeciesFormChangeMoveLearnedTrigger, SpeciesFormChangePostMoveTrigger, -} from "#app/data/pokemon-forms/form-change-triggers"; -import { TerrainType } from "#app/data/terrain"; -import type { TrainerSlot } from "#enums/trainer-slot"; -import Overrides from "#app/overrides"; -import i18next from "i18next"; -import { speciesEggMoves } from "#app/data/balance/egg-moves"; -import { ModifierTier } from "#enums/modifier-tier"; -import { applyChallenges } from "#app/data/challenge"; -import { ChallengeType } from "#enums/challenge-type"; -import { AbilityId } from "#enums/ability-id"; -import { ArenaTagType } from "#enums/arena-tag-type"; -import { BattleSpec } from "#enums/battle-spec"; -import { BattlerTagType } from "#enums/battler-tag-type"; -import type { BerryType } from "#enums/berry-type"; -import { BiomeId } from "#enums/biome-id"; -import { MoveId } from "#enums/move-id"; -import { SpeciesId } from "#enums/species-id"; -import { getPokemonNameWithAffix } from "#app/messages"; -import { Challenges } from "#enums/challenges"; -import { PokemonAnimType } from "#enums/pokemon-anim-type"; -import { PLAYER_PARTY_MAX_SIZE } from "#app/constants"; +} from "#data/form-change-triggers"; +import { Gender } from "#data/gender"; +import { getNatureStatMultiplier } from "#data/nature"; import { CustomPokemonData, PokemonBattleData, @@ -157,33 +58,122 @@ import { PokemonTempSummonData, PokemonTurnData, PokemonWaveData, -} from "#app/data/pokemon/pokemon-data"; -import { SwitchType } from "#enums/switch-type"; -import { SpeciesFormKey } from "#enums/species-form-key"; -import { getStatusEffectOverlapText } from "#app/data/status-effect"; -import { - BASE_HIDDEN_ABILITY_CHANCE, - BASE_SHINY_CHANCE, - SHINY_EPIC_CHANCE, - SHINY_VARIANT_CHANCE, -} from "#app/data/balance/rates"; -import { Nature } from "#enums/nature"; -import { StatusEffect } from "#enums/status-effect"; -import { doShinySparkleAnim } from "#app/field/anims"; -import { MoveFlags } from "#enums/MoveFlags"; -import { timedEventManager } from "#app/global-event-manager"; -import { loadMoveAnimations } from "#app/sprites/pokemon-asset-loader"; -import { isVirtual, isIgnorePP, MoveUseMode } from "#enums/move-use-mode"; +} from "#data/pokemon-data"; +import type { SpeciesFormChange } from "#data/pokemon-forms"; +import type { PokemonSpeciesForm } from "#data/pokemon-species"; +import { getFusedSpeciesName, getPokemonSpeciesForm, PokemonSpecies } from "#data/pokemon-species"; +import { getRandomStatus, getStatusEffectOverlapText, Status } from "#data/status-effect"; +import { getTerrainBlockMessage, TerrainType } from "#data/terrain"; +import type { TypeDamageMultiplier } from "#data/type"; +import { getTypeDamageMultiplier, getTypeRgb } from "#data/type"; +import { AbilityId } from "#enums/ability-id"; +import { AiType } from "#enums/ai-type"; +import { ArenaTagSide } from "#enums/arena-tag-side"; +import { ArenaTagType } from "#enums/arena-tag-type"; +import { BattleSpec } from "#enums/battle-spec"; +import { BattlerIndex } from "#enums/battler-index"; +import { BattlerTagLapseType } from "#enums/battler-tag-lapse-type"; +import { BattlerTagType } from "#enums/battler-tag-type"; +import type { BerryType } from "#enums/berry-type"; +import { BiomeId } from "#enums/biome-id"; +import { ChallengeType } from "#enums/challenge-type"; +import { Challenges } from "#enums/challenges"; +import { DexAttr } from "#enums/dex-attr"; import { FieldPosition } from "#enums/field-position"; import { HitResult } from "#enums/hit-result"; -import { AiType } from "#enums/ai-type"; -import { PokemonMove } from "#app/data/moves/pokemon-move"; -import type { IllusionData } from "#app/@types/illusion-data"; -import type { TurnMove } from "#app/@types/turn-move"; -import type { DamageCalculationResult, DamageResult } from "#app/@types/damage-result"; -import type { AbAttrMap, AbAttrString, TypeMultiplierAbAttrParams } from "#app/@types/ability-types"; -import { getTerrainBlockMessage } from "#app/data/terrain"; import { LearnMoveSituation } from "#enums/learn-move-situation"; +import { MoveCategory } from "#enums/MoveCategory"; +import { MoveFlags } from "#enums/MoveFlags"; +import { MoveTarget } from "#enums/MoveTarget"; +import { ModifierTier } from "#enums/modifier-tier"; +import { MoveId } from "#enums/move-id"; +import { isIgnorePP, isVirtual, MoveUseMode } from "#enums/move-use-mode"; +import { Nature } from "#enums/nature"; +import { PokeballType } from "#enums/pokeball"; +import { PokemonAnimType } from "#enums/pokemon-anim-type"; +import { PokemonType } from "#enums/pokemon-type"; +import { SpeciesFormKey } from "#enums/species-form-key"; +import { SpeciesId } from "#enums/species-id"; +import { + BATTLE_STATS, + type BattleStat, + EFFECTIVE_STATS, + type EffectiveStat, + PERMANENT_STATS, + type PermanentStat, + Stat, +} from "#enums/stat"; +import { StatusEffect } from "#enums/status-effect"; +import { SwitchType } from "#enums/switch-type"; +import type { TrainerSlot } from "#enums/trainer-slot"; +import { UiMode } from "#enums/ui-mode"; +import { WeatherType } from "#enums/weather-type"; +import { doShinySparkleAnim } from "#field/anims"; +import { + BaseStatModifier, + CritBoosterModifier, + EnemyDamageBoosterModifier, + EnemyDamageReducerModifier, + EnemyFusionChanceModifier, + EvoTrackerModifier, + HiddenAbilityRateBoosterModifier, + PokemonBaseStatFlatModifier, + PokemonBaseStatTotalModifier, + PokemonFriendshipBoosterModifier, + PokemonHeldItemModifier, + PokemonIncrementingStatModifier, + PokemonMultiHitModifier, + PokemonNatureWeightModifier, + ShinyRateBoosterModifier, + StatBoosterModifier, + SurviveDamageModifier, + TempCritBoosterModifier, + TempStatStageBoosterModifier, +} from "#modifiers/modifier"; +import { applyMoveAttrs } from "#moves/apply-attrs"; +import type { Move } from "#moves/move"; +import { getMoveTargets } from "#moves/move-utils"; +import { PokemonMove } from "#moves/pokemon-move"; +import { loadMoveAnimations } from "#sprites/pokemon-asset-loader"; +import type { Variant } from "#sprites/variant"; +import { populateVariantColors, variantColorCache, variantData } from "#sprites/variant"; +import { achvs } from "#system/achv"; +import type { StarterDataEntry, StarterMoveset } from "#system/game-data"; +import type { PokemonData } from "#system/pokemon-data"; +import type { AbAttrMap, AbAttrString, TypeMultiplierAbAttrParams } from "#types/ability-types"; +import type { DamageCalculationResult, DamageResult } from "#types/damage-result"; +import type { IllusionData } from "#types/illusion-data"; +import type { TurnMove } from "#types/turn-move"; +import { BattleInfo } from "#ui/battle-info"; +import { EnemyBattleInfo } from "#ui/enemy-battle-info"; +import type { PartyOption } from "#ui/party-ui-handler"; +import { PartyUiHandler, PartyUiMode } from "#ui/party-ui-handler"; +import { PlayerBattleInfo } from "#ui/player-battle-info"; +import { + BooleanHolder, + type Constructor, + coerceArray, + deltaRgb, + fixedInt, + getEnumValues, + getIvsFromId, + isBetween, + isNullOrUndefined, + NumberHolder, + randSeedFloat, + randSeedInt, + randSeedIntRange, + randSeedItem, + rgbaToInt, + rgbHexToRgba, + rgbToHsv, + toDmgValue, +} from "#utils/common"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; +import { argbFromRgba, QuantizerCelebi, rgbaFromArgb } from "@material/material-color-utilities"; +import i18next from "i18next"; +import Phaser from "phaser"; +import SoundFade from "phaser3-rex-plugins/plugins/soundfade"; /** Base typeclass for damage parameter methods, used for DRY */ type damageParams = { @@ -215,7 +205,7 @@ type getBaseDamageParams = Omit; /** Type for the parameters of {@linkcode Pokemon#getAttackDamage | getAttackDamage} */ type getAttackDamageParams = Omit; -export default abstract class Pokemon extends Phaser.GameObjects.Container { +export abstract class Pokemon extends Phaser.GameObjects.Container { /** * This pokemon's {@link https://bulbapedia.bulbagarden.net/wiki/Personality_value | Personality value/PID}, * used to determine various parameters of this Pokemon. diff --git a/src/field/trainer.ts b/src/field/trainer.ts index 8ac896e2717..f0641215c4f 100644 --- a/src/field/trainer.ts +++ b/src/field/trainer.ts @@ -1,29 +1,28 @@ import { globalScene } from "#app/global-scene"; -import { pokemonPrevolutions } from "#app/data/balance/pokemon-evolutions"; -import type PokemonSpecies from "#app/data/pokemon-species"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; -import type { TrainerConfig } from "#app/data/trainers/trainer-config"; -import type { TrainerPartyTemplate } from "#app/data/trainers/TrainerPartyTemplate"; -import { trainerConfigs } from "#app/data/trainers/trainer-config"; -import { trainerPartyTemplates } from "#app/data/trainers/TrainerPartyTemplate"; -import { TrainerPartyCompoundTemplate } from "#app/data/trainers/TrainerPartyTemplate"; -import { TrainerSlot } from "#enums/trainer-slot"; -import { TrainerPoolTier } from "#enums/trainer-pool-tier"; -import { TeraAIMode } from "#enums/tera-ai-mode"; -import type { EnemyPokemon } from "#app/field/pokemon"; -import { randSeedWeightedItem, randSeedItem, randSeedInt } from "#app/utils/common"; -import type { PersistentModifier } from "#app/modifier/modifier"; -import { ArenaTrapTag } from "#app/data/arena-tag"; +import { pokemonPrevolutions } from "#balance/pokemon-evolutions"; +import { signatureSpecies } from "#balance/signature-species"; +import { ArenaTrapTag } from "#data/arena-tag"; +import type { PokemonSpecies } from "#data/pokemon-species"; import { ArenaTagSide } from "#enums/arena-tag-side"; -import { getIsInitialized, initI18n } from "#app/plugins/i18n"; -import i18next from "i18next"; import { PartyMemberStrength } from "#enums/party-member-strength"; import { SpeciesId } from "#enums/species-id"; +import { TeraAIMode } from "#enums/tera-ai-mode"; +import { TrainerPoolTier } from "#enums/trainer-pool-tier"; +import { TrainerSlot } from "#enums/trainer-slot"; import { TrainerType } from "#enums/trainer-type"; -import { signatureSpecies } from "#app/data/balance/signature-species"; import { TrainerVariant } from "#enums/trainer-variant"; +import type { EnemyPokemon } from "#field/pokemon"; +import type { PersistentModifier } from "#modifiers/modifier"; +import { getIsInitialized, initI18n } from "#plugins/i18n"; +import type { TrainerPartyTemplate } from "#trainers/TrainerPartyTemplate"; +import { TrainerPartyCompoundTemplate, trainerPartyTemplates } from "#trainers/TrainerPartyTemplate"; +import type { TrainerConfig } from "#trainers/trainer-config"; +import { trainerConfigs } from "#trainers/trainer-config"; +import { randSeedInt, randSeedItem, randSeedWeightedItem } from "#utils/common"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; +import i18next from "i18next"; -export default class Trainer extends Phaser.GameObjects.Container { +export class Trainer extends Phaser.GameObjects.Container { public config: TrainerConfig; public variant: TrainerVariant; public partyTemplateIndex: number; diff --git a/src/game-mode.ts b/src/game-mode.ts index da6ef62e33c..caedfcba6cc 100644 --- a/src/game-mode.ts +++ b/src/game-mode.ts @@ -1,21 +1,21 @@ -import i18next from "i18next"; -import type { FixedBattleConfigs } from "./battle"; -import { classicFixedBattles, FixedBattleConfig } from "./battle"; -import type { Challenge } from "./data/challenge"; -import { allChallenges, applyChallenges, copyChallenge } from "./data/challenge"; -import { ChallengeType } from "#enums/challenge-type"; -import type PokemonSpecies from "./data/pokemon-species"; -import { allSpecies } from "#app/data/data-lists"; -import type { Arena } from "./field/arena"; -import Overrides from "#app/overrides"; -import { isNullOrUndefined, randSeedInt, randSeedItem } from "#app/utils/common"; -import { BiomeId } from "#enums/biome-id"; -import { SpeciesId } from "#enums/species-id"; -import { Challenges } from "./enums/challenges"; +import type { FixedBattleConfigs } from "#app/battle"; +import { classicFixedBattles, FixedBattleConfig } from "#app/battle"; +import { CHALLENGE_MODE_MYSTERY_ENCOUNTER_WAVES, CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; import { globalScene } from "#app/global-scene"; -import { getDailyStartingBiome } from "./data/daily-run"; -import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES, CHALLENGE_MODE_MYSTERY_ENCOUNTER_WAVES } from "./constants"; +import Overrides from "#app/overrides"; +import type { Challenge } from "#data/challenge"; +import { allChallenges, applyChallenges, copyChallenge } from "#data/challenge"; +import { getDailyStartingBiome } from "#data/daily-run"; +import { allSpecies } from "#data/data-lists"; +import type { PokemonSpecies } from "#data/pokemon-species"; +import { BiomeId } from "#enums/biome-id"; +import { ChallengeType } from "#enums/challenge-type"; +import { Challenges } from "#enums/challenges"; import { GameModes } from "#enums/game-modes"; +import { SpeciesId } from "#enums/species-id"; +import type { Arena } from "#field/arena"; +import { isNullOrUndefined, randSeedInt, randSeedItem } from "#utils/common"; +import i18next from "i18next"; interface GameModeConfig { isClassic?: boolean; diff --git a/src/global-event-manager.ts b/src/global-event-manager.ts index 3df3d17b5e9..5b67b4a6cc6 100644 --- a/src/global-event-manager.ts +++ b/src/global-event-manager.ts @@ -1,3 +1,3 @@ -import { TimedEventManager } from "./timed-event-manager"; +import { TimedEventManager } from "#app/timed-event-manager"; export const timedEventManager = new TimedEventManager(); diff --git a/src/global-scene.ts b/src/global-scene.ts index 76071bd7fac..3cc5a904db7 100644 --- a/src/global-scene.ts +++ b/src/global-scene.ts @@ -1,4 +1,4 @@ -import type BattleScene from "#app/battle-scene"; +import type { BattleScene } from "#app/battle-scene"; export let globalScene: BattleScene; diff --git a/src/inputs-controller.ts b/src/inputs-controller.ts index 388802f467e..2eeae10ba6b 100644 --- a/src/inputs-controller.ts +++ b/src/inputs-controller.ts @@ -1,23 +1,23 @@ -import Phaser from "phaser"; -import { getEnumValues } from "#app/utils/common"; -import { deepCopy } from "#app/utils/data"; -import pad_generic from "./configs/inputs/pad_generic"; -import pad_unlicensedSNES from "./configs/inputs/pad_unlicensedSNES"; -import pad_xbox360 from "./configs/inputs/pad_xbox360"; -import pad_dualshock from "./configs/inputs/pad_dualshock"; -import pad_procon from "./configs/inputs/pad_procon"; -import { UiMode } from "#enums/ui-mode"; -import type SettingsGamepadUiHandler from "./ui/settings/settings-gamepad-ui-handler"; -import type SettingsKeyboardUiHandler from "./ui/settings/settings-keyboard-ui-handler"; -import cfg_keyboard_qwerty from "./configs/inputs/cfg_keyboard_qwerty"; -import { assign, getButtonWithKeycode, getIconForLatestInput, swap } from "#app/configs/inputs/configHandler"; import { globalScene } from "#app/global-scene"; -import type { SettingGamepad } from "#app/system/settings/settings-gamepad"; -import type { SettingKeyboard } from "#app/system/settings/settings-keyboard"; -import TouchControl from "#app/touch-controls"; +import { TouchControl } from "#app/touch-controls"; import { Button } from "#enums/buttons"; import { Device } from "#enums/devices"; -import MoveTouchControlsHandler from "./ui/settings/move-touch-controls-handler"; +import { UiMode } from "#enums/ui-mode"; +import cfg_keyboard_qwerty from "#inputs/cfg_keyboard_qwerty"; +import { assign, getButtonWithKeycode, getIconForLatestInput, swap } from "#inputs/configHandler"; +import pad_dualshock from "#inputs/pad_dualshock"; +import pad_generic from "#inputs/pad_generic"; +import pad_procon from "#inputs/pad_procon"; +import pad_unlicensedSNES from "#inputs/pad_unlicensedSNES"; +import pad_xbox360 from "#inputs/pad_xbox360"; +import type { SettingGamepad } from "#system/settings-gamepad"; +import type { SettingKeyboard } from "#system/settings-keyboard"; +import { MoveTouchControlsHandler } from "#ui/move-touch-controls-handler"; +import type { SettingsGamepadUiHandler } from "#ui/settings-gamepad-ui-handler"; +import type { SettingsKeyboardUiHandler } from "#ui/settings-keyboard-ui-handler"; +import { getEnumValues } from "#utils/common"; +import { deepCopy } from "#utils/data"; +import Phaser from "phaser"; export interface DeviceMapping { [key: string]: number; diff --git a/src/loading-scene.ts b/src/loading-scene.ts index f67d19e1027..7d06b0a293f 100644 --- a/src/loading-scene.ts +++ b/src/loading-scene.ts @@ -1,28 +1,28 @@ -import { GachaType } from "#enums/gacha-types"; -import { getBiomeHasProps } from "#app/field/arena"; -import CacheBustedLoaderPlugin from "#app/plugins/cache-busted-loader-plugin"; +import { initAbilities } from "#abilities/ability"; +import { timedEventManager } from "#app/global-event-manager"; import { SceneBase } from "#app/scene-base"; -import { WindowVariant, getWindowVariantSuffix } from "#app/ui/ui-theme"; import { isMobile } from "#app/touch-controls"; -import { localPing, getEnumValues, hasAllLocalizedSprites, getEnumKeys } from "#app/utils/common"; -import { initPokemonPrevolutions, initPokemonStarters } from "#app/data/balance/pokemon-evolutions"; -import { initBiomes } from "#app/data/balance/biomes"; -import { initEggMoves } from "#app/data/balance/egg-moves"; -import { initPokemonForms } from "#app/data/pokemon-forms"; -import { initSpecies } from "#app/data/pokemon-species"; -import { initMoves } from "#app/data/moves/move"; -import { initAbilities } from "#app/data/abilities/ability"; -import { initAchievements } from "#app/system/achv"; -import { initTrainerTypeDialogue } from "#app/data/dialogue"; -import { initChallenges } from "#app/data/challenge"; -import i18next from "i18next"; -import { initStatsKeys } from "#app/ui/game-stats-ui-handler"; -import { initVouchers } from "#app/system/voucher"; +import { initBiomes } from "#balance/biomes"; +import { initEggMoves } from "#balance/egg-moves"; +import { initPokemonPrevolutions, initPokemonStarters } from "#balance/pokemon-evolutions"; +import { initChallenges } from "#data/challenge"; +import { initTrainerTypeDialogue } from "#data/dialogue"; +import { initPokemonForms } from "#data/pokemon-forms"; +import { initSpecies } from "#data/pokemon-species"; import { BiomeId } from "#enums/biome-id"; -import { initMysteryEncounters } from "#app/data/mystery-encounters/mystery-encounters"; -import { timedEventManager } from "./global-event-manager"; -import { initModifierPools } from "./modifier/init-modifier-pools"; -import { initModifierTypes } from "./modifier/modifier-type"; +import { GachaType } from "#enums/gacha-types"; +import { getBiomeHasProps } from "#field/arena"; +import { initModifierPools } from "#modifiers/init-modifier-pools"; +import { initModifierTypes } from "#modifiers/modifier-type"; +import { initMoves } from "#moves/move"; +import { initMysteryEncounters } from "#mystery-encounters/mystery-encounters"; +import { CacheBustedLoaderPlugin } from "#plugins/cache-busted-loader-plugin"; +import { initAchievements } from "#system/achv"; +import { initVouchers } from "#system/voucher"; +import { initStatsKeys } from "#ui/game-stats-ui-handler"; +import { getWindowVariantSuffix, WindowVariant } from "#ui/ui-theme"; +import { getEnumKeys, getEnumValues, hasAllLocalizedSprites, localPing } from "#utils/common"; +import i18next from "i18next"; export class LoadingScene extends SceneBase { public static readonly KEY = "loading"; diff --git a/src/main.ts b/src/main.ts index 38bfcbe5636..6c0fcacd521 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,11 +1,11 @@ +import { InvertPostFX } from "#app/pipelines/invert"; +import { initI18n } from "#app/plugins/i18n"; +import { version } from "#package.json"; import Phaser from "phaser"; -import InvertPostFX from "./pipelines/invert"; -import { version } from "../package.json"; -import UIPlugin from "phaser3-rex-plugins/templates/ui/ui-plugin"; import BBCodeTextPlugin from "phaser3-rex-plugins/plugins/bbcodetext-plugin"; import InputTextPlugin from "phaser3-rex-plugins/plugins/inputtext-plugin"; import TransitionImagePackPlugin from "phaser3-rex-plugins/templates/transitionimagepack/transitionimagepack-plugin"; -import { initI18n } from "./plugins/i18n"; +import UIPlugin from "phaser3-rex-plugins/templates/ui/ui-plugin"; // Catch global errors and display them in an alert so users can report the issue. window.onerror = (_message, _source, _lineno, _colno, error) => { @@ -46,7 +46,7 @@ let game; const startGame = async (manifest?: any) => { await initI18n(); const LoadingScene = (await import("./loading-scene")).LoadingScene; - const BattleScene = (await import("./battle-scene")).default; + const BattleScene = (await import("./battle-scene")).BattleScene; game = new Phaser.Game({ type: Phaser.WEBGL, parent: "app", diff --git a/src/messages.ts b/src/messages.ts index 21473eb8361..177b4cc9b05 100644 --- a/src/messages.ts +++ b/src/messages.ts @@ -1,6 +1,6 @@ import { globalScene } from "#app/global-scene"; import { BattleSpec } from "#enums/battle-spec"; -import type Pokemon from "./field/pokemon"; +import type { Pokemon } from "#field/pokemon"; import i18next from "i18next"; /** diff --git a/src/modifier/init-modifier-pools.ts b/src/modifier/init-modifier-pools.ts index 60697333600..316d4dae741 100644 --- a/src/modifier/init-modifier-pools.ts +++ b/src/modifier/init-modifier-pools.ts @@ -1,31 +1,37 @@ -import type Pokemon from "#app/field/pokemon"; +/* 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"; +import { globalScene } from "#app/global-scene"; +import { pokemonEvolutions } from "#balance/pokemon-evolutions"; +import { modifierTypes } from "#data/data-lists"; +import { MAX_PER_TYPE_POKEBALLS } from "#data/pokeball"; +import { AbilityId } from "#enums/ability-id"; +import { BerryType } from "#enums/berry-type"; +import { ModifierTier } from "#enums/modifier-tier"; +import { MoveId } from "#enums/move-id"; +import { PokeballType } from "#enums/pokeball"; +import { SpeciesId } from "#enums/species-id"; +import { StatusEffect } from "#enums/status-effect"; +import { Unlockables } from "#enums/unlockables"; +import type { Pokemon } from "#field/pokemon"; +import { + BerryModifier, + DoubleBattleChanceBoosterModifier, + SpeciesCritBoosterModifier, + TurnStatusEffectModifier, +} from "#modifiers/modifier"; import { dailyStarterModifierPool, enemyBuffModifierPool, modifierPool, trainerModifierPool, wildModifierPool, -} from "#app/modifier/modifier-pools"; -import { globalScene } from "#app/global-scene"; -import { DoubleBattleChanceBoosterModifier, SpeciesCritBoosterModifier, TurnStatusEffectModifier } from "./modifier"; -import { WeightedModifierType } from "./modifier-type"; -import { ModifierTier } from "../enums/modifier-tier"; -import type { WeightedModifierTypeWeightFunc } from "#app/@types/modifier-types"; -import { modifierTypes } from "#app/data/data-lists"; -import { PokeballType } from "#enums/pokeball"; -import { BerryModifier } from "./modifier"; -import { BerryType } from "#enums/berry-type"; -import { SpeciesId } from "#enums/species-id"; -import { timedEventManager } from "#app/global-event-manager"; -import { pokemonEvolutions } from "#app/data/balance/pokemon-evolutions"; -import { Unlockables } from "#enums/unlockables"; -import { isNullOrUndefined } from "#app/utils/common"; -import { MoveId } from "#enums/move-id"; -import { StatusEffect } from "#enums/status-effect"; -import { AbilityId } from "#enums/ability-id"; -import { MAX_PER_TYPE_POKEBALLS } from "#app/data/pokeball"; -// biome-ignore lint/correctness/noUnusedImports: This is used in a tsdoc comment -import type { initModifierTypes } from "./modifier-type"; +} from "#modifiers/modifier-pools"; +import { WeightedModifierType } from "#modifiers/modifier-type"; +import type { WeightedModifierTypeWeightFunc } from "#types/modifier-types"; +import { isNullOrUndefined } from "#utils/common"; /** * Initialize the wild modifier pool diff --git a/src/modifier/modifier-pools.ts b/src/modifier/modifier-pools.ts index 3396dca1f93..d66511e3239 100644 --- a/src/modifier/modifier-pools.ts +++ b/src/modifier/modifier-pools.ts @@ -1,9 +1,9 @@ -/** +/* * Contains modifier pools for different contexts in the game. * Can be safely imported without worrying about circular dependencies. */ -import type { ModifierPool } from "#app/@types/modifier-types"; +import type { ModifierPool } from "#types/modifier-types"; export const modifierPool: ModifierPool = {}; diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts index fcbe6b66a4e..dc64d3cab09 100644 --- a/src/modifier/modifier-type.ts +++ b/src/modifier/modifier-type.ts @@ -1,19 +1,32 @@ +import { TYPE_BOOST_ITEM_BOOST_PERCENT } from "#app/constants"; +import { timedEventManager } from "#app/global-event-manager"; import { globalScene } from "#app/global-scene"; -import { EvolutionItem, pokemonEvolutions } from "#app/data/balance/pokemon-evolutions"; -import { tmPoolTiers, tmSpecies } from "#app/data/balance/tms"; -import { getBerryEffectDescription, getBerryName } from "#app/data/berry"; -import { allMoves, modifierTypes } from "#app/data/data-lists"; -import { getNatureName, getNatureStatMultiplier } from "#app/data/nature"; -import { getPokeballCatchMultiplier, getPokeballName } from "#app/data/pokeball"; -import { pokemonFormChanges, SpeciesFormChangeCondition } from "#app/data/pokemon-forms"; -import { SpeciesFormChangeItemTrigger } from "#app/data/pokemon-forms/form-change-triggers"; -import { FormChangeItem } from "#enums/form-change-item"; -import { getStatusEffectDescriptor } from "#app/data/status-effect"; -import { PokemonType } from "#enums/pokemon-type"; -import type { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon"; -import type { PokemonMove } from "#app/data/moves/pokemon-move"; -import type Pokemon from "#app/field/pokemon"; import { getPokemonNameWithAffix } from "#app/messages"; +import Overrides from "#app/overrides"; +import { EvolutionItem, pokemonEvolutions } from "#balance/pokemon-evolutions"; +import { tmPoolTiers, tmSpecies } from "#balance/tms"; +import { getBerryEffectDescription, getBerryName } from "#data/berry"; +import { allMoves, modifierTypes } from "#data/data-lists"; +import { SpeciesFormChangeItemTrigger } from "#data/form-change-triggers"; +import { getNatureName, getNatureStatMultiplier } from "#data/nature"; +import { getPokeballCatchMultiplier, getPokeballName } from "#data/pokeball"; +import { pokemonFormChanges, SpeciesFormChangeCondition } from "#data/pokemon-forms"; +import { getStatusEffectDescriptor } from "#data/status-effect"; +import { BattlerTagType } from "#enums/battler-tag-type"; +import { BerryType } from "#enums/berry-type"; +import { FormChangeItem } from "#enums/form-change-item"; +import { ModifierPoolType } from "#enums/modifier-pool-type"; +import { ModifierTier } from "#enums/modifier-tier"; +import { MoveId } from "#enums/move-id"; +import { Nature } from "#enums/nature"; +import { PokeballType } from "#enums/pokeball"; +import { PokemonType } from "#enums/pokemon-type"; +import { SpeciesFormKey } from "#enums/species-form-key"; +import { SpeciesId } from "#enums/species-id"; +import type { PermanentStat, TempBattleStat } from "#enums/stat"; +import { getStatKey, Stat, TEMP_BATTLE_STATS } from "#enums/stat"; +import { StatusEffect } from "#enums/status-effect"; +import type { EnemyPokemon, PlayerPokemon, Pokemon } from "#field/pokemon"; import { AddPokeballModifier, AddVoucherModifier, @@ -24,6 +37,7 @@ import { BypassSpeedChanceModifier, ContactHeldItemTransferChanceModifier, CritBoosterModifier, + CriticalCatchChanceBoosterModifier, DamageMoneyRewardModifier, DoubleBattleChanceBoosterModifier, EnemyAttackStatusEffectChanceModifier, @@ -31,6 +45,7 @@ import { EnemyDamageReducerModifier, EnemyEndureChanceModifier, EnemyFusionChanceModifier, + type EnemyPersistentModifier, EnemyStatusEffectHealChanceModifier, EnemyTurnHealModifier, EvolutionItemModifier, @@ -40,6 +55,7 @@ import { ExpBoosterModifier, ExpShareModifier, ExtraModifierModifier, + FieldEffectModifier, FlinchChanceModifier, FusePokemonModifier, GigantamaxAccessModifier, @@ -52,10 +68,12 @@ import { LockModifierTiersModifier, MapModifier, MegaEvolutionAccessModifier, + type Modifier, MoneyInterestModifier, MoneyMultiplierModifier, MoneyRewardModifier, MultipleParticipantExpBonusModifier, + type PersistentModifier, PokemonAllMovePpRestoreModifier, PokemonBaseStatFlatModifier, PokemonBaseStatTotalModifier, @@ -83,6 +101,7 @@ import { SurviveDamageModifier, SwitchEffectTransferModifier, TempCritBoosterModifier, + TempExtraModifierModifier, TempStatStageBoosterModifier, TerastallizeAccessModifier, TerrastalizeModifier, @@ -90,19 +109,13 @@ import { TurnHealModifier, TurnHeldItemTransferModifier, TurnStatusEffectModifier, - type EnemyPersistentModifier, - type Modifier, - type PersistentModifier, - TempExtraModifierModifier, - CriticalCatchChanceBoosterModifier, - FieldEffectModifier, -} from "#app/modifier/modifier"; -import { ModifierTier } from "#enums/modifier-tier"; -import Overrides from "#app/overrides"; -import { getVoucherTypeIcon, getVoucherTypeName, VoucherType } from "#app/system/voucher"; -import type { PokemonMoveSelectFilter, PokemonSelectFilter } from "#app/ui/party-ui-handler"; -import PartyUiHandler from "#app/ui/party-ui-handler"; -import { getModifierTierTextTint } from "#app/ui/text"; +} from "#modifiers/modifier"; +import type { PokemonMove } from "#moves/pokemon-move"; +import { getVoucherTypeIcon, getVoucherTypeName, VoucherType } from "#system/voucher"; +import type { ModifierTypeFunc, WeightedModifierTypeWeightFunc } from "#types/modifier-types"; +import type { PokemonMoveSelectFilter, PokemonSelectFilter } from "#ui/party-ui-handler"; +import { PartyUiHandler } from "#ui/party-ui-handler"; +import { getModifierTierTextTint } from "#ui/text"; import { formatMoney, getEnumKeys, @@ -111,23 +124,9 @@ import { NumberHolder, padInt, randSeedInt, -} from "#app/utils/common"; -import { BattlerTagType } from "#enums/battler-tag-type"; -import { BerryType } from "#enums/berry-type"; -import { MoveId } from "#enums/move-id"; -import { Nature } from "#enums/nature"; -import { PokeballType } from "#enums/pokeball"; -import { SpeciesId } from "#enums/species-id"; -import { SpeciesFormKey } from "#enums/species-form-key"; -import type { PermanentStat, TempBattleStat } from "#enums/stat"; -import { getStatKey, Stat, TEMP_BATTLE_STATS } from "#enums/stat"; -import { StatusEffect } from "#enums/status-effect"; +} from "#utils/common"; +import { getModifierPoolForType, getModifierType } from "#utils/modifier-utils"; import i18next from "i18next"; -import { timedEventManager } from "#app/global-event-manager"; -import { TYPE_BOOST_ITEM_BOOST_PERCENT } from "#app/constants"; -import { ModifierPoolType } from "#enums/modifier-pool-type"; -import { getModifierPoolForType, getModifierType } from "#app/utils/modifier-utils"; -import type { ModifierTypeFunc, WeightedModifierTypeWeightFunc } from "#app/@types/modifier-types"; const outputModifierData = false; const useMaxWeightForOutput = false; diff --git a/src/modifier/modifier.ts b/src/modifier/modifier.ts index 247b64ca2c0..8ef78e800cc 100644 --- a/src/modifier/modifier.ts +++ b/src/modifier/modifier.ts @@ -1,30 +1,29 @@ -import { FusionSpeciesFormEvolution, pokemonEvolutions } from "#app/data/balance/pokemon-evolutions"; -import { getBerryEffectFunc, getBerryPredicate } from "#app/data/berry"; -import { getLevelTotalExp } from "#app/data/exp"; -import { allMoves, modifierTypes } from "#app/data/data-lists"; -import { MAX_PER_TYPE_POKEBALLS } from "#app/data/pokeball"; -import { SpeciesFormChangeItemTrigger } from "#app/data/pokemon-forms/form-change-triggers"; -import type { FormChangeItem } from "#enums/form-change-item"; -import { getStatusEffectHealText } from "#app/data/status-effect"; -import type { PlayerPokemon } from "#app/field/pokemon"; -import type Pokemon from "#app/field/pokemon"; +import { applyAbAttrs } from "#abilities/apply-ab-attrs"; +import { globalScene } from "#app/global-scene"; import { getPokemonNameWithAffix } from "#app/messages"; import Overrides from "#app/overrides"; -import { LearnMoveType } from "#enums/learn-move-type"; -import type { VoucherType } from "#app/system/voucher"; -import { Command } from "#enums/command"; -import { addTextObject, TextStyle } from "#app/ui/text"; -import { BooleanHolder, hslToHex, isNullOrUndefined, NumberHolder, randSeedFloat, toDmgValue } from "#app/utils/common"; +import { FusionSpeciesFormEvolution, pokemonEvolutions } from "#balance/pokemon-evolutions"; +import { FRIENDSHIP_GAIN_FROM_RARE_CANDY } from "#balance/starters"; +import { getBerryEffectFunc, getBerryPredicate } from "#data/berry"; +import { allMoves, modifierTypes } from "#data/data-lists"; +import { getLevelTotalExp } from "#data/exp"; +import { SpeciesFormChangeItemTrigger } from "#data/form-change-triggers"; +import { MAX_PER_TYPE_POKEBALLS } from "#data/pokeball"; +import { getStatusEffectHealText } from "#data/status-effect"; import { BattlerTagType } from "#enums/battler-tag-type"; import { BerryType } from "#enums/berry-type"; +import { Color, ShadowColor } from "#enums/color"; +import { Command } from "#enums/command"; +import type { FormChangeItem } from "#enums/form-change-item"; +import { LearnMoveType } from "#enums/learn-move-type"; import type { MoveId } from "#enums/move-id"; import type { Nature } from "#enums/nature"; import type { PokeballType } from "#enums/pokeball"; -import { SpeciesId } from "#enums/species-id"; -import { type PermanentStat, type TempBattleStat, BATTLE_STATS, Stat, TEMP_BATTLE_STATS } from "#enums/stat"; -import { StatusEffect } from "#enums/status-effect"; import type { PokemonType } from "#enums/pokemon-type"; -import i18next from "i18next"; +import { SpeciesId } from "#enums/species-id"; +import { BATTLE_STATS, type PermanentStat, Stat, TEMP_BATTLE_STATS, type TempBattleStat } from "#enums/stat"; +import { StatusEffect } from "#enums/status-effect"; +import type { PlayerPokemon, Pokemon } from "#field/pokemon"; import type { DoubleBattleChanceBoosterModifierType, EvolutionItemModifierType, @@ -38,13 +37,13 @@ import type { PokemonMultiHitModifierType, TerastallizeModifierType, TmModifierType, -} from "./modifier-type"; -import { getModifierType } from "#app/utils/modifier-utils"; -import { Color, ShadowColor } from "#enums/color"; -import { FRIENDSHIP_GAIN_FROM_RARE_CANDY } from "#app/data/balance/starters"; -import { applyAbAttrs } from "#app/data/abilities/apply-ab-attrs"; -import { globalScene } from "#app/global-scene"; -import type { ModifierInstanceMap, ModifierString } from "#app/@types/modifier-types"; +} from "#modifiers/modifier-type"; +import type { VoucherType } from "#system/voucher"; +import type { ModifierInstanceMap, ModifierString } from "#types/modifier-types"; +import { addTextObject, TextStyle } from "#ui/text"; +import { BooleanHolder, hslToHex, isNullOrUndefined, NumberHolder, randSeedFloat, toDmgValue } from "#utils/common"; +import { getModifierType } from "#utils/modifier-utils"; +import i18next from "i18next"; export type ModifierPredicate = (modifier: Modifier) => boolean; diff --git a/src/overrides.ts b/src/overrides.ts index ea50e9b088c..de0d1d3f30a 100644 --- a/src/overrides.ts +++ b/src/overrides.ts @@ -1,8 +1,6 @@ import { type PokeballCounts } from "#app/battle-scene"; -import { EvolutionItem } from "#app/data/balance/pokemon-evolutions"; -import { Gender } from "#app/data/gender"; -import { type ModifierOverride } from "#app/modifier/modifier-type"; -import { Variant } from "#app/sprites/variant"; +import { EvolutionItem } from "#balance/pokemon-evolutions"; +import { Gender } from "#data/gender"; import { AbilityId } from "#enums/ability-id"; import { BattleType } from "#enums/battle-type"; import { BerryType } from "#enums/berry-type"; @@ -23,6 +21,8 @@ import { TrainerType } from "#enums/trainer-type"; import { Unlockables } from "#enums/unlockables"; import { VariantTier } from "#enums/variant-tier"; import { WeatherType } from "#enums/weather-type"; +import { type ModifierOverride } from "#modifiers/modifier-type"; +import { Variant } from "#sprites/variant"; /** * This comment block exists to prevent IDEs from automatically removing unused imports diff --git a/src/phase-manager.ts b/src/phase-manager.ts index a4256f110ef..7c1f2986593 100644 --- a/src/phase-manager.ts +++ b/src/phase-manager.ts @@ -1,104 +1,104 @@ -import type { Phase } from "#app/phase"; -import type { default as Pokemon } from "#app/field/pokemon"; -import type { PhaseMap, PhaseString } from "./@types/phase-types"; import { globalScene } from "#app/global-scene"; -import { ActivatePriorityQueuePhase } from "#app/phases/activate-priority-queue-phase"; -import { AddEnemyBuffModifierPhase } from "#app/phases/add-enemy-buff-modifier-phase"; -import { AttemptCapturePhase } from "#app/phases/attempt-capture-phase"; -import { AttemptRunPhase } from "#app/phases/attempt-run-phase"; -import { BattleEndPhase } from "#app/phases/battle-end-phase"; -import { BerryPhase } from "#app/phases/berry-phase"; -import { CheckStatusEffectPhase } from "#app/phases/check-status-effect-phase"; -import { CheckSwitchPhase } from "#app/phases/check-switch-phase"; -import { CommandPhase } from "#app/phases/command-phase"; -import { CommonAnimPhase } from "#app/phases/common-anim-phase"; -import { coerceArray, type Constructor } from "#app/utils/common"; -import { DamageAnimPhase } from "#app/phases/damage-anim-phase"; +import type { Phase } from "#app/phase"; +import { type PhasePriorityQueue, PostSummonPhasePriorityQueue } from "#data/phase-priority-queue"; import type { DynamicPhaseType } from "#enums/dynamic-phase-type"; -import { EggHatchPhase } from "#app/phases/egg-hatch-phase"; -import { EggLapsePhase } from "#app/phases/egg-lapse-phase"; -import { EggSummaryPhase } from "#app/phases/egg-summary-phase"; -import { EncounterPhase } from "#app/phases/encounter-phase"; -import { EndCardPhase } from "#app/phases/end-card-phase"; -import { EndEvolutionPhase } from "#app/phases/end-evolution-phase"; -import { EnemyCommandPhase } from "#app/phases/enemy-command-phase"; -import { EvolutionPhase } from "#app/phases/evolution-phase"; -import { ExpPhase } from "#app/phases/exp-phase"; -import { FaintPhase } from "#app/phases/faint-phase"; -import { FormChangePhase } from "#app/phases/form-change-phase"; -import { GameOverModifierRewardPhase } from "#app/phases/game-over-modifier-reward-phase"; -import { GameOverPhase } from "#app/phases/game-over-phase"; -import { HideAbilityPhase } from "#app/phases/hide-ability-phase"; -import { HidePartyExpBarPhase } from "#app/phases/hide-party-exp-bar-phase"; -import { LearnMovePhase } from "#app/phases/learn-move-phase"; -import { LevelCapPhase } from "#app/phases/level-cap-phase"; -import { LevelUpPhase } from "#app/phases/level-up-phase"; -import { LoadMoveAnimPhase } from "#app/phases/load-move-anim-phase"; -import { LoginPhase } from "#app/phases/login-phase"; -import { MessagePhase } from "#app/phases/message-phase"; -import { ModifierRewardPhase } from "#app/phases/modifier-reward-phase"; -import { MoneyRewardPhase } from "#app/phases/money-reward-phase"; -import { MoveAnimPhase } from "#app/phases/move-anim-phase"; -import { MoveChargePhase } from "#app/phases/move-charge-phase"; -import { MoveEffectPhase } from "#app/phases/move-effect-phase"; -import { MoveEndPhase } from "#app/phases/move-end-phase"; -import { MoveHeaderPhase } from "#app/phases/move-header-phase"; -import { MovePhase } from "#app/phases/move-phase"; +import type { Pokemon } from "#field/pokemon"; +import { ActivatePriorityQueuePhase } from "#phases/activate-priority-queue-phase"; +import { AddEnemyBuffModifierPhase } from "#phases/add-enemy-buff-modifier-phase"; +import { AttemptCapturePhase } from "#phases/attempt-capture-phase"; +import { AttemptRunPhase } from "#phases/attempt-run-phase"; +import { BattleEndPhase } from "#phases/battle-end-phase"; +import { BerryPhase } from "#phases/berry-phase"; +import { CheckStatusEffectPhase } from "#phases/check-status-effect-phase"; +import { CheckSwitchPhase } from "#phases/check-switch-phase"; +import { CommandPhase } from "#phases/command-phase"; +import { CommonAnimPhase } from "#phases/common-anim-phase"; +import { DamageAnimPhase } from "#phases/damage-anim-phase"; +import { EggHatchPhase } from "#phases/egg-hatch-phase"; +import { EggLapsePhase } from "#phases/egg-lapse-phase"; +import { EggSummaryPhase } from "#phases/egg-summary-phase"; +import { EncounterPhase } from "#phases/encounter-phase"; +import { EndCardPhase } from "#phases/end-card-phase"; +import { EndEvolutionPhase } from "#phases/end-evolution-phase"; +import { EnemyCommandPhase } from "#phases/enemy-command-phase"; +import { EvolutionPhase } from "#phases/evolution-phase"; +import { ExpPhase } from "#phases/exp-phase"; +import { FaintPhase } from "#phases/faint-phase"; +import { FormChangePhase } from "#phases/form-change-phase"; +import { GameOverModifierRewardPhase } from "#phases/game-over-modifier-reward-phase"; +import { GameOverPhase } from "#phases/game-over-phase"; +import { HideAbilityPhase } from "#phases/hide-ability-phase"; +import { HidePartyExpBarPhase } from "#phases/hide-party-exp-bar-phase"; +import { LearnMovePhase } from "#phases/learn-move-phase"; +import { LevelCapPhase } from "#phases/level-cap-phase"; +import { LevelUpPhase } from "#phases/level-up-phase"; +import { LoadMoveAnimPhase } from "#phases/load-move-anim-phase"; +import { LoginPhase } from "#phases/login-phase"; +import { MessagePhase } from "#phases/message-phase"; +import { ModifierRewardPhase } from "#phases/modifier-reward-phase"; +import { MoneyRewardPhase } from "#phases/money-reward-phase"; +import { MoveAnimPhase } from "#phases/move-anim-phase"; +import { MoveChargePhase } from "#phases/move-charge-phase"; +import { MoveEffectPhase } from "#phases/move-effect-phase"; +import { MoveEndPhase } from "#phases/move-end-phase"; +import { MoveHeaderPhase } from "#phases/move-header-phase"; +import { MovePhase } from "#phases/move-phase"; import { - MysteryEncounterPhase, - MysteryEncounterOptionSelectedPhase, MysteryEncounterBattlePhase, + MysteryEncounterBattleStartCleanupPhase, + MysteryEncounterOptionSelectedPhase, + MysteryEncounterPhase, MysteryEncounterRewardsPhase, PostMysteryEncounterPhase, - MysteryEncounterBattleStartCleanupPhase, -} from "#app/phases/mystery-encounter-phases"; -import { NewBattlePhase } from "#app/phases/new-battle-phase"; -import { NewBiomeEncounterPhase } from "#app/phases/new-biome-encounter-phase"; -import { NextEncounterPhase } from "#app/phases/next-encounter-phase"; -import { ObtainStatusEffectPhase } from "#app/phases/obtain-status-effect-phase"; -import { PartyExpPhase } from "#app/phases/party-exp-phase"; -import { PartyHealPhase } from "#app/phases/party-heal-phase"; -import { type PhasePriorityQueue, PostSummonPhasePriorityQueue } from "#app/data/phase-priority-queue"; -import { PokemonAnimPhase } from "#app/phases/pokemon-anim-phase"; -import { PokemonHealPhase } from "#app/phases/pokemon-heal-phase"; -import { PokemonTransformPhase } from "#app/phases/pokemon-transform-phase"; -import { PostGameOverPhase } from "#app/phases/post-game-over-phase"; -import { PostSummonPhase } from "#app/phases/post-summon-phase"; -import { PostTurnStatusEffectPhase } from "#app/phases/post-turn-status-effect-phase"; -import { QuietFormChangePhase } from "#app/phases/quiet-form-change-phase"; -import { ReloadSessionPhase } from "#app/phases/reload-session-phase"; -import { ResetStatusPhase } from "#app/phases/reset-status-phase"; -import { ReturnPhase } from "#app/phases/return-phase"; -import { RevivalBlessingPhase } from "#app/phases/revival-blessing-phase"; -import { RibbonModifierRewardPhase } from "#app/phases/ribbon-modifier-reward-phase"; -import { ScanIvsPhase } from "#app/phases/scan-ivs-phase"; -import { SelectBiomePhase } from "#app/phases/select-biome-phase"; -import { SelectChallengePhase } from "#app/phases/select-challenge-phase"; -import { SelectGenderPhase } from "#app/phases/select-gender-phase"; -import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; -import { SelectStarterPhase } from "#app/phases/select-starter-phase"; -import { SelectTargetPhase } from "#app/phases/select-target-phase"; -import { ShinySparklePhase } from "#app/phases/shiny-sparkle-phase"; -import { ShowAbilityPhase } from "#app/phases/show-ability-phase"; -import { ShowPartyExpBarPhase } from "#app/phases/show-party-exp-bar-phase"; -import { ShowTrainerPhase } from "#app/phases/show-trainer-phase"; -import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase"; -import { SummonMissingPhase } from "#app/phases/summon-missing-phase"; -import { SummonPhase } from "#app/phases/summon-phase"; -import { SwitchBiomePhase } from "#app/phases/switch-biome-phase"; -import { SwitchPhase } from "#app/phases/switch-phase"; -import { SwitchSummonPhase } from "#app/phases/switch-summon-phase"; -import { TeraPhase } from "#app/phases/tera-phase"; -import { TitlePhase } from "#app/phases/title-phase"; -import { ToggleDoublePositionPhase } from "#app/phases/toggle-double-position-phase"; -import { TrainerVictoryPhase } from "#app/phases/trainer-victory-phase"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { TurnInitPhase } from "#app/phases/turn-init-phase"; -import { TurnStartPhase } from "#app/phases/turn-start-phase"; -import { UnavailablePhase } from "#app/phases/unavailable-phase"; -import { UnlockPhase } from "#app/phases/unlock-phase"; -import { VictoryPhase } from "#app/phases/victory-phase"; -import { WeatherEffectPhase } from "#app/phases/weather-effect-phase"; +} from "#phases/mystery-encounter-phases"; +import { NewBattlePhase } from "#phases/new-battle-phase"; +import { NewBiomeEncounterPhase } from "#phases/new-biome-encounter-phase"; +import { NextEncounterPhase } from "#phases/next-encounter-phase"; +import { ObtainStatusEffectPhase } from "#phases/obtain-status-effect-phase"; +import { PartyExpPhase } from "#phases/party-exp-phase"; +import { PartyHealPhase } from "#phases/party-heal-phase"; +import { PokemonAnimPhase } from "#phases/pokemon-anim-phase"; +import { PokemonHealPhase } from "#phases/pokemon-heal-phase"; +import { PokemonTransformPhase } from "#phases/pokemon-transform-phase"; +import { PostGameOverPhase } from "#phases/post-game-over-phase"; +import { PostSummonPhase } from "#phases/post-summon-phase"; +import { PostTurnStatusEffectPhase } from "#phases/post-turn-status-effect-phase"; +import { QuietFormChangePhase } from "#phases/quiet-form-change-phase"; +import { ReloadSessionPhase } from "#phases/reload-session-phase"; +import { ResetStatusPhase } from "#phases/reset-status-phase"; +import { ReturnPhase } from "#phases/return-phase"; +import { RevivalBlessingPhase } from "#phases/revival-blessing-phase"; +import { RibbonModifierRewardPhase } from "#phases/ribbon-modifier-reward-phase"; +import { ScanIvsPhase } from "#phases/scan-ivs-phase"; +import { SelectBiomePhase } from "#phases/select-biome-phase"; +import { SelectChallengePhase } from "#phases/select-challenge-phase"; +import { SelectGenderPhase } from "#phases/select-gender-phase"; +import { SelectModifierPhase } from "#phases/select-modifier-phase"; +import { SelectStarterPhase } from "#phases/select-starter-phase"; +import { SelectTargetPhase } from "#phases/select-target-phase"; +import { ShinySparklePhase } from "#phases/shiny-sparkle-phase"; +import { ShowAbilityPhase } from "#phases/show-ability-phase"; +import { ShowPartyExpBarPhase } from "#phases/show-party-exp-bar-phase"; +import { ShowTrainerPhase } from "#phases/show-trainer-phase"; +import { StatStageChangePhase } from "#phases/stat-stage-change-phase"; +import { SummonMissingPhase } from "#phases/summon-missing-phase"; +import { SummonPhase } from "#phases/summon-phase"; +import { SwitchBiomePhase } from "#phases/switch-biome-phase"; +import { SwitchPhase } from "#phases/switch-phase"; +import { SwitchSummonPhase } from "#phases/switch-summon-phase"; +import { TeraPhase } from "#phases/tera-phase"; +import { TitlePhase } from "#phases/title-phase"; +import { ToggleDoublePositionPhase } from "#phases/toggle-double-position-phase"; +import { TrainerVictoryPhase } from "#phases/trainer-victory-phase"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { TurnInitPhase } from "#phases/turn-init-phase"; +import { TurnStartPhase } from "#phases/turn-start-phase"; +import { UnavailablePhase } from "#phases/unavailable-phase"; +import { UnlockPhase } from "#phases/unlock-phase"; +import { VictoryPhase } from "#phases/victory-phase"; +import { WeatherEffectPhase } from "#phases/weather-effect-phase"; +import type { PhaseMap, PhaseString } from "#types/phase-types"; +import { type Constructor, coerceArray } from "#utils/common"; /* * Manager for phases used by battle scene. diff --git a/src/phase.ts b/src/phase.ts index 5e81679d29e..46a81dddb6f 100644 --- a/src/phase.ts +++ b/src/phase.ts @@ -1,5 +1,5 @@ import { globalScene } from "#app/global-scene"; -import type { PhaseMap, PhaseString } from "./@types/phase-types"; +import type { PhaseMap, PhaseString } from "#types/phase-types"; export abstract class Phase { start() {} diff --git a/src/phases/activate-priority-queue-phase.ts b/src/phases/activate-priority-queue-phase.ts index df42c491676..a31d3291a60 100644 --- a/src/phases/activate-priority-queue-phase.ts +++ b/src/phases/activate-priority-queue-phase.ts @@ -1,6 +1,6 @@ -import type { DynamicPhaseType } from "#enums/dynamic-phase-type"; import { globalScene } from "#app/global-scene"; import { Phase } from "#app/phase"; +import type { DynamicPhaseType } from "#enums/dynamic-phase-type"; export class ActivatePriorityQueuePhase extends Phase { public readonly phaseName = "ActivatePriorityQueuePhase"; diff --git a/src/phases/add-enemy-buff-modifier-phase.ts b/src/phases/add-enemy-buff-modifier-phase.ts index 218a3a653ff..5c9a56796d4 100644 --- a/src/phases/add-enemy-buff-modifier-phase.ts +++ b/src/phases/add-enemy-buff-modifier-phase.ts @@ -1,9 +1,9 @@ -import { ModifierTier } from "#enums/modifier-tier"; -import { regenerateModifierPoolThresholds, getEnemyBuffModifierForWave } from "#app/modifier/modifier-type"; -import { ModifierPoolType } from "#enums/modifier-pool-type"; -import { EnemyPersistentModifier } from "#app/modifier/modifier"; -import { Phase } from "#app/phase"; import { globalScene } from "#app/global-scene"; +import { Phase } from "#app/phase"; +import { ModifierPoolType } from "#enums/modifier-pool-type"; +import { ModifierTier } from "#enums/modifier-tier"; +import { EnemyPersistentModifier } from "#modifiers/modifier"; +import { getEnemyBuffModifierForWave, regenerateModifierPoolThresholds } from "#modifiers/modifier-type"; export class AddEnemyBuffModifierPhase extends Phase { public readonly phaseName = "AddEnemyBuffModifierPhase"; diff --git a/src/phases/attempt-capture-phase.ts b/src/phases/attempt-capture-phase.ts index f4e6725935a..a8bb3af7b85 100644 --- a/src/phases/attempt-capture-phase.ts +++ b/src/phases/attempt-capture-phase.ts @@ -1,29 +1,29 @@ -import { BattlerIndex } from "#enums/battler-index"; import { PLAYER_PARTY_MAX_SIZE } from "#app/constants"; -import { SubstituteTag } from "#app/data/battler-tags"; +import { globalScene } from "#app/global-scene"; +import { getPokemonNameWithAffix } from "#app/messages"; +import { SubstituteTag } from "#data/battler-tags"; +import { Gender } from "#data/gender"; import { doPokeballBounceAnim, + getCriticalCaptureChance, getPokeballAtlasKey, getPokeballCatchMultiplier, getPokeballTintColor, - getCriticalCaptureChance, -} from "#app/data/pokeball"; -import { getStatusEffectCatchRateMultiplier } from "#app/data/status-effect"; -import { addPokeballCaptureStars, addPokeballOpenParticles } from "#app/field/anims"; -import type { EnemyPokemon } from "#app/field/pokemon"; -import { getPokemonNameWithAffix } from "#app/messages"; -import { PokemonHeldItemModifier } from "#app/modifier/modifier"; -import { PokemonPhase } from "#app/phases/pokemon-phase"; -import { achvs } from "#app/system/achv"; -import type { PartyOption } from "#app/ui/party-ui-handler"; -import { PartyUiMode } from "#app/ui/party-ui-handler"; -import { SummaryUiMode } from "#app/ui/summary-ui-handler"; -import { UiMode } from "#enums/ui-mode"; +} from "#data/pokeball"; +import { getStatusEffectCatchRateMultiplier } from "#data/status-effect"; +import { BattlerIndex } from "#enums/battler-index"; import type { PokeballType } from "#enums/pokeball"; import { StatusEffect } from "#enums/status-effect"; +import { UiMode } from "#enums/ui-mode"; +import { addPokeballCaptureStars, addPokeballOpenParticles } from "#field/anims"; +import type { EnemyPokemon } from "#field/pokemon"; +import { PokemonHeldItemModifier } from "#modifiers/modifier"; +import { PokemonPhase } from "#phases/pokemon-phase"; +import { achvs } from "#system/achv"; +import type { PartyOption } from "#ui/party-ui-handler"; +import { PartyUiMode } from "#ui/party-ui-handler"; +import { SummaryUiMode } from "#ui/summary-ui-handler"; import i18next from "i18next"; -import { globalScene } from "#app/global-scene"; -import { Gender } from "#app/data/gender"; export class AttemptCapturePhase extends PokemonPhase { public readonly phaseName = "AttemptCapturePhase"; diff --git a/src/phases/attempt-run-phase.ts b/src/phases/attempt-run-phase.ts index 3709374287a..a59667bdd4e 100644 --- a/src/phases/attempt-run-phase.ts +++ b/src/phases/attempt-run-phase.ts @@ -1,10 +1,10 @@ -import { applyAbAttrs } from "#app/data/abilities/apply-ab-attrs"; +import { applyAbAttrs } from "#abilities/apply-ab-attrs"; import { globalScene } from "#app/global-scene"; import Overrides from "#app/overrides"; -import { FieldPhase } from "#app/phases/field-phase"; -import { NumberHolder } from "#app/utils/common"; import { Stat } from "#enums/stat"; import { StatusEffect } from "#enums/status-effect"; +import { FieldPhase } from "#phases/field-phase"; +import { NumberHolder } from "#utils/common"; import i18next from "i18next"; export class AttemptRunPhase extends FieldPhase { diff --git a/src/phases/battle-end-phase.ts b/src/phases/battle-end-phase.ts index 297e20cb445..8d199915385 100644 --- a/src/phases/battle-end-phase.ts +++ b/src/phases/battle-end-phase.ts @@ -1,7 +1,7 @@ +import { applyAbAttrs } from "#abilities/apply-ab-attrs"; import { globalScene } from "#app/global-scene"; -import { applyAbAttrs } from "#app/data/abilities/apply-ab-attrs"; -import { LapsingPersistentModifier, LapsingPokemonHeldItemModifier } from "#app/modifier/modifier"; -import { BattlePhase } from "./battle-phase"; +import { LapsingPersistentModifier, LapsingPokemonHeldItemModifier } from "#modifiers/modifier"; +import { BattlePhase } from "#phases/battle-phase"; export class BattleEndPhase extends BattlePhase { public readonly phaseName = "BattleEndPhase"; diff --git a/src/phases/battle-phase.ts b/src/phases/battle-phase.ts index 7cefd0369d9..26794ed9bc5 100644 --- a/src/phases/battle-phase.ts +++ b/src/phases/battle-phase.ts @@ -1,6 +1,6 @@ import { globalScene } from "#app/global-scene"; -import { TrainerSlot } from "#enums/trainer-slot"; import { Phase } from "#app/phase"; +import { TrainerSlot } from "#enums/trainer-slot"; export abstract class BattlePhase extends Phase { showEnemyTrainer(trainerSlot: TrainerSlot = TrainerSlot.NONE): void { diff --git a/src/phases/berry-phase.ts b/src/phases/berry-phase.ts index 61124a7cda8..941406d0b96 100644 --- a/src/phases/berry-phase.ts +++ b/src/phases/berry-phase.ts @@ -1,13 +1,13 @@ -import { applyAbAttrs } from "#app/data/abilities/apply-ab-attrs"; -import { CommonAnim } from "#enums/move-anims-common"; -import { BerryUsedEvent } from "#app/events/battle-scene"; -import { getPokemonNameWithAffix } from "#app/messages"; -import { BerryModifier } from "#app/modifier/modifier"; -import i18next from "i18next"; -import { BooleanHolder } from "#app/utils/common"; -import { FieldPhase } from "./field-phase"; +import { applyAbAttrs } from "#abilities/apply-ab-attrs"; import { globalScene } from "#app/global-scene"; -import type Pokemon from "#app/field/pokemon"; +import { getPokemonNameWithAffix } from "#app/messages"; +import { CommonAnim } from "#enums/move-anims-common"; +import { BerryUsedEvent } from "#events/battle-scene"; +import type { Pokemon } from "#field/pokemon"; +import { BerryModifier } from "#modifiers/modifier"; +import { FieldPhase } from "#phases/field-phase"; +import { BooleanHolder } from "#utils/common"; +import i18next from "i18next"; /** * The phase after attacks where the pokemon eat berries. diff --git a/src/phases/check-status-effect-phase.ts b/src/phases/check-status-effect-phase.ts index 43495e038e9..bdaa536986a 100644 --- a/src/phases/check-status-effect-phase.ts +++ b/src/phases/check-status-effect-phase.ts @@ -1,6 +1,6 @@ +import { globalScene } from "#app/global-scene"; import { Phase } from "#app/phase"; import type { BattlerIndex } from "#enums/battler-index"; -import { globalScene } from "#app/global-scene"; export class CheckStatusEffectPhase extends Phase { public readonly phaseName = "CheckStatusEffectPhase"; diff --git a/src/phases/check-switch-phase.ts b/src/phases/check-switch-phase.ts index 97f4092096f..f4e8ee56c55 100644 --- a/src/phases/check-switch-phase.ts +++ b/src/phases/check-switch-phase.ts @@ -1,11 +1,11 @@ import { globalScene } from "#app/global-scene"; -import { BattleStyle } from "#app/enums/battle-style"; -import { BattlerTagType } from "#app/enums/battler-tag-type"; import { getPokemonNameWithAffix } from "#app/messages"; -import { UiMode } from "#enums/ui-mode"; -import i18next from "i18next"; -import { BattlePhase } from "./battle-phase"; +import { BattleStyle } from "#enums/battle-style"; +import { BattlerTagType } from "#enums/battler-tag-type"; import { SwitchType } from "#enums/switch-type"; +import { UiMode } from "#enums/ui-mode"; +import { BattlePhase } from "#phases/battle-phase"; +import i18next from "i18next"; export class CheckSwitchPhase extends BattlePhase { public readonly phaseName = "CheckSwitchPhase"; diff --git a/src/phases/command-phase.ts b/src/phases/command-phase.ts index 8281019b3c4..b90c5a6b00a 100644 --- a/src/phases/command-phase.ts +++ b/src/phases/command-phase.ts @@ -1,29 +1,29 @@ -import { globalScene } from "#app/global-scene"; import type { TurnCommand } from "#app/battle"; -import { BattleType } from "#enums/battle-type"; -import type { EncoreTag } from "#app/data/battler-tags"; -import { TrappedTag } from "#app/data/battler-tags"; -import type { MoveTargetSet } from "#app/data/moves/move"; -import { getMoveTargets } from "#app/data/moves/move-utils"; -import { speciesStarterCosts } from "#app/data/balance/starters"; -import { AbilityId } from "#enums/ability-id"; -import { BattlerTagType } from "#app/enums/battler-tag-type"; -import { BiomeId } from "#enums/biome-id"; -import { MoveId } from "#enums/move-id"; -import { PokeballType } from "#enums/pokeball"; -import type { PlayerPokemon } from "#app/field/pokemon"; -import type { TurnMove } from "#app/@types/turn-move"; -import { FieldPosition } from "#enums/field-position"; +import { globalScene } from "#app/global-scene"; import { getPokemonNameWithAffix } from "#app/messages"; -import { Command } from "#enums/command"; -import { UiMode } from "#enums/ui-mode"; -import i18next from "i18next"; -import { FieldPhase } from "./field-phase"; -import { MysteryEncounterMode } from "#enums/mystery-encounter-mode"; -import { isNullOrUndefined } from "#app/utils/common"; +import { speciesStarterCosts } from "#balance/starters"; +import type { EncoreTag } from "#data/battler-tags"; +import { TrappedTag } from "#data/battler-tags"; +import { AbilityId } from "#enums/ability-id"; import { ArenaTagSide } from "#enums/arena-tag-side"; -import { ArenaTagType } from "#app/enums/arena-tag-type"; -import { isVirtual, isIgnorePP, MoveUseMode } from "#enums/move-use-mode"; +import { ArenaTagType } from "#enums/arena-tag-type"; +import { BattleType } from "#enums/battle-type"; +import { BattlerTagType } from "#enums/battler-tag-type"; +import { BiomeId } from "#enums/biome-id"; +import { Command } from "#enums/command"; +import { FieldPosition } from "#enums/field-position"; +import { MoveId } from "#enums/move-id"; +import { isIgnorePP, isVirtual, MoveUseMode } from "#enums/move-use-mode"; +import { MysteryEncounterMode } from "#enums/mystery-encounter-mode"; +import { PokeballType } from "#enums/pokeball"; +import { UiMode } from "#enums/ui-mode"; +import type { PlayerPokemon } from "#field/pokemon"; +import type { MoveTargetSet } from "#moves/move"; +import { getMoveTargets } from "#moves/move-utils"; +import { FieldPhase } from "#phases/field-phase"; +import type { TurnMove } from "#types/turn-move"; +import { isNullOrUndefined } from "#utils/common"; +import i18next from "i18next"; export class CommandPhase extends FieldPhase { public readonly phaseName = "CommandPhase"; diff --git a/src/phases/common-anim-phase.ts b/src/phases/common-anim-phase.ts index abfe8ed99f0..78da1dcfa2f 100644 --- a/src/phases/common-anim-phase.ts +++ b/src/phases/common-anim-phase.ts @@ -1,8 +1,8 @@ -import type { BattlerIndex } from "#enums/battler-index"; import { globalScene } from "#app/global-scene"; +import { CommonBattleAnim } from "#data/battle-anims"; +import type { BattlerIndex } from "#enums/battler-index"; import type { CommonAnim } from "#enums/move-anims-common"; -import { CommonBattleAnim } from "#app/data/battle-anims"; -import { PokemonPhase } from "./pokemon-phase"; +import { PokemonPhase } from "#phases/pokemon-phase"; export class CommonAnimPhase extends PokemonPhase { // PokemonHealPhase extends CommonAnimPhase, and to make typescript happy, diff --git a/src/phases/damage-anim-phase.ts b/src/phases/damage-anim-phase.ts index 8dc377cdaf5..a651255baff 100644 --- a/src/phases/damage-anim-phase.ts +++ b/src/phases/damage-anim-phase.ts @@ -1,10 +1,10 @@ import { globalScene } from "#app/global-scene"; -import type { BattlerIndex } from "#enums/battler-index"; import { BattleSpec } from "#enums/battle-spec"; -import type { DamageResult } from "#app/@types/damage-result"; +import type { BattlerIndex } from "#enums/battler-index"; import { HitResult } from "#enums/hit-result"; -import { fixedInt } from "#app/utils/common"; -import { PokemonPhase } from "#app/phases/pokemon-phase"; +import { PokemonPhase } from "#phases/pokemon-phase"; +import type { DamageResult } from "#types/damage-result"; +import { fixedInt } from "#utils/common"; export class DamageAnimPhase extends PokemonPhase { public readonly phaseName = "DamageAnimPhase"; diff --git a/src/phases/egg-hatch-phase.ts b/src/phases/egg-hatch-phase.ts index d6c40a1510e..94923ae8c1f 100644 --- a/src/phases/egg-hatch-phase.ts +++ b/src/phases/egg-hatch-phase.ts @@ -1,20 +1,20 @@ import type { AnySound } from "#app/battle-scene"; import { globalScene } from "#app/global-scene"; -import type { Egg } from "#app/data/egg"; -import { EggCountChangedEvent } from "#app/events/egg"; -import type { PlayerPokemon } from "#app/field/pokemon"; import { Phase } from "#app/phase"; -import { achvs } from "#app/system/achv"; -import EggCounterContainer from "#app/ui/egg-counter-container"; -import type EggHatchSceneHandler from "#app/ui/egg-hatch-scene-handler"; -import PokemonInfoContainer from "#app/ui/pokemon-info-container"; +import type { Egg } from "#data/egg"; +import type { EggHatchData } from "#data/egg-hatch-data"; import { UiMode } from "#enums/ui-mode"; +import { EggCountChangedEvent } from "#events/egg"; +import { doShinySparkleAnim } from "#field/anims"; +import type { PlayerPokemon } from "#field/pokemon"; +import type { EggLapsePhase } from "#phases/egg-lapse-phase"; +import { achvs } from "#system/achv"; +import { EggCounterContainer } from "#ui/egg-counter-container"; +import type { EggHatchSceneHandler } from "#ui/egg-hatch-scene-handler"; +import { PokemonInfoContainer } from "#ui/pokemon-info-container"; +import { fixedInt, getFrameMs, randInt } from "#utils/common"; import i18next from "i18next"; import SoundFade from "phaser3-rex-plugins/plugins/soundfade"; -import { fixedInt, getFrameMs, randInt } from "#app/utils/common"; -import type { EggLapsePhase } from "./egg-lapse-phase"; -import type { EggHatchData } from "#app/data/egg-hatch-data"; -import { doShinySparkleAnim } from "#app/field/anims"; /** * Class that represents egg hatching diff --git a/src/phases/egg-lapse-phase.ts b/src/phases/egg-lapse-phase.ts index 206bef1a33c..4f393bddd36 100644 --- a/src/phases/egg-lapse-phase.ts +++ b/src/phases/egg-lapse-phase.ts @@ -1,13 +1,13 @@ import { globalScene } from "#app/global-scene"; -import type { Egg } from "#app/data/egg"; -import { EGG_SEED } from "#app/data/egg"; -import { Phase } from "#app/phase"; -import i18next from "i18next"; import Overrides from "#app/overrides"; +import { Phase } from "#app/phase"; +import type { Egg } from "#data/egg"; +import { EGG_SEED } from "#data/egg"; +import { EggHatchData } from "#data/egg-hatch-data"; import { UiMode } from "#enums/ui-mode"; -import { achvs } from "#app/system/achv"; -import type { PlayerPokemon } from "#app/field/pokemon"; -import { EggHatchData } from "#app/data/egg-hatch-data"; +import type { PlayerPokemon } from "#field/pokemon"; +import { achvs } from "#system/achv"; +import i18next from "i18next"; /** * Phase that handles updating eggs, and hatching any ready eggs diff --git a/src/phases/egg-summary-phase.ts b/src/phases/egg-summary-phase.ts index cc7857426bc..c236c5c3abc 100644 --- a/src/phases/egg-summary-phase.ts +++ b/src/phases/egg-summary-phase.ts @@ -1,7 +1,7 @@ import { globalScene } from "#app/global-scene"; import { Phase } from "#app/phase"; +import type { EggHatchData } from "#data/egg-hatch-data"; import { UiMode } from "#enums/ui-mode"; -import type { EggHatchData } from "#app/data/egg-hatch-data"; /** * Class that represents the egg summary phase diff --git a/src/phases/encounter-phase.ts b/src/phases/encounter-phase.ts index 52c2b2e465d..79da7134e9a 100644 --- a/src/phases/encounter-phase.ts +++ b/src/phases/encounter-phase.ts @@ -1,37 +1,41 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { BattleType } from "#enums/battle-type"; +import { applyAbAttrs } from "#abilities/apply-ab-attrs"; +import { PLAYER_PARTY_MAX_SIZE, WEIGHT_INCREMENT_ON_SPAWN_MISS } from "#app/constants"; import { globalScene } from "#app/global-scene"; -import { PLAYER_PARTY_MAX_SIZE } from "#app/constants"; -import { applyAbAttrs } from "#app/data/abilities/apply-ab-attrs"; -import { initEncounterAnims, loadEncounterAnimAssets } from "#app/data/battle-anims"; -import { getCharVariantFromDialogue } from "#app/data/dialogue"; -import { getEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; -import { doTrainerExclamation } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { getGoldenBugNetSpecies } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; -import { TrainerSlot } from "#enums/trainer-slot"; -import { getRandomWeatherType } from "#app/data/weather"; -import { EncounterPhaseEvent } from "#app/events/battle-scene"; -import type Pokemon from "#app/field/pokemon"; -import { FieldPosition } from "#enums/field-position"; import { getPokemonNameWithAffix } from "#app/messages"; -import { BoostBugSpawnModifier, IvScannerModifier, TurnHeldItemTransferModifier } from "#app/modifier/modifier"; -import { regenerateModifierPoolThresholds } from "#app/modifier/modifier-type"; -import { ModifierPoolType } from "#enums/modifier-pool-type"; import Overrides from "#app/overrides"; -import { BattlePhase } from "#app/phases/battle-phase"; -import { achvs } from "#app/system/achv"; import { handleTutorial, Tutorial } from "#app/tutorial"; -import { UiMode } from "#enums/ui-mode"; -import { randSeedInt, randSeedItem } from "#app/utils/common"; +import { initEncounterAnims, loadEncounterAnimAssets } from "#data/battle-anims"; +import { getCharVariantFromDialogue } from "#data/dialogue"; +import { getNatureName } from "#data/nature"; +import { getRandomWeatherType } from "#data/weather"; import { BattleSpec } from "#enums/battle-spec"; +import { BattleType } from "#enums/battle-type"; +import { BattlerIndex } from "#enums/battler-index"; import { BiomeId } from "#enums/biome-id"; +import { FieldPosition } from "#enums/field-position"; +import { ModifierPoolType } from "#enums/modifier-pool-type"; import { MysteryEncounterMode } from "#enums/mystery-encounter-mode"; import { PlayerGender } from "#enums/player-gender"; import { SpeciesId } from "#enums/species-id"; -import { overrideHeldItems, overrideModifiers } from "#app/modifier/modifier"; +import { TrainerSlot } from "#enums/trainer-slot"; +import { UiMode } from "#enums/ui-mode"; +import { EncounterPhaseEvent } from "#events/battle-scene"; +import type { Pokemon } from "#field/pokemon"; +import { + BoostBugSpawnModifier, + IvScannerModifier, + overrideHeldItems, + overrideModifiers, + TurnHeldItemTransferModifier, +} from "#modifiers/modifier"; +import { regenerateModifierPoolThresholds } from "#modifiers/modifier-type"; +import { getEncounterText } from "#mystery-encounters/encounter-dialogue-utils"; +import { doTrainerExclamation } from "#mystery-encounters/encounter-phase-utils"; +import { getGoldenBugNetSpecies } from "#mystery-encounters/encounter-pokemon-utils"; +import { BattlePhase } from "#phases/battle-phase"; +import { achvs } from "#system/achv"; +import { randSeedInt, randSeedItem } from "#utils/common"; import i18next from "i18next"; -import { WEIGHT_INCREMENT_ON_SPAWN_MISS } from "#app/constants"; -import { getNatureName } from "#app/data/nature"; export class EncounterPhase extends BattlePhase { // Union type is necessary as this is subclassed, and typescript will otherwise complain diff --git a/src/phases/end-card-phase.ts b/src/phases/end-card-phase.ts index bb64969514f..5c3f6e1bf9b 100644 --- a/src/phases/end-card-phase.ts +++ b/src/phases/end-card-phase.ts @@ -1,7 +1,7 @@ import { globalScene } from "#app/global-scene"; -import { PlayerGender } from "#app/enums/player-gender"; import { Phase } from "#app/phase"; -import { addTextObject, TextStyle } from "#app/ui/text"; +import { PlayerGender } from "#enums/player-gender"; +import { addTextObject, TextStyle } from "#ui/text"; import i18next from "i18next"; export class EndCardPhase extends Phase { diff --git a/src/phases/enemy-command-phase.ts b/src/phases/enemy-command-phase.ts index 0dc41a592e0..7e4dff37b0f 100644 --- a/src/phases/enemy-command-phase.ts +++ b/src/phases/enemy-command-phase.ts @@ -1,9 +1,9 @@ import { globalScene } from "#app/global-scene"; -import { BattlerIndex } from "#enums/battler-index"; -import { Command } from "#enums/command"; -import { FieldPhase } from "./field-phase"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; import { BattlerTagType } from "#enums/battler-tag-type"; +import { Command } from "#enums/command"; +import { FieldPhase } from "#phases/field-phase"; /** * Phase for determining an enemy AI's action for the next turn. diff --git a/src/phases/enemy-party-member-pokemon-phase.ts b/src/phases/enemy-party-member-pokemon-phase.ts index 5c701f7d73a..2f0ace608ff 100644 --- a/src/phases/enemy-party-member-pokemon-phase.ts +++ b/src/phases/enemy-party-member-pokemon-phase.ts @@ -1,5 +1,5 @@ -import type { EnemyPokemon } from "#app/field/pokemon"; -import { PartyMemberPokemonPhase } from "./party-member-pokemon-phase"; +import type { EnemyPokemon } from "#field/pokemon"; +import { PartyMemberPokemonPhase } from "#phases/party-member-pokemon-phase"; export abstract class EnemyPartyMemberPokemonPhase extends PartyMemberPokemonPhase { constructor(partyMemberIndex: number) { diff --git a/src/phases/evolution-phase.ts b/src/phases/evolution-phase.ts index 8e4300986b3..b336e1b0ae9 100644 --- a/src/phases/evolution-phase.ts +++ b/src/phases/evolution-phase.ts @@ -1,20 +1,19 @@ -import SoundFade from "phaser3-rex-plugins/plugins/soundfade"; -import { Phase } from "#app/phase"; import type { AnySound } from "#app/battle-scene"; import { globalScene } from "#app/global-scene"; -import type { SpeciesFormEvolution } from "#app/data/balance/pokemon-evolutions"; -import { FusionSpeciesFormEvolution } from "#app/data/balance/pokemon-evolutions"; -import type EvolutionSceneHandler from "#app/ui/evolution-scene-handler"; -import { fixedInt, getFrameMs, randInt } from "#app/utils/common"; -import { UiMode } from "#enums/ui-mode"; -import { cos, sin } from "#app/field/anims"; -import type { PlayerPokemon } from "#app/field/pokemon"; -import type Pokemon from "#app/field/pokemon"; -import { LearnMoveSituation } from "#enums/learn-move-situation"; -import { getTypeRgb } from "#app/data/type"; -import i18next from "i18next"; import { getPokemonNameWithAffix } from "#app/messages"; -import { EVOLVE_MOVE } from "#app/data/balance/pokemon-level-moves"; +import { Phase } from "#app/phase"; +import type { SpeciesFormEvolution } from "#balance/pokemon-evolutions"; +import { FusionSpeciesFormEvolution } from "#balance/pokemon-evolutions"; +import { EVOLVE_MOVE } from "#balance/pokemon-level-moves"; +import { getTypeRgb } from "#data/type"; +import { LearnMoveSituation } from "#enums/learn-move-situation"; +import { UiMode } from "#enums/ui-mode"; +import { cos, sin } from "#field/anims"; +import type { PlayerPokemon, Pokemon } from "#field/pokemon"; +import type { EvolutionSceneHandler } from "#ui/evolution-scene-handler"; +import { fixedInt, getFrameMs, randInt } from "#utils/common"; +import i18next from "i18next"; +import SoundFade from "phaser3-rex-plugins/plugins/soundfade"; export class EvolutionPhase extends Phase { // FormChangePhase inherits from this, but EvolutionPhase is not abstract. diff --git a/src/phases/exp-phase.ts b/src/phases/exp-phase.ts index 74768e86186..7ab162c2ac6 100644 --- a/src/phases/exp-phase.ts +++ b/src/phases/exp-phase.ts @@ -1,9 +1,9 @@ import { globalScene } from "#app/global-scene"; import { getPokemonNameWithAffix } from "#app/messages"; -import { ExpBoosterModifier } from "#app/modifier/modifier"; +import { ExpBoosterModifier } from "#modifiers/modifier"; +import { PlayerPartyMemberPokemonPhase } from "#phases/player-party-member-pokemon-phase"; +import { NumberHolder } from "#utils/common"; import i18next from "i18next"; -import { NumberHolder } from "#app/utils/common"; -import { PlayerPartyMemberPokemonPhase } from "./player-party-member-pokemon-phase"; export class ExpPhase extends PlayerPartyMemberPokemonPhase { public readonly phaseName = "ExpPhase"; diff --git a/src/phases/faint-phase.ts b/src/phases/faint-phase.ts index c2658b62b23..d1bd0ed0804 100644 --- a/src/phases/faint-phase.ts +++ b/src/phases/faint-phase.ts @@ -1,26 +1,24 @@ -import type { BattlerIndex } from "#enums/battler-index"; -import { BattleType } from "#enums/battle-type"; +import { applyAbAttrs } from "#abilities/apply-ab-attrs"; import { globalScene } from "#app/global-scene"; -import { applyAbAttrs } from "#app/data/abilities/apply-ab-attrs"; -import { BattlerTagLapseType } from "#enums/battler-tag-lapse-type"; -import { battleSpecDialogue } from "#app/data/dialogue"; -import { allMoves } from "#app/data/data-lists"; -import { SpeciesFormChangeActiveTrigger } from "#app/data/pokemon-forms/form-change-triggers"; -import { BattleSpec } from "#app/enums/battle-spec"; -import { StatusEffect } from "#app/enums/status-effect"; -import type { EnemyPokemon } from "#app/field/pokemon"; -import type Pokemon from "#app/field/pokemon"; -import { PokemonMove } from "#app/data/moves/pokemon-move"; -import { HitResult } from "#enums/hit-result"; -import type { PlayerPokemon } from "#app/field/pokemon"; import { getPokemonNameWithAffix } from "#app/messages"; -import { PokemonInstantReviveModifier } from "#app/modifier/modifier"; -import { SwitchType } from "#enums/switch-type"; -import i18next from "i18next"; -import { PokemonPhase } from "./pokemon-phase"; -import { isNullOrUndefined } from "#app/utils/common"; -import { FRIENDSHIP_LOSS_FROM_FAINT } from "#app/data/balance/starters"; +import { FRIENDSHIP_LOSS_FROM_FAINT } from "#balance/starters"; +import { allMoves } from "#data/data-lists"; +import { battleSpecDialogue } from "#data/dialogue"; +import { SpeciesFormChangeActiveTrigger } from "#data/form-change-triggers"; +import { BattleSpec } from "#enums/battle-spec"; +import { BattleType } from "#enums/battle-type"; +import type { BattlerIndex } from "#enums/battler-index"; +import { BattlerTagLapseType } from "#enums/battler-tag-lapse-type"; import { BattlerTagType } from "#enums/battler-tag-type"; +import { HitResult } from "#enums/hit-result"; +import { StatusEffect } from "#enums/status-effect"; +import { SwitchType } from "#enums/switch-type"; +import type { EnemyPokemon, PlayerPokemon, Pokemon } from "#field/pokemon"; +import { PokemonInstantReviveModifier } from "#modifiers/modifier"; +import { PokemonMove } from "#moves/pokemon-move"; +import { PokemonPhase } from "#phases/pokemon-phase"; +import { isNullOrUndefined } from "#utils/common"; +import i18next from "i18next"; export class FaintPhase extends PokemonPhase { public readonly phaseName = "FaintPhase"; diff --git a/src/phases/field-phase.ts b/src/phases/field-phase.ts index c37f0e960e7..99de3d9fcf5 100644 --- a/src/phases/field-phase.ts +++ b/src/phases/field-phase.ts @@ -1,6 +1,6 @@ import { globalScene } from "#app/global-scene"; -import type Pokemon from "#app/field/pokemon"; -import { BattlePhase } from "./battle-phase"; +import type { Pokemon } from "#field/pokemon"; +import { BattlePhase } from "#phases/battle-phase"; type PokemonFunc = (pokemon: Pokemon) => void; diff --git a/src/phases/form-change-phase.ts b/src/phases/form-change-phase.ts index 6d60cacd69d..7b7f5a6dac6 100644 --- a/src/phases/form-change-phase.ts +++ b/src/phases/form-change-phase.ts @@ -1,15 +1,15 @@ import { globalScene } from "#app/global-scene"; -import { fixedInt } from "#app/utils/common"; -import { achvs } from "../system/achv"; -import type { SpeciesFormChange } from "../data/pokemon-forms"; -import { getSpeciesFormChangeMessage } from "#app/data/pokemon-forms/form-change-triggers"; -import type { default as Pokemon, PlayerPokemon } from "../field/pokemon"; -import { UiMode } from "#enums/ui-mode"; -import type PartyUiHandler from "../ui/party-ui-handler"; -import { getPokemonNameWithAffix } from "../messages"; -import { EvolutionPhase } from "./evolution-phase"; +import { getPokemonNameWithAffix } from "#app/messages"; +import { getSpeciesFormChangeMessage } from "#data/form-change-triggers"; +import type { SpeciesFormChange } from "#data/pokemon-forms"; import { BattlerTagType } from "#enums/battler-tag-type"; import { SpeciesFormKey } from "#enums/species-form-key"; +import { UiMode } from "#enums/ui-mode"; +import type { PlayerPokemon, Pokemon } from "#field/pokemon"; +import { EvolutionPhase } from "#phases/evolution-phase"; +import { achvs } from "#system/achv"; +import type { PartyUiHandler } from "#ui/party-ui-handler"; +import { fixedInt } from "#utils/common"; export class FormChangePhase extends EvolutionPhase { public readonly phaseName = "FormChangePhase"; diff --git a/src/phases/game-over-modifier-reward-phase.ts b/src/phases/game-over-modifier-reward-phase.ts index 13c8f48abad..f07c7d2adba 100644 --- a/src/phases/game-over-modifier-reward-phase.ts +++ b/src/phases/game-over-modifier-reward-phase.ts @@ -1,7 +1,7 @@ import { globalScene } from "#app/global-scene"; import { UiMode } from "#enums/ui-mode"; +import { ModifierRewardPhase } from "#phases/modifier-reward-phase"; import i18next from "i18next"; -import { ModifierRewardPhase } from "./modifier-reward-phase"; export class GameOverModifierRewardPhase extends ModifierRewardPhase { public readonly phaseName = "GameOverModifierRewardPhase"; diff --git a/src/phases/game-over-phase.ts b/src/phases/game-over-phase.ts index 3f92f26b9b9..d4562b5a237 100644 --- a/src/phases/game-over-phase.ts +++ b/src/phases/game-over-phase.ts @@ -1,29 +1,29 @@ +import { pokerogueApi } from "#api/pokerogue-api"; import { clientSessionId } from "#app/account"; -import { BattleType } from "#enums/battle-type"; import { globalScene } from "#app/global-scene"; -import { pokemonEvolutions } from "#app/data/balance/pokemon-evolutions"; -import { getCharVariantFromDialogue } from "#app/data/dialogue"; -import type PokemonSpecies from "#app/data/pokemon-species"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; -import { trainerConfigs } from "#app/data/trainers/trainer-config"; -import type Pokemon from "#app/field/pokemon"; -import { modifierTypes } from "#app/data/data-lists"; -import { BattlePhase } from "#app/phases/battle-phase"; -import type { EndCardPhase } from "#app/phases/end-card-phase"; -import { achvs, ChallengeAchv } from "#app/system/achv"; -import { Unlockables } from "#enums/unlockables"; -import { UiMode } from "#enums/ui-mode"; -import { isLocal, isLocalServerConnected } from "#app/utils/common"; +import { pokemonEvolutions } from "#balance/pokemon-evolutions"; +import { modifierTypes } from "#data/data-lists"; +import { getCharVariantFromDialogue } from "#data/dialogue"; +import type { PokemonSpecies } from "#data/pokemon-species"; +import { BattleType } from "#enums/battle-type"; import { PlayerGender } from "#enums/player-gender"; import { TrainerType } from "#enums/trainer-type"; +import { UiMode } from "#enums/ui-mode"; +import { Unlockables } from "#enums/unlockables"; +import type { Pokemon } from "#field/pokemon"; +import { BattlePhase } from "#phases/battle-phase"; +import type { EndCardPhase } from "#phases/end-card-phase"; +import { achvs, ChallengeAchv } from "#system/achv"; +import { ArenaData } from "#system/arena-data"; +import { ChallengeData } from "#system/challenge-data"; +import type { SessionSaveData } from "#system/game-data"; +import { ModifierData as PersistentModifierData } from "#system/modifier-data"; +import { PokemonData } from "#system/pokemon-data"; +import { TrainerData } from "#system/trainer-data"; +import { trainerConfigs } from "#trainers/trainer-config"; +import { isLocal, isLocalServerConnected } from "#utils/common"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; import i18next from "i18next"; -import type { SessionSaveData } from "#app/system/game-data"; -import PersistentModifierData from "#app/system/modifier-data"; -import PokemonData from "#app/system/pokemon-data"; -import ChallengeData from "#app/system/challenge-data"; -import TrainerData from "#app/system/trainer-data"; -import ArenaData from "#app/system/arena-data"; -import { pokerogueApi } from "#app/plugins/api/pokerogue-api"; export class GameOverPhase extends BattlePhase { public readonly phaseName = "GameOverPhase"; diff --git a/src/phases/hide-party-exp-bar-phase.ts b/src/phases/hide-party-exp-bar-phase.ts index 9ee08280cd4..e59bd02ce60 100644 --- a/src/phases/hide-party-exp-bar-phase.ts +++ b/src/phases/hide-party-exp-bar-phase.ts @@ -1,5 +1,5 @@ import { globalScene } from "#app/global-scene"; -import { BattlePhase } from "./battle-phase"; +import { BattlePhase } from "#phases/battle-phase"; export class HidePartyExpBarPhase extends BattlePhase { public readonly phaseName = "HidePartyExpBarPhase"; diff --git a/src/phases/learn-move-phase.ts b/src/phases/learn-move-phase.ts index e24efa63b5a..a714d247730 100644 --- a/src/phases/learn-move-phase.ts +++ b/src/phases/learn-move-phase.ts @@ -1,18 +1,18 @@ import { globalScene } from "#app/global-scene"; -import { initMoveAnim, loadMoveAnimAssets } from "#app/data/battle-anims"; -import type Move from "#app/data/moves/move"; -import { allMoves } from "#app/data/data-lists"; -import { SpeciesFormChangeMoveLearnedTrigger } from "#app/data/pokemon-forms/form-change-triggers"; -import { MoveId } from "#enums/move-id"; import { getPokemonNameWithAffix } from "#app/messages"; import Overrides from "#app/overrides"; -import EvolutionSceneHandler from "#app/ui/evolution-scene-handler"; -import { SummaryUiMode } from "#app/ui/summary-ui-handler"; -import { UiMode } from "#enums/ui-mode"; -import i18next from "i18next"; -import { PlayerPartyMemberPokemonPhase } from "#app/phases/player-party-member-pokemon-phase"; -import type Pokemon from "#app/field/pokemon"; +import { initMoveAnim, loadMoveAnimAssets } from "#data/battle-anims"; +import { allMoves } from "#data/data-lists"; +import { SpeciesFormChangeMoveLearnedTrigger } from "#data/form-change-triggers"; import { LearnMoveType } from "#enums/learn-move-type"; +import { MoveId } from "#enums/move-id"; +import { UiMode } from "#enums/ui-mode"; +import type { Pokemon } from "#field/pokemon"; +import type { Move } from "#moves/move"; +import { PlayerPartyMemberPokemonPhase } from "#phases/player-party-member-pokemon-phase"; +import { EvolutionSceneHandler } from "#ui/evolution-scene-handler"; +import { SummaryUiMode } from "#ui/summary-ui-handler"; +import i18next from "i18next"; export class LearnMovePhase extends PlayerPartyMemberPokemonPhase { public readonly phaseName = "LearnMovePhase"; diff --git a/src/phases/level-cap-phase.ts b/src/phases/level-cap-phase.ts index 12d4d64e8e2..a1f1e07f58d 100644 --- a/src/phases/level-cap-phase.ts +++ b/src/phases/level-cap-phase.ts @@ -1,7 +1,7 @@ import { globalScene } from "#app/global-scene"; import { UiMode } from "#enums/ui-mode"; +import { FieldPhase } from "#phases/field-phase"; import i18next from "i18next"; -import { FieldPhase } from "./field-phase"; export class LevelCapPhase extends FieldPhase { public readonly phaseName = "LevelCapPhase"; diff --git a/src/phases/level-up-phase.ts b/src/phases/level-up-phase.ts index c78a1798304..07a87d73411 100644 --- a/src/phases/level-up-phase.ts +++ b/src/phases/level-up-phase.ts @@ -1,10 +1,10 @@ import { globalScene } from "#app/global-scene"; -import { ExpNotification } from "#app/enums/exp-notification"; -import type { PlayerPokemon } from "#app/field/pokemon"; import { getPokemonNameWithAffix } from "#app/messages"; -import { PlayerPartyMemberPokemonPhase } from "#app/phases/player-party-member-pokemon-phase"; -import { LevelAchv } from "#app/system/achv"; -import { NumberHolder } from "#app/utils/common"; +import { ExpNotification } from "#enums/exp-notification"; +import type { PlayerPokemon } from "#field/pokemon"; +import { PlayerPartyMemberPokemonPhase } from "#phases/player-party-member-pokemon-phase"; +import { LevelAchv } from "#system/achv"; +import { NumberHolder } from "#utils/common"; import i18next from "i18next"; export class LevelUpPhase extends PlayerPartyMemberPokemonPhase { diff --git a/src/phases/load-move-anim-phase.ts b/src/phases/load-move-anim-phase.ts index c9b78797407..3209e395399 100644 --- a/src/phases/load-move-anim-phase.ts +++ b/src/phases/load-move-anim-phase.ts @@ -1,6 +1,6 @@ -import { initMoveAnim, loadMoveAnimAssets } from "#app/data/battle-anims"; -import type { MoveId } from "#enums/move-id"; import { Phase } from "#app/phase"; +import { initMoveAnim, loadMoveAnimAssets } from "#data/battle-anims"; +import type { MoveId } from "#enums/move-id"; /** * Phase for synchronous move animation loading. diff --git a/src/phases/login-phase.ts b/src/phases/login-phase.ts index de426866baa..f310c60b0d4 100644 --- a/src/phases/login-phase.ts +++ b/src/phases/login-phase.ts @@ -1,12 +1,12 @@ import { updateUserInfo } from "#app/account"; -import { bypassLogin } from "#app/global-vars/bypass-login"; import { globalScene } from "#app/global-scene"; +import { bypassLogin } from "#app/global-vars/bypass-login"; import { Phase } from "#app/phase"; import { handleTutorial, Tutorial } from "#app/tutorial"; import { UiMode } from "#enums/ui-mode"; +import { executeIf, sessionIdKey } from "#utils/common"; +import { getCookie, removeCookie } from "#utils/cookies"; import i18next, { t } from "i18next"; -import { sessionIdKey, executeIf } from "#app/utils/common"; -import { getCookie, removeCookie } from "#app/utils/cookies"; export class LoginPhase extends Phase { public readonly phaseName = "LoginPhase"; diff --git a/src/phases/modifier-reward-phase.ts b/src/phases/modifier-reward-phase.ts index 29bbe215fc0..b84985b7311 100644 --- a/src/phases/modifier-reward-phase.ts +++ b/src/phases/modifier-reward-phase.ts @@ -1,9 +1,9 @@ import { globalScene } from "#app/global-scene"; -import type { ModifierType } from "#app/modifier/modifier-type"; -import type { ModifierTypeFunc } from "#app/@types/modifier-types"; -import { getModifierType } from "#app/utils/modifier-utils"; +import type { ModifierType } from "#modifiers/modifier-type"; +import { BattlePhase } from "#phases/battle-phase"; +import type { ModifierTypeFunc } from "#types/modifier-types"; +import { getModifierType } from "#utils/modifier-utils"; import i18next from "i18next"; -import { BattlePhase } from "./battle-phase"; export class ModifierRewardPhase extends BattlePhase { // RibbonModifierRewardPhase extends ModifierRewardPhase and to make typescript happy diff --git a/src/phases/money-reward-phase.ts b/src/phases/money-reward-phase.ts index 52cb9ecb3ff..61153de8565 100644 --- a/src/phases/money-reward-phase.ts +++ b/src/phases/money-reward-phase.ts @@ -1,9 +1,9 @@ import { globalScene } from "#app/global-scene"; -import { ArenaTagType } from "#app/enums/arena-tag-type"; -import { MoneyMultiplierModifier } from "#app/modifier/modifier"; +import { ArenaTagType } from "#enums/arena-tag-type"; +import { MoneyMultiplierModifier } from "#modifiers/modifier"; +import { BattlePhase } from "#phases/battle-phase"; +import { NumberHolder } from "#utils/common"; import i18next from "i18next"; -import { NumberHolder } from "#app/utils/common"; -import { BattlePhase } from "./battle-phase"; export class MoneyRewardPhase extends BattlePhase { public readonly phaseName = "MoneyRewardPhase"; diff --git a/src/phases/move-anim-phase.ts b/src/phases/move-anim-phase.ts index 383841a0146..b8563fbb997 100644 --- a/src/phases/move-anim-phase.ts +++ b/src/phases/move-anim-phase.ts @@ -1,5 +1,5 @@ -import type { MoveAnim } from "#app/data/battle-anims"; import { Phase } from "#app/phase"; +import type { MoveAnim } from "#data/battle-anims"; /** * Plays the given {@linkcode MoveAnim} sequentially. diff --git a/src/phases/move-charge-phase.ts b/src/phases/move-charge-phase.ts index 51b8fe96ff6..0c83db10511 100644 --- a/src/phases/move-charge-phase.ts +++ b/src/phases/move-charge-phase.ts @@ -1,15 +1,15 @@ import { globalScene } from "#app/global-scene"; +import { MoveChargeAnim } from "#data/battle-anims"; import type { BattlerIndex } from "#enums/battler-index"; -import { MoveChargeAnim } from "#app/data/battle-anims"; -import { applyMoveChargeAttrs } from "#app/data/moves/apply-attrs"; -import type { PokemonMove } from "#app/data/moves/pokemon-move"; -import type Pokemon from "#app/field/pokemon"; -import { MoveResult } from "#enums/move-result"; -import { BooleanHolder } from "#app/utils/common"; -import { PokemonPhase } from "#app/phases/pokemon-phase"; import { BattlerTagType } from "#enums/battler-tag-type"; +import { MoveResult } from "#enums/move-result"; import type { MoveUseMode } from "#enums/move-use-mode"; -import type { ChargingMove } from "#app/@types/move-types"; +import type { Pokemon } from "#field/pokemon"; +import { applyMoveChargeAttrs } from "#moves/apply-attrs"; +import type { PokemonMove } from "#moves/pokemon-move"; +import { PokemonPhase } from "#phases/pokemon-phase"; +import type { ChargingMove } from "#types/move-types"; +import { BooleanHolder } from "#utils/common"; /** * Phase for the "charging turn" of two-turn moves (e.g. Dig). diff --git a/src/phases/move-effect-phase.ts b/src/phases/move-effect-phase.ts index 0f53561f5f3..782dc637863 100644 --- a/src/phases/move-effect-phase.ts +++ b/src/phases/move-effect-phase.ts @@ -1,33 +1,27 @@ -import { BattlerIndex } from "#enums/battler-index"; +import { applyAbAttrs } from "#abilities/apply-ab-attrs"; import { globalScene } from "#app/global-scene"; -import { applyAbAttrs } from "#app/data/abilities/apply-ab-attrs"; -import { ConditionalProtectTag } from "#app/data/arena-tag"; +import { getPokemonNameWithAffix } from "#app/messages"; +import type { Phase } from "#app/phase"; +import { ConditionalProtectTag } from "#data/arena-tag"; +import { MoveAnim } from "#data/battle-anims"; +import { DamageProtectedTag, ProtectedTag, SemiInvulnerableTag, SubstituteTag, TypeBoostTag } from "#data/battler-tags"; +import { SpeciesFormChangePostMoveTrigger } from "#data/form-change-triggers"; +import type { TypeDamageMultiplier } from "#data/type"; import { ArenaTagSide } from "#enums/arena-tag-side"; -import { MoveAnim } from "#app/data/battle-anims"; -import { - DamageProtectedTag, - ProtectedTag, - SemiInvulnerableTag, - SubstituteTag, - TypeBoostTag, -} from "#app/data/battler-tags"; +import { BattlerIndex } from "#enums/battler-index"; import { BattlerTagLapseType } from "#enums/battler-tag-lapse-type"; -import type { MoveAttr } from "#app/data/moves/move"; -import { getMoveTargets } from "#app/data/moves/move-utils"; -import { applyFilteredMoveAttrs, applyMoveAttrs } from "#app/data/moves/apply-attrs"; +import { BattlerTagType } from "#enums/battler-tag-type"; +import { HitCheckResult } from "#enums/hit-check-result"; +import { HitResult } from "#enums/hit-result"; +import { MoveCategory } from "#enums/MoveCategory"; import { MoveEffectTrigger } from "#enums/MoveEffectTrigger"; import { MoveFlags } from "#enums/MoveFlags"; import { MoveTarget } from "#enums/MoveTarget"; -import { MoveCategory } from "#enums/MoveCategory"; -import { SpeciesFormChangePostMoveTrigger } from "#app/data/pokemon-forms/form-change-triggers"; -import { PokemonType } from "#enums/pokemon-type"; -import type { DamageResult } from "#app/@types/damage-result"; -import type { TurnMove } from "#app/@types/turn-move"; -import { PokemonMove } from "#app/data/moves/pokemon-move"; -import type Pokemon from "#app/field/pokemon"; +import { MoveId } from "#enums/move-id"; import { MoveResult } from "#enums/move-result"; -import { HitResult } from "#enums/hit-result"; -import { getPokemonNameWithAffix } from "#app/messages"; +import { isReflected, isVirtual, MoveUseMode } from "#enums/move-use-mode"; +import { PokemonType } from "#enums/pokemon-type"; +import type { Pokemon } from "#field/pokemon"; import { ContactHeldItemTransferChanceModifier, DamageMoneyRewardModifier, @@ -36,20 +30,18 @@ import { FlinchChanceModifier, HitHealModifier, PokemonMultiHitModifier, -} from "#app/modifier/modifier"; -import { PokemonPhase } from "#app/phases/pokemon-phase"; -import { BooleanHolder, isNullOrUndefined, NumberHolder } from "#app/utils/common"; -import type { nil } from "#app/utils/common"; -import { BattlerTagType } from "#enums/battler-tag-type"; -import { MoveId } from "#enums/move-id"; +} from "#modifiers/modifier"; +import { applyFilteredMoveAttrs, applyMoveAttrs } from "#moves/apply-attrs"; +import type { Move, MoveAttr } from "#moves/move"; +import { getMoveTargets, isFieldTargeted } from "#moves/move-utils"; +import { PokemonMove } from "#moves/pokemon-move"; +import { PokemonPhase } from "#phases/pokemon-phase"; +import { DamageAchv } from "#system/achv"; +import type { DamageResult } from "#types/damage-result"; +import type { TurnMove } from "#types/turn-move"; +import type { nil } from "#utils/common"; +import { BooleanHolder, isNullOrUndefined, NumberHolder } from "#utils/common"; import i18next from "i18next"; -import type { Phase } from "#app/phase"; -import type { TypeDamageMultiplier } from "#app/data/type"; -import { HitCheckResult } from "#enums/hit-check-result"; -import type Move from "#app/data/moves/move"; -import { isFieldTargeted } from "#app/data/moves/move-utils"; -import { DamageAchv } from "#app/system/achv"; -import { isVirtual, isReflected, MoveUseMode } from "#enums/move-use-mode"; export type HitCheckEntry = [HitCheckResult, TypeDamageMultiplier]; diff --git a/src/phases/move-end-phase.ts b/src/phases/move-end-phase.ts index 7e1006c74e8..fd893c445ff 100644 --- a/src/phases/move-end-phase.ts +++ b/src/phases/move-end-phase.ts @@ -1,9 +1,9 @@ +import { applyAbAttrs } from "#abilities/apply-ab-attrs"; import { globalScene } from "#app/global-scene"; -import { BattlerTagLapseType } from "#enums/battler-tag-lapse-type"; -import { PokemonPhase } from "./pokemon-phase"; import type { BattlerIndex } from "#enums/battler-index"; -import type Pokemon from "#app/field/pokemon"; -import { applyAbAttrs } from "#app/data/abilities/apply-ab-attrs"; +import { BattlerTagLapseType } from "#enums/battler-tag-lapse-type"; +import type { Pokemon } from "#field/pokemon"; +import { PokemonPhase } from "#phases/pokemon-phase"; export class MoveEndPhase extends PokemonPhase { public readonly phaseName = "MoveEndPhase"; diff --git a/src/phases/move-header-phase.ts b/src/phases/move-header-phase.ts index 8c2d184c3f5..5c69dcd1217 100644 --- a/src/phases/move-header-phase.ts +++ b/src/phases/move-header-phase.ts @@ -1,7 +1,7 @@ -import { applyMoveAttrs } from "#app/data/moves/apply-attrs"; -import type { PokemonMove } from "#app/data/moves/pokemon-move"; -import type Pokemon from "#app/field/pokemon"; -import { BattlePhase } from "./battle-phase"; +import type { Pokemon } from "#field/pokemon"; +import { applyMoveAttrs } from "#moves/apply-attrs"; +import type { PokemonMove } from "#moves/pokemon-move"; +import { BattlePhase } from "#phases/battle-phase"; export class MoveHeaderPhase extends BattlePhase { public readonly phaseName = "MoveHeaderPhase"; diff --git a/src/phases/move-phase.ts b/src/phases/move-phase.ts index 3bc46d3aea8..eebba2773e5 100644 --- a/src/phases/move-phase.ts +++ b/src/phases/move-phase.ts @@ -1,34 +1,34 @@ -import { BattlerIndex } from "#enums/battler-index"; +import { applyAbAttrs } from "#abilities/apply-ab-attrs"; import { globalScene } from "#app/global-scene"; -import { applyAbAttrs } from "#app/data/abilities/apply-ab-attrs"; -import type { DelayedAttackTag } from "#app/data/arena-tag"; -import { CommonAnim } from "#enums/move-anims-common"; -import { CenterOfAttentionTag } from "#app/data/battler-tags"; -import { BattlerTagLapseType } from "#enums/battler-tag-lapse-type"; -import { applyMoveAttrs } from "#app/data/moves/apply-attrs"; -import { allMoves } from "#app/data/data-lists"; -import { MoveFlags } from "#enums/MoveFlags"; -import { SpeciesFormChangePreMoveTrigger } from "#app/data/pokemon-forms/form-change-triggers"; -import { getStatusEffectActivationText, getStatusEffectHealText } from "#app/data/status-effect"; -import { PokemonType } from "#enums/pokemon-type"; -import { getWeatherBlockMessage } from "#app/data/weather"; -import { MoveUsedEvent } from "#app/events/battle-scene"; -import type { PokemonMove } from "#app/data/moves/pokemon-move"; -import type Pokemon from "#app/field/pokemon"; -import { MoveResult } from "#enums/move-result"; import { getPokemonNameWithAffix } from "#app/messages"; import Overrides from "#app/overrides"; -import { BattlePhase } from "#app/phases/battle-phase"; -import { enumValueToKey, NumberHolder } from "#app/utils/common"; +import type { DelayedAttackTag } from "#data/arena-tag"; +import { CenterOfAttentionTag } from "#data/battler-tags"; +import { allMoves } from "#data/data-lists"; +import { SpeciesFormChangePreMoveTrigger } from "#data/form-change-triggers"; +import { getStatusEffectActivationText, getStatusEffectHealText } from "#data/status-effect"; +import { getTerrainBlockMessage } from "#data/terrain"; +import { getWeatherBlockMessage } from "#data/weather"; import { AbilityId } from "#enums/ability-id"; import { ArenaTagType } from "#enums/arena-tag-type"; +import { BattlerIndex } from "#enums/battler-index"; +import { BattlerTagLapseType } from "#enums/battler-tag-lapse-type"; import { BattlerTagType } from "#enums/battler-tag-type"; +import { MoveFlags } from "#enums/MoveFlags"; +import { CommonAnim } from "#enums/move-anims-common"; import { MoveId } from "#enums/move-id"; +import { MoveResult } from "#enums/move-result"; +import { isIgnorePP, isIgnoreStatus, isReflected, isVirtual, MoveUseMode } from "#enums/move-use-mode"; +import { PokemonType } from "#enums/pokemon-type"; import { StatusEffect } from "#enums/status-effect"; +import { MoveUsedEvent } from "#events/battle-scene"; +import type { Pokemon } from "#field/pokemon"; +import { applyMoveAttrs } from "#moves/apply-attrs"; +import { frenzyMissFunc } from "#moves/move-utils"; +import type { PokemonMove } from "#moves/pokemon-move"; +import { BattlePhase } from "#phases/battle-phase"; +import { enumValueToKey, NumberHolder } from "#utils/common"; import i18next from "i18next"; -import { getTerrainBlockMessage } from "#app/data/terrain"; -import { isVirtual, isIgnorePP, isReflected, MoveUseMode, isIgnoreStatus } from "#enums/move-use-mode"; -import { frenzyMissFunc } from "#app/data/moves/move-utils"; export class MovePhase extends BattlePhase { public readonly phaseName = "MovePhase"; diff --git a/src/phases/mystery-encounter-phases.ts b/src/phases/mystery-encounter-phases.ts index 9aae796211f..9363efcb460 100644 --- a/src/phases/mystery-encounter-phases.ts +++ b/src/phases/mystery-encounter-phases.ts @@ -1,22 +1,21 @@ -import { BattlerTagLapseType } from "#enums/battler-tag-lapse-type"; -import type { OptionPhaseCallback } from "#app/data/mystery-encounters/mystery-encounter-option"; -import type MysteryEncounterOption from "#app/data/mystery-encounters/mystery-encounter-option"; -import { SeenEncounterData } from "#app/data/mystery-encounters/mystery-encounter-save-data"; -import { getEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; +import { globalScene } from "#app/global-scene"; +import { Phase } from "#app/phase"; +import { getCharVariantFromDialogue } from "#data/dialogue"; import { BattleSpec } from "#enums/battle-spec"; +import { BattlerTagLapseType } from "#enums/battler-tag-lapse-type"; import { BattlerTagType } from "#enums/battler-tag-type"; import { MysteryEncounterMode } from "#enums/mystery-encounter-mode"; import { SwitchType } from "#enums/switch-type"; -import i18next from "i18next"; -import { globalScene } from "#app/global-scene"; -import { getCharVariantFromDialogue } from "../data/dialogue"; -import type { OptionSelectSettings } from "../data/mystery-encounters/utils/encounter-phase-utils"; -import { transitionMysteryEncounterIntroVisuals } from "../data/mystery-encounters/utils/encounter-phase-utils"; import { TrainerSlot } from "#enums/trainer-slot"; -import { IvScannerModifier } from "../modifier/modifier"; -import { Phase } from "../phase"; import { UiMode } from "#enums/ui-mode"; -import { isNullOrUndefined, randSeedItem } from "#app/utils/common"; +import { IvScannerModifier } from "#modifiers/modifier"; +import { getEncounterText } from "#mystery-encounters/encounter-dialogue-utils"; +import type { OptionSelectSettings } from "#mystery-encounters/encounter-phase-utils"; +import { transitionMysteryEncounterIntroVisuals } from "#mystery-encounters/encounter-phase-utils"; +import type { MysteryEncounterOption, OptionPhaseCallback } from "#mystery-encounters/mystery-encounter-option"; +import { SeenEncounterData } from "#mystery-encounters/mystery-encounter-save-data"; +import { isNullOrUndefined, randSeedItem } from "#utils/common"; +import i18next from "i18next"; /** * Will handle (in order): diff --git a/src/phases/new-battle-phase.ts b/src/phases/new-battle-phase.ts index 65ecc81df2d..b9a57161bd0 100644 --- a/src/phases/new-battle-phase.ts +++ b/src/phases/new-battle-phase.ts @@ -1,5 +1,5 @@ import { globalScene } from "#app/global-scene"; -import { BattlePhase } from "./battle-phase"; +import { BattlePhase } from "#phases/battle-phase"; export class NewBattlePhase extends BattlePhase { public readonly phaseName = "NewBattlePhase"; diff --git a/src/phases/new-biome-encounter-phase.ts b/src/phases/new-biome-encounter-phase.ts index 74476412401..db57671c4e3 100644 --- a/src/phases/new-biome-encounter-phase.ts +++ b/src/phases/new-biome-encounter-phase.ts @@ -1,7 +1,7 @@ +import { applyAbAttrs } from "#abilities/apply-ab-attrs"; import { globalScene } from "#app/global-scene"; -import { applyAbAttrs } from "#app/data/abilities/apply-ab-attrs"; -import { getRandomWeatherType } from "#app/data/weather"; -import { NextEncounterPhase } from "./next-encounter-phase"; +import { getRandomWeatherType } from "#data/weather"; +import { NextEncounterPhase } from "#phases/next-encounter-phase"; export class NewBiomeEncounterPhase extends NextEncounterPhase { public readonly phaseName = "NewBiomeEncounterPhase"; diff --git a/src/phases/next-encounter-phase.ts b/src/phases/next-encounter-phase.ts index c31b4b5bbc3..02b9dd7ed69 100644 --- a/src/phases/next-encounter-phase.ts +++ b/src/phases/next-encounter-phase.ts @@ -1,5 +1,5 @@ import { globalScene } from "#app/global-scene"; -import { EncounterPhase } from "./encounter-phase"; +import { EncounterPhase } from "#phases/encounter-phase"; /** * The phase between defeating an encounter and starting another wild wave. diff --git a/src/phases/obtain-status-effect-phase.ts b/src/phases/obtain-status-effect-phase.ts index 78db8ae0a99..fbadbed205b 100644 --- a/src/phases/obtain-status-effect-phase.ts +++ b/src/phases/obtain-status-effect-phase.ts @@ -1,15 +1,15 @@ +import { applyAbAttrs } from "#abilities/apply-ab-attrs"; import { globalScene } from "#app/global-scene"; -import type { BattlerIndex } from "#enums/battler-index"; -import { CommonBattleAnim } from "#app/data/battle-anims"; -import { CommonAnim } from "#enums/move-anims-common"; -import { getStatusEffectObtainText, getStatusEffectOverlapText } from "#app/data/status-effect"; -import { StatusEffect } from "#app/enums/status-effect"; -import type Pokemon from "#app/field/pokemon"; import { getPokemonNameWithAffix } from "#app/messages"; -import { PokemonPhase } from "./pokemon-phase"; -import { SpeciesFormChangeStatusEffectTrigger } from "#app/data/pokemon-forms/form-change-triggers"; -import { applyAbAttrs } from "#app/data/abilities/apply-ab-attrs"; -import { isNullOrUndefined } from "#app/utils/common"; +import { CommonBattleAnim } from "#data/battle-anims"; +import { SpeciesFormChangeStatusEffectTrigger } from "#data/form-change-triggers"; +import { getStatusEffectObtainText, getStatusEffectOverlapText } from "#data/status-effect"; +import type { BattlerIndex } from "#enums/battler-index"; +import { CommonAnim } from "#enums/move-anims-common"; +import { StatusEffect } from "#enums/status-effect"; +import type { Pokemon } from "#field/pokemon"; +import { PokemonPhase } from "#phases/pokemon-phase"; +import { isNullOrUndefined } from "#utils/common"; export class ObtainStatusEffectPhase extends PokemonPhase { public readonly phaseName = "ObtainStatusEffectPhase"; diff --git a/src/phases/party-heal-phase.ts b/src/phases/party-heal-phase.ts index 765c7dbad8e..80d8b315102 100644 --- a/src/phases/party-heal-phase.ts +++ b/src/phases/party-heal-phase.ts @@ -1,6 +1,6 @@ import { globalScene } from "#app/global-scene"; -import { fixedInt } from "#app/utils/common"; -import { BattlePhase } from "./battle-phase"; +import { BattlePhase } from "#phases/battle-phase"; +import { fixedInt } from "#utils/common"; export class PartyHealPhase extends BattlePhase { public readonly phaseName = "PartyHealPhase"; diff --git a/src/phases/party-member-pokemon-phase.ts b/src/phases/party-member-pokemon-phase.ts index a782eabda38..9536dafda60 100644 --- a/src/phases/party-member-pokemon-phase.ts +++ b/src/phases/party-member-pokemon-phase.ts @@ -1,6 +1,6 @@ import { globalScene } from "#app/global-scene"; -import type Pokemon from "#app/field/pokemon"; -import { FieldPhase } from "./field-phase"; +import type { Pokemon } from "#field/pokemon"; +import { FieldPhase } from "#phases/field-phase"; export abstract class PartyMemberPokemonPhase extends FieldPhase { protected partyMemberIndex: number; diff --git a/src/phases/player-party-member-pokemon-phase.ts b/src/phases/player-party-member-pokemon-phase.ts index d97376a8614..4538bb42325 100644 --- a/src/phases/player-party-member-pokemon-phase.ts +++ b/src/phases/player-party-member-pokemon-phase.ts @@ -1,5 +1,5 @@ -import type { PlayerPokemon } from "#app/field/pokemon"; -import { PartyMemberPokemonPhase } from "./party-member-pokemon-phase"; +import type { PlayerPokemon } from "#field/pokemon"; +import { PartyMemberPokemonPhase } from "#phases/party-member-pokemon-phase"; export abstract class PlayerPartyMemberPokemonPhase extends PartyMemberPokemonPhase { constructor(partyMemberIndex: number) { diff --git a/src/phases/pokemon-anim-phase.ts b/src/phases/pokemon-anim-phase.ts index 314bddb981d..39e9c609aec 100644 --- a/src/phases/pokemon-anim-phase.ts +++ b/src/phases/pokemon-anim-phase.ts @@ -1,10 +1,10 @@ import { globalScene } from "#app/global-scene"; -import { SubstituteTag } from "#app/data/battler-tags"; -import type Pokemon from "#app/field/pokemon"; -import { BattlePhase } from "#app/phases/battle-phase"; -import { isNullOrUndefined } from "#app/utils/common"; +import { SubstituteTag } from "#data/battler-tags"; import { PokemonAnimType } from "#enums/pokemon-anim-type"; import { SpeciesId } from "#enums/species-id"; +import type { Pokemon } from "#field/pokemon"; +import { BattlePhase } from "#phases/battle-phase"; +import { isNullOrUndefined } from "#utils/common"; export class PokemonAnimPhase extends BattlePhase { public readonly phaseName = "PokemonAnimPhase"; diff --git a/src/phases/pokemon-heal-phase.ts b/src/phases/pokemon-heal-phase.ts index cf6cf40a923..fa6a3222466 100644 --- a/src/phases/pokemon-heal-phase.ts +++ b/src/phases/pokemon-heal-phase.ts @@ -1,17 +1,17 @@ import { globalScene } from "#app/global-scene"; -import type { BattlerIndex } from "#enums/battler-index"; -import { CommonAnim } from "#enums/move-anims-common"; -import { getStatusEffectHealText } from "#app/data/status-effect"; -import { StatusEffect } from "#app/enums/status-effect"; -import { HitResult } from "#enums/hit-result"; import { getPokemonNameWithAffix } from "#app/messages"; -import { HealingBoosterModifier } from "#app/modifier/modifier"; -import { HealAchv } from "#app/system/achv"; +import type { HealBlockTag } from "#data/battler-tags"; +import { getStatusEffectHealText } from "#data/status-effect"; +import type { BattlerIndex } from "#enums/battler-index"; +import { BattlerTagType } from "#enums/battler-tag-type"; +import { HitResult } from "#enums/hit-result"; +import { CommonAnim } from "#enums/move-anims-common"; +import { StatusEffect } from "#enums/status-effect"; +import { HealingBoosterModifier } from "#modifiers/modifier"; +import { CommonAnimPhase } from "#phases/common-anim-phase"; +import { HealAchv } from "#system/achv"; +import { NumberHolder } from "#utils/common"; import i18next from "i18next"; -import { NumberHolder } from "#app/utils/common"; -import { CommonAnimPhase } from "./common-anim-phase"; -import { BattlerTagType } from "#app/enums/battler-tag-type"; -import type { HealBlockTag } from "#app/data/battler-tags"; export class PokemonHealPhase extends CommonAnimPhase { public readonly phaseName = "PokemonHealPhase"; diff --git a/src/phases/pokemon-phase.ts b/src/phases/pokemon-phase.ts index cfa30f0d06e..9739c58d667 100644 --- a/src/phases/pokemon-phase.ts +++ b/src/phases/pokemon-phase.ts @@ -1,7 +1,7 @@ import { globalScene } from "#app/global-scene"; import { BattlerIndex } from "#enums/battler-index"; -import type Pokemon from "#app/field/pokemon"; -import { FieldPhase } from "./field-phase"; +import type { Pokemon } from "#field/pokemon"; +import { FieldPhase } from "#phases/field-phase"; export abstract class PokemonPhase extends FieldPhase { /** diff --git a/src/phases/pokemon-transform-phase.ts b/src/phases/pokemon-transform-phase.ts index 938915309d9..f0852c80fde 100644 --- a/src/phases/pokemon-transform-phase.ts +++ b/src/phases/pokemon-transform-phase.ts @@ -1,11 +1,11 @@ +import { globalScene } from "#app/global-scene"; +import { getPokemonNameWithAffix } from "#app/messages"; import type { BattlerIndex } from "#enums/battler-index"; import { BattlerTagType } from "#enums/battler-tag-type"; import { MoveId } from "#enums/move-id"; -import { EFFECTIVE_STATS, BATTLE_STATS } from "#enums/stat"; -import { PokemonMove } from "#app/data/moves/pokemon-move"; -import { globalScene } from "#app/global-scene"; -import { PokemonPhase } from "./pokemon-phase"; -import { getPokemonNameWithAffix } from "#app/messages"; +import { BATTLE_STATS, EFFECTIVE_STATS } from "#enums/stat"; +import { PokemonMove } from "#moves/pokemon-move"; +import { PokemonPhase } from "#phases/pokemon-phase"; import i18next from "i18next"; /** diff --git a/src/phases/post-game-over-phase.ts b/src/phases/post-game-over-phase.ts index 8e19dcd5498..3ac112a8a8b 100644 --- a/src/phases/post-game-over-phase.ts +++ b/src/phases/post-game-over-phase.ts @@ -1,6 +1,6 @@ import { globalScene } from "#app/global-scene"; import { Phase } from "#app/phase"; -import type { EndCardPhase } from "./end-card-phase"; +import type { EndCardPhase } from "#phases/end-card-phase"; export class PostGameOverPhase extends Phase { public readonly phaseName = "PostGameOverPhase"; diff --git a/src/phases/post-summon-activate-ability-phase.ts b/src/phases/post-summon-activate-ability-phase.ts index b1079a9b3e5..5f790c01ad1 100644 --- a/src/phases/post-summon-activate-ability-phase.ts +++ b/src/phases/post-summon-activate-ability-phase.ts @@ -1,6 +1,6 @@ -import { applyAbAttrs } from "#app/data/abilities/apply-ab-attrs"; -import { PostSummonPhase } from "#app/phases/post-summon-phase"; +import { applyAbAttrs } from "#abilities/apply-ab-attrs"; import type { BattlerIndex } from "#enums/battler-index"; +import { PostSummonPhase } from "#phases/post-summon-phase"; /** * Helper to {@linkcode PostSummonPhase} which applies abilities diff --git a/src/phases/post-summon-phase.ts b/src/phases/post-summon-phase.ts index 7f22148fdcf..e0811d0ab93 100644 --- a/src/phases/post-summon-phase.ts +++ b/src/phases/post-summon-phase.ts @@ -1,10 +1,10 @@ +import { applyAbAttrs } from "#abilities/apply-ab-attrs"; import { globalScene } from "#app/global-scene"; -import { ArenaTrapTag } from "#app/data/arena-tag"; -import { StatusEffect } from "#app/enums/status-effect"; -import { PokemonPhase } from "./pokemon-phase"; -import { MysteryEncounterPostSummonTag } from "#app/data/battler-tags"; +import { ArenaTrapTag } from "#data/arena-tag"; +import { MysteryEncounterPostSummonTag } from "#data/battler-tags"; import { BattlerTagType } from "#enums/battler-tag-type"; -import { applyAbAttrs } from "#app/data/abilities/apply-ab-attrs"; +import { StatusEffect } from "#enums/status-effect"; +import { PokemonPhase } from "#phases/pokemon-phase"; export class PostSummonPhase extends PokemonPhase { public readonly phaseName = "PostSummonPhase"; diff --git a/src/phases/post-turn-status-effect-phase.ts b/src/phases/post-turn-status-effect-phase.ts index fd7dd6ed419..9d5172180b8 100644 --- a/src/phases/post-turn-status-effect-phase.ts +++ b/src/phases/post-turn-status-effect-phase.ts @@ -1,14 +1,14 @@ +import { applyAbAttrs } from "#abilities/apply-ab-attrs"; import { globalScene } from "#app/global-scene"; -import type { BattlerIndex } from "#enums/battler-index"; -import { applyAbAttrs } from "#app/data/abilities/apply-ab-attrs"; -import { CommonBattleAnim } from "#app/data/battle-anims"; -import { CommonAnim } from "#enums/move-anims-common"; -import { getStatusEffectActivationText } from "#app/data/status-effect"; -import { BattleSpec } from "#app/enums/battle-spec"; -import { StatusEffect } from "#app/enums/status-effect"; import { getPokemonNameWithAffix } from "#app/messages"; -import { BooleanHolder, NumberHolder } from "#app/utils/common"; -import { PokemonPhase } from "./pokemon-phase"; +import { CommonBattleAnim } from "#data/battle-anims"; +import { getStatusEffectActivationText } from "#data/status-effect"; +import { BattleSpec } from "#enums/battle-spec"; +import type { BattlerIndex } from "#enums/battler-index"; +import { CommonAnim } from "#enums/move-anims-common"; +import { StatusEffect } from "#enums/status-effect"; +import { PokemonPhase } from "#phases/pokemon-phase"; +import { BooleanHolder, NumberHolder } from "#utils/common"; export class PostTurnStatusEffectPhase extends PokemonPhase { public readonly phaseName = "PostTurnStatusEffectPhase"; diff --git a/src/phases/quiet-form-change-phase.ts b/src/phases/quiet-form-change-phase.ts index 9c4a0638b54..ef53b16cc56 100644 --- a/src/phases/quiet-form-change-phase.ts +++ b/src/phases/quiet-form-change-phase.ts @@ -1,18 +1,15 @@ +import { applyAbAttrs } from "#abilities/apply-ab-attrs"; import { globalScene } from "#app/global-scene"; -import { SemiInvulnerableTag } from "#app/data/battler-tags"; -import type { SpeciesFormChange } from "#app/data/pokemon-forms"; -import { - getSpeciesFormChangeMessage, - SpeciesFormChangeTeraTrigger, -} from "#app/data/pokemon-forms/form-change-triggers"; -import { getTypeRgb } from "#app/data/type"; -import { BattleSpec } from "#app/enums/battle-spec"; -import { BattlerTagType } from "#app/enums/battler-tag-type"; -import type Pokemon from "#app/field/pokemon"; import { getPokemonNameWithAffix } from "#app/messages"; -import { BattlePhase } from "./battle-phase"; -import type { MovePhase } from "./move-phase"; -import { applyAbAttrs } from "#app/data/abilities/apply-ab-attrs"; +import { SemiInvulnerableTag } from "#data/battler-tags"; +import { getSpeciesFormChangeMessage, SpeciesFormChangeTeraTrigger } from "#data/form-change-triggers"; +import type { SpeciesFormChange } from "#data/pokemon-forms"; +import { getTypeRgb } from "#data/type"; +import { BattleSpec } from "#enums/battle-spec"; +import { BattlerTagType } from "#enums/battler-tag-type"; +import type { Pokemon } from "#field/pokemon"; +import { BattlePhase } from "#phases/battle-phase"; +import type { MovePhase } from "#phases/move-phase"; export class QuietFormChangePhase extends BattlePhase { public readonly phaseName = "QuietFormChangePhase"; diff --git a/src/phases/reload-session-phase.ts b/src/phases/reload-session-phase.ts index ac9337753c4..ac8a6bc2799 100644 --- a/src/phases/reload-session-phase.ts +++ b/src/phases/reload-session-phase.ts @@ -1,7 +1,7 @@ import { globalScene } from "#app/global-scene"; import { Phase } from "#app/phase"; import { UiMode } from "#enums/ui-mode"; -import { fixedInt } from "#app/utils/common"; +import { fixedInt } from "#utils/common"; export class ReloadSessionPhase extends Phase { public readonly phaseName = "ReloadSessionPhase"; diff --git a/src/phases/reset-status-phase.ts b/src/phases/reset-status-phase.ts index 779f375d7e2..e15fb7fee85 100644 --- a/src/phases/reset-status-phase.ts +++ b/src/phases/reset-status-phase.ts @@ -1,5 +1,5 @@ -import type Pokemon from "#app/field/pokemon"; -import { BattlePhase } from "#app/phases/battle-phase"; +import type { Pokemon } from "#field/pokemon"; +import { BattlePhase } from "#phases/battle-phase"; /** * Phase which handles resetting a Pokemon's status to none diff --git a/src/phases/return-phase.ts b/src/phases/return-phase.ts index a8233f98bd1..a8cce72810e 100644 --- a/src/phases/return-phase.ts +++ b/src/phases/return-phase.ts @@ -1,7 +1,7 @@ import { globalScene } from "#app/global-scene"; -import { SpeciesFormChangeActiveTrigger } from "#app/data/pokemon-forms/form-change-triggers"; +import { SpeciesFormChangeActiveTrigger } from "#data/form-change-triggers"; import { SwitchType } from "#enums/switch-type"; -import { SwitchSummonPhase } from "./switch-summon-phase"; +import { SwitchSummonPhase } from "#phases/switch-summon-phase"; export class ReturnPhase extends SwitchSummonPhase { public readonly phaseName = "ReturnPhase"; diff --git a/src/phases/revival-blessing-phase.ts b/src/phases/revival-blessing-phase.ts index e3e69f7ef25..0235fb51da3 100644 --- a/src/phases/revival-blessing-phase.ts +++ b/src/phases/revival-blessing-phase.ts @@ -1,12 +1,12 @@ -import { SwitchType } from "#enums/switch-type"; import { globalScene } from "#app/global-scene"; -import type { PartyOption } from "#app/ui/party-ui-handler"; -import PartyUiHandler, { PartyUiMode } from "#app/ui/party-ui-handler"; +import { SwitchType } from "#enums/switch-type"; import { UiMode } from "#enums/ui-mode"; +import type { PlayerPokemon } from "#field/pokemon"; +import { BattlePhase } from "#phases/battle-phase"; +import type { PartyOption } from "#ui/party-ui-handler"; +import { PartyUiHandler, PartyUiMode } from "#ui/party-ui-handler"; +import { isNullOrUndefined, toDmgValue } from "#utils/common"; import i18next from "i18next"; -import { toDmgValue, isNullOrUndefined } from "#app/utils/common"; -import { BattlePhase } from "#app/phases/battle-phase"; -import type { PlayerPokemon } from "#app/field/pokemon"; /** * Sets the Party UI and handles the effect of Revival Blessing diff --git a/src/phases/ribbon-modifier-reward-phase.ts b/src/phases/ribbon-modifier-reward-phase.ts index 10d63ba707f..7cf3f7a8071 100644 --- a/src/phases/ribbon-modifier-reward-phase.ts +++ b/src/phases/ribbon-modifier-reward-phase.ts @@ -1,9 +1,9 @@ import { globalScene } from "#app/global-scene"; -import type PokemonSpecies from "#app/data/pokemon-species"; -import type { ModifierTypeFunc } from "#app/@types/modifier-types"; +import type { PokemonSpecies } from "#data/pokemon-species"; import { UiMode } from "#enums/ui-mode"; +import { ModifierRewardPhase } from "#phases/modifier-reward-phase"; +import type { ModifierTypeFunc } from "#types/modifier-types"; import i18next from "i18next"; -import { ModifierRewardPhase } from "./modifier-reward-phase"; export class RibbonModifierRewardPhase extends ModifierRewardPhase { public readonly phaseName = "RibbonModifierRewardPhase"; diff --git a/src/phases/scan-ivs-phase.ts b/src/phases/scan-ivs-phase.ts index d296d87ca88..e0865feb7ca 100644 --- a/src/phases/scan-ivs-phase.ts +++ b/src/phases/scan-ivs-phase.ts @@ -1,11 +1,11 @@ import { globalScene } from "#app/global-scene"; -import type { BattlerIndex } from "#enums/battler-index"; -import { PERMANENT_STATS, Stat } from "#app/enums/stat"; import { getPokemonNameWithAffix } from "#app/messages"; -import { getTextColor, TextStyle } from "#app/ui/text"; +import type { BattlerIndex } from "#enums/battler-index"; +import { PERMANENT_STATS, Stat } from "#enums/stat"; import { UiMode } from "#enums/ui-mode"; +import { PokemonPhase } from "#phases/pokemon-phase"; +import { getTextColor, TextStyle } from "#ui/text"; import i18next from "i18next"; -import { PokemonPhase } from "./pokemon-phase"; export class ScanIvsPhase extends PokemonPhase { public readonly phaseName = "ScanIvsPhase"; diff --git a/src/phases/select-biome-phase.ts b/src/phases/select-biome-phase.ts index e8b4946b6d1..f54900b15b5 100644 --- a/src/phases/select-biome-phase.ts +++ b/src/phases/select-biome-phase.ts @@ -1,11 +1,11 @@ import { globalScene } from "#app/global-scene"; -import { biomeLinks, getBiomeName } from "#app/data/balance/biomes"; +import { biomeLinks, getBiomeName } from "#balance/biomes"; import { BiomeId } from "#enums/biome-id"; -import { MoneyInterestModifier, MapModifier } from "#app/modifier/modifier"; -import type { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler"; import { UiMode } from "#enums/ui-mode"; -import { BattlePhase } from "./battle-phase"; -import { randSeedInt } from "#app/utils/common"; +import { MapModifier, MoneyInterestModifier } from "#modifiers/modifier"; +import { BattlePhase } from "#phases/battle-phase"; +import type { OptionSelectItem } from "#ui/abstact-option-select-ui-handler"; +import { randSeedInt } from "#utils/common"; export class SelectBiomePhase extends BattlePhase { public readonly phaseName = "SelectBiomePhase"; diff --git a/src/phases/select-gender-phase.ts b/src/phases/select-gender-phase.ts index ad8515e312e..d44c308d08c 100644 --- a/src/phases/select-gender-phase.ts +++ b/src/phases/select-gender-phase.ts @@ -1,8 +1,8 @@ import { globalScene } from "#app/global-scene"; -import { PlayerGender } from "#app/enums/player-gender"; import { Phase } from "#app/phase"; -import { SettingKeys } from "#app/system/settings/settings"; +import { PlayerGender } from "#enums/player-gender"; import { UiMode } from "#enums/ui-mode"; +import { SettingKeys } from "#system/settings"; import i18next from "i18next"; export class SelectGenderPhase extends Phase { diff --git a/src/phases/select-modifier-phase.ts b/src/phases/select-modifier-phase.ts index 53e1f5bc282..cfe8a14f31f 100644 --- a/src/phases/select-modifier-phase.ts +++ b/src/phases/select-modifier-phase.ts @@ -1,35 +1,34 @@ import { globalScene } from "#app/global-scene"; -import type { ModifierTier } from "#enums/modifier-tier"; -import type { ModifierTypeOption, ModifierType } from "#app/modifier/modifier-type"; -import { - regenerateModifierPoolThresholds, - getPlayerShopModifierTypeOptionsForWave, - PokemonModifierType, - FusePokemonModifierType, - PokemonMoveModifierType, - TmModifierType, - RememberMoveModifierType, - PokemonPpRestoreModifierType, - PokemonPpUpModifierType, - getPlayerModifierTypeOptions, -} from "#app/modifier/modifier-type"; +import Overrides from "#app/overrides"; import { ModifierPoolType } from "#enums/modifier-pool-type"; -import type { Modifier } from "#app/modifier/modifier"; +import type { ModifierTier } from "#enums/modifier-tier"; +import { UiMode } from "#enums/ui-mode"; +import type { Modifier } from "#modifiers/modifier"; import { ExtraModifierModifier, HealShopCostModifier, PokemonHeldItemModifier, TempExtraModifierModifier, -} from "#app/modifier/modifier"; -import type ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; -import { SHOP_OPTIONS_ROW_LIMIT } from "#app/ui/modifier-select-ui-handler"; -import PartyUiHandler, { PartyUiMode, PartyOption } from "#app/ui/party-ui-handler"; -import { UiMode } from "#enums/ui-mode"; +} from "#modifiers/modifier"; +import type { CustomModifierSettings, ModifierType, ModifierTypeOption } from "#modifiers/modifier-type"; +import { + FusePokemonModifierType, + getPlayerModifierTypeOptions, + getPlayerShopModifierTypeOptionsForWave, + PokemonModifierType, + PokemonMoveModifierType, + PokemonPpRestoreModifierType, + PokemonPpUpModifierType, + RememberMoveModifierType, + regenerateModifierPoolThresholds, + TmModifierType, +} from "#modifiers/modifier-type"; +import { BattlePhase } from "#phases/battle-phase"; +import type { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; +import { SHOP_OPTIONS_ROW_LIMIT } from "#ui/modifier-select-ui-handler"; +import { PartyOption, PartyUiHandler, PartyUiMode } from "#ui/party-ui-handler"; +import { isNullOrUndefined, NumberHolder } from "#utils/common"; import i18next from "i18next"; -import { BattlePhase } from "./battle-phase"; -import Overrides from "#app/overrides"; -import type { CustomModifierSettings } from "#app/modifier/modifier-type"; -import { isNullOrUndefined, NumberHolder } from "#app/utils/common"; export type ModifierSelectCallback = (rowCursor: number, cursor: number) => boolean; diff --git a/src/phases/select-starter-phase.ts b/src/phases/select-starter-phase.ts index 76247c14ce0..f8f4eeee4d2 100644 --- a/src/phases/select-starter-phase.ts +++ b/src/phases/select-starter-phase.ts @@ -1,18 +1,18 @@ import { globalScene } from "#app/global-scene"; -import { applyChallenges } from "#app/data/challenge"; -import { ChallengeType } from "#enums/challenge-type"; -import { Gender } from "#app/data/gender"; -import { SpeciesFormChangeMoveLearnedTrigger } from "#app/data/pokemon-forms/form-change-triggers"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; -import { overrideHeldItems, overrideModifiers } from "#app/modifier/modifier"; import Overrides from "#app/overrides"; import { Phase } from "#app/phase"; -import { SaveSlotUiMode } from "#app/ui/save-slot-select-ui-handler"; -import type { Starter } from "#app/ui/starter-select-ui-handler"; -import { UiMode } from "#enums/ui-mode"; +import { applyChallenges } from "#data/challenge"; +import { SpeciesFormChangeMoveLearnedTrigger } from "#data/form-change-triggers"; +import { Gender } from "#data/gender"; +import { ChallengeType } from "#enums/challenge-type"; import type { SpeciesId } from "#enums/species-id"; +import { UiMode } from "#enums/ui-mode"; +import { overrideHeldItems, overrideModifiers } from "#modifiers/modifier"; +import { SaveSlotUiMode } from "#ui/save-slot-select-ui-handler"; +import type { Starter } from "#ui/starter-select-ui-handler"; +import { isNullOrUndefined } from "#utils/common"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; import SoundFade from "phaser3-rex-plugins/plugins/soundfade"; -import { isNullOrUndefined } from "#app/utils/common"; export class SelectStarterPhase extends Phase { public readonly phaseName = "SelectStarterPhase"; diff --git a/src/phases/select-target-phase.ts b/src/phases/select-target-phase.ts index 6d47ac18021..3805cb919b2 100644 --- a/src/phases/select-target-phase.ts +++ b/src/phases/select-target-phase.ts @@ -1,10 +1,10 @@ import { globalScene } from "#app/global-scene"; +import { allMoves } from "#data/data-lists"; import type { BattlerIndex } from "#enums/battler-index"; import { Command } from "#enums/command"; import { UiMode } from "#enums/ui-mode"; -import { PokemonPhase } from "./pokemon-phase"; -import i18next from "#app/plugins/i18n"; -import { allMoves } from "#app/data/data-lists"; +import { PokemonPhase } from "#phases/pokemon-phase"; +import i18next from "#plugins/i18n"; export class SelectTargetPhase extends PokemonPhase { public readonly phaseName = "SelectTargetPhase"; diff --git a/src/phases/shiny-sparkle-phase.ts b/src/phases/shiny-sparkle-phase.ts index 53866af89e6..0930d536267 100644 --- a/src/phases/shiny-sparkle-phase.ts +++ b/src/phases/shiny-sparkle-phase.ts @@ -1,6 +1,6 @@ import { globalScene } from "#app/global-scene"; import type { BattlerIndex } from "#enums/battler-index"; -import { PokemonPhase } from "./pokemon-phase"; +import { PokemonPhase } from "#phases/pokemon-phase"; export class ShinySparklePhase extends PokemonPhase { public readonly phaseName = "ShinySparklePhase"; diff --git a/src/phases/show-ability-phase.ts b/src/phases/show-ability-phase.ts index 0f568819cde..21c3e7341a7 100644 --- a/src/phases/show-ability-phase.ts +++ b/src/phases/show-ability-phase.ts @@ -1,7 +1,7 @@ import { globalScene } from "#app/global-scene"; -import type { BattlerIndex } from "#enums/battler-index"; -import { PokemonPhase } from "./pokemon-phase"; import { getPokemonNameWithAffix } from "#app/messages"; +import type { BattlerIndex } from "#enums/battler-index"; +import { PokemonPhase } from "#phases/pokemon-phase"; export class ShowAbilityPhase extends PokemonPhase { public readonly phaseName = "ShowAbilityPhase"; diff --git a/src/phases/show-party-exp-bar-phase.ts b/src/phases/show-party-exp-bar-phase.ts index 4849526b639..f22be5f63e3 100644 --- a/src/phases/show-party-exp-bar-phase.ts +++ b/src/phases/show-party-exp-bar-phase.ts @@ -1,9 +1,9 @@ import { globalScene } from "#app/global-scene"; -import { ExpGainsSpeed } from "#app/enums/exp-gains-speed"; -import { ExpNotification } from "#app/enums/exp-notification"; -import { ExpBoosterModifier } from "#app/modifier/modifier"; -import { NumberHolder } from "#app/utils/common"; -import { PlayerPartyMemberPokemonPhase } from "./player-party-member-pokemon-phase"; +import { ExpGainsSpeed } from "#enums/exp-gains-speed"; +import { ExpNotification } from "#enums/exp-notification"; +import { ExpBoosterModifier } from "#modifiers/modifier"; +import { PlayerPartyMemberPokemonPhase } from "#phases/player-party-member-pokemon-phase"; +import { NumberHolder } from "#utils/common"; export class ShowPartyExpBarPhase extends PlayerPartyMemberPokemonPhase { public readonly phaseName = "ShowPartyExpBarPhase"; diff --git a/src/phases/show-trainer-phase.ts b/src/phases/show-trainer-phase.ts index bae6ecd839c..e012c22116a 100644 --- a/src/phases/show-trainer-phase.ts +++ b/src/phases/show-trainer-phase.ts @@ -1,6 +1,6 @@ import { globalScene } from "#app/global-scene"; -import { PlayerGender } from "#app/enums/player-gender"; -import { BattlePhase } from "./battle-phase"; +import { PlayerGender } from "#enums/player-gender"; +import { BattlePhase } from "#phases/battle-phase"; export class ShowTrainerPhase extends BattlePhase { public readonly phaseName = "ShowTrainerPhase"; diff --git a/src/phases/stat-stage-change-phase.ts b/src/phases/stat-stage-change-phase.ts index 77fb7b38600..140ef841929 100644 --- a/src/phases/stat-stage-change-phase.ts +++ b/src/phases/stat-stage-change-phase.ts @@ -1,23 +1,20 @@ +import { applyAbAttrs } from "#abilities/apply-ab-attrs"; import { globalScene } from "#app/global-scene"; -import type { BattlerIndex } from "#enums/battler-index"; -import { applyAbAttrs } from "#app/data/abilities/apply-ab-attrs"; -import { MistTag } from "#app/data/arena-tag"; -import { ArenaTagSide } from "#enums/arena-tag-side"; -import type { ArenaTag } from "#app/data/arena-tag"; -import type Pokemon from "#app/field/pokemon"; import { getPokemonNameWithAffix } from "#app/messages"; -import { ResetNegativeStatStageModifier } from "#app/modifier/modifier"; import { handleTutorial, Tutorial } from "#app/tutorial"; -import { NumberHolder, BooleanHolder, isNullOrUndefined } from "#app/utils/common"; +import type { ArenaTag } from "#data/arena-tag"; +import { MistTag } from "#data/arena-tag"; +import { OctolockTag } from "#data/battler-tags"; +import { ArenaTagSide } from "#enums/arena-tag-side"; +import { ArenaTagType } from "#enums/arena-tag-type"; +import type { BattlerIndex } from "#enums/battler-index"; +import { type BattleStat, getStatKey, getStatStageChangeDescriptionKey, Stat } from "#enums/stat"; +import type { Pokemon } from "#field/pokemon"; +import { ResetNegativeStatStageModifier } from "#modifiers/modifier"; +import { PokemonPhase } from "#phases/pokemon-phase"; +import type { ConditionalUserFieldProtectStatAbAttrParams, PreStatStageChangeAbAttrParams } from "#types/ability-types"; +import { BooleanHolder, isNullOrUndefined, NumberHolder } from "#utils/common"; import i18next from "i18next"; -import { PokemonPhase } from "./pokemon-phase"; -import { Stat, type BattleStat, getStatKey, getStatStageChangeDescriptionKey } from "#enums/stat"; -import { OctolockTag } from "#app/data/battler-tags"; -import { ArenaTagType } from "#app/enums/arena-tag-type"; -import type { - ConditionalUserFieldProtectStatAbAttrParams, - PreStatStageChangeAbAttrParams, -} from "#app/@types/ability-types"; export type StatStageChangeCallback = ( target: Pokemon | null, diff --git a/src/phases/summon-missing-phase.ts b/src/phases/summon-missing-phase.ts index ce3e982055e..89d36b13597 100644 --- a/src/phases/summon-missing-phase.ts +++ b/src/phases/summon-missing-phase.ts @@ -1,7 +1,7 @@ -import { getPokemonNameWithAffix } from "#app/messages"; -import i18next from "i18next"; -import { SummonPhase } from "./summon-phase"; import { globalScene } from "#app/global-scene"; +import { getPokemonNameWithAffix } from "#app/messages"; +import { SummonPhase } from "#phases/summon-phase"; +import i18next from "i18next"; export class SummonMissingPhase extends SummonPhase { public readonly phaseName = "SummonMissingPhase"; diff --git a/src/phases/summon-phase.ts b/src/phases/summon-phase.ts index 95e4367d8df..e4c8aa9af7a 100644 --- a/src/phases/summon-phase.ts +++ b/src/phases/summon-phase.ts @@ -1,17 +1,17 @@ -import { BattleType } from "#enums/battle-type"; -import { getPokeballAtlasKey, getPokeballTintColor } from "#app/data/pokeball"; -import { SpeciesFormChangeActiveTrigger } from "#app/data/pokemon-forms/form-change-triggers"; -import { TrainerSlot } from "#enums/trainer-slot"; -import { PlayerGender } from "#app/enums/player-gender"; -import { addPokeballOpenParticles } from "#app/field/anims"; -import type Pokemon from "#app/field/pokemon"; -import { FieldPosition } from "#enums/field-position"; -import { getPokemonNameWithAffix } from "#app/messages"; -import i18next from "i18next"; -import { PartyMemberPokemonPhase } from "./party-member-pokemon-phase"; -import { MysteryEncounterMode } from "#enums/mystery-encounter-mode"; -import { applyAbAttrs } from "#app/data/abilities/apply-ab-attrs"; +import { applyAbAttrs } from "#abilities/apply-ab-attrs"; import { globalScene } from "#app/global-scene"; +import { getPokemonNameWithAffix } from "#app/messages"; +import { SpeciesFormChangeActiveTrigger } from "#data/form-change-triggers"; +import { getPokeballAtlasKey, getPokeballTintColor } from "#data/pokeball"; +import { BattleType } from "#enums/battle-type"; +import { FieldPosition } from "#enums/field-position"; +import { MysteryEncounterMode } from "#enums/mystery-encounter-mode"; +import { PlayerGender } from "#enums/player-gender"; +import { TrainerSlot } from "#enums/trainer-slot"; +import { addPokeballOpenParticles } from "#field/anims"; +import type { Pokemon } from "#field/pokemon"; +import { PartyMemberPokemonPhase } from "#phases/party-member-pokemon-phase"; +import i18next from "i18next"; export class SummonPhase extends PartyMemberPokemonPhase { // The union type is needed to keep typescript happy as these phases extend from SummonPhase diff --git a/src/phases/switch-biome-phase.ts b/src/phases/switch-biome-phase.ts index f84f1d517b4..dc2e0fa64d4 100644 --- a/src/phases/switch-biome-phase.ts +++ b/src/phases/switch-biome-phase.ts @@ -1,7 +1,7 @@ import { globalScene } from "#app/global-scene"; import type { BiomeId } from "#enums/biome-id"; -import { getBiomeKey } from "#app/field/arena"; -import { BattlePhase } from "./battle-phase"; +import { getBiomeKey } from "#field/arena"; +import { BattlePhase } from "#phases/battle-phase"; export class SwitchBiomePhase extends BattlePhase { public readonly phaseName = "SwitchBiomePhase"; diff --git a/src/phases/switch-phase.ts b/src/phases/switch-phase.ts index 8d18e29e6a6..a431d973a02 100644 --- a/src/phases/switch-phase.ts +++ b/src/phases/switch-phase.ts @@ -1,8 +1,8 @@ import { globalScene } from "#app/global-scene"; -import PartyUiHandler, { PartyOption, PartyUiMode } from "#app/ui/party-ui-handler"; -import { UiMode } from "#enums/ui-mode"; import { SwitchType } from "#enums/switch-type"; -import { BattlePhase } from "./battle-phase"; +import { UiMode } from "#enums/ui-mode"; +import { BattlePhase } from "#phases/battle-phase"; +import { PartyOption, PartyUiHandler, PartyUiMode } from "#ui/party-ui-handler"; /** * Opens the party selector UI and transitions into a {@linkcode SwitchSummonPhase} diff --git a/src/phases/switch-summon-phase.ts b/src/phases/switch-summon-phase.ts index ccd0681c068..b7460e77569 100644 --- a/src/phases/switch-summon-phase.ts +++ b/src/phases/switch-summon-phase.ts @@ -1,17 +1,17 @@ +import { applyAbAttrs } from "#abilities/apply-ab-attrs"; import { globalScene } from "#app/global-scene"; -import { applyAbAttrs } from "#app/data/abilities/apply-ab-attrs"; -import { allMoves } from "#app/data/data-lists"; -import { getPokeballTintColor } from "#app/data/pokeball"; -import { SpeciesFormChangeActiveTrigger } from "#app/data/pokemon-forms/form-change-triggers"; -import { TrainerSlot } from "#enums/trainer-slot"; -import type Pokemon from "#app/field/pokemon"; import { getPokemonNameWithAffix } from "#app/messages"; -import { SwitchEffectTransferModifier } from "#app/modifier/modifier"; +import { SubstituteTag } from "#data/battler-tags"; +import { allMoves } from "#data/data-lists"; +import { SpeciesFormChangeActiveTrigger } from "#data/form-change-triggers"; +import { getPokeballTintColor } from "#data/pokeball"; import { Command } from "#enums/command"; -import i18next from "i18next"; -import { SummonPhase } from "./summon-phase"; -import { SubstituteTag } from "#app/data/battler-tags"; import { SwitchType } from "#enums/switch-type"; +import { TrainerSlot } from "#enums/trainer-slot"; +import type { Pokemon } from "#field/pokemon"; +import { SwitchEffectTransferModifier } from "#modifiers/modifier"; +import { SummonPhase } from "#phases/summon-phase"; +import i18next from "i18next"; export class SwitchSummonPhase extends SummonPhase { public readonly phaseName: "SwitchSummonPhase" | "ReturnPhase" = "SwitchSummonPhase"; diff --git a/src/phases/tera-phase.ts b/src/phases/tera-phase.ts index a6025e20488..84b05d88abe 100644 --- a/src/phases/tera-phase.ts +++ b/src/phases/tera-phase.ts @@ -1,13 +1,13 @@ -import type Pokemon from "#app/field/pokemon"; -import { getPokemonNameWithAffix } from "#app/messages"; -import { BattlePhase } from "./battle-phase"; -import i18next from "i18next"; import { globalScene } from "#app/global-scene"; -import { PokemonType } from "#enums/pokemon-type"; -import { achvs } from "#app/system/achv"; -import { SpeciesFormChangeTeraTrigger } from "#app/data/pokemon-forms/form-change-triggers"; -import { CommonBattleAnim } from "#app/data/battle-anims"; +import { getPokemonNameWithAffix } from "#app/messages"; +import { CommonBattleAnim } from "#data/battle-anims"; +import { SpeciesFormChangeTeraTrigger } from "#data/form-change-triggers"; import { CommonAnim } from "#enums/move-anims-common"; +import { PokemonType } from "#enums/pokemon-type"; +import type { Pokemon } from "#field/pokemon"; +import { BattlePhase } from "#phases/battle-phase"; +import { achvs } from "#system/achv"; +import i18next from "i18next"; export class TeraPhase extends BattlePhase { public readonly phaseName = "TeraPhase"; diff --git a/src/phases/title-phase.ts b/src/phases/title-phase.ts index 5e36081b899..42dd761de27 100644 --- a/src/phases/title-phase.ts +++ b/src/phases/title-phase.ts @@ -1,25 +1,25 @@ import { loggedInUser } from "#app/account"; -import { BattleType } from "#enums/battle-type"; -import { fetchDailyRunSeed, getDailyRunStarters } from "#app/data/daily-run"; -import { Gender } from "#app/data/gender"; -import { getBiomeKey } from "#app/field/arena"; import { GameMode, getGameMode } from "#app/game-mode"; -import { GameModes } from "#enums/game-modes"; -import type { Modifier } from "#app/modifier/modifier"; -import { getDailyRunStarterModifiers, regenerateModifierPoolThresholds } from "#app/modifier/modifier-type"; -import { modifierTypes } from "#app/data/data-lists"; -import { ModifierPoolType } from "#enums/modifier-pool-type"; -import { Phase } from "#app/phase"; -import type { SessionSaveData } from "#app/system/game-data"; -import { Unlockables } from "#enums/unlockables"; -import { vouchers } from "#app/system/voucher"; -import type { OptionSelectConfig, OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler"; -import { SaveSlotUiMode } from "#app/ui/save-slot-select-ui-handler"; -import { UiMode } from "#enums/ui-mode"; -import { isLocal, isLocalServerConnected, isNullOrUndefined } from "#app/utils/common"; -import i18next from "i18next"; import { globalScene } from "#app/global-scene"; import Overrides from "#app/overrides"; +import { Phase } from "#app/phase"; +import { fetchDailyRunSeed, getDailyRunStarters } from "#data/daily-run"; +import { modifierTypes } from "#data/data-lists"; +import { Gender } from "#data/gender"; +import { BattleType } from "#enums/battle-type"; +import { GameModes } from "#enums/game-modes"; +import { ModifierPoolType } from "#enums/modifier-pool-type"; +import { UiMode } from "#enums/ui-mode"; +import { Unlockables } from "#enums/unlockables"; +import { getBiomeKey } from "#field/arena"; +import type { Modifier } from "#modifiers/modifier"; +import { getDailyRunStarterModifiers, regenerateModifierPoolThresholds } from "#modifiers/modifier-type"; +import type { SessionSaveData } from "#system/game-data"; +import { vouchers } from "#system/voucher"; +import type { OptionSelectConfig, OptionSelectItem } from "#ui/abstact-option-select-ui-handler"; +import { SaveSlotUiMode } from "#ui/save-slot-select-ui-handler"; +import { isLocal, isLocalServerConnected, isNullOrUndefined } from "#utils/common"; +import i18next from "i18next"; export class TitlePhase extends Phase { public readonly phaseName = "TitlePhase"; diff --git a/src/phases/toggle-double-position-phase.ts b/src/phases/toggle-double-position-phase.ts index 596bf87eb5b..2dcaac52d2f 100644 --- a/src/phases/toggle-double-position-phase.ts +++ b/src/phases/toggle-double-position-phase.ts @@ -1,6 +1,6 @@ import { globalScene } from "#app/global-scene"; import { FieldPosition } from "#enums/field-position"; -import { BattlePhase } from "./battle-phase"; +import { BattlePhase } from "#phases/battle-phase"; export class ToggleDoublePositionPhase extends BattlePhase { public readonly phaseName = "ToggleDoublePositionPhase"; diff --git a/src/phases/trainer-victory-phase.ts b/src/phases/trainer-victory-phase.ts index 554b8109f02..6f92dbe496d 100644 --- a/src/phases/trainer-victory-phase.ts +++ b/src/phases/trainer-victory-phase.ts @@ -1,15 +1,15 @@ -import { getCharVariantFromDialogue } from "#app/data/dialogue"; -import { TrainerType } from "#app/enums/trainer-type"; -import { modifierTypes } from "#app/data/data-lists"; -import { vouchers } from "#app/system/voucher"; -import i18next from "i18next"; -import { randSeedItem } from "#app/utils/common"; -import { BattlePhase } from "./battle-phase"; -import { TrainerSlot } from "#enums/trainer-slot"; -import { globalScene } from "#app/global-scene"; -import { BiomeId } from "#enums/biome-id"; -import { achvs } from "#app/system/achv"; import { timedEventManager } from "#app/global-event-manager"; +import { globalScene } from "#app/global-scene"; +import { modifierTypes } from "#data/data-lists"; +import { getCharVariantFromDialogue } from "#data/dialogue"; +import { BiomeId } from "#enums/biome-id"; +import { TrainerSlot } from "#enums/trainer-slot"; +import { TrainerType } from "#enums/trainer-type"; +import { BattlePhase } from "#phases/battle-phase"; +import { achvs } from "#system/achv"; +import { vouchers } from "#system/voucher"; +import { randSeedItem } from "#utils/common"; +import i18next from "i18next"; export class TrainerVictoryPhase extends BattlePhase { public readonly phaseName = "TrainerVictoryPhase"; diff --git a/src/phases/turn-end-phase.ts b/src/phases/turn-end-phase.ts index b5e56f6d63f..ce3b2958c23 100644 --- a/src/phases/turn-end-phase.ts +++ b/src/phases/turn-end-phase.ts @@ -1,20 +1,20 @@ -import { applyAbAttrs } from "#app/data/abilities/apply-ab-attrs"; -import { BattlerTagLapseType } from "#enums/battler-tag-lapse-type"; -import { TerrainType } from "#app/data/terrain"; -import { WeatherType } from "#app/enums/weather-type"; -import { TurnEndEvent } from "#app/events/battle-scene"; -import type Pokemon from "#app/field/pokemon"; -import { getPokemonNameWithAffix } from "#app/messages"; -import { - TurnHealModifier, - EnemyTurnHealModifier, - EnemyStatusEffectHealChanceModifier, - TurnStatusEffectModifier, - TurnHeldItemTransferModifier, -} from "#app/modifier/modifier"; -import i18next from "i18next"; -import { FieldPhase } from "./field-phase"; +import { applyAbAttrs } from "#abilities/apply-ab-attrs"; import { globalScene } from "#app/global-scene"; +import { getPokemonNameWithAffix } from "#app/messages"; +import { TerrainType } from "#data/terrain"; +import { BattlerTagLapseType } from "#enums/battler-tag-lapse-type"; +import { WeatherType } from "#enums/weather-type"; +import { TurnEndEvent } from "#events/battle-scene"; +import type { Pokemon } from "#field/pokemon"; +import { + EnemyStatusEffectHealChanceModifier, + EnemyTurnHealModifier, + TurnHealModifier, + TurnHeldItemTransferModifier, + TurnStatusEffectModifier, +} from "#modifiers/modifier"; +import { FieldPhase } from "#phases/field-phase"; +import i18next from "i18next"; export class TurnEndPhase extends FieldPhase { public readonly phaseName = "TurnEndPhase"; diff --git a/src/phases/turn-init-phase.ts b/src/phases/turn-init-phase.ts index 8d0508c5ebb..b2ab096102c 100644 --- a/src/phases/turn-init-phase.ts +++ b/src/phases/turn-init-phase.ts @@ -1,13 +1,13 @@ +import { globalScene } from "#app/global-scene"; import { BattlerIndex } from "#enums/battler-index"; +import { TurnInitEvent } from "#events/battle-scene"; +import type { PlayerPokemon } from "#field/pokemon"; import { handleMysteryEncounterBattleStartEffects, handleMysteryEncounterTurnStartEffects, -} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { TurnInitEvent } from "#app/events/battle-scene"; -import type { PlayerPokemon } from "#app/field/pokemon"; +} from "#mystery-encounters/encounter-phase-utils"; +import { FieldPhase } from "#phases/field-phase"; import i18next from "i18next"; -import { FieldPhase } from "./field-phase"; -import { globalScene } from "#app/global-scene"; export class TurnInitPhase extends FieldPhase { public readonly phaseName = "TurnInitPhase"; diff --git a/src/phases/turn-start-phase.ts b/src/phases/turn-start-phase.ts index bfae2f06de4..0fc126801ec 100644 --- a/src/phases/turn-start-phase.ts +++ b/src/phases/turn-start-phase.ts @@ -1,16 +1,16 @@ -import { applyAbAttrs } from "#app/data/abilities/apply-ab-attrs"; -import { allMoves } from "#app/data/data-lists"; -import { Stat } from "#app/enums/stat"; -import type Pokemon from "#app/field/pokemon"; -import { PokemonMove } from "#app/data/moves/pokemon-move"; -import { BypassSpeedChanceModifier } from "#app/modifier/modifier"; -import { Command } from "#enums/command"; -import { randSeedShuffle, BooleanHolder } from "#app/utils/common"; -import { FieldPhase } from "./field-phase"; -import { BattlerIndex } from "#enums/battler-index"; -import { TrickRoomTag } from "#app/data/arena-tag"; -import { SwitchType } from "#enums/switch-type"; +import { applyAbAttrs } from "#abilities/apply-ab-attrs"; import { globalScene } from "#app/global-scene"; +import { TrickRoomTag } from "#data/arena-tag"; +import { allMoves } from "#data/data-lists"; +import { BattlerIndex } from "#enums/battler-index"; +import { Command } from "#enums/command"; +import { Stat } from "#enums/stat"; +import { SwitchType } from "#enums/switch-type"; +import type { Pokemon } from "#field/pokemon"; +import { BypassSpeedChanceModifier } from "#modifiers/modifier"; +import { PokemonMove } from "#moves/pokemon-move"; +import { FieldPhase } from "#phases/field-phase"; +import { BooleanHolder, randSeedShuffle } from "#utils/common"; export class TurnStartPhase extends FieldPhase { public readonly phaseName = "TurnStartPhase"; diff --git a/src/phases/unlock-phase.ts b/src/phases/unlock-phase.ts index 76719847f92..ec3be88d4a5 100644 --- a/src/phases/unlock-phase.ts +++ b/src/phases/unlock-phase.ts @@ -1,8 +1,8 @@ import { globalScene } from "#app/global-scene"; import { Phase } from "#app/phase"; -import type { Unlockables } from "#enums/unlockables"; -import { getUnlockableName } from "#app/system/unlockables"; import { UiMode } from "#enums/ui-mode"; +import type { Unlockables } from "#enums/unlockables"; +import { getUnlockableName } from "#system/unlockables"; import i18next from "i18next"; export class UnlockPhase extends Phase { diff --git a/src/phases/victory-phase.ts b/src/phases/victory-phase.ts index ae5b727c2a6..4b1a79d7443 100644 --- a/src/phases/victory-phase.ts +++ b/src/phases/victory-phase.ts @@ -1,12 +1,12 @@ +import { timedEventManager } from "#app/global-event-manager"; +import { globalScene } from "#app/global-scene"; +import { modifierTypes } from "#data/data-lists"; +import { BattleType } from "#enums/battle-type"; import type { BattlerIndex } from "#enums/battler-index"; import { ClassicFixedBossWaves } from "#enums/fixed-boss-waves"; -import { BattleType } from "#enums/battle-type"; -import type { CustomModifierSettings } from "#app/modifier/modifier-type"; -import { modifierTypes } from "#app/data/data-lists"; -import { PokemonPhase } from "./pokemon-phase"; -import { handleMysteryEncounterVictory } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { globalScene } from "#app/global-scene"; -import { timedEventManager } from "#app/global-event-manager"; +import type { CustomModifierSettings } from "#modifiers/modifier-type"; +import { handleMysteryEncounterVictory } from "#mystery-encounters/encounter-phase-utils"; +import { PokemonPhase } from "#phases/pokemon-phase"; export class VictoryPhase extends PokemonPhase { public readonly phaseName = "VictoryPhase"; diff --git a/src/phases/weather-effect-phase.ts b/src/phases/weather-effect-phase.ts index 5476ac67672..81db543001b 100644 --- a/src/phases/weather-effect-phase.ts +++ b/src/phases/weather-effect-phase.ts @@ -1,14 +1,14 @@ +import { applyAbAttrs } from "#abilities/apply-ab-attrs"; import { globalScene } from "#app/global-scene"; -import { applyAbAttrs } from "#app/data/abilities/apply-ab-attrs"; -import { CommonAnim } from "#enums/move-anims-common"; -import type { Weather } from "#app/data/weather"; -import { getWeatherDamageMessage, getWeatherLapseMessage } from "#app/data/weather"; -import { BattlerTagType } from "#app/enums/battler-tag-type"; -import { WeatherType } from "#app/enums/weather-type"; -import type Pokemon from "#app/field/pokemon"; +import type { Weather } from "#data/weather"; +import { getWeatherDamageMessage, getWeatherLapseMessage } from "#data/weather"; +import { BattlerTagType } from "#enums/battler-tag-type"; import { HitResult } from "#enums/hit-result"; -import { BooleanHolder, toDmgValue } from "#app/utils/common"; -import { CommonAnimPhase } from "./common-anim-phase"; +import { CommonAnim } from "#enums/move-anims-common"; +import { WeatherType } from "#enums/weather-type"; +import type { Pokemon } from "#field/pokemon"; +import { CommonAnimPhase } from "#phases/common-anim-phase"; +import { BooleanHolder, toDmgValue } from "#utils/common"; export class WeatherEffectPhase extends CommonAnimPhase { public readonly phaseName = "WeatherEffectPhase"; diff --git a/src/pipelines/field-sprite.ts b/src/pipelines/field-sprite.ts index a6e248c9998..647483d1524 100644 --- a/src/pipelines/field-sprite.ts +++ b/src/pipelines/field-sprite.ts @@ -1,10 +1,11 @@ import { globalScene } from "#app/global-scene"; -import { TerrainType, getTerrainColor } from "../data/terrain"; -import { getCurrentTime } from "#app/utils/common"; +import { getTerrainColor, TerrainType } from "#data/terrain"; +import { getCurrentTime } from "#utils/common"; +import Phaser from "phaser"; import fieldSpriteFragShader from "./glsl/fieldSpriteFragShader.frag?raw"; import spriteVertShader from "./glsl/spriteShader.vert?raw"; -export default class FieldSpritePipeline extends Phaser.Renderer.WebGL.Pipelines.MultiPipeline { +export class FieldSpritePipeline extends Phaser.Renderer.WebGL.Pipelines.MultiPipeline { constructor(game: Phaser.Game, config?: Phaser.Types.Renderer.WebGL.WebGLPipelineConfig) { super( config || { diff --git a/src/pipelines/invert.ts b/src/pipelines/invert.ts index 0ebc3ad865f..2414f2cf6b3 100644 --- a/src/pipelines/invert.ts +++ b/src/pipelines/invert.ts @@ -1,7 +1,8 @@ import type { Game } from "phaser"; +import Phaser from "phaser"; import fragShader from "./glsl/invert.frag?raw"; -export default class InvertPostFX extends Phaser.Renderer.WebGL.Pipelines.PostFXPipeline { +export class InvertPostFX extends Phaser.Renderer.WebGL.Pipelines.PostFXPipeline { constructor(game: Game) { super({ game, diff --git a/src/pipelines/sprite.ts b/src/pipelines/sprite.ts index 307c2cee4cc..596a761b05f 100644 --- a/src/pipelines/sprite.ts +++ b/src/pipelines/sprite.ts @@ -1,14 +1,14 @@ -import { variantColorCache } from "#app/sprites/variant"; -import MysteryEncounterIntroVisuals from "#app/field/mystery-encounter-intro"; -import Pokemon from "#app/field/pokemon"; -import Trainer from "#app/field/trainer"; import { globalScene } from "#app/global-scene"; -import { rgbHexToRgba } from "#app/utils/common"; -import FieldSpritePipeline from "./field-sprite"; +import { FieldSpritePipeline } from "#app/pipelines/field-sprite"; +import { MysteryEncounterIntroVisuals } from "#field/mystery-encounter-intro"; +import { Pokemon } from "#field/pokemon"; +import { Trainer } from "#field/trainer"; +import { variantColorCache } from "#sprites/variant"; +import { rgbHexToRgba } from "#utils/common"; import spriteFragShader from "./glsl/spriteFragShader.frag?raw"; import spriteVertShader from "./glsl/spriteShader.vert?raw"; -export default class SpritePipeline extends FieldSpritePipeline { +export class SpritePipeline extends FieldSpritePipeline { private _tone: number[]; constructor(game: Phaser.Game) { diff --git a/src/plugins/api/api-base.ts b/src/plugins/api/api-base.ts index c7ff4619187..63f56c129f3 100644 --- a/src/plugins/api/api-base.ts +++ b/src/plugins/api/api-base.ts @@ -1,5 +1,5 @@ import { SESSION_ID_COOKIE_NAME } from "#app/constants"; -import { getCookie } from "#app/utils/cookies"; +import { getCookie } from "#utils/cookies"; type DataType = "json" | "form-urlencoded"; diff --git a/src/plugins/api/pokerogue-account-api.ts b/src/plugins/api/pokerogue-account-api.ts index 9cd82c24430..56bdc92b9b9 100644 --- a/src/plugins/api/pokerogue-account-api.ts +++ b/src/plugins/api/pokerogue-account-api.ts @@ -1,12 +1,12 @@ +import { ApiBase } from "#api/api-base"; +import { SESSION_ID_COOKIE_NAME } from "#app/constants"; import type { AccountInfoResponse, AccountLoginRequest, AccountLoginResponse, AccountRegisterRequest, -} from "#app/@types/PokerogueAccountApi"; -import { SESSION_ID_COOKIE_NAME } from "#app/constants"; -import { ApiBase } from "#app/plugins/api/api-base"; -import { removeCookie, setCookie } from "#app/utils/cookies"; +} from "#types/PokerogueAccountApi"; +import { removeCookie, setCookie } from "#utils/cookies"; /** * A wrapper for PokéRogue account API requests. diff --git a/src/plugins/api/pokerogue-admin-api.ts b/src/plugins/api/pokerogue-admin-api.ts index 5923f286430..4e549c7ff53 100644 --- a/src/plugins/api/pokerogue-admin-api.ts +++ b/src/plugins/api/pokerogue-admin-api.ts @@ -1,3 +1,4 @@ +import { ApiBase } from "#api/api-base"; import type { LinkAccountToDiscordIdRequest, LinkAccountToGoogledIdRequest, @@ -5,8 +6,7 @@ import type { SearchAccountResponse, UnlinkAccountFromDiscordIdRequest, UnlinkAccountFromGoogledIdRequest, -} from "#app/@types/PokerogueAdminApi"; -import { ApiBase } from "#app/plugins/api/api-base"; +} from "#types/PokerogueAdminApi"; export class PokerogueAdminApi extends ApiBase { public readonly ERR_USERNAME_NOT_FOUND: string = "Username not found!"; diff --git a/src/plugins/api/pokerogue-api.ts b/src/plugins/api/pokerogue-api.ts index c6dfae019a5..99600a359a2 100644 --- a/src/plugins/api/pokerogue-api.ts +++ b/src/plugins/api/pokerogue-api.ts @@ -1,9 +1,9 @@ -import type { TitleStatsResponse } from "#app/@types/PokerogueApi"; -import { ApiBase } from "#app/plugins/api/api-base"; -import { PokerogueAccountApi } from "#app/plugins/api/pokerogue-account-api"; -import { PokerogueAdminApi } from "#app/plugins/api/pokerogue-admin-api"; -import { PokerogueDailyApi } from "#app/plugins/api/pokerogue-daily-api"; -import { PokerogueSavedataApi } from "#app/plugins/api/pokerogue-savedata-api"; +import { ApiBase } from "#api/api-base"; +import { PokerogueAccountApi } from "#api/pokerogue-account-api"; +import { PokerogueAdminApi } from "#api/pokerogue-admin-api"; +import { PokerogueDailyApi } from "#api/pokerogue-daily-api"; +import { PokerogueSavedataApi } from "#api/pokerogue-savedata-api"; +import type { TitleStatsResponse } from "#types/PokerogueApi"; /** * A wrapper for PokéRogue API requests. diff --git a/src/plugins/api/pokerogue-daily-api.ts b/src/plugins/api/pokerogue-daily-api.ts index c9319ae7fdc..2913c7bd4f2 100644 --- a/src/plugins/api/pokerogue-daily-api.ts +++ b/src/plugins/api/pokerogue-daily-api.ts @@ -1,6 +1,6 @@ -import type { GetDailyRankingsPageCountRequest, GetDailyRankingsRequest } from "#app/@types/PokerogueDailyApi"; -import { ApiBase } from "#app/plugins/api/api-base"; -import type { RankingEntry } from "#app/ui/daily-run-scoreboard"; +import { ApiBase } from "#api/api-base"; +import type { GetDailyRankingsPageCountRequest, GetDailyRankingsRequest } from "#types/PokerogueDailyApi"; +import type { RankingEntry } from "#ui/daily-run-scoreboard"; /** * A wrapper for daily-run PokéRogue API requests. diff --git a/src/plugins/api/pokerogue-savedata-api.ts b/src/plugins/api/pokerogue-savedata-api.ts index b8531e82d4f..bc77de8060b 100644 --- a/src/plugins/api/pokerogue-savedata-api.ts +++ b/src/plugins/api/pokerogue-savedata-api.ts @@ -1,8 +1,8 @@ -import type { UpdateAllSavedataRequest } from "#app/@types/PokerogueSavedataApi"; +import { ApiBase } from "#api/api-base"; +import { PokerogueSessionSavedataApi } from "#api/pokerogue-session-savedata-api"; +import { PokerogueSystemSavedataApi } from "#api/pokerogue-system-savedata-api"; import { MAX_INT_ATTR_VALUE } from "#app/constants"; -import { ApiBase } from "#app/plugins/api/api-base"; -import { PokerogueSessionSavedataApi } from "#app/plugins/api/pokerogue-session-savedata-api"; -import { PokerogueSystemSavedataApi } from "#app/plugins/api/pokerogue-system-savedata-api"; +import type { UpdateAllSavedataRequest } from "#types/PokerogueSavedataApi"; /** * A wrapper for PokéRogue savedata API requests. diff --git a/src/plugins/api/pokerogue-session-savedata-api.ts b/src/plugins/api/pokerogue-session-savedata-api.ts index aac8b9b93ad..a807d4b712c 100644 --- a/src/plugins/api/pokerogue-session-savedata-api.ts +++ b/src/plugins/api/pokerogue-session-savedata-api.ts @@ -1,3 +1,5 @@ +import { ApiBase } from "#api/api-base"; +import type { SessionSaveData } from "#system/game-data"; import type { ClearSessionSavedataRequest, ClearSessionSavedataResponse, @@ -5,9 +7,7 @@ import type { GetSessionSavedataRequest, NewClearSessionSavedataRequest, UpdateSessionSavedataRequest, -} from "#app/@types/PokerogueSessionSavedataApi"; -import { ApiBase } from "#app/plugins/api/api-base"; -import type { SessionSaveData } from "#app/system/game-data"; +} from "#types/PokerogueSessionSavedataApi"; /** * A wrapper for PokéRogue session savedata API requests. diff --git a/src/plugins/api/pokerogue-system-savedata-api.ts b/src/plugins/api/pokerogue-system-savedata-api.ts index d6fbb39ae0a..f87aba81ee9 100644 --- a/src/plugins/api/pokerogue-system-savedata-api.ts +++ b/src/plugins/api/pokerogue-system-savedata-api.ts @@ -1,10 +1,10 @@ +import { ApiBase } from "#api/api-base"; import type { GetSystemSavedataRequest, UpdateSystemSavedataRequest, VerifySystemSavedataRequest, VerifySystemSavedataResponse, -} from "#app/@types/PokerogueSystemSavedataApi"; -import { ApiBase } from "#app/plugins/api/api-base"; +} from "#types/PokerogueSystemSavedataApi"; /** * A wrapper for PokéRogue system savedata API requests. diff --git a/src/plugins/cache-busted-loader-plugin.ts b/src/plugins/cache-busted-loader-plugin.ts index 4ae9b352ae3..4853265ec65 100644 --- a/src/plugins/cache-busted-loader-plugin.ts +++ b/src/plugins/cache-busted-loader-plugin.ts @@ -1,8 +1,8 @@ -import { coerceArray } from "#app/utils/common"; +import { coerceArray } from "#utils/common"; let manifest: object; -export default class CacheBustedLoaderPlugin extends Phaser.Loader.LoaderPlugin { +export class CacheBustedLoaderPlugin extends Phaser.Loader.LoaderPlugin { get manifest() { return manifest; } diff --git a/src/plugins/i18n.ts b/src/plugins/i18n.ts index 7d3b30ed5b0..ea33e2029ca 100644 --- a/src/plugins/i18n.ts +++ b/src/plugins/i18n.ts @@ -1,9 +1,9 @@ -import { camelCaseToKebabCase } from "#app/utils/common"; +import pkg from "#package.json"; +import { camelCaseToKebabCase } from "#utils/common"; import i18next from "i18next"; import LanguageDetector from "i18next-browser-languagedetector"; import HttpBackend from "i18next-http-backend"; import processor, { KoreanPostpositionProcessor } from "i18next-korean-postposition-processor"; -import pkg from "../../package.json"; //#region Interfaces/Types diff --git a/src/plugins/vite/vite-minify-json-plugin.ts b/src/plugins/vite/vite-minify-json-plugin.ts index 38f299eea50..50f5f87fe7c 100644 --- a/src/plugins/vite/vite-minify-json-plugin.ts +++ b/src/plugins/vite/vite-minify-json-plugin.ts @@ -1,5 +1,5 @@ -import path from "path"; import fs from "fs"; +import path from "path"; import type { Plugin as VitePlugin } from "vite"; /** diff --git a/src/scene-base.ts b/src/scene-base.ts index ccea373fca0..3f2e4409794 100644 --- a/src/scene-base.ts +++ b/src/scene-base.ts @@ -1,4 +1,4 @@ -import { coerceArray } from "#app/utils/common"; +import { coerceArray } from "#utils/common"; export const legacyCompatibleImages: string[] = []; diff --git a/src/sprites/pokemon-asset-loader.ts b/src/sprites/pokemon-asset-loader.ts index 980d242a880..9deb68b7443 100644 --- a/src/sprites/pokemon-asset-loader.ts +++ b/src/sprites/pokemon-asset-loader.ts @@ -1,5 +1,5 @@ +import { initMoveAnim, loadMoveAnimAssets } from "#data/battle-anims"; import type { MoveId } from "#enums/move-id"; -import { initMoveAnim, loadMoveAnimAssets } from "#app/data/battle-anims"; /** * Asynchronously load the animations and assets for the provided moves. diff --git a/src/sprites/pokemon-sprite.ts b/src/sprites/pokemon-sprite.ts index cdf9e3acfa6..5a8d7d53f0c 100644 --- a/src/sprites/pokemon-sprite.ts +++ b/src/sprites/pokemon-sprite.ts @@ -1,10 +1,10 @@ +import type { BattleScene } from "#app/battle-scene"; import { globalScene } from "#app/global-scene"; -import { variantColorCache, variantData } from "#app/sprites/variant"; -import { Gender } from "#app/data/gender"; -import { hasExpSprite } from "./sprite-utils"; -import type { Variant, VariantSet } from "#app/sprites/variant"; -import type Pokemon from "#app/field/pokemon"; -import type BattleScene from "#app/battle-scene"; +import { Gender } from "#data/gender"; +import type { Pokemon } from "#field/pokemon"; +import { hasExpSprite } from "#sprites/sprite-utils"; +import type { Variant, VariantSet } from "#sprites/variant"; +import { variantColorCache, variantData } from "#sprites/variant"; // Regex patterns diff --git a/src/sprites/sprite-utils.ts b/src/sprites/sprite-utils.ts index 563bb1235b5..e5c00d4c914 100644 --- a/src/sprites/sprite-utils.ts +++ b/src/sprites/sprite-utils.ts @@ -1,4 +1,4 @@ -import { expSpriteKeys } from "#app/sprites/sprite-keys"; +import { expSpriteKeys } from "#sprites/sprite-keys"; const expKeyRegex = /^pkmn__?(back__)?(shiny__)?(female__)?(\d+)(-.*?)?(?:_[1-3])?$/; diff --git a/src/sprites/variant.ts b/src/sprites/variant.ts index 985068015c6..28d7ed13839 100644 --- a/src/sprites/variant.ts +++ b/src/sprites/variant.ts @@ -1,8 +1,8 @@ -import { VariantTier } from "#app/enums/variant-tier"; -import { hasExpSprite } from "#app/sprites/sprite-utils"; import { globalScene } from "#app/global-scene"; -import type Pokemon from "#app/field/pokemon"; -import { isNullOrUndefined } from "#app/utils/common"; +import { VariantTier } from "#enums/variant-tier"; +import type { Pokemon } from "#field/pokemon"; +import { hasExpSprite } from "#sprites/sprite-utils"; +import { isNullOrUndefined } from "#utils/common"; export type Variant = 0 | 1 | 2; diff --git a/src/starting-wave.ts b/src/starting-wave.ts index 3d36dabe652..7dbcffebbfe 100644 --- a/src/starting-wave.ts +++ b/src/starting-wave.ts @@ -1,3 +1,3 @@ -import Overrides from "./overrides"; +import Overrides from "#app/overrides"; export const startingWave = Overrides.STARTING_WAVE_OVERRIDE || 1; diff --git a/src/system/achv.ts b/src/system/achv.ts index 90816ff65c3..abe6f264d20 100644 --- a/src/system/achv.ts +++ b/src/system/achv.ts @@ -1,21 +1,21 @@ -import type { Modifier } from "typescript"; -import { TurnHeldItemTransferModifier } from "../modifier/modifier"; -import { pokemonEvolutions } from "#app/data/balance/pokemon-evolutions"; -import i18next from "i18next"; -import { NumberHolder } from "#app/utils/common"; -import { PlayerGender } from "#enums/player-gender"; -import type { Challenge } from "#app/data/challenge"; +import { globalScene } from "#app/global-scene"; +import { pokemonEvolutions } from "#balance/pokemon-evolutions"; +import type { Challenge } from "#data/challenge"; import { FlipStatChallenge, FreshStartChallenge, + InverseBattleChallenge, SingleGenerationChallenge, SingleTypeChallenge, - InverseBattleChallenge, -} from "#app/data/challenge"; -import type { ConditionFn } from "#app/@types/common"; -import { Stat, getShortenedStatKey } from "#app/enums/stat"; -import { Challenges } from "#app/enums/challenges"; -import { globalScene } from "#app/global-scene"; +} from "#data/challenge"; +import { Challenges } from "#enums/challenges"; +import { PlayerGender } from "#enums/player-gender"; +import { getShortenedStatKey, Stat } from "#enums/stat"; +import { TurnHeldItemTransferModifier } from "#modifiers/modifier"; +import type { ConditionFn } from "#types/common"; +import { NumberHolder } from "#utils/common"; +import i18next from "i18next"; +import type { Modifier } from "typescript"; export enum AchvTier { COMMON, diff --git a/src/system/arena-data.ts b/src/system/arena-data.ts index 29423d10207..9d15ab50fcc 100644 --- a/src/system/arena-data.ts +++ b/src/system/arena-data.ts @@ -1,11 +1,11 @@ -import { Arena } from "../field/arena"; -import type { ArenaTag } from "../data/arena-tag"; -import { loadArenaTag } from "../data/arena-tag"; +import type { ArenaTag } from "#data/arena-tag"; +import { loadArenaTag } from "#data/arena-tag"; +import { Terrain } from "#data/terrain"; +import { Weather } from "#data/weather"; import type { BiomeId } from "#enums/biome-id"; -import { Weather } from "../data/weather"; -import { Terrain } from "#app/data/terrain"; +import { Arena } from "#field/arena"; -export default class ArenaData { +export class ArenaData { public biome: BiomeId; public weather: Weather | null; public terrain: Terrain | null; diff --git a/src/system/challenge-data.ts b/src/system/challenge-data.ts index 87299ae653a..1d4ab23f523 100644 --- a/src/system/challenge-data.ts +++ b/src/system/challenge-data.ts @@ -1,7 +1,7 @@ -import type { Challenge } from "#app/data/challenge"; -import { copyChallenge } from "#app/data/challenge"; +import type { Challenge } from "#data/challenge"; +import { copyChallenge } from "#data/challenge"; -export default class ChallengeData { +export class ChallengeData { public id: number; public value: number; public severity: number; diff --git a/src/system/egg-data.ts b/src/system/egg-data.ts index 63f9e17d7be..4910d01d5a8 100644 --- a/src/system/egg-data.ts +++ b/src/system/egg-data.ts @@ -1,10 +1,10 @@ +import { EGG_SEED, Egg } from "#data/egg"; +import type { EggSourceType } from "#enums/egg-source-types"; import type { EggTier } from "#enums/egg-type"; import type { SpeciesId } from "#enums/species-id"; import type { VariantTier } from "#enums/variant-tier"; -import { EGG_SEED, Egg } from "../data/egg"; -import type { EggSourceType } from "#app/enums/egg-source-types"; -export default class EggData { +export class EggData { public id: number; public tier: EggTier; public sourceType: EggSourceType; diff --git a/src/system/game-data.ts b/src/system/game-data.ts index d5d4256f7d0..32733a6ec50 100644 --- a/src/system/game-data.ts +++ b/src/system/game-data.ts @@ -1,74 +1,72 @@ -import i18next from "i18next"; -import type { PokeballCounts } from "#app/battle-scene"; -import { bypassLogin } from "#app/global-vars/bypass-login"; -import { globalScene } from "#app/global-scene"; -import type { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon"; -import type Pokemon from "#app/field/pokemon"; -import { pokemonPrevolutions } from "#app/data/balance/pokemon-evolutions"; -import type PokemonSpecies from "#app/data/pokemon-species"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; -import { allSpecies } from "#app/data/data-lists"; -import { speciesStarterCosts } from "#app/data/balance/starters"; -import { randInt, getEnumKeys, isLocal, executeIf, fixedInt, randSeedItem, NumberHolder } from "#app/utils/common"; -import Overrides from "#app/overrides"; -import PokemonData from "#app/system/pokemon-data"; -import PersistentModifierData from "#app/system/modifier-data"; -import ArenaData from "#app/system/arena-data"; -import { Unlockables } from "#enums/unlockables"; -import { getGameMode } from "#app/game-mode"; -import { GameModes } from "#enums/game-modes"; -import { BattleType } from "#enums/battle-type"; -import TrainerData from "#app/system/trainer-data"; -import { trainerConfigs } from "#app/data/trainers/trainer-config"; -import { resetSettings, setSetting, SettingKeys } from "#app/system/settings/settings"; -import { achvs } from "#app/system/achv"; -import EggData from "#app/system/egg-data"; -import type { Egg } from "#app/data/egg"; -import { vouchers, VoucherType } from "#app/system/voucher"; -import { AES, enc } from "crypto-js"; -import { UiMode } from "#enums/ui-mode"; +import { pokerogueApi } from "#api/pokerogue-api"; import { clientSessionId, loggedInUser, updateUserInfo } from "#app/account"; -import { Nature } from "#enums/nature"; -import { GameStats } from "#app/system/game-stats"; +import type { PokeballCounts } from "#app/battle-scene"; +import { defaultStarterSpecies, saveKey } from "#app/constants"; +import { getGameMode } from "#app/game-mode"; +import { globalScene } from "#app/global-scene"; +import { bypassLogin } from "#app/global-vars/bypass-login"; +import Overrides from "#app/overrides"; import { Tutorial } from "#app/tutorial"; -import { speciesEggMoves } from "#app/data/balance/egg-moves"; -import { allMoves } from "#app/data/data-lists"; -import { TrainerVariant } from "#enums/trainer-variant"; -import type { Variant } from "#app/sprites/variant"; -import { setSettingGamepad, SettingGamepad, settingGamepadDefaults } from "#app/system/settings/settings-gamepad"; -import type { SettingKeyboard } from "#app/system/settings/settings-keyboard"; -import { setSettingKeyboard } from "#app/system/settings/settings-keyboard"; -import { TagAddedEvent, TerrainChangedEvent, WeatherChangedEvent } from "#app/events/arena"; -// biome-ignore lint/performance/noNamespaceImport: Something weird is going on here and I don't want to touch it -import * as Modifier from "#app/modifier/modifier"; -import { StatusEffect } from "#enums/status-effect"; -import ChallengeData from "#app/system/challenge-data"; -import { Device } from "#enums/devices"; -import { GameDataType } from "#enums/game-data-type"; -import type { MoveId } from "#enums/move-id"; -import { PlayerGender } from "#enums/player-gender"; -import { SpeciesId } from "#enums/species-id"; -import { applyChallenges } from "#app/data/challenge"; +import { speciesEggMoves } from "#balance/egg-moves"; +import { pokemonPrevolutions } from "#balance/pokemon-evolutions"; +import { speciesStarterCosts } from "#balance/starters"; +import { ArenaTrapTag } from "#data/arena-tag"; +import { applyChallenges } from "#data/challenge"; +import { allMoves, allSpecies } from "#data/data-lists"; +import type { Egg } from "#data/egg"; +import { pokemonFormChanges } from "#data/pokemon-forms"; +import type { PokemonSpecies } from "#data/pokemon-species"; +import { TerrainType } from "#data/terrain"; +import { AbilityAttr } from "#enums/ability-attr"; +import { BattleType } from "#enums/battle-type"; import { ChallengeType } from "#enums/challenge-type"; +import { Device } from "#enums/devices"; +import { DexAttr } from "#enums/dex-attr"; +import { GameDataType } from "#enums/game-data-type"; +import { GameModes } from "#enums/game-modes"; +import type { MoveId } from "#enums/move-id"; +import type { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { Nature } from "#enums/nature"; +import { PlayerGender } from "#enums/player-gender"; +import type { PokemonType } from "#enums/pokemon-type"; +import { SpeciesId } from "#enums/species-id"; +import { StatusEffect } from "#enums/status-effect"; +import { TrainerVariant } from "#enums/trainer-variant"; +import { UiMode } from "#enums/ui-mode"; +import { Unlockables } from "#enums/unlockables"; import { WeatherType } from "#enums/weather-type"; -import { TerrainType } from "#app/data/terrain"; -import { RUN_HISTORY_LIMIT } from "#app/ui/run-history-ui-handler"; +import { TagAddedEvent, TerrainChangedEvent, WeatherChangedEvent } from "#events/arena"; +import type { EnemyPokemon, PlayerPokemon, Pokemon } from "#field/pokemon"; +// biome-ignore lint/performance/noNamespaceImport: Something weird is going on here and I don't want to touch it +import * as Modifier from "#modifiers/modifier"; +import { MysteryEncounterSaveData } from "#mystery-encounters/mystery-encounter-save-data"; +import type { Variant } from "#sprites/variant"; +import { achvs } from "#system/achv"; +import { ArenaData } from "#system/arena-data"; +import { ChallengeData } from "#system/challenge-data"; +import { EggData } from "#system/egg-data"; +import { GameStats } from "#system/game-stats"; +import { ModifierData as PersistentModifierData } from "#system/modifier-data"; +import { PokemonData } from "#system/pokemon-data"; +import { resetSettings, SettingKeys, setSetting } from "#system/settings"; +import { SettingGamepad, setSettingGamepad, settingGamepadDefaults } from "#system/settings-gamepad"; +import type { SettingKeyboard } from "#system/settings-keyboard"; +import { setSettingKeyboard } from "#system/settings-keyboard"; +import { TrainerData } from "#system/trainer-data"; import { applySessionVersionMigration, - applySystemVersionMigration, applySettingsVersionMigration, -} from "./version_migration/version_converter"; -import { MysteryEncounterSaveData } from "#app/data/mystery-encounters/mystery-encounter-save-data"; -import type { MysteryEncounterType } from "#enums/mystery-encounter-type"; -import { pokerogueApi } from "#app/plugins/api/pokerogue-api"; -import { ArenaTrapTag } from "#app/data/arena-tag"; -import { pokemonFormChanges } from "#app/data/pokemon-forms"; -import type { PokemonType } from "#enums/pokemon-type"; -import type { DexData, DexEntry } from "../@types/dex-data"; -import { DexAttr } from "#enums/dex-attr"; -import { AbilityAttr } from "#enums/ability-attr"; -import { defaultStarterSpecies, saveKey } from "#app/constants"; -import { encrypt, decrypt } from "#app/utils/data"; + applySystemVersionMigration, +} from "#system/version_converter"; +import { VoucherType, vouchers } from "#system/voucher"; +import { trainerConfigs } from "#trainers/trainer-config"; +import type { DexData, DexEntry } from "#types/dex-data"; +import { RUN_HISTORY_LIMIT } from "#ui/run-history-ui-handler"; +import { executeIf, fixedInt, getEnumKeys, isLocal, NumberHolder, randInt, randSeedItem } from "#utils/common"; +import { decrypt, encrypt } from "#utils/data"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; +import { AES, enc } from "crypto-js"; +import i18next from "i18next"; function getDataTypeKey(dataType: GameDataType, slotId = 0): string { switch (dataType) { diff --git a/src/system/game-speed.ts b/src/system/game-speed.ts index 207a4fb44a1..283e6461e55 100644 --- a/src/system/game-speed.ts +++ b/src/system/game-speed.ts @@ -1,9 +1,9 @@ -import SoundFade from "phaser3-rex-plugins/plugins/soundfade"; +import type { BattleScene } from "#app/battle-scene"; +import { globalScene } from "#app/global-scene"; +import { FixedInt } from "#utils/common"; import type FadeIn from "phaser3-rex-plugins/plugins/audio/fade/FadeIn"; import type FadeOut from "phaser3-rex-plugins/plugins/audio/fade/FadeOut"; -import type BattleScene from "#app/battle-scene"; -import { globalScene } from "#app/global-scene"; -import { FixedInt } from "#app/utils/common"; +import SoundFade from "phaser3-rex-plugins/plugins/soundfade"; type TweenManager = typeof Phaser.Tweens.TweenManager.prototype; diff --git a/src/system/modifier-data.ts b/src/system/modifier-data.ts index cbda45572ac..135d1907e08 100644 --- a/src/system/modifier-data.ts +++ b/src/system/modifier-data.ts @@ -1,9 +1,9 @@ import { globalScene } from "#app/global-scene"; -import { PersistentModifier } from "#app/modifier/modifier"; -import type { GeneratedPersistentModifierType, ModifierType } from "#app/modifier/modifier-type"; -import { ModifierTypeGenerator, getModifierTypeFuncById } from "#app/modifier/modifier-type"; +import { PersistentModifier } from "#modifiers/modifier"; +import type { GeneratedPersistentModifierType, ModifierType } from "#modifiers/modifier-type"; +import { getModifierTypeFuncById, ModifierTypeGenerator } from "#modifiers/modifier-type"; -export default class ModifierData { +export class ModifierData { public player: boolean; public typeId: string; public typePregenArgs: any[]; diff --git a/src/system/pokemon-data.ts b/src/system/pokemon-data.ts index 85f7b12a2a5..91ceac17ce2 100644 --- a/src/system/pokemon-data.ts +++ b/src/system/pokemon-data.ts @@ -1,22 +1,22 @@ -import { BattleType } from "#enums/battle-type"; import { globalScene } from "#app/global-scene"; -import type { Gender } from "../data/gender"; -import { Nature } from "#enums/nature"; -import { PokeballType } from "#enums/pokeball"; -import { getPokemonSpeciesForm } from "#app/data/pokemon-species"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; -import { Status } from "../data/status-effect"; -import Pokemon, { EnemyPokemon } from "../field/pokemon"; -import { PokemonMove } from "#app/data/moves/pokemon-move"; -import { TrainerSlot } from "#enums/trainer-slot"; -import type { Variant } from "#app/sprites/variant"; +import type { Gender } from "#data/gender"; +import { CustomPokemonData, PokemonBattleData, PokemonSummonData } from "#data/pokemon-data"; +import { getPokemonSpeciesForm } from "#data/pokemon-species"; +import { Status } from "#data/status-effect"; +import { BattleType } from "#enums/battle-type"; import type { BiomeId } from "#enums/biome-id"; import type { MoveId } from "#enums/move-id"; -import type { SpeciesId } from "#enums/species-id"; -import { CustomPokemonData, PokemonBattleData, PokemonSummonData } from "#app/data/pokemon/pokemon-data"; +import { Nature } from "#enums/nature"; +import { PokeballType } from "#enums/pokeball"; import type { PokemonType } from "#enums/pokemon-type"; +import type { SpeciesId } from "#enums/species-id"; +import { TrainerSlot } from "#enums/trainer-slot"; +import { EnemyPokemon, Pokemon } from "#field/pokemon"; +import { PokemonMove } from "#moves/pokemon-move"; +import type { Variant } from "#sprites/variant"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; -export default class PokemonData { +export class PokemonData { public id: number; public player: boolean; public species: SpeciesId; diff --git a/src/system/settings/settings-gamepad.ts b/src/system/settings/settings-gamepad.ts index 8a28e9fbf14..2e25eda7300 100644 --- a/src/system/settings/settings-gamepad.ts +++ b/src/system/settings/settings-gamepad.ts @@ -1,9 +1,9 @@ -import type SettingsGamepadUiHandler from "../../ui/settings/settings-gamepad-ui-handler"; -import { UiMode } from "#enums/ui-mode"; -import { truncateString } from "../../utils/common"; -import { Button } from "#enums/buttons"; -import { SettingKeyboard } from "#app/system/settings/settings-keyboard"; import { globalScene } from "#app/global-scene"; +import { Button } from "#enums/buttons"; +import { UiMode } from "#enums/ui-mode"; +import { SettingKeyboard } from "#system/settings-keyboard"; +import type { SettingsGamepadUiHandler } from "#ui/settings-gamepad-ui-handler"; +import { truncateString } from "#utils/common"; import i18next from "i18next"; export enum SettingGamepad { diff --git a/src/system/settings/settings-keyboard.ts b/src/system/settings/settings-keyboard.ts index ec5c9ad6b0e..07f4f86bdb0 100644 --- a/src/system/settings/settings-keyboard.ts +++ b/src/system/settings/settings-keyboard.ts @@ -1,8 +1,8 @@ +import { globalScene } from "#app/global-scene"; import { Button } from "#enums/buttons"; import { UiMode } from "#enums/ui-mode"; -import type SettingsKeyboardUiHandler from "#app/ui/settings/settings-keyboard-ui-handler"; +import type { SettingsKeyboardUiHandler } from "#ui/settings-keyboard-ui-handler"; import i18next from "i18next"; -import { globalScene } from "#app/global-scene"; export enum SettingKeyboard { // Default_Layout = "DEFAULT_LAYOUT", diff --git a/src/system/settings/settings.ts b/src/system/settings/settings.ts index ca5395a5af7..01bb0685a01 100644 --- a/src/system/settings/settings.ts +++ b/src/system/settings/settings.ts @@ -1,15 +1,15 @@ -import { UiMode } from "#enums/ui-mode"; -import i18next from "i18next"; import { globalScene } from "#app/global-scene"; import { hasTouchscreen } from "#app/touch-controls"; -import { updateWindowType } from "#app/ui/ui-theme"; -import { CandyUpgradeNotificationChangedEvent } from "#app/events/battle-scene"; -import type SettingsUiHandler from "#app/ui/settings/settings-ui-handler"; import { EaseType } from "#enums/ease-type"; import { MoneyFormat } from "#enums/money-format"; import { PlayerGender } from "#enums/player-gender"; import { ShopCursorTarget } from "#enums/shop-cursor-target"; -import { isLocal } from "#app/utils/common"; +import { UiMode } from "#enums/ui-mode"; +import { CandyUpgradeNotificationChangedEvent } from "#events/battle-scene"; +import type { SettingsUiHandler } from "#ui/settings-ui-handler"; +import { updateWindowType } from "#ui/ui-theme"; +import { isLocal } from "#utils/common"; +import i18next from "i18next"; const VOLUME_OPTIONS: SettingOption[] = new Array(11).fill(null).map((_, i) => i diff --git a/src/system/trainer-data.ts b/src/system/trainer-data.ts index 7c9bffd99ee..ce402ff23bf 100644 --- a/src/system/trainer-data.ts +++ b/src/system/trainer-data.ts @@ -1,8 +1,8 @@ import type { TrainerType } from "#enums/trainer-type"; -import Trainer from "../field/trainer"; import { TrainerVariant } from "#enums/trainer-variant"; +import { Trainer } from "#field/trainer"; -export default class TrainerData { +export class TrainerData { public trainerType: TrainerType; public variant: TrainerVariant; public partyTemplateIndex: number; diff --git a/src/system/unlockables.ts b/src/system/unlockables.ts index 72588858eae..647aad9bcdb 100644 --- a/src/system/unlockables.ts +++ b/src/system/unlockables.ts @@ -1,7 +1,7 @@ -import i18next from "i18next"; -import { GameMode } from "../game-mode"; +import { GameMode } from "#app/game-mode"; import { GameModes } from "#enums/game-modes"; import { Unlockables } from "#enums/unlockables"; +import i18next from "i18next"; export function getUnlockableName(unlockable: Unlockables) { switch (unlockable) { diff --git a/src/system/version_migration/version_converter.ts b/src/system/version_migration/version_converter.ts index 789fa96958c..c49490da756 100644 --- a/src/system/version_migration/version_converter.ts +++ b/src/system/version_migration/version_converter.ts @@ -1,11 +1,11 @@ /** biome-ignore-all lint/performance/noNamespaceImport: Convenience */ -import type { SessionSaveMigrator } from "#app/@types/SessionSaveMigrator"; -import type { SettingsSaveMigrator } from "#app/@types/SettingsSaveMigrator"; -import type { SystemSaveMigrator } from "#app/@types/SystemSaveMigrator"; -import type { SessionSaveData, SystemSaveData } from "#app/system/game-data"; +import { version } from "#package.json"; +import type { SessionSaveData, SystemSaveData } from "#system/game-data"; +import type { SessionSaveMigrator } from "#types/SessionSaveMigrator"; +import type { SettingsSaveMigrator } from "#types/SettingsSaveMigrator"; +import type { SystemSaveMigrator } from "#types/SystemSaveMigrator"; import { compareVersions } from "compare-versions"; -import { version } from "../../../package.json"; /* // template for save migrator creation @@ -24,7 +24,7 @@ const systemMigratorA: SystemSaveMigrator = { }, }; -export const systemMigrators: Readonly = [systemMigratorA] as const; +export const systemMigrators: readonly SystemSaveMigrator[] = [systemMigratorA] as const; const sessionMigratorA: SessionSaveMigrator = { version: "A.B.C", @@ -33,7 +33,7 @@ const sessionMigratorA: SessionSaveMigrator = { }, }; -export const sessionMigrators: Readonly = [sessionMigratorA] as const; +export const sessionMigrators: readonly SessionSaveMigrator[] = [sessionMigratorA] as const; const settingsMigratorA: SettingsSaveMigrator = { version: "A.B.C", @@ -43,26 +43,17 @@ const settingsMigratorA: SettingsSaveMigrator = { }, }; -export const settingsMigrators: Readonly = [settingsMigratorA] as const; +export const settingsMigrators: readonly SettingsSaveMigrator[] = [settingsMigratorA] as const; */ -// --- vA.B.C PATCHES --- // -// import * as vA_B_C from "./versions/vA_B_C"; +// Add migrator imports below: +// Example: import * as vA_B_C from "#system/vA_B_C"; -// --- v1.0.4 (and below) PATCHES --- // -import * as v1_0_4 from "./versions/v1_0_4"; - -// --- v1.7.0 PATCHES --- // -import * as v1_7_0 from "./versions/v1_7_0"; - -// --- v1.8.3 PATCHES --- // -import * as v1_8_3 from "./versions/v1_8_3"; - -// --- v1.9.0 PATCHES --- // -import * as v1_9_0 from "./versions/v1_9_0"; - -// --- v1.10.0 PATCHES --- // -import * as v1_10_0 from "./versions/v1_10_0"; +import * as v1_0_4 from "#system/v1_0_4"; +import * as v1_7_0 from "#system/v1_7_0"; +import * as v1_8_3 from "#system/v1_8_3"; +import * as v1_9_0 from "#system/v1_9_0"; +import * as v1_10_0 from "#system/v1_10_0"; /** Current game version */ const LATEST_VERSION = version; diff --git a/src/system/version_migration/versions/v1_0_4.ts b/src/system/version_migration/versions/v1_0_4.ts index eacb4f7da1a..3523a5b8826 100644 --- a/src/system/version_migration/versions/v1_0_4.ts +++ b/src/system/version_migration/versions/v1_0_4.ts @@ -1,14 +1,14 @@ -import { SettingKeys } from "#app/system/settings/settings"; -import type { SystemSaveData, SessionSaveData } from "#app/system/game-data"; import { defaultStarterSpecies } from "#app/constants"; +import { allSpecies } from "#data/data-lists"; +import { CustomPokemonData } from "#data/pokemon-data"; import { AbilityAttr } from "#enums/ability-attr"; import { DexAttr } from "#enums/dex-attr"; -import { allSpecies } from "#app/data/data-lists"; -import { CustomPokemonData } from "#app/data/pokemon/pokemon-data"; -import { isNullOrUndefined } from "#app/utils/common"; -import type { SystemSaveMigrator } from "#app/@types/SystemSaveMigrator"; -import type { SettingsSaveMigrator } from "#app/@types/SettingsSaveMigrator"; -import type { SessionSaveMigrator } from "#app/@types/SessionSaveMigrator"; +import type { SessionSaveData, SystemSaveData } from "#system/game-data"; +import { SettingKeys } from "#system/settings"; +import type { SessionSaveMigrator } from "#types/SessionSaveMigrator"; +import type { SettingsSaveMigrator } from "#types/SettingsSaveMigrator"; +import type { SystemSaveMigrator } from "#types/SystemSaveMigrator"; +import { isNullOrUndefined } from "#utils/common"; /** * Migrate ability starter data if empty for caught species. @@ -95,7 +95,7 @@ const fixStarterData: SystemSaveMigrator = { }, }; -export const systemMigrators: Readonly = [ +export const systemMigrators: readonly SystemSaveMigrator[] = [ migrateAbilityData, fixLegendaryStats, fixStarterData, @@ -118,7 +118,7 @@ const fixRerollTarget: SettingsSaveMigrator = { }, }; -export const settingsMigrators: Readonly = [fixRerollTarget] as const; +export const settingsMigrators: readonly SettingsSaveMigrator[] = [fixRerollTarget] as const; /** * Converts old lapsing modifiers (battle items, lures, and Dire Hit) and @@ -206,4 +206,4 @@ const migrateCustomPokemonData: SessionSaveMigrator = { }, }; -export const sessionMigrators: Readonly = [migrateModifiers, migrateCustomPokemonData] as const; +export const sessionMigrators: readonly SessionSaveMigrator[] = [migrateModifiers, migrateCustomPokemonData] as const; diff --git a/src/system/version_migration/versions/v1_10_0.ts b/src/system/version_migration/versions/v1_10_0.ts index 6ed3253a0c9..66436717639 100644 --- a/src/system/version_migration/versions/v1_10_0.ts +++ b/src/system/version_migration/versions/v1_10_0.ts @@ -1,10 +1,10 @@ -import type { SessionSaveMigrator } from "#app/@types/SessionSaveMigrator"; import type { BattlerIndex } from "#enums/battler-index"; -import type { TurnMove } from "#app/@types/turn-move"; -import type { MoveResult } from "#enums/move-result"; -import type { SessionSaveData } from "#app/system/game-data"; -import { MoveUseMode } from "#enums/move-use-mode"; import type { MoveId } from "#enums/move-id"; +import type { MoveResult } from "#enums/move-result"; +import { MoveUseMode } from "#enums/move-use-mode"; +import type { SessionSaveData } from "#system/game-data"; +import type { SessionSaveMigrator } from "#types/SessionSaveMigrator"; +import type { TurnMove } from "#types/turn-move"; /** Prior signature of `TurnMove`; used to ensure parity */ interface OldTurnMove { @@ -45,4 +45,4 @@ const fixMoveHistory: SessionSaveMigrator = { }, }; -export const sessionMigrators: Readonly = [fixMoveHistory] as const; +export const sessionMigrators: readonly SessionSaveMigrator[] = [fixMoveHistory] as const; diff --git a/src/system/version_migration/versions/v1_7_0.ts b/src/system/version_migration/versions/v1_7_0.ts index e3c599bf77b..8f757456d0a 100644 --- a/src/system/version_migration/versions/v1_7_0.ts +++ b/src/system/version_migration/versions/v1_7_0.ts @@ -1,11 +1,11 @@ -import type { SessionSaveMigrator } from "#app/@types/SessionSaveMigrator"; -import type { SystemSaveMigrator } from "#app/@types/SystemSaveMigrator"; -import { getPokemonSpeciesForm } from "#app/data/pokemon-species"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; import { globalScene } from "#app/global-scene"; -import type { SessionSaveData, SystemSaveData } from "#app/system/game-data"; +import { getPokemonSpeciesForm } from "#data/pokemon-species"; import { DexAttr } from "#enums/dex-attr"; -import { isNullOrUndefined } from "#app/utils/common"; +import type { SessionSaveData, SystemSaveData } from "#system/game-data"; +import type { SessionSaveMigrator } from "#types/SessionSaveMigrator"; +import type { SystemSaveMigrator } from "#types/SystemSaveMigrator"; +import { isNullOrUndefined } from "#utils/common"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; /** * If a starter is caught, but the only forms registered as caught are not starterSelectable, @@ -37,7 +37,7 @@ const migrateUnselectableForms: SystemSaveMigrator = { }, }; -export const systemMigrators: Readonly = [migrateUnselectableForms] as const; +export const systemMigrators: readonly SystemSaveMigrator[] = [migrateUnselectableForms] as const; const migrateTera: SessionSaveMigrator = { version: "1.7.0", @@ -82,4 +82,4 @@ const migrateTera: SessionSaveMigrator = { }, }; -export const sessionMigrators: Readonly = [migrateTera] as const; +export const sessionMigrators: readonly SessionSaveMigrator[] = [migrateTera] as const; diff --git a/src/system/version_migration/versions/v1_8_3.ts b/src/system/version_migration/versions/v1_8_3.ts index 81430659e0b..e6b5129d9d5 100644 --- a/src/system/version_migration/versions/v1_8_3.ts +++ b/src/system/version_migration/versions/v1_8_3.ts @@ -1,8 +1,8 @@ -import type { SystemSaveMigrator } from "#app/@types/SystemSaveMigrator"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; -import type { SystemSaveData } from "#app/system/game-data"; import { DexAttr } from "#enums/dex-attr"; import { SpeciesId } from "#enums/species-id"; +import type { SystemSaveData } from "#system/game-data"; +import type { SystemSaveMigrator } from "#types/SystemSaveMigrator"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; /** * If a starter is caught, but the only forms registered as caught are not starterSelectable, @@ -28,4 +28,4 @@ const migratePichuForms: SystemSaveMigrator = { }, }; -export const systemMigrators: Readonly = [migratePichuForms] as const; +export const systemMigrators: readonly SystemSaveMigrator[] = [migratePichuForms] as const; diff --git a/src/system/version_migration/versions/v1_9_0.ts b/src/system/version_migration/versions/v1_9_0.ts index 0bd5a422ffb..80da5f2996b 100644 --- a/src/system/version_migration/versions/v1_9_0.ts +++ b/src/system/version_migration/versions/v1_9_0.ts @@ -1,8 +1,8 @@ -import type { SessionSaveMigrator } from "#app/@types/SessionSaveMigrator"; -import { PokemonMove } from "#app/data/moves/pokemon-move"; -import type { SessionSaveData } from "#app/system/game-data"; -import type PokemonData from "#app/system/pokemon-data"; import { MoveId } from "#enums/move-id"; +import { PokemonMove } from "#moves/pokemon-move"; +import type { SessionSaveData } from "#system/game-data"; +import type { PokemonData } from "#system/pokemon-data"; +import type { SessionSaveMigrator } from "#types/SessionSaveMigrator"; /** * Migrate all lingering rage fist data inside `CustomPokemonData`, @@ -38,4 +38,4 @@ const migratePartyData: SessionSaveMigrator = { }, }; -export const sessionMigrators: Readonly = [migratePartyData] as const; +export const sessionMigrators: readonly SessionSaveMigrator[] = [migratePartyData] as const; diff --git a/src/system/voucher.ts b/src/system/voucher.ts index ce10560c3e2..79e95f0b07b 100644 --- a/src/system/voucher.ts +++ b/src/system/voucher.ts @@ -1,9 +1,9 @@ -import i18next from "i18next"; -import { AchvTier, achvs, getAchievementDescription } from "./achv"; import type { PlayerGender } from "#enums/player-gender"; import { TrainerType } from "#enums/trainer-type"; -import type { ConditionFn } from "#app/@types/common"; -import { trainerConfigs } from "#app/data/trainers/trainer-config"; +import { AchvTier, achvs, getAchievementDescription } from "#system/achv"; +import { trainerConfigs } from "#trainers/trainer-config"; +import type { ConditionFn } from "#types/common"; +import i18next from "i18next"; export enum VoucherType { REGULAR, diff --git a/src/timed-event-manager.ts b/src/timed-event-manager.ts index f73c6dab1b2..02cb7fe8e0d 100644 --- a/src/timed-event-manager.ts +++ b/src/timed-event-manager.ts @@ -1,15 +1,15 @@ import { globalScene } from "#app/global-scene"; -import { TextStyle, addTextObject } from "#app/ui/text"; -import type { nil } from "#app/utils/common"; -import { isNullOrUndefined } from "#app/utils/common"; -import i18next from "i18next"; -import { SpeciesId } from "#enums/species-id"; -import type { WeatherPoolEntry } from "#app/data/weather"; -import { WeatherType } from "#enums/weather-type"; -import { CLASSIC_CANDY_FRIENDSHIP_MULTIPLIER } from "./data/balance/starters"; -import { MysteryEncounterType } from "./enums/mystery-encounter-type"; -import { MysteryEncounterTier } from "./enums/mystery-encounter-tier"; +import { CLASSIC_CANDY_FRIENDSHIP_MULTIPLIER } from "#balance/starters"; +import type { WeatherPoolEntry } from "#data/weather"; import { Challenges } from "#enums/challenges"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { SpeciesId } from "#enums/species-id"; +import { WeatherType } from "#enums/weather-type"; +import { addTextObject, TextStyle } from "#ui/text"; +import type { nil } from "#utils/common"; +import { isNullOrUndefined } from "#utils/common"; +import i18next from "i18next"; export enum EventType { SHINY, diff --git a/src/touch-controls.ts b/src/touch-controls.ts index 5319976648f..faee9ea232e 100644 --- a/src/touch-controls.ts +++ b/src/touch-controls.ts @@ -1,11 +1,11 @@ import { globalScene } from "#app/global-scene"; import { Button } from "#enums/buttons"; -import EventEmitter = Phaser.Events.EventEmitter; +import type Phaser from "phaser"; const repeatInputDelayMillis = 250; -export default class TouchControl { - events: EventEmitter; +export class TouchControl { + events: Phaser.Events.EventEmitter; private buttonLock: string[] = []; private inputInterval: NodeJS.Timeout[] = []; /** Whether touch controls are disabled */ diff --git a/src/tutorial.ts b/src/tutorial.ts index d9ae3a03290..018d0927da0 100644 --- a/src/tutorial.ts +++ b/src/tutorial.ts @@ -1,9 +1,9 @@ import { globalScene } from "#app/global-scene"; -import AwaitableUiHandler from "./ui/awaitable-ui-handler"; -import type UiHandler from "./ui/ui-handler"; -import { UiMode } from "#enums/ui-mode"; -import i18next from "i18next"; import Overrides from "#app/overrides"; +import { UiMode } from "#enums/ui-mode"; +import { AwaitableUiHandler } from "#ui/awaitable-ui-handler"; +import type { UiHandler } from "#ui/ui-handler"; +import i18next from "i18next"; export enum Tutorial { Intro = "INTRO", diff --git a/src/ui-inputs.ts b/src/ui-inputs.ts index f7a97ec673c..71c5ac1049e 100644 --- a/src/ui-inputs.ts +++ b/src/ui-inputs.ts @@ -1,19 +1,19 @@ -import type Phaser from "phaser"; -import { UiMode } from "#enums/ui-mode"; -import type { InputsController } from "./inputs-controller"; -import type MessageUiHandler from "./ui/message-ui-handler"; -import StarterSelectUiHandler from "./ui/starter-select-ui-handler"; -import { Setting, SettingKeys, settingIndex } from "./system/settings/settings"; -import SettingsUiHandler from "./ui/settings/settings-ui-handler"; -import { Button } from "#enums/buttons"; -import SettingsGamepadUiHandler from "./ui/settings/settings-gamepad-ui-handler"; -import SettingsKeyboardUiHandler from "#app/ui/settings/settings-keyboard-ui-handler"; import { globalScene } from "#app/global-scene"; -import SettingsDisplayUiHandler from "./ui/settings/settings-display-ui-handler"; -import SettingsAudioUiHandler from "./ui/settings/settings-audio-ui-handler"; -import RunInfoUiHandler from "./ui/run-info-ui-handler"; -import PokedexUiHandler from "./ui/pokedex-ui-handler"; -import PokedexPageUiHandler from "./ui/pokedex-page-ui-handler"; +import type { InputsController } from "#app/inputs-controller"; +import { Button } from "#enums/buttons"; +import { UiMode } from "#enums/ui-mode"; +import { Setting, SettingKeys, settingIndex } from "#system/settings"; +import type { MessageUiHandler } from "#ui/message-ui-handler"; +import { PokedexPageUiHandler } from "#ui/pokedex-page-ui-handler"; +import { PokedexUiHandler } from "#ui/pokedex-ui-handler"; +import { RunInfoUiHandler } from "#ui/run-info-ui-handler"; +import { SettingsAudioUiHandler } from "#ui/settings-audio-ui-handler"; +import { SettingsDisplayUiHandler } from "#ui/settings-display-ui-handler"; +import { SettingsGamepadUiHandler } from "#ui/settings-gamepad-ui-handler"; +import { SettingsKeyboardUiHandler } from "#ui/settings-keyboard-ui-handler"; +import { SettingsUiHandler } from "#ui/settings-ui-handler"; +import { StarterSelectUiHandler } from "#ui/starter-select-ui-handler"; +import type Phaser from "phaser"; type ActionKeys = Record void>; diff --git a/src/ui/ability-bar.ts b/src/ui/ability-bar.ts index 5481791de64..79a68e9dce7 100644 --- a/src/ui/ability-bar.ts +++ b/src/ui/ability-bar.ts @@ -1,12 +1,12 @@ import { globalScene } from "#app/global-scene"; -import { TextStyle, addTextObject } from "./text"; +import { addTextObject, TextStyle } from "#ui/text"; import i18next from "i18next"; const barWidth = 118; const screenLeft = 0; const baseY = -116; -export default class AbilityBar extends Phaser.GameObjects.Container { +export class AbilityBar extends Phaser.GameObjects.Container { private abilityBars: Phaser.GameObjects.Image[]; private abilityBarText: Phaser.GameObjects.Text; private player: boolean; diff --git a/src/ui/abstact-option-select-ui-handler.ts b/src/ui/abstact-option-select-ui-handler.ts index e1263bc088c..d93ad8b7665 100644 --- a/src/ui/abstact-option-select-ui-handler.ts +++ b/src/ui/abstact-option-select-ui-handler.ts @@ -1,11 +1,11 @@ import { globalScene } from "#app/global-scene"; -import { TextStyle, addBBCodeTextObject, getTextColor, getTextStyleOptions } from "./text"; -import { UiMode } from "#enums/ui-mode"; -import UiHandler from "./ui-handler"; -import { addWindow } from "./ui-theme"; -import { rgbHexToRgba, fixedInt } from "#app/utils/common"; -import { argbFromRgba } from "@material/material-color-utilities"; import { Button } from "#enums/buttons"; +import { UiMode } from "#enums/ui-mode"; +import { addBBCodeTextObject, getTextColor, getTextStyleOptions, TextStyle } from "#ui/text"; +import { UiHandler } from "#ui/ui-handler"; +import { addWindow } from "#ui/ui-theme"; +import { fixedInt, rgbHexToRgba } from "#utils/common"; +import { argbFromRgba } from "@material/material-color-utilities"; import BBCodeText from "phaser3-rex-plugins/plugins/gameobjects/tagtext/bbcodetext/BBCodeText"; export interface OptionSelectConfig { @@ -33,7 +33,7 @@ export interface OptionSelectItem { const scrollUpLabel = "↑"; const scrollDownLabel = "↓"; -export default abstract class AbstractOptionSelectUiHandler extends UiHandler { +export abstract class AbstractOptionSelectUiHandler extends UiHandler { protected optionSelectContainer: Phaser.GameObjects.Container; protected optionSelectTextContainer: Phaser.GameObjects.Container; protected optionSelectBg: Phaser.GameObjects.NineSlice; diff --git a/src/ui/achv-bar.ts b/src/ui/achv-bar.ts index 1e068157afa..8e0f2a9404b 100644 --- a/src/ui/achv-bar.ts +++ b/src/ui/achv-bar.ts @@ -1,10 +1,10 @@ import { globalScene } from "#app/global-scene"; -import { Achv, getAchievementDescription } from "../system/achv"; -import { Voucher } from "../system/voucher"; -import { TextStyle, addTextObject } from "./text"; import type { PlayerGender } from "#enums/player-gender"; +import { Achv, getAchievementDescription } from "#system/achv"; +import { Voucher } from "#system/voucher"; +import { addTextObject, TextStyle } from "#ui/text"; -export default class AchvBar extends Phaser.GameObjects.Container { +export class AchvBar extends Phaser.GameObjects.Container { private defaultWidth: number; private defaultHeight: number; diff --git a/src/ui/achvs-ui-handler.ts b/src/ui/achvs-ui-handler.ts index 8588530d370..48efc4fca40 100644 --- a/src/ui/achvs-ui-handler.ts +++ b/src/ui/achvs-ui-handler.ts @@ -1,17 +1,17 @@ -import { Button } from "#enums/buttons"; -import i18next from "i18next"; -import type { Achv } from "#app/system/achv"; -import { achvs, getAchievementDescription } from "#app/system/achv"; -import type { Voucher } from "#app/system/voucher"; -import { getVoucherTypeIcon, getVoucherTypeName, vouchers } from "#app/system/voucher"; -import MessageUiHandler from "#app/ui/message-ui-handler"; -import { addTextObject, TextStyle } from "#app/ui/text"; -import type { UiMode } from "#enums/ui-mode"; -import { addWindow } from "#app/ui/ui-theme"; -import { ScrollBar } from "#app/ui/scroll-bar"; -import { PlayerGender } from "#enums/player-gender"; import { globalScene } from "#app/global-scene"; -import type { AchvUnlocks, VoucherUnlocks } from "#app/system/game-data"; +import { Button } from "#enums/buttons"; +import { PlayerGender } from "#enums/player-gender"; +import type { UiMode } from "#enums/ui-mode"; +import type { Achv } from "#system/achv"; +import { achvs, getAchievementDescription } from "#system/achv"; +import type { AchvUnlocks, VoucherUnlocks } from "#system/game-data"; +import type { Voucher } from "#system/voucher"; +import { getVoucherTypeIcon, getVoucherTypeName, vouchers } from "#system/voucher"; +import { MessageUiHandler } from "#ui/message-ui-handler"; +import { ScrollBar } from "#ui/scroll-bar"; +import { addTextObject, TextStyle } from "#ui/text"; +import { addWindow } from "#ui/ui-theme"; +import i18next from "i18next"; const Page = { ACHIEVEMENTS: 0, @@ -27,7 +27,7 @@ const languageSettings: { [key: string]: LanguageSetting } = { de: { TextSize: "80px" }, }; -export default class AchvsUiHandler extends MessageUiHandler { +export class AchvsUiHandler extends MessageUiHandler { private readonly ROWS = 4; private readonly COLS = 17; diff --git a/src/ui/admin-ui-handler.ts b/src/ui/admin-ui-handler.ts index c8c8e43802b..3d0a1153127 100644 --- a/src/ui/admin-ui-handler.ts +++ b/src/ui/admin-ui-handler.ts @@ -1,17 +1,17 @@ -import { Button } from "#app/enums/buttons"; -import { pokerogueApi } from "#app/plugins/api/pokerogue-api"; -import { formatText } from "#app/utils/common"; -import type { InputFieldConfig } from "./form-modal-ui-handler"; -import { FormModalUiHandler } from "./form-modal-ui-handler"; -import type { ModalConfig } from "./modal-ui-handler"; -import { TextStyle } from "./text"; -import { UiMode } from "#enums/ui-mode"; +import { pokerogueApi } from "#api/pokerogue-api"; import { globalScene } from "#app/global-scene"; +import { Button } from "#enums/buttons"; +import { UiMode } from "#enums/ui-mode"; +import type { InputFieldConfig } from "#ui/form-modal-ui-handler"; +import { FormModalUiHandler } from "#ui/form-modal-ui-handler"; +import type { ModalConfig } from "#ui/modal-ui-handler"; +import { TextStyle } from "#ui/text"; +import { formatText } from "#utils/common"; type AdminUiHandlerService = "discord" | "google"; type AdminUiHandlerServiceMode = "Link" | "Unlink"; -export default class AdminUiHandler extends FormModalUiHandler { +export class AdminUiHandler extends FormModalUiHandler { private adminMode: AdminMode; private adminResult: AdminSearchInfo; private config: ModalConfig; diff --git a/src/ui/arena-flyout.ts b/src/ui/arena-flyout.ts index fec02ffb660..43cc553d936 100644 --- a/src/ui/arena-flyout.ts +++ b/src/ui/arena-flyout.ts @@ -1,23 +1,23 @@ -import { addTextObject, TextStyle } from "./text"; import { globalScene } from "#app/global-scene"; -import { ArenaTrapTag } from "#app/data/arena-tag"; +import { ArenaTrapTag } from "#data/arena-tag"; +import { TerrainType } from "#data/terrain"; import { ArenaTagSide } from "#enums/arena-tag-side"; +import { ArenaTagType } from "#enums/arena-tag-type"; import { WeatherType } from "#enums/weather-type"; -import { TerrainType } from "#app/data/terrain"; -import { addWindow, WindowVariant } from "./ui-theme"; -import type { ArenaEvent } from "#app/events/arena"; +import type { ArenaEvent } from "#events/arena"; import { ArenaEventType, TagAddedEvent, TagRemovedEvent, TerrainChangedEvent, WeatherChangedEvent, -} from "#app/events/arena"; -import type { TurnEndEvent } from "../events/battle-scene"; -import { BattleSceneEventType } from "../events/battle-scene"; -import { ArenaTagType } from "#enums/arena-tag-type"; -import TimeOfDayWidget from "./time-of-day-widget"; -import { toCamelCaseString, formatText, fixedInt } from "#app/utils/common"; +} from "#events/arena"; +import type { TurnEndEvent } from "#events/battle-scene"; +import { BattleSceneEventType } from "#events/battle-scene"; +import { addTextObject, TextStyle } from "#ui/text"; +import { TimeOfDayWidget } from "#ui/time-of-day-widget"; +import { addWindow, WindowVariant } from "#ui/ui-theme"; +import { fixedInt, formatText, toCamelCaseString } from "#utils/common"; import type { ParseKeys } from "i18next"; import i18next from "i18next"; diff --git a/src/ui/autocomplete-ui-handler.ts b/src/ui/autocomplete-ui-handler.ts index ba1802c8582..6016245c38d 100644 --- a/src/ui/autocomplete-ui-handler.ts +++ b/src/ui/autocomplete-ui-handler.ts @@ -1,8 +1,8 @@ import { Button } from "#enums/buttons"; -import AbstractOptionSelectUiHandler from "./abstact-option-select-ui-handler"; import { UiMode } from "#enums/ui-mode"; +import { AbstractOptionSelectUiHandler } from "#ui/abstact-option-select-ui-handler"; -export default class AutoCompleteUiHandler extends AbstractOptionSelectUiHandler { +export class AutoCompleteUiHandler extends AbstractOptionSelectUiHandler { modalContainer: Phaser.GameObjects.Container; constructor(mode: UiMode = UiMode.OPTION_SELECT) { super(mode); diff --git a/src/ui/awaitable-ui-handler.ts b/src/ui/awaitable-ui-handler.ts index 3c577fd4411..e8513b4acc1 100644 --- a/src/ui/awaitable-ui-handler.ts +++ b/src/ui/awaitable-ui-handler.ts @@ -1,9 +1,9 @@ -import type { UiMode } from "#enums/ui-mode"; -import UiHandler from "./ui-handler"; -import { Button } from "#enums/buttons"; import { globalScene } from "#app/global-scene"; +import { Button } from "#enums/buttons"; +import type { UiMode } from "#enums/ui-mode"; +import { UiHandler } from "#ui/ui-handler"; -export default abstract class AwaitableUiHandler extends UiHandler { +export abstract class AwaitableUiHandler extends UiHandler { protected awaitingActionInput: boolean; protected onActionInput: Function | null; public tutorialActive = false; diff --git a/src/ui/ball-ui-handler.ts b/src/ui/ball-ui-handler.ts index 11fb485164a..6b82f085897 100644 --- a/src/ui/ball-ui-handler.ts +++ b/src/ui/ball-ui-handler.ts @@ -1,15 +1,15 @@ -import { getPokeballName } from "../data/pokeball"; -import { addTextObject, getTextStyleOptions, TextStyle } from "./text"; +import { globalScene } from "#app/global-scene"; +import { getPokeballName } from "#data/pokeball"; +import { Button } from "#enums/buttons"; import { Command } from "#enums/command"; import { UiMode } from "#enums/ui-mode"; -import UiHandler from "./ui-handler"; -import { addWindow } from "./ui-theme"; -import { Button } from "#enums/buttons"; -import type { CommandPhase } from "#app/phases/command-phase"; -import { globalScene } from "#app/global-scene"; +import type { CommandPhase } from "#phases/command-phase"; +import { addTextObject, getTextStyleOptions, TextStyle } from "#ui/text"; +import { UiHandler } from "#ui/ui-handler"; +import { addWindow } from "#ui/ui-theme"; import i18next from "i18next"; -export default class BallUiHandler extends UiHandler { +export class BallUiHandler extends UiHandler { private pokeballSelectContainer: Phaser.GameObjects.Container; private pokeballSelectBg: Phaser.GameObjects.NineSlice; private countsText: Phaser.GameObjects.Text; diff --git a/src/ui/base-stats-overlay.ts b/src/ui/base-stats-overlay.ts index 0541ae766e5..888b87a8d11 100644 --- a/src/ui/base-stats-overlay.ts +++ b/src/ui/base-stats-overlay.ts @@ -1,9 +1,9 @@ -import type { InfoToggle } from "../battle-scene"; -import { TextStyle, addTextObject } from "./text"; -import { addWindow } from "./ui-theme"; -import { fixedInt } from "#app/utils/common"; -import i18next from "i18next"; +import type { InfoToggle } from "#app/battle-scene"; import { globalScene } from "#app/global-scene"; +import { addTextObject, TextStyle } from "#ui/text"; +import { addWindow } from "#ui/ui-theme"; +import { fixedInt } from "#utils/common"; +import i18next from "i18next"; interface BaseStatsOverlaySettings { scale?: number; // scale the box? A scale of 0.5 is recommended diff --git a/src/ui/battle-flyout.ts b/src/ui/battle-flyout.ts index 6f8f6a76b34..083dc7bbf19 100644 --- a/src/ui/battle-flyout.ts +++ b/src/ui/battle-flyout.ts @@ -1,14 +1,14 @@ -import type { EnemyPokemon, default as Pokemon } from "../field/pokemon"; -import { addTextObject, TextStyle } from "./text"; -import { fixedInt } from "#app/utils/common"; import { globalScene } from "#app/global-scene"; -import type Move from "#app/data/moves/move"; -import type { BerryUsedEvent, MoveUsedEvent } from "../events/battle-scene"; -import { BattleSceneEventType } from "../events/battle-scene"; +import { getPokemonNameWithAffix } from "#app/messages"; import { BerryType } from "#enums/berry-type"; import { MoveId } from "#enums/move-id"; import { UiTheme } from "#enums/ui-theme"; -import { getPokemonNameWithAffix } from "#app/messages"; +import type { BerryUsedEvent, MoveUsedEvent } from "#events/battle-scene"; +import { BattleSceneEventType } from "#events/battle-scene"; +import type { EnemyPokemon, Pokemon } from "#field/pokemon"; +import type { Move } from "#moves/move"; +import { addTextObject, TextStyle } from "#ui/text"; +import { fixedInt } from "#utils/common"; /** Container for info about a {@linkcode Move} */ interface MoveInfo { @@ -22,7 +22,7 @@ interface MoveInfo { } /** A Flyout Menu attached to each {@linkcode BattleInfo} object on the field UI */ -export default class BattleFlyout extends Phaser.GameObjects.Container { +export class BattleFlyout extends Phaser.GameObjects.Container { /** Is this object linked to a player's Pokemon? */ private player: boolean; diff --git a/src/ui/battle-info/battle-info.ts b/src/ui/battle-info/battle-info.ts index e67000bb243..4a2a6d1804d 100644 --- a/src/ui/battle-info/battle-info.ts +++ b/src/ui/battle-info/battle-info.ts @@ -1,13 +1,13 @@ -import type { default as Pokemon } from "../../field/pokemon"; -import { getLocalizedSpriteKey, fixedInt, getShinyDescriptor } from "#app/utils/common"; -import { addTextObject, TextStyle } from "../text"; -import { getGenderSymbol, getGenderColor, Gender } from "../../data/gender"; -import { StatusEffect } from "#enums/status-effect"; import { globalScene } from "#app/global-scene"; -import { getTypeRgb } from "#app/data/type"; +import { Gender, getGenderColor, getGenderSymbol } from "#data/gender"; +import { getTypeRgb } from "#data/type"; import { PokemonType } from "#enums/pokemon-type"; -import { getVariantTint } from "#app/sprites/variant"; import { Stat } from "#enums/stat"; +import { StatusEffect } from "#enums/status-effect"; +import type { Pokemon } from "#field/pokemon"; +import { getVariantTint } from "#sprites/variant"; +import { addTextObject, TextStyle } from "#ui/text"; +import { fixedInt, getLocalizedSpriteKey, getShinyDescriptor } from "#utils/common"; import i18next from "i18next"; /** @@ -37,7 +37,7 @@ export type BattleInfoParamList = { }; }; -export default abstract class BattleInfo extends Phaser.GameObjects.Container { +export abstract class BattleInfo extends Phaser.GameObjects.Container { public static readonly EXP_GAINS_DURATION_BASE = 1650; protected baseY: number; diff --git a/src/ui/battle-info/enemy-battle-info.ts b/src/ui/battle-info/enemy-battle-info.ts index 7c16f01ac38..5799fb476ef 100644 --- a/src/ui/battle-info/enemy-battle-info.ts +++ b/src/ui/battle-info/enemy-battle-info.ts @@ -1,13 +1,13 @@ import { globalScene } from "#app/global-scene"; -import BattleFlyout from "../battle-flyout"; -import { addTextObject, TextStyle } from "#app/ui/text"; -import { addWindow, WindowVariant } from "#app/ui/ui-theme"; import { Stat } from "#enums/stat"; +import type { EnemyPokemon } from "#field/pokemon"; +import { BattleFlyout } from "#ui/battle-flyout"; +import type { BattleInfoParamList } from "#ui/battle-info"; +import { BattleInfo } from "#ui/battle-info"; +import { addTextObject, TextStyle } from "#ui/text"; +import { addWindow, WindowVariant } from "#ui/ui-theme"; import i18next from "i18next"; -import type { EnemyPokemon } from "#app/field/pokemon"; import type { GameObjects } from "phaser"; -import BattleInfo from "./battle-info"; -import type { BattleInfoParamList } from "./battle-info"; export class EnemyBattleInfo extends BattleInfo { protected player: false = false; diff --git a/src/ui/battle-info/player-battle-info.ts b/src/ui/battle-info/player-battle-info.ts index 634f89b7922..62a2eddecb9 100644 --- a/src/ui/battle-info/player-battle-info.ts +++ b/src/ui/battle-info/player-battle-info.ts @@ -1,10 +1,10 @@ -import { getLevelRelExp, getLevelTotalExp } from "#app/data/exp"; -import type { PlayerPokemon } from "#app/field/pokemon"; import { globalScene } from "#app/global-scene"; +import { getLevelRelExp, getLevelTotalExp } from "#data/exp"; import { ExpGainsSpeed } from "#enums/exp-gains-speed"; import { Stat } from "#enums/stat"; -import BattleInfo from "./battle-info"; -import type { BattleInfoParamList } from "./battle-info"; +import type { PlayerPokemon } from "#field/pokemon"; +import type { BattleInfoParamList } from "#ui/battle-info"; +import { BattleInfo } from "#ui/battle-info"; export class PlayerBattleInfo extends BattleInfo { protected player: true = true; diff --git a/src/ui/battle-message-ui-handler.ts b/src/ui/battle-message-ui-handler.ts index d1102bbe53e..ae3e6496922 100644 --- a/src/ui/battle-message-ui-handler.ts +++ b/src/ui/battle-message-ui-handler.ts @@ -1,14 +1,14 @@ import { globalScene } from "#app/global-scene"; -import { addBBCodeTextObject, addTextObject, getTextColor, TextStyle } from "./text"; -import { UiMode } from "#enums/ui-mode"; -import MessageUiHandler from "./message-ui-handler"; -import { addWindow } from "./ui-theme"; -import type BBCodeText from "phaser3-rex-plugins/plugins/bbcodetext"; import { Button } from "#enums/buttons"; +import { getStatKey, PERMANENT_STATS } from "#enums/stat"; +import { UiMode } from "#enums/ui-mode"; +import { MessageUiHandler } from "#ui/message-ui-handler"; +import { addBBCodeTextObject, addTextObject, getTextColor, TextStyle } from "#ui/text"; +import { addWindow } from "#ui/ui-theme"; import i18next from "i18next"; -import { PERMANENT_STATS, getStatKey } from "#app/enums/stat"; +import type BBCodeText from "phaser3-rex-plugins/plugins/bbcodetext"; -export default class BattleMessageUiHandler extends MessageUiHandler { +export class BattleMessageUiHandler extends MessageUiHandler { private levelUpStatsContainer: Phaser.GameObjects.Container; private levelUpStatsIncrContent: Phaser.GameObjects.Text; private levelUpStatsValuesContent: BBCodeText; diff --git a/src/ui/bgm-bar.ts b/src/ui/bgm-bar.ts index e331d82f6d9..d8b6bbe8b8a 100644 --- a/src/ui/bgm-bar.ts +++ b/src/ui/bgm-bar.ts @@ -1,13 +1,13 @@ -import { addTextObject, TextStyle } from "./text"; -import i18next from "i18next"; -import { formatText } from "#app/utils/common"; import { globalScene } from "#app/global-scene"; +import { addTextObject, TextStyle } from "#ui/text"; +import { formatText } from "#utils/common"; +import i18next from "i18next"; const hiddenX = -150; const shownX = 0; const baseY = 0; -export default class BgmBar extends Phaser.GameObjects.Container { +export class BgmBar extends Phaser.GameObjects.Container { private defaultWidth: number; private defaultHeight: number; diff --git a/src/ui/candy-bar.ts b/src/ui/candy-bar.ts index 189a418eec8..ea3500d6c4c 100644 --- a/src/ui/candy-bar.ts +++ b/src/ui/candy-bar.ts @@ -1,11 +1,11 @@ -import { starterColors } from "#app/global-vars/starter-colors"; import { globalScene } from "#app/global-scene"; -import { TextStyle, addTextObject } from "./text"; -import { argbFromRgba } from "@material/material-color-utilities"; -import { rgbHexToRgba } from "#app/utils/common"; +import { starterColors } from "#app/global-vars/starter-colors"; import type { SpeciesId } from "#enums/species-id"; +import { addTextObject, TextStyle } from "#ui/text"; +import { rgbHexToRgba } from "#utils/common"; +import { argbFromRgba } from "@material/material-color-utilities"; -export default class CandyBar extends Phaser.GameObjects.Container { +export class CandyBar extends Phaser.GameObjects.Container { private bg: Phaser.GameObjects.NineSlice; private candyIcon: Phaser.GameObjects.Sprite; private candyOverlayIcon: Phaser.GameObjects.Sprite; diff --git a/src/ui/challenges-select-ui-handler.ts b/src/ui/challenges-select-ui-handler.ts index b02bf4abaef..45b5f9b7c50 100644 --- a/src/ui/challenges-select-ui-handler.ts +++ b/src/ui/challenges-select-ui-handler.ts @@ -1,20 +1,20 @@ -import { TextStyle, addTextObject } from "./text"; -import type { UiMode } from "#enums/ui-mode"; -import UiHandler from "./ui-handler"; -import { addWindow } from "./ui-theme"; -import { Button } from "#enums/buttons"; -import i18next from "i18next"; -import type { Challenge } from "#app/data/challenge"; -import { getLocalizedSpriteKey } from "#app/utils/common"; -import { Challenges } from "#app/enums/challenges"; -import BBCodeText from "phaser3-rex-plugins/plugins/bbcodetext"; -import { Color, ShadowColor } from "#app/enums/color"; import { globalScene } from "#app/global-scene"; +import type { Challenge } from "#data/challenge"; +import { Button } from "#enums/buttons"; +import { Challenges } from "#enums/challenges"; +import { Color, ShadowColor } from "#enums/color"; +import type { UiMode } from "#enums/ui-mode"; +import { addTextObject, TextStyle } from "#ui/text"; +import { UiHandler } from "#ui/ui-handler"; +import { addWindow } from "#ui/ui-theme"; +import { getLocalizedSpriteKey } from "#utils/common"; +import i18next from "i18next"; +import BBCodeText from "phaser3-rex-plugins/plugins/bbcodetext"; /** * Handles all the UI for choosing optional challenges. */ -export default class GameChallengesUiHandler extends UiHandler { +export class GameChallengesUiHandler extends UiHandler { private challengesContainer: Phaser.GameObjects.Container; private valuesContainer: Phaser.GameObjects.Container; diff --git a/src/ui/char-sprite.ts b/src/ui/char-sprite.ts index a8451f4bb9c..381421086ff 100644 --- a/src/ui/char-sprite.ts +++ b/src/ui/char-sprite.ts @@ -1,7 +1,7 @@ import { globalScene } from "#app/global-scene"; -import { MissingTextureKey } from "#app/utils/common"; +import { MissingTextureKey } from "#utils/common"; -export default class CharSprite extends Phaser.GameObjects.Container { +export class CharSprite extends Phaser.GameObjects.Container { private sprite: Phaser.GameObjects.Sprite; private transitionSprite: Phaser.GameObjects.Sprite; diff --git a/src/ui/command-ui-handler.ts b/src/ui/command-ui-handler.ts index 8df399b6d9b..5d9dd78583c 100644 --- a/src/ui/command-ui-handler.ts +++ b/src/ui/command-ui-handler.ts @@ -1,19 +1,19 @@ -import { addTextObject, TextStyle } from "./text"; -import PartyUiHandler, { PartyUiMode } from "./party-ui-handler"; -import { UiMode } from "#enums/ui-mode"; -import UiHandler from "./ui-handler"; -import i18next from "i18next"; -import { Button } from "#enums/buttons"; -import { getPokemonNameWithAffix } from "#app/messages"; -import type { CommandPhase } from "#app/phases/command-phase"; import { globalScene } from "#app/global-scene"; -import { TerastallizeAccessModifier } from "#app/modifier/modifier"; -import { PokemonType } from "#enums/pokemon-type"; -import { getTypeRgb } from "#app/data/type"; -import { SpeciesId } from "#enums/species-id"; +import { getPokemonNameWithAffix } from "#app/messages"; +import { getTypeRgb } from "#data/type"; +import { Button } from "#enums/buttons"; import { Command } from "#enums/command"; +import { PokemonType } from "#enums/pokemon-type"; +import { SpeciesId } from "#enums/species-id"; +import { UiMode } from "#enums/ui-mode"; +import { TerastallizeAccessModifier } from "#modifiers/modifier"; +import type { CommandPhase } from "#phases/command-phase"; +import { PartyUiHandler, PartyUiMode } from "#ui/party-ui-handler"; +import { addTextObject, TextStyle } from "#ui/text"; +import { UiHandler } from "#ui/ui-handler"; +import i18next from "i18next"; -export default class CommandUiHandler extends UiHandler { +export class CommandUiHandler extends UiHandler { private commandsContainer: Phaser.GameObjects.Container; private cursorObj: Phaser.GameObjects.Image | null; diff --git a/src/ui/confirm-ui-handler.ts b/src/ui/confirm-ui-handler.ts index 7b5ca3d7e63..b2f35931278 100644 --- a/src/ui/confirm-ui-handler.ts +++ b/src/ui/confirm-ui-handler.ts @@ -1,11 +1,11 @@ -import type { OptionSelectConfig } from "./abstact-option-select-ui-handler"; -import AbstractOptionSelectUiHandler from "./abstact-option-select-ui-handler"; -import { UiMode } from "#enums/ui-mode"; -import i18next from "i18next"; -import { Button } from "#enums/buttons"; import { globalScene } from "#app/global-scene"; +import { Button } from "#enums/buttons"; +import { UiMode } from "#enums/ui-mode"; +import type { OptionSelectConfig } from "#ui/abstact-option-select-ui-handler"; +import { AbstractOptionSelectUiHandler } from "#ui/abstact-option-select-ui-handler"; +import i18next from "i18next"; -export default class ConfirmUiHandler extends AbstractOptionSelectUiHandler { +export class ConfirmUiHandler extends AbstractOptionSelectUiHandler { public static readonly windowWidth: number = 48; private switchCheck: boolean; diff --git a/src/ui/daily-run-scoreboard.ts b/src/ui/daily-run-scoreboard.ts index c069c6fffd7..c48f42d1ede 100644 --- a/src/ui/daily-run-scoreboard.ts +++ b/src/ui/daily-run-scoreboard.ts @@ -1,9 +1,9 @@ -import i18next from "i18next"; +import { pokerogueApi } from "#api/pokerogue-api"; import { globalScene } from "#app/global-scene"; -import { getEnumKeys, executeIf } from "#app/utils/common"; -import { TextStyle, addTextObject } from "./text"; -import { WindowVariant, addWindow } from "./ui-theme"; -import { pokerogueApi } from "#app/plugins/api/pokerogue-api"; +import { addTextObject, TextStyle } from "#ui/text"; +import { addWindow, WindowVariant } from "#ui/ui-theme"; +import { executeIf, getEnumKeys } from "#utils/common"; +import i18next from "i18next"; export interface RankingEntry { rank: number; diff --git a/src/ui/dropdown.ts b/src/ui/dropdown.ts index 2cbd1f0dfa9..2a100ddbe59 100644 --- a/src/ui/dropdown.ts +++ b/src/ui/dropdown.ts @@ -1,7 +1,7 @@ import { globalScene } from "#app/global-scene"; -import { addTextObject, TextStyle } from "./text"; -import { addWindow, WindowVariant } from "./ui-theme"; -import { ScrollBar } from "#app/ui/scroll-bar"; +import { ScrollBar } from "#ui/scroll-bar"; +import { addTextObject, TextStyle } from "#ui/text"; +import { addWindow, WindowVariant } from "#ui/ui-theme"; import i18next from "i18next"; export enum DropDownState { diff --git a/src/ui/egg-counter-container.ts b/src/ui/egg-counter-container.ts index 7bb32189681..ff536228fde 100644 --- a/src/ui/egg-counter-container.ts +++ b/src/ui/egg-counter-container.ts @@ -1,15 +1,15 @@ import { globalScene } from "#app/global-scene"; -import { addWindow } from "./ui-theme"; -import { addTextObject, TextStyle } from "./text"; -import type { EggCountChangedEvent } from "#app/events/egg"; -import { EggEventType } from "#app/events/egg"; -import type EggHatchSceneHandler from "./egg-hatch-scene-handler"; +import type { EggCountChangedEvent } from "#events/egg"; +import { EggEventType } from "#events/egg"; +import type { EggHatchSceneHandler } from "#ui/egg-hatch-scene-handler"; +import { addTextObject, TextStyle } from "#ui/text"; +import { addWindow } from "#ui/ui-theme"; /** * A container that displays the count of hatching eggs. * @extends Phaser.GameObjects.Container */ -export default class EggCounterContainer extends Phaser.GameObjects.Container { +export class EggCounterContainer extends Phaser.GameObjects.Container { private readonly WINDOW_DEFAULT_WIDTH = 37; private readonly WINDOW_MEDIUM_WIDTH = 42; private readonly WINDOW_HEIGHT = 26; diff --git a/src/ui/egg-gacha-ui-handler.ts b/src/ui/egg-gacha-ui-handler.ts index 7ff3a1b65ee..79aa85ce426 100644 --- a/src/ui/egg-gacha-ui-handler.ts +++ b/src/ui/egg-gacha-ui-handler.ts @@ -1,21 +1,21 @@ -import { UiMode } from "#enums/ui-mode"; -import { TextStyle, addTextObject, getEggTierTextTint, getTextStyleOptions } from "./text"; -import MessageUiHandler from "./message-ui-handler"; -import { getEnumValues, getEnumKeys, fixedInt, randSeedShuffle } from "#app/utils/common"; -import type { IEggOptions } from "../data/egg"; -import { Egg, getLegendaryGachaSpeciesForTimestamp } from "../data/egg"; -import { VoucherType, getVoucherTypeIcon } from "../system/voucher"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; -import { addWindow } from "./ui-theme"; -import { Tutorial, handleTutorial } from "../tutorial"; -import { Button } from "#enums/buttons"; -import Overrides from "#app/overrides"; -import { GachaType } from "#app/enums/gacha-types"; -import i18next from "i18next"; -import { EggTier } from "#enums/egg-type"; import { globalScene } from "#app/global-scene"; +import Overrides from "#app/overrides"; +import { handleTutorial, Tutorial } from "#app/tutorial"; +import type { IEggOptions } from "#data/egg"; +import { Egg, getLegendaryGachaSpeciesForTimestamp } from "#data/egg"; +import { Button } from "#enums/buttons"; +import { EggTier } from "#enums/egg-type"; +import { GachaType } from "#enums/gacha-types"; +import { UiMode } from "#enums/ui-mode"; +import { getVoucherTypeIcon, VoucherType } from "#system/voucher"; +import { MessageUiHandler } from "#ui/message-ui-handler"; +import { addTextObject, getEggTierTextTint, getTextStyleOptions, TextStyle } from "#ui/text"; +import { addWindow } from "#ui/ui-theme"; +import { fixedInt, getEnumKeys, getEnumValues, randSeedShuffle } from "#utils/common"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; +import i18next from "i18next"; -export default class EggGachaUiHandler extends MessageUiHandler { +export class EggGachaUiHandler extends MessageUiHandler { private eggGachaContainer: Phaser.GameObjects.Container; private eggGachaMessageBox: Phaser.GameObjects.NineSlice; private eggGachaOptionsContainer: Phaser.GameObjects.Container; diff --git a/src/ui/egg-hatch-scene-handler.ts b/src/ui/egg-hatch-scene-handler.ts index 85c4199ff1d..5b2c9d40cfa 100644 --- a/src/ui/egg-hatch-scene-handler.ts +++ b/src/ui/egg-hatch-scene-handler.ts @@ -1,9 +1,9 @@ -import { UiMode } from "#enums/ui-mode"; -import UiHandler from "./ui-handler"; -import { Button } from "#enums/buttons"; import { globalScene } from "#app/global-scene"; +import { Button } from "#enums/buttons"; +import { UiMode } from "#enums/ui-mode"; +import { UiHandler } from "#ui/ui-handler"; -export default class EggHatchSceneHandler extends UiHandler { +export class EggHatchSceneHandler extends UiHandler { public eggHatchContainer: Phaser.GameObjects.Container; /** diff --git a/src/ui/egg-list-ui-handler.ts b/src/ui/egg-list-ui-handler.ts index 9a1b1f51e25..7165b070a29 100644 --- a/src/ui/egg-list-ui-handler.ts +++ b/src/ui/egg-list-ui-handler.ts @@ -1,15 +1,15 @@ -import { UiMode } from "#enums/ui-mode"; -import PokemonIconAnimHandler, { PokemonIconAnimMode } from "#app/ui/pokemon-icon-anim-handler"; -import { TextStyle, addTextObject } from "#app/ui/text"; -import MessageUiHandler from "#app/ui/message-ui-handler"; -import { addWindow } from "#app/ui/ui-theme"; -import { Button } from "#enums/buttons"; -import i18next from "i18next"; -import ScrollableGridUiHandler from "#app/ui/scrollable-grid-handler"; -import { ScrollBar } from "#app/ui/scroll-bar"; import { globalScene } from "#app/global-scene"; +import { Button } from "#enums/buttons"; +import { UiMode } from "#enums/ui-mode"; +import { MessageUiHandler } from "#ui/message-ui-handler"; +import { PokemonIconAnimHandler, PokemonIconAnimMode } from "#ui/pokemon-icon-anim-handler"; +import { ScrollBar } from "#ui/scroll-bar"; +import { ScrollableGridUiHandler } from "#ui/scrollable-grid-handler"; +import { addTextObject, TextStyle } from "#ui/text"; +import { addWindow } from "#ui/ui-theme"; +import i18next from "i18next"; -export default class EggListUiHandler extends MessageUiHandler { +export class EggListUiHandler extends MessageUiHandler { private readonly ROWS = 9; private readonly COLUMNS = 11; diff --git a/src/ui/egg-summary-ui-handler.ts b/src/ui/egg-summary-ui-handler.ts index 90dc60e16b7..aa4e8974318 100644 --- a/src/ui/egg-summary-ui-handler.ts +++ b/src/ui/egg-summary-ui-handler.ts @@ -1,14 +1,14 @@ -import { UiMode } from "#enums/ui-mode"; -import PokemonIconAnimHandler, { PokemonIconAnimMode } from "./pokemon-icon-anim-handler"; -import MessageUiHandler from "./message-ui-handler"; -import { getEggTierForSpecies } from "../data/egg"; -import { Button } from "#enums/buttons"; -import PokemonHatchInfoContainer from "./pokemon-hatch-info-container"; -import type { EggHatchData } from "#app/data/egg-hatch-data"; -import ScrollableGridUiHandler from "./scrollable-grid-handler"; -import { HatchedPokemonContainer } from "./hatched-pokemon-container"; -import { ScrollBar } from "#app/ui/scroll-bar"; import { globalScene } from "#app/global-scene"; +import { getEggTierForSpecies } from "#data/egg"; +import type { EggHatchData } from "#data/egg-hatch-data"; +import { Button } from "#enums/buttons"; +import { UiMode } from "#enums/ui-mode"; +import { HatchedPokemonContainer } from "#ui/hatched-pokemon-container"; +import { MessageUiHandler } from "#ui/message-ui-handler"; +import { PokemonHatchInfoContainer } from "#ui/pokemon-hatch-info-container"; +import { PokemonIconAnimHandler, PokemonIconAnimMode } from "#ui/pokemon-icon-anim-handler"; +import { ScrollBar } from "#ui/scroll-bar"; +import { ScrollableGridUiHandler } from "#ui/scrollable-grid-handler"; const iconContainerX = 112; const iconContainerY = 9; @@ -21,7 +21,7 @@ const iconSize = 18; * Handles navigation and display of each pokemon as a list * Also handles display of the pokemon-hatch-info-container */ -export default class EggSummaryUiHandler extends MessageUiHandler { +export class EggSummaryUiHandler extends MessageUiHandler { /** holds all elements in the scene */ private eggHatchContainer: Phaser.GameObjects.Container; /** holds the icon containers and info container */ diff --git a/src/ui/evolution-scene-handler.ts b/src/ui/evolution-scene-handler.ts index 7372fc6f2b5..5ad4fc6fdf5 100644 --- a/src/ui/evolution-scene-handler.ts +++ b/src/ui/evolution-scene-handler.ts @@ -1,10 +1,10 @@ -import MessageUiHandler from "./message-ui-handler"; -import { TextStyle, addTextObject } from "./text"; -import { UiMode } from "#enums/ui-mode"; -import { Button } from "#enums/buttons"; import { globalScene } from "#app/global-scene"; +import { Button } from "#enums/buttons"; +import { UiMode } from "#enums/ui-mode"; +import { MessageUiHandler } from "#ui/message-ui-handler"; +import { addTextObject, TextStyle } from "#ui/text"; -export default class EvolutionSceneHandler extends MessageUiHandler { +export class EvolutionSceneHandler extends MessageUiHandler { public evolutionContainer: Phaser.GameObjects.Container; public messageBg: Phaser.GameObjects.Image; public messageContainer: Phaser.GameObjects.Container; diff --git a/src/ui/fight-ui-handler.ts b/src/ui/fight-ui-handler.ts index 14cd10d0d6f..0b81d4a5ad6 100644 --- a/src/ui/fight-ui-handler.ts +++ b/src/ui/fight-ui-handler.ts @@ -1,24 +1,23 @@ import type { InfoToggle } from "#app/battle-scene"; import { globalScene } from "#app/global-scene"; -import { addTextObject, TextStyle } from "./text"; -import { getTypeDamageMultiplierColor } from "#app/data/type"; -import { PokemonType } from "#enums/pokemon-type"; -import { Command } from "#enums/command"; -import { UiMode } from "#enums/ui-mode"; -import UiHandler from "./ui-handler"; -import { getLocalizedSpriteKey, fixedInt, padInt } from "#app/utils/common"; -import { MoveCategory } from "#enums/MoveCategory"; -import i18next from "i18next"; -import { Button } from "#enums/buttons"; -import type { EnemyPokemon } from "#app/field/pokemon"; -import type { PokemonMove } from "#app/data/moves/pokemon-move"; -import type Pokemon from "#app/field/pokemon"; -import type { CommandPhase } from "#app/phases/command-phase"; -import MoveInfoOverlay from "./move-info-overlay"; +import { getTypeDamageMultiplierColor } from "#data/type"; import { BattleType } from "#enums/battle-type"; +import { Button } from "#enums/buttons"; +import { Command } from "#enums/command"; +import { MoveCategory } from "#enums/MoveCategory"; import { MoveUseMode } from "#enums/move-use-mode"; +import { PokemonType } from "#enums/pokemon-type"; +import { UiMode } from "#enums/ui-mode"; +import type { EnemyPokemon, Pokemon } from "#field/pokemon"; +import type { PokemonMove } from "#moves/pokemon-move"; +import type { CommandPhase } from "#phases/command-phase"; +import { MoveInfoOverlay } from "#ui/move-info-overlay"; +import { addTextObject, TextStyle } from "#ui/text"; +import { UiHandler } from "#ui/ui-handler"; +import { fixedInt, getLocalizedSpriteKey, padInt } from "#utils/common"; +import i18next from "i18next"; -export default class FightUiHandler extends UiHandler implements InfoToggle { +export class FightUiHandler extends UiHandler implements InfoToggle { public static readonly MOVES_CONTAINER_NAME = "moves"; private movesContainer: Phaser.GameObjects.Container; diff --git a/src/ui/filter-bar.ts b/src/ui/filter-bar.ts index 622488c04cd..fa9ea527eaf 100644 --- a/src/ui/filter-bar.ts +++ b/src/ui/filter-bar.ts @@ -1,11 +1,11 @@ -import type { DropDown } from "./dropdown"; -import { DropDownType } from "./dropdown"; -import type { StarterContainer } from "./starter-container"; -import { addTextObject, getTextColor, TextStyle } from "./text"; -import type { UiTheme } from "#enums/ui-theme"; -import { addWindow, WindowVariant } from "./ui-theme"; import { globalScene } from "#app/global-scene"; import type { DropDownColumn } from "#enums/drop-down-column"; +import type { UiTheme } from "#enums/ui-theme"; +import type { DropDown } from "#ui/dropdown"; +import { DropDownType } from "#ui/dropdown"; +import type { StarterContainer } from "#ui/starter-container"; +import { addTextObject, getTextColor, TextStyle } from "#ui/text"; +import { addWindow, WindowVariant } from "#ui/ui-theme"; export class FilterBar extends Phaser.GameObjects.Container { private window: Phaser.GameObjects.NineSlice; diff --git a/src/ui/filter-text.ts b/src/ui/filter-text.ts index 7e27a806478..4a9012e44fc 100644 --- a/src/ui/filter-text.ts +++ b/src/ui/filter-text.ts @@ -1,12 +1,12 @@ -import type { StarterContainer } from "./starter-container"; -import { addTextObject, getTextColor, TextStyle } from "./text"; -import type { UiTheme } from "#enums/ui-theme"; -import { addWindow, WindowVariant } from "./ui-theme"; -import i18next from "i18next"; -import type AwaitableUiHandler from "./awaitable-ui-handler"; -import type UI from "./ui"; -import { UiMode } from "#enums/ui-mode"; import { globalScene } from "#app/global-scene"; +import { UiMode } from "#enums/ui-mode"; +import type { UiTheme } from "#enums/ui-theme"; +import type { AwaitableUiHandler } from "#ui/awaitable-ui-handler"; +import type { StarterContainer } from "#ui/starter-container"; +import { addTextObject, getTextColor, TextStyle } from "#ui/text"; +import type { UI } from "#ui/ui"; +import { addWindow, WindowVariant } from "#ui/ui-theme"; +import i18next from "i18next"; export enum FilterTextRow { NAME, diff --git a/src/ui/form-modal-ui-handler.ts b/src/ui/form-modal-ui-handler.ts index 8c30b4e0bc4..35965b09b80 100644 --- a/src/ui/form-modal-ui-handler.ts +++ b/src/ui/form-modal-ui-handler.ts @@ -1,12 +1,12 @@ -import type { ModalConfig } from "./modal-ui-handler"; -import { ModalUiHandler } from "./modal-ui-handler"; -import type { UiMode } from "#enums/ui-mode"; -import { TextStyle, addTextInputObject, addTextObject } from "./text"; -import { WindowVariant, addWindow } from "./ui-theme"; -import type InputText from "phaser3-rex-plugins/plugins/inputtext"; -import { fixedInt } from "#app/utils/common"; -import { Button } from "#enums/buttons"; import { globalScene } from "#app/global-scene"; +import { Button } from "#enums/buttons"; +import type { UiMode } from "#enums/ui-mode"; +import type { ModalConfig } from "#ui/modal-ui-handler"; +import { ModalUiHandler } from "#ui/modal-ui-handler"; +import { addTextInputObject, addTextObject, TextStyle } from "#ui/text"; +import { addWindow, WindowVariant } from "#ui/ui-theme"; +import { fixedInt } from "#utils/common"; +import type InputText from "phaser3-rex-plugins/plugins/inputtext"; export interface FormModalConfig extends ModalConfig { errorMessage?: string; diff --git a/src/ui/game-stats-ui-handler.ts b/src/ui/game-stats-ui-handler.ts index 4213a244fdb..e1a03a5fd32 100644 --- a/src/ui/game-stats-ui-handler.ts +++ b/src/ui/game-stats-ui-handler.ts @@ -1,16 +1,16 @@ -import Phaser from "phaser"; -import { TextStyle, addTextObject } from "#app/ui/text"; -import type { UiMode } from "#enums/ui-mode"; -import UiHandler from "#app/ui/ui-handler"; -import { addWindow } from "#app/ui/ui-theme"; -import { getPlayTimeString, formatFancyLargeNumber, toReadableString } from "#app/utils/common"; -import type { GameData } from "#app/system/game-data"; -import { DexAttr } from "#enums/dex-attr"; -import { speciesStarterCosts } from "#app/data/balance/starters"; -import { Button } from "#enums/buttons"; -import i18next from "i18next"; -import { UiTheme } from "#enums/ui-theme"; import { globalScene } from "#app/global-scene"; +import { speciesStarterCosts } from "#balance/starters"; +import { Button } from "#enums/buttons"; +import { DexAttr } from "#enums/dex-attr"; +import type { UiMode } from "#enums/ui-mode"; +import { UiTheme } from "#enums/ui-theme"; +import type { GameData } from "#system/game-data"; +import { addTextObject, TextStyle } from "#ui/text"; +import { UiHandler } from "#ui/ui-handler"; +import { addWindow } from "#ui/ui-theme"; +import { formatFancyLargeNumber, getPlayTimeString, toReadableString } from "#utils/common"; +import i18next from "i18next"; +import Phaser from "phaser"; interface DisplayStat { label_key?: string; @@ -213,7 +213,7 @@ const displayStats: DisplayStats = { }, }; -export default class GameStatsUiHandler extends UiHandler { +export class GameStatsUiHandler extends UiHandler { private gameStatsContainer: Phaser.GameObjects.Container; private statsContainer: Phaser.GameObjects.Container; diff --git a/src/ui/hatched-pokemon-container.ts b/src/ui/hatched-pokemon-container.ts index 8b9a5309a9c..a5919348a94 100644 --- a/src/ui/hatched-pokemon-container.ts +++ b/src/ui/hatched-pokemon-container.ts @@ -1,11 +1,11 @@ -import type { EggHatchData } from "#app/data/egg-hatch-data"; -import { Gender } from "#app/data/gender"; -import { getVariantTint } from "#app/sprites/variant"; -import { DexAttr } from "#enums/dex-attr"; import { globalScene } from "#app/global-scene"; -import type PokemonSpecies from "#app/data/pokemon-species"; -import type PokemonIconAnimHandler from "./pokemon-icon-anim-handler"; -import { PokemonIconAnimMode } from "./pokemon-icon-anim-handler"; +import type { EggHatchData } from "#data/egg-hatch-data"; +import { Gender } from "#data/gender"; +import type { PokemonSpecies } from "#data/pokemon-species"; +import { DexAttr } from "#enums/dex-attr"; +import { getVariantTint } from "#sprites/variant"; +import type { PokemonIconAnimHandler } from "#ui/pokemon-icon-anim-handler"; +import { PokemonIconAnimMode } from "#ui/pokemon-icon-anim-handler"; /** * A container for a Pokemon's sprite and icons to get displayed in the egg summary screen diff --git a/src/ui/loading-modal-ui-handler.ts b/src/ui/loading-modal-ui-handler.ts index 13dffe5614c..585d70d51db 100644 --- a/src/ui/loading-modal-ui-handler.ts +++ b/src/ui/loading-modal-ui-handler.ts @@ -1,9 +1,9 @@ -import i18next from "i18next"; -import { ModalUiHandler } from "./modal-ui-handler"; -import { addTextObject, TextStyle } from "./text"; import type { UiMode } from "#enums/ui-mode"; +import { ModalUiHandler } from "#ui/modal-ui-handler"; +import { addTextObject, TextStyle } from "#ui/text"; +import i18next from "i18next"; -export default class LoadingModalUiHandler extends ModalUiHandler { +export class LoadingModalUiHandler extends ModalUiHandler { constructor(mode: UiMode | null = null) { super(mode); } diff --git a/src/ui/login-form-ui-handler.ts b/src/ui/login-form-ui-handler.ts index 5c48cf55753..417a9031bf7 100644 --- a/src/ui/login-form-ui-handler.ts +++ b/src/ui/login-form-ui-handler.ts @@ -1,14 +1,14 @@ -import type { InputFieldConfig } from "./form-modal-ui-handler"; -import { FormModalUiHandler } from "./form-modal-ui-handler"; -import type { ModalConfig } from "./modal-ui-handler"; -import { fixedInt } from "#app/utils/common"; -import { UiMode } from "#enums/ui-mode"; -import i18next from "i18next"; -import { addTextObject, TextStyle } from "./text"; -import { addWindow } from "./ui-theme"; -import type { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler"; -import { pokerogueApi } from "#app/plugins/api/pokerogue-api"; +import { pokerogueApi } from "#api/pokerogue-api"; import { globalScene } from "#app/global-scene"; +import { UiMode } from "#enums/ui-mode"; +import type { OptionSelectItem } from "#ui/abstact-option-select-ui-handler"; +import type { InputFieldConfig } from "#ui/form-modal-ui-handler"; +import { FormModalUiHandler } from "#ui/form-modal-ui-handler"; +import type { ModalConfig } from "#ui/modal-ui-handler"; +import { addTextObject, TextStyle } from "#ui/text"; +import { addWindow } from "#ui/ui-theme"; +import { fixedInt } from "#utils/common"; +import i18next from "i18next"; import JSZip from "jszip"; interface BuildInteractableImageOpts { @@ -18,7 +18,7 @@ interface BuildInteractableImageOpts { origin?: { x: number; y: number }; } -export default class LoginFormUiHandler extends FormModalUiHandler { +export class LoginFormUiHandler extends FormModalUiHandler { private readonly ERR_USERNAME: string = "invalid username"; private readonly ERR_PASSWORD: string = "invalid password"; private readonly ERR_ACCOUNT_EXIST: string = "account doesn't exist"; diff --git a/src/ui/menu-ui-handler.ts b/src/ui/menu-ui-handler.ts index 5ab1d4f9e96..bb3c3f7bc4e 100644 --- a/src/ui/menu-ui-handler.ts +++ b/src/ui/menu-ui-handler.ts @@ -1,22 +1,22 @@ -import { bypassLogin } from "#app/global-vars/bypass-login"; +import { pokerogueApi } from "#api/pokerogue-api"; +import { loggedInUser, updateUserInfo } from "#app/account"; import { globalScene } from "#app/global-scene"; -import { TextStyle, addTextObject, getTextStyleOptions } from "./text"; -import { UiMode } from "#enums/ui-mode"; -import { getEnumKeys, isLocal, fixedInt, sessionIdKey } from "#app/utils/common"; -import { isBeta } from "#app/utils/utility-vars"; -import { getCookie } from "#app/utils/cookies"; -import { addWindow, WindowVariant } from "./ui-theme"; -import MessageUiHandler from "./message-ui-handler"; -import type { OptionSelectConfig, OptionSelectItem } from "./abstact-option-select-ui-handler"; -import { Tutorial, handleTutorial } from "../tutorial"; -import { loggedInUser, updateUserInfo } from "../account"; -import i18next from "i18next"; +import { bypassLogin } from "#app/global-vars/bypass-login"; +import { handleTutorial, Tutorial } from "#app/tutorial"; import { Button } from "#enums/buttons"; import { GameDataType } from "#enums/game-data-type"; -import BgmBar from "#app/ui/bgm-bar"; -import type AwaitableUiHandler from "./awaitable-ui-handler"; -import { AdminMode, getAdminModeName } from "./admin-ui-handler"; -import { pokerogueApi } from "#app/plugins/api/pokerogue-api"; +import { UiMode } from "#enums/ui-mode"; +import type { OptionSelectConfig, OptionSelectItem } from "#ui/abstact-option-select-ui-handler"; +import { AdminMode, getAdminModeName } from "#ui/admin-ui-handler"; +import type { AwaitableUiHandler } from "#ui/awaitable-ui-handler"; +import { BgmBar } from "#ui/bgm-bar"; +import { MessageUiHandler } from "#ui/message-ui-handler"; +import { addTextObject, getTextStyleOptions, TextStyle } from "#ui/text"; +import { addWindow, WindowVariant } from "#ui/ui-theme"; +import { fixedInt, getEnumKeys, isLocal, sessionIdKey } from "#utils/common"; +import { getCookie } from "#utils/cookies"; +import { isBeta } from "#utils/utility-vars"; +import i18next from "i18next"; enum MenuOptions { GAME_SETTINGS, @@ -37,7 +37,7 @@ const githubUrl = "https://github.com/pagefaultgames/pokerogue"; const redditUrl = "https://www.reddit.com/r/pokerogue"; const donateUrl = "https://github.com/sponsors/pagefaultgames"; -export default class MenuUiHandler extends MessageUiHandler { +export class MenuUiHandler extends MessageUiHandler { private readonly textPadding = 8; private readonly defaultMessageBoxWidth = 220; private readonly defaultWordWrapWidth = 1224; diff --git a/src/ui/message-ui-handler.ts b/src/ui/message-ui-handler.ts index efa53b63808..57f054c9bf9 100644 --- a/src/ui/message-ui-handler.ts +++ b/src/ui/message-ui-handler.ts @@ -1,9 +1,9 @@ -import AwaitableUiHandler from "./awaitable-ui-handler"; -import type { UiMode } from "#enums/ui-mode"; -import { getFrameMs } from "#app/utils/common"; import { globalScene } from "#app/global-scene"; +import type { UiMode } from "#enums/ui-mode"; +import { AwaitableUiHandler } from "#ui/awaitable-ui-handler"; +import { getFrameMs } from "#utils/common"; -export default abstract class MessageUiHandler extends AwaitableUiHandler { +export abstract class MessageUiHandler extends AwaitableUiHandler { protected textTimer: Phaser.Time.TimerEvent | null; protected textCallbackTimer: Phaser.Time.TimerEvent | null; public pendingPrompt: boolean; diff --git a/src/ui/modal-ui-handler.ts b/src/ui/modal-ui-handler.ts index 56c1c2c3fcf..844f7f43930 100644 --- a/src/ui/modal-ui-handler.ts +++ b/src/ui/modal-ui-handler.ts @@ -1,9 +1,9 @@ -import { TextStyle, addTextObject } from "./text"; -import type { UiMode } from "#enums/ui-mode"; -import UiHandler from "./ui-handler"; -import { WindowVariant, addWindow } from "./ui-theme"; -import type { Button } from "#enums/buttons"; import { globalScene } from "#app/global-scene"; +import type { Button } from "#enums/buttons"; +import type { UiMode } from "#enums/ui-mode"; +import { addTextObject, TextStyle } from "#ui/text"; +import { UiHandler } from "#ui/ui-handler"; +import { addWindow, WindowVariant } from "#ui/ui-theme"; export interface ModalConfig { buttonActions: Function[]; diff --git a/src/ui/modifier-select-ui-handler.ts b/src/ui/modifier-select-ui-handler.ts index 7f5bf997f88..a44023f6de4 100644 --- a/src/ui/modifier-select-ui-handler.ts +++ b/src/ui/modifier-select-ui-handler.ts @@ -1,28 +1,28 @@ import { globalScene } from "#app/global-scene"; -import type { ModifierTypeOption } from "../modifier/modifier-type"; -import { getPlayerShopModifierTypeOptionsForWave, TmModifierType } from "../modifier/modifier-type"; -import { getPokeballAtlasKey } from "#app/data/pokeball"; -import { addTextObject, getTextStyleOptions, getModifierTierTextTint, getTextColor, TextStyle } from "./text"; -import AwaitableUiHandler from "./awaitable-ui-handler"; -import { UiMode } from "#enums/ui-mode"; -import { LockModifierTiersModifier, PokemonHeldItemModifier, HealShopCostModifier } from "../modifier/modifier"; -import { handleTutorial, Tutorial } from "../tutorial"; -import { Button } from "#enums/buttons"; -import MoveInfoOverlay from "./move-info-overlay"; -import { allMoves } from "#app/data/data-lists"; -import { formatMoney, NumberHolder } from "#app/utils/common"; import Overrides from "#app/overrides"; -import i18next from "i18next"; -import { ShopCursorTarget } from "#app/enums/shop-cursor-target"; -import Phaser from "phaser"; +import { handleTutorial, Tutorial } from "#app/tutorial"; +import { allMoves } from "#data/data-lists"; +import { getPokeballAtlasKey } from "#data/pokeball"; +import { Button } from "#enums/buttons"; import type { PokeballType } from "#enums/pokeball"; +import { ShopCursorTarget } from "#enums/shop-cursor-target"; +import { UiMode } from "#enums/ui-mode"; +import { HealShopCostModifier, LockModifierTiersModifier, PokemonHeldItemModifier } from "#modifiers/modifier"; +import type { ModifierTypeOption } from "#modifiers/modifier-type"; +import { getPlayerShopModifierTypeOptionsForWave, TmModifierType } from "#modifiers/modifier-type"; +import { AwaitableUiHandler } from "#ui/awaitable-ui-handler"; +import { MoveInfoOverlay } from "#ui/move-info-overlay"; +import { addTextObject, getModifierTierTextTint, getTextColor, getTextStyleOptions, TextStyle } from "#ui/text"; +import { formatMoney, NumberHolder } from "#utils/common"; +import i18next from "i18next"; +import Phaser from "phaser"; export const SHOP_OPTIONS_ROW_LIMIT = 7; const SINGLE_SHOP_ROW_YOFFSET = 12; const DOUBLE_SHOP_ROW_YOFFSET = 24; const OPTION_BUTTON_YPOSITION = -62; -export default class ModifierSelectUiHandler extends AwaitableUiHandler { +export class ModifierSelectUiHandler extends AwaitableUiHandler { private modifierContainer: Phaser.GameObjects.Container; private rerollButtonContainer: Phaser.GameObjects.Container; private lockRarityButtonContainer: Phaser.GameObjects.Container; diff --git a/src/ui/move-info-overlay.ts b/src/ui/move-info-overlay.ts index 2b230d609fd..abf41c3640f 100644 --- a/src/ui/move-info-overlay.ts +++ b/src/ui/move-info-overlay.ts @@ -1,11 +1,11 @@ import type { InfoToggle } from "#app/battle-scene"; import { globalScene } from "#app/global-scene"; -import { TextStyle, addTextObject } from "./text"; -import { addWindow } from "./ui-theme"; -import { getLocalizedSpriteKey, fixedInt } from "#app/utils/common"; -import type Move from "../data/moves/move"; import { MoveCategory } from "#enums/MoveCategory"; import { PokemonType } from "#enums/pokemon-type"; +import type { Move } from "#moves/move"; +import { addTextObject, TextStyle } from "#ui/text"; +import { addWindow } from "#ui/ui-theme"; +import { fixedInt, getLocalizedSpriteKey } from "#utils/common"; import i18next from "i18next"; export interface MoveInfoOverlaySettings { @@ -30,7 +30,7 @@ const DESC_HEIGHT = 48; const BORDER = 8; const GLOBAL_SCALE = 6; -export default class MoveInfoOverlay extends Phaser.GameObjects.Container implements InfoToggle { +export class MoveInfoOverlay extends Phaser.GameObjects.Container implements InfoToggle { public active = false; private move: Move; diff --git a/src/ui/mystery-encounter-ui-handler.ts b/src/ui/mystery-encounter-ui-handler.ts index 7d4ec845209..60bd05396bd 100644 --- a/src/ui/mystery-encounter-ui-handler.ts +++ b/src/ui/mystery-encounter-ui-handler.ts @@ -1,22 +1,22 @@ -import { addBBCodeTextObject, getBBCodeFrag, TextStyle } from "./text"; -import { UiMode } from "#enums/ui-mode"; -import UiHandler from "./ui-handler"; +import { globalScene } from "#app/global-scene"; +import { getPokeballAtlasKey } from "#data/pokeball"; import { Button } from "#enums/buttons"; -import { addWindow, WindowVariant } from "./ui-theme"; -import type { MysteryEncounterPhase } from "../phases/mystery-encounter-phases"; -import { PartyUiMode } from "./party-ui-handler"; -import type MysteryEncounterOption from "#app/data/mystery-encounters/mystery-encounter-option"; -import { fixedInt, isNullOrUndefined } from "#app/utils/common"; -import { getPokeballAtlasKey } from "../data/pokeball"; -import type { OptionSelectSettings } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { getEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; -import i18next from "i18next"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { UiMode } from "#enums/ui-mode"; +import { getEncounterText } from "#mystery-encounters/encounter-dialogue-utils"; +import type { OptionSelectSettings } from "#mystery-encounters/encounter-phase-utils"; +import type { MysteryEncounterOption } from "#mystery-encounters/mystery-encounter-option"; +import type { MysteryEncounterPhase } from "#phases/mystery-encounter-phases"; +import { PartyUiMode } from "#ui/party-ui-handler"; +import { addBBCodeTextObject, getBBCodeFrag, TextStyle } from "#ui/text"; +import { UiHandler } from "#ui/ui-handler"; +import { addWindow, WindowVariant } from "#ui/ui-theme"; +import { fixedInt, isNullOrUndefined } from "#utils/common"; +import i18next from "i18next"; import type BBCodeText from "phaser3-rex-plugins/plugins/bbcodetext"; -import { globalScene } from "#app/global-scene"; -export default class MysteryEncounterUiHandler extends UiHandler { +export class MysteryEncounterUiHandler extends UiHandler { private cursorContainer: Phaser.GameObjects.Container; private cursorObj?: Phaser.GameObjects.Image; diff --git a/src/ui/party-exp-bar.ts b/src/ui/party-exp-bar.ts index 7b7f5277ca1..0d6ec936a92 100644 --- a/src/ui/party-exp-bar.ts +++ b/src/ui/party-exp-bar.ts @@ -1,9 +1,9 @@ import { globalScene } from "#app/global-scene"; -import type Pokemon from "../field/pokemon"; -import { TextStyle, addTextObject } from "./text"; +import type { Pokemon } from "#field/pokemon"; +import { addTextObject, TextStyle } from "#ui/text"; import i18next from "i18next"; -export default class PartyExpBar extends Phaser.GameObjects.Container { +export class PartyExpBar extends Phaser.GameObjects.Container { private bg: Phaser.GameObjects.NineSlice; private pokemonIcon: Phaser.GameObjects.Container; private expText: Phaser.GameObjects.Text; diff --git a/src/ui/party-ui-handler.ts b/src/ui/party-ui-handler.ts index 60e9e846859..e33371e29bf 100644 --- a/src/ui/party-ui-handler.ts +++ b/src/ui/party-ui-handler.ts @@ -1,34 +1,33 @@ -import type { PlayerPokemon } from "#app/field/pokemon"; -import type { TurnMove } from "#app/@types/turn-move"; -import type { PokemonMove } from "#app/data/moves/pokemon-move"; -import type Pokemon from "#app/field/pokemon"; -import { MoveResult } from "#enums/move-result"; -import { addBBCodeTextObject, addTextObject, getTextColor, TextStyle } from "#app/ui/text"; -import { Command } from "#enums/command"; -import MessageUiHandler from "#app/ui/message-ui-handler"; -import { UiMode } from "#enums/ui-mode"; -import { BooleanHolder, toReadableString, randInt, getLocalizedSpriteKey } from "#app/utils/common"; -import type { PokemonFormChangeItemModifier, PokemonHeldItemModifier } from "#app/modifier/modifier"; -import { allMoves } from "#app/data/data-lists"; -import { Gender, getGenderColor, getGenderSymbol } from "#app/data/gender"; -import { StatusEffect } from "#enums/status-effect"; -import PokemonIconAnimHandler, { PokemonIconAnimMode } from "#app/ui/pokemon-icon-anim-handler"; -import { pokemonEvolutions } from "#app/data/balance/pokemon-evolutions"; -import { addWindow } from "#app/ui/ui-theme"; -import { SpeciesFormChangeItemTrigger } from "#app/data/pokemon-forms/form-change-triggers"; -import { FormChangeItem } from "#enums/form-change-item"; -import { getVariantTint } from "#app/sprites/variant"; +import { globalScene } from "#app/global-scene"; +import { getPokemonNameWithAffix } from "#app/messages"; +import { pokemonEvolutions } from "#balance/pokemon-evolutions"; +import { applyChallenges } from "#data/challenge"; +import { allMoves } from "#data/data-lists"; +import { SpeciesFormChangeItemTrigger } from "#data/form-change-triggers"; +import { Gender, getGenderColor, getGenderSymbol } from "#data/gender"; import { Button } from "#enums/buttons"; -import { applyChallenges } from "#app/data/challenge"; import { ChallengeType } from "#enums/challenge-type"; -import MoveInfoOverlay from "#app/ui/move-info-overlay"; +import { Command } from "#enums/command"; +import { FormChangeItem } from "#enums/form-change-item"; +import { MoveId } from "#enums/move-id"; +import { MoveResult } from "#enums/move-result"; +import { SpeciesId } from "#enums/species-id"; +import { StatusEffect } from "#enums/status-effect"; +import { UiMode } from "#enums/ui-mode"; +import type { PlayerPokemon, Pokemon } from "#field/pokemon"; +import type { PokemonFormChangeItemModifier, PokemonHeldItemModifier } from "#modifiers/modifier"; +import type { PokemonMove } from "#moves/pokemon-move"; +import type { CommandPhase } from "#phases/command-phase"; +import { getVariantTint } from "#sprites/variant"; +import type { TurnMove } from "#types/turn-move"; +import { MessageUiHandler } from "#ui/message-ui-handler"; +import { MoveInfoOverlay } from "#ui/move-info-overlay"; +import { PokemonIconAnimHandler, PokemonIconAnimMode } from "#ui/pokemon-icon-anim-handler"; +import { addBBCodeTextObject, addTextObject, getTextColor, TextStyle } from "#ui/text"; +import { addWindow } from "#ui/ui-theme"; +import { BooleanHolder, getLocalizedSpriteKey, randInt, toReadableString } from "#utils/common"; import i18next from "i18next"; import type BBCodeText from "phaser3-rex-plugins/plugins/bbcodetext"; -import { MoveId } from "#enums/move-id"; -import { SpeciesId } from "#enums/species-id"; -import { getPokemonNameWithAffix } from "#app/messages"; -import type { CommandPhase } from "#app/phases/command-phase"; -import { globalScene } from "#app/global-scene"; const defaultMessage = i18next.t("partyUiHandler:choosePokemon"); @@ -145,7 +144,7 @@ export type PokemonModifierTransferSelectFilter = ( ) => string | null; export type PokemonMoveSelectFilter = (pokemonMove: PokemonMove) => string | null; -export default class PartyUiHandler extends MessageUiHandler { +export class PartyUiHandler extends MessageUiHandler { private partyUiMode: PartyUiMode; private fieldIndex: number; diff --git a/src/ui/pokeball-tray.ts b/src/ui/pokeball-tray.ts index 0bf47699cdb..9720aa42090 100644 --- a/src/ui/pokeball-tray.ts +++ b/src/ui/pokeball-tray.ts @@ -1,7 +1,7 @@ import { globalScene } from "#app/global-scene"; -import type Pokemon from "../field/pokemon"; +import type { Pokemon } from "#field/pokemon"; -export default class PokeballTray extends Phaser.GameObjects.Container { +export class PokeballTray extends Phaser.GameObjects.Container { private player: boolean; private bg: Phaser.GameObjects.NineSlice; diff --git a/src/ui/pokedex-info-overlay.ts b/src/ui/pokedex-info-overlay.ts index 2e889f6d2a9..e4cb7eafdef 100644 --- a/src/ui/pokedex-info-overlay.ts +++ b/src/ui/pokedex-info-overlay.ts @@ -1,9 +1,9 @@ -import type { InfoToggle } from "../battle-scene"; -import { TextStyle, addTextObject } from "./text"; -import { addWindow } from "./ui-theme"; -import { fixedInt } from "#app/utils/common"; -import i18next from "i18next"; +import type { InfoToggle } from "#app/battle-scene"; import { globalScene } from "#app/global-scene"; +import { addTextObject, TextStyle } from "#ui/text"; +import { addWindow } from "#ui/ui-theme"; +import { fixedInt } from "#utils/common"; +import i18next from "i18next"; export interface PokedexInfoOverlaySettings { delayVisibility?: boolean; // if true, showing the overlay will only set it to active and populate the fields and the handler using this field has to manually call setVisible later. @@ -22,7 +22,7 @@ const DESC_HEIGHT = 48; const BORDER = 8; const GLOBAL_SCALE = 6; -export default class PokedexInfoOverlay extends Phaser.GameObjects.Container implements InfoToggle { +export class PokedexInfoOverlay extends Phaser.GameObjects.Container implements InfoToggle { public active = false; private desc: Phaser.GameObjects.Text; diff --git a/src/ui/pokedex-mon-container.ts b/src/ui/pokedex-mon-container.ts index da79320850d..73799870e6b 100644 --- a/src/ui/pokedex-mon-container.ts +++ b/src/ui/pokedex-mon-container.ts @@ -1,8 +1,8 @@ -import type { Variant } from "#app/sprites/variant"; import { globalScene } from "#app/global-scene"; -import { isNullOrUndefined } from "#app/utils/common"; -import type PokemonSpecies from "../data/pokemon-species"; -import { addTextObject, TextStyle } from "./text"; +import type { PokemonSpecies } from "#data/pokemon-species"; +import type { Variant } from "#sprites/variant"; +import { addTextObject, TextStyle } from "#ui/text"; +import { isNullOrUndefined } from "#utils/common"; interface SpeciesDetails { shiny?: boolean; diff --git a/src/ui/pokedex-page-ui-handler.ts b/src/ui/pokedex-page-ui-handler.ts index 9ec74e70b23..7c34f878a2e 100644 --- a/src/ui/pokedex-page-ui-handler.ts +++ b/src/ui/pokedex-page-ui-handler.ts @@ -1,72 +1,70 @@ -import type { SpeciesFormEvolution } from "#app/data/balance/pokemon-evolutions"; -import { pokemonEvolutions, pokemonPrevolutions, pokemonStarters } from "#app/data/balance/pokemon-evolutions"; -import type { Variant } from "#app/sprites/variant"; -import { getVariantTint, getVariantIcon } from "#app/sprites/variant"; -import { argbFromRgba } from "@material/material-color-utilities"; -import i18next from "i18next"; +import { globalScene } from "#app/global-scene"; import { starterColors } from "#app/global-vars/starter-colors"; -import { allAbilities } from "#app/data/data-lists"; -import { speciesEggMoves } from "#app/data/balance/egg-moves"; -import { GrowthRate, getGrowthRateColor } from "#app/data/exp"; -import { Gender, getGenderColor, getGenderSymbol } from "#app/data/gender"; -import { allMoves } from "#app/data/data-lists"; -import { getNatureName } from "#app/data/nature"; -import type { SpeciesFormChange } from "#app/data/pokemon-forms"; -import { pokemonFormChanges } from "#app/data/pokemon-forms"; -import type { LevelMoves } from "#app/data/balance/pokemon-level-moves"; -import { pokemonFormLevelMoves, pokemonSpeciesLevelMoves } from "#app/data/balance/pokemon-level-moves"; -import type PokemonSpecies from "#app/data/pokemon-species"; -import { getPokemonSpeciesForm, normalForm } from "#app/data/pokemon-species"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; -import { allSpecies } from "#app/data/data-lists"; -import { getStarterValueFriendshipCap, speciesStarterCosts } from "#app/data/balance/starters"; -import { starterPassiveAbilities } from "#app/data/balance/passives"; -import { PokemonType } from "#enums/pokemon-type"; -import type { StarterAttributes } from "#app/system/game-data"; -import type { DexEntry } from "#app/@types/dex-data"; -import { AbilityAttr } from "#enums/ability-attr"; -import { DexAttr } from "#enums/dex-attr"; -import type { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler"; -import MessageUiHandler from "#app/ui/message-ui-handler"; -import { StatsContainer } from "#app/ui/stats-container"; -import { TextStyle, addBBCodeTextObject, addTextObject, getTextColor, getTextStyleOptions } from "#app/ui/text"; -import { UiMode } from "#enums/ui-mode"; -import { addWindow } from "#app/ui/ui-theme"; -import { Egg } from "#app/data/egg"; import Overrides from "#app/overrides"; -import { SettingKeyboard } from "#app/system/settings/settings-keyboard"; -import { Passive as PassiveAttr } from "#enums/passive"; -import MoveInfoOverlay from "#app/ui/move-info-overlay"; -import PokedexInfoOverlay from "#app/ui/pokedex-info-overlay"; -import { getEggTierForSpecies } from "#app/data/egg"; -import { Device } from "#enums/devices"; -import type { MoveId } from "#enums/move-id"; -import { SpeciesId } from "#enums/species-id"; -import { Button } from "#enums/buttons"; -import { EggSourceType } from "#enums/egg-source-types"; +import type { BiomeTierTod } from "#balance/biomes"; +import { BiomePoolTier, catchableSpecies } from "#balance/biomes"; +import { speciesEggMoves } from "#balance/egg-moves"; +import { starterPassiveAbilities } from "#balance/passives"; +import type { SpeciesFormEvolution } from "#balance/pokemon-evolutions"; +import { pokemonEvolutions, pokemonPrevolutions, pokemonStarters } from "#balance/pokemon-evolutions"; +import type { LevelMoves } from "#balance/pokemon-level-moves"; +import { pokemonFormLevelMoves, pokemonSpeciesLevelMoves } from "#balance/pokemon-level-moves"; import { getPassiveCandyCount, - getValueReductionCandyCounts, getSameSpeciesEggCandyCounts, -} from "#app/data/balance/starters"; + getStarterValueFriendshipCap, + getValueReductionCandyCounts, + speciesStarterCosts, +} from "#balance/starters"; +import { speciesTmMoves } from "#balance/tms"; +import { allAbilities, allMoves, allSpecies } from "#data/data-lists"; +import { Egg, getEggTierForSpecies } from "#data/egg"; +import { GrowthRate, getGrowthRateColor } from "#data/exp"; +import { Gender, getGenderColor, getGenderSymbol } from "#data/gender"; +import { getNatureName } from "#data/nature"; +import type { SpeciesFormChange } from "#data/pokemon-forms"; +import { pokemonFormChanges } from "#data/pokemon-forms"; +import type { PokemonSpecies } from "#data/pokemon-species"; +import { getPokemonSpeciesForm, normalForm } from "#data/pokemon-species"; +import { AbilityAttr } from "#enums/ability-attr"; +import type { AbilityId } from "#enums/ability-id"; +import { BiomeId } from "#enums/biome-id"; +import { Button } from "#enums/buttons"; +import { Device } from "#enums/devices"; +import { DexAttr } from "#enums/dex-attr"; +import { EggSourceType } from "#enums/egg-source-types"; +import type { MoveId } from "#enums/move-id"; +import type { Nature } from "#enums/nature"; +import { Passive as PassiveAttr } from "#enums/passive"; +import { PokemonType } from "#enums/pokemon-type"; +import { SpeciesId } from "#enums/species-id"; +import { TimeOfDay } from "#enums/time-of-day"; +import { UiMode } from "#enums/ui-mode"; +import type { Variant } from "#sprites/variant"; +import { getVariantIcon, getVariantTint } from "#sprites/variant"; +import type { StarterAttributes } from "#system/game-data"; +import { SettingKeyboard } from "#system/settings-keyboard"; +import type { DexEntry } from "#types/dex-data"; +import type { OptionSelectItem } from "#ui/abstact-option-select-ui-handler"; +import { BaseStatsOverlay } from "#ui/base-stats-overlay"; +import { MessageUiHandler } from "#ui/message-ui-handler"; +import { MoveInfoOverlay } from "#ui/move-info-overlay"; +import { PokedexInfoOverlay } from "#ui/pokedex-info-overlay"; +import { StatsContainer } from "#ui/stats-container"; +import { addBBCodeTextObject, addTextObject, getTextColor, getTextStyleOptions, TextStyle } from "#ui/text"; +import { addWindow } from "#ui/ui-theme"; import { BooleanHolder, + getEnumKeys, getLocalizedSpriteKey, isNullOrUndefined, padInt, rgbHexToRgba, toReadableString, -} from "#app/utils/common"; -import type { Nature } from "#enums/nature"; -import { getEnumKeys } from "#app/utils/common"; -import { speciesTmMoves } from "#app/data/balance/tms"; -import type { BiomeTierTod } from "#app/data/balance/biomes"; -import { BiomePoolTier, catchableSpecies } from "#app/data/balance/biomes"; -import { BiomeId } from "#enums/biome-id"; -import { TimeOfDay } from "#app/enums/time-of-day"; -import type { AbilityId } from "#enums/ability-id"; -import { BaseStatsOverlay } from "#app/ui/base-stats-overlay"; -import { globalScene } from "#app/global-scene"; +} from "#utils/common"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; +import { argbFromRgba } from "@material/material-color-utilities"; +import i18next from "i18next"; import type BBCodeText from "phaser3-rex-plugins/plugins/gameobjects/tagtext/bbcodetext/BBCodeText"; interface LanguageSetting { @@ -152,7 +150,7 @@ enum MenuOptions { EVOLUTIONS, } -export default class PokedexPageUiHandler extends MessageUiHandler { +export class PokedexPageUiHandler extends MessageUiHandler { private starterSelectContainer: Phaser.GameObjects.Container; private shinyOverlay: Phaser.GameObjects.Image; private pokemonNumberText: Phaser.GameObjects.Text; diff --git a/src/ui/pokedex-scan-ui-handler.ts b/src/ui/pokedex-scan-ui-handler.ts index 2bffc464793..bcf869f6f39 100644 --- a/src/ui/pokedex-scan-ui-handler.ts +++ b/src/ui/pokedex-scan-ui-handler.ts @@ -1,17 +1,15 @@ -import type { InputFieldConfig } from "./form-modal-ui-handler"; -import { FormModalUiHandler } from "./form-modal-ui-handler"; -import type { ModalConfig } from "./modal-ui-handler"; -import type { PlayerPokemon } from "#app/field/pokemon"; -import type { OptionSelectItem } from "./abstact-option-select-ui-handler"; -import { isNullOrUndefined } from "#app/utils/common"; +import { allAbilities, allMoves, allSpecies } from "#data/data-lists"; import { UiMode } from "#enums/ui-mode"; -import { FilterTextRow } from "./filter-text"; -import { allAbilities } from "#app/data/data-lists"; -import { allMoves } from "#app/data/data-lists"; -import { allSpecies } from "#app/data/data-lists"; +import type { PlayerPokemon } from "#field/pokemon"; +import type { OptionSelectItem } from "#ui/abstact-option-select-ui-handler"; +import { FilterTextRow } from "#ui/filter-text"; +import type { InputFieldConfig } from "#ui/form-modal-ui-handler"; +import { FormModalUiHandler } from "#ui/form-modal-ui-handler"; +import type { ModalConfig } from "#ui/modal-ui-handler"; +import { isNullOrUndefined } from "#utils/common"; import i18next from "i18next"; -export default class PokedexScanUiHandler extends FormModalUiHandler { +export class PokedexScanUiHandler extends FormModalUiHandler { keys: string[]; reducedKeys: string[]; parallelKeys: string[]; diff --git a/src/ui/pokedex-ui-handler.ts b/src/ui/pokedex-ui-handler.ts index 9169ca77999..b9659debd1f 100644 --- a/src/ui/pokedex-ui-handler.ts +++ b/src/ui/pokedex-ui-handler.ts @@ -1,53 +1,52 @@ -import type { Variant } from "#app/sprites/variant"; -import { getVariantTint, getVariantIcon } from "#app/sprites/variant"; -import { argbFromRgba } from "@material/material-color-utilities"; -import i18next from "i18next"; +import { globalScene } from "#app/global-scene"; import { starterColors } from "#app/global-vars/starter-colors"; -import { speciesEggMoves } from "#app/data/balance/egg-moves"; -import { pokemonFormLevelMoves, pokemonSpeciesLevelMoves } from "#app/data/balance/pokemon-level-moves"; -import type { PokemonForm } from "#app/data/pokemon-species"; -import type PokemonSpecies from "#app/data/pokemon-species"; -import { getPokemonSpeciesForm, getPokerusStarters, normalForm } from "#app/data/pokemon-species"; -import { allSpecies } from "#app/data/data-lists"; -import { getStarterValueFriendshipCap, speciesStarterCosts, POKERUS_STARTER_COUNT } from "#app/data/balance/starters"; -import { catchableSpecies } from "#app/data/balance/biomes"; -import { PokemonType } from "#enums/pokemon-type"; -import type { DexAttrProps, StarterAttributes } from "#app/system/game-data"; -import type { StarterPreferences } from "#app/utils/data"; -import type { DexEntry } from "#app/@types/dex-data"; -import { loadStarterPreferences } from "#app/utils/data"; -import { AbilityAttr } from "#enums/ability-attr"; -import { DexAttr } from "#enums/dex-attr"; -import MessageUiHandler from "#app/ui/message-ui-handler"; -import PokemonIconAnimHandler, { PokemonIconAnimMode } from "#app/ui/pokemon-icon-anim-handler"; -import { TextStyle, addTextObject } from "#app/ui/text"; -import { UiMode } from "#enums/ui-mode"; -import { SettingKeyboard } from "#app/system/settings/settings-keyboard"; -import { Passive as PassiveAttr } from "#enums/passive"; -import type { SpeciesId } from "#enums/species-id"; -import { Button } from "#enums/buttons"; -import { DropDown, DropDownLabel, DropDownOption, DropDownState, DropDownType, SortCriteria } from "#app/ui/dropdown"; -import { PokedexMonContainer } from "#app/ui/pokedex-mon-container"; -import { FilterBar } from "#app/ui/filter-bar"; -import { DropDownColumn } from "#enums/drop-down-column"; -import { ScrollBar } from "#app/ui/scroll-bar"; -import { AbilityId } from "#enums/ability-id"; +import { catchableSpecies } from "#balance/biomes"; +import { speciesEggMoves } from "#balance/egg-moves"; +import { pokemonStarters } from "#balance/pokemon-evolutions"; +import { pokemonFormLevelMoves, pokemonSpeciesLevelMoves } from "#balance/pokemon-level-moves"; import { getPassiveCandyCount, - getValueReductionCandyCounts, getSameSpeciesEggCandyCounts, -} from "#app/data/balance/starters"; -import { BooleanHolder, fixedInt, getLocalizedSpriteKey, padInt, randIntRange, rgbHexToRgba } from "#app/utils/common"; -import type { Nature } from "#enums/nature"; -import { addWindow } from "./ui-theme"; -import type { OptionSelectConfig } from "./abstact-option-select-ui-handler"; -import { FilterText, FilterTextRow } from "./filter-text"; -import { allAbilities } from "#app/data/data-lists"; -import { allMoves } from "#app/data/data-lists"; -import { speciesTmMoves } from "#app/data/balance/tms"; -import { pokemonStarters } from "#app/data/balance/pokemon-evolutions"; + getStarterValueFriendshipCap, + getValueReductionCandyCounts, + POKERUS_STARTER_COUNT, + speciesStarterCosts, +} from "#balance/starters"; +import { speciesTmMoves } from "#balance/tms"; +import { allAbilities, allMoves, allSpecies } from "#data/data-lists"; +import type { PokemonForm, PokemonSpecies } from "#data/pokemon-species"; +import { getPokemonSpeciesForm, getPokerusStarters, normalForm } from "#data/pokemon-species"; +import { AbilityAttr } from "#enums/ability-attr"; +import { AbilityId } from "#enums/ability-id"; import { BiomeId } from "#enums/biome-id"; -import { globalScene } from "#app/global-scene"; +import { Button } from "#enums/buttons"; +import { DexAttr } from "#enums/dex-attr"; +import { DropDownColumn } from "#enums/drop-down-column"; +import type { Nature } from "#enums/nature"; +import { Passive as PassiveAttr } from "#enums/passive"; +import { PokemonType } from "#enums/pokemon-type"; +import type { SpeciesId } from "#enums/species-id"; +import { UiMode } from "#enums/ui-mode"; +import type { Variant } from "#sprites/variant"; +import { getVariantIcon, getVariantTint } from "#sprites/variant"; +import type { DexAttrProps, StarterAttributes } from "#system/game-data"; +import { SettingKeyboard } from "#system/settings-keyboard"; +import type { DexEntry } from "#types/dex-data"; +import type { OptionSelectConfig } from "#ui/abstact-option-select-ui-handler"; +import { DropDown, DropDownLabel, DropDownOption, DropDownState, DropDownType, SortCriteria } from "#ui/dropdown"; +import { FilterBar } from "#ui/filter-bar"; +import { FilterText, FilterTextRow } from "#ui/filter-text"; +import { MessageUiHandler } from "#ui/message-ui-handler"; +import { PokedexMonContainer } from "#ui/pokedex-mon-container"; +import { PokemonIconAnimHandler, PokemonIconAnimMode } from "#ui/pokemon-icon-anim-handler"; +import { ScrollBar } from "#ui/scroll-bar"; +import { addTextObject, TextStyle } from "#ui/text"; +import { addWindow } from "#ui/ui-theme"; +import { BooleanHolder, fixedInt, getLocalizedSpriteKey, padInt, randIntRange, rgbHexToRgba } from "#utils/common"; +import type { StarterPreferences } from "#utils/data"; +import { loadStarterPreferences } from "#utils/data"; +import { argbFromRgba } from "@material/material-color-utilities"; +import i18next from "i18next"; interface LanguageSetting { starterInfoTextSize: string; @@ -157,7 +156,7 @@ interface SpeciesDetails { natureIndex?: number; } -export default class PokedexUiHandler extends MessageUiHandler { +export class PokedexUiHandler extends MessageUiHandler { private starterSelectContainer: Phaser.GameObjects.Container; private starterSelectScrollBar: ScrollBar; private filterBarContainer: Phaser.GameObjects.Container; diff --git a/src/ui/pokemon-hatch-info-container.ts b/src/ui/pokemon-hatch-info-container.ts index afc58c63953..279edf7dc52 100644 --- a/src/ui/pokemon-hatch-info-container.ts +++ b/src/ui/pokemon-hatch-info-container.ts @@ -1,24 +1,24 @@ -import PokemonInfoContainer from "#app/ui/pokemon-info-container"; -import { Gender } from "#app/data/gender"; -import { PokemonType } from "#enums/pokemon-type"; -import { rgbHexToRgba, padInt } from "#app/utils/common"; -import { TextStyle, addTextObject } from "#app/ui/text"; -import { speciesEggMoves } from "#app/data/balance/egg-moves"; -import { allMoves } from "#app/data/data-lists"; -import { SpeciesId } from "#enums/species-id"; -import { getEggTierForSpecies } from "#app/data/egg"; -import { starterColors } from "#app/global-vars/starter-colors"; import { globalScene } from "#app/global-scene"; +import { starterColors } from "#app/global-vars/starter-colors"; +import { speciesEggMoves } from "#balance/egg-moves"; +import { allMoves } from "#data/data-lists"; +import { getEggTierForSpecies } from "#data/egg"; +import type { EggHatchData } from "#data/egg-hatch-data"; +import { Gender } from "#data/gender"; +import { getPokemonSpeciesForm } from "#data/pokemon-species"; +import { PokemonType } from "#enums/pokemon-type"; +import { SpeciesId } from "#enums/species-id"; +import type { PlayerPokemon } from "#field/pokemon"; +import { PokemonInfoContainer } from "#ui/pokemon-info-container"; +import { addTextObject, TextStyle } from "#ui/text"; +import { padInt, rgbHexToRgba } from "#utils/common"; import { argbFromRgba } from "@material/material-color-utilities"; -import type { EggHatchData } from "#app/data/egg-hatch-data"; -import type { PlayerPokemon } from "#app/field/pokemon"; -import { getPokemonSpeciesForm } from "#app/data/pokemon-species"; /** * Class for the hatch info summary of each pokemon * Holds an info container as well as an additional egg sprite, name, egg moves and main sprite */ -export default class PokemonHatchInfoContainer extends PokemonInfoContainer { +export class PokemonHatchInfoContainer extends PokemonInfoContainer { private currentPokemonSprite: Phaser.GameObjects.Sprite; private pokemonNumberText: Phaser.GameObjects.Text; private pokemonNameText: Phaser.GameObjects.Text; diff --git a/src/ui/pokemon-icon-anim-handler.ts b/src/ui/pokemon-icon-anim-handler.ts index 8a206167a94..408e0ebc9d3 100644 --- a/src/ui/pokemon-icon-anim-handler.ts +++ b/src/ui/pokemon-icon-anim-handler.ts @@ -1,5 +1,5 @@ import { globalScene } from "#app/global-scene"; -import { fixedInt, coerceArray } from "#app/utils/common"; +import { coerceArray, fixedInt } from "#utils/common"; export enum PokemonIconAnimMode { NONE, @@ -9,7 +9,7 @@ export enum PokemonIconAnimMode { type PokemonIcon = Phaser.GameObjects.Container | Phaser.GameObjects.Sprite; -export default class PokemonIconAnimHandler { +export class PokemonIconAnimHandler { private icons: Map; private toggled: boolean; diff --git a/src/ui/pokemon-info-container.ts b/src/ui/pokemon-info-container.ts index 0056c3e2f11..1dff8165dad 100644 --- a/src/ui/pokemon-info-container.ts +++ b/src/ui/pokemon-info-container.ts @@ -1,19 +1,19 @@ -import { getVariantTint } from "#app/sprites/variant"; -import type BBCodeText from "phaser3-rex-plugins/plugins/bbcodetext"; import { globalScene } from "#app/global-scene"; -import { Gender, getGenderColor, getGenderSymbol } from "../data/gender"; -import { getNatureName } from "../data/nature"; -import { PokemonType } from "#enums/pokemon-type"; -import type Pokemon from "../field/pokemon"; -import i18next from "i18next"; -import type { StarterDataEntry } from "../system/game-data"; -import type { DexEntry } from "#app/@types/dex-data"; +import { Gender, getGenderColor, getGenderSymbol } from "#data/gender"; +import { getNatureName } from "#data/nature"; import { DexAttr } from "#enums/dex-attr"; -import { fixedInt, getShinyDescriptor } from "#app/utils/common"; -import ConfirmUiHandler from "./confirm-ui-handler"; -import { StatsContainer } from "./stats-container"; -import { TextStyle, addBBCodeTextObject, addTextObject, getTextColor } from "./text"; -import { addWindow } from "./ui-theme"; +import { PokemonType } from "#enums/pokemon-type"; +import type { Pokemon } from "#field/pokemon"; +import { getVariantTint } from "#sprites/variant"; +import type { StarterDataEntry } from "#system/game-data"; +import type { DexEntry } from "#types/dex-data"; +import { ConfirmUiHandler } from "#ui/confirm-ui-handler"; +import { StatsContainer } from "#ui/stats-container"; +import { addBBCodeTextObject, addTextObject, getTextColor, TextStyle } from "#ui/text"; +import { addWindow } from "#ui/ui-theme"; +import { fixedInt, getShinyDescriptor } from "#utils/common"; +import i18next from "i18next"; +import type BBCodeText from "phaser3-rex-plugins/plugins/bbcodetext"; interface LanguageSetting { infoContainerTextSize: string; @@ -29,7 +29,7 @@ const languageSettings: { [key: string]: LanguageSetting } = { }, }; -export default class PokemonInfoContainer extends Phaser.GameObjects.Container { +export class PokemonInfoContainer extends Phaser.GameObjects.Container { private readonly infoWindowWidth = 104; private pokemonFormLabelText: Phaser.GameObjects.Text; diff --git a/src/ui/registration-form-ui-handler.ts b/src/ui/registration-form-ui-handler.ts index a60a53a8e7a..2466603af71 100644 --- a/src/ui/registration-form-ui-handler.ts +++ b/src/ui/registration-form-ui-handler.ts @@ -1,11 +1,11 @@ -import type { InputFieldConfig } from "./form-modal-ui-handler"; -import { FormModalUiHandler } from "./form-modal-ui-handler"; -import type { ModalConfig } from "./modal-ui-handler"; -import { UiMode } from "#enums/ui-mode"; -import { TextStyle, addTextObject } from "./text"; -import i18next from "i18next"; -import { pokerogueApi } from "#app/plugins/api/pokerogue-api"; +import { pokerogueApi } from "#api/pokerogue-api"; import { globalScene } from "#app/global-scene"; +import { UiMode } from "#enums/ui-mode"; +import type { InputFieldConfig } from "#ui/form-modal-ui-handler"; +import { FormModalUiHandler } from "#ui/form-modal-ui-handler"; +import type { ModalConfig } from "#ui/modal-ui-handler"; +import { addTextObject, TextStyle } from "#ui/text"; +import i18next from "i18next"; interface LanguageSetting { inputFieldFontSize?: string; @@ -20,7 +20,7 @@ const languageSettings: { [key: string]: LanguageSetting } = { }, }; -export default class RegistrationFormUiHandler extends FormModalUiHandler { +export class RegistrationFormUiHandler extends FormModalUiHandler { getModalTitle(_config?: ModalConfig): string { return i18next.t("menu:register"); } diff --git a/src/ui/rename-form-ui-handler.ts b/src/ui/rename-form-ui-handler.ts index 7083f83865b..9da5b0e8554 100644 --- a/src/ui/rename-form-ui-handler.ts +++ b/src/ui/rename-form-ui-handler.ts @@ -1,10 +1,10 @@ -import type { InputFieldConfig } from "./form-modal-ui-handler"; -import { FormModalUiHandler } from "./form-modal-ui-handler"; -import type { ModalConfig } from "./modal-ui-handler"; +import type { PlayerPokemon } from "#field/pokemon"; +import type { InputFieldConfig } from "#ui/form-modal-ui-handler"; +import { FormModalUiHandler } from "#ui/form-modal-ui-handler"; +import type { ModalConfig } from "#ui/modal-ui-handler"; import i18next from "i18next"; -import type { PlayerPokemon } from "#app/field/pokemon"; -export default class RenameFormUiHandler extends FormModalUiHandler { +export class RenameFormUiHandler extends FormModalUiHandler { getModalTitle(_config?: ModalConfig): string { return i18next.t("menu:renamePokemon"); } diff --git a/src/ui/run-history-ui-handler.ts b/src/ui/run-history-ui-handler.ts index 06ef590c1e8..f810468aea1 100644 --- a/src/ui/run-history-ui-handler.ts +++ b/src/ui/run-history-ui-handler.ts @@ -1,18 +1,18 @@ import { globalScene } from "#app/global-scene"; -import { GameModes } from "#enums/game-modes"; -import { TextStyle, addTextObject } from "./text"; -import { UiMode } from "#enums/ui-mode"; -import { addWindow } from "./ui-theme"; -import { fixedInt, formatLargeNumber } from "#app/utils/common"; -import type PokemonData from "../system/pokemon-data"; -import MessageUiHandler from "./message-ui-handler"; -import i18next from "i18next"; -import { Button } from "../enums/buttons"; import { BattleType } from "#enums/battle-type"; -import type { RunEntry } from "../system/game-data"; +import { Button } from "#enums/buttons"; +import { GameModes } from "#enums/game-modes"; import { PlayerGender } from "#enums/player-gender"; import { TrainerVariant } from "#enums/trainer-variant"; -import { RunDisplayMode } from "#app/ui/run-info-ui-handler"; +import { UiMode } from "#enums/ui-mode"; +import type { RunEntry } from "#system/game-data"; +import type { PokemonData } from "#system/pokemon-data"; +import { MessageUiHandler } from "#ui/message-ui-handler"; +import { RunDisplayMode } from "#ui/run-info-ui-handler"; +import { addTextObject, TextStyle } from "#ui/text"; +import { addWindow } from "#ui/ui-theme"; +import { fixedInt, formatLargeNumber } from "#utils/common"; +import i18next from "i18next"; export type RunSelectCallback = (cursor: number) => void; @@ -24,7 +24,7 @@ export const RUN_HISTORY_LIMIT: number = 25; * It navigates similarly to the UI of the save slot select menu. * The only valid input buttons are Button.ACTION and Button.CANCEL. */ -export default class RunHistoryUiHandler extends MessageUiHandler { +export class RunHistoryUiHandler extends MessageUiHandler { private readonly maxRows = 3; private runSelectContainer: Phaser.GameObjects.Container; diff --git a/src/ui/run-info-ui-handler.ts b/src/ui/run-info-ui-handler.ts index 76e343d018a..817ac85698b 100644 --- a/src/ui/run-info-ui-handler.ts +++ b/src/ui/run-info-ui-handler.ts @@ -1,32 +1,32 @@ -import { GameModes } from "#enums/game-modes"; -import UiHandler from "./ui-handler"; -import type { SessionSaveData } from "../system/game-data"; -import { TextStyle, addTextObject, addBBCodeTextObject, getTextColor } from "./text"; -import { UiMode } from "#enums/ui-mode"; -import { addWindow } from "./ui-theme"; -import { getPokeballAtlasKey } from "#app/data/pokeball"; -import { formatLargeNumber, getPlayTimeString, formatMoney, formatFancyLargeNumber } from "#app/utils/common"; -import type PokemonData from "../system/pokemon-data"; -import i18next from "i18next"; -import { Button } from "../enums/buttons"; -import { BattleType } from "#enums/battle-type"; -import { TrainerVariant } from "#enums/trainer-variant"; -import { Challenges } from "#enums/challenges"; -import { getLuckString, getLuckTextTint } from "../modifier/modifier-type"; -import RoundRectangle from "phaser3-rex-plugins/plugins/roundrectangle"; -import { getTypeRgb } from "#app/data/type"; -import { PokemonType } from "#enums/pokemon-type"; -import { TypeColor, TypeShadow } from "#app/enums/color"; -import { getNatureStatMultiplier, getNatureName } from "../data/nature"; -import { getVariantTint } from "#app/sprites/variant"; -// biome-ignore lint/performance/noNamespaceImport: See `src/system/game-data.ts` -import * as Modifier from "#app/modifier/modifier"; -import type { SpeciesId } from "#enums/species-id"; -import { PlayerGender } from "#enums/player-gender"; -import { SettingKeyboard } from "#app/system/settings/settings-keyboard"; -import { getBiomeName } from "#app/data/balance/biomes"; -import type { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { globalScene } from "#app/global-scene"; +import { getBiomeName } from "#balance/biomes"; +import { getNatureName, getNatureStatMultiplier } from "#data/nature"; +import { getPokeballAtlasKey } from "#data/pokeball"; +import { getTypeRgb } from "#data/type"; +import { BattleType } from "#enums/battle-type"; +import { Button } from "#enums/buttons"; +import { Challenges } from "#enums/challenges"; +import { TypeColor, TypeShadow } from "#enums/color"; +import { GameModes } from "#enums/game-modes"; +import type { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { PlayerGender } from "#enums/player-gender"; +import { PokemonType } from "#enums/pokemon-type"; +import type { SpeciesId } from "#enums/species-id"; +import { TrainerVariant } from "#enums/trainer-variant"; +import { UiMode } from "#enums/ui-mode"; +// biome-ignore lint/performance/noNamespaceImport: See `src/system/game-data.ts` +import * as Modifier from "#modifiers/modifier"; +import { getLuckString, getLuckTextTint } from "#modifiers/modifier-type"; +import { getVariantTint } from "#sprites/variant"; +import type { SessionSaveData } from "#system/game-data"; +import type { PokemonData } from "#system/pokemon-data"; +import { SettingKeyboard } from "#system/settings-keyboard"; +import { addBBCodeTextObject, addTextObject, getTextColor, TextStyle } from "#ui/text"; +import { UiHandler } from "#ui/ui-handler"; +import { addWindow } from "#ui/ui-theme"; +import { formatFancyLargeNumber, formatLargeNumber, formatMoney, getPlayTimeString } from "#utils/common"; +import i18next from "i18next"; +import RoundRectangle from "phaser3-rex-plugins/plugins/roundrectangle"; /** * RunInfoUiMode indicates possible overlays of RunInfoUiHandler. @@ -50,7 +50,7 @@ export enum RunDisplayMode { * I believe that it is possible that the contents/methods of the first page will be placed in their own class that is an extension of RunInfoUiHandler as more pages are added. * For now, I leave as is. */ -export default class RunInfoUiHandler extends UiHandler { +export class RunInfoUiHandler extends UiHandler { protected runDisplayMode: RunDisplayMode; protected runInfo: SessionSaveData; protected isVictory: boolean; diff --git a/src/ui/save-slot-select-ui-handler.ts b/src/ui/save-slot-select-ui-handler.ts index 7dee041fa63..bcbe60265cd 100644 --- a/src/ui/save-slot-select-ui-handler.ts +++ b/src/ui/save-slot-select-ui-handler.ts @@ -1,17 +1,17 @@ -import i18next from "i18next"; +import { GameMode } from "#app/game-mode"; import { globalScene } from "#app/global-scene"; import { Button } from "#enums/buttons"; -import { GameMode } from "../game-mode"; -// biome-ignore lint/performance/noNamespaceImport: See `src/system/game-data.ts` -import * as Modifier from "#app/modifier/modifier"; -import type { SessionSaveData } from "../system/game-data"; -import type PokemonData from "../system/pokemon-data"; -import { isNullOrUndefined, fixedInt, getPlayTimeString, formatLargeNumber } from "#app/utils/common"; -import MessageUiHandler from "./message-ui-handler"; -import { TextStyle, addTextObject } from "./text"; import { UiMode } from "#enums/ui-mode"; -import { addWindow } from "./ui-theme"; -import { RunDisplayMode } from "#app/ui/run-info-ui-handler"; +// biome-ignore lint/performance/noNamespaceImport: See `src/system/game-data.ts` +import * as Modifier from "#modifiers/modifier"; +import type { SessionSaveData } from "#system/game-data"; +import type { PokemonData } from "#system/pokemon-data"; +import { MessageUiHandler } from "#ui/message-ui-handler"; +import { RunDisplayMode } from "#ui/run-info-ui-handler"; +import { addTextObject, TextStyle } from "#ui/text"; +import { addWindow } from "#ui/ui-theme"; +import { fixedInt, formatLargeNumber, getPlayTimeString, isNullOrUndefined } from "#utils/common"; +import i18next from "i18next"; const SESSION_SLOTS_COUNT = 5; const SLOTS_ON_SCREEN = 3; @@ -23,7 +23,7 @@ export enum SaveSlotUiMode { export type SaveSlotSelectCallback = (cursor: number) => void; -export default class SaveSlotSelectUiHandler extends MessageUiHandler { +export class SaveSlotSelectUiHandler extends MessageUiHandler { private saveSlotSelectContainer: Phaser.GameObjects.Container; private sessionSlotsContainer: Phaser.GameObjects.Container; private saveSlotSelectMessageBox: Phaser.GameObjects.NineSlice; diff --git a/src/ui/saving-icon-handler.ts b/src/ui/saving-icon-handler.ts index 3b7db549a4a..6923017218f 100644 --- a/src/ui/saving-icon-handler.ts +++ b/src/ui/saving-icon-handler.ts @@ -1,7 +1,7 @@ import { globalScene } from "#app/global-scene"; -import { fixedInt } from "#app/utils/common"; +import { fixedInt } from "#utils/common"; -export default class SavingIconHandler extends Phaser.GameObjects.Container { +export class SavingIconHandler extends Phaser.GameObjects.Container { private icon: Phaser.GameObjects.Sprite; private animActive: boolean; diff --git a/src/ui/scrollable-grid-handler.ts b/src/ui/scrollable-grid-handler.ts index 54f07d69fb7..3c6458f5083 100644 --- a/src/ui/scrollable-grid-handler.ts +++ b/src/ui/scrollable-grid-handler.ts @@ -1,6 +1,6 @@ import { Button } from "#enums/buttons"; -import type UiHandler from "#app/ui/ui-handler"; -import type { ScrollBar } from "#app/ui/scroll-bar"; +import type { ScrollBar } from "#ui/scroll-bar"; +import type { UiHandler } from "#ui/ui-handler"; type UpdateGridCallbackFunction = () => void; type UpdateDetailsCallbackFunction = (index: number) => void; @@ -16,7 +16,7 @@ type UpdateDetailsCallbackFunction = (index: number) => void; * - in `UiHandler.processInput`: call `processNavigationInput` to have it handle the cursor updates while calling the defined callbacks * - in `UiHandler.clear`: call `reset` */ -export default class ScrollableGridUiHandler { +export class ScrollableGridUiHandler { private readonly ROWS: number; private readonly COLUMNS: number; private handler: UiHandler; diff --git a/src/ui/session-reload-modal-ui-handler.ts b/src/ui/session-reload-modal-ui-handler.ts index f866783afe8..ab1197324a6 100644 --- a/src/ui/session-reload-modal-ui-handler.ts +++ b/src/ui/session-reload-modal-ui-handler.ts @@ -1,9 +1,9 @@ -import type { ModalConfig } from "./modal-ui-handler"; -import { ModalUiHandler } from "./modal-ui-handler"; -import { addTextObject, TextStyle } from "./text"; import type { UiMode } from "#enums/ui-mode"; +import type { ModalConfig } from "#ui/modal-ui-handler"; +import { ModalUiHandler } from "#ui/modal-ui-handler"; +import { addTextObject, TextStyle } from "#ui/text"; -export default class SessionReloadModalUiHandler extends ModalUiHandler { +export class SessionReloadModalUiHandler extends ModalUiHandler { constructor(mode: UiMode | null = null) { super(mode); } diff --git a/src/ui/settings/abstract-binding-ui-handler.ts b/src/ui/settings/abstract-binding-ui-handler.ts index a4707418b7c..aaf3572b489 100644 --- a/src/ui/settings/abstract-binding-ui-handler.ts +++ b/src/ui/settings/abstract-binding-ui-handler.ts @@ -1,18 +1,18 @@ -import UiHandler from "../ui-handler"; -import type { UiMode } from "#enums/ui-mode"; -import { addWindow } from "../ui-theme"; -import { addTextObject, TextStyle } from "../text"; -import { Button } from "#enums/buttons"; -import { NavigationManager } from "#app/ui/settings/navigationMenu"; -import i18next from "i18next"; import { globalScene } from "#app/global-scene"; +import { Button } from "#enums/buttons"; +import type { UiMode } from "#enums/ui-mode"; +import { NavigationManager } from "#ui/navigationMenu"; +import { addTextObject, TextStyle } from "#ui/text"; +import { UiHandler } from "#ui/ui-handler"; +import { addWindow } from "#ui/ui-theme"; +import i18next from "i18next"; type CancelFn = (succes?: boolean) => boolean; /** * Abstract class for handling UI elements related to button bindings. */ -export default abstract class AbstractBindingUiHandler extends UiHandler { +export abstract class AbstractBindingUiHandler extends UiHandler { // Containers for different segments of the UI. protected optionSelectContainer: Phaser.GameObjects.Container; protected actionsContainer: Phaser.GameObjects.Container; diff --git a/src/ui/settings/abstract-control-settings-ui-handler.ts b/src/ui/settings/abstract-control-settings-ui-handler.ts index 769de7993ce..67cc3ad7c03 100644 --- a/src/ui/settings/abstract-control-settings-ui-handler.ts +++ b/src/ui/settings/abstract-control-settings-ui-handler.ts @@ -1,15 +1,15 @@ -import UiHandler from "#app/ui/ui-handler"; -import type { UiMode } from "#enums/ui-mode"; -import type { InterfaceConfig } from "#app/inputs-controller"; -import { addWindow } from "#app/ui/ui-theme"; -import { addTextObject, TextStyle } from "#app/ui/text"; -import { ScrollBar } from "#app/ui/scroll-bar"; -import { getIconWithSettingName } from "#app/configs/inputs/configHandler"; -import NavigationMenu, { NavigationManager } from "#app/ui/settings/navigationMenu"; -import type { Device } from "#enums/devices"; -import { Button } from "#enums/buttons"; -import i18next from "i18next"; import { globalScene } from "#app/global-scene"; +import type { InterfaceConfig } from "#app/inputs-controller"; +import { Button } from "#enums/buttons"; +import type { Device } from "#enums/devices"; +import type { UiMode } from "#enums/ui-mode"; +import { getIconWithSettingName } from "#inputs/configHandler"; +import { NavigationManager, NavigationMenu } from "#ui/navigationMenu"; +import { ScrollBar } from "#ui/scroll-bar"; +import { addTextObject, TextStyle } from "#ui/text"; +import { UiHandler } from "#ui/ui-handler"; +import { addWindow } from "#ui/ui-theme"; +import i18next from "i18next"; export interface InputsIcons { [key: string]: Phaser.GameObjects.Sprite; @@ -27,7 +27,7 @@ export interface LayoutConfig { /** * Abstract class for handling UI elements related to control settings. */ -export default abstract class AbstractControlSettingsUiHandler extends UiHandler { +export abstract class AbstractControlSettingsUiHandler extends UiHandler { protected settingsContainer: Phaser.GameObjects.Container; protected optionsContainer: Phaser.GameObjects.Container; protected navigationContainer: NavigationMenu; diff --git a/src/ui/settings/abstract-settings-ui-handler.ts b/src/ui/settings/abstract-settings-ui-handler.ts index 6db9840a818..303ad229ea6 100644 --- a/src/ui/settings/abstract-settings-ui-handler.ts +++ b/src/ui/settings/abstract-settings-ui-handler.ts @@ -1,20 +1,20 @@ -import { TextStyle, addTextObject } from "#app/ui/text"; -import { UiMode } from "#enums/ui-mode"; -import MessageUiHandler from "#app/ui/message-ui-handler"; -import { addWindow } from "#app/ui/ui-theme"; -import { ScrollBar } from "#app/ui/scroll-bar"; -import { Button } from "#enums/buttons"; -import type { InputsIcons } from "#app/ui/settings/abstract-control-settings-ui-handler"; -import NavigationMenu, { NavigationManager } from "#app/ui/settings/navigationMenu"; -import type { SettingType } from "#app/system/settings/settings"; -import { Setting, SettingKeys } from "#app/system/settings/settings"; -import i18next from "i18next"; import { globalScene } from "#app/global-scene"; +import { Button } from "#enums/buttons"; +import { UiMode } from "#enums/ui-mode"; +import type { SettingType } from "#system/settings"; +import { Setting, SettingKeys } from "#system/settings"; +import type { InputsIcons } from "#ui/abstract-control-settings-ui-handler"; +import { MessageUiHandler } from "#ui/message-ui-handler"; +import { NavigationManager, NavigationMenu } from "#ui/navigationMenu"; +import { ScrollBar } from "#ui/scroll-bar"; +import { addTextObject, TextStyle } from "#ui/text"; +import { addWindow } from "#ui/ui-theme"; +import i18next from "i18next"; /** * Abstract class for handling UI elements related to settings. */ -export default class AbstractSettingsUiHandler extends MessageUiHandler { +export class AbstractSettingsUiHandler extends MessageUiHandler { private settingsContainer: Phaser.GameObjects.Container; private optionsContainer: Phaser.GameObjects.Container; private messageBoxContainer: Phaser.GameObjects.Container; diff --git a/src/ui/settings/gamepad-binding-ui-handler.ts b/src/ui/settings/gamepad-binding-ui-handler.ts index 9ddb54131d5..c514e93ec51 100644 --- a/src/ui/settings/gamepad-binding-ui-handler.ts +++ b/src/ui/settings/gamepad-binding-ui-handler.ts @@ -1,12 +1,12 @@ -import AbstractBindingUiHandler from "./abstract-binding-ui-handler"; -import type { UiMode } from "#enums/ui-mode"; -import { Device } from "#enums/devices"; -import { getIconWithSettingName, getKeyWithKeycode } from "#app/configs/inputs/configHandler"; -import { addTextObject, TextStyle } from "#app/ui/text"; import { globalScene } from "#app/global-scene"; +import { Device } from "#enums/devices"; +import type { UiMode } from "#enums/ui-mode"; +import { getIconWithSettingName, getKeyWithKeycode } from "#inputs/configHandler"; +import { AbstractBindingUiHandler } from "#ui/abstract-binding-ui-handler"; +import { addTextObject, TextStyle } from "#ui/text"; import i18next from "i18next"; -export default class GamepadBindingUiHandler extends AbstractBindingUiHandler { +export class GamepadBindingUiHandler extends AbstractBindingUiHandler { constructor(mode: UiMode | null = null) { super(mode); globalScene.input.gamepad?.on("down", this.gamepadButtonDown, this); diff --git a/src/ui/settings/keyboard-binding-ui-handler.ts b/src/ui/settings/keyboard-binding-ui-handler.ts index 183b8269e78..a789225a8ef 100644 --- a/src/ui/settings/keyboard-binding-ui-handler.ts +++ b/src/ui/settings/keyboard-binding-ui-handler.ts @@ -1,12 +1,12 @@ -import AbstractBindingUiHandler from "./abstract-binding-ui-handler"; -import type { UiMode } from "#enums/ui-mode"; -import { getKeyWithKeycode } from "#app/configs/inputs/configHandler"; -import { Device } from "#enums/devices"; -import { addTextObject, TextStyle } from "#app/ui/text"; import { globalScene } from "#app/global-scene"; +import { Device } from "#enums/devices"; +import type { UiMode } from "#enums/ui-mode"; +import { getKeyWithKeycode } from "#inputs/configHandler"; +import { AbstractBindingUiHandler } from "#ui/abstract-binding-ui-handler"; +import { addTextObject, TextStyle } from "#ui/text"; import i18next from "i18next"; -export default class KeyboardBindingUiHandler extends AbstractBindingUiHandler { +export class KeyboardBindingUiHandler extends AbstractBindingUiHandler { constructor(mode: UiMode | null = null) { super(mode); // Listen to gamepad button down events to initiate binding. diff --git a/src/ui/settings/move-touch-controls-handler.ts b/src/ui/settings/move-touch-controls-handler.ts index f684d27f748..60572529c89 100644 --- a/src/ui/settings/move-touch-controls-handler.ts +++ b/src/ui/settings/move-touch-controls-handler.ts @@ -1,6 +1,6 @@ import { globalScene } from "#app/global-scene"; -import type TouchControl from "#app/touch-controls"; -import type UI from "#app/ui/ui"; +import type { TouchControl } from "#app/touch-controls"; +import type { UI } from "#ui/ui"; import i18next from "i18next"; export const TOUCH_CONTROL_POSITIONS_LANDSCAPE = "touchControlPositionsLandscape"; @@ -24,7 +24,7 @@ type ToolbarRefs = { /** * Handles the dragging of touch controls around the screen. */ -export default class MoveTouchControlsHandler { +export class MoveTouchControlsHandler { /** The element that is currently being dragged */ private draggingElement: HTMLElement | null = null; diff --git a/src/ui/settings/navigationMenu.ts b/src/ui/settings/navigationMenu.ts index be3726bd47d..417312f5287 100644 --- a/src/ui/settings/navigationMenu.ts +++ b/src/ui/settings/navigationMenu.ts @@ -1,9 +1,9 @@ import { globalScene } from "#app/global-scene"; -import { UiMode } from "#enums/ui-mode"; -import type { InputsIcons } from "#app/ui/settings/abstract-control-settings-ui-handler"; -import { addTextObject, setTextStyle, TextStyle } from "#app/ui/text"; -import { addWindow } from "#app/ui/ui-theme"; import { Button } from "#enums/buttons"; +import { UiMode } from "#enums/ui-mode"; +import type { InputsIcons } from "#ui/abstract-control-settings-ui-handler"; +import { addTextObject, setTextStyle, TextStyle } from "#ui/text"; +import { addWindow } from "#ui/ui-theme"; import i18next from "i18next"; const LEFT = "LEFT"; @@ -103,7 +103,7 @@ export class NavigationManager { } } -export default class NavigationMenu extends Phaser.GameObjects.Container { +export class NavigationMenu extends Phaser.GameObjects.Container { private navigationIcons: InputsIcons; protected headerTitles: Phaser.GameObjects.Text[] = []; diff --git a/src/ui/settings/option-select-ui-handler.ts b/src/ui/settings/option-select-ui-handler.ts index af9760814ac..d7b699e6e50 100644 --- a/src/ui/settings/option-select-ui-handler.ts +++ b/src/ui/settings/option-select-ui-handler.ts @@ -1,7 +1,7 @@ -import AbstractOptionSelectUiHandler from "../abstact-option-select-ui-handler"; import { UiMode } from "#enums/ui-mode"; +import { AbstractOptionSelectUiHandler } from "#ui/abstact-option-select-ui-handler"; -export default class OptionSelectUiHandler extends AbstractOptionSelectUiHandler { +export class OptionSelectUiHandler extends AbstractOptionSelectUiHandler { constructor(mode: UiMode = UiMode.OPTION_SELECT) { super(mode); } diff --git a/src/ui/settings/settings-audio-ui-handler.ts b/src/ui/settings/settings-audio-ui-handler.ts index 019d66d7428..aa55f5489cc 100644 --- a/src/ui/settings/settings-audio-ui-handler.ts +++ b/src/ui/settings/settings-audio-ui-handler.ts @@ -1,9 +1,8 @@ import type { UiMode } from "#enums/ui-mode"; -import AbstractSettingsUiHandler from "./abstract-settings-ui-handler"; -import { SettingType } from "#app/system/settings/settings"; -("#app/inputs-controller"); +import { SettingType } from "#system/settings"; +import { AbstractSettingsUiHandler } from "#ui/abstract-settings-ui-handler"; -export default class SettingsAudioUiHandler extends AbstractSettingsUiHandler { +export class SettingsAudioUiHandler extends AbstractSettingsUiHandler { /** * Creates an instance of SettingsAudioUiHandler. * diff --git a/src/ui/settings/settings-display-ui-handler.ts b/src/ui/settings/settings-display-ui-handler.ts index 0636bd25567..3c261d6ddab 100644 --- a/src/ui/settings/settings-display-ui-handler.ts +++ b/src/ui/settings/settings-display-ui-handler.ts @@ -1,9 +1,8 @@ import type { UiMode } from "#enums/ui-mode"; -import AbstractSettingsUiHandler from "./abstract-settings-ui-handler"; -import { SettingKeys, SettingType } from "#app/system/settings/settings"; -("#app/inputs-controller"); +import { SettingKeys, SettingType } from "#system/settings"; +import { AbstractSettingsUiHandler } from "#ui/abstract-settings-ui-handler"; -export default class SettingsDisplayUiHandler extends AbstractSettingsUiHandler { +export class SettingsDisplayUiHandler extends AbstractSettingsUiHandler { /** * Creates an instance of SettingsGamepadUiHandler. * diff --git a/src/ui/settings/settings-gamepad-ui-handler.ts b/src/ui/settings/settings-gamepad-ui-handler.ts index 7d269deab14..63dd4c74618 100644 --- a/src/ui/settings/settings-gamepad-ui-handler.ts +++ b/src/ui/settings/settings-gamepad-ui-handler.ts @@ -1,21 +1,21 @@ -import { addTextObject, TextStyle } from "../text"; +import { globalScene } from "#app/global-scene"; +import type { InterfaceConfig } from "#app/inputs-controller"; +import { Device } from "#enums/devices"; import type { UiMode } from "#enums/ui-mode"; +import pad_dualshock from "#inputs/pad_dualshock"; +import pad_unlicensedSNES from "#inputs/pad_unlicensedSNES"; +import pad_xbox360 from "#inputs/pad_xbox360"; import { - setSettingGamepad, SettingGamepad, + setSettingGamepad, settingGamepadBlackList, settingGamepadDefaults, settingGamepadOptions, -} from "../../system/settings/settings-gamepad"; -import pad_xbox360 from "#app/configs/inputs/pad_xbox360"; -import pad_dualshock from "#app/configs/inputs/pad_dualshock"; -import pad_unlicensedSNES from "#app/configs/inputs/pad_unlicensedSNES"; -import type { InterfaceConfig } from "#app/inputs-controller"; -import AbstractControlSettingsUiHandler from "#app/ui/settings/abstract-control-settings-ui-handler"; -import { Device } from "#enums/devices"; -import { truncateString } from "#app/utils/common"; +} from "#system/settings-gamepad"; +import { AbstractControlSettingsUiHandler } from "#ui/abstract-control-settings-ui-handler"; +import { addTextObject, TextStyle } from "#ui/text"; +import { truncateString } from "#utils/common"; import i18next from "i18next"; -import { globalScene } from "#app/global-scene"; /** * Class representing the settings UI handler for gamepads. @@ -23,7 +23,7 @@ import { globalScene } from "#app/global-scene"; * @extends AbstractControlSettingsUiHandler */ -export default class SettingsGamepadUiHandler extends AbstractControlSettingsUiHandler { +export class SettingsGamepadUiHandler extends AbstractControlSettingsUiHandler { /** * Creates an instance of SettingsGamepadUiHandler. * diff --git a/src/ui/settings/settings-keyboard-ui-handler.ts b/src/ui/settings/settings-keyboard-ui-handler.ts index c334ee8f1fc..581e3e938be 100644 --- a/src/ui/settings/settings-keyboard-ui-handler.ts +++ b/src/ui/settings/settings-keyboard-ui-handler.ts @@ -1,28 +1,28 @@ +import { globalScene } from "#app/global-scene"; +import type { InterfaceConfig } from "#app/inputs-controller"; +import { Device } from "#enums/devices"; import { UiMode } from "#enums/ui-mode"; -import cfg_keyboard_qwerty from "#app/configs/inputs/cfg_keyboard_qwerty"; +import cfg_keyboard_qwerty from "#inputs/cfg_keyboard_qwerty"; +import { deleteBind } from "#inputs/configHandler"; import { - setSettingKeyboard, SettingKeyboard, + setSettingKeyboard, settingKeyboardBlackList, settingKeyboardDefaults, settingKeyboardOptions, -} from "#app/system/settings/settings-keyboard"; -import { reverseValueToKeySetting, truncateString } from "#app/utils/common"; -import AbstractControlSettingsUiHandler from "#app/ui/settings/abstract-control-settings-ui-handler"; -import type { InterfaceConfig } from "#app/inputs-controller"; -import { addTextObject, TextStyle } from "#app/ui/text"; -import { deleteBind } from "#app/configs/inputs/configHandler"; -import { Device } from "#enums/devices"; -import { NavigationManager } from "#app/ui/settings/navigationMenu"; +} from "#system/settings-keyboard"; +import { AbstractControlSettingsUiHandler } from "#ui/abstract-control-settings-ui-handler"; +import { NavigationManager } from "#ui/navigationMenu"; +import { addTextObject, TextStyle } from "#ui/text"; +import { reverseValueToKeySetting, truncateString } from "#utils/common"; import i18next from "i18next"; -import { globalScene } from "#app/global-scene"; /** * Class representing the settings UI handler for keyboards. * * @extends AbstractControlSettingsUiHandler */ -export default class SettingsKeyboardUiHandler extends AbstractControlSettingsUiHandler { +export class SettingsKeyboardUiHandler extends AbstractControlSettingsUiHandler { /** * Creates an instance of SettingsKeyboardUiHandler. * diff --git a/src/ui/settings/settings-ui-handler.ts b/src/ui/settings/settings-ui-handler.ts index 8d61044ff91..9461e987864 100644 --- a/src/ui/settings/settings-ui-handler.ts +++ b/src/ui/settings/settings-ui-handler.ts @@ -1,8 +1,8 @@ -import { SettingType } from "../../system/settings/settings"; import type { UiMode } from "#enums/ui-mode"; -import AbstractSettingsUiHandler from "./abstract-settings-ui-handler"; +import { SettingType } from "#system/settings"; +import { AbstractSettingsUiHandler } from "#ui/abstract-settings-ui-handler"; -export default class SettingsUiHandler extends AbstractSettingsUiHandler { +export class SettingsUiHandler extends AbstractSettingsUiHandler { /** * Creates an instance of SettingsGamepadUiHandler. * diff --git a/src/ui/starter-container.ts b/src/ui/starter-container.ts index 71e40844f38..4c174dc5955 100644 --- a/src/ui/starter-container.ts +++ b/src/ui/starter-container.ts @@ -1,6 +1,6 @@ import { globalScene } from "#app/global-scene"; -import type PokemonSpecies from "../data/pokemon-species"; -import { addTextObject, TextStyle } from "./text"; +import type { PokemonSpecies } from "#data/pokemon-species"; +import { addTextObject, TextStyle } from "#ui/text"; export class StarterContainer extends Phaser.GameObjects.Container { public species: PokemonSpecies; diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/starter-select-ui-handler.ts index 3cb6222cafa..8a2045ff2b4 100644 --- a/src/ui/starter-select-ui-handler.ts +++ b/src/ui/starter-select-ui-handler.ts @@ -1,67 +1,64 @@ -import type { CandyUpgradeNotificationChangedEvent } from "#app/events/battle-scene"; -import { BattleSceneEventType } from "#app/events/battle-scene"; -import { pokemonPrevolutions } from "#app/data/balance/pokemon-evolutions"; -import type { Variant } from "#app/sprites/variant"; -import { getVariantTint, getVariantIcon } from "#app/sprites/variant"; -import { argbFromRgba } from "@material/material-color-utilities"; -import i18next from "i18next"; -import type BBCodeText from "phaser3-rex-plugins/plugins/bbcodetext"; -import { starterColors } from "#app/global-vars/starter-colors"; +import type { Ability } from "#abilities/ability"; +import { PLAYER_PARTY_MAX_SIZE } from "#app/constants"; import { globalScene } from "#app/global-scene"; -import type { Ability } from "#app/data/abilities/ability"; -import { allAbilities } from "#app/data/data-lists"; -import { speciesEggMoves } from "#app/data/balance/egg-moves"; -import { GrowthRate, getGrowthRateColor } from "#app/data/exp"; -import { Gender, getGenderColor, getGenderSymbol } from "#app/data/gender"; -import { allMoves } from "#app/data/data-lists"; -import { getNatureName } from "#app/data/nature"; -import { pokemonFormChanges } from "#app/data/pokemon-forms"; -import type { LevelMoves } from "#app/data/balance/pokemon-level-moves"; -import { pokemonFormLevelMoves, pokemonSpeciesLevelMoves } from "#app/data/balance/pokemon-level-moves"; -import type PokemonSpecies from "#app/data/pokemon-species"; -import { getPokemonSpeciesForm, getPokerusStarters } from "#app/data/pokemon-species"; -import { allSpecies } from "#app/data/data-lists"; -import { getStarterValueFriendshipCap, speciesStarterCosts, POKERUS_STARTER_COUNT } from "#app/data/balance/starters"; -import { PokemonType } from "#enums/pokemon-type"; -import { GameModes } from "#enums/game-modes"; -import type { DexAttrProps, StarterMoveset, StarterAttributes } from "#app/system/game-data"; -import type { StarterPreferences } from "#app/utils/data"; -import type { DexEntry } from "#app/@types/dex-data"; -import { loadStarterPreferences, saveStarterPreferences } from "#app/utils/data"; -import { AbilityAttr } from "#enums/ability-attr"; -import { DexAttr } from "#enums/dex-attr"; -import { Tutorial, handleTutorial } from "#app/tutorial"; -import type { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler"; -import MessageUiHandler from "#app/ui/message-ui-handler"; -import PokemonIconAnimHandler, { PokemonIconAnimMode } from "#app/ui/pokemon-icon-anim-handler"; -import { StatsContainer } from "#app/ui/stats-container"; -import { TextStyle, addBBCodeTextObject, addTextObject } from "#app/ui/text"; -import { UiMode } from "#enums/ui-mode"; -import { addWindow } from "#app/ui/ui-theme"; -import { Egg } from "#app/data/egg"; +import { starterColors } from "#app/global-vars/starter-colors"; import Overrides from "#app/overrides"; -import { SettingKeyboard } from "#app/system/settings/settings-keyboard"; -import { Passive as PassiveAttr } from "#enums/passive"; -import { applyChallenges } from "#app/data/challenge"; -import { ChallengeType } from "#enums/challenge-type"; -import MoveInfoOverlay from "#app/ui/move-info-overlay"; -import { getEggTierForSpecies } from "#app/data/egg"; -import { Device } from "#enums/devices"; -import type { MoveId } from "#enums/move-id"; -import { SpeciesId } from "#enums/species-id"; -import { Button } from "#enums/buttons"; -import { EggSourceType } from "#enums/egg-source-types"; -import { DropDown, DropDownLabel, DropDownOption, DropDownState, DropDownType, SortCriteria } from "#app/ui/dropdown"; -import { StarterContainer } from "#app/ui/starter-container"; -import { FilterBar } from "#app/ui/filter-bar"; -import { DropDownColumn } from "#enums/drop-down-column"; -import { ScrollBar } from "#app/ui/scroll-bar"; -import { AbilityId } from "#enums/ability-id"; +import { handleTutorial, Tutorial } from "#app/tutorial"; +import { speciesEggMoves } from "#balance/egg-moves"; +import { pokemonPrevolutions } from "#balance/pokemon-evolutions"; +import type { LevelMoves } from "#balance/pokemon-level-moves"; +import { pokemonFormLevelMoves, pokemonSpeciesLevelMoves } from "#balance/pokemon-level-moves"; import { getPassiveCandyCount, - getValueReductionCandyCounts, getSameSpeciesEggCandyCounts, -} from "#app/data/balance/starters"; + getStarterValueFriendshipCap, + getValueReductionCandyCounts, + POKERUS_STARTER_COUNT, + speciesStarterCosts, +} from "#balance/starters"; +import { applyChallenges, checkStarterValidForChallenge } from "#data/challenge"; +import { allAbilities, allMoves, allSpecies } from "#data/data-lists"; +import { Egg, getEggTierForSpecies } from "#data/egg"; +import { GrowthRate, getGrowthRateColor } from "#data/exp"; +import { Gender, getGenderColor, getGenderSymbol } from "#data/gender"; +import { getNatureName } from "#data/nature"; +import { pokemonFormChanges } from "#data/pokemon-forms"; +import type { PokemonSpecies } from "#data/pokemon-species"; +import { getPokemonSpeciesForm, getPokerusStarters } from "#data/pokemon-species"; +import { AbilityAttr } from "#enums/ability-attr"; +import { AbilityId } from "#enums/ability-id"; +import { Button } from "#enums/buttons"; +import { ChallengeType } from "#enums/challenge-type"; +import { Device } from "#enums/devices"; +import { DexAttr } from "#enums/dex-attr"; +import { DropDownColumn } from "#enums/drop-down-column"; +import { EggSourceType } from "#enums/egg-source-types"; +import { GameModes } from "#enums/game-modes"; +import type { MoveId } from "#enums/move-id"; +import type { Nature } from "#enums/nature"; +import { Passive as PassiveAttr } from "#enums/passive"; +import { PokemonType } from "#enums/pokemon-type"; +import { SpeciesId } from "#enums/species-id"; +import { UiMode } from "#enums/ui-mode"; +import type { CandyUpgradeNotificationChangedEvent } from "#events/battle-scene"; +import { BattleSceneEventType } from "#events/battle-scene"; +import type { Variant } from "#sprites/variant"; +import { getVariantIcon, getVariantTint } from "#sprites/variant"; +import { achvs } from "#system/achv"; +import type { DexAttrProps, StarterAttributes, StarterMoveset } from "#system/game-data"; +import { SettingKeyboard } from "#system/settings-keyboard"; +import type { DexEntry } from "#types/dex-data"; +import type { OptionSelectItem } from "#ui/abstact-option-select-ui-handler"; +import { DropDown, DropDownLabel, DropDownOption, DropDownState, DropDownType, SortCriteria } from "#ui/dropdown"; +import { FilterBar } from "#ui/filter-bar"; +import { MessageUiHandler } from "#ui/message-ui-handler"; +import { MoveInfoOverlay } from "#ui/move-info-overlay"; +import { PokemonIconAnimHandler, PokemonIconAnimMode } from "#ui/pokemon-icon-anim-handler"; +import { ScrollBar } from "#ui/scroll-bar"; +import { StarterContainer } from "#ui/starter-container"; +import { StatsContainer } from "#ui/stats-container"; +import { addBBCodeTextObject, addTextObject, TextStyle } from "#ui/text"; +import { addWindow } from "#ui/ui-theme"; import { BooleanHolder, fixedInt, @@ -72,12 +69,13 @@ import { randIntRange, rgbHexToRgba, toReadableString, -} from "#app/utils/common"; -import type { Nature } from "#enums/nature"; -import { PLAYER_PARTY_MAX_SIZE } from "#app/constants"; -import { achvs } from "#app/system/achv"; +} from "#utils/common"; +import type { StarterPreferences } from "#utils/data"; +import { loadStarterPreferences, saveStarterPreferences } from "#utils/data"; +import { argbFromRgba } from "@material/material-color-utilities"; +import i18next from "i18next"; import type { GameObjects } from "phaser"; -import { checkStarterValidForChallenge } from "#app/data/challenge"; +import type BBCodeText from "phaser3-rex-plugins/plugins/bbcodetext"; export type StarterSelectCallback = (starters: Starter[]) => void; @@ -265,7 +263,7 @@ interface SpeciesDetails { teraType?: PokemonType; } -export default class StarterSelectUiHandler extends MessageUiHandler { +export class StarterSelectUiHandler extends MessageUiHandler { private starterSelectContainer: Phaser.GameObjects.Container; private starterSelectScrollBar: ScrollBar; private filterBarContainer: Phaser.GameObjects.Container; diff --git a/src/ui/stats-container.ts b/src/ui/stats-container.ts index 8cc74e64e96..4b68cf55a9a 100644 --- a/src/ui/stats-container.ts +++ b/src/ui/stats-container.ts @@ -1,8 +1,8 @@ -import type BBCodeText from "phaser3-rex-plugins/plugins/gameobjects/tagtext/bbcodetext/BBCodeText"; -import { TextStyle, addBBCodeTextObject, addTextObject, getTextColor } from "./text"; -import { PERMANENT_STATS, getStatKey } from "#app/enums/stat"; -import i18next from "i18next"; import { globalScene } from "#app/global-scene"; +import { getStatKey, PERMANENT_STATS } from "#enums/stat"; +import { addBBCodeTextObject, addTextObject, getTextColor, TextStyle } from "#ui/text"; +import i18next from "i18next"; +import type BBCodeText from "phaser3-rex-plugins/plugins/gameobjects/tagtext/bbcodetext/BBCodeText"; const ivChartSize = 24; const ivChartStatCoordMultipliers = [ diff --git a/src/ui/summary-ui-handler.ts b/src/ui/summary-ui-handler.ts index f108faf1646..41b6cf9518c 100644 --- a/src/ui/summary-ui-handler.ts +++ b/src/ui/summary-ui-handler.ts @@ -1,45 +1,44 @@ -import { starterColors } from "#app/global-vars/starter-colors"; -import { globalScene } from "#app/global-scene"; -import { UiMode } from "#enums/ui-mode"; -import UiHandler from "#app/ui/ui-handler"; -import { - getLocalizedSpriteKey, - rgbHexToRgba, - padInt, - getEnumValues, - fixedInt, - isNullOrUndefined, - toReadableString, - formatStat, - getShinyDescriptor, -} from "#app/utils/common"; -import type { PlayerPokemon } from "#app/field/pokemon"; -import type { PokemonMove } from "#app/data/moves/pokemon-move"; -import { getStarterValueFriendshipCap, speciesStarterCosts } from "#app/data/balance/starters"; -import { argbFromRgba } from "@material/material-color-utilities"; -import { getTypeRgb } from "#app/data/type"; -import { PokemonType } from "#enums/pokemon-type"; -import { TextStyle, addBBCodeTextObject, addTextObject, getBBCodeFrag } from "#app/ui/text"; -import type Move from "#app/data/moves/move"; -import { MoveCategory } from "#enums/MoveCategory"; -import { getPokeballAtlasKey } from "#app/data/pokeball"; -import { getGenderColor, getGenderSymbol } from "#app/data/gender"; -import { getLevelRelExp, getLevelTotalExp } from "#app/data/exp"; -import { PokemonHeldItemModifier } from "#app/modifier/modifier"; -import { StatusEffect } from "#enums/status-effect"; -import { getBiomeName } from "#app/data/balance/biomes"; -import { getNatureName, getNatureStatMultiplier } from "#app/data/nature"; +import type { Ability } from "#abilities/ability"; import { loggedInUser } from "#app/account"; -import type { Variant } from "#app/sprites/variant"; -import { getVariantTint } from "#app/sprites/variant"; +import { globalScene } from "#app/global-scene"; +import { starterColors } from "#app/global-vars/starter-colors"; +import { getBiomeName } from "#balance/biomes"; +import { getStarterValueFriendshipCap, speciesStarterCosts } from "#balance/starters"; +import { getLevelRelExp, getLevelTotalExp } from "#data/exp"; +import { getGenderColor, getGenderSymbol } from "#data/gender"; +import { getNatureName, getNatureStatMultiplier } from "#data/nature"; +import { getPokeballAtlasKey } from "#data/pokeball"; +import { getTypeRgb } from "#data/type"; import { Button } from "#enums/buttons"; -import type { Ability } from "#app/data/abilities/ability"; -import i18next from "i18next"; -import { modifierSortFunc } from "#app/modifier/modifier"; -import { PlayerGender } from "#enums/player-gender"; -import { Stat, PERMANENT_STATS, getStatKey } from "#enums/stat"; +import { MoveCategory } from "#enums/MoveCategory"; import { Nature } from "#enums/nature"; -import { achvs } from "#app/system/achv"; +import { PlayerGender } from "#enums/player-gender"; +import { PokemonType } from "#enums/pokemon-type"; +import { getStatKey, PERMANENT_STATS, Stat } from "#enums/stat"; +import { StatusEffect } from "#enums/status-effect"; +import { UiMode } from "#enums/ui-mode"; +import type { PlayerPokemon } from "#field/pokemon"; +import { modifierSortFunc, PokemonHeldItemModifier } from "#modifiers/modifier"; +import type { Move } from "#moves/move"; +import type { PokemonMove } from "#moves/pokemon-move"; +import type { Variant } from "#sprites/variant"; +import { getVariantTint } from "#sprites/variant"; +import { achvs } from "#system/achv"; +import { addBBCodeTextObject, addTextObject, getBBCodeFrag, TextStyle } from "#ui/text"; +import { UiHandler } from "#ui/ui-handler"; +import { + fixedInt, + formatStat, + getEnumValues, + getLocalizedSpriteKey, + getShinyDescriptor, + isNullOrUndefined, + padInt, + rgbHexToRgba, + toReadableString, +} from "#utils/common"; +import { argbFromRgba } from "@material/material-color-utilities"; +import i18next from "i18next"; enum Page { PROFILE, @@ -64,7 +63,7 @@ interface abilityContainer { descriptionText: Phaser.GameObjects.Text | null; } -export default class SummaryUiHandler extends UiHandler { +export class SummaryUiHandler extends UiHandler { private summaryUiMode: SummaryUiMode; private summaryContainer: Phaser.GameObjects.Container; diff --git a/src/ui/target-select-ui-handler.ts b/src/ui/target-select-ui-handler.ts index 8106e4de2da..3dcf5cc77c6 100644 --- a/src/ui/target-select-ui-handler.ts +++ b/src/ui/target-select-ui-handler.ts @@ -1,18 +1,18 @@ +import { globalScene } from "#app/global-scene"; +import { SubstituteTag } from "#data/battler-tags"; import { BattlerIndex } from "#enums/battler-index"; -import { UiMode } from "#enums/ui-mode"; -import UiHandler from "./ui-handler"; -import { isNullOrUndefined, fixedInt } from "#app/utils/common"; -import { getMoveTargets } from "#app/data/moves/move-utils"; import { Button } from "#enums/buttons"; import type { MoveId } from "#enums/move-id"; -import type Pokemon from "#app/field/pokemon"; -import type { ModifierBar } from "#app/modifier/modifier"; -import { SubstituteTag } from "#app/data/battler-tags"; -import { globalScene } from "#app/global-scene"; +import { UiMode } from "#enums/ui-mode"; +import type { Pokemon } from "#field/pokemon"; +import type { ModifierBar } from "#modifiers/modifier"; +import { getMoveTargets } from "#moves/move-utils"; +import { UiHandler } from "#ui/ui-handler"; +import { fixedInt, isNullOrUndefined } from "#utils/common"; export type TargetSelectCallback = (targets: BattlerIndex[]) => void; -export default class TargetSelectUiHandler extends UiHandler { +export class TargetSelectUiHandler extends UiHandler { private fieldIndex: number; private move: MoveId; private targetSelectCallback: TargetSelectCallback; diff --git a/src/ui/test-dialogue-ui-handler.ts b/src/ui/test-dialogue-ui-handler.ts index b1e5047955a..c57c73ca777 100644 --- a/src/ui/test-dialogue-ui-handler.ts +++ b/src/ui/test-dialogue-ui-handler.ts @@ -1,13 +1,13 @@ -import type { InputFieldConfig } from "./form-modal-ui-handler"; -import { FormModalUiHandler } from "./form-modal-ui-handler"; -import type { ModalConfig } from "./modal-ui-handler"; -import i18next from "i18next"; -import type { PlayerPokemon } from "#app/field/pokemon"; -import type { OptionSelectItem } from "./abstact-option-select-ui-handler"; -import { isNullOrUndefined } from "#app/utils/common"; import { UiMode } from "#enums/ui-mode"; +import type { PlayerPokemon } from "#field/pokemon"; +import type { OptionSelectItem } from "#ui/abstact-option-select-ui-handler"; +import type { InputFieldConfig } from "#ui/form-modal-ui-handler"; +import { FormModalUiHandler } from "#ui/form-modal-ui-handler"; +import type { ModalConfig } from "#ui/modal-ui-handler"; +import { isNullOrUndefined } from "#utils/common"; +import i18next from "i18next"; -export default class TestDialogueUiHandler extends FormModalUiHandler { +export class TestDialogueUiHandler extends FormModalUiHandler { keys: string[]; setup() { diff --git a/src/ui/text.ts b/src/ui/text.ts index 76c85bac5cf..d0d2a6082ad 100644 --- a/src/ui/text.ts +++ b/src/ui/text.ts @@ -1,11 +1,11 @@ +import { globalScene } from "#app/global-scene"; import { EggTier } from "#enums/egg-type"; +import { ModifierTier } from "#enums/modifier-tier"; import { UiTheme } from "#enums/ui-theme"; +import i18next from "#plugins/i18n"; import type Phaser from "phaser"; import BBCodeText from "phaser3-rex-plugins/plugins/gameobjects/tagtext/bbcodetext/BBCodeText"; import InputText from "phaser3-rex-plugins/plugins/inputtext"; -import { globalScene } from "#app/global-scene"; -import { ModifierTier } from "../enums/modifier-tier"; -import i18next from "#app/plugins/i18n"; export enum TextStyle { MESSAGE, diff --git a/src/ui/time-of-day-widget.ts b/src/ui/time-of-day-widget.ts index 5f5116a2da0..6deaf1405d7 100644 --- a/src/ui/time-of-day-widget.ts +++ b/src/ui/time-of-day-widget.ts @@ -1,11 +1,11 @@ -import { fixedInt } from "#app/utils/common"; import { globalScene } from "#app/global-scene"; -import { BattleSceneEventType } from "../events/battle-scene"; import { EaseType } from "#enums/ease-type"; import { TimeOfDay } from "#enums/time-of-day"; +import { BattleSceneEventType } from "#events/battle-scene"; +import { fixedInt } from "#utils/common"; /** A small self contained UI element that displays the time of day as an icon */ -export default class TimeOfDayWidget extends Phaser.GameObjects.Container { +export class TimeOfDayWidget extends Phaser.GameObjects.Container { /** The {@linkcode Phaser.GameObjects.Sprite} that represents the foreground of the current time of day */ private readonly timeOfDayIconFgs: Phaser.GameObjects.Sprite[] = new Array(2); /** The {@linkcode Phaser.GameObjects.Sprite} that represents the middle-ground of the current time of day */ diff --git a/src/ui/title-ui-handler.ts b/src/ui/title-ui-handler.ts index 50e77bbdd14..b7c37538a3e 100644 --- a/src/ui/title-ui-handler.ts +++ b/src/ui/title-ui-handler.ts @@ -1,19 +1,19 @@ -import OptionSelectUiHandler from "./settings/option-select-ui-handler"; -import { UiMode } from "#enums/ui-mode"; -import { fixedInt, randInt, randItem } from "#app/utils/common"; -import { TextStyle, addTextObject } from "./text"; -import { getSplashMessages } from "../data/splash-messages"; -import i18next from "i18next"; -import { TimedEventDisplay } from "#app/timed-event-manager"; -import { version } from "../../package.json"; -import { pokerogueApi } from "#app/plugins/api/pokerogue-api"; -import { globalScene } from "#app/global-scene"; -import type { SpeciesId } from "#enums/species-id"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; -import { PlayerGender } from "#enums/player-gender"; +import { pokerogueApi } from "#api/pokerogue-api"; import { timedEventManager } from "#app/global-event-manager"; +import { globalScene } from "#app/global-scene"; +import { TimedEventDisplay } from "#app/timed-event-manager"; +import { getSplashMessages } from "#data/splash-messages"; +import { PlayerGender } from "#enums/player-gender"; +import type { SpeciesId } from "#enums/species-id"; +import { UiMode } from "#enums/ui-mode"; +import { version } from "#package.json"; +import { OptionSelectUiHandler } from "#ui/option-select-ui-handler"; +import { addTextObject, TextStyle } from "#ui/text"; +import { fixedInt, randInt, randItem } from "#utils/common"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; +import i18next from "i18next"; -export default class TitleUiHandler extends OptionSelectUiHandler { +export class TitleUiHandler extends OptionSelectUiHandler { /** If the stats can not be retrieved, use this fallback value */ private static readonly BATTLES_WON_FALLBACK: number = -1; diff --git a/src/ui/ui-handler.ts b/src/ui/ui-handler.ts index d3784c1225c..c7b25c90205 100644 --- a/src/ui/ui-handler.ts +++ b/src/ui/ui-handler.ts @@ -1,13 +1,13 @@ import { globalScene } from "#app/global-scene"; -import type { TextStyle } from "./text"; -import { getTextColor } from "./text"; -import type { UiMode } from "#enums/ui-mode"; import type { Button } from "#enums/buttons"; +import type { UiMode } from "#enums/ui-mode"; +import type { TextStyle } from "#ui/text"; +import { getTextColor } from "#ui/text"; /** * A basic abstract class to act as a holder and processor for UI elements. */ -export default abstract class UiHandler { +export abstract class UiHandler { protected mode: number | null; protected cursor = 0; public active = false; diff --git a/src/ui/ui-theme.ts b/src/ui/ui-theme.ts index c3931aea23b..f2d434c024a 100644 --- a/src/ui/ui-theme.ts +++ b/src/ui/ui-theme.ts @@ -1,6 +1,6 @@ -import { UiTheme } from "#enums/ui-theme"; -import { legacyCompatibleImages } from "#app/scene-base"; import { globalScene } from "#app/global-scene"; +import { legacyCompatibleImages } from "#app/scene-base"; +import { UiTheme } from "#enums/ui-theme"; export enum WindowVariant { NORMAL, diff --git a/src/ui/ui.ts b/src/ui/ui.ts index ad496df6382..394409bcb9d 100644 --- a/src/ui/ui.ts +++ b/src/ui/ui.ts @@ -1,63 +1,63 @@ import { globalScene } from "#app/global-scene"; -import type UiHandler from "./ui-handler"; -import BattleMessageUiHandler from "./battle-message-ui-handler"; -import CommandUiHandler from "./command-ui-handler"; -import PartyUiHandler from "./party-ui-handler"; -import FightUiHandler from "./fight-ui-handler"; -import MessageUiHandler from "./message-ui-handler"; -import ConfirmUiHandler from "./confirm-ui-handler"; -import ModifierSelectUiHandler from "./modifier-select-ui-handler"; -import BallUiHandler from "./ball-ui-handler"; -import SummaryUiHandler from "./summary-ui-handler"; -import StarterSelectUiHandler from "./starter-select-ui-handler"; -import EvolutionSceneHandler from "./evolution-scene-handler"; -import TargetSelectUiHandler from "./target-select-ui-handler"; -import SettingsUiHandler from "./settings/settings-ui-handler"; -import SettingsGamepadUiHandler from "./settings/settings-gamepad-ui-handler"; -import GameChallengesUiHandler from "./challenges-select-ui-handler"; -import { TextStyle, addTextObject } from "./text"; -import AchvBar from "./achv-bar"; -import MenuUiHandler from "./menu-ui-handler"; -import AchvsUiHandler from "./achvs-ui-handler"; -import OptionSelectUiHandler from "./settings/option-select-ui-handler"; -import EggHatchSceneHandler from "./egg-hatch-scene-handler"; -import EggListUiHandler from "./egg-list-ui-handler"; -import EggGachaUiHandler from "./egg-gacha-ui-handler"; -import PokedexUiHandler from "./pokedex-ui-handler"; -import { addWindow } from "./ui-theme"; -import LoginFormUiHandler from "./login-form-ui-handler"; -import RegistrationFormUiHandler from "./registration-form-ui-handler"; -import LoadingModalUiHandler from "./loading-modal-ui-handler"; -import { executeIf } from "#app/utils/common"; -import GameStatsUiHandler from "./game-stats-ui-handler"; -import AwaitableUiHandler from "./awaitable-ui-handler"; -import SaveSlotSelectUiHandler from "./save-slot-select-ui-handler"; -import TitleUiHandler from "./title-ui-handler"; -import SavingIconHandler from "./saving-icon-handler"; -import UnavailableModalUiHandler from "./unavailable-modal-ui-handler"; -import SessionReloadModalUiHandler from "./session-reload-modal-ui-handler"; import type { Button } from "#enums/buttons"; -import i18next from "i18next"; -import GamepadBindingUiHandler from "./settings/gamepad-binding-ui-handler"; -import SettingsKeyboardUiHandler from "#app/ui/settings/settings-keyboard-ui-handler"; -import KeyboardBindingUiHandler from "#app/ui/settings/keyboard-binding-ui-handler"; -import SettingsDisplayUiHandler from "./settings/settings-display-ui-handler"; -import SettingsAudioUiHandler from "./settings/settings-audio-ui-handler"; -import { PlayerGender } from "#enums/player-gender"; -import type BgmBar from "#app/ui/bgm-bar"; -import RenameFormUiHandler from "./rename-form-ui-handler"; -import AdminUiHandler from "./admin-ui-handler"; -import RunHistoryUiHandler from "./run-history-ui-handler"; -import RunInfoUiHandler from "./run-info-ui-handler"; -import EggSummaryUiHandler from "./egg-summary-ui-handler"; -import TestDialogueUiHandler from "#app/ui/test-dialogue-ui-handler"; -import AutoCompleteUiHandler from "./autocomplete-ui-handler"; import { Device } from "#enums/devices"; -import MysteryEncounterUiHandler from "./mystery-encounter-ui-handler"; -import PokedexScanUiHandler from "./pokedex-scan-ui-handler"; -import PokedexPageUiHandler from "./pokedex-page-ui-handler"; -import { NavigationManager } from "./settings/navigationMenu"; +import { PlayerGender } from "#enums/player-gender"; import { UiMode } from "#enums/ui-mode"; +import { AchvBar } from "#ui/achv-bar"; +import { AchvsUiHandler } from "#ui/achvs-ui-handler"; +import { AdminUiHandler } from "#ui/admin-ui-handler"; +import { AutoCompleteUiHandler } from "#ui/autocomplete-ui-handler"; +import { AwaitableUiHandler } from "#ui/awaitable-ui-handler"; +import { BallUiHandler } from "#ui/ball-ui-handler"; +import { BattleMessageUiHandler } from "#ui/battle-message-ui-handler"; +import type { BgmBar } from "#ui/bgm-bar"; +import { GameChallengesUiHandler } from "#ui/challenges-select-ui-handler"; +import { CommandUiHandler } from "#ui/command-ui-handler"; +import { ConfirmUiHandler } from "#ui/confirm-ui-handler"; +import { EggGachaUiHandler } from "#ui/egg-gacha-ui-handler"; +import { EggHatchSceneHandler } from "#ui/egg-hatch-scene-handler"; +import { EggListUiHandler } from "#ui/egg-list-ui-handler"; +import { EggSummaryUiHandler } from "#ui/egg-summary-ui-handler"; +import { EvolutionSceneHandler } from "#ui/evolution-scene-handler"; +import { FightUiHandler } from "#ui/fight-ui-handler"; +import { GameStatsUiHandler } from "#ui/game-stats-ui-handler"; +import { GamepadBindingUiHandler } from "#ui/gamepad-binding-ui-handler"; +import { KeyboardBindingUiHandler } from "#ui/keyboard-binding-ui-handler"; +import { LoadingModalUiHandler } from "#ui/loading-modal-ui-handler"; +import { LoginFormUiHandler } from "#ui/login-form-ui-handler"; +import { MenuUiHandler } from "#ui/menu-ui-handler"; +import { MessageUiHandler } from "#ui/message-ui-handler"; +import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; +import { MysteryEncounterUiHandler } from "#ui/mystery-encounter-ui-handler"; +import { NavigationManager } from "#ui/navigationMenu"; +import { OptionSelectUiHandler } from "#ui/option-select-ui-handler"; +import { PartyUiHandler } from "#ui/party-ui-handler"; +import { PokedexPageUiHandler } from "#ui/pokedex-page-ui-handler"; +import { PokedexScanUiHandler } from "#ui/pokedex-scan-ui-handler"; +import { PokedexUiHandler } from "#ui/pokedex-ui-handler"; +import { RegistrationFormUiHandler } from "#ui/registration-form-ui-handler"; +import { RenameFormUiHandler } from "#ui/rename-form-ui-handler"; +import { RunHistoryUiHandler } from "#ui/run-history-ui-handler"; +import { RunInfoUiHandler } from "#ui/run-info-ui-handler"; +import { SaveSlotSelectUiHandler } from "#ui/save-slot-select-ui-handler"; +import { SavingIconHandler } from "#ui/saving-icon-handler"; +import { SessionReloadModalUiHandler } from "#ui/session-reload-modal-ui-handler"; +import { SettingsAudioUiHandler } from "#ui/settings-audio-ui-handler"; +import { SettingsDisplayUiHandler } from "#ui/settings-display-ui-handler"; +import { SettingsGamepadUiHandler } from "#ui/settings-gamepad-ui-handler"; +import { SettingsKeyboardUiHandler } from "#ui/settings-keyboard-ui-handler"; +import { SettingsUiHandler } from "#ui/settings-ui-handler"; +import { StarterSelectUiHandler } from "#ui/starter-select-ui-handler"; +import { SummaryUiHandler } from "#ui/summary-ui-handler"; +import { TargetSelectUiHandler } from "#ui/target-select-ui-handler"; +import { TestDialogueUiHandler } from "#ui/test-dialogue-ui-handler"; +import { addTextObject, TextStyle } from "#ui/text"; +import { TitleUiHandler } from "#ui/title-ui-handler"; +import type { UiHandler } from "#ui/ui-handler"; +import { addWindow } from "#ui/ui-theme"; +import { UnavailableModalUiHandler } from "#ui/unavailable-modal-ui-handler"; +import { executeIf } from "#utils/common"; +import i18next from "i18next"; const transitionModes = [ UiMode.SAVE_SLOT, @@ -103,7 +103,7 @@ const noTransitionModes = [ UiMode.RUN_INFO, ]; -export default class UI extends Phaser.GameObjects.Container { +export class UI extends Phaser.GameObjects.Container { private mode: UiMode; private modeChain: UiMode[]; public handlers: UiHandler[]; diff --git a/src/ui/unavailable-modal-ui-handler.ts b/src/ui/unavailable-modal-ui-handler.ts index 5bed55ec24a..420a47664a7 100644 --- a/src/ui/unavailable-modal-ui-handler.ts +++ b/src/ui/unavailable-modal-ui-handler.ts @@ -1,14 +1,14 @@ -import type { ModalConfig } from "./modal-ui-handler"; -import { ModalUiHandler } from "./modal-ui-handler"; -import { addTextObject, TextStyle } from "./text"; -import type { UiMode } from "#enums/ui-mode"; import { updateUserInfo } from "#app/account"; -import { sessionIdKey } from "#app/utils/common"; -import { removeCookie } from "#app/utils/cookies"; -import i18next from "i18next"; import { globalScene } from "#app/global-scene"; +import type { UiMode } from "#enums/ui-mode"; +import type { ModalConfig } from "#ui/modal-ui-handler"; +import { ModalUiHandler } from "#ui/modal-ui-handler"; +import { addTextObject, TextStyle } from "#ui/text"; +import { sessionIdKey } from "#utils/common"; +import { removeCookie } from "#utils/cookies"; +import i18next from "i18next"; -export default class UnavailableModalUiHandler extends ModalUiHandler { +export class UnavailableModalUiHandler extends ModalUiHandler { private reconnectTimer: NodeJS.Timeout | null; private reconnectDuration: number; private reconnectCallback: () => void; diff --git a/src/utils/common.ts b/src/utils/common.ts index 753d6ebb865..bd66f2e773f 100644 --- a/src/utils/common.ts +++ b/src/utils/common.ts @@ -1,8 +1,8 @@ +import { pokerogueApi } from "#api/pokerogue-api"; import { MoneyFormat } from "#enums/money-format"; import { MoveId } from "#enums/move-id"; +import type { Variant } from "#sprites/variant"; import i18next from "i18next"; -import { pokerogueApi } from "#app/plugins/api/pokerogue-api"; -import type { Variant } from "#app/sprites/variant"; export type nil = null | undefined; diff --git a/src/utils/cookies.ts b/src/utils/cookies.ts index b38e941b59a..06391e6f4c7 100644 --- a/src/utils/cookies.ts +++ b/src/utils/cookies.ts @@ -1,4 +1,4 @@ -import { isBeta } from "./utility-vars"; +import { isBeta } from "#utils/utility-vars"; export function setCookie(cName: string, cValue: string): void { const expiration = new Date(); diff --git a/src/utils/data.ts b/src/utils/data.ts index 5a28657d034..932ea38d504 100644 --- a/src/utils/data.ts +++ b/src/utils/data.ts @@ -1,7 +1,7 @@ import { loggedInUser } from "#app/account"; -import type { StarterAttributes } from "#app/system/game-data"; -import { AES, enc } from "crypto-js"; import { saveKey } from "#app/constants"; +import type { StarterAttributes } from "#system/game-data"; +import { AES, enc } from "crypto-js"; /** * Perform a deep copy of an object. diff --git a/src/utils/modifier-utils.ts b/src/utils/modifier-utils.ts index 3be4af3730c..58108e7a599 100644 --- a/src/utils/modifier-utils.ts +++ b/src/utils/modifier-utils.ts @@ -1,3 +1,4 @@ +import { modifierTypes } from "#data/data-lists"; import { ModifierPoolType } from "#enums/modifier-pool-type"; import { dailyStarterModifierPool, @@ -5,10 +6,9 @@ import { modifierPool, trainerModifierPool, wildModifierPool, -} from "#app/modifier/modifier-pools"; -import type { ModifierPool, ModifierTypeFunc } from "#app/@types/modifier-types"; -import { modifierTypes } from "#app/data/data-lists"; -import type { ModifierType } from "#app/modifier/modifier-type"; +} from "#modifiers/modifier-pools"; +import type { ModifierType } from "#modifiers/modifier-type"; +import type { ModifierPool, ModifierTypeFunc } from "#types/modifier-types"; export function getModifierPoolForType(poolType: ModifierPoolType): ModifierPool { switch (poolType) { diff --git a/src/utils/pokemon-utils.ts b/src/utils/pokemon-utils.ts index 9f87c36b050..da39cfe11ad 100644 --- a/src/utils/pokemon-utils.ts +++ b/src/utils/pokemon-utils.ts @@ -1,5 +1,5 @@ -import { allSpecies } from "#app/data/data-lists"; -import type PokemonSpecies from "#app/data/pokemon-species"; +import { allSpecies } from "#data/data-lists"; +import type { PokemonSpecies } from "#data/pokemon-species"; import type { SpeciesId } from "#enums/species-id"; /** diff --git a/test/abilities/ability_activation_order.test.ts b/test/abilities/ability_activation_order.test.ts index 0b8e354cc7d..8344ba6be11 100644 --- a/test/abilities/ability_activation_order.test.ts +++ b/test/abilities/ability_activation_order.test.ts @@ -3,7 +3,7 @@ import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { Stat } from "#enums/stat"; import { WeatherType } from "#enums/weather-type"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/ability_duplication.test.ts b/test/abilities/ability_duplication.test.ts index d392b7043e4..0c88b65a00e 100644 --- a/test/abilities/ability_duplication.test.ts +++ b/test/abilities/ability_duplication.test.ts @@ -1,10 +1,10 @@ -import { Stat } from "#app/enums/stat"; 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 { Stat } from "#enums/stat"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; describe("Ability Duplication", () => { let phaserGame: Phaser.Game; diff --git a/test/abilities/ability_timing.test.ts b/test/abilities/ability_timing.test.ts index 124591597be..c3e841d8216 100644 --- a/test/abilities/ability_timing.test.ts +++ b/test/abilities/ability_timing.test.ts @@ -1,11 +1,11 @@ -import { BattleStyle } from "#app/enums/battle-style"; -import { CommandPhase } from "#app/phases/command-phase"; -import { TurnInitPhase } from "#app/phases/turn-init-phase"; -import i18next from "#app/plugins/i18n"; -import { UiMode } from "#enums/ui-mode"; import { AbilityId } from "#enums/ability-id"; +import { BattleStyle } from "#enums/battle-style"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { UiMode } from "#enums/ui-mode"; +import { CommandPhase } from "#phases/command-phase"; +import { TurnInitPhase } from "#phases/turn-init-phase"; +import i18next from "#plugins/i18n"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/abilities/analytic.test.ts b/test/abilities/analytic.test.ts index 5dbf4365186..0bacfe6775b 100644 --- a/test/abilities/analytic.test.ts +++ b/test/abilities/analytic.test.ts @@ -1,9 +1,9 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { isBetween, toDmgValue } from "#app/utils/common"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; +import { isBetween, toDmgValue } from "#utils/common"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/arena_trap.test.ts b/test/abilities/arena_trap.test.ts index cc6888be102..c47cf3cd327 100644 --- a/test/abilities/arena_trap.test.ts +++ b/test/abilities/arena_trap.test.ts @@ -1,10 +1,10 @@ -import { allAbilities } from "#app/data/data-lists"; +import { allAbilities } from "#data/data-lists"; 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 { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; describe("Abilities - Arena Trap", () => { let phaserGame: Phaser.Game; diff --git a/test/abilities/aroma_veil.test.ts b/test/abilities/aroma_veil.test.ts index 56cce749b9f..fb08d60c24f 100644 --- a/test/abilities/aroma_veil.test.ts +++ b/test/abilities/aroma_veil.test.ts @@ -1,13 +1,13 @@ -import { MoveId } from "#enums/move-id"; -import { SpeciesId } from "#enums/species-id"; import { AbilityId } from "#enums/ability-id"; -import GameManager from "#test/testUtils/gameManager"; -import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import { BattlerTagType } from "#enums/battler-tag-type"; import { ArenaTagType } from "#enums/arena-tag-type"; import { BattlerIndex } from "#enums/battler-index"; -import type { PlayerPokemon } from "#app/field/pokemon"; +import { BattlerTagType } from "#enums/battler-tag-type"; +import { MoveId } from "#enums/move-id"; +import { SpeciesId } from "#enums/species-id"; +import type { PlayerPokemon } from "#field/pokemon"; +import { GameManager } from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; describe("Moves - Aroma Veil", () => { let phaserGame: Phaser.Game; diff --git a/test/abilities/aura_break.test.ts b/test/abilities/aura_break.test.ts index 657d363bd97..6f33e3f047f 100644 --- a/test/abilities/aura_break.test.ts +++ b/test/abilities/aura_break.test.ts @@ -1,8 +1,8 @@ -import { allMoves } from "#app/data/data-lists"; +import { allMoves } from "#data/data-lists"; 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 { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/abilities/battery.test.ts b/test/abilities/battery.test.ts index db129e72b0b..13ebd52367a 100644 --- a/test/abilities/battery.test.ts +++ b/test/abilities/battery.test.ts @@ -1,10 +1,10 @@ -import { allMoves } from "#app/data/data-lists"; +import { allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; -import { MoveEffectPhase } from "#app/phases/move-effect-phase"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { MoveEffectPhase } from "#phases/move-effect-phase"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/abilities/battle_bond.test.ts b/test/abilities/battle_bond.test.ts index adb4a9c6e7a..ef8c2ffed75 100644 --- a/test/abilities/battle_bond.test.ts +++ b/test/abilities/battle_bond.test.ts @@ -1,11 +1,11 @@ -import { allMoves } from "#app/data/data-lists"; -import { MultiHitType } from "#enums/MultiHitType"; -import { Status } from "#app/data/status-effect"; +import { allMoves } from "#data/data-lists"; +import { Status } from "#data/status-effect"; import { AbilityId } from "#enums/ability-id"; +import { MultiHitType } from "#enums/MultiHitType"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; describe("Abilities - BATTLE BOND", () => { diff --git a/test/abilities/beast_boost.test.ts b/test/abilities/beast_boost.test.ts index 8be9156ce07..0a49728698b 100644 --- a/test/abilities/beast_boost.test.ts +++ b/test/abilities/beast_boost.test.ts @@ -1,9 +1,9 @@ -import { BattlerIndex } from "#enums/battler-index"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { Stat } from "#enums/stat"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/abilities/commander.test.ts b/test/abilities/commander.test.ts index 99512d7a733..5ddafc90d05 100644 --- a/test/abilities/commander.test.ts +++ b/test/abilities/commander.test.ts @@ -1,15 +1,15 @@ +import { AbilityId } from "#enums/ability-id"; import { BattlerIndex } from "#enums/battler-index"; import { BattlerTagType } from "#enums/battler-tag-type"; +import { MoveId } from "#enums/move-id"; +import { MoveResult } from "#enums/move-result"; import { PokemonAnimType } from "#enums/pokemon-anim-type"; +import { SpeciesId } from "#enums/species-id"; import type { EffectiveStat } from "#enums/stat"; import { Stat } from "#enums/stat"; import { StatusEffect } from "#enums/status-effect"; import { WeatherType } from "#enums/weather-type"; -import { MoveResult } from "#enums/move-result"; -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 { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/abilities/competitive.test.ts b/test/abilities/competitive.test.ts index f12b06837dc..7dcc677a74e 100644 --- a/test/abilities/competitive.test.ts +++ b/test/abilities/competitive.test.ts @@ -1,9 +1,9 @@ -import { Stat } from "#enums/stat"; -import { TurnInitPhase } from "#app/phases/turn-init-phase"; 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 { Stat } from "#enums/stat"; +import { TurnInitPhase } from "#phases/turn-init-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/contrary.test.ts b/test/abilities/contrary.test.ts index 6962abb0fec..7db48dedbfd 100644 --- a/test/abilities/contrary.test.ts +++ b/test/abilities/contrary.test.ts @@ -1,8 +1,8 @@ -import { MoveId } from "#enums/move-id"; import { AbilityId } from "#enums/ability-id"; +import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { Stat } from "#enums/stat"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/corrosion.test.ts b/test/abilities/corrosion.test.ts index 2a0464d1146..22abc158fc7 100644 --- a/test/abilities/corrosion.test.ts +++ b/test/abilities/corrosion.test.ts @@ -1,7 +1,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 { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/costar.test.ts b/test/abilities/costar.test.ts index a40d84e72f5..42d8f7811f8 100644 --- a/test/abilities/costar.test.ts +++ b/test/abilities/costar.test.ts @@ -1,10 +1,10 @@ -import { Stat } from "#enums/stat"; import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import { CommandPhase } from "#app/phases/command-phase"; -import { MessagePhase } from "#app/phases/message-phase"; -import GameManager from "#test/testUtils/gameManager"; +import { Stat } from "#enums/stat"; +import { CommandPhase } from "#phases/command-phase"; +import { MessagePhase } from "#phases/message-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; diff --git a/test/abilities/cud_chew.test.ts b/test/abilities/cud_chew.test.ts index e563e7537dd..8fc62b38528 100644 --- a/test/abilities/cud_chew.test.ts +++ b/test/abilities/cud_chew.test.ts @@ -1,5 +1,4 @@ -import { CudChewConsumeBerryAbAttr } from "#app/data/abilities/ability"; -import Pokemon from "#app/field/pokemon"; +import { CudChewConsumeBerryAbAttr } from "#abilities/ability"; import { globalScene } from "#app/global-scene"; import { getPokemonNameWithAffix } from "#app/messages"; import { AbilityId } from "#enums/ability-id"; @@ -7,7 +6,8 @@ import { BerryType } from "#enums/berry-type"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { Stat } from "#enums/stat"; -import GameManager from "#test/testUtils/gameManager"; +import { Pokemon } from "#field/pokemon"; +import { GameManager } from "#test/testUtils/gameManager"; import i18next from "i18next"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/abilities/dancer.test.ts b/test/abilities/dancer.test.ts index 2a4a3c36bcc..86b5b68e901 100644 --- a/test/abilities/dancer.test.ts +++ b/test/abilities/dancer.test.ts @@ -1,11 +1,11 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { MoveResult } from "#enums/move-result"; -import type { MovePhase } from "#app/phases/move-phase"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; +import { MoveResult } from "#enums/move-result"; import { SpeciesId } from "#enums/species-id"; import { Stat } from "#enums/stat"; -import GameManager from "#test/testUtils/gameManager"; +import type { MovePhase } from "#phases/move-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/defiant.test.ts b/test/abilities/defiant.test.ts index ef26b5bfca3..44187429e2b 100644 --- a/test/abilities/defiant.test.ts +++ b/test/abilities/defiant.test.ts @@ -1,9 +1,9 @@ -import { Stat } from "#enums/stat"; -import { TurnInitPhase } from "#app/phases/turn-init-phase"; 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 { Stat } from "#enums/stat"; +import { TurnInitPhase } from "#phases/turn-init-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/desolate-land.test.ts b/test/abilities/desolate-land.test.ts index eee44b3d818..fc066fa8955 100644 --- a/test/abilities/desolate-land.test.ts +++ b/test/abilities/desolate-land.test.ts @@ -1,14 +1,14 @@ -import { PokeballType } from "#app/enums/pokeball"; -import { WeatherType } from "#app/enums/weather-type"; -import type { CommandPhase } from "#app/phases/command-phase"; -import { Command } from "#enums/command"; -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 Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest"; import { globalScene } from "#app/global-scene"; +import { AbilityId } from "#enums/ability-id"; +import { Command } from "#enums/command"; +import { MoveId } from "#enums/move-id"; +import { PokeballType } from "#enums/pokeball"; +import { SpeciesId } from "#enums/species-id"; +import { WeatherType } from "#enums/weather-type"; +import type { CommandPhase } from "#phases/command-phase"; +import { GameManager } from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; describe("Abilities - Desolate Land", () => { let phaserGame: Phaser.Game; diff --git a/test/abilities/disguise.test.ts b/test/abilities/disguise.test.ts index 4ccd825e574..94d9dbf1d47 100644 --- a/test/abilities/disguise.test.ts +++ b/test/abilities/disguise.test.ts @@ -1,11 +1,11 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { toDmgValue } from "#app/utils/common"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { Stat } from "#enums/stat"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; +import { toDmgValue } from "#utils/common"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; describe("Abilities - Disguise", () => { diff --git a/test/abilities/dry_skin.test.ts b/test/abilities/dry_skin.test.ts index 31620beb9bd..712d3295e6f 100644 --- a/test/abilities/dry_skin.test.ts +++ b/test/abilities/dry_skin.test.ts @@ -1,7 +1,7 @@ -import { SpeciesId } from "#enums/species-id"; import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; -import GameManager from "#test/testUtils/gameManager"; +import { SpeciesId } from "#enums/species-id"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/early_bird.test.ts b/test/abilities/early_bird.test.ts index dcdfd8e4956..be4a2c802af 100644 --- a/test/abilities/early_bird.test.ts +++ b/test/abilities/early_bird.test.ts @@ -1,10 +1,10 @@ -import { Status } from "#app/data/status-effect"; -import { MoveResult } from "#enums/move-result"; +import { Status } from "#data/status-effect"; 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 { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/flash_fire.test.ts b/test/abilities/flash_fire.test.ts index 3be156a1578..d6085c4e591 100644 --- a/test/abilities/flash_fire.test.ts +++ b/test/abilities/flash_fire.test.ts @@ -1,12 +1,12 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { BattlerTagType } from "#app/enums/battler-tag-type"; -import { SpeciesId } from "#enums/species-id"; -import { MovePhase } from "#app/phases/move-phase"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; +import { BattlerTagType } from "#enums/battler-tag-type"; import { MoveId } from "#enums/move-id"; +import { SpeciesId } from "#enums/species-id"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/testUtils/gameManager"; +import { MovePhase } from "#phases/move-phase"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/flower_gift.test.ts b/test/abilities/flower_gift.test.ts index f072afe7f34..b283729d951 100644 --- a/test/abilities/flower_gift.test.ts +++ b/test/abilities/flower_gift.test.ts @@ -1,12 +1,12 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { allAbilities } from "#app/data/data-lists"; +import { allAbilities } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; -import { Stat } from "#app/enums/stat"; -import { WeatherType } from "#app/enums/weather-type"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { Stat } from "#enums/stat"; +import { WeatherType } from "#enums/weather-type"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/abilities/flower_veil.test.ts b/test/abilities/flower_veil.test.ts index 7cabfa23e96..e890ea24fad 100644 --- a/test/abilities/flower_veil.test.ts +++ b/test/abilities/flower_veil.test.ts @@ -1,15 +1,14 @@ -import { BattlerIndex } from "#enums/battler-index"; +import { allAbilities, allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; +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 { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { allMoves } from "#app/data/data-lists"; -import { BattlerTagType } from "#enums/battler-tag-type"; -import { allAbilities } from "#app/data/data-lists"; describe("Abilities - Flower Veil", () => { let phaserGame: Phaser.Game; diff --git a/test/abilities/forecast.test.ts b/test/abilities/forecast.test.ts index 9111766ebdf..372e32a27fa 100644 --- a/test/abilities/forecast.test.ts +++ b/test/abilities/forecast.test.ts @@ -1,15 +1,15 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { allAbilities } from "#app/data/data-lists"; +import { allAbilities } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; -import { WeatherType } from "#app/enums/weather-type"; -import { DamageAnimPhase } from "#app/phases/damage-anim-phase"; -import { MovePhase } from "#app/phases/move-phase"; -import { PostSummonPhase } from "#app/phases/post-summon-phase"; -import { QuietFormChangePhase } from "#app/phases/quiet-form-change-phase"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { WeatherType } from "#enums/weather-type"; +import { DamageAnimPhase } from "#phases/damage-anim-phase"; +import { MovePhase } from "#phases/move-phase"; +import { PostSummonPhase } from "#phases/post-summon-phase"; +import { QuietFormChangePhase } from "#phases/quiet-form-change-phase"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/abilities/friend_guard.test.ts b/test/abilities/friend_guard.test.ts index c5809e18e96..e26fd5b5f1f 100644 --- a/test/abilities/friend_guard.test.ts +++ b/test/abilities/friend_guard.test.ts @@ -1,13 +1,12 @@ +import { allAbilities, allMoves } from "#data/data-lists"; +import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; +import { MoveCategory } from "#enums/MoveCategory"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import { AbilityId } from "#enums/ability-id"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { BattlerIndex } from "#enums/battler-index"; -import { allAbilities } from "#app/data/data-lists"; -import { allMoves } from "#app/data/data-lists"; -import { MoveCategory } from "#enums/MoveCategory"; describe("Moves - Friend Guard", () => { let phaserGame: Phaser.Game; diff --git a/test/abilities/good_as_gold.test.ts b/test/abilities/good_as_gold.test.ts index 89e354b1f34..f2f8e7a0a93 100644 --- a/test/abilities/good_as_gold.test.ts +++ b/test/abilities/good_as_gold.test.ts @@ -1,15 +1,15 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { ArenaTagSide } from "#enums/arena-tag-side"; -import { allAbilities } from "#app/data/data-lists"; -import { ArenaTagType } from "#app/enums/arena-tag-type"; -import { BattlerTagType } from "#app/enums/battler-tag-type"; -import { Stat } from "#app/enums/stat"; -import { StatusEffect } from "#app/enums/status-effect"; -import { WeatherType } from "#app/enums/weather-type"; +import { allAbilities } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; +import { ArenaTagSide } from "#enums/arena-tag-side"; +import { ArenaTagType } from "#enums/arena-tag-type"; +import { BattlerIndex } from "#enums/battler-index"; +import { BattlerTagType } from "#enums/battler-tag-type"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { Stat } from "#enums/stat"; +import { StatusEffect } from "#enums/status-effect"; +import { WeatherType } from "#enums/weather-type"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/abilities/gorilla_tactics.test.ts b/test/abilities/gorilla_tactics.test.ts index 7a563f5b37f..05714fe77ea 100644 --- a/test/abilities/gorilla_tactics.test.ts +++ b/test/abilities/gorilla_tactics.test.ts @@ -1,14 +1,14 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { RandomMoveAttr } from "#app/data/moves/move"; -import { MoveId } from "#enums/move-id"; import { AbilityId } from "#enums/ability-id"; -import { SpeciesId } from "#enums/species-id"; -import { Stat } from "#app/enums/stat"; -import GameManager from "#test/testUtils/gameManager"; -import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; +import { BattlerIndex } from "#enums/battler-index"; +import { MoveId } from "#enums/move-id"; import { MoveResult } from "#enums/move-result"; import { MoveUseMode } from "#enums/move-use-mode"; +import { SpeciesId } from "#enums/species-id"; +import { Stat } from "#enums/stat"; +import { RandomMoveAttr } from "#moves/move"; +import { GameManager } from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; describe("Abilities - Gorilla Tactics", () => { let phaserGame: Phaser.Game; diff --git a/test/abilities/gulp_missile.test.ts b/test/abilities/gulp_missile.test.ts index e47b22f0c06..69ed6c51ac9 100644 --- a/test/abilities/gulp_missile.test.ts +++ b/test/abilities/gulp_missile.test.ts @@ -1,12 +1,12 @@ -import { BattlerIndex } from "#enums/battler-index"; -import type Pokemon from "#app/field/pokemon"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; 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 { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/testUtils/gameManager"; +import type { Pokemon } from "#field/pokemon"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/abilities/harvest.test.ts b/test/abilities/harvest.test.ts index 42c9772bd10..244de383b44 100644 --- a/test/abilities/harvest.test.ts +++ b/test/abilities/harvest.test.ts @@ -1,16 +1,16 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { PostTurnRestoreBerryAbAttr } from "#app/data/abilities/ability"; -import type Pokemon from "#app/field/pokemon"; -import { BerryModifier, PreserveBerryModifier } from "#app/modifier/modifier"; -import type { ModifierOverride } from "#app/modifier/modifier-type"; -import type { BooleanHolder } from "#app/utils/common"; +import { PostTurnRestoreBerryAbAttr } from "#abilities/ability"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; import { BerryType } from "#enums/berry-type"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { Stat } from "#enums/stat"; import { WeatherType } from "#enums/weather-type"; -import GameManager from "#test/testUtils/gameManager"; +import type { Pokemon } from "#field/pokemon"; +import { BerryModifier, PreserveBerryModifier } from "#modifiers/modifier"; +import type { ModifierOverride } from "#modifiers/modifier-type"; +import { GameManager } from "#test/testUtils/gameManager"; +import type { BooleanHolder } from "#utils/common"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/abilities/healer.test.ts b/test/abilities/healer.test.ts index b21b04531ec..8ce8b5bada0 100644 --- a/test/abilities/healer.test.ts +++ b/test/abilities/healer.test.ts @@ -1,14 +1,14 @@ +import { PostTurnResetStatusAbAttr } from "#abilities/ability"; +import { allAbilities } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/testUtils/gameManager"; +import type { Pokemon } from "#field/pokemon"; +import { GameManager } from "#test/testUtils/gameManager"; +import { isNullOrUndefined } from "#utils/common"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { isNullOrUndefined } from "#app/utils/common"; -import { allAbilities } from "#app/data/data-lists"; -import type Pokemon from "#app/field/pokemon"; -import { PostTurnResetStatusAbAttr } from "#app/data/abilities/ability"; describe("Abilities - Healer", () => { let phaserGame: Phaser.Game; diff --git a/test/abilities/heatproof.test.ts b/test/abilities/heatproof.test.ts index 39c9dff8289..0d76c1ad40b 100644 --- a/test/abilities/heatproof.test.ts +++ b/test/abilities/heatproof.test.ts @@ -1,10 +1,10 @@ -import { SpeciesId } from "#enums/species-id"; -import { StatusEffect } from "#app/enums/status-effect"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { toDmgValue } from "#app/utils/common"; import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; -import GameManager from "#test/testUtils/gameManager"; +import { SpeciesId } from "#enums/species-id"; +import { StatusEffect } from "#enums/status-effect"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; +import { toDmgValue } from "#utils/common"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/honey_gather.test.ts b/test/abilities/honey_gather.test.ts index 5bc7b3a0776..65c590083f5 100644 --- a/test/abilities/honey_gather.test.ts +++ b/test/abilities/honey_gather.test.ts @@ -1,12 +1,12 @@ -import type { CommandPhase } from "#app/phases/command-phase"; -import { Command } from "#enums/command"; +import Overrides from "#app/overrides"; import { AbilityId } from "#enums/ability-id"; +import { Command } from "#enums/command"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import type { CommandPhase } from "#phases/command-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import Overrides from "#app/overrides"; describe("Abilities - Honey Gather", () => { let phaserGame: Phaser.Game; diff --git a/test/abilities/hustle.test.ts b/test/abilities/hustle.test.ts index 57a1a2e1d86..94045d231d1 100644 --- a/test/abilities/hustle.test.ts +++ b/test/abilities/hustle.test.ts @@ -1,9 +1,9 @@ -import { allMoves } from "#app/data/data-lists"; +import { allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; -import { Stat } from "#app/enums/stat"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { Stat } from "#enums/stat"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/abilities/hyper_cutter.test.ts b/test/abilities/hyper_cutter.test.ts index 211be9a0533..212083b62b6 100644 --- a/test/abilities/hyper_cutter.test.ts +++ b/test/abilities/hyper_cutter.test.ts @@ -1,8 +1,8 @@ -import { Stat } from "#enums/stat"; 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 { Stat } from "#enums/stat"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/ice_face.test.ts b/test/abilities/ice_face.test.ts index c42713d7e6c..534772830e1 100644 --- a/test/abilities/ice_face.test.ts +++ b/test/abilities/ice_face.test.ts @@ -1,14 +1,14 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { MoveEffectPhase } from "#app/phases/move-effect-phase"; -import { MoveEndPhase } from "#app/phases/move-end-phase"; -import { QuietFormChangePhase } from "#app/phases/quiet-form-change-phase"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { TurnInitPhase } from "#app/phases/turn-init-phase"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; import { BattlerTagType } from "#enums/battler-tag-type"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { MoveEffectPhase } from "#phases/move-effect-phase"; +import { MoveEndPhase } from "#phases/move-end-phase"; +import { QuietFormChangePhase } from "#phases/quiet-form-change-phase"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { TurnInitPhase } from "#phases/turn-init-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/illuminate.test.ts b/test/abilities/illuminate.test.ts index ec4f6436041..0fb31379542 100644 --- a/test/abilities/illuminate.test.ts +++ b/test/abilities/illuminate.test.ts @@ -1,9 +1,9 @@ -import { Stat } from "#app/enums/stat"; import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; -import GameManager from "#test/testUtils/gameManager"; +import { Stat } from "#enums/stat"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; describe("Abilities - Illuminate", () => { let phaserGame: Phaser.Game; diff --git a/test/abilities/illusion.test.ts b/test/abilities/illusion.test.ts index 1c2809ad813..0624c5e19f4 100644 --- a/test/abilities/illusion.test.ts +++ b/test/abilities/illusion.test.ts @@ -1,9 +1,9 @@ -import { Gender } from "#app/data/gender"; -import { PokeballType } from "#app/enums/pokeball"; +import { Gender } from "#data/gender"; import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; +import { PokeballType } from "#enums/pokeball"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/immunity.test.ts b/test/abilities/immunity.test.ts index 063ab57f11a..6f6fac10bf9 100644 --- a/test/abilities/immunity.test.ts +++ b/test/abilities/immunity.test.ts @@ -2,7 +2,7 @@ import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/imposter.test.ts b/test/abilities/imposter.test.ts index 30491139877..8669c621464 100644 --- a/test/abilities/imposter.test.ts +++ b/test/abilities/imposter.test.ts @@ -1,11 +1,11 @@ -import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import Phaser from "phaser"; -import GameManager from "#test/testUtils/gameManager"; -import { SpeciesId } from "#enums/species-id"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { MoveId } from "#enums/move-id"; -import { Stat, BATTLE_STATS, EFFECTIVE_STATS } from "#enums/stat"; import { AbilityId } from "#enums/ability-id"; +import { MoveId } from "#enums/move-id"; +import { SpeciesId } from "#enums/species-id"; +import { BATTLE_STATS, EFFECTIVE_STATS, Stat } from "#enums/stat"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; // TODO: Add more tests once Imposter is fully implemented describe("Abilities - Imposter", () => { diff --git a/test/abilities/infiltrator.test.ts b/test/abilities/infiltrator.test.ts index a5de035a136..9f1eed466b9 100644 --- a/test/abilities/infiltrator.test.ts +++ b/test/abilities/infiltrator.test.ts @@ -1,13 +1,13 @@ +import { allMoves } from "#data/data-lists"; +import { AbilityId } from "#enums/ability-id"; import { ArenaTagSide } from "#enums/arena-tag-side"; -import { allMoves } from "#app/data/data-lists"; import { ArenaTagType } from "#enums/arena-tag-type"; import { BattlerTagType } from "#enums/battler-tag-type"; -import { Stat } from "#enums/stat"; -import { StatusEffect } from "#enums/status-effect"; -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 { Stat } from "#enums/stat"; +import { StatusEffect } from "#enums/status-effect"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/insomnia.test.ts b/test/abilities/insomnia.test.ts index 800663823c3..2f683b516eb 100644 --- a/test/abilities/insomnia.test.ts +++ b/test/abilities/insomnia.test.ts @@ -2,7 +2,7 @@ import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/intimidate.test.ts b/test/abilities/intimidate.test.ts index 3dcd9bcd129..1a90ce99a71 100644 --- a/test/abilities/intimidate.test.ts +++ b/test/abilities/intimidate.test.ts @@ -1,12 +1,12 @@ -import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import Phaser from "phaser"; -import GameManager from "#test/testUtils/gameManager"; -import { UiMode } from "#enums/ui-mode"; -import { Stat } from "#enums/stat"; -import { getMovePosition } from "#test/testUtils/gameManagerUtils"; import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; +import { Stat } from "#enums/stat"; +import { UiMode } from "#enums/ui-mode"; +import { GameManager } from "#test/testUtils/gameManager"; +import { getMovePosition } from "#test/testUtils/gameManagerUtils"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; describe("Abilities - Intimidate", () => { let phaserGame: Phaser.Game; diff --git a/test/abilities/intrepid_sword.test.ts b/test/abilities/intrepid_sword.test.ts index d9b81e9552e..7465b331791 100644 --- a/test/abilities/intrepid_sword.test.ts +++ b/test/abilities/intrepid_sword.test.ts @@ -1,8 +1,8 @@ -import { Stat } from "#enums/stat"; -import GameManager from "#test/testUtils/gameManager"; -import { CommandPhase } from "#app/phases/command-phase"; import { AbilityId } from "#enums/ability-id"; import { SpeciesId } from "#enums/species-id"; +import { Stat } from "#enums/stat"; +import { CommandPhase } from "#phases/command-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/libero.test.ts b/test/abilities/libero.test.ts index eaa2630e90d..0113d2a2552 100644 --- a/test/abilities/libero.test.ts +++ b/test/abilities/libero.test.ts @@ -1,15 +1,15 @@ -import { allMoves } from "#app/data/data-lists"; -import { PokemonType } from "#enums/pokemon-type"; -import { Weather } from "#app/data/weather"; -import type { PlayerPokemon } from "#app/field/pokemon"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; +import { allMoves } from "#data/data-lists"; +import { Weather } from "#data/weather"; import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#enums/battler-tag-type"; import { BiomeId } from "#enums/biome-id"; import { MoveId } from "#enums/move-id"; +import { PokemonType } from "#enums/pokemon-type"; import { SpeciesId } from "#enums/species-id"; import { WeatherType } from "#enums/weather-type"; -import GameManager from "#test/testUtils/gameManager"; +import type { PlayerPokemon } from "#field/pokemon"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; diff --git a/test/abilities/lightningrod.test.ts b/test/abilities/lightningrod.test.ts index 2dc29500454..353cc2d1043 100644 --- a/test/abilities/lightningrod.test.ts +++ b/test/abilities/lightningrod.test.ts @@ -1,9 +1,9 @@ -import { BattlerIndex } from "#enums/battler-index"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { Stat } from "#enums/stat"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/limber.test.ts b/test/abilities/limber.test.ts index 77acd8b3dab..ed140c09fb1 100644 --- a/test/abilities/limber.test.ts +++ b/test/abilities/limber.test.ts @@ -2,7 +2,7 @@ import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/magic_bounce.test.ts b/test/abilities/magic_bounce.test.ts index 04bfcbbfe8f..795963f52be 100644 --- a/test/abilities/magic_bounce.test.ts +++ b/test/abilities/magic_bounce.test.ts @@ -1,15 +1,14 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { allAbilities } from "#app/data/data-lists"; -import { ArenaTagSide } from "#enums/arena-tag-side"; -import { allMoves } from "#app/data/data-lists"; -import { ArenaTagType } from "#app/enums/arena-tag-type"; -import { BattlerTagType } from "#app/enums/battler-tag-type"; -import { Stat } from "#app/enums/stat"; -import { StatusEffect } from "#app/enums/status-effect"; +import { allAbilities, allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; +import { ArenaTagSide } from "#enums/arena-tag-side"; +import { ArenaTagType } from "#enums/arena-tag-type"; +import { BattlerIndex } from "#enums/battler-index"; +import { BattlerTagType } from "#enums/battler-tag-type"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { Stat } from "#enums/stat"; +import { StatusEffect } from "#enums/status-effect"; +import { GameManager } from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; describe("Abilities - Magic Bounce", () => { diff --git a/test/abilities/magic_guard.test.ts b/test/abilities/magic_guard.test.ts index f135a761bba..b1b7ee6765b 100644 --- a/test/abilities/magic_guard.test.ts +++ b/test/abilities/magic_guard.test.ts @@ -1,15 +1,15 @@ -import { getArenaTag } from "#app/data/arena-tag"; -import { ArenaTagSide } from "#enums/arena-tag-side"; -import { getStatusEffectCatchRateMultiplier } from "#app/data/status-effect"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; +import { getArenaTag } from "#data/arena-tag"; +import { getStatusEffectCatchRateMultiplier } from "#data/status-effect"; import { AbilityId } from "#enums/ability-id"; +import { ArenaTagSide } from "#enums/arena-tag-side"; import { ArenaTagType } from "#enums/arena-tag-type"; import { BattlerTagType } from "#enums/battler-tag-type"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { StatusEffect } from "#enums/status-effect"; import { WeatherType } from "#enums/weather-type"; -import GameManager from "#test/testUtils/gameManager"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/magma_armor.test.ts b/test/abilities/magma_armor.test.ts index 0a8f3024291..cc40ea9f679 100644 --- a/test/abilities/magma_armor.test.ts +++ b/test/abilities/magma_armor.test.ts @@ -2,7 +2,7 @@ import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/mimicry.test.ts b/test/abilities/mimicry.test.ts index 7ac7aeb599f..f377ab89ffe 100644 --- a/test/abilities/mimicry.test.ts +++ b/test/abilities/mimicry.test.ts @@ -1,8 +1,8 @@ import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; -import { SpeciesId } from "#enums/species-id"; import { PokemonType } from "#enums/pokemon-type"; -import GameManager from "#test/testUtils/gameManager"; +import { SpeciesId } from "#enums/species-id"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/mirror_armor.test.ts b/test/abilities/mirror_armor.test.ts index 71b072c7d06..4d4ee973527 100644 --- a/test/abilities/mirror_armor.test.ts +++ b/test/abilities/mirror_armor.test.ts @@ -1,11 +1,11 @@ -import { Stat } from "#enums/stat"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { Stat } from "#enums/stat"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import { BattlerIndex } from "#enums/battler-index"; // TODO: When Magic Bounce is implemented, make a test for its interaction with mirror guard, use screech diff --git a/test/abilities/mold_breaker.test.ts b/test/abilities/mold_breaker.test.ts index 28a077e8908..1769f2d2d8b 100644 --- a/test/abilities/mold_breaker.test.ts +++ b/test/abilities/mold_breaker.test.ts @@ -1,9 +1,9 @@ -import { BattlerIndex } from "#enums/battler-index"; import { globalScene } from "#app/global-scene"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/moody.test.ts b/test/abilities/moody.test.ts index bca3d57a70a..150456bc0f7 100644 --- a/test/abilities/moody.test.ts +++ b/test/abilities/moody.test.ts @@ -1,8 +1,8 @@ -import { BATTLE_STATS, EFFECTIVE_STATS } from "#enums/stat"; 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 { BATTLE_STATS, EFFECTIVE_STATS } from "#enums/stat"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/abilities/moxie.test.ts b/test/abilities/moxie.test.ts index a85ed081448..07899e73dc3 100644 --- a/test/abilities/moxie.test.ts +++ b/test/abilities/moxie.test.ts @@ -1,14 +1,14 @@ -import { Stat } from "#enums/stat"; -import GameManager from "#test/testUtils/gameManager"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; +import { Stat } from "#enums/stat"; +import { EnemyCommandPhase } from "#phases/enemy-command-phase"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { VictoryPhase } from "#phases/victory-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import { BattlerIndex } from "#enums/battler-index"; -import { EnemyCommandPhase } from "#app/phases/enemy-command-phase"; -import { VictoryPhase } from "#app/phases/victory-phase"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; describe("Abilities - Moxie", () => { let phaserGame: Phaser.Game; diff --git a/test/abilities/mummy.test.ts b/test/abilities/mummy.test.ts index d6c40541d25..6c94fea407b 100644 --- a/test/abilities/mummy.test.ts +++ b/test/abilities/mummy.test.ts @@ -1,7 +1,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 { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/mycelium_might.test.ts b/test/abilities/mycelium_might.test.ts index 56af51c00f7..fa3ab8e5301 100644 --- a/test/abilities/mycelium_might.test.ts +++ b/test/abilities/mycelium_might.test.ts @@ -1,10 +1,10 @@ -import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { TurnStartPhase } from "#app/phases/turn-start-phase"; -import GameManager from "#test/testUtils/gameManager"; import { AbilityId } from "#enums/ability-id"; -import { Stat } from "#enums/stat"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; +import { Stat } from "#enums/stat"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { TurnStartPhase } from "#phases/turn-start-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/neutralizing_gas.test.ts b/test/abilities/neutralizing_gas.test.ts index ec1197c30ca..bcc00e4249a 100644 --- a/test/abilities/neutralizing_gas.test.ts +++ b/test/abilities/neutralizing_gas.test.ts @@ -1,16 +1,16 @@ -import { BattlerIndex } from "#enums/battler-index"; -import type { CommandPhase } from "#app/phases/command-phase"; -import { Command } from "#enums/command"; +import { globalScene } from "#app/global-scene"; import { AbilityId } from "#enums/ability-id"; import { ArenaTagType } from "#enums/arena-tag-type"; +import { BattlerIndex } from "#enums/battler-index"; +import { Command } from "#enums/command"; import { MoveId } from "#enums/move-id"; import { PokeballType } from "#enums/pokeball"; import { SpeciesId } from "#enums/species-id"; import { Stat } from "#enums/stat"; -import GameManager from "#test/testUtils/gameManager"; +import type { CommandPhase } from "#phases/command-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { globalScene } from "#app/global-scene"; describe("Abilities - Neutralizing Gas", () => { let phaserGame: Phaser.Game; diff --git a/test/abilities/no_guard.test.ts b/test/abilities/no_guard.test.ts index dc35e0e1b9a..f6f55ce3b80 100644 --- a/test/abilities/no_guard.test.ts +++ b/test/abilities/no_guard.test.ts @@ -1,13 +1,13 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { MoveEffectPhase } from "#app/phases/move-effect-phase"; -import { MoveEndPhase } from "#app/phases/move-end-phase"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; +import { HitCheckResult } from "#enums/hit-check-result"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import { HitCheckResult } from "#enums/hit-check-result"; -import GameManager from "#test/testUtils/gameManager"; +import { MoveEffectPhase } from "#phases/move-effect-phase"; +import { MoveEndPhase } from "#phases/move-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; describe("Abilities - No Guard", () => { let phaserGame: Phaser.Game; diff --git a/test/abilities/normal-move-type-change.test.ts b/test/abilities/normal-move-type-change.test.ts index d9e39b32a7c..aa673ddde29 100644 --- a/test/abilities/normal-move-type-change.test.ts +++ b/test/abilities/normal-move-type-change.test.ts @@ -1,15 +1,14 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { allMoves } from "#app/data/data-lists"; -import { PokemonType } from "#enums/pokemon-type"; +import { TYPE_BOOST_ITEM_BOOST_PERCENT } from "#app/constants"; +import { allAbilities, allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; +import { PokemonType } from "#enums/pokemon-type"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; +import { toDmgValue } from "#utils/common"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { TYPE_BOOST_ITEM_BOOST_PERCENT } from "#app/constants"; -import { allAbilities } from "#app/data/data-lists"; -import { toDmgValue } from "#app/utils/common"; /** * Tests for abilities that change the type of normal moves to diff --git a/test/abilities/normalize.test.ts b/test/abilities/normalize.test.ts index 1a4b93f3f32..1128dd1a562 100644 --- a/test/abilities/normalize.test.ts +++ b/test/abilities/normalize.test.ts @@ -1,11 +1,11 @@ import { TYPE_BOOST_ITEM_BOOST_PERCENT } from "#app/constants"; -import { allMoves } from "#app/data/data-lists"; -import { toDmgValue } from "#app/utils/common"; +import { allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; import { PokemonType } from "#enums/pokemon-type"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; +import { toDmgValue } from "#utils/common"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/abilities/oblivious.test.ts b/test/abilities/oblivious.test.ts index dab8394edd0..8b18fe65455 100644 --- a/test/abilities/oblivious.test.ts +++ b/test/abilities/oblivious.test.ts @@ -2,7 +2,7 @@ import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#enums/battler-tag-type"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/abilities/own_tempo.test.ts b/test/abilities/own_tempo.test.ts index 869953b4e93..bdb247c4987 100644 --- a/test/abilities/own_tempo.test.ts +++ b/test/abilities/own_tempo.test.ts @@ -2,7 +2,7 @@ import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#enums/battler-tag-type"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/parental_bond.test.ts b/test/abilities/parental_bond.test.ts index fd914b86100..6b39d66fa9a 100644 --- a/test/abilities/parental_bond.test.ts +++ b/test/abilities/parental_bond.test.ts @@ -1,12 +1,12 @@ -import { PokemonType } from "#enums/pokemon-type"; -import { BattlerTagType } from "#enums/battler-tag-type"; -import { toDmgValue } from "#app/utils/common"; import { AbilityId } from "#enums/ability-id"; +import { BattlerTagType } from "#enums/battler-tag-type"; import { MoveId } from "#enums/move-id"; +import { PokemonType } from "#enums/pokemon-type"; import { SpeciesId } from "#enums/species-id"; import { Stat } from "#enums/stat"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; +import { toDmgValue } from "#utils/common"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/abilities/pastel_veil.test.ts b/test/abilities/pastel_veil.test.ts index b8e8873ed36..47fdd751931 100644 --- a/test/abilities/pastel_veil.test.ts +++ b/test/abilities/pastel_veil.test.ts @@ -1,11 +1,11 @@ -import { BattlerIndex } from "#enums/battler-index"; import { AbilityId } from "#enums/ability-id"; -import { CommandPhase } from "#app/phases/command-phase"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/testUtils/gameManager"; +import { CommandPhase } from "#phases/command-phase"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/perish_body.test.ts b/test/abilities/perish_body.test.ts index 4852533816b..83a862164a1 100644 --- a/test/abilities/perish_body.test.ts +++ b/test/abilities/perish_body.test.ts @@ -1,7 +1,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 { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/power_construct.test.ts b/test/abilities/power_construct.test.ts index 2ea14597ef9..0917082d7bd 100644 --- a/test/abilities/power_construct.test.ts +++ b/test/abilities/power_construct.test.ts @@ -1,11 +1,11 @@ -import { Status } from "#app/data/status-effect"; -import { QuietFormChangePhase } from "#app/phases/quiet-form-change-phase"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; +import { Status } from "#data/status-effect"; import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/testUtils/gameManager"; +import { QuietFormChangePhase } from "#phases/quiet-form-change-phase"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; describe("Abilities - POWER CONSTRUCT", () => { diff --git a/test/abilities/power_spot.test.ts b/test/abilities/power_spot.test.ts index 11f75588386..f07ece17245 100644 --- a/test/abilities/power_spot.test.ts +++ b/test/abilities/power_spot.test.ts @@ -1,10 +1,10 @@ -import { allMoves } from "#app/data/data-lists"; +import { allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; -import { MoveEffectPhase } from "#app/phases/move-effect-phase"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { MoveEffectPhase } from "#phases/move-effect-phase"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/abilities/protean.test.ts b/test/abilities/protean.test.ts index 09c9addbc35..36263f04f29 100644 --- a/test/abilities/protean.test.ts +++ b/test/abilities/protean.test.ts @@ -1,15 +1,15 @@ -import { allMoves } from "#app/data/data-lists"; -import { PokemonType } from "#enums/pokemon-type"; -import { Weather } from "#app/data/weather"; -import type { PlayerPokemon } from "#app/field/pokemon"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; +import { allMoves } from "#data/data-lists"; +import { Weather } from "#data/weather"; import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#enums/battler-tag-type"; import { BiomeId } from "#enums/biome-id"; import { MoveId } from "#enums/move-id"; +import { PokemonType } from "#enums/pokemon-type"; import { SpeciesId } from "#enums/species-id"; import { WeatherType } from "#enums/weather-type"; -import GameManager from "#test/testUtils/gameManager"; +import type { PlayerPokemon } from "#field/pokemon"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; diff --git a/test/abilities/protosynthesis.test.ts b/test/abilities/protosynthesis.test.ts index ef860fc0cd5..5629ea503d7 100644 --- a/test/abilities/protosynthesis.test.ts +++ b/test/abilities/protosynthesis.test.ts @@ -1,11 +1,11 @@ import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; import { Nature } from "#enums/nature"; import { SpeciesId } from "#enums/species-id"; import { Stat } from "#enums/stat"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; -import { BattlerIndex } from "#enums/battler-index"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; describe("Abilities - Protosynthesis", () => { diff --git a/test/abilities/quick_draw.test.ts b/test/abilities/quick_draw.test.ts index 11418f31375..f881adce5ed 100644 --- a/test/abilities/quick_draw.test.ts +++ b/test/abilities/quick_draw.test.ts @@ -1,9 +1,9 @@ -import { allAbilities } from "#app/data/data-lists"; -import { FaintPhase } from "#app/phases/faint-phase"; +import { allAbilities } from "#data/data-lists"; 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 { FaintPhase } from "#phases/faint-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vitest"; diff --git a/test/abilities/sand_spit.test.ts b/test/abilities/sand_spit.test.ts index 2b519745649..dfd8a342ccc 100644 --- a/test/abilities/sand_spit.test.ts +++ b/test/abilities/sand_spit.test.ts @@ -1,8 +1,8 @@ -import { WeatherType } from "#app/enums/weather-type"; 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 { WeatherType } from "#enums/weather-type"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/sand_veil.test.ts b/test/abilities/sand_veil.test.ts index 035b37d85a8..b37901f65c3 100644 --- a/test/abilities/sand_veil.test.ts +++ b/test/abilities/sand_veil.test.ts @@ -1,14 +1,14 @@ -import type { StatMultiplierAbAttrParams } from "#app/@types/ability-types"; -import { allAbilities } from "#app/data/data-lists"; -import { CommandPhase } from "#app/phases/command-phase"; -import { MoveEffectPhase } from "#app/phases/move-effect-phase"; -import { MoveEndPhase } from "#app/phases/move-end-phase"; +import { allAbilities } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { Stat } from "#enums/stat"; import { WeatherType } from "#enums/weather-type"; -import GameManager from "#test/testUtils/gameManager"; +import { CommandPhase } from "#phases/command-phase"; +import { MoveEffectPhase } from "#phases/move-effect-phase"; +import { MoveEndPhase } from "#phases/move-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; +import type { StatMultiplierAbAttrParams } from "#types/ability-types"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vitest"; diff --git a/test/abilities/sap_sipper.test.ts b/test/abilities/sap_sipper.test.ts index c70730f0711..a8fe10d7fc5 100644 --- a/test/abilities/sap_sipper.test.ts +++ b/test/abilities/sap_sipper.test.ts @@ -1,16 +1,16 @@ -import { Stat } from "#enums/stat"; -import { TerrainType } from "#app/data/terrain"; -import { MoveEndPhase } from "#app/phases/move-end-phase"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; +import { allMoves } from "#data/data-lists"; +import { TerrainType } from "#data/terrain"; import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#enums/battler-tag-type"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { Stat } from "#enums/stat"; +import { RandomMoveAttr } from "#moves/move"; +import { MoveEndPhase } from "#phases/move-end-phase"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { RandomMoveAttr } from "#app/data/moves/move"; -import { allMoves } from "#app/data/data-lists"; // See also: TypeImmunityAbAttr describe("Abilities - Sap Sipper", () => { diff --git a/test/abilities/schooling.test.ts b/test/abilities/schooling.test.ts index 646beafb80f..94bb4cb80f9 100644 --- a/test/abilities/schooling.test.ts +++ b/test/abilities/schooling.test.ts @@ -1,11 +1,11 @@ -import { Status } from "#app/data/status-effect"; -import { QuietFormChangePhase } from "#app/phases/quiet-form-change-phase"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; +import { Status } from "#data/status-effect"; import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/testUtils/gameManager"; +import { QuietFormChangePhase } from "#phases/quiet-form-change-phase"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; describe("Abilities - SCHOOLING", () => { diff --git a/test/abilities/screen_cleaner.test.ts b/test/abilities/screen_cleaner.test.ts index e896d2e51f9..f96559beff6 100644 --- a/test/abilities/screen_cleaner.test.ts +++ b/test/abilities/screen_cleaner.test.ts @@ -1,10 +1,10 @@ -import { ArenaTagType } from "#app/enums/arena-tag-type"; -import { PostSummonPhase } from "#app/phases/post-summon-phase"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { AbilityId } from "#enums/ability-id"; +import { ArenaTagType } from "#enums/arena-tag-type"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { PostSummonPhase } from "#phases/post-summon-phase"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/seed_sower.test.ts b/test/abilities/seed_sower.test.ts index 7a898f5bcf9..8573f0242ea 100644 --- a/test/abilities/seed_sower.test.ts +++ b/test/abilities/seed_sower.test.ts @@ -1,8 +1,8 @@ -import { TerrainType } from "#app/data/terrain"; +import { TerrainType } from "#data/terrain"; 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 { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/serene_grace.test.ts b/test/abilities/serene_grace.test.ts index 2acf2981537..aaa0f26f78b 100644 --- a/test/abilities/serene_grace.test.ts +++ b/test/abilities/serene_grace.test.ts @@ -1,10 +1,10 @@ -import { BattlerIndex } from "#enums/battler-index"; +import { allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; -import { allMoves } from "#app/data/data-lists"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; describe("Abilities - Serene Grace", () => { diff --git a/test/abilities/sheer_force.test.ts b/test/abilities/sheer_force.test.ts index e90b8d08611..0b0c0c10ccf 100644 --- a/test/abilities/sheer_force.test.ts +++ b/test/abilities/sheer_force.test.ts @@ -1,13 +1,13 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { PokemonType } from "#enums/pokemon-type"; +import { allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; +import { PokemonType } from "#enums/pokemon-type"; import { SpeciesId } from "#enums/species-id"; import { Stat } from "#enums/stat"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { allMoves } from "#app/data/data-lists"; describe("Abilities - Sheer Force", () => { let phaserGame: Phaser.Game; diff --git a/test/abilities/shell-armor.test.ts b/test/abilities/shell-armor.test.ts index ea0ed4a95dd..e10c3a90444 100644 --- a/test/abilities/shell-armor.test.ts +++ b/test/abilities/shell-armor.test.ts @@ -1,12 +1,12 @@ -import type Move from "#app/data/moves/move"; -import Pokemon from "#app/field/pokemon"; import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/testUtils/gameManager"; +import { Pokemon } from "#field/pokemon"; +import type { Move } from "#moves/move"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi, type MockInstance } from "vitest"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, type MockInstance, vi } from "vitest"; describe("Abilities - Shell Armor", () => { let phaserGame: Phaser.Game; diff --git a/test/abilities/shield_dust.test.ts b/test/abilities/shield_dust.test.ts index a7896b9eeb8..371c7d9cf29 100644 --- a/test/abilities/shield_dust.test.ts +++ b/test/abilities/shield_dust.test.ts @@ -1,12 +1,12 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { applyAbAttrs } from "#app/data/abilities/apply-ab-attrs"; -import { MoveEffectPhase } from "#app/phases/move-effect-phase"; -import { NumberHolder } from "#app/utils/common"; +import { applyAbAttrs } from "#abilities/apply-ab-attrs"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { Stat } from "#enums/stat"; -import GameManager from "#test/testUtils/gameManager"; +import { MoveEffectPhase } from "#phases/move-effect-phase"; +import { GameManager } from "#test/testUtils/gameManager"; +import { NumberHolder } from "#utils/common"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/shields_down.test.ts b/test/abilities/shields_down.test.ts index 7b4803915f1..7678c7d8dac 100644 --- a/test/abilities/shields_down.test.ts +++ b/test/abilities/shields_down.test.ts @@ -1,12 +1,12 @@ -import { Status } from "#app/data/status-effect"; -import { BattlerTagType } from "#app/enums/battler-tag-type"; -import { QuietFormChangePhase } from "#app/phases/quiet-form-change-phase"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; +import { Status } from "#data/status-effect"; import { AbilityId } from "#enums/ability-id"; +import { BattlerTagType } from "#enums/battler-tag-type"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/testUtils/gameManager"; +import { QuietFormChangePhase } from "#phases/quiet-form-change-phase"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; describe("Abilities - SHIELDS DOWN", () => { diff --git a/test/abilities/simple.test.ts b/test/abilities/simple.test.ts index 703f8fcffac..a709c8696d3 100644 --- a/test/abilities/simple.test.ts +++ b/test/abilities/simple.test.ts @@ -1,8 +1,8 @@ -import { MoveId } from "#enums/move-id"; import { AbilityId } from "#enums/ability-id"; +import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { Stat } from "#enums/stat"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/speed_boost.test.ts b/test/abilities/speed_boost.test.ts index 1e731c7d6b6..975fc8ebecf 100644 --- a/test/abilities/speed_boost.test.ts +++ b/test/abilities/speed_boost.test.ts @@ -1,14 +1,14 @@ -import { Stat } from "#enums/stat"; +import Overrides from "#app/overrides"; import { AbilityId } from "#enums/ability-id"; +import { Command } from "#enums/command"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { Stat } from "#enums/stat"; +import { AttemptRunPhase } from "#phases/attempt-run-phase"; +import type { CommandPhase } from "#phases/command-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import type { CommandPhase } from "#app/phases/command-phase"; -import { Command } from "#enums/command"; -import { AttemptRunPhase } from "#app/phases/attempt-run-phase"; -import Overrides from "#app/overrides"; describe("Abilities - Speed Boost", () => { let phaserGame: Phaser.Game; diff --git a/test/abilities/stakeout.test.ts b/test/abilities/stakeout.test.ts index b3844bf17ca..85838a52abe 100644 --- a/test/abilities/stakeout.test.ts +++ b/test/abilities/stakeout.test.ts @@ -1,9 +1,9 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { isBetween } from "#app/utils/common"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; +import { isBetween } from "#utils/common"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/stall.test.ts b/test/abilities/stall.test.ts index 04a29a4f284..c012586eea5 100644 --- a/test/abilities/stall.test.ts +++ b/test/abilities/stall.test.ts @@ -1,10 +1,10 @@ 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 { TurnStartPhase } from "#phases/turn-start-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import { TurnStartPhase } from "#app/phases/turn-start-phase"; describe("Abilities - Stall", () => { let phaserGame: Phaser.Game; diff --git a/test/abilities/steely_spirit.test.ts b/test/abilities/steely_spirit.test.ts index 7a2bd98b6b1..0ca7bebe17a 100644 --- a/test/abilities/steely_spirit.test.ts +++ b/test/abilities/steely_spirit.test.ts @@ -1,9 +1,8 @@ -import { allAbilities } from "#app/data/data-lists"; -import { allMoves } from "#app/data/data-lists"; +import { allAbilities, allMoves } from "#data/data-lists"; 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 { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/abilities/storm_drain.test.ts b/test/abilities/storm_drain.test.ts index 8eedf0c7ce8..0c9727d7e3f 100644 --- a/test/abilities/storm_drain.test.ts +++ b/test/abilities/storm_drain.test.ts @@ -1,9 +1,9 @@ -import { BattlerIndex } from "#enums/battler-index"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { Stat } from "#enums/stat"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/sturdy.test.ts b/test/abilities/sturdy.test.ts index e7b2c05040d..0cde40a91da 100644 --- a/test/abilities/sturdy.test.ts +++ b/test/abilities/sturdy.test.ts @@ -1,10 +1,10 @@ -import type { EnemyPokemon } from "#app/field/pokemon"; -import { DamageAnimPhase } from "#app/phases/damage-anim-phase"; -import { MoveEndPhase } from "#app/phases/move-end-phase"; 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 type { EnemyPokemon } from "#field/pokemon"; +import { DamageAnimPhase } from "#phases/damage-anim-phase"; +import { MoveEndPhase } from "#phases/move-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; diff --git a/test/abilities/super_luck.test.ts b/test/abilities/super_luck.test.ts index 60ed2534fe9..954251583f8 100644 --- a/test/abilities/super_luck.test.ts +++ b/test/abilities/super_luck.test.ts @@ -1,7 +1,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 { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/abilities/supreme_overlord.test.ts b/test/abilities/supreme_overlord.test.ts index 7143b590f68..b68153a2cc8 100644 --- a/test/abilities/supreme_overlord.test.ts +++ b/test/abilities/supreme_overlord.test.ts @@ -1,13 +1,13 @@ -import { MoveId } from "#enums/move-id"; -import type Move from "#app/data/moves/move"; +import { allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; -import { SpeciesId } from "#enums/species-id"; import { BattlerIndex } from "#enums/battler-index"; -import { MoveEffectPhase } from "#app/phases/move-effect-phase"; -import GameManager from "#test/testUtils/gameManager"; +import { MoveId } from "#enums/move-id"; +import { SpeciesId } from "#enums/species-id"; +import type { Move } from "#moves/move"; +import { MoveEffectPhase } from "#phases/move-effect-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { allMoves } from "#app/data/data-lists"; describe("Abilities - Supreme Overlord", () => { let phaserGame: Phaser.Game; diff --git a/test/abilities/sweet_veil.test.ts b/test/abilities/sweet_veil.test.ts index ed9cb20afcc..97ddb2c5f36 100644 --- a/test/abilities/sweet_veil.test.ts +++ b/test/abilities/sweet_veil.test.ts @@ -1,11 +1,11 @@ -import { BattlerIndex } from "#enums/battler-index"; import { AbilityId } from "#enums/ability-id"; -import { BattlerTagType } from "#app/enums/battler-tag-type"; -import { CommandPhase } from "#app/phases/command-phase"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; +import { BattlerIndex } from "#enums/battler-index"; +import { BattlerTagType } from "#enums/battler-tag-type"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { CommandPhase } from "#phases/command-phase"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/synchronize.test.ts b/test/abilities/synchronize.test.ts index 030509ac4e6..1874560a166 100644 --- a/test/abilities/synchronize.test.ts +++ b/test/abilities/synchronize.test.ts @@ -2,7 +2,7 @@ import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/tera_shell.test.ts b/test/abilities/tera_shell.test.ts index a52a01862ff..bd461e3aeba 100644 --- a/test/abilities/tera_shell.test.ts +++ b/test/abilities/tera_shell.test.ts @@ -1,8 +1,8 @@ -import { BattlerIndex } from "#enums/battler-index"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/abilities/thermal_exchange.test.ts b/test/abilities/thermal_exchange.test.ts index 70af864d413..5e684b982e7 100644 --- a/test/abilities/thermal_exchange.test.ts +++ b/test/abilities/thermal_exchange.test.ts @@ -2,7 +2,7 @@ import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/trace.test.ts b/test/abilities/trace.test.ts index f17bec159ab..7b87b3669b6 100644 --- a/test/abilities/trace.test.ts +++ b/test/abilities/trace.test.ts @@ -1,8 +1,8 @@ -import { Stat } from "#app/enums/stat"; 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 { Stat } from "#enums/stat"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/unburden.test.ts b/test/abilities/unburden.test.ts index fff37daff7b..8d738db9076 100644 --- a/test/abilities/unburden.test.ts +++ b/test/abilities/unburden.test.ts @@ -1,15 +1,15 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { StealHeldItemChanceAttr } from "#app/data/moves/move"; -import { allMoves } from "#app/data/data-lists"; -import type Pokemon from "#app/field/pokemon"; -import type { ContactHeldItemTransferChanceModifier } from "#app/modifier/modifier"; +import { allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; import { BattlerTagType } from "#enums/battler-tag-type"; import { BerryType } from "#enums/berry-type"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { Stat } from "#enums/stat"; -import GameManager from "#test/testUtils/gameManager"; +import type { Pokemon } from "#field/pokemon"; +import type { ContactHeldItemTransferChanceModifier } from "#modifiers/modifier"; +import { StealHeldItemChanceAttr } from "#moves/move"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/abilities/unseen_fist.test.ts b/test/abilities/unseen_fist.test.ts index 26de77d4643..c986a112517 100644 --- a/test/abilities/unseen_fist.test.ts +++ b/test/abilities/unseen_fist.test.ts @@ -1,12 +1,12 @@ -import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { AbilityId } from "#enums/ability-id"; +import { BattlerTagType } from "#enums/battler-tag-type"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { BerryPhase } from "#phases/berry-phase"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import { BattlerTagType } from "#app/enums/battler-tag-type"; -import { BerryPhase } from "#app/phases/berry-phase"; describe("Abilities - Unseen Fist", () => { let phaserGame: Phaser.Game; diff --git a/test/abilities/victory_star.test.ts b/test/abilities/victory_star.test.ts index 4742dd96aa6..aff91a7702b 100644 --- a/test/abilities/victory_star.test.ts +++ b/test/abilities/victory_star.test.ts @@ -1,9 +1,9 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/abilities/vital_spirit.test.ts b/test/abilities/vital_spirit.test.ts index 18764f94a6b..7530b2c6c04 100644 --- a/test/abilities/vital_spirit.test.ts +++ b/test/abilities/vital_spirit.test.ts @@ -2,7 +2,7 @@ import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/volt_absorb.test.ts b/test/abilities/volt_absorb.test.ts index 6bea70ee2a4..12de6ceff87 100644 --- a/test/abilities/volt_absorb.test.ts +++ b/test/abilities/volt_absorb.test.ts @@ -1,13 +1,13 @@ -import { Stat } from "#enums/stat"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; import { BattlerTagType } from "#enums/battler-tag-type"; import { MoveId } from "#enums/move-id"; -import GameManager from "#test/testUtils/gameManager"; +import { SpeciesId } from "#enums/species-id"; +import { Stat } from "#enums/stat"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import { BattlerIndex } from "#enums/battler-index"; -import { SpeciesId } from "#enums/species-id"; // See also: TypeImmunityAbAttr describe("Abilities - Volt Absorb", () => { diff --git a/test/abilities/wandering_spirit.test.ts b/test/abilities/wandering_spirit.test.ts index 950cec6d27c..3d26238e970 100644 --- a/test/abilities/wandering_spirit.test.ts +++ b/test/abilities/wandering_spirit.test.ts @@ -1,8 +1,8 @@ -import { Stat } from "#app/enums/stat"; 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 { Stat } from "#enums/stat"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/water_bubble.test.ts b/test/abilities/water_bubble.test.ts index 455a2e368c4..c8d01eb2800 100644 --- a/test/abilities/water_bubble.test.ts +++ b/test/abilities/water_bubble.test.ts @@ -2,7 +2,7 @@ import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/water_veil.test.ts b/test/abilities/water_veil.test.ts index 2df06ec1a21..dcfe5b60fe9 100644 --- a/test/abilities/water_veil.test.ts +++ b/test/abilities/water_veil.test.ts @@ -2,7 +2,7 @@ import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/wimp_out.test.ts b/test/abilities/wimp_out.test.ts index 8e97618d46f..d6e6908e19b 100644 --- a/test/abilities/wimp_out.test.ts +++ b/test/abilities/wimp_out.test.ts @@ -1,16 +1,16 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { ArenaTagSide } from "#enums/arena-tag-side"; -import { allMoves } from "#app/data/data-lists"; -import GameManager from "#test/testUtils/gameManager"; -import { toDmgValue } from "#app/utils/common"; +import { allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; +import { ArenaTagSide } from "#enums/arena-tag-side"; import { ArenaTagType } from "#enums/arena-tag-type"; +import { BattlerIndex } from "#enums/battler-index"; 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 { StatusEffect } from "#enums/status-effect"; import { WeatherType } from "#enums/weather-type"; +import { GameManager } from "#test/testUtils/gameManager"; +import { toDmgValue } from "#utils/common"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/abilities/wind_power.test.ts b/test/abilities/wind_power.test.ts index 8e657997008..255e8fa69be 100644 --- a/test/abilities/wind_power.test.ts +++ b/test/abilities/wind_power.test.ts @@ -1,9 +1,9 @@ -import { BattlerTagType } from "#app/enums/battler-tag-type"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { AbilityId } from "#enums/ability-id"; +import { BattlerTagType } from "#enums/battler-tag-type"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/wind_rider.test.ts b/test/abilities/wind_rider.test.ts index ea1747fcae9..e7b55d2ef65 100644 --- a/test/abilities/wind_rider.test.ts +++ b/test/abilities/wind_rider.test.ts @@ -1,8 +1,8 @@ -import { Stat } from "#enums/stat"; -import GameManager from "#test/testUtils/gameManager"; import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; +import { Stat } from "#enums/stat"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/wonder_skin.test.ts b/test/abilities/wonder_skin.test.ts index 177b97ae3b7..f55c303c9e3 100644 --- a/test/abilities/wonder_skin.test.ts +++ b/test/abilities/wonder_skin.test.ts @@ -1,9 +1,9 @@ -import { allMoves } from "#app/data/data-lists"; -import { MoveEffectPhase } from "#app/phases/move-effect-phase"; +import { allMoves } from "#data/data-lists"; 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 { MoveEffectPhase } from "#phases/move-effect-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/abilities/zen_mode.test.ts b/test/abilities/zen_mode.test.ts index 5df2b3a6bc7..89dc0690ead 100644 --- a/test/abilities/zen_mode.test.ts +++ b/test/abilities/zen_mode.test.ts @@ -1,9 +1,9 @@ -import { Status } from "#app/data/status-effect"; +import { Status } from "#data/status-effect"; import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/zero_to_hero.test.ts b/test/abilities/zero_to_hero.test.ts index 7d0128a4dbc..84b3ddab60c 100644 --- a/test/abilities/zero_to_hero.test.ts +++ b/test/abilities/zero_to_hero.test.ts @@ -1,11 +1,11 @@ -import { Status } from "#app/data/status-effect"; -import { QuietFormChangePhase } from "#app/phases/quiet-form-change-phase"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; +import { Status } from "#data/status-effect"; import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/testUtils/gameManager"; +import { QuietFormChangePhase } from "#phases/quiet-form-change-phase"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; describe("Abilities - ZERO TO HERO", () => { diff --git a/test/account.test.ts b/test/account.test.ts index 77368b0b64c..52d52778dad 100644 --- a/test/account.test.ts +++ b/test/account.test.ts @@ -1,7 +1,7 @@ -import * as bypassLogin from "#app/global-vars/bypass-login"; -import { pokerogueApi } from "#app/plugins/api/pokerogue-api"; -import { describe, expect, it, vi } from "vitest"; +import { pokerogueApi } from "#api/pokerogue-api"; import { initLoggedInUser, loggedInUser, updateUserInfo } from "#app/account"; +import * as bypassLogin from "#app/global-vars/bypass-login"; +import { describe, expect, it, vi } from "vitest"; describe("account", () => { describe("initLoggedInUser", () => { diff --git a/test/achievements/achievement.test.ts b/test/achievements/achievement.test.ts index 5a74c77fe6a..d736485b25f 100644 --- a/test/achievements/achievement.test.ts +++ b/test/achievements/achievement.test.ts @@ -1,20 +1,20 @@ -import { TurnHeldItemTransferModifier } from "#app/modifier/modifier"; +import type { BattleScene } from "#app/battle-scene"; +import { TurnHeldItemTransferModifier } from "#modifiers/modifier"; import { Achv, AchvTier, + achvs, DamageAchv, HealAchv, LevelAchv, ModifierAchv, MoneyAchv, RibbonAchv, - achvs, -} from "#app/system/achv"; -import { NumberHolder } from "#app/utils/common"; -import GameManager from "#test/testUtils/gameManager"; +} from "#system/achv"; +import { GameManager } from "#test/testUtils/gameManager"; +import { NumberHolder } from "#utils/common"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import type BattleScene from "#app/battle-scene"; describe("check some Achievement related stuff", () => { it("should check Achievement creation", () => { diff --git a/test/arena/arena_gravity.test.ts b/test/arena/arena_gravity.test.ts index 36fe0b58308..d1cee1655a1 100644 --- a/test/arena/arena_gravity.test.ts +++ b/test/arena/arena_gravity.test.ts @@ -1,11 +1,11 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { allMoves } from "#app/data/data-lists"; +import { allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; import { ArenaTagType } from "#enums/arena-tag-type"; +import { BattlerIndex } from "#enums/battler-index"; import { BattlerTagType } from "#enums/battler-tag-type"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/arena/grassy_terrain.test.ts b/test/arena/grassy_terrain.test.ts index 5f78d8f801d..541402123c4 100644 --- a/test/arena/grassy_terrain.test.ts +++ b/test/arena/grassy_terrain.test.ts @@ -1,8 +1,8 @@ -import { allMoves } from "#app/data/data-lists"; +import { allMoves } from "#data/data-lists"; 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 { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/arena/weather_fog.test.ts b/test/arena/weather_fog.test.ts index e6984e13bd0..f55a12e3e0f 100644 --- a/test/arena/weather_fog.test.ts +++ b/test/arena/weather_fog.test.ts @@ -1,10 +1,10 @@ -import { allMoves } from "#app/data/data-lists"; +import { allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; -import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { WeatherType } from "#enums/weather-type"; -import GameManager from "#test/testUtils/gameManager"; +import { MoveEffectPhase } from "#phases/move-effect-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/arena/weather_hail.test.ts b/test/arena/weather_hail.test.ts index 27cf46fa9f2..c6f27f647fe 100644 --- a/test/arena/weather_hail.test.ts +++ b/test/arena/weather_hail.test.ts @@ -2,7 +2,7 @@ import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { WeatherType } from "#enums/weather-type"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/arena/weather_sandstorm.test.ts b/test/arena/weather_sandstorm.test.ts index 61001abe1f4..a600aeed000 100644 --- a/test/arena/weather_sandstorm.test.ts +++ b/test/arena/weather_sandstorm.test.ts @@ -1,9 +1,9 @@ import { AbilityId } from "#enums/ability-id"; -import { Stat } from "#app/enums/stat"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; +import { Stat } from "#enums/stat"; import { WeatherType } from "#enums/weather-type"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/arena/weather_strong_winds.test.ts b/test/arena/weather_strong_winds.test.ts index d0d256816eb..6045d75f181 100644 --- a/test/arena/weather_strong_winds.test.ts +++ b/test/arena/weather_strong_winds.test.ts @@ -1,10 +1,10 @@ -import { allMoves } from "#app/data/data-lists"; -import { StatusEffect } from "#app/enums/status-effect"; -import { TurnStartPhase } from "#app/phases/turn-start-phase"; +import { allMoves } from "#data/data-lists"; 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 { StatusEffect } from "#enums/status-effect"; +import { TurnStartPhase } from "#phases/turn-start-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/battle-scene.test.ts b/test/battle-scene.test.ts index 44f1364441b..a920c48ea75 100644 --- a/test/battle-scene.test.ts +++ b/test/battle-scene.test.ts @@ -1,6 +1,6 @@ import { LoadingScene } from "#app/loading-scene"; +import { GameManager } from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import GameManager from "#test/testUtils/gameManager"; describe("BattleScene", () => { let phaserGame: Phaser.Game; diff --git a/test/battle/ability_swap.test.ts b/test/battle/ability_swap.test.ts index 3dd92576e3b..525c038d011 100644 --- a/test/battle/ability_swap.test.ts +++ b/test/battle/ability_swap.test.ts @@ -1,9 +1,9 @@ -import { allAbilities } from "#app/data/data-lists"; -import { Stat } from "#app/enums/stat"; +import { allAbilities } from "#data/data-lists"; 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 { Stat } from "#enums/stat"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/battle/battle-order.test.ts b/test/battle/battle-order.test.ts index 114592c8c8e..a47da66c4d7 100644 --- a/test/battle/battle-order.test.ts +++ b/test/battle/battle-order.test.ts @@ -1,10 +1,10 @@ -import { EnemyCommandPhase } from "#app/phases/enemy-command-phase"; -import { SelectTargetPhase } from "#app/phases/select-target-phase"; -import { TurnStartPhase } from "#app/phases/turn-start-phase"; 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 { EnemyCommandPhase } from "#phases/enemy-command-phase"; +import { SelectTargetPhase } from "#phases/select-target-phase"; +import { TurnStartPhase } from "#phases/turn-start-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/battle/battle.test.ts b/test/battle/battle.test.ts index bf2c3968aa6..03e8db3f0c8 100644 --- a/test/battle/battle.test.ts +++ b/test/battle/battle.test.ts @@ -1,30 +1,30 @@ -import { allSpecies } from "#app/data/data-lists"; -import { Stat } from "#enums/stat"; import { getGameMode } from "#app/game-mode"; -import { GameModes } from "#enums/game-modes"; -import { BattleEndPhase } from "#app/phases/battle-end-phase"; -import { CommandPhase } from "#app/phases/command-phase"; -import { DamageAnimPhase } from "#app/phases/damage-anim-phase"; -import { EncounterPhase } from "#app/phases/encounter-phase"; -import { EnemyCommandPhase } from "#app/phases/enemy-command-phase"; -import { LoginPhase } from "#app/phases/login-phase"; -import { NextEncounterPhase } from "#app/phases/next-encounter-phase"; -import { SelectGenderPhase } from "#app/phases/select-gender-phase"; -import { SelectStarterPhase } from "#app/phases/select-starter-phase"; -import { SummonPhase } from "#app/phases/summon-phase"; -import { SwitchPhase } from "#app/phases/switch-phase"; -import { TitlePhase } from "#app/phases/title-phase"; -import { TurnInitPhase } from "#app/phases/turn-init-phase"; -import GameManager from "#test/testUtils/gameManager"; -import { generateStarter } from "#test/testUtils/gameManagerUtils"; -import { UiMode } from "#enums/ui-mode"; +import { allSpecies } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; +import { BiomeId } from "#enums/biome-id"; +import { GameModes } from "#enums/game-modes"; import { MoveId } from "#enums/move-id"; import { PlayerGender } from "#enums/player-gender"; import { SpeciesId } from "#enums/species-id"; +import { Stat } from "#enums/stat"; +import { UiMode } from "#enums/ui-mode"; +import { BattleEndPhase } from "#phases/battle-end-phase"; +import { CommandPhase } from "#phases/command-phase"; +import { DamageAnimPhase } from "#phases/damage-anim-phase"; +import { EncounterPhase } from "#phases/encounter-phase"; +import { EnemyCommandPhase } from "#phases/enemy-command-phase"; +import { LoginPhase } from "#phases/login-phase"; +import { NextEncounterPhase } from "#phases/next-encounter-phase"; +import { SelectGenderPhase } from "#phases/select-gender-phase"; +import { SelectStarterPhase } from "#phases/select-starter-phase"; +import { SummonPhase } from "#phases/summon-phase"; +import { SwitchPhase } from "#phases/switch-phase"; +import { TitlePhase } from "#phases/title-phase"; +import { TurnInitPhase } from "#phases/turn-init-phase"; +import { GameManager } from "#test/testUtils/gameManager"; +import { generateStarter } from "#test/testUtils/gameManagerUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { BiomeId } from "#enums/biome-id"; describe("Test Battle Phase", () => { let phaserGame: Phaser.Game; diff --git a/test/battle/damage_calculation.test.ts b/test/battle/damage_calculation.test.ts index 19cdf6b9237..fbcefcb0693 100644 --- a/test/battle/damage_calculation.test.ts +++ b/test/battle/damage_calculation.test.ts @@ -1,11 +1,10 @@ -import { allMoves } from "#app/data/data-lists"; -import type { EnemyPersistentModifier } from "#app/modifier/modifier"; -import { modifierTypes } from "#app/data/data-lists"; +import { allMoves, modifierTypes } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; import { ArenaTagType } from "#enums/arena-tag-type"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import type { EnemyPersistentModifier } from "#modifiers/modifier"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/battle/double_battle.test.ts b/test/battle/double_battle.test.ts index 8e606a99ae0..7e0aa0f6c69 100644 --- a/test/battle/double_battle.test.ts +++ b/test/battle/double_battle.test.ts @@ -1,13 +1,13 @@ -import { Status } from "#app/data/status-effect"; -import { AbilityId } from "#enums/ability-id"; import { getGameMode } from "#app/game-mode"; +import { Status } from "#data/status-effect"; +import { AbilityId } from "#enums/ability-id"; import { GameModes } from "#enums/game-modes"; -import { BattleEndPhase } from "#app/phases/battle-end-phase"; -import { TurnInitPhase } from "#app/phases/turn-init-phase"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/testUtils/gameManager"; +import { BattleEndPhase } from "#phases/battle-end-phase"; +import { TurnInitPhase } from "#phases/turn-init-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/battle/inverse_battle.test.ts b/test/battle/inverse_battle.test.ts index 66cab3e2d84..f9fd8f80a37 100644 --- a/test/battle/inverse_battle.test.ts +++ b/test/battle/inverse_battle.test.ts @@ -1,12 +1,12 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { PokemonType } from "#enums/pokemon-type"; import { AbilityId } from "#enums/ability-id"; import { ArenaTagType } from "#enums/arena-tag-type"; +import { BattlerIndex } from "#enums/battler-index"; import { Challenges } from "#enums/challenges"; import { MoveId } from "#enums/move-id"; +import { PokemonType } from "#enums/pokemon-type"; import { SpeciesId } from "#enums/species-id"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/battle/special_battle.test.ts b/test/battle/special_battle.test.ts index 4988e526b1e..36b543b0666 100644 --- a/test/battle/special_battle.test.ts +++ b/test/battle/special_battle.test.ts @@ -1,8 +1,8 @@ -import { UiMode } from "#enums/ui-mode"; 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 { UiMode } from "#enums/ui-mode"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/battlerTags/octolock.test.ts b/test/battlerTags/octolock.test.ts index d0214f495fc..5b395a180a2 100644 --- a/test/battlerTags/octolock.test.ts +++ b/test/battlerTags/octolock.test.ts @@ -1,10 +1,10 @@ -import { afterEach, beforeAll, describe, expect, it, vi } from "vitest"; -import type Pokemon from "#app/field/pokemon"; -import { OctolockTag, TrappedTag } from "#app/data/battler-tags"; +import { OctolockTag, TrappedTag } from "#data/battler-tags"; import { BattlerTagLapseType } from "#enums/battler-tag-lapse-type"; -import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase"; import { Stat } from "#enums/stat"; -import GameManager from "#test/testUtils/gameManager"; +import type { Pokemon } from "#field/pokemon"; +import { StatStageChangePhase } from "#phases/stat-stage-change-phase"; +import { GameManager } from "#test/testUtils/gameManager"; +import { afterEach, beforeAll, describe, expect, it, vi } from "vitest"; describe("BattlerTag - OctolockTag", () => { describe("lapse behavior", () => { diff --git a/test/battlerTags/stockpiling.test.ts b/test/battlerTags/stockpiling.test.ts index 8f524ae7a4d..4d14d3160dc 100644 --- a/test/battlerTags/stockpiling.test.ts +++ b/test/battlerTags/stockpiling.test.ts @@ -1,10 +1,10 @@ -import { StockpilingTag } from "#app/data/battler-tags"; -import type Pokemon from "#app/field/pokemon"; -import { PokemonSummonData } from "#app/data/pokemon/pokemon-data"; import * as messages from "#app/messages"; -import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase"; +import { StockpilingTag } from "#data/battler-tags"; +import { PokemonSummonData } from "#data/pokemon-data"; import { Stat } from "#enums/stat"; -import GameManager from "#test/testUtils/gameManager"; +import type { Pokemon } from "#field/pokemon"; +import { StatStageChangePhase } from "#phases/stat-stage-change-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; beforeEach(() => { diff --git a/test/battlerTags/substitute.test.ts b/test/battlerTags/substitute.test.ts index 55c620bbb40..825bebf1a1e 100644 --- a/test/battlerTags/substitute.test.ts +++ b/test/battlerTags/substitute.test.ts @@ -1,17 +1,17 @@ -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import type { TurnMove } from "#app/@types/turn-move"; -import type { PokemonTurnData } from "#app/data/pokemon/pokemon-data"; -import type Pokemon from "#app/field/pokemon"; -import { MoveResult } from "#enums/move-result"; -import type BattleScene from "#app/battle-scene"; -import { BindTag, SubstituteTag } from "#app/data/battler-tags"; +import type { BattleScene } from "#app/battle-scene"; +import * as messages from "#app/messages"; +import { BindTag, SubstituteTag } from "#data/battler-tags"; +import { allMoves } from "#data/data-lists"; +import type { PokemonTurnData } from "#data/pokemon-data"; import { BattlerTagLapseType } from "#enums/battler-tag-lapse-type"; import { MoveId } from "#enums/move-id"; -import { PokemonAnimType } from "#app/enums/pokemon-anim-type"; -import * as messages from "#app/messages"; -import { allMoves } from "#app/data/data-lists"; -import type { MoveEffectPhase } from "#app/phases/move-effect-phase"; -import GameManager from "#test/testUtils/gameManager"; +import { MoveResult } from "#enums/move-result"; +import { PokemonAnimType } from "#enums/pokemon-anim-type"; +import type { Pokemon } from "#field/pokemon"; +import type { MoveEffectPhase } from "#phases/move-effect-phase"; +import { GameManager } from "#test/testUtils/gameManager"; +import type { TurnMove } from "#types/turn-move"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; describe("BattlerTag - SubstituteTag", () => { let phaserGame: Phaser.Game; diff --git a/test/boss-pokemon.test.ts b/test/boss-pokemon.test.ts index 6eb6d262c56..06a2f313016 100644 --- a/test/boss-pokemon.test.ts +++ b/test/boss-pokemon.test.ts @@ -1,12 +1,12 @@ -import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import GameManager from "#test/testUtils/gameManager"; -import { SpeciesId } from "#enums/species-id"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; -import { EFFECTIVE_STATS } from "#app/enums/stat"; -import type { EnemyPokemon } from "#app/field/pokemon"; -import { toDmgValue } from "#app/utils/common"; +import { SpeciesId } from "#enums/species-id"; +import { EFFECTIVE_STATS } from "#enums/stat"; +import type { EnemyPokemon } from "#field/pokemon"; +import { GameManager } from "#test/testUtils/gameManager"; +import { toDmgValue } from "#utils/common"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; describe("Boss Pokemon / Shields", () => { let phaserGame: Phaser.Game; diff --git a/test/daily_mode.test.ts b/test/daily_mode.test.ts index 41dcf51ccf6..0fa7c0dc846 100644 --- a/test/daily_mode.test.ts +++ b/test/daily_mode.test.ts @@ -1,14 +1,12 @@ +import { pokerogueApi } from "#api/pokerogue-api"; import { BiomeId } from "#enums/biome-id"; import { MoveId } from "#enums/move-id"; -import { MapModifier } from "#app/modifier/modifier"; -import { pokerogueApi } from "#app/plugins/api/pokerogue-api"; -import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; import { SpeciesId } from "#enums/species-id"; import { UiMode } from "#enums/ui-mode"; +import { MapModifier } from "#modifiers/modifier"; +import { GameManager } from "#test/testUtils/gameManager"; +import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import GameManager from "#test/testUtils/gameManager"; - -//const TIMEOUT = 20 * 1000; describe("Daily Mode", () => { let phaserGame: Phaser.Game; diff --git a/test/data/splash_messages.test.ts b/test/data/splash_messages.test.ts index 773b2715825..9763d85a583 100644 --- a/test/data/splash_messages.test.ts +++ b/test/data/splash_messages.test.ts @@ -1,6 +1,6 @@ -import { getSplashMessages } from "#app/data/splash-messages"; -import { describe, expect, it, vi, afterEach, beforeEach } from "vitest"; import * as Constants from "#app/constants"; +import { getSplashMessages } from "#data/splash-messages"; +import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; describe("Data - Splash Messages", () => { it("should contain at least 15 splash messages", () => { diff --git a/test/data/status_effect.test.ts b/test/data/status_effect.test.ts index e697ee3f1c7..2ea4dce4147 100644 --- a/test/data/status_effect.test.ts +++ b/test/data/status_effect.test.ts @@ -1,17 +1,17 @@ import { - Status, getStatusEffectActivationText, getStatusEffectDescriptor, getStatusEffectHealText, getStatusEffectObtainText, getStatusEffectOverlapText, -} from "#app/data/status-effect"; -import { MoveResult } from "#enums/move-result"; + Status, +} from "#data/status-effect"; 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 { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import { mockI18next } from "#test/testUtils/testUtils"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/eggs/egg.test.ts b/test/eggs/egg.test.ts index 0d5d09c5179..b27124bd786 100644 --- a/test/eggs/egg.test.ts +++ b/test/eggs/egg.test.ts @@ -1,13 +1,13 @@ -import { speciesEggTiers } from "#app/data/balance/species-egg-tiers"; -import { Egg, getLegendaryGachaSpeciesForTimestamp, getValidLegendaryGachaSpecies } from "#app/data/egg"; -import { allSpecies } from "#app/data/data-lists"; -import { EggSourceType } from "#app/enums/egg-source-types"; -import { EggTier } from "#app/enums/egg-type"; -import { VariantTier } from "#app/enums/variant-tier"; -import EggData from "#app/system/egg-data"; -import * as Utils from "#app/utils/common"; +import { speciesEggTiers } from "#balance/species-egg-tiers"; +import { allSpecies } from "#data/data-lists"; +import { Egg, getLegendaryGachaSpeciesForTimestamp, getValidLegendaryGachaSpecies } from "#data/egg"; +import { EggSourceType } from "#enums/egg-source-types"; +import { EggTier } from "#enums/egg-type"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { VariantTier } from "#enums/variant-tier"; +import { EggData } from "#system/egg-data"; +import { GameManager } from "#test/testUtils/gameManager"; +import * as Utils from "#utils/common"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/eggs/manaphy-egg.test.ts b/test/eggs/manaphy-egg.test.ts index a58dfa9beba..319b5a15d7b 100644 --- a/test/eggs/manaphy-egg.test.ts +++ b/test/eggs/manaphy-egg.test.ts @@ -1,8 +1,8 @@ -import { Egg } from "#app/data/egg"; -import { EggSourceType } from "#app/enums/egg-source-types"; -import { EggTier } from "#app/enums/egg-type"; +import { Egg } from "#data/egg"; +import { EggSourceType } from "#enums/egg-source-types"; +import { EggTier } from "#enums/egg-type"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/endless_boss.test.ts b/test/endless_boss.test.ts index d219cacf317..99c179ceeb6 100644 --- a/test/endless_boss.test.ts +++ b/test/endless_boss.test.ts @@ -1,8 +1,8 @@ import { BiomeId } from "#enums/biome-id"; -import { SpeciesId } from "#enums/species-id"; import { GameModes } from "#enums/game-modes"; +import { SpeciesId } from "#enums/species-id"; +import { GameManager } from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import GameManager from "#test/testUtils/gameManager"; const EndlessBossWave = { Minor: 250, diff --git a/test/enemy_command.test.ts b/test/enemy_command.test.ts index fabb1f1fdb0..249c819a107 100644 --- a/test/enemy_command.test.ts +++ b/test/enemy_command.test.ts @@ -1,13 +1,13 @@ -import type BattleScene from "#app/battle-scene"; -import { allMoves } from "#app/data/data-lists"; -import { MoveCategory } from "#enums/MoveCategory"; +import type { BattleScene } from "#app/battle-scene"; +import { allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; +import { AiType } from "#enums/ai-type"; +import { MoveCategory } from "#enums/MoveCategory"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import type { EnemyPokemon } from "#app/field/pokemon"; -import { AiType } from "#enums/ai-type"; -import { randSeedInt } from "#app/utils/common"; -import GameManager from "#test/testUtils/gameManager"; +import type { EnemyPokemon } from "#field/pokemon"; +import { GameManager } from "#test/testUtils/gameManager"; +import { randSeedInt } from "#utils/common"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/escape-calculations.test.ts b/test/escape-calculations.test.ts index a4ff52302ed..338d2a1dcfc 100644 --- a/test/escape-calculations.test.ts +++ b/test/escape-calculations.test.ts @@ -1,9 +1,9 @@ -import { AttemptRunPhase } from "#app/phases/attempt-run-phase"; -import type { CommandPhase } from "#app/phases/command-phase"; -import { Command } from "#enums/command"; import { AbilityId } from "#enums/ability-id"; +import { Command } from "#enums/command"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { AttemptRunPhase } from "#phases/attempt-run-phase"; +import type { CommandPhase } from "#phases/command-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/evolution.test.ts b/test/evolution.test.ts index c4bcca785c1..ffede4d09d6 100644 --- a/test/evolution.test.ts +++ b/test/evolution.test.ts @@ -1,13 +1,9 @@ -import { - pokemonEvolutions, - SpeciesFormEvolution, - SpeciesWildEvolutionDelay, -} from "#app/data/balance/pokemon-evolutions"; +import { pokemonEvolutions, SpeciesFormEvolution, SpeciesWildEvolutionDelay } from "#balance/pokemon-evolutions"; import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import * as Utils from "#app/utils/common"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; +import * as Utils from "#utils/common"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/field/pokemon-id-checks.test.ts b/test/field/pokemon-id-checks.test.ts index 4023b8d73ad..065a1ffeb7e 100644 --- a/test/field/pokemon-id-checks.test.ts +++ b/test/field/pokemon-id-checks.test.ts @@ -1,13 +1,13 @@ -import type Pokemon from "#app/field/pokemon"; -import { MoveId } from "#enums/move-id"; import { AbilityId } from "#enums/ability-id"; -import { SpeciesId } from "#enums/species-id"; import { BattleType } from "#enums/battle-type"; +import { BattlerIndex } from "#enums/battler-index"; import { BattlerTagType } from "#enums/battler-tag-type"; -import GameManager from "#test/testUtils/gameManager"; +import { MoveId } from "#enums/move-id"; +import { SpeciesId } from "#enums/species-id"; +import type { Pokemon } from "#field/pokemon"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import { BattlerIndex } from "#enums/battler-index"; describe("Field - Pokemon ID Checks", () => { let phaserGame: Phaser.Game; diff --git a/test/field/pokemon.test.ts b/test/field/pokemon.test.ts index 2c32f704e4e..8c04dc61b32 100644 --- a/test/field/pokemon.test.ts +++ b/test/field/pokemon.test.ts @@ -1,11 +1,11 @@ -import { SpeciesId } from "#enums/species-id"; -import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import GameManager from "#test/testUtils/gameManager"; -import { PokeballType } from "#enums/pokeball"; -import type BattleScene from "#app/battle-scene"; +import type { BattleScene } from "#app/battle-scene"; +import { CustomPokemonData } from "#data/pokemon-data"; import { MoveId } from "#enums/move-id"; +import { PokeballType } from "#enums/pokeball"; import { PokemonType } from "#enums/pokemon-type"; -import { CustomPokemonData } from "#app/data/pokemon/pokemon-data"; +import { SpeciesId } from "#enums/species-id"; +import { GameManager } from "#test/testUtils/gameManager"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; describe("Spec - Pokemon", () => { let phaserGame: Phaser.Game; diff --git a/test/final_boss.test.ts b/test/final_boss.test.ts index 071f83285e7..59918d28aa5 100644 --- a/test/final_boss.test.ts +++ b/test/final_boss.test.ts @@ -1,11 +1,11 @@ -import { GameModes } from "#enums/game-modes"; -import { TurnHeldItemTransferModifier } from "#app/modifier/modifier"; import { AbilityId } from "#enums/ability-id"; import { BiomeId } from "#enums/biome-id"; +import { GameModes } from "#enums/game-modes"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/testUtils/gameManager"; +import { TurnHeldItemTransferModifier } from "#modifiers/modifier"; +import { GameManager } from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; const FinalWave = { diff --git a/test/game-mode.test.ts b/test/game-mode.test.ts index c5ce1e02852..52de7e6a705 100644 --- a/test/game-mode.test.ts +++ b/test/game-mode.test.ts @@ -1,9 +1,9 @@ import type { GameMode } from "#app/game-mode"; import { getGameMode } from "#app/game-mode"; import { GameModes } from "#enums/game-modes"; +import { GameManager } from "#test/testUtils/gameManager"; +import * as Utils from "#utils/common"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import * as Utils from "#app/utils/common"; -import GameManager from "#test/testUtils/gameManager"; describe("game-mode", () => { let phaserGame: Phaser.Game; diff --git a/test/imports.test.ts b/test/imports.test.ts index 8a5c735e950..04e9462d8d0 100644 --- a/test/imports.test.ts +++ b/test/imports.test.ts @@ -1,4 +1,4 @@ -import { initStatsKeys } from "#app/ui/game-stats-ui-handler"; +import { initStatsKeys } from "#ui/game-stats-ui-handler"; import { describe, expect, it } from "vitest"; async function importModule() { diff --git a/test/inputs/inputs.test.ts b/test/inputs/inputs.test.ts index 1f566672f00..ce208d6ce6d 100644 --- a/test/inputs/inputs.test.ts +++ b/test/inputs/inputs.test.ts @@ -1,7 +1,7 @@ -import cfg_keyboard_qwerty from "#app/configs/inputs/cfg_keyboard_qwerty"; -import pad_xbox360 from "#app/configs/inputs/pad_xbox360"; -import GameManager from "#test/testUtils/gameManager"; -import InputsHandler from "#test/testUtils/inputsHandler"; +import cfg_keyboard_qwerty from "#inputs/cfg_keyboard_qwerty"; +import pad_xbox360 from "#inputs/pad_xbox360"; +import { GameManager } from "#test/testUtils/gameManager"; +import { InputsHandler } from "#test/testUtils/inputsHandler"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/internals.test.ts b/test/internals.test.ts index bd603ec22fc..bb3cd89565c 100644 --- a/test/internals.test.ts +++ b/test/internals.test.ts @@ -1,6 +1,6 @@ import { AbilityId } from "#enums/ability-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/items/dire_hit.test.ts b/test/items/dire_hit.test.ts index 25fe9c8b876..9b68706c804 100644 --- a/test/items/dire_hit.test.ts +++ b/test/items/dire_hit.test.ts @@ -1,25 +1,25 @@ -import { TurnEndPhase } from "#app/phases/turn-end-phase"; +import { Button } from "#enums/buttons"; import { MoveId } from "#enums/move-id"; +import { ShopCursorTarget } from "#enums/shop-cursor-target"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; -import Phase from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { BattleEndPhase } from "#app/phases/battle-end-phase"; -import { TempCritBoosterModifier } from "#app/modifier/modifier"; import { UiMode } from "#enums/ui-mode"; -import type ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; -import { Button } from "#app/enums/buttons"; -import { CommandPhase } from "#app/phases/command-phase"; -import { NewBattlePhase } from "#app/phases/new-battle-phase"; -import { TurnInitPhase } from "#app/phases/turn-init-phase"; -import { ShopCursorTarget } from "#app/enums/shop-cursor-target"; +import { TempCritBoosterModifier } from "#modifiers/modifier"; +import { BattleEndPhase } from "#phases/battle-end-phase"; +import { CommandPhase } from "#phases/command-phase"; +import { NewBattlePhase } from "#phases/new-battle-phase"; +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 Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; describe("Items - Dire Hit", () => { let phaserGame: Phaser.Game; let game: GameManager; beforeAll(() => { - phaserGame = new Phase.Game({ + phaserGame = new Phaser.Game({ type: Phaser.HEADLESS, }); }); diff --git a/test/items/double_battle_chance_booster.test.ts b/test/items/double_battle_chance_booster.test.ts index d1a9e826cda..df6a3c6d7de 100644 --- a/test/items/double_battle_chance_booster.test.ts +++ b/test/items/double_battle_chance_booster.test.ts @@ -1,13 +1,13 @@ +import { Button } from "#enums/buttons"; import { MoveId } from "#enums/move-id"; +import { ShopCursorTarget } from "#enums/shop-cursor-target"; import { SpeciesId } from "#enums/species-id"; -import { DoubleBattleChanceBoosterModifier } from "#app/modifier/modifier"; -import GameManager from "#test/testUtils/gameManager"; +import { UiMode } from "#enums/ui-mode"; +import { DoubleBattleChanceBoosterModifier } from "#modifiers/modifier"; +import { GameManager } from "#test/testUtils/gameManager"; +import type { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import { ShopCursorTarget } from "#app/enums/shop-cursor-target"; -import { UiMode } from "#enums/ui-mode"; -import type ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; -import { Button } from "#app/enums/buttons"; describe("Items - Double Battle Chance Boosters", () => { let phaserGame: Phaser.Game; diff --git a/test/items/eviolite.test.ts b/test/items/eviolite.test.ts index 353cdbf91b4..74aff03616c 100644 --- a/test/items/eviolite.test.ts +++ b/test/items/eviolite.test.ts @@ -1,16 +1,16 @@ -import { StatBoosterModifier } from "#app/modifier/modifier"; -import { NumberHolder, randItem } from "#app/utils/common"; import { SpeciesId } from "#enums/species-id"; import { Stat } from "#enums/stat"; -import GameManager from "#test/testUtils/gameManager"; -import Phase from "phaser"; +import { StatBoosterModifier } from "#modifiers/modifier"; +import { GameManager } from "#test/testUtils/gameManager"; +import { NumberHolder, randItem } from "#utils/common"; +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 44d7721aba2..6c8c16d08f4 100644 --- a/test/items/exp_booster.test.ts +++ b/test/items/exp_booster.test.ts @@ -1,8 +1,8 @@ import { AbilityId } from "#enums/ability-id"; -import { PokemonExpBoosterModifier } from "#app/modifier/modifier"; -import { NumberHolder } from "#app/utils/common"; -import GameManager from "#test/testUtils/gameManager"; -import Phase from "phaser"; +import { PokemonExpBoosterModifier } from "#modifiers/modifier"; +import { GameManager } from "#test/testUtils/gameManager"; +import { NumberHolder } from "#utils/common"; +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 9c3e6548140..6e25cdf6c08 100644 --- a/test/items/grip_claw.test.ts +++ b/test/items/grip_claw.test.ts @@ -1,12 +1,12 @@ -import { BattlerIndex } from "#enums/battler-index"; -import type Pokemon from "#app/field/pokemon"; -import type { ContactHeldItemTransferChanceModifier } from "#app/modifier/modifier"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; import { BerryType } from "#enums/berry-type"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; -import Phase from "phaser"; +import type { Pokemon } from "#field/pokemon"; +import type { ContactHeldItemTransferChanceModifier } from "#modifiers/modifier"; +import { GameManager } from "#test/testUtils/gameManager"; +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 eedb6667b9b..7ee3dff23d6 100644 --- a/test/items/leek.test.ts +++ b/test/items/leek.test.ts @@ -1,9 +1,9 @@ -import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { randInt } from "#app/utils/common"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; -import Phase from "phaser"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; +import { randInt } from "#utils/common"; +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/leftovers.test.ts b/test/items/leftovers.test.ts index 21319d2c9d7..9f2c532ef8b 100644 --- a/test/items/leftovers.test.ts +++ b/test/items/leftovers.test.ts @@ -1,9 +1,9 @@ -import { DamageAnimPhase } from "#app/phases/damage-anim-phase"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; 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 { DamageAnimPhase } from "#phases/damage-anim-phase"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/items/light_ball.test.ts b/test/items/light_ball.test.ts index 6dfed3389b9..eebcc81c224 100644 --- a/test/items/light_ball.test.ts +++ b/test/items/light_ball.test.ts @@ -1,11 +1,11 @@ -import { Stat } from "#enums/stat"; -import { SpeciesStatBoosterModifier } from "#app/modifier/modifier"; -import { modifierTypes } from "#app/data/data-lists"; -import i18next from "#app/plugins/i18n"; -import { NumberHolder } from "#app/utils/common"; +import { modifierTypes } from "#data/data-lists"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; -import Phase from "phaser"; +import { Stat } from "#enums/stat"; +import { SpeciesStatBoosterModifier } from "#modifiers/modifier"; +import i18next from "#plugins/i18n"; +import { GameManager } from "#test/testUtils/gameManager"; +import { NumberHolder } from "#utils/common"; +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 beacc3a3907..e98e6880eb1 100644 --- a/test/items/lock_capsule.test.ts +++ b/test/items/lock_capsule.test.ts @@ -1,10 +1,10 @@ import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/move-id"; import { ModifierTier } from "#enums/modifier-tier"; -import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; +import { MoveId } from "#enums/move-id"; import { UiMode } from "#enums/ui-mode"; -import GameManager from "#test/testUtils/gameManager"; -import Phase from "phaser"; +import { SelectModifierPhase } from "#phases/select-modifier-phase"; +import { GameManager } from "#test/testUtils/gameManager"; +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 e731f6e7295..17baa057fd5 100644 --- a/test/items/metal_powder.test.ts +++ b/test/items/metal_powder.test.ts @@ -1,11 +1,11 @@ -import { Stat } from "#enums/stat"; -import { SpeciesStatBoosterModifier } from "#app/modifier/modifier"; -import { modifierTypes } from "#app/data/data-lists"; -import i18next from "#app/plugins/i18n"; -import { NumberHolder } from "#app/utils/common"; +import { modifierTypes } from "#data/data-lists"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; -import Phase from "phaser"; +import { Stat } from "#enums/stat"; +import { SpeciesStatBoosterModifier } from "#modifiers/modifier"; +import i18next from "#plugins/i18n"; +import { GameManager } from "#test/testUtils/gameManager"; +import { NumberHolder } from "#utils/common"; +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/multi_lens.test.ts b/test/items/multi_lens.test.ts index 8a3161970c0..828f1254d59 100644 --- a/test/items/multi_lens.test.ts +++ b/test/items/multi_lens.test.ts @@ -1,9 +1,9 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { Stat } from "#enums/stat"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { Stat } from "#enums/stat"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/items/mystical_rock.test.ts b/test/items/mystical_rock.test.ts index 091815aa604..f1e9bb91ecf 100644 --- a/test/items/mystical_rock.test.ts +++ b/test/items/mystical_rock.test.ts @@ -1,9 +1,9 @@ import { globalScene } from "#app/global-scene"; -import { MoveId } from "#enums/move-id"; 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 { GameManager } from "#test/testUtils/gameManager"; +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 af99f51273d..6c8cb0751c3 100644 --- a/test/items/quick_powder.test.ts +++ b/test/items/quick_powder.test.ts @@ -1,11 +1,11 @@ -import { Stat } from "#enums/stat"; -import { SpeciesStatBoosterModifier } from "#app/modifier/modifier"; -import { modifierTypes } from "#app/data/data-lists"; -import i18next from "#app/plugins/i18n"; -import { NumberHolder } from "#app/utils/common"; +import { modifierTypes } from "#data/data-lists"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; -import Phase from "phaser"; +import { Stat } from "#enums/stat"; +import { SpeciesStatBoosterModifier } from "#modifiers/modifier"; +import i18next from "#plugins/i18n"; +import { GameManager } from "#test/testUtils/gameManager"; +import { NumberHolder } from "#utils/common"; +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/reviver_seed.test.ts b/test/items/reviver_seed.test.ts index f444a6eac66..f0929ee0993 100644 --- a/test/items/reviver_seed.test.ts +++ b/test/items/reviver_seed.test.ts @@ -1,11 +1,11 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { allMoves } from "#app/data/data-lists"; -import { BattlerTagType } from "#app/enums/battler-tag-type"; -import type { PokemonInstantReviveModifier } from "#app/modifier/modifier"; +import { allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; +import { BattlerTagType } from "#enums/battler-tag-type"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import type { PokemonInstantReviveModifier } from "#modifiers/modifier"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/items/scope_lens.test.ts b/test/items/scope_lens.test.ts index 16be8aab930..866164629f8 100644 --- a/test/items/scope_lens.test.ts +++ b/test/items/scope_lens.test.ts @@ -1,8 +1,8 @@ -import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; -import Phase from "phaser"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; +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 b8cd0cde4eb..454a469700a 100644 --- a/test/items/temp_stat_stage_booster.test.ts +++ b/test/items/temp_stat_stage_booster.test.ts @@ -1,23 +1,23 @@ -import { BATTLE_STATS, Stat } from "#enums/stat"; -import GameManager from "#test/testUtils/gameManager"; -import { SpeciesId } from "#enums/species-id"; -import Phase from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { MoveId } from "#enums/move-id"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { AbilityId } from "#enums/ability-id"; -import { TempStatStageBoosterModifier } from "#app/modifier/modifier"; +import { Button } from "#enums/buttons"; +import { MoveId } from "#enums/move-id"; +import { ShopCursorTarget } from "#enums/shop-cursor-target"; +import { SpeciesId } from "#enums/species-id"; +import { BATTLE_STATS, Stat } from "#enums/stat"; import { UiMode } from "#enums/ui-mode"; -import { Button } from "#app/enums/buttons"; -import type ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; -import { ShopCursorTarget } from "#app/enums/shop-cursor-target"; +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 Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; describe("Items - Temporary Stat Stage Boosters", () => { let phaserGame: Phaser.Game; 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 bc019ee99f8..3a993d64a0c 100644 --- a/test/items/thick_club.test.ts +++ b/test/items/thick_club.test.ts @@ -1,11 +1,11 @@ -import { Stat } from "#enums/stat"; -import { SpeciesStatBoosterModifier } from "#app/modifier/modifier"; -import { modifierTypes } from "#app/data/data-lists"; -import i18next from "#app/plugins/i18n"; -import { NumberHolder, randInt } from "#app/utils/common"; +import { modifierTypes } from "#data/data-lists"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; -import Phase from "phaser"; +import { Stat } from "#enums/stat"; +import { SpeciesStatBoosterModifier } from "#modifiers/modifier"; +import i18next from "#plugins/i18n"; +import { GameManager } from "#test/testUtils/gameManager"; +import { NumberHolder, randInt } from "#utils/common"; +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/items/toxic_orb.test.ts b/test/items/toxic_orb.test.ts index e0d86655028..0f4acedbfb5 100644 --- a/test/items/toxic_orb.test.ts +++ b/test/items/toxic_orb.test.ts @@ -1,9 +1,9 @@ -import i18next from "#app/plugins/i18n"; import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/testUtils/gameManager"; +import i18next from "#plugins/i18n"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/misc.test.ts b/test/misc.test.ts index 12ed165d9d9..5afd8f898c6 100644 --- a/test/misc.test.ts +++ b/test/misc.test.ts @@ -1,5 +1,4 @@ -// import { apiFetch } from "#app/utils"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import { waitUntil } from "#test/testUtils/gameManagerUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/moves/after_you.test.ts b/test/moves/after_you.test.ts index 37186dcc7a5..e961342dc36 100644 --- a/test/moves/after_you.test.ts +++ b/test/moves/after_you.test.ts @@ -1,11 +1,11 @@ -import { BattlerIndex } from "#enums/battler-index"; import { AbilityId } from "#enums/ability-id"; -import { MoveResult } from "#enums/move-result"; -import { MovePhase } from "#app/phases/move-phase"; -import { MoveUseMode } from "#enums/move-use-mode"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; +import { MoveResult } from "#enums/move-result"; +import { MoveUseMode } from "#enums/move-use-mode"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { MovePhase } from "#phases/move-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/alluring_voice.test.ts b/test/moves/alluring_voice.test.ts index ba096391f1b..d72d7b4f906 100644 --- a/test/moves/alluring_voice.test.ts +++ b/test/moves/alluring_voice.test.ts @@ -1,10 +1,10 @@ -import { BattlerIndex } from "#enums/battler-index"; import { AbilityId } from "#enums/ability-id"; -import { BattlerTagType } from "#app/enums/battler-tag-type"; -import { BerryPhase } from "#app/phases/berry-phase"; +import { BattlerIndex } from "#enums/battler-index"; +import { BattlerTagType } from "#enums/battler-tag-type"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { BerryPhase } from "#phases/berry-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/aromatherapy.test.ts b/test/moves/aromatherapy.test.ts index bfe315a1390..d18f886bff2 100644 --- a/test/moves/aromatherapy.test.ts +++ b/test/moves/aromatherapy.test.ts @@ -1,11 +1,11 @@ -import { StatusEffect } from "#app/enums/status-effect"; -import { CommandPhase } from "#app/phases/command-phase"; 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 { StatusEffect } from "#enums/status-effect"; +import { CommandPhase } from "#phases/command-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; describe("Moves - Aromatherapy", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/assist.test.ts b/test/moves/assist.test.ts index 27aa5528f17..6ef8946eaf8 100644 --- a/test/moves/assist.test.ts +++ b/test/moves/assist.test.ts @@ -1,11 +1,11 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { Stat } from "#app/enums/stat"; -import { MoveResult } from "#enums/move-result"; -import { CommandPhase } from "#app/phases/command-phase"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; +import { MoveResult } from "#enums/move-result"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { Stat } from "#enums/stat"; +import { CommandPhase } from "#phases/command-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/astonish.test.ts b/test/moves/astonish.test.ts index 48deadf7a01..7db149c9975 100644 --- a/test/moves/astonish.test.ts +++ b/test/moves/astonish.test.ts @@ -1,13 +1,13 @@ -import { allMoves } from "#app/data/data-lists"; -import { BattlerTagType } from "#app/enums/battler-tag-type"; -import { BerryPhase } from "#app/phases/berry-phase"; -import { CommandPhase } from "#app/phases/command-phase"; -import { MoveEndPhase } from "#app/phases/move-end-phase"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; +import { allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; +import { BattlerTagType } from "#enums/battler-tag-type"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { BerryPhase } from "#phases/berry-phase"; +import { CommandPhase } from "#phases/command-phase"; +import { MoveEndPhase } from "#phases/move-end-phase"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vitest"; diff --git a/test/moves/aurora_veil.test.ts b/test/moves/aurora_veil.test.ts index b9ae79e4155..2276391b1d8 100644 --- a/test/moves/aurora_veil.test.ts +++ b/test/moves/aurora_veil.test.ts @@ -1,16 +1,16 @@ -import type BattleScene from "#app/battle-scene"; -import { ArenaTagSide } from "#enums/arena-tag-side"; -import type Move from "#app/data/moves/move"; -import { allMoves } from "#app/data/data-lists"; -import { ArenaTagType } from "#app/enums/arena-tag-type"; -import type Pokemon from "#app/field/pokemon"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { NumberHolder } from "#app/utils/common"; +import type { BattleScene } from "#app/battle-scene"; +import { allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; +import { ArenaTagSide } from "#enums/arena-tag-side"; +import { ArenaTagType } from "#enums/arena-tag-type"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { WeatherType } from "#enums/weather-type"; -import GameManager from "#test/testUtils/gameManager"; +import type { Pokemon } from "#field/pokemon"; +import type { Move } from "#moves/move"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; +import { NumberHolder } from "#utils/common"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/moves/autotomize.test.ts b/test/moves/autotomize.test.ts index 000dd19b8f5..01021870b88 100644 --- a/test/moves/autotomize.test.ts +++ b/test/moves/autotomize.test.ts @@ -1,9 +1,9 @@ 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 { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; describe("Moves - Autotomize", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/baddy_bad.test.ts b/test/moves/baddy_bad.test.ts index ffdf9f0309c..57ded747d5c 100644 --- a/test/moves/baddy_bad.test.ts +++ b/test/moves/baddy_bad.test.ts @@ -1,7 +1,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 { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/baneful_bunker.test.ts b/test/moves/baneful_bunker.test.ts index c9cc2025a58..09050dcbb44 100644 --- a/test/moves/baneful_bunker.test.ts +++ b/test/moves/baneful_bunker.test.ts @@ -1,11 +1,11 @@ +import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; +import { MoveId } from "#enums/move-id"; +import { SpeciesId } from "#enums/species-id"; +import { StatusEffect } from "#enums/status-effect"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; -import GameManager from "#test/testUtils/gameManager"; -import { SpeciesId } from "#enums/species-id"; -import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/move-id"; -import { BattlerIndex } from "#enums/battler-index"; -import { StatusEffect } from "#app/enums/status-effect"; describe("Moves - Baneful Bunker", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/baton_pass.test.ts b/test/moves/baton_pass.test.ts index 1b1b0620133..af49ac0db9f 100644 --- a/test/moves/baton_pass.test.ts +++ b/test/moves/baton_pass.test.ts @@ -1,10 +1,10 @@ -import { BattlerIndex } from "#enums/battler-index"; -import GameManager from "#test/testUtils/gameManager"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; 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 { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/beak_blast.test.ts b/test/moves/beak_blast.test.ts index 2cb9f9bdd6f..60a6bb75066 100644 --- a/test/moves/beak_blast.test.ts +++ b/test/moves/beak_blast.test.ts @@ -1,12 +1,12 @@ -import { BattlerTagType } from "#app/enums/battler-tag-type"; -import { StatusEffect } from "#app/enums/status-effect"; -import { BerryPhase } from "#app/phases/berry-phase"; -import { MovePhase } from "#app/phases/move-phase"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { AbilityId } from "#enums/ability-id"; +import { BattlerTagType } from "#enums/battler-tag-type"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { StatusEffect } from "#enums/status-effect"; +import { BerryPhase } from "#phases/berry-phase"; +import { MovePhase } from "#phases/move-phase"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/beat_up.test.ts b/test/moves/beat_up.test.ts index 7c4686ab4fa..8387b6f671b 100644 --- a/test/moves/beat_up.test.ts +++ b/test/moves/beat_up.test.ts @@ -1,9 +1,9 @@ import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import { StatusEffect } from "#app/enums/status-effect"; -import { MoveEffectPhase } from "#app/phases/move-effect-phase"; -import GameManager from "#test/testUtils/gameManager"; +import { StatusEffect } from "#enums/status-effect"; +import { MoveEffectPhase } from "#phases/move-effect-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/belly_drum.test.ts b/test/moves/belly_drum.test.ts index 239b3c3d794..9044e10589f 100644 --- a/test/moves/belly_drum.test.ts +++ b/test/moves/belly_drum.test.ts @@ -1,12 +1,12 @@ -import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { toDmgValue } from "#app/utils/common"; +import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { Stat } from "#enums/stat"; -import GameManager from "#test/testUtils/gameManager"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; +import { toDmgValue } from "#utils/common"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; -import { AbilityId } from "#enums/ability-id"; // RATIO : HP Cost of Move const RATIO = 2; diff --git a/test/moves/burning_jealousy.test.ts b/test/moves/burning_jealousy.test.ts index ce0a1ce57c9..9f8dfc29ee4 100644 --- a/test/moves/burning_jealousy.test.ts +++ b/test/moves/burning_jealousy.test.ts @@ -1,10 +1,10 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { allMoves } from "#app/data/data-lists"; +import { allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; -import { StatusEffect } from "#app/enums/status-effect"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { StatusEffect } from "#enums/status-effect"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/moves/camouflage.test.ts b/test/moves/camouflage.test.ts index 6f28493b1e5..39bf8f6d5b5 100644 --- a/test/moves/camouflage.test.ts +++ b/test/moves/camouflage.test.ts @@ -1,10 +1,10 @@ +import { TerrainType } from "#data/terrain"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/move-id"; -import { SpeciesId } from "#enums/species-id"; -import { TerrainType } from "#app/data/terrain"; -import { PokemonType } from "#enums/pokemon-type"; import { BattlerIndex } from "#enums/battler-index"; -import GameManager from "#test/testUtils/gameManager"; +import { MoveId } from "#enums/move-id"; +import { PokemonType } from "#enums/pokemon-type"; +import { SpeciesId } from "#enums/species-id"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/ceaseless_edge.test.ts b/test/moves/ceaseless_edge.test.ts index 1dec98fe3a8..2d28f4b1a1b 100644 --- a/test/moves/ceaseless_edge.test.ts +++ b/test/moves/ceaseless_edge.test.ts @@ -1,13 +1,13 @@ -import { ArenaTrapTag } from "#app/data/arena-tag"; -import { ArenaTagSide } from "#enums/arena-tag-side"; -import { allMoves } from "#app/data/data-lists"; +import { ArenaTrapTag } from "#data/arena-tag"; +import { allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; -import { ArenaTagType } from "#app/enums/arena-tag-type"; -import { MoveEffectPhase } from "#app/phases/move-effect-phase"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; +import { ArenaTagSide } from "#enums/arena-tag-side"; +import { ArenaTagType } from "#enums/arena-tag-type"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { MoveEffectPhase } from "#phases/move-effect-phase"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vitest"; diff --git a/test/moves/chilly_reception.test.ts b/test/moves/chilly_reception.test.ts index 4d15bfff284..f34e61873cc 100644 --- a/test/moves/chilly_reception.test.ts +++ b/test/moves/chilly_reception.test.ts @@ -1,11 +1,11 @@ -import { RandomMoveAttr } from "#app/data/moves/move"; -import { MoveResult } from "#enums/move-result"; 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 { AbilityId } from "#app/enums/ability-id"; import { WeatherType } from "#enums/weather-type"; -import GameManager from "#test/testUtils/gameManager"; +import { RandomMoveAttr } from "#moves/move"; +import { GameManager } from "#test/testUtils/gameManager"; import i18next from "i18next"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/moves/chloroblast.test.ts b/test/moves/chloroblast.test.ts index 6c790bac150..c87f79c440a 100644 --- a/test/moves/chloroblast.test.ts +++ b/test/moves/chloroblast.test.ts @@ -1,8 +1,8 @@ -import { MoveResult } from "#enums/move-result"; 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/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/clangorous_soul.test.ts b/test/moves/clangorous_soul.test.ts index f08503acdc6..dc208087bb8 100644 --- a/test/moves/clangorous_soul.test.ts +++ b/test/moves/clangorous_soul.test.ts @@ -1,10 +1,10 @@ -import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import Phaser from "phaser"; -import GameManager from "#test/testUtils/gameManager"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { Stat } from "#enums/stat"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; /** HP Cost of Move */ const RATIO = 3; diff --git a/test/moves/copycat.test.ts b/test/moves/copycat.test.ts index 8d135d5e2c7..8f1d87ab2b5 100644 --- a/test/moves/copycat.test.ts +++ b/test/moves/copycat.test.ts @@ -1,12 +1,12 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { RandomMoveAttr } from "#app/data/moves/move"; -import { Stat } from "#app/enums/stat"; -import { MoveResult } from "#enums/move-result"; import { AbilityId } from "#enums/ability-id"; -import { MoveUseMode } from "#enums/move-use-mode"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; +import { MoveResult } from "#enums/move-result"; +import { MoveUseMode } from "#enums/move-use-mode"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { Stat } from "#enums/stat"; +import { RandomMoveAttr } from "#moves/move"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/moves/crafty_shield.test.ts b/test/moves/crafty_shield.test.ts index 12a607a2a1b..b9dbac76b90 100644 --- a/test/moves/crafty_shield.test.ts +++ b/test/moves/crafty_shield.test.ts @@ -1,13 +1,13 @@ +import { AbilityId } from "#enums/ability-id"; +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 { BerryPhase } from "#phases/berry-phase"; +import { CommandPhase } from "#phases/command-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; -import GameManager from "#test/testUtils/gameManager"; -import { SpeciesId } from "#enums/species-id"; -import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/move-id"; -import { Stat } from "#enums/stat"; -import { BattlerTagType } from "#app/enums/battler-tag-type"; -import { BerryPhase } from "#app/phases/berry-phase"; -import { CommandPhase } from "#app/phases/command-phase"; describe("Moves - Crafty Shield", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/defog.test.ts b/test/moves/defog.test.ts index 17dc0613e9b..253eac4f22c 100644 --- a/test/moves/defog.test.ts +++ b/test/moves/defog.test.ts @@ -1,8 +1,8 @@ -import { Stat } from "#enums/stat"; 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 { Stat } from "#enums/stat"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/destiny_bond.test.ts b/test/moves/destiny_bond.test.ts index a78d46b464b..29bbfabb09f 100644 --- a/test/moves/destiny_bond.test.ts +++ b/test/moves/destiny_bond.test.ts @@ -1,16 +1,16 @@ -import type { ArenaTrapTag } from "#app/data/arena-tag"; -import { ArenaTagSide } from "#enums/arena-tag-side"; -import { allMoves } from "#app/data/data-lists"; +import type { ArenaTrapTag } from "#data/arena-tag"; +import { allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; +import { ArenaTagSide } from "#enums/arena-tag-side"; import { ArenaTagType } from "#enums/arena-tag-type"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { StatusEffect } from "#enums/status-effect"; +import { PokemonInstantReviveModifier } from "#modifiers/modifier"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { BattlerIndex } from "#enums/battler-index"; -import { StatusEffect } from "#enums/status-effect"; -import { PokemonInstantReviveModifier } from "#app/modifier/modifier"; describe("Moves - Destiny Bond", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/diamond_storm.test.ts b/test/moves/diamond_storm.test.ts index 20067b3a0f3..1eb86f94b76 100644 --- a/test/moves/diamond_storm.test.ts +++ b/test/moves/diamond_storm.test.ts @@ -1,9 +1,9 @@ -import { allMoves } from "#app/data/data-lists"; +import { allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { Stat } from "#enums/stat"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/moves/dig.test.ts b/test/moves/dig.test.ts index a80ac0405fe..9d431b78838 100644 --- a/test/moves/dig.test.ts +++ b/test/moves/dig.test.ts @@ -1,13 +1,13 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { allMoves } from "#app/data/data-lists"; +import { allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; import { BattlerTagType } from "#enums/battler-tag-type"; import { MoveId } from "#enums/move-id"; +import { MoveResult } from "#enums/move-result"; import { SpeciesId } from "#enums/species-id"; import { StatusEffect } from "#enums/status-effect"; -import { MoveResult } from "#enums/move-result"; -import { describe, beforeAll, afterEach, beforeEach, it, expect } from "vitest"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; describe("Moves - Dig", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/disable.test.ts b/test/moves/disable.test.ts index b113acb9525..f6b1c24ac7d 100644 --- a/test/moves/disable.test.ts +++ b/test/moves/disable.test.ts @@ -1,13 +1,13 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { MoveResult } from "#enums/move-result"; import { AbilityId } from "#enums/ability-id"; -import { MoveUseMode } from "#enums/move-use-mode"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; +import { MoveResult } from "#enums/move-result"; +import { MoveUseMode } from "#enums/move-use-mode"; import { SpeciesId } from "#enums/species-id"; import { Stat } from "#enums/stat"; -import GameManager from "#test/testUtils/gameManager"; +import { RandomMoveAttr } from "#moves/move"; +import { GameManager } from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { RandomMoveAttr } from "#app/data/moves/move"; describe("Moves - Disable", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/dive.test.ts b/test/moves/dive.test.ts index 9c467976775..c7e4f99f6cb 100644 --- a/test/moves/dive.test.ts +++ b/test/moves/dive.test.ts @@ -1,13 +1,13 @@ -import { BattlerTagType } from "#enums/battler-tag-type"; -import { StatusEffect } from "#enums/status-effect"; -import { MoveResult } from "#enums/move-result"; import { AbilityId } from "#enums/ability-id"; +import { BattlerTagType } from "#enums/battler-tag-type"; import { MoveId } from "#enums/move-id"; +import { MoveResult } from "#enums/move-result"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; -import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest"; +import { StatusEffect } from "#enums/status-effect"; import { WeatherType } from "#enums/weather-type"; +import { GameManager } from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; describe("Moves - Dive", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/doodle.test.ts b/test/moves/doodle.test.ts index 2dbd5c08c8f..5f4b8ab9b39 100644 --- a/test/moves/doodle.test.ts +++ b/test/moves/doodle.test.ts @@ -1,9 +1,9 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { Stat } from "#app/enums/stat"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { Stat } from "#enums/stat"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/double_team.test.ts b/test/moves/double_team.test.ts index d1f6c5be3e4..9cdae33af41 100644 --- a/test/moves/double_team.test.ts +++ b/test/moves/double_team.test.ts @@ -1,9 +1,9 @@ -import { Stat } from "#enums/stat"; import { AbilityId } from "#enums/ability-id"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { Stat } from "#enums/stat"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/moves/dragon_cheer.test.ts b/test/moves/dragon_cheer.test.ts index 56feac513a1..7d1f35fe2d4 100644 --- a/test/moves/dragon_cheer.test.ts +++ b/test/moves/dragon_cheer.test.ts @@ -1,9 +1,9 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { PokemonType } from "#enums/pokemon-type"; -import { MoveId } from "#enums/move-id"; -import { SpeciesId } from "#enums/species-id"; import { AbilityId } from "#enums/ability-id"; -import GameManager from "#test/testUtils/gameManager"; +import { BattlerIndex } from "#enums/battler-index"; +import { MoveId } from "#enums/move-id"; +import { PokemonType } from "#enums/pokemon-type"; +import { SpeciesId } from "#enums/species-id"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/moves/dragon_rage.test.ts b/test/moves/dragon_rage.test.ts index c5bed3377fa..46e7dfa5a21 100644 --- a/test/moves/dragon_rage.test.ts +++ b/test/moves/dragon_rage.test.ts @@ -1,14 +1,14 @@ -import { Stat } from "#enums/stat"; -import { PokemonType } from "#enums/pokemon-type"; -import type { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#enums/battler-tag-type"; import { MoveId } from "#enums/move-id"; -import GameManager from "#test/testUtils/gameManager"; +import { PokemonType } from "#enums/pokemon-type"; +import { SpeciesId } from "#enums/species-id"; +import { Stat } from "#enums/stat"; +import type { EnemyPokemon, PlayerPokemon } from "#field/pokemon"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { SpeciesId } from "#enums/species-id"; describe("Moves - Dragon Rage", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/dragon_tail.test.ts b/test/moves/dragon_tail.test.ts index 8c456f27853..c5a77716c56 100644 --- a/test/moves/dragon_tail.test.ts +++ b/test/moves/dragon_tail.test.ts @@ -1,13 +1,13 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { allMoves } from "#app/data/data-lists"; -import { Status } from "#app/data/status-effect"; -import { Challenges } from "#enums/challenges"; -import { StatusEffect } from "#enums/status-effect"; -import { PokemonType } from "#enums/pokemon-type"; +import { allMoves } from "#data/data-lists"; +import { Status } from "#data/status-effect"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; +import { Challenges } from "#enums/challenges"; import { MoveId } from "#enums/move-id"; +import { PokemonType } from "#enums/pokemon-type"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { StatusEffect } from "#enums/status-effect"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/moves/dynamax_cannon.test.ts b/test/moves/dynamax_cannon.test.ts index 3febf918de8..fcbbccd5123 100644 --- a/test/moves/dynamax_cannon.test.ts +++ b/test/moves/dynamax_cannon.test.ts @@ -1,11 +1,11 @@ +import { allMoves } from "#data/data-lists"; import { BattlerIndex } from "#enums/battler-index"; -import { allMoves } from "#app/data/data-lists"; -import { DamageAnimPhase } from "#app/phases/damage-anim-phase"; -import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { MoveId } from "#enums/move-id"; -import type Move from "#app/data/moves/move"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import type { Move } from "#moves/move"; +import { DamageAnimPhase } from "#phases/damage-anim-phase"; +import { MoveEffectPhase } from "#phases/move-effect-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/moves/effectiveness.test.ts b/test/moves/effectiveness.test.ts index 58b2d07b1b6..58e041fb5c5 100644 --- a/test/moves/effectiveness.test.ts +++ b/test/moves/effectiveness.test.ts @@ -1,12 +1,12 @@ -import { allMoves } from "#app/data/data-lists"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; -import { TrainerSlot } from "#enums/trainer-slot"; -import { PokemonType } from "#enums/pokemon-type"; +import * as Messages from "#app/messages"; +import { allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; +import { PokemonType } from "#enums/pokemon-type"; import { SpeciesId } from "#enums/species-id"; -import * as Messages from "#app/messages"; -import GameManager from "#test/testUtils/gameManager"; +import { TrainerSlot } from "#enums/trainer-slot"; +import { GameManager } from "#test/testUtils/gameManager"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; import Phaser from "phaser"; import { afterEach, beforeAll, describe, expect, it, vi } from "vitest"; diff --git a/test/moves/electrify.test.ts b/test/moves/electrify.test.ts index b6a3cac9fff..c3aa925a331 100644 --- a/test/moves/electrify.test.ts +++ b/test/moves/electrify.test.ts @@ -1,11 +1,11 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { PokemonType } from "#enums/pokemon-type"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; +import { PokemonType } from "#enums/pokemon-type"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; describe("Moves - Electrify", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/electro_shot.test.ts b/test/moves/electro_shot.test.ts index 1d69e9c2fa7..cb696b162d5 100644 --- a/test/moves/electro_shot.test.ts +++ b/test/moves/electro_shot.test.ts @@ -1,13 +1,13 @@ +import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#enums/battler-tag-type"; +import { MoveId } from "#enums/move-id"; +import { MoveResult } from "#enums/move-result"; +import { SpeciesId } from "#enums/species-id"; import { Stat } from "#enums/stat"; import { WeatherType } from "#enums/weather-type"; -import { MoveResult } from "#enums/move-result"; -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 { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; describe("Moves - Electro Shot", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/encore.test.ts b/test/moves/encore.test.ts index 772b7c96060..c20dc194ead 100644 --- a/test/moves/encore.test.ts +++ b/test/moves/encore.test.ts @@ -1,10 +1,10 @@ -import { BattlerTagType } from "#enums/battler-tag-type"; -import { BattlerIndex } from "#enums/battler-index"; -import { MoveResult } from "#enums/move-result"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; +import { BattlerTagType } from "#enums/battler-tag-type"; import { MoveId } from "#enums/move-id"; +import { MoveResult } from "#enums/move-result"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/endure.test.ts b/test/moves/endure.test.ts index 7738f7426fe..717c9d58211 100644 --- a/test/moves/endure.test.ts +++ b/test/moves/endure.test.ts @@ -1,7 +1,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 { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/entrainment.test.ts b/test/moves/entrainment.test.ts index 65586149492..9d7da455525 100644 --- a/test/moves/entrainment.test.ts +++ b/test/moves/entrainment.test.ts @@ -1,8 +1,8 @@ -import { Stat } from "#app/enums/stat"; 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 { Stat } from "#enums/stat"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/fairy_lock.test.ts b/test/moves/fairy_lock.test.ts index b9f854cdc93..5f20c39c6f8 100644 --- a/test/moves/fairy_lock.test.ts +++ b/test/moves/fairy_lock.test.ts @@ -1,9 +1,9 @@ -import { ArenaTagSide } from "#enums/arena-tag-side"; -import { ArenaTagType } from "#app/enums/arena-tag-type"; import { AbilityId } from "#enums/ability-id"; +import { ArenaTagSide } from "#enums/arena-tag-side"; +import { ArenaTagType } from "#enums/arena-tag-type"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/fake_out.test.ts b/test/moves/fake_out.test.ts index 4fc83e5aa07..815de9b9225 100644 --- a/test/moves/fake_out.test.ts +++ b/test/moves/fake_out.test.ts @@ -1,6 +1,6 @@ -import GameManager from "#test/testUtils/gameManager"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/false_swipe.test.ts b/test/moves/false_swipe.test.ts index bf9c8307c22..0aa16ff43e1 100644 --- a/test/moves/false_swipe.test.ts +++ b/test/moves/false_swipe.test.ts @@ -1,8 +1,8 @@ -import { MoveResult } from "#enums/move-result"; 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/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/fell_stinger.test.ts b/test/moves/fell_stinger.test.ts index 0737db9105f..c3ea17904af 100644 --- a/test/moves/fell_stinger.test.ts +++ b/test/moves/fell_stinger.test.ts @@ -1,13 +1,13 @@ -import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import GameManager from "#test/testUtils/gameManager"; -import { SpeciesId } from "#enums/species-id"; +import { allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; +import { SpeciesId } from "#enums/species-id"; import { Stat } from "#enums/stat"; -import { StatusEffect } from "#app/enums/status-effect"; -import { WeatherType } from "#app/enums/weather-type"; -import { allMoves } from "#app/data/data-lists"; +import { StatusEffect } from "#enums/status-effect"; +import { WeatherType } from "#enums/weather-type"; +import { GameManager } from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; describe("Moves - Fell Stinger", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/fillet_away.test.ts b/test/moves/fillet_away.test.ts index 1e00f2ee02d..3ba4f5740eb 100644 --- a/test/moves/fillet_away.test.ts +++ b/test/moves/fillet_away.test.ts @@ -1,9 +1,9 @@ -import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { toDmgValue } from "#app/utils/common"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { Stat } from "#enums/stat"; -import GameManager from "#test/testUtils/gameManager"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; +import { toDmgValue } from "#utils/common"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; diff --git a/test/moves/fissure.test.ts b/test/moves/fissure.test.ts index 27031a7736d..6fadf867e8a 100644 --- a/test/moves/fissure.test.ts +++ b/test/moves/fissure.test.ts @@ -1,13 +1,13 @@ -import { Stat } from "#enums/stat"; -import type { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon"; -import { DamageAnimPhase } from "#app/phases/damage-anim-phase"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; -import GameManager from "#test/testUtils/gameManager"; +import { SpeciesId } from "#enums/species-id"; +import { Stat } from "#enums/stat"; +import type { EnemyPokemon, PlayerPokemon } from "#field/pokemon"; +import { DamageAnimPhase } from "#phases/damage-anim-phase"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { SpeciesId } from "#enums/species-id"; describe("Moves - Fissure", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/flame_burst.test.ts b/test/moves/flame_burst.test.ts index 0a378df1077..76d9a100e37 100644 --- a/test/moves/flame_burst.test.ts +++ b/test/moves/flame_burst.test.ts @@ -1,10 +1,10 @@ -import { allAbilities } from "#app/data/data-lists"; +import { allAbilities } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; -import type Pokemon from "#app/field/pokemon"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import type { Pokemon } from "#field/pokemon"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/moves/flower_shield.test.ts b/test/moves/flower_shield.test.ts index c3c5e5cf870..16a1efacf35 100644 --- a/test/moves/flower_shield.test.ts +++ b/test/moves/flower_shield.test.ts @@ -1,12 +1,12 @@ -import { Stat } from "#enums/stat"; -import { SemiInvulnerableTag } from "#app/data/battler-tags"; -import { PokemonType } from "#enums/pokemon-type"; -import { BiomeId } from "#enums/biome-id"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; +import { SemiInvulnerableTag } from "#data/battler-tags"; import { AbilityId } from "#enums/ability-id"; +import { BiomeId } from "#enums/biome-id"; import { MoveId } from "#enums/move-id"; +import { PokemonType } from "#enums/pokemon-type"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { Stat } from "#enums/stat"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/fly.test.ts b/test/moves/fly.test.ts index 7d8a6ee659e..c27db3686b4 100644 --- a/test/moves/fly.test.ts +++ b/test/moves/fly.test.ts @@ -1,14 +1,14 @@ -import { BattlerTagType } from "#enums/battler-tag-type"; -import { StatusEffect } from "#enums/status-effect"; -import { MoveResult } from "#enums/move-result"; +import { allMoves } from "#data/data-lists"; 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 Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest"; import { BattlerIndex } from "#enums/battler-index"; -import { allMoves } from "#app/data/data-lists"; +import { BattlerTagType } from "#enums/battler-tag-type"; +import { MoveId } from "#enums/move-id"; +import { MoveResult } from "#enums/move-result"; +import { SpeciesId } from "#enums/species-id"; +import { StatusEffect } from "#enums/status-effect"; +import { GameManager } from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; describe("Moves - Fly", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/focus_punch.test.ts b/test/moves/focus_punch.test.ts index 38b57b201c0..5123e99c6ff 100644 --- a/test/moves/focus_punch.test.ts +++ b/test/moves/focus_punch.test.ts @@ -1,12 +1,12 @@ -import { BerryPhase } from "#app/phases/berry-phase"; -import { MessagePhase } from "#app/phases/message-phase"; -import { MoveHeaderPhase } from "#app/phases/move-header-phase"; -import { SwitchSummonPhase } from "#app/phases/switch-summon-phase"; -import { TurnStartPhase } from "#app/phases/turn-start-phase"; 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 { BerryPhase } from "#phases/berry-phase"; +import { MessagePhase } from "#phases/message-phase"; +import { MoveHeaderPhase } from "#phases/move-header-phase"; +import { SwitchSummonPhase } from "#phases/switch-summon-phase"; +import { TurnStartPhase } from "#phases/turn-start-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import i18next from "i18next"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/moves/follow_me.test.ts b/test/moves/follow_me.test.ts index a99ac0b6c00..891b1844512 100644 --- a/test/moves/follow_me.test.ts +++ b/test/moves/follow_me.test.ts @@ -1,10 +1,10 @@ -import { Stat } from "#enums/stat"; -import { BattlerIndex } from "#enums/battler-index"; import { AbilityId } from "#enums/ability-id"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { Stat } from "#enums/stat"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; diff --git a/test/moves/foresight.test.ts b/test/moves/foresight.test.ts index 96a341582f9..3163f65dd79 100644 --- a/test/moves/foresight.test.ts +++ b/test/moves/foresight.test.ts @@ -1,7 +1,7 @@ import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import { MoveEffectPhase } from "#app/phases/move-effect-phase"; -import GameManager from "#test/testUtils/gameManager"; +import { MoveEffectPhase } from "#phases/move-effect-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/moves/forests_curse.test.ts b/test/moves/forests_curse.test.ts index 81ced674a33..812d3c57217 100644 --- a/test/moves/forests_curse.test.ts +++ b/test/moves/forests_curse.test.ts @@ -1,8 +1,8 @@ import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; -import { SpeciesId } from "#enums/species-id"; import { PokemonType } from "#enums/pokemon-type"; -import GameManager from "#test/testUtils/gameManager"; +import { SpeciesId } from "#enums/species-id"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/freeze_dry.test.ts b/test/moves/freeze_dry.test.ts index f1577d3d6c5..5639330db1b 100644 --- a/test/moves/freeze_dry.test.ts +++ b/test/moves/freeze_dry.test.ts @@ -1,10 +1,10 @@ -import { BattlerIndex } from "#enums/battler-index"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/move-id"; -import { SpeciesId } from "#enums/species-id"; -import { PokemonType } from "#enums/pokemon-type"; +import { BattlerIndex } from "#enums/battler-index"; import { Challenges } from "#enums/challenges"; -import GameManager from "#test/testUtils/gameManager"; +import { MoveId } from "#enums/move-id"; +import { PokemonType } from "#enums/pokemon-type"; +import { SpeciesId } from "#enums/species-id"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/moves/freezy_frost.test.ts b/test/moves/freezy_frost.test.ts index 55f67de085f..9c917ee0854 100644 --- a/test/moves/freezy_frost.test.ts +++ b/test/moves/freezy_frost.test.ts @@ -1,12 +1,12 @@ -import { Stat } from "#enums/stat"; +import { allMoves } from "#data/data-lists"; 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 { Stat } from "#enums/stat"; +import { CommandPhase } from "#phases/command-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { allMoves } from "#app/data/data-lists"; -import { CommandPhase } from "#app/phases/command-phase"; describe("Moves - Freezy Frost", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/fusion_bolt.test.ts b/test/moves/fusion_bolt.test.ts index c92a483a497..ad6810cb412 100644 --- a/test/moves/fusion_bolt.test.ts +++ b/test/moves/fusion_bolt.test.ts @@ -1,7 +1,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 { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/fusion_flare.test.ts b/test/moves/fusion_flare.test.ts index c0df347fcce..d86f784bce4 100644 --- a/test/moves/fusion_flare.test.ts +++ b/test/moves/fusion_flare.test.ts @@ -1,8 +1,8 @@ -import { TurnStartPhase } from "#app/phases/turn-start-phase"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/testUtils/gameManager"; +import { TurnStartPhase } from "#phases/turn-start-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/fusion_flare_bolt.test.ts b/test/moves/fusion_flare_bolt.test.ts index 1967e9f12d1..1777eb5e07e 100644 --- a/test/moves/fusion_flare_bolt.test.ts +++ b/test/moves/fusion_flare_bolt.test.ts @@ -1,14 +1,14 @@ -import { Stat } from "#enums/stat"; +import { allMoves } from "#data/data-lists"; import { BattlerIndex } from "#enums/battler-index"; -import { allMoves } from "#app/data/data-lists"; -import type Move from "#app/data/moves/move"; -import { DamageAnimPhase } from "#app/phases/damage-anim-phase"; -import { MoveEffectPhase } from "#app/phases/move-effect-phase"; -import { MoveEndPhase } from "#app/phases/move-end-phase"; -import { MovePhase } from "#app/phases/move-phase"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { Stat } from "#enums/stat"; +import type { Move } from "#moves/move"; +import { DamageAnimPhase } from "#phases/damage-anim-phase"; +import { MoveEffectPhase } from "#phases/move-effect-phase"; +import { MoveEndPhase } from "#phases/move-end-phase"; +import { MovePhase } from "#phases/move-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/moves/future_sight.test.ts b/test/moves/future_sight.test.ts index 7de70a88d10..96b71b8b0f1 100644 --- a/test/moves/future_sight.test.ts +++ b/test/moves/future_sight.test.ts @@ -1,7 +1,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 { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/gastro_acid.test.ts b/test/moves/gastro_acid.test.ts index 39167987809..d3ec8de2cd8 100644 --- a/test/moves/gastro_acid.test.ts +++ b/test/moves/gastro_acid.test.ts @@ -1,10 +1,10 @@ -import { BattlerIndex } from "#enums/battler-index"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/move-id"; -import { SpeciesId } from "#enums/species-id"; -import { MoveResult } from "#enums/move-result"; import { BattleType } from "#enums/battle-type"; -import GameManager from "#test/testUtils/gameManager"; +import { BattlerIndex } from "#enums/battler-index"; +import { MoveId } from "#enums/move-id"; +import { MoveResult } from "#enums/move-result"; +import { SpeciesId } from "#enums/species-id"; +import { GameManager } from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; describe("Moves - Gastro Acid", () => { diff --git a/test/moves/geomancy.test.ts b/test/moves/geomancy.test.ts index 452022b4cf1..100c4d85637 100644 --- a/test/moves/geomancy.test.ts +++ b/test/moves/geomancy.test.ts @@ -1,12 +1,12 @@ -import type { EffectiveStat } from "#enums/stat"; -import { Stat } from "#enums/stat"; -import { MoveResult } from "#enums/move-result"; 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/testUtils/gameManager"; +import type { EffectiveStat } from "#enums/stat"; +import { Stat } from "#enums/stat"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; describe("Moves - Geomancy", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/gigaton_hammer.test.ts b/test/moves/gigaton_hammer.test.ts index d80743f4ed0..69186886f40 100644 --- a/test/moves/gigaton_hammer.test.ts +++ b/test/moves/gigaton_hammer.test.ts @@ -1,7 +1,7 @@ import { BattlerIndex } from "#enums/battler-index"; -import GameManager from "#test/testUtils/gameManager"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/glaive_rush.test.ts b/test/moves/glaive_rush.test.ts index 0b6f30da71a..a09c35604b9 100644 --- a/test/moves/glaive_rush.test.ts +++ b/test/moves/glaive_rush.test.ts @@ -1,8 +1,8 @@ -import { allMoves } from "#app/data/data-lists"; +import { allMoves } from "#data/data-lists"; 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 { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/growth.test.ts b/test/moves/growth.test.ts index 6eec30be49f..94df21271a1 100644 --- a/test/moves/growth.test.ts +++ b/test/moves/growth.test.ts @@ -1,12 +1,12 @@ -import { Stat } from "#enums/stat"; -import GameManager from "#test/testUtils/gameManager"; import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; +import { Stat } from "#enums/stat"; +import { EnemyCommandPhase } from "#phases/enemy-command-phase"; +import { TurnInitPhase } from "#phases/turn-init-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import { EnemyCommandPhase } from "#app/phases/enemy-command-phase"; -import { TurnInitPhase } from "#app/phases/turn-init-phase"; describe("Moves - Growth", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/grudge.test.ts b/test/moves/grudge.test.ts index 36030c88bad..ff18cd5d6a4 100644 --- a/test/moves/grudge.test.ts +++ b/test/moves/grudge.test.ts @@ -1,8 +1,8 @@ import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import { BattlerIndex } from "#enums/battler-index"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/guard_split.test.ts b/test/moves/guard_split.test.ts index 878bb80f251..7972296f6ae 100644 --- a/test/moves/guard_split.test.ts +++ b/test/moves/guard_split.test.ts @@ -1,11 +1,11 @@ -import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import Phaser from "phaser"; -import GameManager from "#test/testUtils/gameManager"; -import { SpeciesId } from "#enums/species-id"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { MoveId } from "#enums/move-id"; -import { Stat } from "#enums/stat"; import { AbilityId } from "#enums/ability-id"; +import { MoveId } from "#enums/move-id"; +import { SpeciesId } from "#enums/species-id"; +import { Stat } from "#enums/stat"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; describe("Moves - Guard Split", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/guard_swap.test.ts b/test/moves/guard_swap.test.ts index d2c33e45df0..eda4349b9f8 100644 --- a/test/moves/guard_swap.test.ts +++ b/test/moves/guard_swap.test.ts @@ -1,12 +1,12 @@ -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import Phaser from "phaser"; -import GameManager from "#test/testUtils/gameManager"; -import { SpeciesId } from "#enums/species-id"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { MoveId } from "#enums/move-id"; -import { Stat, BATTLE_STATS } from "#enums/stat"; import { AbilityId } from "#enums/ability-id"; -import { MoveEndPhase } from "#app/phases/move-end-phase"; +import { MoveId } from "#enums/move-id"; +import { SpeciesId } from "#enums/species-id"; +import { BATTLE_STATS, Stat } from "#enums/stat"; +import { MoveEndPhase } from "#phases/move-end-phase"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; describe("Moves - Guard Swap", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/hard_press.test.ts b/test/moves/hard_press.test.ts index e57c9af981f..f61f5084752 100644 --- a/test/moves/hard_press.test.ts +++ b/test/moves/hard_press.test.ts @@ -1,12 +1,12 @@ -import { allMoves } from "#app/data/data-lists"; -import { MoveEffectPhase } from "#app/phases/move-effect-phase"; +import { allMoves } from "#data/data-lists"; 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 type { Move } from "#moves/move"; +import { MoveEffectPhase } from "#phases/move-effect-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import type Move from "#app/data/moves/move"; describe("Moves - Hard Press", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/haze.test.ts b/test/moves/haze.test.ts index f3e3dafae0a..990bbc62ae8 100644 --- a/test/moves/haze.test.ts +++ b/test/moves/haze.test.ts @@ -1,11 +1,11 @@ -import { Stat } from "#enums/stat"; -import GameManager from "#test/testUtils/gameManager"; import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; +import { Stat } from "#enums/stat"; +import { TurnInitPhase } from "#phases/turn-init-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import { TurnInitPhase } from "#app/phases/turn-init-phase"; describe("Moves - Haze", () => { describe("integration tests", () => { diff --git a/test/moves/heal_bell.test.ts b/test/moves/heal_bell.test.ts index 914307b4795..b6d757300ad 100644 --- a/test/moves/heal_bell.test.ts +++ b/test/moves/heal_bell.test.ts @@ -1,11 +1,11 @@ -import { StatusEffect } from "#app/enums/status-effect"; -import { CommandPhase } from "#app/phases/command-phase"; 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 { StatusEffect } from "#enums/status-effect"; +import { CommandPhase } from "#phases/command-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; describe("Moves - Heal Bell", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/heal_block.test.ts b/test/moves/heal_block.test.ts index dc69b5c2974..0f3ff0df683 100644 --- a/test/moves/heal_block.test.ts +++ b/test/moves/heal_block.test.ts @@ -1,12 +1,12 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { ArenaTagSide } from "#enums/arena-tag-side"; -import GameManager from "#test/testUtils/gameManager"; import { AbilityId } from "#enums/ability-id"; +import { ArenaTagSide } from "#enums/arena-tag-side"; import { ArenaTagType } from "#enums/arena-tag-type"; +import { BattlerIndex } from "#enums/battler-index"; import { BattlerTagType } from "#enums/battler-tag-type"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { WeatherType } from "#enums/weather-type"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/heart_swap.test.ts b/test/moves/heart_swap.test.ts index e9e407b6b30..c90b13b88ef 100644 --- a/test/moves/heart_swap.test.ts +++ b/test/moves/heart_swap.test.ts @@ -1,12 +1,12 @@ -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import Phaser from "phaser"; -import GameManager from "#test/testUtils/gameManager"; -import { SpeciesId } from "#enums/species-id"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { MoveId } from "#enums/move-id"; -import { BATTLE_STATS } from "#enums/stat"; import { AbilityId } from "#enums/ability-id"; -import { MoveEndPhase } from "#app/phases/move-end-phase"; +import { MoveId } from "#enums/move-id"; +import { SpeciesId } from "#enums/species-id"; +import { BATTLE_STATS } from "#enums/stat"; +import { MoveEndPhase } from "#phases/move-end-phase"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; describe("Moves - Heart Swap", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/hyper_beam.test.ts b/test/moves/hyper_beam.test.ts index bca7cba4e9a..aa3ecfe910b 100644 --- a/test/moves/hyper_beam.test.ts +++ b/test/moves/hyper_beam.test.ts @@ -1,11 +1,11 @@ -import { allMoves } from "#app/data/data-lists"; +import { allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; -import { BattlerTagType } from "#app/enums/battler-tag-type"; +import { BattlerTagType } from "#enums/battler-tag-type"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import { BerryPhase } from "#app/phases/berry-phase"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import GameManager from "#test/testUtils/gameManager"; +import { BerryPhase } from "#phases/berry-phase"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/moves/imprison.test.ts b/test/moves/imprison.test.ts index 26eadb685f9..0007c07985c 100644 --- a/test/moves/imprison.test.ts +++ b/test/moves/imprison.test.ts @@ -1,11 +1,11 @@ +import { AbilityId } from "#enums/ability-id"; +import { ArenaTagType } from "#enums/arena-tag-type"; +import { BattlerTagType } from "#enums/battler-tag-type"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import { AbilityId } from "#enums/ability-id"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import { BattlerTagType } from "#enums/battler-tag-type"; -import { ArenaTagType } from "#enums/arena-tag-type"; describe("Moves - Imprison", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/instruct.test.ts b/test/moves/instruct.test.ts index a7bcb4c86ea..106898140c5 100644 --- a/test/moves/instruct.test.ts +++ b/test/moves/instruct.test.ts @@ -1,8 +1,4 @@ -import type { TurnMove } from "#app/@types/turn-move"; -import { allMoves } from "#app/data/data-lists"; -import { RandomMoveAttr } from "#app/data/moves/move"; -import type Pokemon from "#app/field/pokemon"; -import type { MovePhase } from "#app/phases/move-phase"; +import { allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; @@ -10,7 +6,11 @@ import { MoveResult } from "#enums/move-result"; import { MoveUseMode } from "#enums/move-use-mode"; import { SpeciesId } from "#enums/species-id"; import { Stat } from "#enums/stat"; -import GameManager from "#test/testUtils/gameManager"; +import type { Pokemon } from "#field/pokemon"; +import { RandomMoveAttr } from "#moves/move"; +import type { MovePhase } from "#phases/move-phase"; +import { GameManager } from "#test/testUtils/gameManager"; +import type { TurnMove } from "#types/turn-move"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/moves/jaw_lock.test.ts b/test/moves/jaw_lock.test.ts index 4e103c14f98..b5e98fbf6d8 100644 --- a/test/moves/jaw_lock.test.ts +++ b/test/moves/jaw_lock.test.ts @@ -1,13 +1,13 @@ -import { BattlerIndex } from "#enums/battler-index"; import { AbilityId } from "#enums/ability-id"; -import { BattlerTagType } from "#app/enums/battler-tag-type"; -import { BerryPhase } from "#app/phases/berry-phase"; -import { FaintPhase } from "#app/phases/faint-phase"; -import { MoveEffectPhase } from "#app/phases/move-effect-phase"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import GameManager from "#test/testUtils/gameManager"; +import { BattlerIndex } from "#enums/battler-index"; +import { BattlerTagType } from "#enums/battler-tag-type"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; +import { BerryPhase } from "#phases/berry-phase"; +import { FaintPhase } from "#phases/faint-phase"; +import { MoveEffectPhase } from "#phases/move-effect-phase"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/lash_out.test.ts b/test/moves/lash_out.test.ts index 33a58914978..b529351e01f 100644 --- a/test/moves/lash_out.test.ts +++ b/test/moves/lash_out.test.ts @@ -1,9 +1,9 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { allMoves } from "#app/data/data-lists"; +import { allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/moves/last-resort.test.ts b/test/moves/last-resort.test.ts index 3cb98a0cd92..4eaf1ee7f5d 100644 --- a/test/moves/last-resort.test.ts +++ b/test/moves/last-resort.test.ts @@ -1,10 +1,10 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { MoveResult } from "#enums/move-result"; import { AbilityId } from "#enums/ability-id"; -import { MoveUseMode } from "#enums/move-use-mode"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; +import { MoveResult } from "#enums/move-result"; +import { MoveUseMode } from "#enums/move-use-mode"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/last_respects.test.ts b/test/moves/last_respects.test.ts index 14aa5ad3309..e438971125a 100644 --- a/test/moves/last_respects.test.ts +++ b/test/moves/last_respects.test.ts @@ -1,11 +1,11 @@ -import { MoveId } from "#enums/move-id"; -import { BattlerIndex } from "#enums/battler-index"; -import { SpeciesId } from "#enums/species-id"; +import { allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; -import GameManager from "#test/testUtils/gameManager"; -import { allMoves } from "#app/data/data-lists"; -import type Move from "#app/data/moves/move"; -import { MoveEffectPhase } from "#app/phases/move-effect-phase"; +import { BattlerIndex } from "#enums/battler-index"; +import { MoveId } from "#enums/move-id"; +import { SpeciesId } from "#enums/species-id"; +import type { Move } from "#moves/move"; +import { MoveEffectPhase } from "#phases/move-effect-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/moves/light_screen.test.ts b/test/moves/light_screen.test.ts index 8c436aacf6a..5dcdc3c271c 100644 --- a/test/moves/light_screen.test.ts +++ b/test/moves/light_screen.test.ts @@ -1,15 +1,15 @@ -import type BattleScene from "#app/battle-scene"; -import { ArenaTagSide } from "#enums/arena-tag-side"; -import type Move from "#app/data/moves/move"; -import { allMoves } from "#app/data/data-lists"; +import type { BattleScene } from "#app/battle-scene"; +import { allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; -import { ArenaTagType } from "#app/enums/arena-tag-type"; -import type Pokemon from "#app/field/pokemon"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { NumberHolder } from "#app/utils/common"; +import { ArenaTagSide } from "#enums/arena-tag-side"; +import { ArenaTagType } from "#enums/arena-tag-type"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import type { Pokemon } from "#field/pokemon"; +import type { Move } from "#moves/move"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; +import { NumberHolder } from "#utils/common"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/moves/lucky_chant.test.ts b/test/moves/lucky_chant.test.ts index a57d231134b..afcdd901382 100644 --- a/test/moves/lucky_chant.test.ts +++ b/test/moves/lucky_chant.test.ts @@ -1,10 +1,10 @@ import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; import { BattlerTagType } from "#enums/battler-tag-type"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; +import { GameManager } from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import GameManager from "#test/testUtils/gameManager"; -import { BattlerIndex } from "#enums/battler-index"; describe("Moves - Lucky Chant", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/lunar_blessing.test.ts b/test/moves/lunar_blessing.test.ts index 2709ccbacf3..5d6bc44201d 100644 --- a/test/moves/lunar_blessing.test.ts +++ b/test/moves/lunar_blessing.test.ts @@ -1,9 +1,9 @@ -import { StatusEffect } from "#app/enums/status-effect"; -import { CommandPhase } from "#app/phases/command-phase"; 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 { StatusEffect } from "#enums/status-effect"; +import { CommandPhase } from "#phases/command-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/moves/lunar_dance.test.ts b/test/moves/lunar_dance.test.ts index aea1e31b616..c49baad3e8f 100644 --- a/test/moves/lunar_dance.test.ts +++ b/test/moves/lunar_dance.test.ts @@ -1,11 +1,11 @@ -import { StatusEffect } from "#app/enums/status-effect"; -import { CommandPhase } from "#app/phases/command-phase"; 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 { StatusEffect } from "#enums/status-effect"; +import { CommandPhase } from "#phases/command-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; describe("Moves - Lunar Dance", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/magic_coat.test.ts b/test/moves/magic_coat.test.ts index 566c206f1ba..4a026ceb84e 100644 --- a/test/moves/magic_coat.test.ts +++ b/test/moves/magic_coat.test.ts @@ -1,15 +1,15 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { ArenaTagSide } from "#enums/arena-tag-side"; -import { allMoves } from "#app/data/data-lists"; -import { ArenaTagType } from "#app/enums/arena-tag-type"; -import { BattlerTagType } from "#app/enums/battler-tag-type"; -import { Stat } from "#app/enums/stat"; -import { StatusEffect } from "#app/enums/status-effect"; -import { MoveResult } from "#enums/move-result"; +import { allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; +import { ArenaTagSide } from "#enums/arena-tag-side"; +import { ArenaTagType } from "#enums/arena-tag-type"; +import { BattlerIndex } from "#enums/battler-index"; +import { BattlerTagType } from "#enums/battler-tag-type"; import { MoveId } from "#enums/move-id"; +import { MoveResult } from "#enums/move-result"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { Stat } from "#enums/stat"; +import { StatusEffect } from "#enums/status-effect"; +import { GameManager } from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; describe("Moves - Magic Coat", () => { diff --git a/test/moves/magnet_rise.test.ts b/test/moves/magnet_rise.test.ts index d8fc6a74225..0fc96fa1a05 100644 --- a/test/moves/magnet_rise.test.ts +++ b/test/moves/magnet_rise.test.ts @@ -1,8 +1,8 @@ -import { CommandPhase } from "#app/phases/command-phase"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { CommandPhase } from "#phases/command-phase"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/make_it_rain.test.ts b/test/moves/make_it_rain.test.ts index 13b8e8f1853..47f1bc89fc1 100644 --- a/test/moves/make_it_rain.test.ts +++ b/test/moves/make_it_rain.test.ts @@ -1,12 +1,12 @@ -import { Stat } from "#enums/stat"; 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 { Stat } from "#enums/stat"; +import { MoveEndPhase } from "#phases/move-end-phase"; +import { StatStageChangePhase } from "#phases/stat-stage-change-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import { MoveEndPhase } from "#app/phases/move-end-phase"; -import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase"; describe("Moves - Make It Rain", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/mat_block.test.ts b/test/moves/mat_block.test.ts index d77f538a973..edbe465e500 100644 --- a/test/moves/mat_block.test.ts +++ b/test/moves/mat_block.test.ts @@ -1,13 +1,13 @@ -import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; -import GameManager from "#test/testUtils/gameManager"; -import { SpeciesId } from "#enums/species-id"; import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; +import { SpeciesId } from "#enums/species-id"; import { Stat } from "#enums/stat"; -import { BerryPhase } from "#app/phases/berry-phase"; -import { CommandPhase } from "#app/phases/command-phase"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; +import { BerryPhase } from "#phases/berry-phase"; +import { CommandPhase } from "#phases/command-phase"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; describe("Moves - Mat Block", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/metal_burst.test.ts b/test/moves/metal_burst.test.ts index 4d07d59c16d..c99b4324878 100644 --- a/test/moves/metal_burst.test.ts +++ b/test/moves/metal_burst.test.ts @@ -1,9 +1,9 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { MoveResult } from "#enums/move-result"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; +import { MoveResult } from "#enums/move-result"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/metronome.test.ts b/test/moves/metronome.test.ts index 670f7bb9b88..9a9fcdff04a 100644 --- a/test/moves/metronome.test.ts +++ b/test/moves/metronome.test.ts @@ -1,18 +1,18 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { RechargingTag, SemiInvulnerableTag } from "#app/data/battler-tags"; -import type { RandomMoveAttr } from "#app/data/moves/move"; -import { allMoves } from "#app/data/data-lists"; +import { RechargingTag, SemiInvulnerableTag } from "#data/battler-tags"; +import { allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; -import { Stat } from "#app/enums/stat"; -import { MoveResult } from "#enums/move-result"; -import { CommandPhase } from "#app/phases/command-phase"; +import { BattlerIndex } from "#enums/battler-index"; import { BattlerTagType } from "#enums/battler-tag-type"; -import { MoveUseMode } from "#enums/move-use-mode"; import { MoveId } from "#enums/move-id"; +import { MoveResult } from "#enums/move-result"; +import { MoveUseMode } from "#enums/move-use-mode"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { Stat } from "#enums/stat"; +import type { RandomMoveAttr } from "#moves/move"; +import { CommandPhase } from "#phases/command-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; describe("Moves - Metronome", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/miracle_eye.test.ts b/test/moves/miracle_eye.test.ts index 9281931621f..d77da857068 100644 --- a/test/moves/miracle_eye.test.ts +++ b/test/moves/miracle_eye.test.ts @@ -1,8 +1,8 @@ import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import { MoveEffectPhase } from "#app/phases/move-effect-phase"; -import GameManager from "#test/testUtils/gameManager"; +import { MoveEffectPhase } from "#phases/move-effect-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/mirror_move.test.ts b/test/moves/mirror_move.test.ts index 03de93c56dc..7f833c08bf5 100644 --- a/test/moves/mirror_move.test.ts +++ b/test/moves/mirror_move.test.ts @@ -1,10 +1,10 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { Stat } from "#app/enums/stat"; -import { MoveResult } from "#enums/move-result"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; +import { MoveResult } from "#enums/move-result"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { Stat } from "#enums/stat"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/mist.test.ts b/test/moves/mist.test.ts index 4191aae0a46..b420b234e15 100644 --- a/test/moves/mist.test.ts +++ b/test/moves/mist.test.ts @@ -1,8 +1,8 @@ -import { Stat } from "#enums/stat"; 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 { Stat } from "#enums/stat"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/moongeist_beam.test.ts b/test/moves/moongeist_beam.test.ts index 367fe67cff5..7db0b50d203 100644 --- a/test/moves/moongeist_beam.test.ts +++ b/test/moves/moongeist_beam.test.ts @@ -1,8 +1,8 @@ -import { allMoves } from "#app/data/data-lists"; +import { allMoves } from "#data/data-lists"; 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 { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/moves/multi_target.test.ts b/test/moves/multi_target.test.ts index bc6b24c474d..a58fb8d3a6b 100644 --- a/test/moves/multi_target.test.ts +++ b/test/moves/multi_target.test.ts @@ -1,9 +1,9 @@ -import { BattlerIndex } from "#enums/battler-index"; import { AbilityId } from "#enums/ability-id"; -import { SpeciesId } from "#enums/species-id"; -import { toDmgValue } from "#app/utils/common"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; -import GameManager from "#test/testUtils/gameManager"; +import { SpeciesId } from "#enums/species-id"; +import { GameManager } from "#test/testUtils/gameManager"; +import { toDmgValue } from "#utils/common"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/nightmare.test.ts b/test/moves/nightmare.test.ts index e005def85ad..07579a6790c 100644 --- a/test/moves/nightmare.test.ts +++ b/test/moves/nightmare.test.ts @@ -2,7 +2,7 @@ import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/obstruct.test.ts b/test/moves/obstruct.test.ts index fc534180bef..ef589213c74 100644 --- a/test/moves/obstruct.test.ts +++ b/test/moves/obstruct.test.ts @@ -2,7 +2,7 @@ import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { Stat } from "#enums/stat"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/octolock.test.ts b/test/moves/octolock.test.ts index 2a2f8743ad2..bf2f8dc5865 100644 --- a/test/moves/octolock.test.ts +++ b/test/moves/octolock.test.ts @@ -1,9 +1,9 @@ -import { TrappedTag } from "#app/data/battler-tags"; +import { TrappedTag } from "#data/battler-tags"; import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { Stat } from "#enums/stat"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/order_up.test.ts b/test/moves/order_up.test.ts index fc505809fe6..2c9702fd6cb 100644 --- a/test/moves/order_up.test.ts +++ b/test/moves/order_up.test.ts @@ -1,12 +1,12 @@ +import { AbilityId } from "#enums/ability-id"; import { BattlerIndex } from "#enums/battler-index"; import { BattlerTagType } from "#enums/battler-tag-type"; +import { MoveId } from "#enums/move-id"; import { PokemonAnimType } from "#enums/pokemon-anim-type"; +import { SpeciesId } from "#enums/species-id"; import type { EffectiveStat } from "#enums/stat"; import { Stat } from "#enums/stat"; -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 { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/moves/parting_shot.test.ts b/test/moves/parting_shot.test.ts index fdeab6bfc7c..86a14330a3e 100644 --- a/test/moves/parting_shot.test.ts +++ b/test/moves/parting_shot.test.ts @@ -1,14 +1,14 @@ import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; +import { Stat } from "#enums/stat"; +import { BerryPhase } from "#phases/berry-phase"; +import { FaintPhase } from "#phases/faint-phase"; +import { MessagePhase } from "#phases/message-phase"; +import { TurnInitPhase } from "#phases/turn-init-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, test } from "vitest"; -import GameManager from "#test/testUtils/gameManager"; -import { Stat } from "#enums/stat"; -import { BerryPhase } from "#app/phases/berry-phase"; -import { FaintPhase } from "#app/phases/faint-phase"; -import { MessagePhase } from "#app/phases/message-phase"; -import { TurnInitPhase } from "#app/phases/turn-init-phase"; describe("Moves - Parting Shot", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/plasma_fists.test.ts b/test/moves/plasma_fists.test.ts index 7d1985be13e..7a5ba77b62d 100644 --- a/test/moves/plasma_fists.test.ts +++ b/test/moves/plasma_fists.test.ts @@ -1,11 +1,11 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { PokemonType } from "#enums/pokemon-type"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; +import { PokemonType } from "#enums/pokemon-type"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; describe("Moves - Plasma Fists", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/pledge_moves.test.ts b/test/moves/pledge_moves.test.ts index f653e245f6f..bd0c981517c 100644 --- a/test/moves/pledge_moves.test.ts +++ b/test/moves/pledge_moves.test.ts @@ -1,17 +1,16 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { allAbilities } from "#app/data/data-lists"; -import { ArenaTagSide } from "#enums/arena-tag-side"; -import { allMoves } from "#app/data/data-lists"; -import { PokemonType } from "#enums/pokemon-type"; -import { ArenaTagType } from "#enums/arena-tag-type"; -import { Stat } from "#enums/stat"; -import { toDmgValue } from "#app/utils/common"; +import { allAbilities, allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; +import { ArenaTagSide } from "#enums/arena-tag-side"; +import { ArenaTagType } from "#enums/arena-tag-type"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; +import { PokemonType } from "#enums/pokemon-type"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { Stat } from "#enums/stat"; +import { GameManager } from "#test/testUtils/gameManager"; +import { toDmgValue } from "#utils/common"; import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; describe("Moves - Pledge Moves", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/pollen_puff.test.ts b/test/moves/pollen_puff.test.ts index cd0a138e96c..d372f72a390 100644 --- a/test/moves/pollen_puff.test.ts +++ b/test/moves/pollen_puff.test.ts @@ -1,8 +1,8 @@ -import { BattlerIndex } from "#enums/battler-index"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/powder.test.ts b/test/moves/powder.test.ts index 8f47f2ff428..3e60c0d9fec 100644 --- a/test/moves/powder.test.ts +++ b/test/moves/powder.test.ts @@ -1,12 +1,12 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { MoveResult } from "#enums/move-result"; -import { BerryPhase } from "#app/phases/berry-phase"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; -import { SpeciesId } from "#enums/species-id"; +import { MoveResult } from "#enums/move-result"; import { PokemonType } from "#enums/pokemon-type"; +import { SpeciesId } from "#enums/species-id"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/testUtils/gameManager"; +import { BerryPhase } from "#phases/berry-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/power_shift.test.ts b/test/moves/power_shift.test.ts index cd5252c3f2f..069d793a794 100644 --- a/test/moves/power_shift.test.ts +++ b/test/moves/power_shift.test.ts @@ -1,8 +1,8 @@ +import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import { Stat } from "#app/enums/stat"; -import { AbilityId } from "#enums/ability-id"; -import GameManager from "#test/testUtils/gameManager"; +import { Stat } from "#enums/stat"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/power_split.test.ts b/test/moves/power_split.test.ts index c0fcd317182..ef6fda419ca 100644 --- a/test/moves/power_split.test.ts +++ b/test/moves/power_split.test.ts @@ -1,11 +1,11 @@ -import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import Phaser from "phaser"; -import GameManager from "#test/testUtils/gameManager"; -import { SpeciesId } from "#enums/species-id"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { MoveId } from "#enums/move-id"; -import { Stat } from "#enums/stat"; import { AbilityId } from "#enums/ability-id"; +import { MoveId } from "#enums/move-id"; +import { SpeciesId } from "#enums/species-id"; +import { Stat } from "#enums/stat"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; describe("Moves - Power Split", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/power_swap.test.ts b/test/moves/power_swap.test.ts index 82662850c77..cdd52fbc524 100644 --- a/test/moves/power_swap.test.ts +++ b/test/moves/power_swap.test.ts @@ -1,12 +1,12 @@ -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import Phaser from "phaser"; -import GameManager from "#test/testUtils/gameManager"; -import { SpeciesId } from "#enums/species-id"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { MoveId } from "#enums/move-id"; -import { Stat, BATTLE_STATS } from "#enums/stat"; import { AbilityId } from "#enums/ability-id"; -import { MoveEndPhase } from "#app/phases/move-end-phase"; +import { MoveId } from "#enums/move-id"; +import { SpeciesId } from "#enums/species-id"; +import { BATTLE_STATS, Stat } from "#enums/stat"; +import { MoveEndPhase } from "#phases/move-end-phase"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; describe("Moves - Power Swap", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/power_trick.test.ts b/test/moves/power_trick.test.ts index af90525d263..29a8107d891 100644 --- a/test/moves/power_trick.test.ts +++ b/test/moves/power_trick.test.ts @@ -1,12 +1,12 @@ -import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import Phaser from "phaser"; -import GameManager from "#test/testUtils/gameManager"; -import { MoveId } from "#enums/move-id"; -import { Stat } from "#enums/stat"; -import { SpeciesId } from "#enums/species-id"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { AbilityId } from "#enums/ability-id"; 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 { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; describe("Moves - Power Trick", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/protect.test.ts b/test/moves/protect.test.ts index 601afb43ec3..9fd54d44891 100644 --- a/test/moves/protect.test.ts +++ b/test/moves/protect.test.ts @@ -1,15 +1,15 @@ -import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vitest"; -import GameManager from "#test/testUtils/gameManager"; -import { SpeciesId } from "#enums/species-id"; +import { ArenaTrapTag } from "#data/arena-tag"; +import { allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/move-id"; -import { Stat } from "#enums/stat"; -import { allMoves } from "#app/data/data-lists"; -import { ArenaTrapTag } from "#app/data/arena-tag"; import { ArenaTagSide } from "#enums/arena-tag-side"; import { BattlerIndex } from "#enums/battler-index"; +import { MoveId } from "#enums/move-id"; import { MoveResult } from "#enums/move-result"; +import { SpeciesId } from "#enums/species-id"; +import { Stat } from "#enums/stat"; +import { GameManager } from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vitest"; describe("Moves - Protect", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/psycho_shift.test.ts b/test/moves/psycho_shift.test.ts index e4eb2bd8ef6..6414a91543b 100644 --- a/test/moves/psycho_shift.test.ts +++ b/test/moves/psycho_shift.test.ts @@ -1,8 +1,8 @@ -import { StatusEffect } from "#app/enums/status-effect"; 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 { StatusEffect } from "#enums/status-effect"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/purify.test.ts b/test/moves/purify.test.ts index 2e8e312f23c..a5d7d86851b 100644 --- a/test/moves/purify.test.ts +++ b/test/moves/purify.test.ts @@ -1,11 +1,11 @@ +import { Status } from "#data/status-effect"; import { BattlerIndex } from "#enums/battler-index"; -import { Status } from "#app/data/status-effect"; -import type { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon"; -import { MoveEndPhase } from "#app/phases/move-end-phase"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/testUtils/gameManager"; +import type { EnemyPokemon, PlayerPokemon } from "#field/pokemon"; +import { MoveEndPhase } from "#phases/move-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; diff --git a/test/moves/quash.test.ts b/test/moves/quash.test.ts index 158c409cf05..632d37a4e13 100644 --- a/test/moves/quash.test.ts +++ b/test/moves/quash.test.ts @@ -1,13 +1,13 @@ -import { SpeciesId } from "#enums/species-id"; -import { MoveId } from "#enums/move-id"; import { AbilityId } from "#enums/ability-id"; import { BattlerIndex } from "#enums/battler-index"; -import { WeatherType } from "#enums/weather-type"; +import { MoveId } from "#enums/move-id"; import { MoveResult } from "#enums/move-result"; -import GameManager from "#test/testUtils/gameManager"; -import Phaser from "phaser"; -import { describe, beforeAll, afterEach, beforeEach, it, expect } from "vitest"; import { MoveUseMode } from "#enums/move-use-mode"; +import { SpeciesId } from "#enums/species-id"; +import { WeatherType } from "#enums/weather-type"; +import { GameManager } from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; describe("Moves - Quash", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/quick_guard.test.ts b/test/moves/quick_guard.test.ts index 7146b804ffa..5e2e1ae1f24 100644 --- a/test/moves/quick_guard.test.ts +++ b/test/moves/quick_guard.test.ts @@ -1,12 +1,12 @@ +import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; +import { MoveId } from "#enums/move-id"; +import { MoveResult } from "#enums/move-result"; +import { SpeciesId } from "#enums/species-id"; +import { Stat } from "#enums/stat"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; -import GameManager from "#test/testUtils/gameManager"; -import { SpeciesId } from "#enums/species-id"; -import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/move-id"; -import { Stat } from "#enums/stat"; -import { BattlerIndex } from "#enums/battler-index"; -import { MoveResult } from "#enums/move-result"; describe("Moves - Quick Guard", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/rage_fist.test.ts b/test/moves/rage_fist.test.ts index 31dd987cb87..d7928ddd310 100644 --- a/test/moves/rage_fist.test.ts +++ b/test/moves/rage_fist.test.ts @@ -1,13 +1,13 @@ -import { BattlerIndex } from "#enums/battler-index"; +import { allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; +import { BattleType } from "#enums/battle-type"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import { allMoves } from "#app/data/data-lists"; -import type Move from "#app/data/moves/move"; -import GameManager from "#test/testUtils/gameManager"; +import type { Move } from "#moves/move"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { BattleType } from "#enums/battle-type"; describe("Moves - Rage Fist", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/rage_powder.test.ts b/test/moves/rage_powder.test.ts index 845bff33d04..a0b836f0917 100644 --- a/test/moves/rage_powder.test.ts +++ b/test/moves/rage_powder.test.ts @@ -1,8 +1,8 @@ -import { BattlerIndex } from "#enums/battler-index"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; diff --git a/test/moves/reflect.test.ts b/test/moves/reflect.test.ts index ef8c80070bf..47c49ea4d36 100644 --- a/test/moves/reflect.test.ts +++ b/test/moves/reflect.test.ts @@ -1,15 +1,15 @@ -import type BattleScene from "#app/battle-scene"; -import { ArenaTagSide } from "#enums/arena-tag-side"; -import type Move from "#app/data/moves/move"; -import { allMoves } from "#app/data/data-lists"; +import type { BattleScene } from "#app/battle-scene"; +import { allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; -import { ArenaTagType } from "#app/enums/arena-tag-type"; -import type Pokemon from "#app/field/pokemon"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { NumberHolder } from "#app/utils/common"; +import { ArenaTagSide } from "#enums/arena-tag-side"; +import { ArenaTagType } from "#enums/arena-tag-type"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import type { Pokemon } from "#field/pokemon"; +import type { Move } from "#moves/move"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; +import { NumberHolder } from "#utils/common"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/reflect_type.test.ts b/test/moves/reflect_type.test.ts index 0915069764c..3bea6850ce7 100644 --- a/test/moves/reflect_type.test.ts +++ b/test/moves/reflect_type.test.ts @@ -1,8 +1,8 @@ import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; -import { SpeciesId } from "#enums/species-id"; import { PokemonType } from "#enums/pokemon-type"; -import GameManager from "#test/testUtils/gameManager"; +import { SpeciesId } from "#enums/species-id"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/relic_song.test.ts b/test/moves/relic_song.test.ts index b3dd400a202..36c46769515 100644 --- a/test/moves/relic_song.test.ts +++ b/test/moves/relic_song.test.ts @@ -1,9 +1,9 @@ -import { PokemonType } from "#enums/pokemon-type"; -import { Challenges } from "#app/enums/challenges"; import { AbilityId } from "#enums/ability-id"; +import { Challenges } from "#enums/challenges"; import { MoveId } from "#enums/move-id"; +import { PokemonType } from "#enums/pokemon-type"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/retaliate.test.ts b/test/moves/retaliate.test.ts index dd5029a7c83..3eefbe3ceb6 100644 --- a/test/moves/retaliate.test.ts +++ b/test/moves/retaliate.test.ts @@ -1,10 +1,10 @@ -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import Phaser from "phaser"; -import GameManager from "#test/testUtils/gameManager"; -import { SpeciesId } from "#enums/species-id"; +import { allMoves } from "#data/data-lists"; import { MoveId } from "#enums/move-id"; -import { allMoves } from "#app/data/data-lists"; -import type Move from "#app/data/moves/move"; +import { SpeciesId } from "#enums/species-id"; +import type { Move } from "#moves/move"; +import { GameManager } from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; describe("Moves - Retaliate", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/revival_blessing.test.ts b/test/moves/revival_blessing.test.ts index 1f2ba869e4f..a9a6bd0fd7d 100644 --- a/test/moves/revival_blessing.test.ts +++ b/test/moves/revival_blessing.test.ts @@ -1,10 +1,10 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { MoveResult } from "#enums/move-result"; -import { toDmgValue } from "#app/utils/common"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; +import { MoveResult } from "#enums/move-result"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; +import { toDmgValue } from "#utils/common"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/role_play.test.ts b/test/moves/role_play.test.ts index cfa38ed38b7..dda7f319cd5 100644 --- a/test/moves/role_play.test.ts +++ b/test/moves/role_play.test.ts @@ -1,8 +1,8 @@ -import { Stat } from "#app/enums/stat"; 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 { Stat } from "#enums/stat"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/rollout.test.ts b/test/moves/rollout.test.ts index 9639a2e5408..46c53b05c6c 100644 --- a/test/moves/rollout.test.ts +++ b/test/moves/rollout.test.ts @@ -1,9 +1,9 @@ -import { allMoves } from "#app/data/data-lists"; -import { CommandPhase } from "#app/phases/command-phase"; +import { allMoves } from "#data/data-lists"; 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 { CommandPhase } from "#phases/command-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/moves/roost.test.ts b/test/moves/roost.test.ts index 3707e0ead45..30a71721d03 100644 --- a/test/moves/roost.test.ts +++ b/test/moves/roost.test.ts @@ -1,11 +1,11 @@ import { BattlerIndex } from "#enums/battler-index"; -import { PokemonType } from "#enums/pokemon-type"; -import { BattlerTagType } from "#app/enums/battler-tag-type"; +import { BattlerTagType } from "#enums/battler-tag-type"; import { MoveId } from "#enums/move-id"; +import { PokemonType } from "#enums/pokemon-type"; import { SpeciesId } from "#enums/species-id"; -import { MoveEffectPhase } from "#app/phases/move-effect-phase"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import GameManager from "#test/testUtils/gameManager"; +import { MoveEffectPhase } from "#phases/move-effect-phase"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; diff --git a/test/moves/round.test.ts b/test/moves/round.test.ts index 8e07a819131..a706fd15e9b 100644 --- a/test/moves/round.test.ts +++ b/test/moves/round.test.ts @@ -1,10 +1,10 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { allMoves } from "#app/data/data-lists"; -import type { MoveEffectPhase } from "#app/phases/move-effect-phase"; +import { allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import type { MoveEffectPhase } from "#phases/move-effect-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/moves/safeguard.test.ts b/test/moves/safeguard.test.ts index 91aa298a8ca..2651d8473be 100644 --- a/test/moves/safeguard.test.ts +++ b/test/moves/safeguard.test.ts @@ -1,12 +1,12 @@ +import { allAbilities } from "#data/data-lists"; +import { AbilityId } from "#enums/ability-id"; import { BattlerIndex } from "#enums/battler-index"; -import { allAbilities } from "#app/data/data-lists"; -import { StatusEffect } from "#app/enums/status-effect"; -import GameManager from "#test/testUtils/gameManager"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; +import { StatusEffect } from "#enums/status-effect"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { AbilityId } from "#enums/ability-id"; describe("Moves - Safeguard", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/scale_shot.test.ts b/test/moves/scale_shot.test.ts index e2c86091378..4e420f6b3ef 100644 --- a/test/moves/scale_shot.test.ts +++ b/test/moves/scale_shot.test.ts @@ -1,16 +1,16 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { allMoves } from "#app/data/data-lists"; -import { DamageAnimPhase } from "#app/phases/damage-anim-phase"; -import { MoveEffectPhase } from "#app/phases/move-effect-phase"; -import { MoveEndPhase } from "#app/phases/move-end-phase"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; +import { allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { Stat } from "#enums/stat"; -import GameManager from "#test/testUtils/gameManager"; +import { DamageAnimPhase } from "#phases/damage-anim-phase"; +import { MoveEffectPhase } from "#phases/move-effect-phase"; +import { MoveEndPhase } from "#phases/move-end-phase"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; describe("Moves - Scale Shot", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/secret_power.test.ts b/test/moves/secret_power.test.ts index adb91162ae8..8ec69fb276a 100644 --- a/test/moves/secret_power.test.ts +++ b/test/moves/secret_power.test.ts @@ -1,17 +1,16 @@ +import { allAbilities, allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; +import { ArenaTagSide } from "#enums/arena-tag-side"; +import { ArenaTagType } from "#enums/arena-tag-type"; +import { BattlerIndex } from "#enums/battler-index"; import { BiomeId } from "#enums/biome-id"; import { MoveId } from "#enums/move-id"; -import { Stat } from "#enums/stat"; -import { allMoves } from "#app/data/data-lists"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { Stat } from "#enums/stat"; +import { StatusEffect } from "#enums/status-effect"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { StatusEffect } from "#enums/status-effect"; -import { BattlerIndex } from "#enums/battler-index"; -import { ArenaTagType } from "#enums/arena-tag-type"; -import { ArenaTagSide } from "#enums/arena-tag-side"; -import { allAbilities } from "#app/data/data-lists"; describe("Moves - Secret Power", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/shed_tail.test.ts b/test/moves/shed_tail.test.ts index 81ab9215bc9..8a837a642c9 100644 --- a/test/moves/shed_tail.test.ts +++ b/test/moves/shed_tail.test.ts @@ -1,11 +1,11 @@ -import { SubstituteTag } from "#app/data/battler-tags"; -import { MoveResult } from "#enums/move-result"; +import { SubstituteTag } from "#data/battler-tags"; 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/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; describe("Moves - Shed Tail", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/shell_side_arm.test.ts b/test/moves/shell_side_arm.test.ts index 35246e10e3f..685cebce4cf 100644 --- a/test/moves/shell_side_arm.test.ts +++ b/test/moves/shell_side_arm.test.ts @@ -1,11 +1,10 @@ -import { BattlerIndex } from "#enums/battler-index"; -import type { ShellSideArmCategoryAttr } from "#app/data/moves/move"; -import { allMoves } from "#app/data/data-lists"; -import type Move from "#app/data/moves/move"; +import { allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import type { Move, ShellSideArmCategoryAttr } from "#moves/move"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/moves/shell_trap.test.ts b/test/moves/shell_trap.test.ts index a3f55cef10f..c484d1195aa 100644 --- a/test/moves/shell_trap.test.ts +++ b/test/moves/shell_trap.test.ts @@ -1,12 +1,12 @@ +import { allMoves } from "#data/data-lists"; import { BattlerIndex } from "#enums/battler-index"; -import { allMoves } from "#app/data/data-lists"; import { MoveId } from "#enums/move-id"; -import { SpeciesId } from "#enums/species-id"; import { MoveResult } from "#enums/move-result"; -import { BerryPhase } from "#app/phases/berry-phase"; -import { MoveEndPhase } from "#app/phases/move-end-phase"; -import { MovePhase } from "#app/phases/move-phase"; -import GameManager from "#test/testUtils/gameManager"; +import { SpeciesId } from "#enums/species-id"; +import { BerryPhase } from "#phases/berry-phase"; +import { MoveEndPhase } from "#phases/move-end-phase"; +import { MovePhase } from "#phases/move-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/moves/simple_beam.test.ts b/test/moves/simple_beam.test.ts index f8549944ed9..106977aea84 100644 --- a/test/moves/simple_beam.test.ts +++ b/test/moves/simple_beam.test.ts @@ -1,7 +1,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 { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/sketch.test.ts b/test/moves/sketch.test.ts index 5e9ce9a9e84..10ad31c35eb 100644 --- a/test/moves/sketch.test.ts +++ b/test/moves/sketch.test.ts @@ -1,15 +1,15 @@ +import { allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; -import { SpeciesId } from "#enums/species-id"; -import { PokemonMove } from "#app/data/moves/pokemon-move"; import { MoveResult } from "#enums/move-result"; -import GameManager from "#test/testUtils/gameManager"; +import { SpeciesId } from "#enums/species-id"; +import { StatusEffect } from "#enums/status-effect"; +import { RandomMoveAttr } from "#moves/move"; +import { PokemonMove } from "#moves/pokemon-move"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { StatusEffect } from "#app/enums/status-effect"; -import { BattlerIndex } from "#enums/battler-index"; -import { RandomMoveAttr } from "#app/data/moves/move"; -import { allMoves } from "#app/data/data-lists"; describe("Moves - Sketch", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/skill_swap.test.ts b/test/moves/skill_swap.test.ts index 7c2e6f5fd0a..d5ba509b0df 100644 --- a/test/moves/skill_swap.test.ts +++ b/test/moves/skill_swap.test.ts @@ -1,8 +1,8 @@ -import { Stat } from "#app/enums/stat"; 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 { Stat } from "#enums/stat"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/sleep_talk.test.ts b/test/moves/sleep_talk.test.ts index 84e9d509a03..972c54463e2 100644 --- a/test/moves/sleep_talk.test.ts +++ b/test/moves/sleep_talk.test.ts @@ -1,10 +1,10 @@ -import { Stat } from "#app/enums/stat"; -import { StatusEffect } from "#app/enums/status-effect"; -import { MoveResult } from "#enums/move-result"; 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/testUtils/gameManager"; +import { Stat } from "#enums/stat"; +import { StatusEffect } from "#enums/status-effect"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/solar_beam.test.ts b/test/moves/solar_beam.test.ts index 55d2ee5d13c..32400abfc0f 100644 --- a/test/moves/solar_beam.test.ts +++ b/test/moves/solar_beam.test.ts @@ -1,13 +1,13 @@ -import { allMoves } from "#app/data/data-lists"; -import { BattlerTagType } from "#enums/battler-tag-type"; -import { WeatherType } from "#enums/weather-type"; -import { MoveResult } from "#enums/move-result"; +import { allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; +import { BattlerTagType } from "#enums/battler-tag-type"; import { MoveId } from "#enums/move-id"; +import { MoveResult } from "#enums/move-result"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { WeatherType } from "#enums/weather-type"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; describe("Moves - Solar Beam", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/sparkly_swirl.test.ts b/test/moves/sparkly_swirl.test.ts index d1cbdd70107..b81bda66c56 100644 --- a/test/moves/sparkly_swirl.test.ts +++ b/test/moves/sparkly_swirl.test.ts @@ -1,10 +1,10 @@ -import { allMoves } from "#app/data/data-lists"; -import { StatusEffect } from "#app/enums/status-effect"; -import { CommandPhase } from "#app/phases/command-phase"; +import { allMoves } from "#data/data-lists"; 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 { StatusEffect } from "#enums/status-effect"; +import { CommandPhase } from "#phases/command-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/moves/spectral_thief.test.ts b/test/moves/spectral_thief.test.ts index e7b19eda506..acb3e22cf6c 100644 --- a/test/moves/spectral_thief.test.ts +++ b/test/moves/spectral_thief.test.ts @@ -1,11 +1,11 @@ +import { allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; import { BattlerIndex } from "#enums/battler-index"; -import { Stat } from "#enums/stat"; -import { allMoves } from "#app/data/data-lists"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import GameManager from "#test/testUtils/gameManager"; +import { Stat } from "#enums/stat"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/speed_swap.test.ts b/test/moves/speed_swap.test.ts index 3723e7db740..e0c06bfb0f7 100644 --- a/test/moves/speed_swap.test.ts +++ b/test/moves/speed_swap.test.ts @@ -1,11 +1,11 @@ -import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import Phaser from "phaser"; -import GameManager from "#test/testUtils/gameManager"; -import { SpeciesId } from "#enums/species-id"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { MoveId } from "#enums/move-id"; -import { Stat } from "#enums/stat"; import { AbilityId } from "#enums/ability-id"; +import { MoveId } from "#enums/move-id"; +import { SpeciesId } from "#enums/species-id"; +import { Stat } from "#enums/stat"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; describe("Moves - Speed Swap", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/spikes.test.ts b/test/moves/spikes.test.ts index 49492701d18..3309e3ec02b 100644 --- a/test/moves/spikes.test.ts +++ b/test/moves/spikes.test.ts @@ -1,11 +1,11 @@ +import { ArenaTrapTag } from "#data/arena-tag"; import { AbilityId } from "#enums/ability-id"; +import { ArenaTagSide } from "#enums/arena-tag-side"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import { ArenaTrapTag } from "#app/data/arena-tag"; -import { ArenaTagSide } from "#enums/arena-tag-side"; describe("Moves - Spikes", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/spit_up.test.ts b/test/moves/spit_up.test.ts index 00cbe2fd0ad..03e0cee1e4b 100644 --- a/test/moves/spit_up.test.ts +++ b/test/moves/spit_up.test.ts @@ -1,17 +1,17 @@ -import { Stat } from "#enums/stat"; -import { StockpilingTag } from "#app/data/battler-tags"; -import { allMoves } from "#app/data/data-lists"; -import { BattlerTagType } from "#app/enums/battler-tag-type"; -import { MoveResult } from "#enums/move-result"; -import GameManager from "#test/testUtils/gameManager"; +import { StockpilingTag } from "#data/battler-tags"; +import { allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; +import { BattlerTagType } from "#enums/battler-tag-type"; import { MoveId } from "#enums/move-id"; -import type Move from "#app/data/moves/move"; +import { MoveResult } from "#enums/move-result"; import { SpeciesId } from "#enums/species-id"; +import { Stat } from "#enums/stat"; +import type { Move } from "#moves/move"; +import { MovePhase } from "#phases/move-phase"; +import { TurnInitPhase } from "#phases/turn-init-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { MovePhase } from "#app/phases/move-phase"; -import { TurnInitPhase } from "#app/phases/turn-init-phase"; describe("Moves - Spit Up", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/spotlight.test.ts b/test/moves/spotlight.test.ts index a9e8cd7e2b6..4feff5eb719 100644 --- a/test/moves/spotlight.test.ts +++ b/test/moves/spotlight.test.ts @@ -1,8 +1,8 @@ import { BattlerIndex } from "#enums/battler-index"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; diff --git a/test/moves/steamroller.test.ts b/test/moves/steamroller.test.ts index 67c63ff32e4..a9da98c1429 100644 --- a/test/moves/steamroller.test.ts +++ b/test/moves/steamroller.test.ts @@ -1,11 +1,11 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { allMoves } from "#app/data/data-lists"; -import { BattlerTagType } from "#app/enums/battler-tag-type"; -import type { DamageCalculationResult } from "#app/@types/damage-result"; +import { allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; +import { BattlerTagType } from "#enums/battler-tag-type"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; +import type { DamageCalculationResult } from "#types/damage-result"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/moves/stockpile.test.ts b/test/moves/stockpile.test.ts index 3ad47d8d85e..d2465446ff6 100644 --- a/test/moves/stockpile.test.ts +++ b/test/moves/stockpile.test.ts @@ -1,12 +1,12 @@ -import { Stat } from "#enums/stat"; -import { StockpilingTag } from "#app/data/battler-tags"; -import { MoveResult } from "#enums/move-result"; -import { CommandPhase } from "#app/phases/command-phase"; -import { TurnInitPhase } from "#app/phases/turn-init-phase"; +import { StockpilingTag } from "#data/battler-tags"; 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/testUtils/gameManager"; +import { Stat } from "#enums/stat"; +import { CommandPhase } from "#phases/command-phase"; +import { TurnInitPhase } from "#phases/turn-init-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/struggle.test.ts b/test/moves/struggle.test.ts index e1373b29d33..2d624f6d338 100644 --- a/test/moves/struggle.test.ts +++ b/test/moves/struggle.test.ts @@ -1,7 +1,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 { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/moves/substitute.test.ts b/test/moves/substitute.test.ts index 182fefb74d7..39418fb5b99 100644 --- a/test/moves/substitute.test.ts +++ b/test/moves/substitute.test.ts @@ -1,21 +1,21 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { ArenaTagSide } from "#enums/arena-tag-side"; -import { SubstituteTag, TrappedTag } from "#app/data/battler-tags"; -import { StealHeldItemChanceAttr } from "#app/data/moves/move"; -import { allMoves } from "#app/data/data-lists"; -import { MoveResult } from "#enums/move-result"; -import type { CommandPhase } from "#app/phases/command-phase"; -import GameManager from "#test/testUtils/gameManager"; -import { Command } from "#enums/command"; -import { UiMode } from "#enums/ui-mode"; +import { SubstituteTag, TrappedTag } from "#data/battler-tags"; +import { allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; +import { ArenaTagSide } from "#enums/arena-tag-side"; import { ArenaTagType } from "#enums/arena-tag-type"; +import { BattlerIndex } from "#enums/battler-index"; import { BattlerTagType } from "#enums/battler-tag-type"; import { BerryType } from "#enums/berry-type"; +import { Command } from "#enums/command"; import { MoveId } from "#enums/move-id"; +import { MoveResult } from "#enums/move-result"; import { SpeciesId } from "#enums/species-id"; import { Stat } from "#enums/stat"; import { StatusEffect } from "#enums/status-effect"; +import { UiMode } from "#enums/ui-mode"; +import { StealHeldItemChanceAttr } from "#moves/move"; +import type { CommandPhase } from "#phases/command-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/moves/swallow.test.ts b/test/moves/swallow.test.ts index c511682011f..176b00b030c 100644 --- a/test/moves/swallow.test.ts +++ b/test/moves/swallow.test.ts @@ -1,13 +1,13 @@ -import { Stat } from "#enums/stat"; -import { StockpilingTag } from "#app/data/battler-tags"; -import { BattlerTagType } from "#app/enums/battler-tag-type"; -import { MoveResult } from "#enums/move-result"; -import { MovePhase } from "#app/phases/move-phase"; -import { TurnInitPhase } from "#app/phases/turn-init-phase"; +import { StockpilingTag } from "#data/battler-tags"; import { AbilityId } from "#enums/ability-id"; +import { BattlerTagType } from "#enums/battler-tag-type"; import { MoveId } from "#enums/move-id"; +import { MoveResult } from "#enums/move-result"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { Stat } from "#enums/stat"; +import { MovePhase } from "#phases/move-phase"; +import { TurnInitPhase } from "#phases/turn-init-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/moves/synchronoise.test.ts b/test/moves/synchronoise.test.ts index 9068a40693b..fe4a316a32a 100644 --- a/test/moves/synchronoise.test.ts +++ b/test/moves/synchronoise.test.ts @@ -2,7 +2,7 @@ import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; import { PokemonType } from "#enums/pokemon-type"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/syrup_bomb.test.ts b/test/moves/syrup_bomb.test.ts index 4b2821b439c..f45070d81a5 100644 --- a/test/moves/syrup_bomb.test.ts +++ b/test/moves/syrup_bomb.test.ts @@ -1,11 +1,11 @@ +import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; +import { BattlerTagType } from "#enums/battler-tag-type"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import { AbilityId } from "#enums/ability-id"; -import { BattlerTagType } from "#enums/battler-tag-type"; import { Stat } from "#enums/stat"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; -import { BattlerIndex } from "#enums/battler-index"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; describe("Moves - SYRUP BOMB", () => { diff --git a/test/moves/tackle.test.ts b/test/moves/tackle.test.ts index f3c0db85a39..998afd23f9d 100644 --- a/test/moves/tackle.test.ts +++ b/test/moves/tackle.test.ts @@ -1,9 +1,9 @@ -import { Stat } from "#enums/stat"; -import { EnemyCommandPhase } from "#app/phases/enemy-command-phase"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { Stat } from "#enums/stat"; +import { EnemyCommandPhase } from "#phases/enemy-command-phase"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/tail_whip.test.ts b/test/moves/tail_whip.test.ts index e98194b52dd..272816a88a6 100644 --- a/test/moves/tail_whip.test.ts +++ b/test/moves/tail_whip.test.ts @@ -1,12 +1,12 @@ -import { Stat } from "#enums/stat"; -import GameManager from "#test/testUtils/gameManager"; import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; +import { Stat } from "#enums/stat"; +import { EnemyCommandPhase } from "#phases/enemy-command-phase"; +import { TurnInitPhase } from "#phases/turn-init-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import { EnemyCommandPhase } from "#app/phases/enemy-command-phase"; -import { TurnInitPhase } from "#app/phases/turn-init-phase"; describe("Moves - Tail whip", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/tailwind.test.ts b/test/moves/tailwind.test.ts index 874934fc8f3..1c8701de5bc 100644 --- a/test/moves/tailwind.test.ts +++ b/test/moves/tailwind.test.ts @@ -1,10 +1,10 @@ -import { ArenaTagSide } from "#enums/arena-tag-side"; -import { ArenaTagType } from "#app/enums/arena-tag-type"; import { AbilityId } from "#enums/ability-id"; +import { ArenaTagSide } from "#enums/arena-tag-side"; +import { ArenaTagType } from "#enums/arena-tag-type"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { Stat } from "#enums/stat"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/tar_shot.test.ts b/test/moves/tar_shot.test.ts index 8d5ea4b3582..c2ae397e43a 100644 --- a/test/moves/tar_shot.test.ts +++ b/test/moves/tar_shot.test.ts @@ -1,10 +1,10 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { PokemonType } from "#enums/pokemon-type"; -import { MoveId } from "#enums/move-id"; -import { SpeciesId } from "#enums/species-id"; -import { Stat } from "#app/enums/stat"; import { AbilityId } from "#enums/ability-id"; -import GameManager from "#test/testUtils/gameManager"; +import { BattlerIndex } from "#enums/battler-index"; +import { MoveId } from "#enums/move-id"; +import { PokemonType } from "#enums/pokemon-type"; +import { SpeciesId } from "#enums/species-id"; +import { Stat } from "#enums/stat"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/moves/taunt.test.ts b/test/moves/taunt.test.ts index fabb95f98b2..ba76551708b 100644 --- a/test/moves/taunt.test.ts +++ b/test/moves/taunt.test.ts @@ -1,11 +1,11 @@ -import { MoveId } from "#enums/move-id"; -import { SpeciesId } from "#enums/species-id"; import { AbilityId } from "#enums/ability-id"; -import GameManager from "#test/testUtils/gameManager"; +import { BattlerTagType } from "#enums/battler-tag-type"; +import { MoveId } from "#enums/move-id"; +import { MoveResult } from "#enums/move-result"; +import { SpeciesId } from "#enums/species-id"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import { MoveResult } from "#enums/move-result"; -import { BattlerTagType } from "#enums/battler-tag-type"; describe("Moves - Taunt", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/telekinesis.test.ts b/test/moves/telekinesis.test.ts index 5c9f1e22395..92d7f8cc885 100644 --- a/test/moves/telekinesis.test.ts +++ b/test/moves/telekinesis.test.ts @@ -1,13 +1,13 @@ -import { BattlerTagType } from "#enums/battler-tag-type"; -import { allMoves } from "#app/data/data-lists"; +import { allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/move-id"; -import { SpeciesId } from "#enums/species-id"; -import { MoveResult } from "#enums/move-result"; -import GameManager from "#test/testUtils/gameManager"; -import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest"; import { BattlerIndex } from "#enums/battler-index"; +import { BattlerTagType } from "#enums/battler-tag-type"; +import { MoveId } from "#enums/move-id"; +import { MoveResult } from "#enums/move-result"; +import { SpeciesId } from "#enums/species-id"; +import { GameManager } from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; describe("Moves - Telekinesis", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/tera_blast.test.ts b/test/moves/tera_blast.test.ts index fbebd428cfd..d6c16c31544 100644 --- a/test/moves/tera_blast.test.ts +++ b/test/moves/tera_blast.test.ts @@ -1,13 +1,12 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { Stat } from "#enums/stat"; -import type { TeraMoveCategoryAttr } from "#app/data/moves/move"; -import { allMoves } from "#app/data/data-lists"; -import type Move from "#app/data/moves/move"; -import { PokemonType } from "#enums/pokemon-type"; +import { allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; +import { PokemonType } from "#enums/pokemon-type"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { Stat } from "#enums/stat"; +import type { Move, TeraMoveCategoryAttr } from "#moves/move"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/moves/tera_starstorm.test.ts b/test/moves/tera_starstorm.test.ts index 2eaf2ec0372..a63573b360d 100644 --- a/test/moves/tera_starstorm.test.ts +++ b/test/moves/tera_starstorm.test.ts @@ -1,11 +1,11 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { PokemonType } from "#enums/pokemon-type"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; +import { PokemonType } from "#enums/pokemon-type"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; describe("Moves - Tera Starstorm", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/thousand_arrows.test.ts b/test/moves/thousand_arrows.test.ts index 9ecdd94a94f..3c7bacfbb2b 100644 --- a/test/moves/thousand_arrows.test.ts +++ b/test/moves/thousand_arrows.test.ts @@ -1,10 +1,10 @@ import { AbilityId } from "#enums/ability-id"; -import { BattlerTagType } from "#app/enums/battler-tag-type"; -import { BerryPhase } from "#app/phases/berry-phase"; -import { MoveEffectPhase } from "#app/phases/move-effect-phase"; +import { BattlerTagType } from "#enums/battler-tag-type"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { BerryPhase } from "#phases/berry-phase"; +import { MoveEffectPhase } from "#phases/move-effect-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/throat_chop.test.ts b/test/moves/throat_chop.test.ts index aa92f657c86..1a17cb1fba2 100644 --- a/test/moves/throat_chop.test.ts +++ b/test/moves/throat_chop.test.ts @@ -1,11 +1,11 @@ +import { AbilityId } from "#enums/ability-id"; import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import { Stat } from "#app/enums/stat"; -import { AbilityId } from "#enums/ability-id"; -import GameManager from "#test/testUtils/gameManager"; +import { Stat } from "#enums/stat"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; describe("Moves - Throat Chop", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/thunder_wave.test.ts b/test/moves/thunder_wave.test.ts index 7d2692fdfa3..06a24e454fa 100644 --- a/test/moves/thunder_wave.test.ts +++ b/test/moves/thunder_wave.test.ts @@ -1,9 +1,9 @@ -import type { EnemyPokemon } from "#app/field/pokemon"; import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/testUtils/gameManager"; +import type { EnemyPokemon } from "#field/pokemon"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/tidy_up.test.ts b/test/moves/tidy_up.test.ts index 69c9df42b36..c96718e2332 100644 --- a/test/moves/tidy_up.test.ts +++ b/test/moves/tidy_up.test.ts @@ -1,14 +1,14 @@ -import { Stat } from "#enums/stat"; -import { ArenaTagType } from "#app/enums/arena-tag-type"; -import { MoveEndPhase } from "#app/phases/move-end-phase"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; +import { SubstituteTag } from "#data/battler-tags"; import { AbilityId } from "#enums/ability-id"; +import { ArenaTagType } from "#enums/arena-tag-type"; import { MoveId } from "#enums/move-id"; -import GameManager from "#test/testUtils/gameManager"; +import { SpeciesId } from "#enums/species-id"; +import { Stat } from "#enums/stat"; +import { MoveEndPhase } from "#phases/move-end-phase"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import { SubstituteTag } from "#app/data/battler-tags"; -import { SpeciesId } from "#enums/species-id"; describe("Moves - Tidy Up", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/torment.test.ts b/test/moves/torment.test.ts index e4d926d9601..71a4f3cb504 100644 --- a/test/moves/torment.test.ts +++ b/test/moves/torment.test.ts @@ -1,12 +1,12 @@ -import { MoveId } from "#enums/move-id"; -import { SpeciesId } from "#enums/species-id"; import { AbilityId } from "#enums/ability-id"; -import GameManager from "#test/testUtils/gameManager"; +import { BattlerTagType } from "#enums/battler-tag-type"; +import { MoveId } from "#enums/move-id"; +import { MoveResult } from "#enums/move-result"; +import { SpeciesId } from "#enums/species-id"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import { MoveResult } from "#enums/move-result"; -import { BattlerTagType } from "#enums/battler-tag-type"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; describe("Moves - Torment", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/toxic.test.ts b/test/moves/toxic.test.ts index a7ba52eb963..5aaa4e3e85d 100644 --- a/test/moves/toxic.test.ts +++ b/test/moves/toxic.test.ts @@ -1,11 +1,11 @@ +import { allMoves } from "#data/data-lists"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { StatusEffect } from "#enums/status-effect"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { StatusEffect } from "#enums/status-effect"; -import { BattlerIndex } from "#enums/battler-index"; -import { allMoves } from "#app/data/data-lists"; describe("Moves - Toxic", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/toxic_spikes.test.ts b/test/moves/toxic_spikes.test.ts index bf1f5acc1cb..69f09ce966a 100644 --- a/test/moves/toxic_spikes.test.ts +++ b/test/moves/toxic_spikes.test.ts @@ -1,14 +1,14 @@ -import type { ArenaTrapTag } from "#app/data/arena-tag"; -import { ArenaTagSide } from "#enums/arena-tag-side"; -import type { SessionSaveData } from "#app/system/game-data"; -import { GameData } from "#app/system/game-data"; -import { decrypt, encrypt } from "#app/utils/data"; +import type { ArenaTrapTag } from "#data/arena-tag"; import { AbilityId } from "#enums/ability-id"; +import { ArenaTagSide } from "#enums/arena-tag-side"; import { ArenaTagType } from "#enums/arena-tag-type"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/testUtils/gameManager"; +import type { SessionSaveData } from "#system/game-data"; +import { GameData } from "#system/game-data"; +import { GameManager } from "#test/testUtils/gameManager"; +import { decrypt, encrypt } from "#utils/data"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/transform.test.ts b/test/moves/transform.test.ts index 4fbaf0136ab..fcb03b731f0 100644 --- a/test/moves/transform.test.ts +++ b/test/moves/transform.test.ts @@ -1,12 +1,12 @@ -import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import Phaser from "phaser"; -import GameManager from "#test/testUtils/gameManager"; -import { SpeciesId } from "#enums/species-id"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { MoveId } from "#enums/move-id"; -import { Stat, EFFECTIVE_STATS } from "#enums/stat"; import { AbilityId } from "#enums/ability-id"; import { BattlerIndex } from "#enums/battler-index"; +import { MoveId } from "#enums/move-id"; +import { SpeciesId } from "#enums/species-id"; +import { EFFECTIVE_STATS, Stat } from "#enums/stat"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { GameManager } from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; // TODO: Add more tests once Transform is fully implemented describe("Moves - Transform", () => { diff --git a/test/moves/trick_or_treat.test.ts b/test/moves/trick_or_treat.test.ts index 861115e2503..4e563c97ddc 100644 --- a/test/moves/trick_or_treat.test.ts +++ b/test/moves/trick_or_treat.test.ts @@ -1,8 +1,8 @@ import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; -import { SpeciesId } from "#enums/species-id"; import { PokemonType } from "#enums/pokemon-type"; -import GameManager from "#test/testUtils/gameManager"; +import { SpeciesId } from "#enums/species-id"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/triple_arrows.test.ts b/test/moves/triple_arrows.test.ts index 89ccb4e5b04..a60c7106a21 100644 --- a/test/moves/triple_arrows.test.ts +++ b/test/moves/triple_arrows.test.ts @@ -1,10 +1,9 @@ -import type { FlinchAttr, StatStageChangeAttr } from "#app/data/moves/move"; -import { allMoves } from "#app/data/data-lists"; +import { allMoves } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; -import type Move from "#app/data/moves/move"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import type { FlinchAttr, Move, StatStageChangeAttr } from "#moves/move"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/moves/u_turn.test.ts b/test/moves/u_turn.test.ts index a2e29899ad8..cf8b91511ca 100644 --- a/test/moves/u_turn.test.ts +++ b/test/moves/u_turn.test.ts @@ -2,7 +2,7 @@ import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/moves/upper_hand.test.ts b/test/moves/upper_hand.test.ts index fe38e75cf9a..f03a84397f2 100644 --- a/test/moves/upper_hand.test.ts +++ b/test/moves/upper_hand.test.ts @@ -1,9 +1,9 @@ -import { BattlerIndex } from "#enums/battler-index"; -import { MoveResult } from "#enums/move-result"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; +import { MoveResult } from "#enums/move-result"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/whirlwind.test.ts b/test/moves/whirlwind.test.ts index 00d7c16561c..9def19c4668 100644 --- a/test/moves/whirlwind.test.ts +++ b/test/moves/whirlwind.test.ts @@ -1,19 +1,19 @@ +import { globalScene } from "#app/global-scene"; +import { Status } from "#data/status-effect"; +import { AbilityId } from "#enums/ability-id"; +import { BattleType } from "#enums/battle-type"; +import { BattlerIndex } from "#enums/battler-index"; import { BattlerTagType } from "#enums/battler-tag-type"; import { Challenges } from "#enums/challenges"; -import { PokemonType } from "#enums/pokemon-type"; -import { MoveResult } from "#enums/move-result"; -import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; +import { MoveResult } from "#enums/move-result"; +import { PokemonType } from "#enums/pokemon-type"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { StatusEffect } from "#enums/status-effect"; +import { TrainerType } from "#enums/trainer-type"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { Status } from "#app/data/status-effect"; -import { StatusEffect } from "#enums/status-effect"; -import { globalScene } from "#app/global-scene"; -import { BattlerIndex } from "#enums/battler-index"; -import { BattleType } from "#enums/battle-type"; -import { TrainerType } from "#enums/trainer-type"; describe("Moves - Whirlwind", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/wide_guard.test.ts b/test/moves/wide_guard.test.ts index 07c02158e94..8f17938b02a 100644 --- a/test/moves/wide_guard.test.ts +++ b/test/moves/wide_guard.test.ts @@ -1,12 +1,12 @@ -import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; -import GameManager from "#test/testUtils/gameManager"; -import { SpeciesId } from "#enums/species-id"; import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; +import { SpeciesId } from "#enums/species-id"; import { Stat } from "#enums/stat"; -import { BerryPhase } from "#app/phases/berry-phase"; -import { CommandPhase } from "#app/phases/command-phase"; +import { BerryPhase } from "#phases/berry-phase"; +import { CommandPhase } from "#phases/command-phase"; +import { GameManager } from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; describe("Moves - Wide Guard", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/will_o_wisp.test.ts b/test/moves/will_o_wisp.test.ts index 336e84129c5..6f878e1198c 100644 --- a/test/moves/will_o_wisp.test.ts +++ b/test/moves/will_o_wisp.test.ts @@ -1,9 +1,9 @@ -import { BattlerIndex } from "#enums/battler-index"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; import { StatusEffect } from "#enums/status-effect"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/mystery-encounter/encounter-test-utils.ts b/test/mystery-encounter/encounter-test-utils.ts index 6293a49cf63..6b6a570d318 100644 --- a/test/mystery-encounter/encounter-test-utils.ts +++ b/test/mystery-encounter/encounter-test-utils.ts @@ -1,24 +1,24 @@ +import { Status } from "#data/status-effect"; +import { Button } from "#enums/buttons"; +import { StatusEffect } from "#enums/status-effect"; +import { UiMode } from "#enums/ui-mode"; // biome-ignore lint/performance/noNamespaceImport: Necessary for mocks -import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { Status } from "#app/data/status-effect"; -import { CommandPhase } from "#app/phases/command-phase"; -import { MessagePhase } from "#app/phases/message-phase"; +import * as EncounterPhaseUtils from "#mystery-encounters/encounter-phase-utils"; +import { CommandPhase } from "#phases/command-phase"; +import { MessagePhase } from "#phases/message-phase"; import { MysteryEncounterBattlePhase, MysteryEncounterOptionSelectedPhase, MysteryEncounterPhase, MysteryEncounterRewardsPhase, -} from "#app/phases/mystery-encounter-phases"; -import { VictoryPhase } from "#app/phases/victory-phase"; -import type MessageUiHandler from "#app/ui/message-ui-handler"; -import type MysteryEncounterUiHandler from "#app/ui/mystery-encounter-ui-handler"; -import type PartyUiHandler from "#app/ui/party-ui-handler"; -import type OptionSelectUiHandler from "#app/ui/settings/option-select-ui-handler"; -import { UiMode } from "#enums/ui-mode"; -import { isNullOrUndefined } from "#app/utils/common"; -import { Button } from "#enums/buttons"; -import { StatusEffect } from "#enums/status-effect"; -import type GameManager from "#test/testUtils/gameManager"; +} from "#phases/mystery-encounter-phases"; +import { VictoryPhase } from "#phases/victory-phase"; +import type { GameManager } from "#test/testUtils/gameManager"; +import type { MessageUiHandler } from "#ui/message-ui-handler"; +import type { MysteryEncounterUiHandler } from "#ui/mystery-encounter-ui-handler"; +import type { OptionSelectUiHandler } from "#ui/option-select-ui-handler"; +import type { PartyUiHandler } from "#ui/party-ui-handler"; +import { isNullOrUndefined } from "#utils/common"; import { expect, vi } from "vitest"; /** diff --git a/test/mystery-encounter/encounters/a-trainers-test-encounter.test.ts b/test/mystery-encounter/encounters/a-trainers-test-encounter.test.ts index 82cac197fe9..a2832052611 100644 --- a/test/mystery-encounter/encounters/a-trainers-test-encounter.test.ts +++ b/test/mystery-encounter/encounters/a-trainers-test-encounter.test.ts @@ -1,25 +1,25 @@ -import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters"; -import { HUMAN_TRANSITABLE_BIOMES } from "#app/data/mystery-encounters/mystery-encounters"; +import type { BattleScene } from "#app/battle-scene"; import { BiomeId } from "#enums/biome-id"; -import { MysteryEncounterType } from "#app/enums/mystery-encounter-type"; +import { EggTier } from "#enums/egg-type"; +import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { ATrainersTestEncounter } from "#mystery-encounters/a-trainers-test-encounter"; +import * as EncounterPhaseUtils from "#mystery-encounters/encounter-phase-utils"; +import * as MysteryEncounters from "#mystery-encounters/mystery-encounters"; +import { HUMAN_TRANSITABLE_BIOMES } from "#mystery-encounters/mystery-encounters"; +import { CommandPhase } from "#phases/command-phase"; +import { PartyHealPhase } from "#phases/party-heal-phase"; +import { SelectModifierPhase } from "#phases/select-modifier-phase"; import { runMysteryEncounterToEnd, skipBattleRunMysteryEncounterRewardsPhase, } from "#test/mystery-encounter/encounter-test-utils"; -import type BattleScene from "#app/battle-scene"; -import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { GameManager } from "#test/testUtils/gameManager"; import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils"; -import { ATrainersTestEncounter } from "#app/data/mystery-encounters/encounters/a-trainers-test-encounter"; -import { EggTier } from "#enums/egg-type"; -import { CommandPhase } from "#app/phases/command-phase"; -import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; -import { PartyHealPhase } from "#app/phases/party-heal-phase"; import i18next from "i18next"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; const namespace = "mysteryEncounters/aTrainersTest"; const defaultParty = [SpeciesId.LAPRAS, SpeciesId.GENGAR, SpeciesId.ABRA]; diff --git a/test/mystery-encounter/encounters/absolute-avarice-encounter.test.ts b/test/mystery-encounter/encounters/absolute-avarice-encounter.test.ts index b6c4e4d85fb..969ac812907 100644 --- a/test/mystery-encounter/encounters/absolute-avarice-encounter.test.ts +++ b/test/mystery-encounter/encounters/absolute-avarice-encounter.test.ts @@ -1,25 +1,25 @@ +import type { BattleScene } from "#app/battle-scene"; +import { BerryType } from "#enums/berry-type"; import { BiomeId } from "#enums/biome-id"; -import { MysteryEncounterType } from "#app/enums/mystery-encounter-type"; +import { MoveId } from "#enums/move-id"; +import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { BerryModifier, PokemonHeldItemModifier } from "#modifiers/modifier"; +import { AbsoluteAvariceEncounter } from "#mystery-encounters/absolute-avarice-encounter"; +import * as EncounterPhaseUtils from "#mystery-encounters/encounter-phase-utils"; +import * as MysteryEncounters from "#mystery-encounters/mystery-encounters"; +import { CommandPhase } from "#phases/command-phase"; +import { MovePhase } from "#phases/move-phase"; +import { SelectModifierPhase } from "#phases/select-modifier-phase"; import { runMysteryEncounterToEnd, skipBattleRunMysteryEncounterRewardsPhase, } from "#test/mystery-encounter/encounter-test-utils"; -import type BattleScene from "#app/battle-scene"; -import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters"; -import { BerryModifier, PokemonHeldItemModifier } from "#app/modifier/modifier"; -import { BerryType } from "#enums/berry-type"; -import { AbsoluteAvariceEncounter } from "#app/data/mystery-encounters/encounters/absolute-avarice-encounter"; -import { MoveId } from "#enums/move-id"; -import { CommandPhase } from "#app/phases/command-phase"; -import { MovePhase } from "#app/phases/move-phase"; -import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import i18next from "i18next"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; const namespace = "mysteryEncounters/absoluteAvarice"; const defaultParty = [SpeciesId.LAPRAS, SpeciesId.GENGAR, SpeciesId.ABRA]; diff --git a/test/mystery-encounter/encounters/an-offer-you-cant-refuse-encounter.test.ts b/test/mystery-encounter/encounters/an-offer-you-cant-refuse-encounter.test.ts index 4f986f58b88..97326e89a83 100644 --- a/test/mystery-encounter/encounters/an-offer-you-cant-refuse-encounter.test.ts +++ b/test/mystery-encounter/encounters/an-offer-you-cant-refuse-encounter.test.ts @@ -1,24 +1,24 @@ -import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters"; -import { HUMAN_TRANSITABLE_BIOMES } from "#app/data/mystery-encounters/mystery-encounters"; +import type { BattleScene } from "#app/battle-scene"; +import { AbilityId } from "#enums/ability-id"; import { BiomeId } from "#enums/biome-id"; -import { MysteryEncounterType } from "#app/enums/mystery-encounter-type"; -import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { runMysteryEncounterToEnd } from "#test/mystery-encounter/encounter-test-utils"; -import type BattleScene from "#app/battle-scene"; -import { PokemonMove } from "#app/data/moves/pokemon-move"; -import { AnOfferYouCantRefuseEncounter } from "#app/data/mystery-encounters/encounters/an-offer-you-cant-refuse-encounter"; +import { MoveId } from "#enums/move-id"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { SpeciesId } from "#enums/species-id"; +import { ShinyRateBoosterModifier } from "#modifiers/modifier"; +import { PokemonMove } from "#moves/pokemon-move"; +import { AnOfferYouCantRefuseEncounter } from "#mystery-encounters/an-offer-you-cant-refuse-encounter"; +import * as EncounterPhaseUtils from "#mystery-encounters/encounter-phase-utils"; +import * as MysteryEncounters from "#mystery-encounters/mystery-encounters"; +import { HUMAN_TRANSITABLE_BIOMES } from "#mystery-encounters/mystery-encounters"; +import { SelectModifierPhase } from "#phases/select-modifier-phase"; +import { runMysteryEncounterToEnd } from "#test/mystery-encounter/encounter-test-utils"; +import { GameManager } from "#test/testUtils/gameManager"; import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; -import { MoveId } from "#enums/move-id"; -import { ShinyRateBoosterModifier } from "#app/modifier/modifier"; -import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; import i18next from "i18next"; -import { AbilityId } from "#enums/ability-id"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; const namespace = "mysteryEncounters/anOfferYouCantRefuse"; /** Gyarados for Indimidate */ diff --git a/test/mystery-encounter/encounters/berries-abound-encounter.test.ts b/test/mystery-encounter/encounters/berries-abound-encounter.test.ts index 8c2c6c608cd..5af89ebc02c 100644 --- a/test/mystery-encounter/encounters/berries-abound-encounter.test.ts +++ b/test/mystery-encounter/encounters/berries-abound-encounter.test.ts @@ -1,26 +1,26 @@ -import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters"; +import type { BattleScene } from "#app/battle-scene"; +import { AbilityId } from "#enums/ability-id"; import { BiomeId } from "#enums/biome-id"; -import { MysteryEncounterType } from "#app/enums/mystery-encounter-type"; +import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; +import { UiMode } from "#enums/ui-mode"; +import { BerryModifier } from "#modifiers/modifier"; +import { BerriesAboundEncounter } from "#mystery-encounters/berries-abound-encounter"; +import * as EncounterDialogueUtils from "#mystery-encounters/encounter-dialogue-utils"; +import * as EncounterPhaseUtils from "#mystery-encounters/encounter-phase-utils"; +import * as MysteryEncounters from "#mystery-encounters/mystery-encounters"; +import { CommandPhase } from "#phases/command-phase"; +import { SelectModifierPhase } from "#phases/select-modifier-phase"; import { runMysteryEncounterToEnd, skipBattleRunMysteryEncounterRewardsPhase, } from "#test/mystery-encounter/encounter-test-utils"; -import type BattleScene from "#app/battle-scene"; -import { UiMode } from "#enums/ui-mode"; -import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; -import { BerryModifier } from "#app/modifier/modifier"; -import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { GameManager } from "#test/testUtils/gameManager"; import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils"; -import { BerriesAboundEncounter } from "#app/data/mystery-encounters/encounters/berries-abound-encounter"; -import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import * as EncounterDialogueUtils from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; -import { CommandPhase } from "#app/phases/command-phase"; -import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; -import { AbilityId } from "#enums/ability-id"; +import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; const namespace = "mysteryEncounters/berriesAbound"; const defaultParty = [SpeciesId.PYUKUMUKU, SpeciesId.MAGIKARP, SpeciesId.PIKACHU]; diff --git a/test/mystery-encounter/encounters/bug-type-superfan-encounter.test.ts b/test/mystery-encounter/encounters/bug-type-superfan-encounter.test.ts index 4da8ff7f643..80f4c00c2a6 100644 --- a/test/mystery-encounter/encounters/bug-type-superfan-encounter.test.ts +++ b/test/mystery-encounter/encounters/bug-type-superfan-encounter.test.ts @@ -1,29 +1,29 @@ -import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters"; +import type { BattleScene } from "#app/battle-scene"; import { BiomeId } from "#enums/biome-id"; -import { MysteryEncounterType } from "#app/enums/mystery-encounter-type"; +import { MoveId } from "#enums/move-id"; +import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; +import { TrainerType } from "#enums/trainer-type"; +import { UiMode } from "#enums/ui-mode"; +import { ContactHeldItemTransferChanceModifier } from "#modifiers/modifier"; +import { PokemonMove } from "#moves/pokemon-move"; +import { BugTypeSuperfanEncounter } from "#mystery-encounters/bug-type-superfan-encounter"; +import * as encounterPhaseUtils from "#mystery-encounters/encounter-phase-utils"; +import * as MysteryEncounters from "#mystery-encounters/mystery-encounters"; +import { CommandPhase } from "#phases/command-phase"; +import { MysteryEncounterPhase, MysteryEncounterRewardsPhase } from "#phases/mystery-encounter-phases"; +import { SelectModifierPhase } from "#phases/select-modifier-phase"; import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption, skipBattleRunMysteryEncounterRewardsPhase, } from "#test/mystery-encounter/encounter-test-utils"; -import { MoveId } from "#enums/move-id"; -import type BattleScene from "#app/battle-scene"; -import { PokemonMove } from "#app/data/moves/pokemon-move"; -import { UiMode } from "#enums/ui-mode"; -import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { GameManager } from "#test/testUtils/gameManager"; import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils"; -import { TrainerType } from "#enums/trainer-type"; -import { MysteryEncounterPhase, MysteryEncounterRewardsPhase } from "#app/phases/mystery-encounter-phases"; -import { ContactHeldItemTransferChanceModifier } from "#app/modifier/modifier"; -import { CommandPhase } from "#app/phases/command-phase"; -import { BugTypeSuperfanEncounter } from "#app/data/mystery-encounters/encounters/bug-type-superfan-encounter"; -import * as encounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; -import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; +import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; const namespace = "mysteryEncounters/bugTypeSuperfan"; const defaultParty = [SpeciesId.LAPRAS, SpeciesId.GENGAR, SpeciesId.WEEDLE]; diff --git a/test/mystery-encounter/encounters/clowning-around-encounter.test.ts b/test/mystery-encounter/encounters/clowning-around-encounter.test.ts index 85193d1ec72..af99834d082 100644 --- a/test/mystery-encounter/encounters/clowning-around-encounter.test.ts +++ b/test/mystery-encounter/encounters/clowning-around-encounter.test.ts @@ -1,42 +1,42 @@ -import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters"; +import type { BattleScene } from "#app/battle-scene"; +import * as BattleAnims from "#data/battle-anims"; +import { modifierTypes } from "#data/data-lists"; +import { AbilityId } from "#enums/ability-id"; +import { BerryType } from "#enums/berry-type"; import { BiomeId } from "#enums/biome-id"; -import { MysteryEncounterType } from "#app/enums/mystery-encounter-type"; +import { Button } from "#enums/buttons"; +import { ModifierTier } from "#enums/modifier-tier"; +import { MoveId } from "#enums/move-id"; +import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { PokemonType } from "#enums/pokemon-type"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; -import * as BattleAnims from "#app/data/battle-anims"; -import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { generateModifierType } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { TrainerType } from "#enums/trainer-type"; +import { UiMode } from "#enums/ui-mode"; +import type { Pokemon } from "#field/pokemon"; +import type { PokemonHeldItemModifier } from "#modifiers/modifier"; +import type { PokemonHeldItemModifierType } from "#modifiers/modifier-type"; +import { PokemonMove } from "#moves/pokemon-move"; +import { ClowningAroundEncounter } from "#mystery-encounters/clowning-around-encounter"; +import * as EncounterPhaseUtils from "#mystery-encounters/encounter-phase-utils"; +import { generateModifierType } from "#mystery-encounters/encounter-phase-utils"; +import * as MysteryEncounters from "#mystery-encounters/mystery-encounters"; +import { CommandPhase } from "#phases/command-phase"; +import { MovePhase } from "#phases/move-phase"; +import { PostMysteryEncounterPhase } from "#phases/mystery-encounter-phases"; +import { NewBattlePhase } from "#phases/new-battle-phase"; +import { SelectModifierPhase } from "#phases/select-modifier-phase"; import { runMysteryEncounterToEnd, skipBattleRunMysteryEncounterRewardsPhase, } from "#test/mystery-encounter/encounter-test-utils"; -import { MoveId } from "#enums/move-id"; -import type BattleScene from "#app/battle-scene"; -import type Pokemon from "#app/field/pokemon"; -import { PokemonMove } from "#app/data/moves/pokemon-move"; -import { UiMode } from "#enums/ui-mode"; -import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { GameManager } from "#test/testUtils/gameManager"; import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils"; -import { ModifierTier } from "#enums/modifier-tier"; -import { ClowningAroundEncounter } from "#app/data/mystery-encounters/encounters/clowning-around-encounter"; -import { TrainerType } from "#enums/trainer-type"; -import { AbilityId } from "#enums/ability-id"; -import { PostMysteryEncounterPhase } from "#app/phases/mystery-encounter-phases"; -import { Button } from "#enums/buttons"; -import type PartyUiHandler from "#app/ui/party-ui-handler"; -import type OptionSelectUiHandler from "#app/ui/settings/option-select-ui-handler"; -import type { PokemonHeldItemModifierType } from "#app/modifier/modifier-type"; -import { modifierTypes } from "#app/data/data-lists"; -import { BerryType } from "#enums/berry-type"; -import type { PokemonHeldItemModifier } from "#app/modifier/modifier"; -import { PokemonType } from "#enums/pokemon-type"; -import { CommandPhase } from "#app/phases/command-phase"; -import { MovePhase } from "#app/phases/move-phase"; -import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; -import { NewBattlePhase } from "#app/phases/new-battle-phase"; +import type { OptionSelectUiHandler } from "#ui/option-select-ui-handler"; +import type { PartyUiHandler } from "#ui/party-ui-handler"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; const namespace = "mysteryEncounters/clowningAround"; const defaultParty = [SpeciesId.LAPRAS, SpeciesId.GENGAR, SpeciesId.ABRA]; diff --git a/test/mystery-encounter/encounters/dancing-lessons-encounter.test.ts b/test/mystery-encounter/encounters/dancing-lessons-encounter.test.ts index e47c7cc1a42..8ef499fe7f4 100644 --- a/test/mystery-encounter/encounters/dancing-lessons-encounter.test.ts +++ b/test/mystery-encounter/encounters/dancing-lessons-encounter.test.ts @@ -1,28 +1,28 @@ +import type { BattleScene } from "#app/battle-scene"; import { BiomeId } from "#enums/biome-id"; -import { MysteryEncounterType } from "#app/enums/mystery-encounter-type"; +import { MoveId } from "#enums/move-id"; +import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { UiMode } from "#enums/ui-mode"; +import { PokemonMove } from "#moves/pokemon-move"; +import { DancingLessonsEncounter } from "#mystery-encounters/dancing-lessons-encounter"; +import * as EncounterPhaseUtils from "#mystery-encounters/encounter-phase-utils"; +import * as MysteryEncounters from "#mystery-encounters/mystery-encounters"; +import { CommandPhase } from "#phases/command-phase"; +import { LearnMovePhase } from "#phases/learn-move-phase"; +import { MovePhase } from "#phases/move-phase"; +import { MysteryEncounterPhase } from "#phases/mystery-encounter-phases"; +import { SelectModifierPhase } from "#phases/select-modifier-phase"; import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption, skipBattleRunMysteryEncounterRewardsPhase, } from "#test/mystery-encounter/encounter-test-utils"; -import type BattleScene from "#app/battle-scene"; -import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters"; -import { MoveId } from "#enums/move-id"; -import { DancingLessonsEncounter } from "#app/data/mystery-encounters/encounters/dancing-lessons-encounter"; -import { UiMode } from "#enums/ui-mode"; -import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; -import { PokemonMove } from "#app/data/moves/pokemon-move"; -import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases"; -import { CommandPhase } from "#app/phases/command-phase"; -import { MovePhase } from "#app/phases/move-phase"; -import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; -import { LearnMovePhase } from "#app/phases/learn-move-phase"; +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 namespace = "mysteryEncounters/dancingLessons"; const defaultParty = [SpeciesId.LAPRAS, SpeciesId.GENGAR, SpeciesId.ABRA]; diff --git a/test/mystery-encounter/encounters/delibirdy-encounter.test.ts b/test/mystery-encounter/encounters/delibirdy-encounter.test.ts index 3ef8431cc2c..0fb6d2d09b8 100644 --- a/test/mystery-encounter/encounters/delibirdy-encounter.test.ts +++ b/test/mystery-encounter/encounters/delibirdy-encounter.test.ts @@ -1,19 +1,11 @@ +import type { BattleScene } from "#app/battle-scene"; +import { modifierTypes } from "#data/data-lists"; +import { BerryType } from "#enums/berry-type"; import { BiomeId } from "#enums/biome-id"; -import { MysteryEncounterType } from "#app/enums/mystery-encounter-type"; -import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { - runMysteryEncounterToEnd, - runSelectMysteryEncounterOption, -} from "#test/mystery-encounter/encounter-test-utils"; -import type BattleScene from "#app/battle-scene"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { DelibirdyEncounter } from "#app/data/mystery-encounters/encounters/delibirdy-encounter"; -import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters"; -import type { MoneyRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { SpeciesId } from "#enums/species-id"; import { BerryModifier, HealingBoosterModifier, @@ -23,11 +15,19 @@ import { PokemonInstantReviveModifier, PokemonNatureWeightModifier, PreserveBerryModifier, -} from "#app/modifier/modifier"; -import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases"; -import { generateModifierType } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { modifierTypes } from "#app/data/data-lists"; -import { BerryType } from "#enums/berry-type"; +} from "#modifiers/modifier"; +import { DelibirdyEncounter } from "#mystery-encounters/delibirdy-encounter"; +import * as EncounterPhaseUtils from "#mystery-encounters/encounter-phase-utils"; +import { generateModifierType } from "#mystery-encounters/encounter-phase-utils"; +import type { MoneyRequirement } from "#mystery-encounters/mystery-encounter-requirements"; +import * as MysteryEncounters from "#mystery-encounters/mystery-encounters"; +import { MysteryEncounterPhase } from "#phases/mystery-encounter-phases"; +import { + runMysteryEncounterToEnd, + runSelectMysteryEncounterOption, +} from "#test/mystery-encounter/encounter-test-utils"; +import { GameManager } from "#test/testUtils/gameManager"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; const namespace = "mysteryEncounters/delibirdy"; const defaultParty = [SpeciesId.LAPRAS, SpeciesId.GENGAR, SpeciesId.ABRA]; diff --git a/test/mystery-encounter/encounters/department-store-sale-encounter.test.ts b/test/mystery-encounter/encounters/department-store-sale-encounter.test.ts index a82734d0c03..807526d2683 100644 --- a/test/mystery-encounter/encounters/department-store-sale-encounter.test.ts +++ b/test/mystery-encounter/encounters/department-store-sale-encounter.test.ts @@ -1,19 +1,19 @@ -import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters"; +import type { BattleScene } from "#app/battle-scene"; import { BiomeId } from "#enums/biome-id"; -import { MysteryEncounterType } from "#app/enums/mystery-encounter-type"; -import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { runMysteryEncounterToEnd } from "#test/mystery-encounter/encounter-test-utils"; -import type BattleScene from "#app/battle-scene"; -import { UiMode } from "#enums/ui-mode"; -import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; -import { DepartmentStoreSaleEncounter } from "#app/data/mystery-encounters/encounters/department-store-sale-encounter"; -import { CIVILIZATION_ENCOUNTER_BIOMES } from "#app/data/mystery-encounters/mystery-encounters"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { SpeciesId } from "#enums/species-id"; +import { UiMode } from "#enums/ui-mode"; +import { DepartmentStoreSaleEncounter } from "#mystery-encounters/department-store-sale-encounter"; +import * as EncounterPhaseUtils from "#mystery-encounters/encounter-phase-utils"; +import * as MysteryEncounters from "#mystery-encounters/mystery-encounters"; +import { CIVILIZATION_ENCOUNTER_BIOMES } from "#mystery-encounters/mystery-encounters"; +import { SelectModifierPhase } from "#phases/select-modifier-phase"; +import { runMysteryEncounterToEnd } from "#test/mystery-encounter/encounter-test-utils"; +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 namespace = "mysteryEncounters/departmentStoreSale"; const defaultParty = [SpeciesId.LAPRAS, SpeciesId.GENGAR, SpeciesId.ABRA]; diff --git a/test/mystery-encounter/encounters/field-trip-encounter.test.ts b/test/mystery-encounter/encounters/field-trip-encounter.test.ts index f4b3c52eb65..4390c80d255 100644 --- a/test/mystery-encounter/encounters/field-trip-encounter.test.ts +++ b/test/mystery-encounter/encounters/field-trip-encounter.test.ts @@ -1,20 +1,20 @@ +import type { BattleScene } from "#app/battle-scene"; import { BiomeId } from "#enums/biome-id"; -import { MysteryEncounterType } from "#app/enums/mystery-encounter-type"; -import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { runMysteryEncounterToEnd } from "#test/mystery-encounter/encounter-test-utils"; -import type BattleScene from "#app/battle-scene"; +import { MoveId } from "#enums/move-id"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters"; -import { FieldTripEncounter } from "#app/data/mystery-encounters/encounters/field-trip-encounter"; -import { MoveId } from "#enums/move-id"; -import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { SpeciesId } from "#enums/species-id"; import { UiMode } from "#enums/ui-mode"; -import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; +import * as EncounterPhaseUtils from "#mystery-encounters/encounter-phase-utils"; +import { FieldTripEncounter } from "#mystery-encounters/field-trip-encounter"; +import * as MysteryEncounters from "#mystery-encounters/mystery-encounters"; +import { SelectModifierPhase } from "#phases/select-modifier-phase"; +import { runMysteryEncounterToEnd } from "#test/mystery-encounter/encounter-test-utils"; +import { GameManager } from "#test/testUtils/gameManager"; +import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; import i18next from "i18next"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; const namespace = "mysteryEncounters/fieldTrip"; const defaultParty = [SpeciesId.LAPRAS, SpeciesId.GENGAR, SpeciesId.ABRA]; diff --git a/test/mystery-encounter/encounters/fiery-fallout-encounter.test.ts b/test/mystery-encounter/encounters/fiery-fallout-encounter.test.ts index 16adc47ff11..1fb1cbfdbc8 100644 --- a/test/mystery-encounter/encounters/fiery-fallout-encounter.test.ts +++ b/test/mystery-encounter/encounters/fiery-fallout-encounter.test.ts @@ -1,35 +1,35 @@ -import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters"; +import type { BattleScene } from "#app/battle-scene"; +import * as BattleAnims from "#data/battle-anims"; +import { Gender } from "#data/gender"; +import { Status } from "#data/status-effect"; +import { AbilityId } from "#enums/ability-id"; +import { BattlerTagType } from "#enums/battler-tag-type"; import { BiomeId } from "#enums/biome-id"; +import { MoveId } from "#enums/move-id"; +import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { PokemonType } from "#enums/pokemon-type"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { FieryFalloutEncounter } from "#app/data/mystery-encounters/encounters/fiery-fallout-encounter"; -import { Gender } from "#app/data/gender"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; -import * as BattleAnims from "#app/data/battle-anims"; -import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { StatusEffect } from "#enums/status-effect"; +import { AttackTypeBoosterModifier, PokemonHeldItemModifier } from "#modifiers/modifier"; +import * as EncounterPhaseUtils from "#mystery-encounters/encounter-phase-utils"; +import { FieryFalloutEncounter } from "#mystery-encounters/fiery-fallout-encounter"; +import * as MysteryEncounters from "#mystery-encounters/mystery-encounters"; +import { CommandPhase } from "#phases/command-phase"; +import { MovePhase } from "#phases/move-phase"; +import { MysteryEncounterPhase } from "#phases/mystery-encounter-phases"; +import { SelectModifierPhase } from "#phases/select-modifier-phase"; import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption, skipBattleRunMysteryEncounterRewardsPhase, } from "#test/mystery-encounter/encounter-test-utils"; -import { MoveId } from "#enums/move-id"; -import type BattleScene from "#app/battle-scene"; -import { AttackTypeBoosterModifier, PokemonHeldItemModifier } from "#app/modifier/modifier"; -import { PokemonType } from "#enums/pokemon-type"; -import { Status } from "#app/data/status-effect"; -import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases"; -import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { GameManager } from "#test/testUtils/gameManager"; import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils"; -import { CommandPhase } from "#app/phases/command-phase"; -import { MovePhase } from "#app/phases/move-phase"; -import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; -import { BattlerTagType } from "#enums/battler-tag-type"; -import { AbilityId } from "#enums/ability-id"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; import i18next from "i18next"; -import { StatusEffect } from "#enums/status-effect"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; const namespace = "mysteryEncounters/fieryFallout"; /** Arcanine and Ninetails for 2 Fire types. Lapras, Gengar, Abra for burnable mon. */ diff --git a/test/mystery-encounter/encounters/fight-or-flight-encounter.test.ts b/test/mystery-encounter/encounters/fight-or-flight-encounter.test.ts index 28db869004c..588c126852f 100644 --- a/test/mystery-encounter/encounters/fight-or-flight-encounter.test.ts +++ b/test/mystery-encounter/encounters/fight-or-flight-encounter.test.ts @@ -1,27 +1,27 @@ -import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters"; +import type { BattleScene } from "#app/battle-scene"; import { BiomeId } from "#enums/biome-id"; -import { MysteryEncounterType } from "#app/enums/mystery-encounter-type"; +import { MoveId } from "#enums/move-id"; +import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; +import { UiMode } from "#enums/ui-mode"; +import { PokemonMove } from "#moves/pokemon-move"; +import * as EncounterPhaseUtils from "#mystery-encounters/encounter-phase-utils"; +import { FightOrFlightEncounter } from "#mystery-encounters/fight-or-flight-encounter"; +import * as MysteryEncounters from "#mystery-encounters/mystery-encounters"; +import { CommandPhase } from "#phases/command-phase"; +import { MysteryEncounterPhase } from "#phases/mystery-encounter-phases"; +import { SelectModifierPhase } from "#phases/select-modifier-phase"; import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption, skipBattleRunMysteryEncounterRewardsPhase, } from "#test/mystery-encounter/encounter-test-utils"; -import { MoveId } from "#enums/move-id"; -import type BattleScene from "#app/battle-scene"; -import { PokemonMove } from "#app/data/moves/pokemon-move"; -import { UiMode } from "#enums/ui-mode"; -import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; -import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { GameManager } from "#test/testUtils/gameManager"; import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils"; -import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { FightOrFlightEncounter } from "#app/data/mystery-encounters/encounters/fight-or-flight-encounter"; -import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases"; -import { CommandPhase } from "#app/phases/command-phase"; -import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; +import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; const namespace = "mysteryEncounters/fightOrFlight"; const defaultParty = [SpeciesId.LAPRAS, SpeciesId.GENGAR, SpeciesId.ABRA]; diff --git a/test/mystery-encounter/encounters/fun-and-games-encounter.test.ts b/test/mystery-encounter/encounters/fun-and-games-encounter.test.ts index ae7e269ea00..6a3aa71ad22 100644 --- a/test/mystery-encounter/encounters/fun-and-games-encounter.test.ts +++ b/test/mystery-encounter/encounters/fun-and-games-encounter.test.ts @@ -1,30 +1,30 @@ -import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters"; -import { HUMAN_TRANSITABLE_BIOMES } from "#app/data/mystery-encounters/mystery-encounters"; +import type { BattleScene } from "#app/battle-scene"; import { BiomeId } from "#enums/biome-id"; -import { MysteryEncounterType } from "#app/enums/mystery-encounter-type"; +import { Command } from "#enums/command"; +import { MoveId } from "#enums/move-id"; +import { MoveUseMode } from "#enums/move-use-mode"; +import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { Nature } from "#enums/nature"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; +import { UiMode } from "#enums/ui-mode"; +import * as EncounterPhaseUtils from "#mystery-encounters/encounter-phase-utils"; +import { FunAndGamesEncounter } from "#mystery-encounters/fun-and-games-encounter"; +import { MysteryEncounter } from "#mystery-encounters/mystery-encounter"; +import * as MysteryEncounters from "#mystery-encounters/mystery-encounters"; +import { HUMAN_TRANSITABLE_BIOMES } from "#mystery-encounters/mystery-encounters"; +import { CommandPhase } from "#phases/command-phase"; +import { MysteryEncounterPhase } from "#phases/mystery-encounter-phases"; +import { SelectModifierPhase } from "#phases/select-modifier-phase"; import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption, } from "#test/mystery-encounter/encounter-test-utils"; -import type BattleScene from "#app/battle-scene"; -import { UiMode } from "#enums/ui-mode"; -import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { GameManager } from "#test/testUtils/gameManager"; import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils"; -import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; -import MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; -import { Nature } from "#enums/nature"; -import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases"; -import { CommandPhase } from "#app/phases/command-phase"; -import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; -import { FunAndGamesEncounter } from "#app/data/mystery-encounters/encounters/fun-and-games-encounter"; -import { MoveId } from "#enums/move-id"; -import { Command } from "#enums/command"; -import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { MoveUseMode } from "#enums/move-use-mode"; +import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; const namespace = "mysteryEncounters/funAndGames"; const defaultParty = [SpeciesId.LAPRAS, SpeciesId.GENGAR, SpeciesId.ABRA]; diff --git a/test/mystery-encounter/encounters/global-trade-system-encounter.test.ts b/test/mystery-encounter/encounters/global-trade-system-encounter.test.ts index bb598f4ae6e..2a959df76f2 100644 --- a/test/mystery-encounter/encounters/global-trade-system-encounter.test.ts +++ b/test/mystery-encounter/encounters/global-trade-system-encounter.test.ts @@ -1,24 +1,24 @@ +import type { BattleScene } from "#app/battle-scene"; +import { modifierTypes } from "#data/data-lists"; import { BiomeId } from "#enums/biome-id"; -import { MysteryEncounterType } from "#app/enums/mystery-encounter-type"; -import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { runMysteryEncounterToEnd } from "#test/mystery-encounter/encounter-test-utils"; -import type BattleScene from "#app/battle-scene"; +import { ModifierTier } from "#enums/modifier-tier"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters"; -import { PokemonNatureWeightModifier } from "#app/modifier/modifier"; -import { generateModifierType } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { modifierTypes } from "#app/data/data-lists"; -import { GlobalTradeSystemEncounter } from "#app/data/mystery-encounters/encounters/global-trade-system-encounter"; -import { CIVILIZATION_ENCOUNTER_BIOMES } from "#app/data/mystery-encounters/mystery-encounters"; -import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { SpeciesId } from "#enums/species-id"; import { UiMode } from "#enums/ui-mode"; -import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; -import { ModifierTier } from "#enums/modifier-tier"; -import * as Utils from "#app/utils/common"; +import { PokemonNatureWeightModifier } from "#modifiers/modifier"; +import * as EncounterPhaseUtils from "#mystery-encounters/encounter-phase-utils"; +import { generateModifierType } from "#mystery-encounters/encounter-phase-utils"; +import { GlobalTradeSystemEncounter } from "#mystery-encounters/global-trade-system-encounter"; +import * as MysteryEncounters from "#mystery-encounters/mystery-encounters"; +import { CIVILIZATION_ENCOUNTER_BIOMES } from "#mystery-encounters/mystery-encounters"; +import { SelectModifierPhase } from "#phases/select-modifier-phase"; +import { runMysteryEncounterToEnd } from "#test/mystery-encounter/encounter-test-utils"; +import { GameManager } from "#test/testUtils/gameManager"; +import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; +import * as Utils from "#utils/common"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; const namespace = "mysteryEncounters/globalTradeSystem"; const defaultParty = [SpeciesId.LAPRAS, SpeciesId.GENGAR, SpeciesId.ABRA]; diff --git a/test/mystery-encounter/encounters/lost-at-sea-encounter.test.ts b/test/mystery-encounter/encounters/lost-at-sea-encounter.test.ts index a55806e5f48..2186fe43e23 100644 --- a/test/mystery-encounter/encounters/lost-at-sea-encounter.test.ts +++ b/test/mystery-encounter/encounters/lost-at-sea-encounter.test.ts @@ -1,20 +1,23 @@ -import { LostAtSeaEncounter } from "#app/data/mystery-encounters/encounters/lost-at-sea-encounter"; -import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters"; -import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; +import type { BattleScene } from "#app/battle-scene"; import { BiomeId } from "#enums/biome-id"; -import { MysteryEncounterType } from "#app/enums/mystery-encounter-type"; -import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption } from "../encounter-test-utils"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { SpeciesId } from "#enums/species-id"; +import * as EncounterPhaseUtils from "#mystery-encounters/encounter-phase-utils"; +import { LostAtSeaEncounter } from "#mystery-encounters/lost-at-sea-encounter"; +import * as MysteryEncounters from "#mystery-encounters/mystery-encounters"; +import { MysteryEncounterPhase } from "#phases/mystery-encounter-phases"; +import { PartyExpPhase } from "#phases/party-exp-phase"; +import { + runMysteryEncounterToEnd, + runSelectMysteryEncounterOption, +} from "#test/mystery-encounter/encounter-test-utils"; +import { GameManager } from "#test/testUtils/gameManager"; import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils"; -import type BattleScene from "#app/battle-scene"; -import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases"; -import { PartyExpPhase } from "#app/phases/party-exp-phase"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; import i18next from "i18next"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; const namespace = "mysteryEncounters/lostAtSea"; /** Blastoise for surf. Pidgeot for fly. Abra for none. */ diff --git a/test/mystery-encounter/encounters/mysterious-challengers-encounter.test.ts b/test/mystery-encounter/encounters/mysterious-challengers-encounter.test.ts index 478648d88a7..f6debfaaf58 100644 --- a/test/mystery-encounter/encounters/mysterious-challengers-encounter.test.ts +++ b/test/mystery-encounter/encounters/mysterious-challengers-encounter.test.ts @@ -1,30 +1,29 @@ -import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters"; -import { HUMAN_TRANSITABLE_BIOMES } from "#app/data/mystery-encounters/mystery-encounters"; +import type { BattleScene } from "#app/battle-scene"; import { BiomeId } from "#enums/biome-id"; -import { MysteryEncounterType } from "#app/enums/mystery-encounter-type"; +import { ModifierTier } from "#enums/modifier-tier"; +import { MysteryEncounterMode } from "#enums/mystery-encounter-mode"; +import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { PartyMemberStrength } from "#enums/party-member-strength"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; +import { UiMode } from "#enums/ui-mode"; +import { MysteriousChallengersEncounter } from "#mystery-encounters/mysterious-challengers-encounter"; +import { MysteryEncounter } from "#mystery-encounters/mystery-encounter"; +import * as MysteryEncounters from "#mystery-encounters/mystery-encounters"; +import { HUMAN_TRANSITABLE_BIOMES } from "#mystery-encounters/mystery-encounters"; +import { CommandPhase } from "#phases/command-phase"; +import { SelectModifierPhase } from "#phases/select-modifier-phase"; import { runMysteryEncounterToEnd, skipBattleRunMysteryEncounterRewardsPhase, } from "#test/mystery-encounter/encounter-test-utils"; -import type BattleScene from "#app/battle-scene"; -import { UiMode } from "#enums/ui-mode"; -import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { GameManager } from "#test/testUtils/gameManager"; import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils"; -import { ModifierTier } from "#enums/modifier-tier"; -import { MysteriousChallengersEncounter } from "#app/data/mystery-encounters/encounters/mysterious-challengers-encounter"; -import { TrainerConfig } from "#app/data/trainers/trainer-config"; -import { TrainerPartyCompoundTemplate } from "#app/data/trainers/TrainerPartyTemplate"; -import { TrainerPartyTemplate } from "#app/data/trainers/TrainerPartyTemplate"; -import { PartyMemberStrength } from "#enums/party-member-strength"; -import { MysteryEncounterMode } from "#enums/mystery-encounter-mode"; -import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; -import MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; -import { CommandPhase } from "#app/phases/command-phase"; -import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; +import { TrainerPartyCompoundTemplate, TrainerPartyTemplate } from "#trainers/TrainerPartyTemplate"; +import { TrainerConfig } from "#trainers/trainer-config"; +import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; const namespace = "mysteryEncounters/mysteriousChallengers"; const defaultParty = [SpeciesId.LAPRAS, SpeciesId.GENGAR, SpeciesId.ABRA]; diff --git a/test/mystery-encounter/encounters/part-timer-encounter.test.ts b/test/mystery-encounter/encounters/part-timer-encounter.test.ts index d36b387cae1..1bbda8b77e0 100644 --- a/test/mystery-encounter/encounters/part-timer-encounter.test.ts +++ b/test/mystery-encounter/encounters/part-timer-encounter.test.ts @@ -1,22 +1,22 @@ -import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters"; +import type { BattleScene } from "#app/battle-scene"; import { BiomeId } from "#enums/biome-id"; -import { MysteryEncounterType } from "#app/enums/mystery-encounter-type"; +import { MoveId } from "#enums/move-id"; +import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { PokemonMove } from "#moves/pokemon-move"; +import * as EncounterPhaseUtils from "#mystery-encounters/encounter-phase-utils"; +import * as MysteryEncounters from "#mystery-encounters/mystery-encounters"; +import { CIVILIZATION_ENCOUNTER_BIOMES } from "#mystery-encounters/mystery-encounters"; +import { PartTimerEncounter } from "#mystery-encounters/part-timer-encounter"; +import { MysteryEncounterPhase } from "#phases/mystery-encounter-phases"; import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption, } from "#test/mystery-encounter/encounter-test-utils"; -import type BattleScene from "#app/battle-scene"; -import { CIVILIZATION_ENCOUNTER_BIOMES } from "#app/data/mystery-encounters/mystery-encounters"; -import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { PartTimerEncounter } from "#app/data/mystery-encounters/encounters/part-timer-encounter"; -import { PokemonMove } from "#app/data/moves/pokemon-move"; -import { MoveId } from "#enums/move-id"; -import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases"; +import { GameManager } from "#test/testUtils/gameManager"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; const namespace = "mysteryEncounters/partTimer"; // Pyukumuku for lowest speed, Regieleki for highest speed, Feebas for lowest "bulk", Melmetal for highest "bulk" diff --git a/test/mystery-encounter/encounters/safari-zone.test.ts b/test/mystery-encounter/encounters/safari-zone.test.ts index 7ac26f48e59..252198139df 100644 --- a/test/mystery-encounter/encounters/safari-zone.test.ts +++ b/test/mystery-encounter/encounters/safari-zone.test.ts @@ -1,25 +1,22 @@ -import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters"; +import type { BattleScene } from "#app/battle-scene"; +import { NON_LEGEND_PARADOX_POKEMON } from "#balance/special-species-groups"; import { BiomeId } from "#enums/biome-id"; +import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; +import * as EncounterPhaseUtils from "#mystery-encounters/encounter-phase-utils"; +import { MysteryEncounter } from "#mystery-encounters/mystery-encounter"; +import * as MysteryEncounters from "#mystery-encounters/mystery-encounters"; +import { getSafariSpeciesSpawn, SafariZoneEncounter } from "#mystery-encounters/safari-zone-encounter"; +import { MysteryEncounterPhase } from "#phases/mystery-encounter-phases"; import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption, } from "#test/mystery-encounter/encounter-test-utils"; -import type BattleScene from "#app/battle-scene"; -import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { GameManager } from "#test/testUtils/gameManager"; import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils"; -import MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; -import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases"; -import { - getSafariSpeciesSpawn, - SafariZoneEncounter, -} from "#app/data/mystery-encounters/encounters/safari-zone-encounter"; -import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { NON_LEGEND_PARADOX_POKEMON } from "#app/data/balance/special-species-groups"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; const namespace = "mysteryEncounters/safariZone"; const defaultParty = [SpeciesId.LAPRAS, SpeciesId.GENGAR, SpeciesId.ABRA]; diff --git a/test/mystery-encounter/encounters/teleporting-hijinks-encounter.test.ts b/test/mystery-encounter/encounters/teleporting-hijinks-encounter.test.ts index 2138298ee2b..6ecf3162607 100644 --- a/test/mystery-encounter/encounters/teleporting-hijinks-encounter.test.ts +++ b/test/mystery-encounter/encounters/teleporting-hijinks-encounter.test.ts @@ -1,24 +1,24 @@ -import type BattleScene from "#app/battle-scene"; -import { TeleportingHijinksEncounter } from "#app/data/mystery-encounters/encounters/teleporting-hijinks-encounter"; -import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters"; +import type { BattleScene } from "#app/battle-scene"; import { AbilityId } from "#enums/ability-id"; import { BiomeId } from "#enums/biome-id"; -import { MysteryEncounterType } from "#enums/mystery-encounter-type"; -import { SpeciesId } from "#enums/species-id"; -import { CommandPhase } from "#app/phases/command-phase"; -import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases"; -import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; -import GameManager from "#test/testUtils/gameManager"; -import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; -import { UiMode } from "#enums/ui-mode"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { SpeciesId } from "#enums/species-id"; +import { UiMode } from "#enums/ui-mode"; +import * as MysteryEncounters from "#mystery-encounters/mystery-encounters"; +import { TeleportingHijinksEncounter } from "#mystery-encounters/teleporting-hijinks-encounter"; +import { CommandPhase } from "#phases/command-phase"; +import { MysteryEncounterPhase } from "#phases/mystery-encounter-phases"; +import { SelectModifierPhase } from "#phases/select-modifier-phase"; import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption, skipBattleRunMysteryEncounterRewardsPhase, } from "#test/mystery-encounter/encounter-test-utils"; +import { GameManager } from "#test/testUtils/gameManager"; import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils"; +import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; import i18next from "i18next"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/mystery-encounter/encounters/the-expert-breeder-encounter.test.ts b/test/mystery-encounter/encounters/the-expert-breeder-encounter.test.ts index c9d6f540191..471a26aa532 100644 --- a/test/mystery-encounter/encounters/the-expert-breeder-encounter.test.ts +++ b/test/mystery-encounter/encounters/the-expert-breeder-encounter.test.ts @@ -1,27 +1,27 @@ -import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters"; -import { HUMAN_TRANSITABLE_BIOMES } from "#app/data/mystery-encounters/mystery-encounters"; +import type { BattleScene } from "#app/battle-scene"; +import { FRIENDSHIP_GAIN_FROM_BATTLE } from "#balance/starters"; import { BiomeId } from "#enums/biome-id"; -import { MysteryEncounterType } from "#app/enums/mystery-encounter-type"; +import { EggTier } from "#enums/egg-type"; +import { MysteryEncounterMode } from "#enums/mystery-encounter-mode"; +import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; +import { TrainerType } from "#enums/trainer-type"; +import { MysteryEncounter } from "#mystery-encounters/mystery-encounter"; +import * as MysteryEncounters from "#mystery-encounters/mystery-encounters"; +import { HUMAN_TRANSITABLE_BIOMES } from "#mystery-encounters/mystery-encounters"; +import { TheExpertPokemonBreederEncounter } from "#mystery-encounters/the-expert-pokemon-breeder-encounter"; +import { CommandPhase } from "#phases/command-phase"; +import { PostMysteryEncounterPhase } from "#phases/mystery-encounter-phases"; +import { SelectModifierPhase } from "#phases/select-modifier-phase"; import { runMysteryEncounterToEnd, skipBattleRunMysteryEncounterRewardsPhase, } from "#test/mystery-encounter/encounter-test-utils"; -import type BattleScene from "#app/battle-scene"; -import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { GameManager } from "#test/testUtils/gameManager"; import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils"; -import { MysteryEncounterMode } from "#enums/mystery-encounter-mode"; -import MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; -import { CommandPhase } from "#app/phases/command-phase"; -import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; -import { TheExpertPokemonBreederEncounter } from "#app/data/mystery-encounters/encounters/the-expert-pokemon-breeder-encounter"; -import { TrainerType } from "#enums/trainer-type"; -import { EggTier } from "#enums/egg-type"; -import { PostMysteryEncounterPhase } from "#app/phases/mystery-encounter-phases"; -import { FRIENDSHIP_GAIN_FROM_BATTLE } from "#app/data/balance/starters"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; const namespace = "mysteryEncounters/theExpertPokemonBreeder"; const defaultParty = [SpeciesId.LAPRAS, SpeciesId.GENGAR, SpeciesId.ABRA]; diff --git a/test/mystery-encounter/encounters/the-pokemon-salesman-encounter.test.ts b/test/mystery-encounter/encounters/the-pokemon-salesman-encounter.test.ts index 990e39014e2..81329c5552f 100644 --- a/test/mystery-encounter/encounters/the-pokemon-salesman-encounter.test.ts +++ b/test/mystery-encounter/encounters/the-pokemon-salesman-encounter.test.ts @@ -1,25 +1,25 @@ -import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters"; +import type { BattleScene } from "#app/battle-scene"; +import { NON_LEGEND_PARADOX_POKEMON } from "#balance/special-species-groups"; import { BiomeId } from "#enums/biome-id"; -import { MysteryEncounterType } from "#app/enums/mystery-encounter-type"; +import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import * as EncounterPhaseUtils from "#mystery-encounters/encounter-phase-utils"; +import * as MysteryEncounters from "#mystery-encounters/mystery-encounters"; +import { HUMAN_TRANSITABLE_BIOMES } from "#mystery-encounters/mystery-encounters"; +import { + getSalesmanSpeciesOffer, + ThePokemonSalesmanEncounter, +} from "#mystery-encounters/the-pokemon-salesman-encounter"; +import { MysteryEncounterPhase } from "#phases/mystery-encounter-phases"; import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption, } from "#test/mystery-encounter/encounter-test-utils"; -import type BattleScene from "#app/battle-scene"; -import { HUMAN_TRANSITABLE_BIOMES } from "#app/data/mystery-encounters/mystery-encounters"; -import { - getSalesmanSpeciesOffer, - ThePokemonSalesmanEncounter, -} from "#app/data/mystery-encounters/encounters/the-pokemon-salesman-encounter"; -import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { GameManager } from "#test/testUtils/gameManager"; import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils"; -import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases"; -import { NON_LEGEND_PARADOX_POKEMON } from "#app/data/balance/special-species-groups"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; const namespace = "mysteryEncounters/thePokemonSalesman"; const defaultParty = [SpeciesId.LAPRAS, SpeciesId.GENGAR, SpeciesId.ABRA]; diff --git a/test/mystery-encounter/encounters/the-strong-stuff-encounter.test.ts b/test/mystery-encounter/encounters/the-strong-stuff-encounter.test.ts index c1f13d61817..9a78cd99f93 100644 --- a/test/mystery-encounter/encounters/the-strong-stuff-encounter.test.ts +++ b/test/mystery-encounter/encounters/the-strong-stuff-encounter.test.ts @@ -1,34 +1,34 @@ -import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters"; +import type { BattleScene } from "#app/battle-scene"; +import * as BattleAnims from "#data/battle-anims"; +import { CustomPokemonData } from "#data/pokemon-data"; +import { AbilityId } from "#enums/ability-id"; +import { BattlerTagType } from "#enums/battler-tag-type"; +import { BerryType } from "#enums/berry-type"; import { BiomeId } from "#enums/biome-id"; +import { MoveId } from "#enums/move-id"; +import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { Nature } from "#enums/nature"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; -import * as BattleAnims from "#app/data/battle-anims"; -import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { UiMode } from "#enums/ui-mode"; +import { BerryModifier, PokemonBaseStatTotalModifier } from "#modifiers/modifier"; +import { PokemonMove } from "#moves/pokemon-move"; +import * as EncounterPhaseUtils from "#mystery-encounters/encounter-phase-utils"; +import * as MysteryEncounters from "#mystery-encounters/mystery-encounters"; +import { TheStrongStuffEncounter } from "#mystery-encounters/the-strong-stuff-encounter"; +import { CommandPhase } from "#phases/command-phase"; +import { MovePhase } from "#phases/move-phase"; +import { SelectModifierPhase } from "#phases/select-modifier-phase"; import { runMysteryEncounterToEnd, skipBattleRunMysteryEncounterRewardsPhase, } from "#test/mystery-encounter/encounter-test-utils"; -import { MoveId } from "#enums/move-id"; -import type BattleScene from "#app/battle-scene"; -import { TheStrongStuffEncounter } from "#app/data/mystery-encounters/encounters/the-strong-stuff-encounter"; -import { Nature } from "#enums/nature"; -import { BerryType } from "#enums/berry-type"; -import { BattlerTagType } from "#enums/battler-tag-type"; -import { PokemonMove } from "#app/data/moves/pokemon-move"; -import { UiMode } from "#enums/ui-mode"; -import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; -import { BerryModifier, PokemonBaseStatTotalModifier } from "#app/modifier/modifier"; -import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { GameManager } from "#test/testUtils/gameManager"; import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils"; -import { CustomPokemonData } from "#app/data/pokemon/pokemon-data"; -import { CommandPhase } from "#app/phases/command-phase"; -import { MovePhase } from "#app/phases/move-phase"; -import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; -import { AbilityId } from "#enums/ability-id"; +import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; const namespace = "mysteryEncounters/theStrongStuff"; const defaultParty = [SpeciesId.LAPRAS, SpeciesId.GENGAR, SpeciesId.ABRA]; diff --git a/test/mystery-encounter/encounters/the-winstrate-challenge-encounter.test.ts b/test/mystery-encounter/encounters/the-winstrate-challenge-encounter.test.ts index 012b88bcd73..078b278dd19 100644 --- a/test/mystery-encounter/encounters/the-winstrate-challenge-encounter.test.ts +++ b/test/mystery-encounter/encounters/the-winstrate-challenge-encounter.test.ts @@ -1,31 +1,31 @@ -import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters"; -import { HUMAN_TRANSITABLE_BIOMES } from "#app/data/mystery-encounters/mystery-encounters"; +import type { BattleScene } from "#app/battle-scene"; +import { Status } from "#data/status-effect"; import { BiomeId } from "#enums/biome-id"; -import { MysteryEncounterType } from "#enums/mystery-encounter-type"; -import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { runMysteryEncounterToEnd } from "#test/mystery-encounter/encounter-test-utils"; -import type BattleScene from "#app/battle-scene"; -import { UiMode } from "#enums/ui-mode"; +import { MoveId } from "#enums/move-id"; +import { MysteryEncounterMode } from "#enums/mystery-encounter-mode"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; -import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils"; -import { MysteryEncounterMode } from "#enums/mystery-encounter-mode"; -import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; -import MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; -import { TrainerType } from "#enums/trainer-type"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { Nature } from "#enums/nature"; -import { MoveId } from "#enums/move-id"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; -import { TheWinstrateChallengeEncounter } from "#app/data/mystery-encounters/encounters/the-winstrate-challenge-encounter"; -import { Status } from "#app/data/status-effect"; -import { MysteryEncounterRewardsPhase } from "#app/phases/mystery-encounter-phases"; -import { CommandPhase } from "#app/phases/command-phase"; -import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; -import { PartyHealPhase } from "#app/phases/party-heal-phase"; -import { VictoryPhase } from "#app/phases/victory-phase"; +import { SpeciesId } from "#enums/species-id"; import { StatusEffect } from "#enums/status-effect"; +import { TrainerType } from "#enums/trainer-type"; +import { UiMode } from "#enums/ui-mode"; +import { MysteryEncounter } from "#mystery-encounters/mystery-encounter"; +import * as MysteryEncounters from "#mystery-encounters/mystery-encounters"; +import { HUMAN_TRANSITABLE_BIOMES } from "#mystery-encounters/mystery-encounters"; +import { TheWinstrateChallengeEncounter } from "#mystery-encounters/the-winstrate-challenge-encounter"; +import { CommandPhase } from "#phases/command-phase"; +import { MysteryEncounterRewardsPhase } from "#phases/mystery-encounter-phases"; +import { PartyHealPhase } from "#phases/party-heal-phase"; +import { SelectModifierPhase } from "#phases/select-modifier-phase"; +import { VictoryPhase } from "#phases/victory-phase"; +import { runMysteryEncounterToEnd } from "#test/mystery-encounter/encounter-test-utils"; +import { GameManager } from "#test/testUtils/gameManager"; +import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils"; +import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; const namespace = "mysteryEncounters/theWinstrateChallenge"; const defaultParty = [SpeciesId.LAPRAS, SpeciesId.GENGAR, SpeciesId.ABRA]; diff --git a/test/mystery-encounter/encounters/trash-to-treasure-encounter.test.ts b/test/mystery-encounter/encounters/trash-to-treasure-encounter.test.ts index 9ab5f16d1b9..48b6ce79488 100644 --- a/test/mystery-encounter/encounters/trash-to-treasure-encounter.test.ts +++ b/test/mystery-encounter/encounters/trash-to-treasure-encounter.test.ts @@ -1,37 +1,37 @@ -import type BattleScene from "#app/battle-scene"; -import * as BattleAnims from "#app/data/battle-anims"; -import { TrashToTreasureEncounter } from "#app/data/mystery-encounters/encounters/trash-to-treasure-encounter"; -import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters"; -import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import type { BattleScene } from "#app/battle-scene"; +import * as BattleAnims from "#data/battle-anims"; +import { modifierTypes } from "#data/data-lists"; +import { BiomeId } from "#enums/biome-id"; +import { ModifierTier } from "#enums/modifier-tier"; +import { MoveId } from "#enums/move-id"; +import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { SpeciesId } from "#enums/species-id"; +import { UiMode } from "#enums/ui-mode"; +import { HealShopCostModifier, HitHealModifier, TurnHealModifier } from "#modifiers/modifier"; +import type { PokemonHeldItemModifierType } from "#modifiers/modifier-type"; +import { PokemonMove } from "#moves/pokemon-move"; +import * as EncounterPhaseUtils from "#mystery-encounters/encounter-phase-utils"; import { type EnemyPartyConfig, type EnemyPokemonConfig, generateModifierType, -} from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; -import { BiomeId } from "#enums/biome-id"; -import { MysteryEncounterType } from "#app/enums/mystery-encounter-type"; -import { SpeciesId } from "#enums/species-id"; -import { PokemonMove } from "#app/data/moves/pokemon-move"; -import { HealShopCostModifier, HitHealModifier, TurnHealModifier } from "#app/modifier/modifier"; -import { ModifierTier } from "#enums/modifier-tier"; -import type { PokemonHeldItemModifierType } from "#app/modifier/modifier-type"; -import { modifierTypes } from "#app/data/data-lists"; -import { CommandPhase } from "#app/phases/command-phase"; -import { MovePhase } from "#app/phases/move-phase"; -import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; -import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; -import { UiMode } from "#enums/ui-mode"; -import * as Utils from "#app/utils/common"; -import { MoveId } from "#enums/move-id"; -import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +} from "#mystery-encounters/encounter-phase-utils"; +import * as MysteryEncounters from "#mystery-encounters/mystery-encounters"; +import { TrashToTreasureEncounter } from "#mystery-encounters/trash-to-treasure-encounter"; +import { CommandPhase } from "#phases/command-phase"; +import { MovePhase } from "#phases/move-phase"; +import { SelectModifierPhase } from "#phases/select-modifier-phase"; import { runMysteryEncounterToEnd, skipBattleRunMysteryEncounterRewardsPhase, } from "#test/mystery-encounter/encounter-test-utils"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils"; +import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; +import * as Utils from "#utils/common"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; const namespace = "mysteryEncounters/trashToTreasure"; diff --git a/test/mystery-encounter/encounters/uncommon-breed-encounter.test.ts b/test/mystery-encounter/encounters/uncommon-breed-encounter.test.ts index ec64a17d291..a9ebfda496a 100644 --- a/test/mystery-encounter/encounters/uncommon-breed-encounter.test.ts +++ b/test/mystery-encounter/encounters/uncommon-breed-encounter.test.ts @@ -1,33 +1,33 @@ -import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters"; +import type { BattleScene } from "#app/battle-scene"; +import { speciesEggMoves } from "#balance/egg-moves"; +import { modifierTypes } from "#data/data-lists"; +import { AbilityId } from "#enums/ability-id"; +import { BerryType } from "#enums/berry-type"; import { BiomeId } from "#enums/biome-id"; -import { MysteryEncounterType } from "#app/enums/mystery-encounter-type"; +import { MoveId } from "#enums/move-id"; +import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; +import { Stat } from "#enums/stat"; +import type { BerryModifier } from "#modifiers/modifier"; +import { PokemonMove } from "#moves/pokemon-move"; +import * as EncounterPhaseUtils from "#mystery-encounters/encounter-phase-utils"; +import { generateModifierType } from "#mystery-encounters/encounter-phase-utils"; +import * as MysteryEncounters from "#mystery-encounters/mystery-encounters"; +import { UncommonBreedEncounter } from "#mystery-encounters/uncommon-breed-encounter"; +import { CommandPhase } from "#phases/command-phase"; +import { MovePhase } from "#phases/move-phase"; +import { MysteryEncounterPhase } from "#phases/mystery-encounter-phases"; +import { StatStageChangePhase } from "#phases/stat-stage-change-phase"; import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption, } from "#test/mystery-encounter/encounter-test-utils"; -import { MoveId } from "#enums/move-id"; -import type BattleScene from "#app/battle-scene"; -import { PokemonMove } from "#app/data/moves/pokemon-move"; -import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { GameManager } from "#test/testUtils/gameManager"; import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils"; -import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { generateModifierType } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases"; -import { CommandPhase } from "#app/phases/command-phase"; -import { UncommonBreedEncounter } from "#app/data/mystery-encounters/encounters/uncommon-breed-encounter"; -import { MovePhase } from "#app/phases/move-phase"; -import { speciesEggMoves } from "#app/data/balance/egg-moves"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; -import { BerryType } from "#enums/berry-type"; -import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase"; -import { Stat } from "#enums/stat"; -import type { BerryModifier } from "#app/modifier/modifier"; -import { modifierTypes } from "#app/data/data-lists"; -import { AbilityId } from "#enums/ability-id"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; const namespace = "mysteryEncounters/uncommonBreed"; const defaultParty = [SpeciesId.LAPRAS, SpeciesId.GENGAR, SpeciesId.ABRA]; diff --git a/test/mystery-encounter/encounters/weird-dream-encounter.test.ts b/test/mystery-encounter/encounters/weird-dream-encounter.test.ts index 475d5cc3c6e..f68818bbfe4 100644 --- a/test/mystery-encounter/encounters/weird-dream-encounter.test.ts +++ b/test/mystery-encounter/encounters/weird-dream-encounter.test.ts @@ -1,25 +1,25 @@ -import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters"; +import type { BattleScene } from "#app/battle-scene"; import { BiomeId } from "#enums/biome-id"; -import { MysteryEncounterType } from "#app/enums/mystery-encounter-type"; +import { ModifierTier } from "#enums/modifier-tier"; +import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { UiMode } from "#enums/ui-mode"; +import * as EncounterPhaseUtils from "#mystery-encounters/encounter-phase-utils"; +import * as EncounterTransformationSequence from "#mystery-encounters/encounter-transformation-sequence"; +import * as MysteryEncounters from "#mystery-encounters/mystery-encounters"; +import { WeirdDreamEncounter } from "#mystery-encounters/weird-dream-encounter"; +import { CommandPhase } from "#phases/command-phase"; +import { SelectModifierPhase } from "#phases/select-modifier-phase"; import { runMysteryEncounterToEnd, skipBattleRunMysteryEncounterRewardsPhase, } from "#test/mystery-encounter/encounter-test-utils"; -import type BattleScene from "#app/battle-scene"; -import { UiMode } from "#enums/ui-mode"; -import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; -import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; -import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { GameManager } from "#test/testUtils/gameManager"; import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils"; -import { WeirdDreamEncounter } from "#app/data/mystery-encounters/encounters/weird-dream-encounter"; -import * as EncounterTransformationSequence from "#app/data/mystery-encounters/utils/encounter-transformation-sequence"; -import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; -import { CommandPhase } from "#app/phases/command-phase"; -import { ModifierTier } from "#enums/modifier-tier"; +import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; const namespace = "mysteryEncounters/weirdDream"; const defaultParty = [SpeciesId.MAGBY, SpeciesId.HAUNTER, SpeciesId.ABRA]; diff --git a/test/mystery-encounter/mystery-encounter-utils.test.ts b/test/mystery-encounter/mystery-encounter-utils.test.ts index b775ce8df60..745b11b7e73 100644 --- a/test/mystery-encounter/mystery-encounter-utils.test.ts +++ b/test/mystery-encounter/mystery-encounter-utils.test.ts @@ -1,26 +1,26 @@ -import type BattleScene from "#app/battle-scene"; -import { speciesStarterCosts } from "#app/data/balance/starters"; -import MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; +import type { BattleScene } from "#app/battle-scene"; +import { speciesStarterCosts } from "#balance/starters"; +import { PokemonType } from "#enums/pokemon-type"; +import { SpeciesId } from "#enums/species-id"; +import { StatusEffect } from "#enums/status-effect"; import { getEncounterText, queueEncounterMessage, showEncounterDialogue, showEncounterText, -} from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; +} from "#mystery-encounters/encounter-dialogue-utils"; import { getHighestLevelPlayerPokemon, getLowestLevelPlayerPokemon, getRandomPlayerPokemon, getRandomSpeciesByStarterCost, koPlayerPokemon, -} from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; -import { PokemonType } from "#enums/pokemon-type"; -import { MessagePhase } from "#app/phases/message-phase"; -import GameManager from "#test/testUtils/gameManager"; -import { SpeciesId } from "#enums/species-id"; -import { StatusEffect } from "#enums/status-effect"; +} from "#mystery-encounters/encounter-pokemon-utils"; +import { MysteryEncounter } from "#mystery-encounters/mystery-encounter"; +import { MessagePhase } from "#phases/message-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/mystery-encounter/mystery-encounter.test.ts b/test/mystery-encounter/mystery-encounter.test.ts index be1f153f8b1..c8ac7078788 100644 --- a/test/mystery-encounter/mystery-encounter.test.ts +++ b/test/mystery-encounter/mystery-encounter.test.ts @@ -1,10 +1,10 @@ -import { afterEach, beforeAll, beforeEach, expect, describe, it } from "vitest"; -import GameManager from "#test/testUtils/gameManager"; -import Phaser from "phaser"; -import { SpeciesId } from "#enums/species-id"; -import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases"; +import type { BattleScene } from "#app/battle-scene"; import { MysteryEncounterType } from "#enums/mystery-encounter-type"; -import type BattleScene from "#app/battle-scene"; +import { SpeciesId } from "#enums/species-id"; +import { MysteryEncounterPhase } from "#phases/mystery-encounter-phases"; +import { GameManager } from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; describe("Mystery Encounters", () => { let phaserGame: Phaser.Game; diff --git a/test/phases/form-change-phase.test.ts b/test/phases/form-change-phase.test.ts index b025f72f5e4..4d3af280043 100644 --- a/test/phases/form-change-phase.test.ts +++ b/test/phases/form-change-phase.test.ts @@ -1,12 +1,12 @@ +import { modifierTypes } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; +import { PokemonType } from "#enums/pokemon-type"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { generateModifierType } from "#mystery-encounters/encounter-phase-utils"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import { PokemonType } from "#enums/pokemon-type"; -import { generateModifierType } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { modifierTypes } from "#app/data/data-lists"; describe("Form Change Phase", () => { let phaserGame: Phaser.Game; diff --git a/test/phases/frenzy-move-reset.test.ts b/test/phases/frenzy-move-reset.test.ts index 9c59e1da968..c922a121526 100644 --- a/test/phases/frenzy-move-reset.test.ts +++ b/test/phases/frenzy-move-reset.test.ts @@ -1,12 +1,12 @@ -import { BattlerIndex } from "#enums/battler-index"; import { AbilityId } from "#enums/ability-id"; +import { BattlerIndex } from "#enums/battler-index"; import { BattlerTagType } from "#enums/battler-tag-type"; -import { StatusEffect } from "#enums/status-effect"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { StatusEffect } from "#enums/status-effect"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; describe("Frenzy Move Reset", () => { let phaserGame: Phaser.Game; diff --git a/test/phases/game-over-phase.test.ts b/test/phases/game-over-phase.test.ts index 008f9fb68e8..d679b812fc0 100644 --- a/test/phases/game-over-phase.test.ts +++ b/test/phases/game-over-phase.test.ts @@ -1,12 +1,12 @@ -import { BiomeId } from "#enums/biome-id"; import { AbilityId } from "#enums/ability-id"; +import { BiomeId } from "#enums/biome-id"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { Unlockables } from "#enums/unlockables"; +import { achvs } from "#system/achv"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { achvs } from "#app/system/achv"; -import { Unlockables } from "#enums/unlockables"; describe("Game Over Phase", () => { let phaserGame: Phaser.Game; diff --git a/test/phases/learn-move-phase.test.ts b/test/phases/learn-move-phase.test.ts index 88b8187069b..b7e7175a46c 100644 --- a/test/phases/learn-move-phase.test.ts +++ b/test/phases/learn-move-phase.test.ts @@ -1,11 +1,11 @@ -import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import Phaser from "phaser"; -import GameManager from "#test/testUtils/gameManager"; -import { SpeciesId } from "#enums/species-id"; +import { Button } from "#enums/buttons"; import { MoveId } from "#enums/move-id"; -import { LearnMovePhase } from "#app/phases/learn-move-phase"; +import { SpeciesId } from "#enums/species-id"; import { UiMode } from "#enums/ui-mode"; -import { Button } from "#app/enums/buttons"; +import { LearnMovePhase } from "#phases/learn-move-phase"; +import { GameManager } from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; describe("Learn Move Phase", () => { let phaserGame: Phaser.Game; diff --git a/test/phases/mystery-encounter-phase.test.ts b/test/phases/mystery-encounter-phase.test.ts index b17682d6c74..3c41028e4b7 100644 --- a/test/phases/mystery-encounter-phase.test.ts +++ b/test/phases/mystery-encounter-phase.test.ts @@ -1,15 +1,15 @@ -import { afterEach, beforeAll, beforeEach, expect, describe, it, vi } from "vitest"; -import GameManager from "#test/testUtils/gameManager"; -import Phaser from "phaser"; -import { SpeciesId } from "#enums/species-id"; -import { MysteryEncounterOptionSelectedPhase, MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases"; -import { UiMode } from "#enums/ui-mode"; import { Button } from "#enums/buttons"; -import type MysteryEncounterUiHandler from "#app/ui/mystery-encounter-ui-handler"; -import { MysteryEncounterType } from "#enums/mystery-encounter-type"; -import type MessageUiHandler from "#app/ui/message-ui-handler"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; +import { MysteryEncounterType } from "#enums/mystery-encounter-type"; +import { SpeciesId } from "#enums/species-id"; +import { UiMode } from "#enums/ui-mode"; +import { MysteryEncounterOptionSelectedPhase, MysteryEncounterPhase } from "#phases/mystery-encounter-phases"; +import { GameManager } from "#test/testUtils/gameManager"; +import type { MessageUiHandler } from "#ui/message-ui-handler"; +import type { MysteryEncounterUiHandler } from "#ui/mystery-encounter-ui-handler"; import i18next from "i18next"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; describe("Mystery Encounter Phases", () => { let phaserGame: Phaser.Game; diff --git a/test/phases/phases.test.ts b/test/phases/phases.test.ts index 9d1c1804615..daa63fe2adc 100644 --- a/test/phases/phases.test.ts +++ b/test/phases/phases.test.ts @@ -1,9 +1,9 @@ -import type BattleScene from "#app/battle-scene"; -import { LoginPhase } from "#app/phases/login-phase"; -import { TitlePhase } from "#app/phases/title-phase"; -import { UnavailablePhase } from "#app/phases/unavailable-phase"; +import type { BattleScene } from "#app/battle-scene"; import { UiMode } from "#enums/ui-mode"; -import GameManager from "#test/testUtils/gameManager"; +import { LoginPhase } from "#phases/login-phase"; +import { TitlePhase } from "#phases/title-phase"; +import { UnavailablePhase } from "#phases/unavailable-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/phases/select-modifier-phase.test.ts b/test/phases/select-modifier-phase.test.ts index b6c3089e236..565fbe8e439 100644 --- a/test/phases/select-modifier-phase.test.ts +++ b/test/phases/select-modifier-phase.test.ts @@ -1,20 +1,20 @@ -import type BattleScene from "#app/battle-scene"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; -import { PlayerPokemon } from "#app/field/pokemon"; -import { ModifierTier } from "#enums/modifier-tier"; -import type { CustomModifierSettings } from "#app/modifier/modifier-type"; -import { ModifierTypeOption } from "#app/modifier/modifier-type"; -import { modifierTypes } from "#app/data/data-lists"; -import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; -import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; -import { UiMode } from "#enums/ui-mode"; -import { shiftCharCodes } from "#app/utils/common"; +import type { BattleScene } from "#app/battle-scene"; +import { modifierTypes } from "#data/data-lists"; import { AbilityId } from "#enums/ability-id"; import { Button } from "#enums/buttons"; +import { ModifierTier } from "#enums/modifier-tier"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { UiMode } from "#enums/ui-mode"; +import { PlayerPokemon } from "#field/pokemon"; +import type { CustomModifierSettings } from "#modifiers/modifier-type"; +import { ModifierTypeOption } from "#modifiers/modifier-type"; +import { SelectModifierPhase } from "#phases/select-modifier-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils"; +import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; +import { shiftCharCodes } from "#utils/common"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/plugins/api/pokerogue-account-api.test.ts b/test/plugins/api/pokerogue-account-api.test.ts index 3c37451960a..578b6ba041a 100644 --- a/test/plugins/api/pokerogue-account-api.test.ts +++ b/test/plugins/api/pokerogue-account-api.test.ts @@ -1,13 +1,13 @@ -import type { AccountInfoResponse } from "#app/@types/PokerogueAccountApi"; +import { PokerogueAccountApi } from "#api/pokerogue-account-api"; import { SESSION_ID_COOKIE_NAME } from "#app/constants"; -import { PokerogueAccountApi } from "#app/plugins/api/pokerogue-account-api"; -import { getApiBaseUrl } from "#test/testUtils/testUtils"; -import * as CookieUtils from "#app/utils/cookies"; -import * as cookies from "#app/utils/cookies"; -import { http, HttpResponse } from "msw"; -import { beforeAll, afterEach, beforeEach, describe, expect, it, vi } from "vitest"; import { initServerForApiTests } from "#test/testUtils/testFileInitialization"; +import { getApiBaseUrl } from "#test/testUtils/testUtils"; +import type { AccountInfoResponse } from "#types/PokerogueAccountApi"; +import * as CookieUtils from "#utils/cookies"; +import * as cookies from "#utils/cookies"; +import { HttpResponse, http } from "msw"; import type { SetupServerApi } from "msw/node"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; const apiBase = getApiBaseUrl(); const accountApi = new PokerogueAccountApi(apiBase); diff --git a/test/plugins/api/pokerogue-admin-api.test.ts b/test/plugins/api/pokerogue-admin-api.test.ts index 08c4cf0dc45..e36f45801b6 100644 --- a/test/plugins/api/pokerogue-admin-api.test.ts +++ b/test/plugins/api/pokerogue-admin-api.test.ts @@ -1,3 +1,6 @@ +import { PokerogueAdminApi } from "#api/pokerogue-admin-api"; +import { initServerForApiTests } from "#test/testUtils/testFileInitialization"; +import { getApiBaseUrl } from "#test/testUtils/testUtils"; import type { LinkAccountToDiscordIdRequest, LinkAccountToGoogledIdRequest, @@ -5,13 +8,10 @@ import type { SearchAccountResponse, UnlinkAccountFromDiscordIdRequest, UnlinkAccountFromGoogledIdRequest, -} from "#app/@types/PokerogueAdminApi"; -import { PokerogueAdminApi } from "#app/plugins/api/pokerogue-admin-api"; -import { getApiBaseUrl } from "#test/testUtils/testUtils"; -import { http, HttpResponse } from "msw"; -import { beforeAll, afterEach, beforeEach, describe, expect, it, vi } from "vitest"; -import { initServerForApiTests } from "#test/testUtils/testFileInitialization"; +} from "#types/PokerogueAdminApi"; +import { HttpResponse, http } from "msw"; import type { SetupServerApi } from "msw/node"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; const apiBase = getApiBaseUrl(); const adminApi = new PokerogueAdminApi(apiBase); diff --git a/test/plugins/api/pokerogue-api.test.ts b/test/plugins/api/pokerogue-api.test.ts index c53a38e23ab..b9ebbe0f685 100644 --- a/test/plugins/api/pokerogue-api.test.ts +++ b/test/plugins/api/pokerogue-api.test.ts @@ -1,10 +1,10 @@ -import type { TitleStatsResponse } from "#app/@types/PokerogueApi"; -import { pokerogueApi } from "#app/plugins/api/pokerogue-api"; -import { getApiBaseUrl } from "#test/testUtils/testUtils"; -import { http, HttpResponse } from "msw"; -import { beforeAll, afterEach, beforeEach, describe, expect, it, vi } from "vitest"; +import { pokerogueApi } from "#api/pokerogue-api"; import { initServerForApiTests } from "#test/testUtils/testFileInitialization"; +import { getApiBaseUrl } from "#test/testUtils/testUtils"; +import type { TitleStatsResponse } from "#types/PokerogueApi"; +import { HttpResponse, http } from "msw"; import type { SetupServerApi } from "msw/node"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; const apiBase = getApiBaseUrl(); let server: SetupServerApi; diff --git a/test/plugins/api/pokerogue-daily-api.test.ts b/test/plugins/api/pokerogue-daily-api.test.ts index 563e6d09009..6399c80781e 100644 --- a/test/plugins/api/pokerogue-daily-api.test.ts +++ b/test/plugins/api/pokerogue-daily-api.test.ts @@ -1,11 +1,11 @@ -import type { GetDailyRankingsPageCountRequest, GetDailyRankingsRequest } from "#app/@types/PokerogueDailyApi"; -import { PokerogueDailyApi } from "#app/plugins/api/pokerogue-daily-api"; -import { getApiBaseUrl } from "#test/testUtils/testUtils"; -import { ScoreboardCategory, type RankingEntry } from "#app/ui/daily-run-scoreboard"; -import { http, HttpResponse } from "msw"; -import { beforeAll, afterEach, beforeEach, describe, expect, it, vi } from "vitest"; +import { PokerogueDailyApi } from "#api/pokerogue-daily-api"; import { initServerForApiTests } from "#test/testUtils/testFileInitialization"; +import { getApiBaseUrl } from "#test/testUtils/testUtils"; +import type { GetDailyRankingsPageCountRequest, GetDailyRankingsRequest } from "#types/PokerogueDailyApi"; +import { type RankingEntry, ScoreboardCategory } from "#ui/daily-run-scoreboard"; +import { HttpResponse, http } from "msw"; import type { SetupServerApi } from "msw/node"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; const apiBase = getApiBaseUrl(); const dailyApi = new PokerogueDailyApi(apiBase); diff --git a/test/plugins/api/pokerogue-savedata-api.test.ts b/test/plugins/api/pokerogue-savedata-api.test.ts index 481ba62c19d..d465759bdfc 100644 --- a/test/plugins/api/pokerogue-savedata-api.test.ts +++ b/test/plugins/api/pokerogue-savedata-api.test.ts @@ -1,10 +1,10 @@ -import type { UpdateAllSavedataRequest } from "#app/@types/PokerogueSavedataApi"; -import { PokerogueSavedataApi } from "#app/plugins/api/pokerogue-savedata-api"; -import { getApiBaseUrl } from "#test/testUtils/testUtils"; -import { http, HttpResponse } from "msw"; -import { beforeAll, afterEach, beforeEach, describe, expect, it, vi } from "vitest"; +import { PokerogueSavedataApi } from "#api/pokerogue-savedata-api"; import { initServerForApiTests } from "#test/testUtils/testFileInitialization"; +import { getApiBaseUrl } from "#test/testUtils/testUtils"; +import type { UpdateAllSavedataRequest } from "#types/PokerogueSavedataApi"; +import { HttpResponse, http } from "msw"; import type { SetupServerApi } from "msw/node"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; const apiBase = getApiBaseUrl(); const savedataApi = new PokerogueSavedataApi(apiBase); diff --git a/test/plugins/api/pokerogue-session-savedata-api.test.ts b/test/plugins/api/pokerogue-session-savedata-api.test.ts index 4d4774f2283..e95697ab72e 100644 --- a/test/plugins/api/pokerogue-session-savedata-api.test.ts +++ b/test/plugins/api/pokerogue-session-savedata-api.test.ts @@ -1,3 +1,7 @@ +import { PokerogueSessionSavedataApi } from "#api/pokerogue-session-savedata-api"; +import type { SessionSaveData } from "#system/game-data"; +import { initServerForApiTests } from "#test/testUtils/testFileInitialization"; +import { getApiBaseUrl } from "#test/testUtils/testUtils"; import type { ClearSessionSavedataRequest, ClearSessionSavedataResponse, @@ -5,14 +9,10 @@ import type { GetSessionSavedataRequest, NewClearSessionSavedataRequest, UpdateSessionSavedataRequest, -} from "#app/@types/PokerogueSessionSavedataApi"; -import { PokerogueSessionSavedataApi } from "#app/plugins/api/pokerogue-session-savedata-api"; -import type { SessionSaveData } from "#app/system/game-data"; -import { getApiBaseUrl } from "#test/testUtils/testUtils"; -import { http, HttpResponse } from "msw"; -import { beforeAll, afterEach, beforeEach, describe, expect, it, vi } from "vitest"; -import { initServerForApiTests } from "#test/testUtils/testFileInitialization"; +} from "#types/PokerogueSessionSavedataApi"; +import { HttpResponse, http } from "msw"; import type { SetupServerApi } from "msw/node"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; const apiBase = getApiBaseUrl(); const sessionSavedataApi = new PokerogueSessionSavedataApi(apiBase); diff --git a/test/plugins/api/pokerogue-system-savedata-api.test.ts b/test/plugins/api/pokerogue-system-savedata-api.test.ts index 0c69ab8f922..0bec6dae16b 100644 --- a/test/plugins/api/pokerogue-system-savedata-api.test.ts +++ b/test/plugins/api/pokerogue-system-savedata-api.test.ts @@ -1,16 +1,16 @@ +import { PokerogueSystemSavedataApi } from "#api/pokerogue-system-savedata-api"; +import type { SystemSaveData } from "#system/game-data"; +import { initServerForApiTests } from "#test/testUtils/testFileInitialization"; +import { getApiBaseUrl } from "#test/testUtils/testUtils"; import type { GetSystemSavedataRequest, UpdateSystemSavedataRequest, VerifySystemSavedataRequest, VerifySystemSavedataResponse, -} from "#app/@types/PokerogueSystemSavedataApi"; -import { PokerogueSystemSavedataApi } from "#app/plugins/api/pokerogue-system-savedata-api"; -import type { SystemSaveData } from "#app/system/game-data"; -import { initServerForApiTests } from "#test/testUtils/testFileInitialization"; -import { getApiBaseUrl } from "#test/testUtils/testUtils"; -import { http, HttpResponse } from "msw"; -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; +} from "#types/PokerogueSystemSavedataApi"; +import { HttpResponse, http } from "msw"; import type { SetupServerApi } from "msw/node"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; const apiBase = getApiBaseUrl(); const systemSavedataApi = new PokerogueSystemSavedataApi(getApiBaseUrl()); diff --git a/test/reload.test.ts b/test/reload.test.ts index 8e39df23f47..a1cdfcb392a 100644 --- a/test/reload.test.ts +++ b/test/reload.test.ts @@ -1,13 +1,13 @@ -import { GameModes } from "#enums/game-modes"; -import { pokerogueApi } from "#app/plugins/api/pokerogue-api"; -import type OptionSelectUiHandler from "#app/ui/settings/option-select-ui-handler"; -import { UiMode } from "#enums/ui-mode"; +import { pokerogueApi } from "#api/pokerogue-api"; import { BiomeId } from "#enums/biome-id"; import { Button } from "#enums/buttons"; +import { GameModes } from "#enums/game-modes"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { UiMode } from "#enums/ui-mode"; +import { GameManager } from "#test/testUtils/gameManager"; import type { MockClock } from "#test/testUtils/mocks/mockClock"; +import type { OptionSelectUiHandler } from "#ui/option-select-ui-handler"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; describe("Reload", () => { diff --git a/test/settingMenu/helpers/inGameManip.ts b/test/settingMenu/helpers/inGameManip.ts index ca1fac3bc65..c19c6745300 100644 --- a/test/settingMenu/helpers/inGameManip.ts +++ b/test/settingMenu/helpers/inGameManip.ts @@ -1,5 +1,5 @@ -import { getIconForLatestInput, getSettingNameWithKeycode } from "#app/configs/inputs/configHandler"; -import { SettingKeyboard } from "#app/system/settings/settings-keyboard"; +import { getIconForLatestInput, getSettingNameWithKeycode } from "#inputs/configHandler"; +import { SettingKeyboard } from "#system/settings-keyboard"; import { expect } from "vitest"; export class InGameManip { diff --git a/test/settingMenu/helpers/menuManip.ts b/test/settingMenu/helpers/menuManip.ts index 1ddd842c864..37c0f823559 100644 --- a/test/settingMenu/helpers/menuManip.ts +++ b/test/settingMenu/helpers/menuManip.ts @@ -9,8 +9,8 @@ import { getKeyWithKeycode, getKeyWithSettingName, getSettingNameWithKeycode, -} from "#app/configs/inputs/configHandler"; -import { SettingKeyboard } from "#app/system/settings/settings-keyboard"; +} from "#inputs/configHandler"; +import { SettingKeyboard } from "#system/settings-keyboard"; import { expect } from "vitest"; export class MenuManip { diff --git a/test/settingMenu/rebinding_setting.test.ts b/test/settingMenu/rebinding_setting.test.ts index 20a1fe51484..b738861c1ee 100644 --- a/test/settingMenu/rebinding_setting.test.ts +++ b/test/settingMenu/rebinding_setting.test.ts @@ -1,12 +1,12 @@ -import cfg_keyboard_qwerty from "#app/configs/inputs/cfg_keyboard_qwerty"; -import { getKeyWithKeycode, getKeyWithSettingName } from "#app/configs/inputs/configHandler"; import type { InterfaceConfig } from "#app/inputs-controller"; -import { SettingKeyboard } from "#app/system/settings/settings-keyboard"; -import { deepCopy } from "#app/utils/data"; import { Button } from "#enums/buttons"; import { Device } from "#enums/devices"; +import cfg_keyboard_qwerty from "#inputs/cfg_keyboard_qwerty"; +import { getKeyWithKeycode, getKeyWithSettingName } from "#inputs/configHandler"; +import { SettingKeyboard } from "#system/settings-keyboard"; import { InGameManip } from "#test/settingMenu/helpers/inGameManip"; import { MenuManip } from "#test/settingMenu/helpers/menuManip"; +import { deepCopy } from "#utils/data"; import { beforeEach, describe, expect, it } from "vitest"; describe("Test Rebinding", () => { diff --git a/test/sprites/pokemonSprite.test.ts b/test/sprites/pokemonSprite.test.ts index be188503b1e..019dc51a8e2 100644 --- a/test/sprites/pokemonSprite.test.ts +++ b/test/sprites/pokemonSprite.test.ts @@ -2,8 +2,8 @@ import { getAppRootDir } from "#test/sprites/spritesUtils"; import fs from "fs"; import path from "path"; import { beforeAll, describe, expect, it } from "vitest"; -import _masterlist from "../../public/images/pokemon/variant/_masterlist.json"; import _exp_masterlist from "../../public/images/pokemon/variant/_exp_masterlist.json"; +import _masterlist from "../../public/images/pokemon/variant/_masterlist.json"; type PokemonVariantMasterlist = typeof _masterlist; type PokemonExpVariantMasterlist = typeof _exp_masterlist; diff --git a/test/system/game_data.test.ts b/test/system/game_data.test.ts index b9011cd934f..5daed0b2f1b 100644 --- a/test/system/game_data.test.ts +++ b/test/system/game_data.test.ts @@ -1,12 +1,12 @@ +import { pokerogueApi } from "#api/pokerogue-api"; +import * as account from "#app/account"; import * as bypassLoginModule from "#app/global-vars/bypass-login"; -import { pokerogueApi } from "#app/plugins/api/pokerogue-api"; -import type { SessionSaveData } from "#app/system/game-data"; import { AbilityId } from "#enums/ability-id"; import { MoveId } from "#enums/move-id"; -import GameManager from "#test/testUtils/gameManager"; +import type { SessionSaveData } from "#system/game-data"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import * as account from "#app/account"; describe("System - Game Data", () => { let phaserGame: Phaser.Game; diff --git a/test/testUtils/TextInterceptor.ts b/test/testUtils/TextInterceptor.ts index 4aaed458e44..36a5db4c78d 100644 --- a/test/testUtils/TextInterceptor.ts +++ b/test/testUtils/TextInterceptor.ts @@ -1,7 +1,7 @@ /** * Class will intercept any text or dialogue message calls and log them for test purposes */ -export default class TextInterceptor { +export class TextInterceptor { private scene; public logs: string[] = []; constructor(scene) { diff --git a/test/testUtils/errorInterceptor.ts b/test/testUtils/errorInterceptor.ts index a8fb3284b78..c253561a71c 100644 --- a/test/testUtils/errorInterceptor.ts +++ b/test/testUtils/errorInterceptor.ts @@ -1,4 +1,4 @@ -export default class ErrorInterceptor { +export class ErrorInterceptor { private static instance: ErrorInterceptor; public running; diff --git a/test/testUtils/gameManager.ts b/test/testUtils/gameManager.ts index b9f499d4e0c..ad57fc2b59f 100644 --- a/test/testUtils/gameManager.ts +++ b/test/testUtils/gameManager.ts @@ -1,46 +1,38 @@ import { updateUserInfo } from "#app/account"; -import { BattlerIndex } from "#enums/battler-index"; -import BattleScene from "#app/battle-scene"; -import type { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon"; -import Trainer from "#app/field/trainer"; +import { BattleScene } from "#app/battle-scene"; import { getGameMode } from "#app/game-mode"; -import { GameModes } from "#enums/game-modes"; import { globalScene } from "#app/global-scene"; -import { ModifierTypeOption } from "#app/modifier/modifier-type"; -import { modifierTypes } from "#app/data/data-lists"; import overrides from "#app/overrides"; -import { CheckSwitchPhase } from "#app/phases/check-switch-phase"; -import { CommandPhase } from "#app/phases/command-phase"; -import { EncounterPhase } from "#app/phases/encounter-phase"; -import { FaintPhase } from "#app/phases/faint-phase"; -import { LoginPhase } from "#app/phases/login-phase"; -import { MovePhase } from "#app/phases/move-phase"; -import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases"; -import { NewBattlePhase } from "#app/phases/new-battle-phase"; -import { SelectStarterPhase } from "#app/phases/select-starter-phase"; -import type { SelectTargetPhase } from "#app/phases/select-target-phase"; -import { TitlePhase } from "#app/phases/title-phase"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { TurnInitPhase } from "#app/phases/turn-init-phase"; -import { TurnStartPhase } from "#app/phases/turn-start-phase"; -import type BallUiHandler from "#app/ui/ball-ui-handler"; -import type BattleMessageUiHandler from "#app/ui/battle-message-ui-handler"; -import type CommandUiHandler from "#app/ui/command-ui-handler"; -import type ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; -import type PartyUiHandler from "#app/ui/party-ui-handler"; -import type StarterSelectUiHandler from "#app/ui/starter-select-ui-handler"; -import type TargetSelectUiHandler from "#app/ui/target-select-ui-handler"; -import { isNullOrUndefined } from "#app/utils/common"; +import { modifierTypes } from "#data/data-lists"; +import { BattlerIndex } from "#enums/battler-index"; import { Button } from "#enums/buttons"; import { ExpGainsSpeed } from "#enums/exp-gains-speed"; import { ExpNotification } from "#enums/exp-notification"; +import { GameModes } from "#enums/game-modes"; import type { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { PlayerGender } from "#enums/player-gender"; import type { SpeciesId } from "#enums/species-id"; import { UiMode } from "#enums/ui-mode"; -import ErrorInterceptor from "#test/testUtils/errorInterceptor"; +import type { EnemyPokemon, PlayerPokemon } from "#field/pokemon"; +import { Trainer } from "#field/trainer"; +import { ModifierTypeOption } from "#modifiers/modifier-type"; +import { CheckSwitchPhase } from "#phases/check-switch-phase"; +import { CommandPhase } from "#phases/command-phase"; +import { EncounterPhase } from "#phases/encounter-phase"; +import { FaintPhase } from "#phases/faint-phase"; +import { LoginPhase } from "#phases/login-phase"; +import { MovePhase } from "#phases/move-phase"; +import { MysteryEncounterPhase } from "#phases/mystery-encounter-phases"; +import { NewBattlePhase } from "#phases/new-battle-phase"; +import { SelectStarterPhase } from "#phases/select-starter-phase"; +import type { SelectTargetPhase } from "#phases/select-target-phase"; +import { TitlePhase } from "#phases/title-phase"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { TurnInitPhase } from "#phases/turn-init-phase"; +import { TurnStartPhase } from "#phases/turn-start-phase"; +import { ErrorInterceptor } from "#test/testUtils/errorInterceptor"; import { generateStarter, waitUntil } from "#test/testUtils/gameManagerUtils"; -import GameWrapper from "#test/testUtils/gameWrapper"; +import { GameWrapper } from "#test/testUtils/gameWrapper"; import { ChallengeModeHelper } from "#test/testUtils/helpers/challengeModeHelper"; import { ClassicModeHelper } from "#test/testUtils/helpers/classicModeHelper"; import { DailyModeHelper } from "#test/testUtils/helpers/dailyModeHelper"; @@ -50,18 +42,26 @@ import { MoveHelper } from "#test/testUtils/helpers/moveHelper"; import { OverridesHelper } from "#test/testUtils/helpers/overridesHelper"; import { ReloadHelper } from "#test/testUtils/helpers/reloadHelper"; import { SettingsHelper } from "#test/testUtils/helpers/settingsHelper"; -import type InputsHandler from "#test/testUtils/inputsHandler"; +import type { InputsHandler } from "#test/testUtils/inputsHandler"; import { MockFetch } from "#test/testUtils/mocks/mockFetch"; -import PhaseInterceptor from "#test/testUtils/phaseInterceptor"; -import TextInterceptor from "#test/testUtils/TextInterceptor"; -import { AES, enc } from "crypto-js"; +import { PhaseInterceptor } from "#test/testUtils/phaseInterceptor"; +import { TextInterceptor } from "#test/testUtils/TextInterceptor"; +import type { BallUiHandler } from "#ui/ball-ui-handler"; +import type { BattleMessageUiHandler } from "#ui/battle-message-ui-handler"; +import type { CommandUiHandler } from "#ui/command-ui-handler"; +import type { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; +import type { PartyUiHandler } from "#ui/party-ui-handler"; +import type { StarterSelectUiHandler } from "#ui/starter-select-ui-handler"; +import type { TargetSelectUiHandler } from "#ui/target-select-ui-handler"; +import { isNullOrUndefined } from "#utils/common"; import fs from "node:fs"; +import { AES, enc } from "crypto-js"; import { expect, vi } from "vitest"; /** * Class to manage the game state and transitions between phases. */ -export default class GameManager { +export class GameManager { public gameWrapper: GameWrapper; public scene: BattleScene; public phaseInterceptor: PhaseInterceptor; diff --git a/test/testUtils/gameManagerUtils.ts b/test/testUtils/gameManagerUtils.ts index 57fd9b91d26..ba92389b088 100644 --- a/test/testUtils/gameManagerUtils.ts +++ b/test/testUtils/gameManagerUtils.ts @@ -1,17 +1,17 @@ -import Battle from "#app/battle"; -import { BattleType } from "#enums/battle-type"; -import type BattleScene from "#app/battle-scene"; -import { getDailyRunStarters } from "#app/data/daily-run"; -import { Gender } from "#app/data/gender"; -import { getPokemonSpeciesForm } from "#app/data/pokemon-species"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; -import { PlayerPokemon } from "#app/field/pokemon"; +import { Battle } from "#app/battle"; +import type { BattleScene } from "#app/battle-scene"; import { getGameMode } from "#app/game-mode"; +import { getDailyRunStarters } from "#data/daily-run"; +import { Gender } from "#data/gender"; +import { getPokemonSpeciesForm } from "#data/pokemon-species"; +import { BattleType } from "#enums/battle-type"; import { GameModes } from "#enums/game-modes"; -import type { StarterMoveset } from "#app/system/game-data"; -import type { Starter } from "#app/ui/starter-select-ui-handler"; import { MoveId } from "#enums/move-id"; import type { SpeciesId } from "#enums/species-id"; +import { PlayerPokemon } from "#field/pokemon"; +import type { StarterMoveset } from "#system/game-data"; +import type { Starter } from "#ui/starter-select-ui-handler"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; /** Function to convert Blob to string */ export function blobToString(blob) { diff --git a/test/testUtils/gameWrapper.ts b/test/testUtils/gameWrapper.ts index 7b5d564de2e..b9665ffe071 100644 --- a/test/testUtils/gameWrapper.ts +++ b/test/testUtils/gameWrapper.ts @@ -1,30 +1,32 @@ // @ts-nocheck - TODO: remove this -import BattleScene from "#app/battle-scene"; -import { MoveAnim } from "#app/data/battle-anims"; -import Pokemon from "#app/field/pokemon"; -import { sessionIdKey } from "#app/utils/common"; -import { setCookie } from "#app/utils/cookies"; + +import { BattleScene } from "#app/battle-scene"; +// biome-ignore lint/performance/noNamespaceImport: Necessary in order to mock the var +import * as bypassLoginModule from "#app/global-vars/bypass-login"; +import { MoveAnim } from "#data/battle-anims"; +import { Pokemon } from "#field/pokemon"; +import { version } from "#package.json"; import { blobToString } from "#test/testUtils/gameManagerUtils"; import { MockClock } from "#test/testUtils/mocks/mockClock"; import { MockFetch } from "#test/testUtils/mocks/mockFetch"; -import MockLoader from "#test/testUtils/mocks/mockLoader"; -import MockTextureManager from "#test/testUtils/mocks/mockTextureManager"; +import { MockGameObjectCreator } from "#test/testUtils/mocks/mockGameObjectCreator"; +import { MockLoader } from "#test/testUtils/mocks/mockLoader"; +import { MockContainer } from "#test/testUtils/mocks/mocksContainer/mockContainer"; +import { MockTextureManager } from "#test/testUtils/mocks/mockTextureManager"; +import { MockTimedEventManager } from "#test/testUtils/mocks/mockTimedEventManager"; +import { PokedexMonContainer } from "#ui/pokedex-mon-container"; +import { sessionIdKey } from "#utils/common"; +import { setCookie } from "#utils/cookies"; import fs from "node:fs"; import Phaser from "phaser"; import { vi } from "vitest"; -import { version } from "../../package.json"; -import { MockGameObjectCreator } from "./mocks/mockGameObjectCreator"; -import { MockTimedEventManager } from "./mocks/mockTimedEventManager"; -import { PokedexMonContainer } from "#app/ui/pokedex-mon-container"; -import MockContainer from "./mocks/mocksContainer/mockContainer"; -import InputManager = Phaser.Input.InputManager; -import KeyboardManager = Phaser.Input.Keyboard.KeyboardManager; -import KeyboardPlugin = Phaser.Input.Keyboard.KeyboardPlugin; -import GamepadPlugin = Phaser.Input.Gamepad.GamepadPlugin; -import EventEmitter = Phaser.Events.EventEmitter; -import UpdateList = Phaser.GameObjects.UpdateList; -// biome-ignore lint/performance/noNamespaceImport: Necessary in order to mock the var -import * as bypassLoginModule from "#app/global-vars/bypass-login"; + +const InputManager = Phaser.Input.InputManager; +const KeyboardManager = Phaser.Input.Keyboard.KeyboardManager; +const KeyboardPlugin = Phaser.Input.Keyboard.KeyboardPlugin; +const GamepadPlugin = Phaser.Input.Gamepad.GamepadPlugin; +const EventEmitter = Phaser.Events.EventEmitter; +const UpdateList = Phaser.GameObjects.UpdateList; window.URL.createObjectURL = (blob: Blob) => { blobToString(blob).then((data: string) => { @@ -40,7 +42,7 @@ window.matchMedia = () => ({ matches: false, }); -export default class GameWrapper { +export class GameWrapper { public game: Phaser.Game; public scene: BattleScene; diff --git a/test/testUtils/helpers/challengeModeHelper.ts b/test/testUtils/helpers/challengeModeHelper.ts index f0b4b151d22..31b7c062d99 100644 --- a/test/testUtils/helpers/challengeModeHelper.ts +++ b/test/testUtils/helpers/challengeModeHelper.ts @@ -1,15 +1,15 @@ -import { BattleStyle } from "#app/enums/battle-style"; -import type { SpeciesId } from "#enums/species-id"; import overrides from "#app/overrides"; -import { EncounterPhase } from "#app/phases/encounter-phase"; -import { SelectStarterPhase } from "#app/phases/select-starter-phase"; -import { UiMode } from "#enums/ui-mode"; -import { generateStarter } from "../gameManagerUtils"; -import { GameManagerHelper } from "./gameManagerHelper"; -import type { Challenge } from "#app/data/challenge"; -import { CommandPhase } from "#app/phases/command-phase"; -import { TurnInitPhase } from "#app/phases/turn-init-phase"; +import type { Challenge } from "#data/challenge"; +import { BattleStyle } from "#enums/battle-style"; import type { Challenges } from "#enums/challenges"; +import type { SpeciesId } from "#enums/species-id"; +import { UiMode } from "#enums/ui-mode"; +import { CommandPhase } from "#phases/command-phase"; +import { EncounterPhase } from "#phases/encounter-phase"; +import { SelectStarterPhase } from "#phases/select-starter-phase"; +import { TurnInitPhase } from "#phases/turn-init-phase"; +import { generateStarter } from "#test/testUtils/gameManagerUtils"; +import { GameManagerHelper } from "#test/testUtils/helpers/gameManagerHelper"; import { copyChallenge } from "data/challenge"; /** diff --git a/test/testUtils/helpers/classicModeHelper.ts b/test/testUtils/helpers/classicModeHelper.ts index 24c4a97e9bf..55b25623b5a 100644 --- a/test/testUtils/helpers/classicModeHelper.ts +++ b/test/testUtils/helpers/classicModeHelper.ts @@ -1,14 +1,14 @@ -import { BattleStyle } from "#app/enums/battle-style"; import { getGameMode } from "#app/game-mode"; import overrides from "#app/overrides"; -import { CommandPhase } from "#app/phases/command-phase"; -import { EncounterPhase } from "#app/phases/encounter-phase"; -import { SelectStarterPhase } from "#app/phases/select-starter-phase"; -import { TurnInitPhase } from "#app/phases/turn-init-phase"; +import { BattleStyle } from "#enums/battle-style"; import { GameModes } from "#enums/game-modes"; import { Nature } from "#enums/nature"; import type { SpeciesId } from "#enums/species-id"; import { UiMode } from "#enums/ui-mode"; +import { CommandPhase } from "#phases/command-phase"; +import { EncounterPhase } from "#phases/encounter-phase"; +import { SelectStarterPhase } from "#phases/select-starter-phase"; +import { TurnInitPhase } from "#phases/turn-init-phase"; import { generateStarter } from "#test/testUtils/gameManagerUtils"; import { GameManagerHelper } from "#test/testUtils/helpers/gameManagerHelper"; diff --git a/test/testUtils/helpers/dailyModeHelper.ts b/test/testUtils/helpers/dailyModeHelper.ts index 4672d4dc787..214b6e4c5a4 100644 --- a/test/testUtils/helpers/dailyModeHelper.ts +++ b/test/testUtils/helpers/dailyModeHelper.ts @@ -1,13 +1,13 @@ -import { BattleStyle } from "#app/enums/battle-style"; -import { Button } from "#app/enums/buttons"; import overrides from "#app/overrides"; -import { CommandPhase } from "#app/phases/command-phase"; -import { EncounterPhase } from "#app/phases/encounter-phase"; -import { TitlePhase } from "#app/phases/title-phase"; -import { TurnInitPhase } from "#app/phases/turn-init-phase"; -import type SaveSlotSelectUiHandler from "#app/ui/save-slot-select-ui-handler"; +import { BattleStyle } from "#enums/battle-style"; +import { Button } from "#enums/buttons"; import { UiMode } from "#enums/ui-mode"; -import { GameManagerHelper } from "./gameManagerHelper"; +import { CommandPhase } from "#phases/command-phase"; +import { EncounterPhase } from "#phases/encounter-phase"; +import { TitlePhase } from "#phases/title-phase"; +import { TurnInitPhase } from "#phases/turn-init-phase"; +import { GameManagerHelper } from "#test/testUtils/helpers/gameManagerHelper"; +import type { SaveSlotSelectUiHandler } from "#ui/save-slot-select-ui-handler"; /** * Helper to handle daily mode specifics diff --git a/test/testUtils/helpers/field-helper.ts b/test/testUtils/helpers/field-helper.ts index 2866c01209f..6db7c62f005 100644 --- a/test/testUtils/helpers/field-helper.ts +++ b/test/testUtils/helpers/field-helper.ts @@ -1,16 +1,14 @@ -// -- start tsdoc imports -- -// biome-ignore lint/correctness/noUnusedImports: TSDoc import +/* biome-ignore-start lint/correctness/noUnusedImports: tsdoc imports */ import type { globalScene } from "#app/global-scene"; -// -- end tsdoc imports -- +/* biome-ignore-end lint/correctness/noUnusedImports: tsdoc imports */ -import type { BattlerIndex } from "#enums/battler-index"; -import type { Ability } from "#app/data/abilities/ability"; -import { allAbilities } from "#app/data/data-lists"; -import type Pokemon from "#app/field/pokemon"; -import type { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon"; +import type { Ability } from "#abilities/ability"; +import { allAbilities } from "#data/data-lists"; import type { AbilityId } from "#enums/ability-id"; +import type { BattlerIndex } from "#enums/battler-index"; import type { PokemonType } from "#enums/pokemon-type"; import { Stat } from "#enums/stat"; +import type { EnemyPokemon, PlayerPokemon, Pokemon } from "#field/pokemon"; import { GameManagerHelper } from "#test/testUtils/helpers/gameManagerHelper"; import { expect, type MockInstance, vi } from "vitest"; diff --git a/test/testUtils/helpers/gameManagerHelper.ts b/test/testUtils/helpers/gameManagerHelper.ts index 85d7bc0df97..6db3819a5cb 100644 --- a/test/testUtils/helpers/gameManagerHelper.ts +++ b/test/testUtils/helpers/gameManagerHelper.ts @@ -1,4 +1,4 @@ -import type GameManager from "../gameManager"; +import type { GameManager } from "#test/testUtils/gameManager"; /** * Base class for defining all game helpers. diff --git a/test/testUtils/helpers/modifiersHelper.ts b/test/testUtils/helpers/modifiersHelper.ts index 22500c87906..ff6e78c8a2f 100644 --- a/test/testUtils/helpers/modifiersHelper.ts +++ b/test/testUtils/helpers/modifiersHelper.ts @@ -1,7 +1,7 @@ +import type { ModifierTypeKeys } from "#modifiers/modifier-type"; +import { itemPoolChecks } from "#modifiers/modifier-type"; +import { GameManagerHelper } from "#test/testUtils/helpers/gameManagerHelper"; import { expect } from "vitest"; -import { GameManagerHelper } from "./gameManagerHelper"; -import type { ModifierTypeKeys } from "#app/modifier/modifier-type"; -import { itemPoolChecks } from "#app/modifier/modifier-type"; export class ModifierHelper extends GameManagerHelper { /** diff --git a/test/testUtils/helpers/moveHelper.ts b/test/testUtils/helpers/moveHelper.ts index ed1441a6a2f..f0337d30471 100644 --- a/test/testUtils/helpers/moveHelper.ts +++ b/test/testUtils/helpers/moveHelper.ts @@ -1,19 +1,19 @@ -import type { BattlerIndex } from "#enums/battler-index"; -import { getMoveTargets } from "#app/data/moves/move-utils"; -import type Pokemon from "#app/field/pokemon"; -import { PokemonMove } from "#app/data/moves/pokemon-move"; import Overrides from "#app/overrides"; -import type { CommandPhase } from "#app/phases/command-phase"; -import type { EnemyCommandPhase } from "#app/phases/enemy-command-phase"; -import { MoveEffectPhase } from "#app/phases/move-effect-phase"; +import type { BattlerIndex } from "#enums/battler-index"; import { Command } from "#enums/command"; import { MoveId } from "#enums/move-id"; +import { MoveUseMode } from "#enums/move-use-mode"; import { UiMode } from "#enums/ui-mode"; +import type { Pokemon } from "#field/pokemon"; +import { getMoveTargets } from "#moves/move-utils"; +import { PokemonMove } from "#moves/pokemon-move"; +import type { CommandPhase } from "#phases/command-phase"; +import type { EnemyCommandPhase } from "#phases/enemy-command-phase"; +import { MoveEffectPhase } from "#phases/move-effect-phase"; import { getMovePosition } from "#test/testUtils/gameManagerUtils"; import { GameManagerHelper } from "#test/testUtils/helpers/gameManagerHelper"; +import { coerceArray } from "#utils/common"; import { vi } from "vitest"; -import { coerceArray } from "#app/utils/common"; -import { MoveUseMode } from "#enums/move-use-mode"; /** * Helper to handle a Pokemon's move diff --git a/test/testUtils/helpers/overridesHelper.ts b/test/testUtils/helpers/overridesHelper.ts index a26dc883a30..e8074443e75 100644 --- a/test/testUtils/helpers/overridesHelper.ts +++ b/test/testUtils/helpers/overridesHelper.ts @@ -2,12 +2,9 @@ import type { NewArenaEvent } from "#app/events/battle-scene"; /** biome-ignore-end lint/correctness/noUnusedImports: tsdoc imports */ -import { Weather } from "#app/data/weather"; -import type { ModifierOverride } from "#app/modifier/modifier-type"; import type { BattleStyle, RandomTrainerOverride } from "#app/overrides"; import Overrides, { defaultOverrides } from "#app/overrides"; -import type { Variant } from "#app/sprites/variant"; -import { coerceArray, shiftCharCodes } from "#app/utils/common"; +import { Weather } from "#data/weather"; import { AbilityId } from "#enums/ability-id"; import type { BattleType } from "#enums/battle-type"; import { BiomeId } from "#enums/biome-id"; @@ -19,7 +16,10 @@ import { SpeciesId } from "#enums/species-id"; import { StatusEffect } from "#enums/status-effect"; import type { Unlockables } from "#enums/unlockables"; import type { WeatherType } from "#enums/weather-type"; +import type { ModifierOverride } from "#modifiers/modifier-type"; +import type { Variant } from "#sprites/variant"; import { GameManagerHelper } from "#test/testUtils/helpers/gameManagerHelper"; +import { coerceArray, shiftCharCodes } from "#utils/common"; import { expect, vi } from "vitest"; /** diff --git a/test/testUtils/helpers/reloadHelper.ts b/test/testUtils/helpers/reloadHelper.ts index 4f9d6c810f8..bc8adae6f28 100644 --- a/test/testUtils/helpers/reloadHelper.ts +++ b/test/testUtils/helpers/reloadHelper.ts @@ -1,12 +1,12 @@ -import { GameManagerHelper } from "./gameManagerHelper"; -import { TitlePhase } from "#app/phases/title-phase"; +import { BattleStyle } from "#enums/battle-style"; import { UiMode } from "#enums/ui-mode"; +import { CommandPhase } from "#phases/command-phase"; +import { TitlePhase } from "#phases/title-phase"; +import { TurnInitPhase } from "#phases/turn-init-phase"; +import type { SessionSaveData } from "#system/game-data"; +import type { GameManager } from "#test/testUtils/gameManager"; +import { GameManagerHelper } from "#test/testUtils/helpers/gameManagerHelper"; import { vi } from "vitest"; -import { BattleStyle } from "#app/enums/battle-style"; -import { CommandPhase } from "#app/phases/command-phase"; -import { TurnInitPhase } from "#app/phases/turn-init-phase"; -import type { SessionSaveData } from "#app/system/game-data"; -import type GameManager from "../gameManager"; /** * Helper to allow reloading sessions in unit tests. diff --git a/test/testUtils/helpers/settingsHelper.ts b/test/testUtils/helpers/settingsHelper.ts index d5a60e6496a..76db93c7de5 100644 --- a/test/testUtils/helpers/settingsHelper.ts +++ b/test/testUtils/helpers/settingsHelper.ts @@ -1,7 +1,7 @@ -import { PlayerGender } from "#app/enums/player-gender"; -import { BattleStyle } from "#app/enums/battle-style"; -import { GameManagerHelper } from "./gameManagerHelper"; -import { ExpGainsSpeed } from "#app/enums/exp-gains-speed"; +import { BattleStyle } from "#enums/battle-style"; +import { ExpGainsSpeed } from "#enums/exp-gains-speed"; +import { PlayerGender } from "#enums/player-gender"; +import { GameManagerHelper } from "#test/testUtils/helpers/gameManagerHelper"; /** * Helper to handle settings for tests diff --git a/test/testUtils/inputsHandler.ts b/test/testUtils/inputsHandler.ts index 0d8c43e7616..6a0db37c9b6 100644 --- a/test/testUtils/inputsHandler.ts +++ b/test/testUtils/inputsHandler.ts @@ -1,7 +1,7 @@ -import type BattleScene from "#app/battle-scene"; -import pad_xbox360 from "#app/configs/inputs/pad_xbox360"; +import type { BattleScene } from "#app/battle-scene"; import type { InputsController } from "#app/inputs-controller"; -import TouchControl from "#app/touch-controls"; +import { TouchControl } from "#app/touch-controls"; +import pad_xbox360 from "#inputs/pad_xbox360"; import { holdOn } from "#test/testUtils/gameManagerUtils"; import fs from "node:fs"; import { JSDOM } from "jsdom"; @@ -12,7 +12,7 @@ interface LogEntry { button: any; } -export default class InputsHandler { +export class InputsHandler { private scene: BattleScene; private events: Phaser.Events.EventEmitter; private inputController: InputsController; diff --git a/test/testUtils/mocks/mockClock.ts b/test/testUtils/mocks/mockClock.ts index 67f399ae41d..0d94a62824c 100644 --- a/test/testUtils/mocks/mockClock.ts +++ b/test/testUtils/mocks/mockClock.ts @@ -1,4 +1,6 @@ -import Clock = Phaser.Time.Clock; +import Phaser from "phaser"; + +const Clock = Phaser.Time.Clock; export class MockClock extends Clock { public overrideDelay: number | null = 1; diff --git a/test/testUtils/mocks/mockGameObjectCreator.ts b/test/testUtils/mocks/mockGameObjectCreator.ts index caf98b79a9f..cfb1051ec2f 100644 --- a/test/testUtils/mocks/mockGameObjectCreator.ts +++ b/test/testUtils/mocks/mockGameObjectCreator.ts @@ -1,5 +1,5 @@ -import MockGraphics from "./mocksContainer/mockGraphics"; -import type MockTextureManager from "./mockTextureManager"; +import { MockGraphics } from "#test/testUtils/mocks/mocksContainer/mockGraphics"; +import type { MockTextureManager } from "#test/testUtils/mocks/mockTextureManager"; export class MockGameObjectCreator { private readonly textureManager: MockTextureManager; diff --git a/test/testUtils/mocks/mockLoader.ts b/test/testUtils/mocks/mockLoader.ts index 7452f85a317..7bb3ffe7147 100644 --- a/test/testUtils/mocks/mockLoader.ts +++ b/test/testUtils/mocks/mockLoader.ts @@ -1,6 +1,8 @@ -import CacheManager = Phaser.Cache.CacheManager; +import Phaser from "phaser"; -export default class MockLoader { +const CacheManager = Phaser.Cache.CacheManager; + +export class MockLoader { public cacheManager; constructor(scene) { this.cacheManager = new CacheManager(scene); diff --git a/test/testUtils/mocks/mockTextureManager.ts b/test/testUtils/mocks/mockTextureManager.ts index 585ee0a674a..dcf4f7b898e 100644 --- a/test/testUtils/mocks/mockTextureManager.ts +++ b/test/testUtils/mocks/mockTextureManager.ts @@ -1,18 +1,18 @@ -import MockContainer from "#test/testUtils/mocks/mocksContainer/mockContainer"; +import type { MockGameObject } from "#test/testUtils/mocks/mockGameObject"; +import { MockContainer } from "#test/testUtils/mocks/mocksContainer/mockContainer"; import { MockImage } from "#test/testUtils/mocks/mocksContainer/mockImage"; -import MockNineslice from "#test/testUtils/mocks/mocksContainer/mockNineslice"; -import MockPolygon from "#test/testUtils/mocks/mocksContainer/mockPolygon"; -import MockRectangle from "#test/testUtils/mocks/mocksContainer/mockRectangle"; -import MockSprite from "#test/testUtils/mocks/mocksContainer/mockSprite"; -import MockText from "#test/testUtils/mocks/mocksContainer/mockText"; -import MockTexture from "#test/testUtils/mocks/mocksContainer/mockTexture"; -import type { MockGameObject } from "./mockGameObject"; -import { MockVideoGameObject } from "./mockVideoGameObject"; +import { MockNineslice } from "#test/testUtils/mocks/mocksContainer/mockNineslice"; +import { MockPolygon } from "#test/testUtils/mocks/mocksContainer/mockPolygon"; +import { MockRectangle } from "#test/testUtils/mocks/mocksContainer/mockRectangle"; +import { MockSprite } from "#test/testUtils/mocks/mocksContainer/mockSprite"; +import { MockText } from "#test/testUtils/mocks/mocksContainer/mockText"; +import { MockTexture } from "#test/testUtils/mocks/mocksContainer/mockTexture"; +import { MockVideoGameObject } from "#test/testUtils/mocks/mockVideoGameObject"; /** * Stub class for Phaser.Textures.TextureManager */ -export default class MockTextureManager { +export class MockTextureManager { private textures: Map; private scene; public add; diff --git a/test/testUtils/mocks/mockTimedEventManager.ts b/test/testUtils/mocks/mockTimedEventManager.ts index 10f32fd4c8b..b6c84876783 100644 --- a/test/testUtils/mocks/mockTimedEventManager.ts +++ b/test/testUtils/mocks/mockTimedEventManager.ts @@ -1,5 +1,5 @@ -import { CLASSIC_CANDY_FRIENDSHIP_MULTIPLIER } from "#app/data/balance/starters"; import { TimedEventManager } from "#app/timed-event-manager"; +import { CLASSIC_CANDY_FRIENDSHIP_MULTIPLIER } from "#balance/starters"; /** Mock TimedEventManager so that ongoing events don't impact tests */ export class MockTimedEventManager extends TimedEventManager { diff --git a/test/testUtils/mocks/mockVideoGameObject.ts b/test/testUtils/mocks/mockVideoGameObject.ts index 9b25877c80c..40413f6f622 100644 --- a/test/testUtils/mocks/mockVideoGameObject.ts +++ b/test/testUtils/mocks/mockVideoGameObject.ts @@ -1,4 +1,4 @@ -import type { MockGameObject } from "./mockGameObject"; +import type { MockGameObject } from "#test/testUtils/mocks/mockGameObject"; /** Mocks video-related stuff */ export class MockVideoGameObject implements MockGameObject { diff --git a/test/testUtils/mocks/mocksContainer/mockContainer.ts b/test/testUtils/mocks/mocksContainer/mockContainer.ts index d31165bb847..df9aaab5888 100644 --- a/test/testUtils/mocks/mocksContainer/mockContainer.ts +++ b/test/testUtils/mocks/mocksContainer/mockContainer.ts @@ -1,8 +1,8 @@ -import { coerceArray } from "#app/utils/common"; -import type MockTextureManager from "#test/testUtils/mocks/mockTextureManager"; -import type { MockGameObject } from "../mockGameObject"; +import type { MockGameObject } from "#test/testUtils/mocks/mockGameObject"; +import type { MockTextureManager } from "#test/testUtils/mocks/mockTextureManager"; +import { coerceArray } from "#utils/common"; -export default class MockContainer implements MockGameObject { +export class MockContainer implements MockGameObject { protected x: number; protected y: number; protected scene; diff --git a/test/testUtils/mocks/mocksContainer/mockGraphics.ts b/test/testUtils/mocks/mocksContainer/mockGraphics.ts index cd43bb3a877..6558cdf9fb1 100644 --- a/test/testUtils/mocks/mocksContainer/mockGraphics.ts +++ b/test/testUtils/mocks/mocksContainer/mockGraphics.ts @@ -1,6 +1,6 @@ -import type { MockGameObject } from "../mockGameObject"; +import type { MockGameObject } from "#test/testUtils/mocks/mockGameObject"; -export default class MockGraphics implements MockGameObject { +export class MockGraphics implements MockGameObject { private scene; public list: MockGameObject[] = []; public name: string; diff --git a/test/testUtils/mocks/mocksContainer/mockImage.ts b/test/testUtils/mocks/mocksContainer/mockImage.ts index f8990985e54..830a22a369c 100644 --- a/test/testUtils/mocks/mocksContainer/mockImage.ts +++ b/test/testUtils/mocks/mocksContainer/mockImage.ts @@ -1,4 +1,4 @@ -import MockContainer from "#test/testUtils/mocks/mocksContainer/mockContainer"; +import { MockContainer } from "#test/testUtils/mocks/mocksContainer/mockContainer"; export class MockImage extends MockContainer { // biome-ignore lint/correctness/noUnusedPrivateClassMembers: this is intentional (?) diff --git a/test/testUtils/mocks/mocksContainer/mockNineslice.ts b/test/testUtils/mocks/mocksContainer/mockNineslice.ts index 90c0e13e725..11983075cf7 100644 --- a/test/testUtils/mocks/mocksContainer/mockNineslice.ts +++ b/test/testUtils/mocks/mocksContainer/mockNineslice.ts @@ -1,6 +1,6 @@ -import MockContainer from "#test/testUtils/mocks/mocksContainer/mockContainer"; +import { MockContainer } from "#test/testUtils/mocks/mocksContainer/mockContainer"; -export default class MockNineslice extends MockContainer { +export class MockNineslice extends MockContainer { private texture; private leftWidth; private rightWidth; diff --git a/test/testUtils/mocks/mocksContainer/mockPolygon.ts b/test/testUtils/mocks/mocksContainer/mockPolygon.ts index 4a7f3baec78..2426231193a 100644 --- a/test/testUtils/mocks/mocksContainer/mockPolygon.ts +++ b/test/testUtils/mocks/mocksContainer/mockPolygon.ts @@ -1,6 +1,6 @@ -import MockContainer from "#test/testUtils/mocks/mocksContainer/mockContainer"; +import { MockContainer } from "#test/testUtils/mocks/mocksContainer/mockContainer"; -export default class MockPolygon extends MockContainer { +export class MockPolygon extends MockContainer { constructor(textureManager, x, y, _content, _fillColor, _fillAlpha) { super(textureManager, x, y); } diff --git a/test/testUtils/mocks/mocksContainer/mockRectangle.ts b/test/testUtils/mocks/mocksContainer/mockRectangle.ts index a8eeb370115..1e38cd3af44 100644 --- a/test/testUtils/mocks/mocksContainer/mockRectangle.ts +++ b/test/testUtils/mocks/mocksContainer/mockRectangle.ts @@ -1,7 +1,7 @@ -import { coerceArray } from "#app/utils/common"; -import type { MockGameObject } from "../mockGameObject"; +import type { MockGameObject } from "#test/testUtils/mocks/mockGameObject"; +import { coerceArray } from "#utils/common"; -export default class MockRectangle implements MockGameObject { +export class MockRectangle implements MockGameObject { private fillColor; private scene; public list: MockGameObject[] = []; diff --git a/test/testUtils/mocks/mocksContainer/mockSprite.ts b/test/testUtils/mocks/mocksContainer/mockSprite.ts index bbcd421e1a7..bea1db21629 100644 --- a/test/testUtils/mocks/mocksContainer/mockSprite.ts +++ b/test/testUtils/mocks/mocksContainer/mockSprite.ts @@ -1,10 +1,10 @@ -import { coerceArray } from "#app/utils/common"; +import type { MockGameObject } from "#test/testUtils/mocks/mockGameObject"; +import { coerceArray } from "#utils/common"; import Phaser from "phaser"; -import type { MockGameObject } from "../mockGameObject"; type Frame = Phaser.Textures.Frame; -export default class MockSprite implements MockGameObject { +export class MockSprite implements MockGameObject { private phaserSprite; public pipelineData; public texture; diff --git a/test/testUtils/mocks/mocksContainer/mockText.ts b/test/testUtils/mocks/mocksContainer/mockText.ts index 2345ff70c0d..58ae3650411 100644 --- a/test/testUtils/mocks/mocksContainer/mockText.ts +++ b/test/testUtils/mocks/mocksContainer/mockText.ts @@ -1,7 +1,7 @@ -import UI from "#app/ui/ui"; -import type { MockGameObject } from "../mockGameObject"; +import type { MockGameObject } from "#test/testUtils/mocks/mockGameObject"; +import { UI } from "#ui/ui"; -export default class MockText implements MockGameObject { +export class MockText implements MockGameObject { private phaserText; private wordWrapWidth; private splitRegExp; diff --git a/test/testUtils/mocks/mocksContainer/mockTexture.ts b/test/testUtils/mocks/mocksContainer/mockTexture.ts index 3b01f9ab4ea..af25941094b 100644 --- a/test/testUtils/mocks/mocksContainer/mockTexture.ts +++ b/test/testUtils/mocks/mocksContainer/mockTexture.ts @@ -1,11 +1,11 @@ -import type MockTextureManager from "#test/testUtils/mocks/mockTextureManager"; -import type { MockGameObject } from "../mockGameObject"; +import type { MockGameObject } from "#test/testUtils/mocks/mockGameObject"; +import type { MockTextureManager } from "#test/testUtils/mocks/mockTextureManager"; /** * Stub for Phaser.Textures.Texture object * Just mocks the function calls and data required for use in tests */ -export default class MockTexture implements MockGameObject { +export class MockTexture implements MockGameObject { public manager: MockTextureManager; public key: string; public source; diff --git a/test/testUtils/phaseInterceptor.ts b/test/testUtils/phaseInterceptor.ts index 9d046fc85ba..fa0d73e50a1 100644 --- a/test/testUtils/phaseInterceptor.ts +++ b/test/testUtils/phaseInterceptor.ts @@ -1,69 +1,68 @@ import { Phase } from "#app/phase"; -import ErrorInterceptor from "#test/testUtils/errorInterceptor"; -import { AttemptRunPhase } from "#app/phases/attempt-run-phase"; -import { BattleEndPhase } from "#app/phases/battle-end-phase"; -import { BerryPhase } from "#app/phases/berry-phase"; -import { CheckSwitchPhase } from "#app/phases/check-switch-phase"; -import { CommandPhase } from "#app/phases/command-phase"; -import { DamageAnimPhase } from "#app/phases/damage-anim-phase"; -import { EggLapsePhase } from "#app/phases/egg-lapse-phase"; -import { EncounterPhase } from "#app/phases/encounter-phase"; -import { EndEvolutionPhase } from "#app/phases/end-evolution-phase"; -import { EnemyCommandPhase } from "#app/phases/enemy-command-phase"; -import { EvolutionPhase } from "#app/phases/evolution-phase"; -import { FaintPhase } from "#app/phases/faint-phase"; -import { FormChangePhase } from "#app/phases/form-change-phase"; -import { LearnMovePhase } from "#app/phases/learn-move-phase"; -import { LevelCapPhase } from "#app/phases/level-cap-phase"; -import { LoginPhase } from "#app/phases/login-phase"; -import { MessagePhase } from "#app/phases/message-phase"; -import { MoveEffectPhase } from "#app/phases/move-effect-phase"; -import { MoveEndPhase } from "#app/phases/move-end-phase"; -import { MovePhase } from "#app/phases/move-phase"; -import { NewBattlePhase } from "#app/phases/new-battle-phase"; -import { NewBiomeEncounterPhase } from "#app/phases/new-biome-encounter-phase"; -import { NextEncounterPhase } from "#app/phases/next-encounter-phase"; -import { PostSummonPhase } from "#app/phases/post-summon-phase"; -import { QuietFormChangePhase } from "#app/phases/quiet-form-change-phase"; -import { SelectGenderPhase } from "#app/phases/select-gender-phase"; -import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; -import { SelectStarterPhase } from "#app/phases/select-starter-phase"; -import { SelectTargetPhase } from "#app/phases/select-target-phase"; -import { ShinySparklePhase } from "#app/phases/shiny-sparkle-phase"; -import { ShowAbilityPhase } from "#app/phases/show-ability-phase"; -import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase"; -import { SummonPhase } from "#app/phases/summon-phase"; -import { SwitchPhase } from "#app/phases/switch-phase"; -import { SwitchSummonPhase } from "#app/phases/switch-summon-phase"; -import { TitlePhase } from "#app/phases/title-phase"; -import { ToggleDoublePositionPhase } from "#app/phases/toggle-double-position-phase"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { TurnInitPhase } from "#app/phases/turn-init-phase"; -import { TurnStartPhase } from "#app/phases/turn-start-phase"; -import { UnavailablePhase } from "#app/phases/unavailable-phase"; -import { VictoryPhase } from "#app/phases/victory-phase"; -import { PartyHealPhase } from "#app/phases/party-heal-phase"; -import UI from "#app/ui/ui"; import { UiMode } from "#enums/ui-mode"; -import { SelectBiomePhase } from "#app/phases/select-biome-phase"; +import { AttemptRunPhase } from "#phases/attempt-run-phase"; +import { BattleEndPhase } from "#phases/battle-end-phase"; +import { BerryPhase } from "#phases/berry-phase"; +import { CheckSwitchPhase } from "#phases/check-switch-phase"; +import { CommandPhase } from "#phases/command-phase"; +import { DamageAnimPhase } from "#phases/damage-anim-phase"; +import { EggLapsePhase } from "#phases/egg-lapse-phase"; +import { EncounterPhase } from "#phases/encounter-phase"; +import { EndEvolutionPhase } from "#phases/end-evolution-phase"; +import { EnemyCommandPhase } from "#phases/enemy-command-phase"; +import { EvolutionPhase } from "#phases/evolution-phase"; +import { ExpPhase } from "#phases/exp-phase"; +import { FaintPhase } from "#phases/faint-phase"; +import { FormChangePhase } from "#phases/form-change-phase"; +import { GameOverModifierRewardPhase } from "#phases/game-over-modifier-reward-phase"; +import { GameOverPhase } from "#phases/game-over-phase"; +import { LearnMovePhase } from "#phases/learn-move-phase"; +import { LevelCapPhase } from "#phases/level-cap-phase"; +import { LoginPhase } from "#phases/login-phase"; +import { MessagePhase } from "#phases/message-phase"; +import { ModifierRewardPhase } from "#phases/modifier-reward-phase"; +import { MoveEffectPhase } from "#phases/move-effect-phase"; +import { MoveEndPhase } from "#phases/move-end-phase"; +import { MovePhase } from "#phases/move-phase"; import { MysteryEncounterBattlePhase, MysteryEncounterOptionSelectedPhase, MysteryEncounterPhase, MysteryEncounterRewardsPhase, PostMysteryEncounterPhase, -} from "#app/phases/mystery-encounter-phases"; -import { ModifierRewardPhase } from "#app/phases/modifier-reward-phase"; -import { PartyExpPhase } from "#app/phases/party-exp-phase"; -import { ExpPhase } from "#app/phases/exp-phase"; -import { GameOverPhase } from "#app/phases/game-over-phase"; -import { RibbonModifierRewardPhase } from "#app/phases/ribbon-modifier-reward-phase"; -import { GameOverModifierRewardPhase } from "#app/phases/game-over-modifier-reward-phase"; -import { UnlockPhase } from "#app/phases/unlock-phase"; -import { PostGameOverPhase } from "#app/phases/post-game-over-phase"; -import { RevivalBlessingPhase } from "#app/phases/revival-blessing-phase"; - -import type { PhaseClass, PhaseString } from "#app/@types/phase-types"; +} from "#phases/mystery-encounter-phases"; +import { NewBattlePhase } from "#phases/new-battle-phase"; +import { NewBiomeEncounterPhase } from "#phases/new-biome-encounter-phase"; +import { NextEncounterPhase } from "#phases/next-encounter-phase"; +import { PartyExpPhase } from "#phases/party-exp-phase"; +import { PartyHealPhase } from "#phases/party-heal-phase"; +import { PostGameOverPhase } from "#phases/post-game-over-phase"; +import { PostSummonPhase } from "#phases/post-summon-phase"; +import { QuietFormChangePhase } from "#phases/quiet-form-change-phase"; +import { RevivalBlessingPhase } from "#phases/revival-blessing-phase"; +import { RibbonModifierRewardPhase } from "#phases/ribbon-modifier-reward-phase"; +import { SelectBiomePhase } from "#phases/select-biome-phase"; +import { SelectGenderPhase } from "#phases/select-gender-phase"; +import { SelectModifierPhase } from "#phases/select-modifier-phase"; +import { SelectStarterPhase } from "#phases/select-starter-phase"; +import { SelectTargetPhase } from "#phases/select-target-phase"; +import { ShinySparklePhase } from "#phases/shiny-sparkle-phase"; +import { ShowAbilityPhase } from "#phases/show-ability-phase"; +import { StatStageChangePhase } from "#phases/stat-stage-change-phase"; +import { SummonPhase } from "#phases/summon-phase"; +import { SwitchPhase } from "#phases/switch-phase"; +import { SwitchSummonPhase } from "#phases/switch-summon-phase"; +import { TitlePhase } from "#phases/title-phase"; +import { ToggleDoublePositionPhase } from "#phases/toggle-double-position-phase"; +import { TurnEndPhase } from "#phases/turn-end-phase"; +import { TurnInitPhase } from "#phases/turn-init-phase"; +import { TurnStartPhase } from "#phases/turn-start-phase"; +import { UnavailablePhase } from "#phases/unavailable-phase"; +import { UnlockPhase } from "#phases/unlock-phase"; +import { VictoryPhase } from "#phases/victory-phase"; +import { ErrorInterceptor } from "#test/testUtils/errorInterceptor"; +import type { PhaseClass, PhaseString } from "#types/phase-types"; +import { UI } from "#ui/ui"; export interface PromptHandler { phaseTarget?: string; @@ -75,7 +74,7 @@ export interface PromptHandler { type PhaseInterceptorPhase = PhaseClass | PhaseString; -export default class PhaseInterceptor { +export class PhaseInterceptor { public scene; public phases = {}; public log: string[]; diff --git a/test/testUtils/testFileInitialization.ts b/test/testUtils/testFileInitialization.ts index 578747b0529..98b49159d98 100644 --- a/test/testUtils/testFileInitialization.ts +++ b/test/testUtils/testFileInitialization.ts @@ -1,29 +1,29 @@ -import { SESSION_ID_COOKIE_NAME } from "#app/constants"; +import { initAbilities } from "#abilities/ability"; import { initLoggedInUser } from "#app/account"; -import { initAbilities } from "#app/data/abilities/ability"; -import { initBiomes } from "#app/data/balance/biomes"; -import { initEggMoves } from "#app/data/balance/egg-moves"; -import { initPokemonPrevolutions, initPokemonStarters } from "#app/data/balance/pokemon-evolutions"; -import { initMoves } from "#app/data/moves/move"; -import { initModifierPools } from "#app/modifier/init-modifier-pools"; -import { initMysteryEncounters } from "#app/data/mystery-encounters/mystery-encounters"; -import { initPokemonForms } from "#app/data/pokemon-forms"; -import { initSpecies } from "#app/data/pokemon-species"; -import { initAchievements } from "#app/system/achv"; -import { initVouchers } from "#app/system/voucher"; -import { initStatsKeys } from "#app/ui/game-stats-ui-handler"; -import { setCookie } from "#app/utils/cookies"; +import { SESSION_ID_COOKIE_NAME } from "#app/constants"; +import { initBiomes } from "#balance/biomes"; +import { initEggMoves } from "#balance/egg-moves"; +import { initPokemonPrevolutions, initPokemonStarters } from "#balance/pokemon-evolutions"; +import { initPokemonForms } from "#data/pokemon-forms"; +import { initSpecies } from "#data/pokemon-species"; +import { initModifierPools } from "#modifiers/init-modifier-pools"; +import { initModifierTypes } from "#modifiers/modifier-type"; +import { initMoves } from "#moves/move"; +import { initMysteryEncounters } from "#mystery-encounters/mystery-encounters"; +import { initI18n } from "#plugins/i18n"; +import { initAchievements } from "#system/achv"; +import { initVouchers } from "#system/voucher"; import { blobToString } from "#test/testUtils/gameManagerUtils"; +import { manageListeners } from "#test/testUtils/listenersManager"; import { MockConsoleLog } from "#test/testUtils/mocks/mockConsoleLog"; import { mockContext } from "#test/testUtils/mocks/mockContextCanvas"; import { mockLocalStorage } from "#test/testUtils/mocks/mockLocalStorage"; import { MockImage } from "#test/testUtils/mocks/mocksContainer/mockImage"; +import { initStatsKeys } from "#ui/game-stats-ui-handler"; +import { setCookie } from "#utils/cookies"; import Phaser from "phaser"; -import InputText from "phaser3-rex-plugins/plugins/inputtext"; import BBCodeText from "phaser3-rex-plugins/plugins/bbcodetext"; -import { manageListeners } from "./listenersManager"; -import { initI18n } from "#app/plugins/i18n"; -import { initModifierTypes } from "#app/modifier/modifier-type"; +import InputText from "phaser3-rex-plugins/plugins/inputtext"; let wasInitialized = false; /** diff --git a/test/ui/battle_info.test.ts b/test/ui/battle_info.test.ts index 3049424e3d2..afc456c6430 100644 --- a/test/ui/battle_info.test.ts +++ b/test/ui/battle_info.test.ts @@ -1,9 +1,9 @@ -import { ExpGainsSpeed } from "#app/enums/exp-gains-speed"; -import { SpeciesId } from "#enums/species-id"; -import { ExpPhase } from "#app/phases/exp-phase"; import { AbilityId } from "#enums/ability-id"; +import { ExpGainsSpeed } from "#enums/exp-gains-speed"; import { MoveId } from "#enums/move-id"; -import GameManager from "#test/testUtils/gameManager"; +import { SpeciesId } from "#enums/species-id"; +import { ExpPhase } from "#phases/exp-phase"; +import { GameManager } from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/ui/pokedex.test.ts b/test/ui/pokedex.test.ts index 13f595e0c60..1d81f19052c 100644 --- a/test/ui/pokedex.test.ts +++ b/test/ui/pokedex.test.ts @@ -1,21 +1,19 @@ -import GameManager from "#test/testUtils/gameManager"; -import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import PokedexUiHandler from "#app/ui/pokedex-ui-handler"; -import { FilterTextRow } from "#app/ui/filter-text"; -import { allAbilities } from "#app/data/data-lists"; +import { allAbilities, allSpecies } from "#data/data-lists"; +import type { PokemonForm, PokemonSpecies } from "#data/pokemon-species"; import { AbilityId } from "#enums/ability-id"; -import { SpeciesId } from "#enums/species-id"; -import type { PokemonForm } from "#app/data/pokemon-species"; -import { getPokemonSpecies } from "#app/utils/pokemon-utils"; -import { allSpecies } from "#app/data/data-lists"; import { Button } from "#enums/buttons"; import { DropDownColumn } from "#enums/drop-down-column"; -import type PokemonSpecies from "#app/data/pokemon-species"; import { PokemonType } from "#enums/pokemon-type"; +import { SpeciesId } from "#enums/species-id"; import { UiMode } from "#enums/ui-mode"; -import PokedexPageUiHandler from "#app/ui/pokedex-page-ui-handler"; -import type { StarterAttributes } from "#app/system/game-data"; +import type { StarterAttributes } from "#system/game-data"; +import { GameManager } from "#test/testUtils/gameManager"; +import { FilterTextRow } from "#ui/filter-text"; +import { PokedexPageUiHandler } from "#ui/pokedex-page-ui-handler"; +import { PokedexUiHandler } from "#ui/pokedex-ui-handler"; +import { getPokemonSpecies } from "#utils/pokemon-utils"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; /* Information for the `data_pokedex_tests.psrv`: diff --git a/test/ui/starter-select.test.ts b/test/ui/starter-select.test.ts index 8167ab17957..63abc99174e 100644 --- a/test/ui/starter-select.test.ts +++ b/test/ui/starter-select.test.ts @@ -1,19 +1,19 @@ -import { Gender } from "#app/data/gender"; -import { Nature } from "#enums/nature"; -import { allSpecies } from "#app/data/data-lists"; -import { GameModes } from "#enums/game-modes"; -import { EncounterPhase } from "#app/phases/encounter-phase"; -import { SelectStarterPhase } from "#app/phases/select-starter-phase"; -import type { TitlePhase } from "#app/phases/title-phase"; -import type { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler"; -import type SaveSlotSelectUiHandler from "#app/ui/save-slot-select-ui-handler"; -import type OptionSelectUiHandler from "#app/ui/settings/option-select-ui-handler"; -import type StarterSelectUiHandler from "#app/ui/starter-select-ui-handler"; -import { UiMode } from "#enums/ui-mode"; +import { allSpecies } from "#data/data-lists"; +import { Gender } from "#data/gender"; import { AbilityId } from "#enums/ability-id"; import { Button } from "#enums/buttons"; +import { GameModes } from "#enums/game-modes"; +import { Nature } from "#enums/nature"; import { SpeciesId } from "#enums/species-id"; -import GameManager from "#test/testUtils/gameManager"; +import { UiMode } from "#enums/ui-mode"; +import { EncounterPhase } from "#phases/encounter-phase"; +import { SelectStarterPhase } from "#phases/select-starter-phase"; +import type { TitlePhase } from "#phases/title-phase"; +import { GameManager } from "#test/testUtils/gameManager"; +import type { OptionSelectItem } from "#ui/abstact-option-select-ui-handler"; +import type { OptionSelectUiHandler } from "#ui/option-select-ui-handler"; +import type { SaveSlotSelectUiHandler } from "#ui/save-slot-select-ui-handler"; +import type { StarterSelectUiHandler } from "#ui/starter-select-ui-handler"; import i18next from "i18next"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/ui/transfer-item.test.ts b/test/ui/transfer-item.test.ts index 572d56c5903..f2b0a4f7d35 100644 --- a/test/ui/transfer-item.test.ts +++ b/test/ui/transfer-item.test.ts @@ -1,11 +1,11 @@ -import { BerryType } from "#app/enums/berry-type"; -import { Button } from "#app/enums/buttons"; +import { BerryType } from "#enums/berry-type"; +import { Button } from "#enums/buttons"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; -import PartyUiHandler, { PartyUiMode } from "#app/ui/party-ui-handler"; import { UiMode } from "#enums/ui-mode"; -import GameManager from "#test/testUtils/gameManager"; +import { GameManager } from "#test/testUtils/gameManager"; +import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; +import { PartyUiHandler, PartyUiMode } from "#ui/party-ui-handler"; import Phaser from "phaser"; import type BBCodeText from "phaser3-rex-plugins/plugins/bbcodetext"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/ui/type-hints.test.ts b/test/ui/type-hints.test.ts index 6b0bc6e5ea5..8359c50c35d 100644 --- a/test/ui/type-hints.test.ts +++ b/test/ui/type-hints.test.ts @@ -1,14 +1,14 @@ -import { Button } from "#app/enums/buttons"; +import { Button } from "#enums/buttons"; import { MoveId } from "#enums/move-id"; import { SpeciesId } from "#enums/species-id"; -import { CommandPhase } from "#app/phases/command-phase"; -import FightUiHandler from "#app/ui/fight-ui-handler"; import { UiMode } from "#enums/ui-mode"; -import GameManager from "#test/testUtils/gameManager"; +import { CommandPhase } from "#phases/command-phase"; +import { GameManager } from "#test/testUtils/gameManager"; +import type { MockText } from "#test/testUtils/mocks/mocksContainer/mockText"; +import { FightUiHandler } from "#ui/fight-ui-handler"; +import i18next from "i18next"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import type MockText from "#test/testUtils/mocks/mocksContainer/mockText"; -import i18next from "i18next"; describe("UI - Type Hints", () => { let phaserGame: Phaser.Game; diff --git a/test/utils.test.ts b/test/utils.test.ts index fe93bdd6970..aacd590a023 100644 --- a/test/utils.test.ts +++ b/test/utils.test.ts @@ -1,8 +1,7 @@ -import { expect, describe, it, beforeAll } from "vitest"; -import { randomString, padInt } from "#app/utils/common"; -import { deepMergeSpriteData } from "#app/utils/data"; - +import { padInt, randomString } from "#utils/common"; +import { deepMergeSpriteData } from "#utils/data"; import Phaser from "phaser"; +import { beforeAll, describe, expect, it } from "vitest"; describe("utils", () => { beforeAll(() => { diff --git a/test/vitest.setup.ts b/test/vitest.setup.ts index 93b439e540f..6cf20219408 100644 --- a/test/vitest.setup.ts +++ b/test/vitest.setup.ts @@ -1,8 +1,7 @@ import "vitest-canvas-mock"; +import { initTestFile } from "#test/testUtils/testFileInitialization"; import { afterAll, beforeAll, vi } from "vitest"; -import { initTestFile } from "./testUtils/testFileInitialization"; - /** Set the timezone to UTC for tests. */ /** Mock the override import to always return default values, ignoring any custom overrides. */ diff --git a/tsconfig.json b/tsconfig.json index 6af3e9ce650..f41b3e5895a 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -11,9 +11,38 @@ "rootDir": ".", "baseUrl": "./src", "paths": { + "#abilities/*": ["./data/abilities/*.ts"], + "#api/*": ["./plugins/api/*.ts"], + "#balance/*": ["./data/balance/*.ts"], "#enums/*": ["./enums/*.ts"], - "#app/*": ["*.ts"], - "#test/*": ["../test/*.ts"] + "#events/*": ["./events/*.ts"], + "#field/*": ["./field/*.ts"], + "#inputs/*": ["./configs/inputs/*.ts"], + "#modifiers/*": ["./modifier/*.ts"], + "#moves/*": ["./data/moves/*.ts"], + "#mystery-encounters/*": [ + "./data/mystery-encounters/utils/*.ts", + "./data/mystery-encounters/encounters/*.ts", + "./data/mystery-encounters/requirements/*.ts", + "./data/mystery-encounters/*.ts" + ], + "#package.json": ["../package.json"], + "#phases/*": ["./phases/*.ts"], + "#plugins/*": ["./plugins/vite/*.ts", "./plugins/*.ts"], + "#sprites/*": ["./sprites/*.ts"], + "#system/*": [ + "./system/settings/*.ts", + "./system/version_migration/versions/*.ts", + "./system/version_migration/*.ts", + "./system/*.ts" + ], + "#trainers/*": ["./data/trainers/*.ts"], + "#types/*": ["./@types/*.ts", "./typings/phaser/*.ts"], + "#ui/*": ["./ui/battle-info/*.ts", "./ui/settings/*.ts", "./ui/*.ts"], + "#utils/*": ["./utils/*.ts"], + "#data/*": ["./data/pokemon-forms/*.ts", "./data/pokemon/*.ts", "./data/*.ts"], + "#test/*": ["../test/*.ts"], + "#app/*": ["*.ts"] }, "outDir": "./build", "noEmit": true diff --git a/vitest.config.ts b/vitest.config.ts index c781bde97ed..3f7d640b727 100644 --- a/vitest.config.ts +++ b/vitest.config.ts @@ -1,6 +1,6 @@ import { defineProject } from "vitest/config"; -import { defaultConfig } from "./vite.config"; import { BaseSequencer, type TestSpecification } from "vitest/node"; +import { defaultConfig } from "./vite.config"; function getTestOrder(testName: string): number { if (testName.includes("battle-scene.test.ts")) {