diff --git a/package.json b/package.json index 91d702dade5..7ee9010acda 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,6 @@ "node": ">=20.0.0" }, "imports": { - "#enums": "./enums", "#enums/*": "./enums/*", "#app": "./src/main.js", "#app/*": "./src/*", diff --git a/src/battle-scene.ts b/src/battle-scene.ts index ab36c707025..ef4304be9da 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -52,8 +52,18 @@ import * as Overrides from "./overrides"; import {InputsController} from "./inputs-controller"; import {UiInputs} from "./ui-inputs"; import { NewArenaEvent } from "./events/battle-scene"; -import { Abilities, BattleSpec, BattleStyle, Biome, EaseType, ExpNotification, MoneyFormat, Moves, PlayerGender, UiTheme, Species} from "#enums"; import ArenaFlyout from "./ui/arena-flyout"; +import { EaseType } from "#enums/ease-type"; +import { Abilities } from "#enums/abilities"; +import { BattleSpec } from "#enums/battle-spec"; +import { BattleStyle } from "#enums/battle-style"; +import { Biome } from "#enums/biome"; +import { ExpNotification } from "#enums/exp-notification"; +import { MoneyFormat } from "#enums/money-format"; +import { Moves } from "#enums/moves"; +import { PlayerGender } from "#enums/player-gender"; +import { Species } from "#enums/species"; +import { UiTheme } from "#enums/ui-theme"; export const bypassLogin = import.meta.env.VITE_BYPASS_LOGIN === "1"; diff --git a/src/battle.ts b/src/battle.ts index 6650903cb18..97fd8dd064c 100644 --- a/src/battle.ts +++ b/src/battle.ts @@ -4,10 +4,14 @@ import { Command } from "./ui/command-ui-handler"; import * as Utils from "./utils"; import Trainer, { TrainerVariant } from "./field/trainer"; import { GameMode } from "./game-mode"; -import { BattleSpec, Moves, PlayerGender, Species, TrainerType } from "#enums"; import { MoneyMultiplierModifier, PokemonHeldItemModifier } from "./modifier/modifier"; import { PokeballType } from "./data/pokeball"; import {trainerConfigs} from "#app/data/trainer-config"; +import { BattleSpec } from "#enums/battle-spec"; +import { Moves } from "#enums/moves"; +import { PlayerGender } from "#enums/player-gender"; +import { Species } from "#enums/species"; +import { TrainerType } from "#enums/trainer-type"; export enum BattleType { WILD, diff --git a/src/configs/inputs/cfg_keyboard_qwerty.ts b/src/configs/inputs/cfg_keyboard_qwerty.ts index ef6a0cceb8f..09a02f02836 100644 --- a/src/configs/inputs/cfg_keyboard_qwerty.ts +++ b/src/configs/inputs/cfg_keyboard_qwerty.ts @@ -1,4 +1,4 @@ -import {Button} from "#enums"; +import {Button} from "#enums/buttons"; import {SettingKeyboard} from "#app/system/settings/settings-keyboard"; const cfg_keyboard_qwerty = { diff --git a/src/configs/inputs/configHandler.ts b/src/configs/inputs/configHandler.ts index f327efce287..a67c45fd413 100644 --- a/src/configs/inputs/configHandler.ts +++ b/src/configs/inputs/configHandler.ts @@ -1,4 +1,4 @@ -import {Device} from "#enums"; +import {Device} from "#enums/devices"; /** * Retrieves the key associated with the specified keycode from the mapping. diff --git a/src/configs/inputs/pad_dualshock.ts b/src/configs/inputs/pad_dualshock.ts index 0ec79ab9614..742040958b4 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"; +import {Button} from "#enums/buttons"; /** * Dualshock mapping diff --git a/src/configs/inputs/pad_generic.ts b/src/configs/inputs/pad_generic.ts index 76aedd963f0..88ff66e231c 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"; +import {Button} from "#enums/buttons"; /** * Generic pad mapping diff --git a/src/configs/inputs/pad_procon.ts b/src/configs/inputs/pad_procon.ts index c94ff39bf70..8cb707f882a 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.js"; -import {Button} from "#enums"; +import {Button} from "#enums/buttons"; /** * Nintendo Pro Controller mapping diff --git a/src/configs/inputs/pad_unlicensedSNES.ts b/src/configs/inputs/pad_unlicensedSNES.ts index 07926ad682e..8a7f3e78f98 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"; +import {Button} from "#enums/buttons"; /** * 081f-e401 - UnlicensedSNES diff --git a/src/configs/inputs/pad_xbox360.ts b/src/configs/inputs/pad_xbox360.ts index 01d8d9497da..e003ccc8e87 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"; +import {Button} from "#enums/buttons"; /** * Generic pad mapping diff --git a/src/data/ability.ts b/src/data/ability.ts index d83a1429bc8..f0c6443eca6 100755 --- a/src/data/ability.ts +++ b/src/data/ability.ts @@ -6,7 +6,6 @@ import { MovePhase, PokemonHealPhase, ShowAbilityPhase, StatChangePhase } from " import { getPokemonMessage, getPokemonNameWithAffix } from "../messages"; import { Weather, WeatherType } from "./weather"; import { BattlerTag } from "./battler-tags"; -import { ArenaTagType, Abilities, BattlerTagType, Moves, Species } from "#enums"; import { StatusEffect, getNonVolatileStatusEffects, getStatusEffectDescriptor, getStatusEffectHealText } from "./status-effect"; import { Gender } from "./gender"; import Move, { AttackMove, MoveCategory, MoveFlags, MoveTarget, FlinchAttr, OneHitKOAttr, HitHealAttr, allMoves, StatusMove, SelfStatusMove, VariablePowerAttr, applyMoveAttrs, IncrementMovePriorityAttr, VariableMoveTypeAttr, RandomMovesetMoveAttr, RandomMoveAttr, NaturePowerAttr, CopyMoveAttr } from "./move"; @@ -20,6 +19,11 @@ import { Command } from "../ui/command-ui-handler"; import { BerryModifierType } from "#app/modifier/modifier-type"; import { getPokeballName } from "./pokeball"; import { BattlerIndex } from "#app/battle"; +import { Abilities } from "#enums/abilities"; +import { ArenaTagType } from "#enums/arena-tag-type"; +import { BattlerTagType } from "#enums/battler-tag-type"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; export class Ability implements Localizable { public id: Abilities; diff --git a/src/data/api.ts b/src/data/api.ts index 96d704abb05..f4a72a24c76 100644 --- a/src/data/api.ts +++ b/src/data/api.ts @@ -6,9 +6,11 @@ import PokemonSpecies, { PokemonForm, SpeciesFormKey, allSpecies } from "./pokem import { GrowthRate } from "./exp"; import { Type } from "./type"; import { allAbilities } from "./ability"; -import { Abilities, Moves, Species } from "#enums"; import { pokemonFormLevelMoves } from "./pokemon-level-moves"; import { tmSpecies } from "./tms"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; const targetMap = { "specific-move": MoveTarget.ATTACKER, diff --git a/src/data/arena-tag.ts b/src/data/arena-tag.ts index bffca0ca7f0..b1c1b46487c 100644 --- a/src/data/arena-tag.ts +++ b/src/data/arena-tag.ts @@ -7,11 +7,14 @@ import Pokemon, { HitResult, PokemonMove } from "../field/pokemon"; import { MoveEffectPhase, PokemonHealPhase, ShowAbilityPhase, StatChangePhase} from "../phases"; import { StatusEffect } from "./status-effect"; import { BattlerIndex } from "../battle"; -import { Abilities, ArenaTagType, BattlerTagType, Moves } from "#enums"; import { BlockNonDirectDamageAbAttr, ProtectStatAbAttr, applyAbAttrs } from "./ability"; import { BattleStat } from "./battle-stat"; import { CommonAnim, CommonBattleAnim } from "./battle-anims"; import i18next from "i18next"; +import { Abilities } from "#enums/abilities"; +import { ArenaTagType } from "#enums/arena-tag-type"; +import { BattlerTagType } from "#enums/battler-tag-type"; +import { Moves } from "#enums/moves"; export enum ArenaTagSide { BOTH, diff --git a/src/data/battle-anims.ts b/src/data/battle-anims.ts index 19ebe8ad7af..d4dbb8ec350 100644 --- a/src/data/battle-anims.ts +++ b/src/data/battle-anims.ts @@ -5,7 +5,7 @@ import Pokemon from "../field/pokemon"; import * as Utils from "../utils"; import { BattlerIndex } from "../battle"; import { Element } from "json-stable-stringify"; -import { Moves } from "#enums"; +import { Moves } from "#enums/moves"; //import fs from 'vite-plugin-fs/browser'; export enum AnimFrameTarget { diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts index b2b58339c9b..977dceb8d30 100644 --- a/src/data/battler-tags.ts +++ b/src/data/battler-tags.ts @@ -8,12 +8,15 @@ import * as Utils from "../utils"; import { ChargeAttr, MoveFlags, allMoves } from "./move"; import { Type } from "./type"; import { BlockNonDirectDamageAbAttr, FlinchEffectAbAttr, ReverseDrainAbAttr, applyAbAttrs } from "./ability"; -import { Abilities, BattlerTagType, Moves, Species } from "#enums"; import { TerrainType } from "./terrain"; import { WeatherType } from "./weather"; import { BattleStat } from "./battle-stat"; import { allAbilities } from "./ability"; import { SpeciesFormChangeManualTrigger } from "./pokemon-forms"; +import { Abilities } from "#enums/abilities"; +import { BattlerTagType } from "#enums/battler-tag-type"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; export enum BattlerTagLapseType { FAINT, diff --git a/src/data/berry.ts b/src/data/berry.ts index f865ee43682..5b4f55c8e13 100644 --- a/src/data/berry.ts +++ b/src/data/berry.ts @@ -2,11 +2,12 @@ import { PokemonHealPhase, StatChangePhase } from "../phases"; import { getPokemonMessage } from "../messages"; import Pokemon, { HitResult } from "../field/pokemon"; import { BattleStat } from "./battle-stat"; -import { BattlerTagType, BerryType } from "#enums"; import { getStatusEffectHealText } from "./status-effect"; import * as Utils from "../utils"; import { DoubleBerryEffectAbAttr, ReduceBerryUseThresholdAbAttr, applyAbAttrs } from "./ability"; import i18next from "../plugins/i18n"; +import { BattlerTagType } from "#enums/battler-tag-type"; +import { BerryType } from "#enums/berry-type"; export function getBerryName(berryType: BerryType): string { return i18next.t(`berry:${BerryType[berryType]}.name`); diff --git a/src/data/biomes.ts b/src/data/biomes.ts index 1d9e9638914..166b1fd40c3 100644 --- a/src/data/biomes.ts +++ b/src/data/biomes.ts @@ -1,9 +1,12 @@ import { Type } from "./type"; import * as Utils from "../utils"; import beautify from "json-beautify"; -import { Biome, Species, TimeOfDay, TrainerType } from "#enums"; import {pokemonEvolutions, SpeciesFormEvolution} from "./pokemon-evolutions"; import i18next from "i18next"; +import { Biome } from "#enums/biome"; +import { Species } from "#enums/species"; +import { TimeOfDay } from "#enums/time-of-day"; +import { TrainerType } from "#enums/trainer-type"; export function getBiomeName(biome: Biome | -1) { if (biome === -1) { diff --git a/src/data/challenge.ts b/src/data/challenge.ts index 9f9d5ef5823..8b41e8c8d9d 100644 --- a/src/data/challenge.ts +++ b/src/data/challenge.ts @@ -1,5 +1,4 @@ import * as Utils from "../utils"; -import { Challenges, TrainerType, Species } from "#enums"; import i18next from "#app/plugins/i18n.js"; import { GameData } from "#app/system/game-data.js"; import PokemonSpecies, { getPokemonSpecies, speciesStarters } from "./pokemon-species"; @@ -8,6 +7,9 @@ import { BattleType, FixedBattleConfig } from "#app/battle.js"; import Trainer, { TrainerVariant } from "#app/field/trainer.js"; import { GameMode } from "#app/game-mode.js"; import { Type } from "./type"; +import { Challenges } from "#enums/challenges"; +import { Species } from "#enums/species"; +import { TrainerType } from "#enums/trainer-type"; /** * An enum for all the challenge types. The parameter entries on these describe the diff --git a/src/data/daily-run.ts b/src/data/daily-run.ts index 8be7edecbe4..4b741b6f473 100644 --- a/src/data/daily-run.ts +++ b/src/data/daily-run.ts @@ -1,9 +1,10 @@ +import { PartyMemberStrength } from "#enums/party-member-strength"; +import { Species } from "#enums/species"; import BattleScene from "../battle-scene"; import { PlayerPokemon } from "../field/pokemon"; import { Starter } from "../ui/starter-select-ui-handler"; import * as Utils from "../utils"; import PokemonSpecies, { PokemonSpeciesForm, getPokemonSpecies, getPokemonSpeciesForm, speciesStarters } from "./pokemon-species"; -import { PartyMemberStrength, Species } from "#enums"; export interface DailyRunConfig { seed: integer; diff --git a/src/data/dialogue.ts b/src/data/dialogue.ts index bcbb4dfcbc1..ae6aa72b52c 100644 --- a/src/data/dialogue.ts +++ b/src/data/dialogue.ts @@ -1,5 +1,6 @@ +import { BattleSpec } from "#enums/battle-spec"; +import { TrainerType } from "#enums/trainer-type"; import {trainerConfigs} from "./trainer-config"; -import {BattleSpec, TrainerType} from "#enums"; export interface TrainerTypeMessages { encounter?: string | string[], diff --git a/src/data/egg-moves.ts b/src/data/egg-moves.ts index 23880625a8a..6204b9e1df7 100644 --- a/src/data/egg-moves.ts +++ b/src/data/egg-moves.ts @@ -1,6 +1,7 @@ -import { Moves, Species } from "#enums"; import { allMoves } from "./move"; import * as Utils from "../utils"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; export const speciesEggMoves = { diff --git a/src/data/egg.ts b/src/data/egg.ts index 00393518f69..6b41bffa45e 100644 --- a/src/data/egg.ts +++ b/src/data/egg.ts @@ -1,7 +1,8 @@ import BattleScene from "../battle-scene"; import PokemonSpecies, { getPokemonSpecies, speciesStarters } from "./pokemon-species"; -import { EggTier, Species } from "#enums"; import i18next from "../plugins/i18n"; +import { EggTier } from "#enums/egg-type"; +import { Species } from "#enums/species"; export const EGG_SEED = 1073741824; diff --git a/src/data/move.ts b/src/data/move.ts index 869dfae6555..b7bfd9343f2 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -10,7 +10,6 @@ import * as Utils from "../utils"; import { WeatherType } from "./weather"; import { ArenaTagSide, ArenaTrapTag } from "./arena-tag"; import { UnswappableAbilityAbAttr, UncopiableAbilityAbAttr, UnsuppressableAbilityAbAttr, BlockRecoilDamageAttr, BlockOneHitKOAbAttr, IgnoreContactAbAttr, MaxMultiHitAbAttr, applyAbAttrs, BlockNonDirectDamageAbAttr, applyPreSwitchOutAbAttrs, PreSwitchOutAbAttr, applyPostDefendAbAttrs, PostDefendContactApplyStatusEffectAbAttr, MoveAbilityBypassAbAttr, ReverseDrainAbAttr, FieldPreventExplosiveMovesAbAttr, ForceSwitchOutImmunityAbAttr, BlockItemTheftAbAttr, applyPostAttackAbAttrs, ConfusionOnStatusEffectAbAttr, HealFromBerryUseAbAttr } from "./ability"; -import { Abilities, ArenaTagType, BattlerTagType, Biome, Moves, Species } from "#enums"; import { allAbilities } from "./ability"; import { PokemonHeldItemModifier, BerryModifier, PreserveBerryModifier } from "../modifier/modifier"; import { BattlerIndex } from "../battle"; @@ -21,6 +20,12 @@ import { ModifierPoolType } from "#app/modifier/modifier-type"; import { Command } from "../ui/command-ui-handler"; import i18next, { Localizable } from "../plugins/i18n"; import { getBerryEffectFunc } from "./berry"; +import { Abilities } from "#enums/abilities"; +import { ArenaTagType } from "#enums/arena-tag-type"; +import { BattlerTagType } from "#enums/battler-tag-type"; +import { Biome } from "#enums/biome"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; export enum MoveCategory { PHYSICAL, diff --git a/src/data/nature.ts b/src/data/nature.ts index 55b38f5ba86..0d9be0f663d 100644 --- a/src/data/nature.ts +++ b/src/data/nature.ts @@ -1,7 +1,7 @@ import { Stat, getStatName } from "./pokemon-stat"; import * as Utils from "../utils"; import { TextStyle, getBBCodeFrag } from "../ui/text"; -import { UiTheme } from "#enums"; +import { UiTheme } from "#enums/ui-theme"; import i18next from "i18next"; export enum Nature { diff --git a/src/data/pokemon-evolutions.ts b/src/data/pokemon-evolutions.ts index 2ccac3522a7..1fb1f7db5fd 100644 --- a/src/data/pokemon-evolutions.ts +++ b/src/data/pokemon-evolutions.ts @@ -6,8 +6,11 @@ import { Type } from "./type"; import * as Utils from "../utils"; import { SpeciesFormKey } from "./pokemon-species"; import { WeatherType } from "./weather"; -import { Biome, Moves, Species, TimeOfDay } from "#enums"; import { Nature } from "./nature"; +import { Biome } from "#enums/biome"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import { TimeOfDay } from "#enums/time-of-day"; export enum SpeciesWildEvolutionDelay { NONE, diff --git a/src/data/pokemon-forms.ts b/src/data/pokemon-forms.ts index b00b57826cf..cc05af50f6f 100644 --- a/src/data/pokemon-forms.ts +++ b/src/data/pokemon-forms.ts @@ -3,7 +3,10 @@ import Pokemon from "../field/pokemon"; import { SpeciesFormKey } from "./pokemon-species"; import { StatusEffect } from "./status-effect"; import { MoveCategory, allMoves } from "./move"; -import { Abilities, Moves, Species, TimeOfDay } from "#enums"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import { TimeOfDay } from "#enums/time-of-day"; export enum FormChangeItem { NONE, diff --git a/src/data/pokemon-level-moves.ts b/src/data/pokemon-level-moves.ts index ffa42eda453..5f01b4db02f 100644 --- a/src/data/pokemon-level-moves.ts +++ b/src/data/pokemon-level-moves.ts @@ -1,4 +1,5 @@ -import { Moves, Species } from "#enums"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; export type LevelMoves = ([integer, Moves])[]; diff --git a/src/data/pokemon-species.ts b/src/data/pokemon-species.ts index 8313a94cb50..6bb0f8db7c5 100644 --- a/src/data/pokemon-species.ts +++ b/src/data/pokemon-species.ts @@ -1,4 +1,4 @@ -import { Abilities, PartyMemberStrength, Species } from "#enums"; + import BattleScene, { AnySound } from "../battle-scene"; import { Variant, variantColorCache } from "./variant"; import { variantData } from "./variant"; @@ -15,6 +15,9 @@ import { QuantizerCelebi, argbFromRgba, rgbaFromArgb } from "@material/material- import { VariantSet } from "./variant"; import i18next, { Localizable } from "../plugins/i18n"; import { Stat } from "./pokemon-stat"; +import { Abilities } from "#enums/abilities"; +import { PartyMemberStrength } from "#enums/party-member-strength"; +import { Species } from "#enums/species"; export enum Region { NORMAL, diff --git a/src/data/tms.ts b/src/data/tms.ts index 43a1fc049be..605419e4685 100644 --- a/src/data/tms.ts +++ b/src/data/tms.ts @@ -1,5 +1,6 @@ import { ModifierTier } from "../modifier/modifier-tier"; -import { Moves, Species } from "#enums"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; interface TmSpecies { [key: integer]: Array> diff --git a/src/data/trainer-config.ts b/src/data/trainer-config.ts index c083453ac00..2479f1a189f 100644 --- a/src/data/trainer-config.ts +++ b/src/data/trainer-config.ts @@ -10,9 +10,12 @@ import {Type} from "./type"; import {doubleBattleDialogue} from "./dialogue"; import {PersistentModifier} from "../modifier/modifier"; import {TrainerVariant} from "../field/trainer"; -import {Moves, PartyMemberStrength, Species, TrainerType} from "#enums"; import {getIsInitialized, initI18n} from "#app/plugins/i18n"; import i18next from "i18next"; +import { Moves } from "#enums/moves"; +import { PartyMemberStrength } from "#enums/party-member-strength"; +import { Species } from "#enums/species"; +import { TrainerType } from "#enums/trainer-type"; export enum TrainerPoolTier { COMMON, diff --git a/src/data/trainer-names.ts b/src/data/trainer-names.ts index 1233760da81..b986378ee47 100644 --- a/src/data/trainer-names.ts +++ b/src/data/trainer-names.ts @@ -1,4 +1,4 @@ -import { TrainerType } from "#enums"; +import { TrainerType } from "#enums/trainer-type"; import * as Utils from "../utils"; class TrainerNameConfig { diff --git a/src/data/weather.ts b/src/data/weather.ts index 53b87445518..425dd3724f6 100644 --- a/src/data/weather.ts +++ b/src/data/weather.ts @@ -1,4 +1,4 @@ -import { Biome } from "#enums"; +import { Biome } from "#enums/biome"; import { getPokemonMessage, getPokemonNameWithAffix } from "../messages"; import Pokemon from "../field/pokemon"; import { Type } from "./type"; diff --git a/src/egg-hatch-phase.ts b/src/egg-hatch-phase.ts index 7264b5c8ee1..3fce35e4f88 100644 --- a/src/egg-hatch-phase.ts +++ b/src/egg-hatch-phase.ts @@ -9,10 +9,11 @@ import { PlayerPokemon } from "./field/pokemon"; import { getPokemonSpecies, speciesStarters } from "./data/pokemon-species"; import { achvs } from "./system/achv"; import { pokemonPrevolutions } from "./data/pokemon-evolutions"; -import { EggTier, Species } from "#enums"; import PokemonInfoContainer from "./ui/pokemon-info-container"; import EggCounterContainer from "./ui/egg-counter-container"; import { EggCountChangedEvent } from "./events/egg"; +import { EggTier } from "#enums/egg-type"; +import { Species } from "#enums/species"; /** * Class that represents egg hatching diff --git a/src/enums/index.ts b/src/enums/index.ts deleted file mode 100644 index e81c5d97f22..00000000000 --- a/src/enums/index.ts +++ /dev/null @@ -1,25 +0,0 @@ -export * from "./abilities"; -export * from "./arena-tag-type"; -export * from "./battle-spec"; -export * from "./battle-style"; -export * from "./battler-tag-type"; -export * from "./berry-type"; -export * from "./biome"; -export * from "./buttons"; -export * from "./challenges"; -export * from "./devices"; -export * from "./ease-type"; -export * from "./egg-type"; -export * from "./exp-notification"; -export * from "./game-data-type"; -export * from "./money-format"; -export * from "./moves"; -export * from "./money-format"; -export * from "./party-member-strength"; -export * from "./passive"; -export * from "./player-gender"; -export * from "./species"; -export * from "./time-of-day"; -export * from "./trainer-type"; -export * from "./ui-theme"; - diff --git a/src/enums/species.ts b/src/enums/species.ts index 0299ee0ce5b..3d410deec1a 100644 --- a/src/enums/species.ts +++ b/src/enums/species.ts @@ -2164,15 +2164,3 @@ export enum Species { /**{@link https://bulbapedia.bulbagarden.net/wiki/Ursaluna_(Pokémon) | Source} */ BLOODMOON_URSALUNA = 8901, } - -export const defaultStarterSpecies: Species[] = [ - Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE, - Species.CHIKORITA, Species.CYNDAQUIL, Species.TOTODILE, - Species.TREECKO, Species.TORCHIC, Species.MUDKIP, - Species.TURTWIG, Species.CHIMCHAR, Species.PIPLUP, - Species.SNIVY, Species.TEPIG, Species.OSHAWOTT, - Species.CHESPIN, Species.FENNEKIN, Species.FROAKIE, - Species.ROWLET, Species.LITTEN, Species.POPPLIO, - Species.GROOKEY, Species.SCORBUNNY, Species.SOBBLE, - Species.SPRIGATITO, Species.FUECOCO, Species.QUAXLY -]; diff --git a/src/events/arena.ts b/src/events/arena.ts index 64e53a07ee9..657acaeae7e 100644 --- a/src/events/arena.ts +++ b/src/events/arena.ts @@ -1,5 +1,5 @@ import { ArenaTagSide } from "#app/data/arena-tag.js"; -import { ArenaTagType } from "#enums"; +import { ArenaTagType } from "#enums/arena-tag-type"; import { TerrainType } from "#app/data/terrain.js"; import { WeatherType } from "#app/data/weather.js"; diff --git a/src/field/arena.ts b/src/field/arena.ts index e3e9d644886..14280536a5f 100644 --- a/src/field/arena.ts +++ b/src/field/arena.ts @@ -1,6 +1,5 @@ import BattleScene from "../battle-scene"; import { BiomePoolTier, PokemonPools, BiomeTierTrainerPools, biomePokemonPools, biomeTrainerPools } from "../data/biomes"; -import { ArenaTagType, Biome, Moves, Species, TimeOfDay, TrainerType } from "#enums"; import * as Utils from "../utils"; import PokemonSpecies, { getPokemonSpecies } from "../data/pokemon-species"; import { Weather, WeatherType, getTerrainClearMessage, getTerrainStartMessage, getWeatherClearMessage, getWeatherStartMessage } from "../data/weather"; @@ -15,6 +14,12 @@ import { PostTerrainChangeAbAttr, PostWeatherChangeAbAttr, applyPostTerrainChang import Pokemon from "./pokemon"; import * as Overrides from "../overrides"; import { WeatherChangedEvent, TerrainChangedEvent, TagAddedEvent, TagRemovedEvent } from "../events/arena"; +import { ArenaTagType } from "#enums/arena-tag-type"; +import { Biome } from "#enums/biome"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import { TimeOfDay } from "#enums/time-of-day"; +import { TrainerType } from "#enums/trainer-type"; export class Arena { public scene: BattleScene; diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index ce4ee6644dd..53db7ac262e 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -22,7 +22,6 @@ import { BattlerTag, BattlerTagLapseType, EncoreTag, HelpingHandTag, HighestStat import { WeatherType } from "../data/weather"; import { TempBattleStat } from "../data/temp-battle-stat"; import { ArenaTagSide, WeakenMoveScreenTag, WeakenMoveTypeTag } from "../data/arena-tag"; -import { Abilities, ArenaTagType, Moves, BattlerTagType, Species, Biome, BattleSpec, BerryType } from "#enums"; import { Ability, AbAttr, BattleStatMultiplierAbAttr, BlockCritAbAttr, BonusCritAbAttr, BypassBurnDamageReductionAbAttr, FieldPriorityMoveImmunityAbAttr, FieldVariableMovePowerAbAttr, IgnoreOpponentStatChangesAbAttr, MoveImmunityAbAttr, MoveTypeChangeAttr, PreApplyBattlerTagAbAttr, PreDefendFullHpEndureAbAttr, ReceivedMoveDamageMultiplierAbAttr, ReduceStatusEffectDurationAbAttr, StabBoostAbAttr, StatusEffectImmunityAbAttr, TypeImmunityAbAttr, VariableMovePowerAbAttr, WeightMultiplierAbAttr, allAbilities, applyAbAttrs, applyBattleStatMultiplierAbAttrs, applyPreApplyBattlerTagAbAttrs, applyPreAttackAbAttrs, applyPreDefendAbAttrs, applyPreSetStatusAbAttrs, UnsuppressableAbilityAbAttr, SuppressFieldAbilitiesAbAttr, NoFusionAbilityAbAttr, MultCritAbAttr, IgnoreTypeImmunityAbAttr, DamageBoostAbAttr, IgnoreTypeStatusEffectImmunityAbAttr, ConditionalCritAbAttr, applyFieldBattleStatMultiplierAbAttrs, FieldMultiplyBattleStatAbAttr } from "../data/ability"; import PokemonData from "../system/pokemon-data"; import { BattlerIndex } from "../battle"; @@ -42,6 +41,14 @@ import i18next from "../plugins/i18n"; import { speciesEggMoves } from "../data/egg-moves"; import { ModifierTier } from "../modifier/modifier-tier"; import { applyChallenges, ChallengeType } from "#app/data/challenge.js"; +import { Abilities } from "#enums/abilities"; +import { ArenaTagType } from "#enums/arena-tag-type"; +import { BattleSpec } from "#enums/battle-spec"; +import { BattlerTagType } from "#enums/battler-tag-type"; +import { BerryType } from "#enums/berry-type"; +import { Biome } from "#enums/biome"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; export enum FieldPosition { CENTER, diff --git a/src/field/trainer.ts b/src/field/trainer.ts index c4af4be767b..a582ab4b096 100644 --- a/src/field/trainer.ts +++ b/src/field/trainer.ts @@ -11,7 +11,6 @@ import { trainerPartyTemplates, signatureSpecies } from "../data/trainer-config"; -import {PartyMemberStrength, Species, TrainerType} from "#enums"; import {EnemyPokemon} from "./pokemon"; import * as Utils from "../utils"; import {PersistentModifier} from "../modifier/modifier"; @@ -19,6 +18,9 @@ import {trainerNamePools} from "../data/trainer-names"; import {ArenaTagSide, ArenaTrapTag} from "#app/data/arena-tag"; import {getIsInitialized, initI18n} from "#app/plugins/i18n"; import i18next from "i18next"; +import { PartyMemberStrength } from "#enums/party-member-strength"; +import { Species } from "#enums/species"; +import { TrainerType } from "#enums/trainer-type"; export enum TrainerVariant { DEFAULT, diff --git a/src/form-change-phase.ts b/src/form-change-phase.ts index df60cc100f7..f2cf9933b17 100644 --- a/src/form-change-phase.ts +++ b/src/form-change-phase.ts @@ -7,7 +7,7 @@ import { EndEvolutionPhase, EvolutionPhase } from "./evolution-phase"; import Pokemon, { EnemyPokemon, PlayerPokemon } from "./field/pokemon"; import { Mode } from "./ui/ui"; import PartyUiHandler from "./ui/party-ui-handler"; -import { BattleSpec } from "#enums"; +import { BattleSpec } from "#enums/battle-spec"; import { BattlePhase, MovePhase, PokemonHealPhase } from "./phases"; import { getTypeRgb } from "./data/type"; diff --git a/src/game-mode.ts b/src/game-mode.ts index f0db6c04a52..0a472e223e3 100644 --- a/src/game-mode.ts +++ b/src/game-mode.ts @@ -2,11 +2,12 @@ import i18next from "i18next"; import { classicFixedBattles, FixedBattleConfig, FixedBattleConfigs } from "./battle"; import BattleScene from "./battle-scene"; import { allChallenges, applyChallenges, Challenge, ChallengeType, copyChallenge } from "./data/challenge"; -import { Biome, Species } from "#enums"; import PokemonSpecies, { allSpecies } from "./data/pokemon-species"; import { Arena } from "./field/arena"; import * as Overrides from "./overrides"; import * as Utils from "./utils"; +import { Biome } from "#enums/biome"; +import { Species } from "#enums/species"; export enum GameModes { CLASSIC, diff --git a/src/inputs-controller.ts b/src/inputs-controller.ts index 5502292cac0..834ca233942 100644 --- a/src/inputs-controller.ts +++ b/src/inputs-controller.ts @@ -10,7 +10,6 @@ import {Mode} from "./ui/ui"; import SettingsGamepadUiHandler from "./ui/settings/settings-gamepad-ui-handler"; import SettingsKeyboardUiHandler from "./ui/settings/settings-keyboard-ui-handler"; import cfg_keyboard_qwerty from "./configs/inputs/cfg_keyboard_qwerty"; -import {Button, Device} from "#enums"; import { assign, getButtonWithKeycode, @@ -20,6 +19,8 @@ import BattleScene from "./battle-scene"; import {SettingGamepad} from "#app/system/settings/settings-gamepad.js"; import {SettingKeyboard} from "#app/system/settings/settings-keyboard"; import TouchControl from "#app/touch-controls"; +import { Button } from "#enums/buttons"; +import { Device } from "#enums/devices"; export interface DeviceMapping { [key: string]: number; diff --git a/src/loading-scene.ts b/src/loading-scene.ts index 4b10af48280..cb1eae4c6d9 100644 --- a/src/loading-scene.ts +++ b/src/loading-scene.ts @@ -1,5 +1,4 @@ import { GachaType } from "./data/egg"; -import { Biome, TrainerType } from "#enums"; import { trainerConfigs } from "./data/trainer-config"; import { getBiomeHasProps } from "./field/arena"; import CacheBustedLoaderPlugin from "./plugins/cache-busted-loader-plugin"; @@ -21,6 +20,8 @@ import { initChallenges } from "./data/challenge"; import i18next from "i18next"; import { initStatsKeys } from "./ui/game-stats-ui-handler"; import { initVouchers } from "./system/voucher"; +import { Biome } from "#enums/biome"; +import { TrainerType } from "#enums/trainer-type"; export class LoadingScene extends SceneBase { constructor() { diff --git a/src/messages.ts b/src/messages.ts index 25a0674f208..b9fbf7f7183 100644 --- a/src/messages.ts +++ b/src/messages.ts @@ -1,4 +1,4 @@ -import { BattleSpec } from "#enums"; +import { BattleSpec } from "#enums/battle-spec"; import Pokemon from "./field/pokemon"; import i18next from "./plugins/i18n"; diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts index e2ca5418fc7..ac7452ae4c9 100644 --- a/src/modifier/modifier-type.ts +++ b/src/modifier/modifier-type.ts @@ -1,6 +1,5 @@ import * as Modifiers from "./modifier"; import { AttackMove, allMoves } from "../data/move"; -import { Abilities, BattlerTagType, BerryType, Moves } from "#enums"; import { PokeballType, getPokeballCatchMultiplier, getPokeballName } from "../data/pokeball"; import Pokemon, { EnemyPokemon, PlayerPokemon, PokemonMove } from "../field/pokemon"; import { EvolutionItem, pokemonEvolutions } from "../data/pokemon-evolutions"; @@ -23,6 +22,10 @@ import i18next from "#app/plugins/i18n"; import { getModifierTierTextTint } from "#app/ui/text"; import * as Overrides from "../overrides"; import { MoneyMultiplierModifier } from "./modifier"; +import { Abilities } from "#enums/abilities"; +import { BattlerTagType } from "#enums/battler-tag-type"; +import { BerryType } from "#enums/berry-type"; +import { Moves } from "#enums/moves"; const outputModifierData = false; const useMaxWeightForOutput = false; diff --git a/src/modifier/modifier.ts b/src/modifier/modifier.ts index 3a2d0d0bf1e..5ea983fb598 100644 --- a/src/modifier/modifier.ts +++ b/src/modifier/modifier.ts @@ -13,7 +13,8 @@ import { getPokemonMessage } from "../messages"; import * as Utils from "../utils"; import { TempBattleStat } from "../data/temp-battle-stat"; import { getBerryEffectFunc, getBerryPredicate } from "../data/berry"; -import { BattlerTagType, BerryType } from "#enums"; +import { BattlerTagType} from "#enums/battler-tag-type"; +import { BerryType } from "#enums/berry-type"; import { StatusEffect, getStatusEffectHealText } from "../data/status-effect"; import { achvs } from "../system/achv"; import { VoucherType } from "../system/voucher"; diff --git a/src/overrides.ts b/src/overrides.ts index d39c0ebfa4e..6ae3af64299 100644 --- a/src/overrides.ts +++ b/src/overrides.ts @@ -1,4 +1,3 @@ -import { Species, Abilities, Biome, Moves, BerryType, TimeOfDay } from "#enums"; import { WeatherType } from "./data/weather"; import { Variant } from "./data/variant"; import { TempBattleStat } from "./data/temp-battle-stat"; @@ -11,6 +10,12 @@ import { Gender } from "./data/gender"; import { StatusEffect } from "./data/status-effect"; import { modifierTypes } from "./modifier/modifier-type"; import { allSpecies } from "./data/pokemon-species"; // eslint-disable-line @typescript-eslint/no-unused-vars +import { Abilities } from "#enums/abilities"; +import { BerryType } from "#enums/berry-type"; +import { Biome } from "#enums/biome"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import { TimeOfDay } from "#enums/time-of-day"; /** * Overrides for testing different in game situations diff --git a/src/phases.ts b/src/phases.ts index 77d8e777b73..e976b133fea 100644 --- a/src/phases.ts +++ b/src/phases.ts @@ -1,7 +1,6 @@ import BattleScene, { bypassLogin } from "./battle-scene"; import { default as Pokemon, PlayerPokemon, EnemyPokemon, PokemonMove, MoveResult, DamageResult, FieldPosition, HitResult, TurnMove } from "./field/pokemon"; import * as Utils from "./utils"; -import { Abilities, ArenaTagType, BattleSpec, BattleStyle, BattlerTagType, Biome, ExpNotification, Moves, PlayerGender, Species, TrainerType } from "#enums"; import { allMoves, applyMoveAttrs, BypassSleepAttr, ChargeAttr, applyFilteredMoveAttrs, HitsTagAttr, MissEffectAttr, MoveAttr, MoveEffectAttr, MoveFlags, MultiHitAttr, OverrideMoveEffectAttr, VariableAccuracyAttr, MoveTarget, getMoveTargets, MoveTargetSet, MoveEffectTrigger, CopyMoveAttr, AttackMove, SelfStatusMove, PreMoveMessageAttr, HealStatusEffectAttr, IgnoreOpponentStatChangesAttr, NoEffectAttr, BypassRedirectAttr, FixedDamageAttr, PostVictoryStatChangeAttr, OneHitKOAccuracyAttr, ForceSwitchOutAttr, VariableTargetAttr, IncrementMovePriorityAttr } from "./data/move"; import { Mode } from "./ui/ui"; import { Command } from "./ui/command-ui-handler"; @@ -55,6 +54,17 @@ import * as Overrides from "./overrides"; import { TextStyle, addTextObject } from "./ui/text"; import { Type } from "./data/type"; import { BerryUsedEvent, EncounterPhaseEvent, MoveUsedEvent, TurnEndEvent, TurnInitEvent } from "./events/battle-scene"; +import { Abilities } from "#enums/abilities"; +import { ArenaTagType } from "#enums/arena-tag-type"; +import { BattleSpec } from "#enums/battle-spec"; +import { BattleStyle } from "#enums/battle-style"; +import { BattlerTagType } from "#enums/battler-tag-type"; +import { Biome } from "#enums/biome"; +import { ExpNotification } from "#enums/exp-notification"; +import { Moves } from "#enums/moves"; +import { PlayerGender } from "#enums/player-gender"; +import { Species } from "#enums/species"; +import { TrainerType } from "#enums/trainer-type"; export class LoginPhase extends Phase { diff --git a/src/system/achv.ts b/src/system/achv.ts index bf4fe4f2e32..21393862d92 100644 --- a/src/system/achv.ts +++ b/src/system/achv.ts @@ -3,7 +3,7 @@ import BattleScene from "../battle-scene"; import { TurnHeldItemTransferModifier } from "../modifier/modifier"; import i18next from "../plugins/i18n"; import * as Utils from "../utils"; -import { PlayerGender } from "#enums"; +import { PlayerGender } from "#enums/player-gender"; import { ParseKeys } from "i18next"; import { Challenge, SingleGenerationChallenge, SingleTypeChallenge } from "#app/data/challenge.js"; diff --git a/src/system/arena-data.ts b/src/system/arena-data.ts index 4ed0fe42b06..f6db53d7f7f 100644 --- a/src/system/arena-data.ts +++ b/src/system/arena-data.ts @@ -1,6 +1,6 @@ import { Arena } from "../field/arena"; import { ArenaTag } from "../data/arena-tag"; -import { Biome } from "#enums"; +import { Biome } from "#enums/biome"; import { Weather } from "../data/weather"; import { Terrain } from "#app/data/terrain.js"; diff --git a/src/system/game-data.ts b/src/system/game-data.ts index 48a8836b2ed..119842cb621 100644 --- a/src/system/game-data.ts +++ b/src/system/game-data.ts @@ -2,7 +2,6 @@ import BattleScene, { PokeballCounts, bypassLogin } from "../battle-scene"; import Pokemon, { EnemyPokemon, PlayerPokemon } from "../field/pokemon"; import { pokemonEvolutions, pokemonPrevolutions } from "../data/pokemon-evolutions"; import PokemonSpecies, { allSpecies, getPokemonSpecies, noStarterFormKeys, speciesStarters } from "../data/pokemon-species"; -import { Species, defaultStarterSpecies, Moves, Device, PlayerGender, GameDataType } from "#enums"; import * as Utils from "../utils"; import * as Overrides from "../overrides"; import PokemonData from "./pokemon-data"; @@ -35,6 +34,23 @@ import { TerrainChangedEvent, WeatherChangedEvent } from "#app/events/arena.js"; import { EnemyAttackStatusEffectChanceModifier } from "../modifier/modifier"; import { StatusEffect } from "#app/data/status-effect.js"; import ChallengeData from "./challenge-data"; +import { Device } from "#enums/devices"; +import { GameDataType } from "#enums/game-data-type"; +import { Moves } from "#enums/moves"; +import { PlayerGender } from "#enums/player-gender"; +import { Species } from "#enums/species"; + +export const defaultStarterSpecies: Species[] = [ + Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE, + Species.CHIKORITA, Species.CYNDAQUIL, Species.TOTODILE, + Species.TREECKO, Species.TORCHIC, Species.MUDKIP, + Species.TURTWIG, Species.CHIMCHAR, Species.PIPLUP, + Species.SNIVY, Species.TEPIG, Species.OSHAWOTT, + Species.CHESPIN, Species.FENNEKIN, Species.FROAKIE, + Species.ROWLET, Species.LITTEN, Species.POPPLIO, + Species.GROOKEY, Species.SCORBUNNY, Species.SOBBLE, + Species.SPRIGATITO, Species.FUECOCO, Species.QUAXLY +]; const saveKey = "x0i2O7WRiANTqPmZ"; // Temporary; secure encryption is not yet necessary diff --git a/src/system/pokemon-data.ts b/src/system/pokemon-data.ts index dbec9ea9c82..e30cfd7e24e 100644 --- a/src/system/pokemon-data.ts +++ b/src/system/pokemon-data.ts @@ -1,6 +1,5 @@ import { BattleType } from "../battle"; import BattleScene from "../battle-scene"; -import { Biome, Species, Moves } from "#enums"; import { Gender } from "../data/gender"; import { Nature } from "../data/nature"; import { PokeballType } from "../data/pokeball"; @@ -10,6 +9,9 @@ import Pokemon, { EnemyPokemon, PokemonMove, PokemonSummonData } from "../field/ import { TrainerSlot } from "../data/trainer-config"; import { Variant } from "#app/data/variant"; import { loadBattlerTag } from "../data/battler-tags"; +import { Biome } from "#enums/biome"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; export default class PokemonData { public id: integer; diff --git a/src/system/settings/settings-gamepad.ts b/src/system/settings/settings-gamepad.ts index 29b6de94544..5dd94b780a0 100644 --- a/src/system/settings/settings-gamepad.ts +++ b/src/system/settings/settings-gamepad.ts @@ -2,7 +2,7 @@ import BattleScene from "../../battle-scene"; import SettingsGamepadUiHandler from "../../ui/settings/settings-gamepad-ui-handler"; import {Mode} from "../../ui/ui"; import {truncateString} from "../../utils"; -import {Button} from "#enums"; +import {Button} from "#enums/buttons"; import {SettingKeyboard} from "#app/system/settings/settings-keyboard"; export enum SettingGamepad { diff --git a/src/system/settings/settings-keyboard.ts b/src/system/settings/settings-keyboard.ts index 661be6546b5..662c718ddcc 100644 --- a/src/system/settings/settings-keyboard.ts +++ b/src/system/settings/settings-keyboard.ts @@ -1,4 +1,4 @@ -import {Button} from "#enums"; +import {Button} from "#enums/buttons"; import BattleScene from "#app/battle-scene"; import {Mode} from "#app/ui/ui"; import SettingsKeyboardUiHandler from "#app/ui/settings/settings-keyboard-ui-handler"; diff --git a/src/system/settings/settings.ts b/src/system/settings/settings.ts index b90a8301560..b929e8ad1e8 100644 --- a/src/system/settings/settings.ts +++ b/src/system/settings/settings.ts @@ -3,9 +3,11 @@ import i18next from "i18next"; import BattleScene from "../../battle-scene"; import { hasTouchscreen } from "../../touch-controls"; import { updateWindowType } from "../../ui/ui-theme"; -import { PlayerGender, MoneyFormat, EaseType } from "#enums"; import { CandyUpgradeNotificationChangedEvent } from "../../events/battle-scene"; import 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"; const MUTE = "Mute"; const VOLUME_OPTIONS = new Array(11).fill(null).map((_, i) => i ? (i * 10).toString() : MUTE); diff --git a/src/system/trainer-data.ts b/src/system/trainer-data.ts index 20e62bf2a32..fc8a14488cc 100644 --- a/src/system/trainer-data.ts +++ b/src/system/trainer-data.ts @@ -1,5 +1,5 @@ import BattleScene from "../battle-scene"; -import { TrainerType } from "#enums"; +import { TrainerType } from "#enums/trainer-type"; import Trainer, { TrainerVariant } from "../field/trainer"; export default class TrainerData { diff --git a/src/system/voucher.ts b/src/system/voucher.ts index 067ae62001c..dd0aa0ef6d4 100644 --- a/src/system/voucher.ts +++ b/src/system/voucher.ts @@ -1,7 +1,8 @@ import BattleScene from "../battle-scene"; import i18next from "../plugins/i18n"; import { Achv, AchvTier, achvs, getAchievementDescription } from "./achv"; -import { PlayerGender, TrainerType } from "#enums"; +import { PlayerGender } from "#enums/player-gender"; +import { TrainerType } from "#enums/trainer-type"; export enum VoucherType { REGULAR, diff --git a/src/test/abilities/battle_bond.test.ts b/src/test/abilities/battle_bond.test.ts index 7d39223dbd4..b2ff73f5b76 100644 --- a/src/test/abilities/battle_bond.test.ts +++ b/src/test/abilities/battle_bond.test.ts @@ -2,9 +2,9 @@ import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vi import GameManager from "#test/utils/gameManager"; import { getMovePosition } from "#test/utils/gameManagerUtils"; import * as Overrides from "#app/overrides"; -import { Moves } from "#enums"; -import { Abilities } from "#enums"; -import { Species } from "#enums"; +import { Moves } from "#enums/moves"; +import { Abilities } from "#enums/abilities"; +import { Species } from "#enums/species"; import { Status, StatusEffect } from "#app/data/status-effect.js"; import { TurnEndPhase } from "#app/phases.js"; import { QuietFormChangePhase } from "#app/form-change-phase.js"; diff --git a/src/test/abilities/disguise.test.ts b/src/test/abilities/disguise.test.ts index 5059116490a..cf8ba386b2e 100644 --- a/src/test/abilities/disguise.test.ts +++ b/src/test/abilities/disguise.test.ts @@ -2,9 +2,9 @@ import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vi import GameManager from "#test/utils/gameManager"; import { getMovePosition } from "#test/utils/gameManagerUtils"; import * as Overrides from "#app/overrides"; -import { Moves } from "#enums"; -import { Abilities } from "#enums"; -import { Species } from "#enums"; +import { Moves } from "#enums/moves"; +import { Abilities } from "#enums/abilities"; +import { Species } from "#enums/species"; import { Status, StatusEffect } from "#app/data/status-effect.js"; import { TurnEndPhase } from "#app/phases.js"; import { QuietFormChangePhase } from "#app/form-change-phase.js"; diff --git a/src/test/abilities/intimidate.test.ts b/src/test/abilities/intimidate.test.ts index 662b2b5b677..4a690e76b56 100644 --- a/src/test/abilities/intimidate.test.ts +++ b/src/test/abilities/intimidate.test.ts @@ -2,7 +2,6 @@ import {afterEach, beforeAll, beforeEach, describe, expect, it, vi} from "vitest import Phaser from "phaser"; import GameManager from "#app/test/utils/gameManager"; import * as overrides from "#app/overrides"; -import {Abilities, Species, Moves} from "#enums"; import { CommandPhase, DamagePhase, EncounterPhase, EnemyCommandPhase, SelectStarterPhase, @@ -14,6 +13,9 @@ import {generateStarter, getMovePosition} from "#app/test/utils/gameManagerUtils import {Command} from "#app/ui/command-ui-handler"; import {Status, StatusEffect} from "#app/data/status-effect"; import {GameModes, getGameMode} from "#app/game-mode"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; describe("Abilities - Intimidate", () => { diff --git a/src/test/abilities/intrepid_sword.test.ts b/src/test/abilities/intrepid_sword.test.ts index 662bc02e42e..2d51642be70 100644 --- a/src/test/abilities/intrepid_sword.test.ts +++ b/src/test/abilities/intrepid_sword.test.ts @@ -2,7 +2,8 @@ import {afterEach, beforeAll, beforeEach, describe, expect, it, vi} from "vitest import Phaser from "phaser"; import GameManager from "#app/test/utils/gameManager"; import * as overrides from "#app/overrides"; -import {Abilities, Species} from "#enums"; +import {Abilities} from "#enums/abilities"; +import {Species} from "#enums/species"; import { CommandPhase, } from "#app/phases"; diff --git a/src/test/abilities/libero.test.ts b/src/test/abilities/libero.test.ts index 6dfb0a66413..a11feea9f88 100644 --- a/src/test/abilities/libero.test.ts +++ b/src/test/abilities/libero.test.ts @@ -2,16 +2,16 @@ import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vitest"; import GameManager from "../utils/gameManager"; import * as Overrides from "#app/overrides"; -import { Species } from "#enums"; -import { Abilities } from "#enums"; -import { Moves } from "#enums"; +import { Species } from "#enums/species"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; import { getMovePosition } from "../utils/gameManagerUtils"; import { MoveEffectPhase, TurnEndPhase } from "#app/phases.js"; import { allMoves } from "#app/data/move.js"; -import { BattlerTagType } from "#enums"; +import { BattlerTagType } from "#enums/battler-tag-type"; import { Weather, WeatherType } from "#app/data/weather.js"; import { Type } from "#app/data/type.js"; -import { Biome } from "#enums"; +import { Biome } from "#enums/biome"; import { PlayerPokemon } from "#app/field/pokemon.js"; const TIMEOUT = 20 * 1000; diff --git a/src/test/abilities/moxie.test.ts b/src/test/abilities/moxie.test.ts index 5e910a0c3ae..46fc4e5c34c 100644 --- a/src/test/abilities/moxie.test.ts +++ b/src/test/abilities/moxie.test.ts @@ -2,7 +2,6 @@ import {afterEach, beforeAll, beforeEach, describe, expect, it, vi} from "vitest import Phaser from "phaser"; import GameManager from "#app/test/utils/gameManager"; import * as overrides from "#app/overrides"; -import {Abilities, Moves, Species} from "#enums"; import { CommandPhase, EnemyCommandPhase, @@ -13,6 +12,9 @@ import {Stat} from "#app/data/pokemon-stat"; import {getMovePosition} from "#app/test/utils/gameManagerUtils"; import {Command} from "#app/ui/command-ui-handler"; import {BattleStat} from "#app/data/battle-stat"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; describe("Abilities - Moxie", () => { diff --git a/src/test/abilities/power_construct.test.ts b/src/test/abilities/power_construct.test.ts index cd763661ef2..68a360a60a2 100644 --- a/src/test/abilities/power_construct.test.ts +++ b/src/test/abilities/power_construct.test.ts @@ -2,9 +2,9 @@ import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vi import GameManager from "#test/utils/gameManager"; import { getMovePosition } from "#test/utils/gameManagerUtils"; import * as Overrides from "#app/overrides"; -import { Moves } from "#enums"; -import { Abilities } from "#enums"; -import { Species } from "#enums"; +import { Moves } from "#enums/moves"; +import { Abilities } from "#enums/abilities"; +import { Species } from "#enums/species"; import { Status, StatusEffect } from "#app/data/status-effect.js"; import { TurnEndPhase } from "#app/phases.js"; import { QuietFormChangePhase } from "#app/form-change-phase.js"; diff --git a/src/test/abilities/protean.test.ts b/src/test/abilities/protean.test.ts index 8cd44481d16..d102daf7fcc 100644 --- a/src/test/abilities/protean.test.ts +++ b/src/test/abilities/protean.test.ts @@ -2,16 +2,16 @@ import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vitest"; import GameManager from "../utils/gameManager"; import * as Overrides from "#app/overrides"; -import { Species } from "#enums"; -import { Abilities } from "#enums"; -import { Moves } from "#enums"; +import { Species } from "#enums/species"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; import { getMovePosition } from "../utils/gameManagerUtils"; import { MoveEffectPhase, TurnEndPhase } from "#app/phases.js"; import { allMoves } from "#app/data/move.js"; -import { BattlerTagType } from "#enums"; +import { BattlerTagType } from "#enums/battler-tag-type"; import { Weather, WeatherType } from "#app/data/weather.js"; import { Type } from "#app/data/type.js"; -import { Biome } from "#enums"; +import { Biome } from "#enums/biome"; import { PlayerPokemon } from "#app/field/pokemon.js"; const TIMEOUT = 20 * 1000; diff --git a/src/test/abilities/sap_sipper.test.ts b/src/test/abilities/sap_sipper.test.ts index b59a7d340a2..403ac1bf4ff 100644 --- a/src/test/abilities/sap_sipper.test.ts +++ b/src/test/abilities/sap_sipper.test.ts @@ -6,9 +6,12 @@ import { MoveEndPhase, TurnEndPhase, } from "#app/phases"; import {getMovePosition} from "#app/test/utils/gameManagerUtils"; -import { Abilities, BattlerTagType, Moves, Species } from "#enums"; import { BattleStat } from "#app/data/battle-stat.js"; import { TerrainType } from "#app/data/terrain.js"; +import { Abilities } from "#enums/abilities"; +import { BattlerTagType } from "#enums/battler-tag-type"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; // See also: TypeImmunityAbAttr describe("Abilities - Sap Sipper", () => { diff --git a/src/test/abilities/schooling.test.ts b/src/test/abilities/schooling.test.ts index f4d84b4502e..4fd64b97246 100644 --- a/src/test/abilities/schooling.test.ts +++ b/src/test/abilities/schooling.test.ts @@ -2,9 +2,9 @@ import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vi import GameManager from "#test/utils/gameManager"; import { getMovePosition } from "#test/utils/gameManagerUtils"; import * as Overrides from "#app/overrides"; -import { Moves } from "#enums"; -import { Abilities } from "#enums"; -import { Species } from "#enums"; +import { Moves } from "#enums/moves"; +import { Abilities } from "#enums/abilities"; +import { Species } from "#enums/species"; import { Status, StatusEffect } from "#app/data/status-effect.js"; import { TurnEndPhase } from "#app/phases.js"; import { QuietFormChangePhase } from "#app/form-change-phase.js"; diff --git a/src/test/abilities/shields_down.test.ts b/src/test/abilities/shields_down.test.ts index dd56f029f0c..f35fdd9ed79 100644 --- a/src/test/abilities/shields_down.test.ts +++ b/src/test/abilities/shields_down.test.ts @@ -2,9 +2,9 @@ import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vi import GameManager from "#test/utils/gameManager"; import { getMovePosition } from "#test/utils/gameManagerUtils"; import * as Overrides from "#app/overrides"; -import { Moves } from "#enums"; -import { Abilities } from "#enums"; -import { Species } from "#enums"; +import { Moves } from "#enums/moves"; +import { Abilities } from "#enums/abilities"; +import { Species } from "#enums/species"; import { Status, StatusEffect } from "#app/data/status-effect.js"; import { TurnEndPhase } from "#app/phases.js"; import { QuietFormChangePhase } from "#app/form-change-phase.js"; diff --git a/src/test/abilities/volt_absorb.test.ts b/src/test/abilities/volt_absorb.test.ts index 6218125767a..8c629d8d771 100644 --- a/src/test/abilities/volt_absorb.test.ts +++ b/src/test/abilities/volt_absorb.test.ts @@ -6,8 +6,11 @@ import { TurnEndPhase, } from "#app/phases"; import {getMovePosition} from "#app/test/utils/gameManagerUtils"; -import { Abilities, BattlerTagType, Moves, Species } from "#enums"; import { BattleStat } from "#app/data/battle-stat.js"; +import { Abilities } from "#enums/abilities"; +import { BattlerTagType } from "#enums/battler-tag-type"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; // See also: TypeImmunityAbAttr describe("Abilities - Volt Absorb", () => { diff --git a/src/test/abilities/zen_mode.test.ts b/src/test/abilities/zen_mode.test.ts index 231c9a757f9..4a3caaaa157 100644 --- a/src/test/abilities/zen_mode.test.ts +++ b/src/test/abilities/zen_mode.test.ts @@ -16,11 +16,13 @@ import { } from "#app/phases"; import { Mode } from "#app/ui/ui"; import { Stat } from "#app/data/pokemon-stat"; -import { Abilities, Moves, Species } from "#enums"; import { getMovePosition } from "#app/test/utils/gameManagerUtils"; import { Command } from "#app/ui/command-ui-handler"; import { QuietFormChangePhase } from "#app/form-change-phase"; import { Status, StatusEffect } from "#app/data/status-effect.js"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; const TIMEOUT = 20 * 1000; diff --git a/src/test/abilities/zero_to_hero.test.ts b/src/test/abilities/zero_to_hero.test.ts index 36ffc2a58fb..e0264729125 100644 --- a/src/test/abilities/zero_to_hero.test.ts +++ b/src/test/abilities/zero_to_hero.test.ts @@ -2,9 +2,9 @@ import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vi import GameManager from "#test/utils/gameManager"; import { getMovePosition } from "#test/utils/gameManagerUtils"; import * as Overrides from "#app/overrides"; -import { Moves } from "#enums"; -import { Abilities } from "#enums"; -import { Species } from "#enums"; +import { Moves } from "#enums/moves"; +import { Abilities } from "#enums/abilities"; +import { Species } from "#enums/species"; import { Status, StatusEffect } from "#app/data/status-effect.js"; import { TurnEndPhase } from "#app/phases.js"; import { QuietFormChangePhase } from "#app/form-change-phase.js"; diff --git a/src/test/battle/battle-order.test.ts b/src/test/battle/battle-order.test.ts index 45d09b83dc9..5d8f9d2c98f 100644 --- a/src/test/battle/battle-order.test.ts +++ b/src/test/battle/battle-order.test.ts @@ -2,7 +2,6 @@ import {afterEach, beforeAll, beforeEach, describe, expect, it, vi} from "vitest import Phaser from "phaser"; import GameManager from "#app/test/utils/gameManager"; import * as overrides from "#app/overrides"; -import {Abilities, Species, Moves, Button} from "#enums"; import { CommandPhase, EnemyCommandPhase, SelectTargetPhase, TurnStartPhase @@ -12,6 +11,10 @@ import {getMovePosition} from "#app/test/utils/gameManagerUtils"; import {Command} from "#app/ui/command-ui-handler"; import {Stat} from "#app/data/pokemon-stat"; import TargetSelectUiHandler from "#app/ui/target-select-ui-handler"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import {Button} from "#enums/buttons"; describe("Battle order", () => { diff --git a/src/test/battle/battle.test.ts b/src/test/battle/battle.test.ts index 76f980e1498..87949be70a8 100644 --- a/src/test/battle/battle.test.ts +++ b/src/test/battle/battle.test.ts @@ -2,7 +2,6 @@ import {afterEach, beforeAll, beforeEach, describe, expect, it, vi} from "vitest import {generateStarter, getMovePosition,} from "#app/test/utils/gameManagerUtils"; import {Mode} from "#app/ui/ui"; import {GameModes} from "#app/game-mode"; -import {Species, Moves, PlayerGender, Abilities} from "#enums"; import * as overrides from "../../overrides"; import {Command} from "#app/ui/command-ui-handler"; import { @@ -21,6 +20,10 @@ import GameManager from "#app/test/utils/gameManager"; import Phaser from "phaser"; import {allSpecies} from "#app/data/pokemon-species"; import { getGameMode } from "#app/game-mode.js"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { PlayerGender } from "#enums/player-gender"; +import { Species } from "#enums/species"; describe("Test Battle Phase", () => { let phaserGame: Phaser.Game; diff --git a/src/test/battle/error-handling.test.ts b/src/test/battle/error-handling.test.ts index 8e062f019e9..d46d8bcf7e8 100644 --- a/src/test/battle/error-handling.test.ts +++ b/src/test/battle/error-handling.test.ts @@ -2,7 +2,9 @@ import {afterEach, beforeAll, beforeEach, describe, expect, it, vi} from "vitest import GameManager from "#app/test/utils/gameManager"; import Phaser from "phaser"; import * as overrides from "#app/overrides"; -import {Species, Moves, Abilities} from "#enums"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; describe("Test Battle Phase", () => { let phaserGame: Phaser.Game; diff --git a/src/test/battle/special_battle.test.ts b/src/test/battle/special_battle.test.ts index 130491528f4..01ae7d05359 100644 --- a/src/test/battle/special_battle.test.ts +++ b/src/test/battle/special_battle.test.ts @@ -1,12 +1,14 @@ import {afterEach, beforeAll, beforeEach, describe, expect, it, vi} from "vitest"; import {Mode} from "#app/ui/ui"; -import {Species, Moves, Abilities} from "#enums"; import * as overrides from "../../overrides"; import { CommandPhase, } from "#app/phases"; import GameManager from "#app/test/utils/gameManager"; import Phaser from "phaser"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; describe("Test Battle Phase", () => { let phaserGame: Phaser.Game; diff --git a/src/test/eggs/egg.test.ts b/src/test/eggs/egg.test.ts index ccfdddf5498..e6c4ad0e16e 100644 --- a/src/test/eggs/egg.test.ts +++ b/src/test/eggs/egg.test.ts @@ -1,7 +1,7 @@ import {beforeAll, describe, expect, it} from "vitest"; import BattleScene from "../../battle-scene"; import { getLegendaryGachaSpeciesForTimestamp } from "#app/data/egg.js"; -import { Species } from "#enums"; +import { Species } from "#enums/species"; import Phaser from "phaser"; describe("getLegendaryGachaSpeciesForTimestamp", () => { diff --git a/src/test/imports.test.ts b/src/test/imports.test.ts index 86893de7bff..5c0272e191d 100644 --- a/src/test/imports.test.ts +++ b/src/test/imports.test.ts @@ -5,7 +5,7 @@ async function importModule() { try { initStatsKeys(); const { PokemonMove } = await import("#app/field/pokemon"); - const { Species } = await import("#enums"); + const { Species } = await import("#enums/species"); return { PokemonMove, Species, diff --git a/src/test/items/toxic_orb.test.ts b/src/test/items/toxic_orb.test.ts index a76008aa747..6aacfd0e5e7 100644 --- a/src/test/items/toxic_orb.test.ts +++ b/src/test/items/toxic_orb.test.ts @@ -2,7 +2,6 @@ import {afterEach, beforeAll, beforeEach, describe, expect, it, vi} from "vitest import Phaser from "phaser"; import GameManager from "#app/test/utils/gameManager"; import * as overrides from "#app/overrides"; -import {Abilities, Moves, Species} from "#enums"; import { CommandPhase, EnemyCommandPhase, @@ -13,6 +12,9 @@ import {Mode} from "#app/ui/ui"; import {getMovePosition} from "#app/test/utils/gameManagerUtils"; import {Command} from "#app/ui/command-ui-handler"; import {StatusEffect} from "#app/data/status-effect"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; describe("Items - Toxic orb", () => { diff --git a/src/test/lokalisation/french.test.ts b/src/test/lokalisation/french.test.ts index c3c6873cd01..45429b1b157 100644 --- a/src/test/lokalisation/french.test.ts +++ b/src/test/lokalisation/french.test.ts @@ -1,7 +1,7 @@ import {afterEach, beforeAll, describe, expect, it} from "vitest"; import Phaser from "phaser"; import GameManager from "#app/test/utils/gameManager"; -import {Species} from "#enums"; +import {Species} from "#enums/species"; import i18next from "i18next"; import {initI18n} from "#app/plugins/i18n"; diff --git a/src/test/moves/growth.test.ts b/src/test/moves/growth.test.ts index 439e47b236b..4e5add26207 100644 --- a/src/test/moves/growth.test.ts +++ b/src/test/moves/growth.test.ts @@ -2,7 +2,6 @@ import {afterEach, beforeAll, beforeEach, describe, expect, it, vi} from "vitest import Phaser from "phaser"; import GameManager from "#app/test/utils/gameManager"; import * as overrides from "#app/overrides"; -import {Abilities, Moves, Species} from "#enums"; import { CommandPhase, EnemyCommandPhase, @@ -13,6 +12,9 @@ import {Stat} from "#app/data/pokemon-stat"; import {getMovePosition} from "#app/test/utils/gameManagerUtils"; import {Command} from "#app/ui/command-ui-handler"; import {BattleStat} from "#app/data/battle-stat"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; describe("Moves - Growth", () => { diff --git a/src/test/moves/spikes.test.ts b/src/test/moves/spikes.test.ts index 6ecc0b6145a..0544442f31e 100644 --- a/src/test/moves/spikes.test.ts +++ b/src/test/moves/spikes.test.ts @@ -2,10 +2,12 @@ import {afterEach, beforeAll, beforeEach, describe, expect, it, vi} from "vitest import Phaser from "phaser"; import GameManager from "#app/test/utils/gameManager"; import * as overrides from "#app/overrides"; -import {Abilities, Moves, Species} from "#enums"; import { CommandPhase } from "#app/phases"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; describe("Moves - Spikes", () => { diff --git a/src/test/moves/tackle.test.ts b/src/test/moves/tackle.test.ts index 7f438cd8958..dabf7db5f7e 100644 --- a/src/test/moves/tackle.test.ts +++ b/src/test/moves/tackle.test.ts @@ -2,7 +2,6 @@ import {afterEach, beforeAll, beforeEach, describe, expect, it, vi} from "vitest import Phaser from "phaser"; import GameManager from "#app/test/utils/gameManager"; import * as overrides from "#app/overrides"; -import {Moves, Species} from "#enums"; import { CommandPhase, EnemyCommandPhase, TurnEndPhase, @@ -11,6 +10,8 @@ import {Mode} from "#app/ui/ui"; import {getMovePosition} from "#app/test/utils/gameManagerUtils"; import {Command} from "#app/ui/command-ui-handler"; import {Stat} from "#app/data/pokemon-stat"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; describe("Moves - Tackle", () => { diff --git a/src/test/moves/tail_whip.test.ts b/src/test/moves/tail_whip.test.ts index b081467cdad..3e89e9cb14e 100644 --- a/src/test/moves/tail_whip.test.ts +++ b/src/test/moves/tail_whip.test.ts @@ -2,7 +2,6 @@ import {afterEach, beforeAll, beforeEach, describe, expect, it, vi} from "vitest import Phaser from "phaser"; import GameManager from "#app/test/utils/gameManager"; import * as overrides from "#app/overrides"; -import {Abilities, Moves, Species} from "#enums"; import { CommandPhase, EnemyCommandPhase, @@ -12,6 +11,9 @@ import {Mode} from "#app/ui/ui"; import {getMovePosition} from "#app/test/utils/gameManagerUtils"; import {Command} from "#app/ui/command-ui-handler"; import {BattleStat} from "#app/data/battle-stat"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; describe("Moves - Tail whip", () => { diff --git a/src/test/settingMenu/rebinding_setting.test.ts b/src/test/settingMenu/rebinding_setting.test.ts index 41c8290fb49..010ad427d6e 100644 --- a/src/test/settingMenu/rebinding_setting.test.ts +++ b/src/test/settingMenu/rebinding_setting.test.ts @@ -1,5 +1,4 @@ import {beforeEach, describe, expect, it} from "vitest"; -import {Button, Device} from "#enums"; import {deepCopy} from "#app/utils"; import { getKeyWithKeycode, @@ -10,6 +9,8 @@ import {InGameManip} from "#app/test/settingMenu/helpers/inGameManip"; import {InterfaceConfig} from "#app/inputs-controller"; import cfg_keyboard_qwerty from "#app/configs/inputs/cfg_keyboard_qwerty"; import {SettingKeyboard} from "#app/system/settings/settings-keyboard"; +import { Device } from "#enums/devices"; +import { Button } from "#enums/buttons"; describe("Test Rebinding", () => { diff --git a/src/test/ui/starter-select.test.ts b/src/test/ui/starter-select.test.ts index 7dc45c06f4a..2b5df315a70 100644 --- a/src/test/ui/starter-select.test.ts +++ b/src/test/ui/starter-select.test.ts @@ -15,7 +15,9 @@ import {OptionSelectItem} from "#app/ui/abstact-option-select-ui-handler"; import {Gender} from "#app/data/gender"; import {allSpecies} from "#app/data/pokemon-species"; import {Nature} from "#app/data/nature"; -import {Abilities, Button, Species} from "#enums"; +import { Button } from "#enums/buttons"; +import { Abilities } from "#enums/abilities"; +import { Species } from "#enums/species"; describe("UI - Starter select", () => { diff --git a/src/test/utils/gameManager.ts b/src/test/utils/gameManager.ts index 719c6776ac4..e0585395ff9 100644 --- a/src/test/utils/gameManager.ts +++ b/src/test/utils/gameManager.ts @@ -22,9 +22,13 @@ import {EnemyPokemon, PlayerPokemon} from "#app/field/pokemon"; import {MockClock} from "#app/test/utils/mocks/mockClock"; import {Command} from "#app/ui/command-ui-handler"; import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; -import {Button, ExpNotification, GameDataType, PlayerGender, Species} from "#enums"; import PartyUiHandler, {PartyUiMode} from "#app/ui/party-ui-handler"; import Trainer from "#app/field/trainer"; +import { ExpNotification } from "#enums/exp-notification"; +import { GameDataType } from "#enums/game-data-type"; +import { PlayerGender } from "#enums/player-gender"; +import { Species } from "#enums/species"; +import { Button } from "#enums/buttons"; /** * Class to manage the game state and transitions between phases. diff --git a/src/test/utils/gameManagerUtils.ts b/src/test/utils/gameManagerUtils.ts index 7ff5bbdf8b6..db9ba7174a9 100644 --- a/src/test/utils/gameManagerUtils.ts +++ b/src/test/utils/gameManagerUtils.ts @@ -1,7 +1,7 @@ // Function to convert Blob to string import {getDailyRunStarters} from "#app/data/daily-run"; import {Gender} from "#app/data/gender"; -import {Species} from "#enums"; +import {Species} from "#enums/species"; import {Starter} from "#app/ui/starter-select-ui-handler"; import {GameModes, getGameMode} from "#app/game-mode"; import {getPokemonSpecies, getPokemonSpeciesForm} from "#app/data/pokemon-species"; diff --git a/src/touch-controls.ts b/src/touch-controls.ts index 6656d6af5a3..9953e99c81a 100644 --- a/src/touch-controls.ts +++ b/src/touch-controls.ts @@ -1,4 +1,4 @@ -import {Button} from "#enums"; +import {Button} from "#enums/buttons"; import EventEmitter = Phaser.Events.EventEmitter; import BattleScene from "./battle-scene"; diff --git a/src/ui-inputs.ts b/src/ui-inputs.ts index aea0e6647cd..00c88504ef1 100644 --- a/src/ui-inputs.ts +++ b/src/ui-inputs.ts @@ -5,7 +5,7 @@ import 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"; +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 BattleScene from "./battle-scene"; diff --git a/src/ui/abstact-option-select-ui-handler.ts b/src/ui/abstact-option-select-ui-handler.ts index a0e61c343a8..c4877cfca59 100644 --- a/src/ui/abstact-option-select-ui-handler.ts +++ b/src/ui/abstact-option-select-ui-handler.ts @@ -5,7 +5,7 @@ import UiHandler from "./ui-handler"; import { addWindow } from "./ui-theme"; import * as Utils from "../utils"; import { argbFromRgba } from "@material/material-color-utilities"; -import {Button} from "#enums"; +import {Button} from "#enums/buttons"; export interface OptionSelectConfig { xOffset?: number; diff --git a/src/ui/achv-bar.ts b/src/ui/achv-bar.ts index 9f6dc52ad56..05dde03aed7 100644 --- a/src/ui/achv-bar.ts +++ b/src/ui/achv-bar.ts @@ -2,7 +2,7 @@ import BattleScene from "../battle-scene"; import { Achv, getAchievementDescription } from "../system/achv"; import { Voucher } from "../system/voucher"; import { TextStyle, addTextObject } from "./text"; -import { PlayerGender } from "#enums"; +import { PlayerGender } from "#enums/player-gender"; export default class AchvBar extends Phaser.GameObjects.Container { private defaultWidth: number; diff --git a/src/ui/achvs-ui-handler.ts b/src/ui/achvs-ui-handler.ts index 4299f8802a3..843ebc4e266 100644 --- a/src/ui/achvs-ui-handler.ts +++ b/src/ui/achvs-ui-handler.ts @@ -1,5 +1,5 @@ import BattleScene from "../battle-scene"; -import { Button, PlayerGender } from "#enums"; +import { Button } from "#enums/buttons"; import i18next from "../plugins/i18n"; import { Achv, achvs, getAchievementDescription } from "../system/achv"; import MessageUiHandler from "./message-ui-handler"; @@ -7,6 +7,7 @@ import { addTextObject, TextStyle } from "./text"; import { Mode } from "./ui"; import { addWindow } from "./ui-theme"; import { ParseKeys } from "i18next"; +import { PlayerGender } from "#enums/player-gender"; export default class AchvsUiHandler extends MessageUiHandler { private achvsContainer: Phaser.GameObjects.Container; diff --git a/src/ui/arena-flyout.ts b/src/ui/arena-flyout.ts index 08d7915b63b..0568d1524aa 100644 --- a/src/ui/arena-flyout.ts +++ b/src/ui/arena-flyout.ts @@ -6,7 +6,7 @@ import { TerrainType } from "#app/data/terrain.js"; import { addWindow, WindowVariant } from "./ui-theme"; import { ArenaEvent, ArenaEventType, TagAddedEvent, TagRemovedEvent, TerrainChangedEvent, WeatherChangedEvent } from "#app/events/arena.js"; import { BattleSceneEventType, TurnEndEvent } from "../events/battle-scene"; -import { ArenaTagType } from "#enums"; +import { ArenaTagType } from "#enums/arena-tag-type"; import TimeOfDayWidget from "./time-of-day-widget"; import * as Utils from "../utils"; diff --git a/src/ui/awaitable-ui-handler.ts b/src/ui/awaitable-ui-handler.ts index 788384ac8d2..18635b132f9 100644 --- a/src/ui/awaitable-ui-handler.ts +++ b/src/ui/awaitable-ui-handler.ts @@ -1,7 +1,7 @@ import BattleScene from "../battle-scene"; import { Mode } from "./ui"; import UiHandler from "./ui-handler"; -import {Button} from "#enums"; +import {Button} from "#enums/buttons"; export default abstract class AwaitableUiHandler extends UiHandler { protected awaitingActionInput: boolean; diff --git a/src/ui/ball-ui-handler.ts b/src/ui/ball-ui-handler.ts index 430a00422c4..70349444647 100644 --- a/src/ui/ball-ui-handler.ts +++ b/src/ui/ball-ui-handler.ts @@ -6,7 +6,7 @@ import { Command } from "./command-ui-handler"; import { Mode } from "./ui"; import UiHandler from "./ui-handler"; import { addWindow } from "./ui-theme"; -import {Button} from "#enums"; +import {Button} from "#enums/buttons"; export default class BallUiHandler extends UiHandler { private pokeballSelectContainer: Phaser.GameObjects.Container; diff --git a/src/ui/battle-flyout.ts b/src/ui/battle-flyout.ts index d6121e2d209..5b34a6b5411 100644 --- a/src/ui/battle-flyout.ts +++ b/src/ui/battle-flyout.ts @@ -4,7 +4,9 @@ import * as Utils from "../utils"; import BattleScene from "#app/battle-scene.js"; import Move from "#app/data/move.js"; import { BattleSceneEventType, BerryUsedEvent, MoveUsedEvent } from "../events/battle-scene"; -import { BerryType, Moves, UiTheme } from "#enums"; +import { BerryType } from "#enums/berry-type"; +import { Moves } from "#enums/moves"; +import { UiTheme } from "#enums/ui-theme"; /** Container for info about a {@linkcode Move} */ interface MoveInfo { diff --git a/src/ui/battle-message-ui-handler.ts b/src/ui/battle-message-ui-handler.ts index fd2386355b4..6edb359746a 100644 --- a/src/ui/battle-message-ui-handler.ts +++ b/src/ui/battle-message-ui-handler.ts @@ -6,7 +6,7 @@ import MessageUiHandler from "./message-ui-handler"; import { getStatName, Stat } from "../data/pokemon-stat"; import { addWindow } from "./ui-theme"; import BBCodeText from "phaser3-rex-plugins/plugins/bbcodetext"; -import {Button} from "#enums"; +import {Button} from "#enums/buttons"; import i18next from "../plugins/i18n"; export default class BattleMessageUiHandler extends MessageUiHandler { diff --git a/src/ui/candy-bar.ts b/src/ui/candy-bar.ts index 87d6b7431c1..3a9f180dd59 100644 --- a/src/ui/candy-bar.ts +++ b/src/ui/candy-bar.ts @@ -2,7 +2,7 @@ import BattleScene, { starterColors } from "../battle-scene"; import { TextStyle, addTextObject } from "./text"; import { argbFromRgba } from "@material/material-color-utilities"; import * as Utils from "../utils"; -import { Species } from "#enums"; +import { Species } from "#enums/species"; export default class CandyBar extends Phaser.GameObjects.Container { private bg: Phaser.GameObjects.NineSlice; diff --git a/src/ui/challenges-select-ui-handler.ts b/src/ui/challenges-select-ui-handler.ts index dc0aa30d489..ae613c69a4d 100644 --- a/src/ui/challenges-select-ui-handler.ts +++ b/src/ui/challenges-select-ui-handler.ts @@ -3,7 +3,7 @@ import { TextStyle, addTextObject } from "./text"; import { Mode } from "./ui"; import UiHandler from "./ui-handler"; import { addWindow } from "./ui-theme"; -import {Button} from "#enums"; +import {Button} from "#enums/buttons"; import i18next from "#app/plugins/i18n.js"; import { SelectStarterPhase, TitlePhase } from "#app/phases.js"; import { Challenge } from "#app/data/challenge.js"; diff --git a/src/ui/command-ui-handler.ts b/src/ui/command-ui-handler.ts index 2f8e81807a3..67b587fd076 100644 --- a/src/ui/command-ui-handler.ts +++ b/src/ui/command-ui-handler.ts @@ -5,7 +5,7 @@ import PartyUiHandler, { PartyUiMode } from "./party-ui-handler"; import { Mode } from "./ui"; import UiHandler from "./ui-handler"; import i18next from "../plugins/i18n"; -import {Button} from "#enums"; +import {Button} from "#enums/buttons"; export enum Command { FIGHT = 0, diff --git a/src/ui/confirm-ui-handler.ts b/src/ui/confirm-ui-handler.ts index 4ffee79dab0..953ed4972ac 100644 --- a/src/ui/confirm-ui-handler.ts +++ b/src/ui/confirm-ui-handler.ts @@ -2,7 +2,7 @@ import BattleScene from "../battle-scene"; import AbstractOptionSelectUiHandler, { OptionSelectConfig } from "./abstact-option-select-ui-handler"; import { Mode } from "./ui"; import i18next from "i18next"; -import {Button} from "#enums"; +import {Button} from "#enums/buttons"; export default class ConfirmUiHandler extends AbstractOptionSelectUiHandler { diff --git a/src/ui/egg-gacha-ui-handler.ts b/src/ui/egg-gacha-ui-handler.ts index 3949c60c76a..4d987ee8fcc 100644 --- a/src/ui/egg-gacha-ui-handler.ts +++ b/src/ui/egg-gacha-ui-handler.ts @@ -8,8 +8,9 @@ import { VoucherType, getVoucherTypeIcon } from "../system/voucher"; import { getPokemonSpecies } from "../data/pokemon-species"; import { addWindow } from "./ui-theme"; import { Tutorial, handleTutorial } from "../tutorial"; -import {Button, EggTier} from "#enums"; +import {Button} from "#enums/buttons"; import i18next from "../plugins/i18n"; +import { EggTier } from "#enums/egg-type"; export default class EggGachaUiHandler extends MessageUiHandler { private eggGachaContainer: Phaser.GameObjects.Container; diff --git a/src/ui/egg-hatch-scene-handler.ts b/src/ui/egg-hatch-scene-handler.ts index e103cf30a6c..0e247da60ab 100644 --- a/src/ui/egg-hatch-scene-handler.ts +++ b/src/ui/egg-hatch-scene-handler.ts @@ -2,7 +2,7 @@ import BattleScene from "../battle-scene"; import { EggHatchPhase } from "../egg-hatch-phase"; import { Mode } from "./ui"; import UiHandler from "./ui-handler"; -import {Button} from "#enums"; +import {Button} from "#enums/buttons"; export default 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 3957ebfa1f4..8c4621ffb3d 100644 --- a/src/ui/egg-list-ui-handler.ts +++ b/src/ui/egg-list-ui-handler.ts @@ -5,7 +5,7 @@ import { TextStyle, addTextObject } from "./text"; import MessageUiHandler from "./message-ui-handler"; import { Egg, getEggGachaTypeDescriptor, getEggHatchWavesMessage, getEggDescriptor } from "../data/egg"; import { addWindow } from "./ui-theme"; -import {Button} from "#enums"; +import {Button} from "#enums/buttons"; import i18next from "../plugins/i18n"; export default class EggListUiHandler extends MessageUiHandler { diff --git a/src/ui/evolution-scene-handler.ts b/src/ui/evolution-scene-handler.ts index c387a24d1ba..64d190c4d3f 100644 --- a/src/ui/evolution-scene-handler.ts +++ b/src/ui/evolution-scene-handler.ts @@ -2,7 +2,7 @@ import BattleScene from "../battle-scene"; import MessageUiHandler from "./message-ui-handler"; import { TextStyle, addTextObject } from "./text"; import { Mode } from "./ui"; -import {Button} from "#enums"; +import {Button} from "#enums/buttons"; export default class EvolutionSceneHandler extends MessageUiHandler { public evolutionContainer: Phaser.GameObjects.Container; diff --git a/src/ui/fight-ui-handler.ts b/src/ui/fight-ui-handler.ts index 0fbfc9a93cd..217f4d75820 100644 --- a/src/ui/fight-ui-handler.ts +++ b/src/ui/fight-ui-handler.ts @@ -8,7 +8,7 @@ import * as Utils from "../utils"; import { CommandPhase } from "../phases"; import { MoveCategory } from "#app/data/move.js"; import i18next from "../plugins/i18n"; -import {Button} from "#enums"; +import {Button} from "#enums/buttons"; import Pokemon, { PokemonMove } from "#app/field/pokemon.js"; export default class FightUiHandler extends UiHandler { diff --git a/src/ui/form-modal-ui-handler.ts b/src/ui/form-modal-ui-handler.ts index 754c2d21dd2..4c60a3bad9b 100644 --- a/src/ui/form-modal-ui-handler.ts +++ b/src/ui/form-modal-ui-handler.ts @@ -6,7 +6,7 @@ import { WindowVariant, addWindow } from "./ui-theme"; import InputText from "phaser3-rex-plugins/plugins/inputtext"; import * as Utils from "../utils"; import i18next from "../plugins/i18n"; -import {Button} from "#enums"; +import {Button} from "#enums/buttons"; 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 08b48c7bdec..4a9c62ca012 100644 --- a/src/ui/game-stats-ui-handler.ts +++ b/src/ui/game-stats-ui-handler.ts @@ -7,7 +7,7 @@ import { addWindow } from "./ui-theme"; import * as Utils from "../utils"; import { DexAttr, GameData } from "../system/game-data"; import { speciesStarters } from "../data/pokemon-species"; -import {Button} from "#enums"; +import {Button} from "#enums/buttons"; import i18next from "../plugins/i18n"; interface DisplayStat { diff --git a/src/ui/menu-ui-handler.ts b/src/ui/menu-ui-handler.ts index 2b3b76164a2..b068080bdda 100644 --- a/src/ui/menu-ui-handler.ts +++ b/src/ui/menu-ui-handler.ts @@ -8,7 +8,8 @@ import { OptionSelectConfig, OptionSelectItem } from "./abstact-option-select-ui import { Tutorial, handleTutorial } from "../tutorial"; import { updateUserInfo } from "../account"; import i18next from "../plugins/i18n"; -import {Button, GameDataType} from "#enums"; +import {Button} from "#enums/buttons"; +import { GameDataType } from "#enums/game-data-type"; export enum MenuOptions { GAME_SETTINGS, diff --git a/src/ui/modal-ui-handler.ts b/src/ui/modal-ui-handler.ts index 76c833f7af1..85b20e423c3 100644 --- a/src/ui/modal-ui-handler.ts +++ b/src/ui/modal-ui-handler.ts @@ -3,7 +3,7 @@ import { TextStyle, addTextObject } from "./text"; import { Mode } from "./ui"; import UiHandler from "./ui-handler"; import { WindowVariant, addWindow } from "./ui-theme"; -import {Button} from "#enums"; +import {Button} from "#enums/buttons"; export interface ModalConfig { buttonActions: Function[]; diff --git a/src/ui/modifier-select-ui-handler.ts b/src/ui/modifier-select-ui-handler.ts index 87c14f7253a..09f73ac2749 100644 --- a/src/ui/modifier-select-ui-handler.ts +++ b/src/ui/modifier-select-ui-handler.ts @@ -6,7 +6,7 @@ import AwaitableUiHandler from "./awaitable-ui-handler"; import { Mode } from "./ui"; import { LockModifierTiersModifier, PokemonHeldItemModifier } from "../modifier/modifier"; import { handleTutorial, Tutorial } from "../tutorial"; -import {Button} from "#enums"; +import {Button} from "#enums/buttons"; import MoveInfoOverlay from "./move-info-overlay"; import { allMoves } from "../data/move"; import * as Utils from "./../utils"; diff --git a/src/ui/party-ui-handler.ts b/src/ui/party-ui-handler.ts index 4dbc14daa8d..fadbb2ff7e9 100644 --- a/src/ui/party-ui-handler.ts +++ b/src/ui/party-ui-handler.ts @@ -15,10 +15,11 @@ import { pokemonEvolutions } from "../data/pokemon-evolutions"; import { addWindow } from "./ui-theme"; import { SpeciesFormChangeItemTrigger } from "../data/pokemon-forms"; import { getVariantTint } from "#app/data/variant"; -import {Button, Moves} from "#enums"; +import {Button} from "#enums/buttons"; import { applyChallenges, ChallengeType } from "#app/data/challenge.js"; import MoveInfoOverlay from "./move-info-overlay"; import i18next from "i18next"; +import { Moves } from "#enums/moves"; const defaultMessage = "Choose a Pokémon."; diff --git a/src/ui/save-slot-select-ui-handler.ts b/src/ui/save-slot-select-ui-handler.ts index 7c51b154e74..47c61011f8c 100644 --- a/src/ui/save-slot-select-ui-handler.ts +++ b/src/ui/save-slot-select-ui-handler.ts @@ -1,6 +1,6 @@ import i18next from "i18next"; import BattleScene from "../battle-scene"; -import { Button } from "#enums"; +import { Button } from "#enums/buttons"; import { GameMode } from "../game-mode"; import { PokemonHeldItemModifier } from "../modifier/modifier"; import { SessionSaveData } from "../system/game-data"; diff --git a/src/ui/settings/abstract-binding-ui-handler.ts b/src/ui/settings/abstract-binding-ui-handler.ts index 285e6f58575..1cc59c13035 100644 --- a/src/ui/settings/abstract-binding-ui-handler.ts +++ b/src/ui/settings/abstract-binding-ui-handler.ts @@ -3,7 +3,7 @@ import BattleScene from "../../battle-scene"; import {Mode} from "../ui"; import {addWindow} from "../ui-theme"; import {addTextObject, TextStyle} from "../text"; -import {Button} from "#enums"; +import {Button} from "#enums/buttons"; import {NavigationManager} from "#app/ui/settings/navigationMenu"; /** diff --git a/src/ui/settings/abstract-control-settings-ui-handler.ts b/src/ui/settings/abstract-control-settings-ui-handler.ts index 0a271ea5b63..4abc19f9087 100644 --- a/src/ui/settings/abstract-control-settings-ui-handler.ts +++ b/src/ui/settings/abstract-control-settings-ui-handler.ts @@ -4,9 +4,10 @@ import {Mode} from "../ui"; import {InterfaceConfig} from "../../inputs-controller"; import {addWindow} from "../ui-theme"; import {addTextObject, TextStyle} from "../text"; -import {Button, Device} from "#enums"; import {getIconWithSettingName} from "#app/configs/inputs/configHandler"; import NavigationMenu, {NavigationManager} from "#app/ui/settings/navigationMenu"; +import { Device } from "#enums/devices"; +import { Button } from "#enums/buttons"; export interface InputsIcons { [key: string]: Phaser.GameObjects.Sprite; diff --git a/src/ui/settings/abstract-settings-ui-handler.ts b/src/ui/settings/abstract-settings-ui-handler.ts index 7d8467ec870..dad797d43a5 100644 --- a/src/ui/settings/abstract-settings-ui-handler.ts +++ b/src/ui/settings/abstract-settings-ui-handler.ts @@ -4,7 +4,7 @@ import { TextStyle, addTextObject } from "../text"; import { Mode } from "../ui"; import UiHandler from "../ui-handler"; import { addWindow } from "../ui-theme"; -import {Button} from "#enums"; +import {Button} from "#enums/buttons"; import {InputsIcons} from "#app/ui/settings/abstract-control-settings-ui-handler.js"; import NavigationMenu, {NavigationManager} from "#app/ui/settings/navigationMenu"; import { Setting, SettingKeys } from "#app/system/settings/settings"; diff --git a/src/ui/settings/gamepad-binding-ui-handler.ts b/src/ui/settings/gamepad-binding-ui-handler.ts index 785f9f4fd58..70291da15a2 100644 --- a/src/ui/settings/gamepad-binding-ui-handler.ts +++ b/src/ui/settings/gamepad-binding-ui-handler.ts @@ -1,7 +1,7 @@ import BattleScene from "../../battle-scene"; import AbstractBindingUiHandler from "./abstract-binding-ui-handler"; import {Mode} from "../ui"; -import {Device} from "#enums"; +import {Device} from "#enums/devices"; import {getIconWithSettingName, getKeyWithKeycode} from "#app/configs/inputs/configHandler"; import {addTextObject, TextStyle} from "#app/ui/text"; diff --git a/src/ui/settings/keyboard-binding-ui-handler.ts b/src/ui/settings/keyboard-binding-ui-handler.ts index 0c2c38513f0..2a92bb0fa6c 100644 --- a/src/ui/settings/keyboard-binding-ui-handler.ts +++ b/src/ui/settings/keyboard-binding-ui-handler.ts @@ -2,7 +2,7 @@ import BattleScene from "../../battle-scene"; import AbstractBindingUiHandler from "./abstract-binding-ui-handler"; import {Mode} from "../ui"; import { getKeyWithKeycode} from "#app/configs/inputs/configHandler"; -import {Device} from "#enums"; +import {Device} from "#enums/devices"; import {addTextObject, TextStyle} from "#app/ui/text"; diff --git a/src/ui/settings/navigationMenu.ts b/src/ui/settings/navigationMenu.ts index 0523b1da625..eb65ea95e0c 100644 --- a/src/ui/settings/navigationMenu.ts +++ b/src/ui/settings/navigationMenu.ts @@ -3,7 +3,7 @@ import {Mode} from "#app/ui/ui"; import {InputsIcons} from "#app/ui/settings/abstract-control-settings-ui-handler.js"; import {addTextObject, setTextStyle, TextStyle} from "#app/ui/text"; import {addWindow} from "#app/ui/ui-theme"; -import {Button} from "#enums"; +import {Button} from "#enums/buttons"; const LEFT = "LEFT"; const RIGHT = "RIGHT"; diff --git a/src/ui/settings/settings-gamepad-ui-handler.ts b/src/ui/settings/settings-gamepad-ui-handler.ts index 9e4b1e90a64..18ebde962f1 100644 --- a/src/ui/settings/settings-gamepad-ui-handler.ts +++ b/src/ui/settings/settings-gamepad-ui-handler.ts @@ -13,7 +13,7 @@ import pad_dualshock from "#app/configs/inputs/pad_dualshock"; import pad_unlicensedSNES from "#app/configs/inputs/pad_unlicensedSNES"; import {InterfaceConfig} from "#app/inputs-controller"; import AbstractControlSettingsUiHandler from "#app/ui/settings/abstract-control-settings-ui-handler.js"; -import {Device} from "#enums"; +import {Device} from "#enums/devices"; import {truncateString} from "#app/utils"; /** diff --git a/src/ui/settings/settings-keyboard-ui-handler.ts b/src/ui/settings/settings-keyboard-ui-handler.ts index 15dd058d53e..7eb1e4f6c60 100644 --- a/src/ui/settings/settings-keyboard-ui-handler.ts +++ b/src/ui/settings/settings-keyboard-ui-handler.ts @@ -13,7 +13,7 @@ import AbstractControlSettingsUiHandler from "#app/ui/settings/abstract-control- import {InterfaceConfig} from "#app/inputs-controller"; import {addTextObject, TextStyle} from "#app/ui/text"; import {deleteBind} from "#app/configs/inputs/configHandler"; -import {Device} from "#enums"; +import {Device} from "#enums/devices"; import {NavigationManager} from "#app/ui/settings/navigationMenu"; /** diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/starter-select-ui-handler.ts index bdeb542d899..0fcded90372 100644 --- a/src/ui/starter-select-ui-handler.ts +++ b/src/ui/starter-select-ui-handler.ts @@ -28,10 +28,14 @@ import { TextStyle, addBBCodeTextObject, addTextObject } from "./text"; import { Mode } from "./ui"; import { addWindow } from "./ui-theme"; import {SettingKeyboard} from "#app/system/settings/settings-keyboard"; -import {Device, Moves, Species, Button, Passive as PassiveAttr} from "#enums"; +import {Passive as PassiveAttr} from "#enums/passive"; import * as Challenge from "../data/challenge"; import MoveInfoOverlay from "./move-info-overlay"; import { getEggTierForSpecies } from "#app/data/egg.js"; +import { Device } from "#enums/devices"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import {Button} from "#enums/buttons"; export type StarterSelectCallback = (starters: Starter[]) => void; diff --git a/src/ui/summary-ui-handler.ts b/src/ui/summary-ui-handler.ts index d063d9c6d26..5b4dc2cf84f 100644 --- a/src/ui/summary-ui-handler.ts +++ b/src/ui/summary-ui-handler.ts @@ -18,10 +18,11 @@ import { getBiomeName } from "../data/biomes"; import { Nature, getNatureStatMultiplier } from "../data/nature"; import { loggedInUser } from "../account"; import { Variant, getVariantTint } from "#app/data/variant"; -import {Button, PlayerGender} from "#enums"; +import {Button} from "#enums/buttons"; import { Ability } from "../data/ability.js"; import i18next from "i18next"; import {modifierSortFunc} from "../modifier/modifier"; +import { PlayerGender } from "#enums/player-gender"; enum Page { diff --git a/src/ui/target-select-ui-handler.ts b/src/ui/target-select-ui-handler.ts index 256acc78c8a..772500e8901 100644 --- a/src/ui/target-select-ui-handler.ts +++ b/src/ui/target-select-ui-handler.ts @@ -4,7 +4,8 @@ import { Mode } from "./ui"; import UiHandler from "./ui-handler"; import * as Utils from "../utils"; import { getMoveTargets } from "../data/move"; -import {Button, Moves} from "#enums"; +import {Button} from "#enums/buttons"; +import { Moves } from "#enums/moves"; export type TargetSelectCallback = (cursor: integer) => void; diff --git a/src/ui/text.ts b/src/ui/text.ts index 8c034564469..b74742fef74 100644 --- a/src/ui/text.ts +++ b/src/ui/text.ts @@ -1,9 +1,10 @@ import BBCodeText from "phaser3-rex-plugins/plugins/gameobjects/tagtext/bbcodetext/BBCodeText"; import InputText from "phaser3-rex-plugins/plugins/inputtext"; import BattleScene from "../battle-scene"; -import { EggTier, UiTheme } from "#enums"; import { ModifierTier } from "../modifier/modifier-tier"; import Phaser from "phaser"; +import { EggTier } from "#enums/egg-type"; +import { UiTheme } from "#enums/ui-theme"; export enum TextStyle { MESSAGE, diff --git a/src/ui/time-of-day-widget.ts b/src/ui/time-of-day-widget.ts index eabd91b4608..e71839a84c5 100644 --- a/src/ui/time-of-day-widget.ts +++ b/src/ui/time-of-day-widget.ts @@ -1,7 +1,8 @@ import * as Utils from "../utils"; import BattleScene from "#app/battle-scene.js"; import { BattleSceneEventType } from "../events/battle-scene"; -import { EaseType, TimeOfDay } from "#enums"; +import { EaseType } from "#enums/ease-type"; +import { TimeOfDay } from "#enums/time-of-day"; /** A small self contained UI element that displays the time of day as an icon */ export default class TimeOfDayWidget extends Phaser.GameObjects.Container { diff --git a/src/ui/ui-handler.ts b/src/ui/ui-handler.ts index f574844dc5a..8336109847e 100644 --- a/src/ui/ui-handler.ts +++ b/src/ui/ui-handler.ts @@ -1,7 +1,7 @@ import BattleScene from "../battle-scene"; import { TextStyle, getTextColor } from "./text"; import { Mode } from "./ui"; -import {Button} from "#enums"; +import {Button} from "#enums/buttons"; /** * A basic abstract class to act as a holder and processor for UI elements. diff --git a/src/ui/ui-theme.ts b/src/ui/ui-theme.ts index 139b5f75768..b2992d049cb 100644 --- a/src/ui/ui-theme.ts +++ b/src/ui/ui-theme.ts @@ -1,4 +1,4 @@ -import { UiTheme } from "#enums"; +import { UiTheme } from "#enums/ui-theme"; import { legacyCompatibleImages } from "#app/scene-base"; import BattleScene from "../battle-scene"; diff --git a/src/ui/ui.ts b/src/ui/ui.ts index f576d157e2d..55982d049cf 100644 --- a/src/ui/ui.ts +++ b/src/ui/ui.ts @@ -37,13 +37,14 @@ import SavingIconHandler from "./saving-icon-handler"; import UnavailableModalUiHandler from "./unavailable-modal-ui-handler"; import OutdatedModalUiHandler from "./outdated-modal-ui-handler"; import SessionReloadModalUiHandler from "./session-reload-modal-ui-handler"; -import {Button, PlayerGender} from "#enums"; +import {Button} from "#enums/buttons"; import i18next, {ParseKeys} 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"; export enum Mode { MESSAGE, diff --git a/src/ui/vouchers-ui-handler.ts b/src/ui/vouchers-ui-handler.ts index ebb32ea8ed0..a57a5dda9e7 100644 --- a/src/ui/vouchers-ui-handler.ts +++ b/src/ui/vouchers-ui-handler.ts @@ -1,5 +1,5 @@ import BattleScene from "../battle-scene"; -import { Button } from "#enums"; +import { Button } from "#enums/buttons"; import i18next from "../plugins/i18n"; import { Voucher, getVoucherTypeIcon, getVoucherTypeName, vouchers } from "../system/voucher"; import MessageUiHandler from "./message-ui-handler"; diff --git a/src/utils.ts b/src/utils.ts index e4d31d16121..7c1a24a6d5e 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -1,5 +1,5 @@ import i18next from "i18next"; -import { MoneyFormat } from "#enums"; +import { MoneyFormat } from "#enums/money-format"; export const MissingTextureKey = "__MISSING"; diff --git a/tsconfig.json b/tsconfig.json index 5ca3e257306..2df676d8433 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -11,8 +11,7 @@ "rootDir": "./src", "baseUrl": "./src", "paths": { - "#enums": ["./enums"], - "#enums/*": ["./enums/*"], + "#enums/*": ["./enums/*.ts"], "#app/*": ["*.ts"], "#app": ["."], "#test/*": ["./test/*.ts"]