diff --git a/src/battle-scene.ts b/src/battle-scene.ts index 6a3958e385f..adb93ffcce7 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -132,7 +132,7 @@ import { BattleStyle } from "#enums/battle-style"; import { Biome } from "#enums/biome"; import type { ExpNotification } from "#enums/exp-notification"; import { MoneyFormat } from "#enums/money-format"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { PlayerGender } from "#enums/player-gender"; import { Species } from "#enums/species"; import { UiTheme } from "#enums/ui-theme"; diff --git a/src/battle.ts b/src/battle.ts index c25c3941f07..27ecf2e585f 100644 --- a/src/battle.ts +++ b/src/battle.ts @@ -19,7 +19,7 @@ import type { EnemyPokemon, PlayerPokemon, TurnMove } from "#app/field/pokemon"; import type Pokemon from "#app/field/pokemon"; import { ArenaTagType } from "#enums/arena-tag-type"; import { BattleSpec } from "#enums/battle-spec"; -import type { MoveId } from "#enums/moves"; +import type { MoveId } from "#enums/move-id"; import { PlayerGender } from "#enums/player-gender"; import { MusicPreference } from "#app/system/settings/settings"; import { Species } from "#enums/species"; diff --git a/src/data/abilities/ability.ts b/src/data/abilities/ability.ts index 7b2901b5651..9729018104d 100644 --- a/src/data/abilities/ability.ts +++ b/src/data/abilities/ability.ts @@ -53,7 +53,7 @@ import { WeatherType } from "#enums/weather-type"; import { AbilityId } from "#enums/ability-id"; import { ArenaTagType } from "#enums/arena-tag-type"; import { BattlerTagType } from "#enums/battler-tag-type"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { SwitchType } from "#enums/switch-type"; import { MoveFlags } from "#enums/MoveFlags"; diff --git a/src/data/arena-tag.ts b/src/data/arena-tag.ts index ae96bf2b04d..590319a01c0 100644 --- a/src/data/arena-tag.ts +++ b/src/data/arena-tag.ts @@ -25,7 +25,7 @@ import i18next from "i18next"; import { AbilityId } from "#enums/ability-id"; import { ArenaTagType } from "#enums/arena-tag-type"; import { BattlerTagType } from "#enums/battler-tag-type"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { PokemonHealPhase } from "#app/phases/pokemon-heal-phase"; import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase"; diff --git a/src/data/balance/egg-moves.ts b/src/data/balance/egg-moves.ts index 1ffab79c1ed..1b3f838b4a2 100644 --- a/src/data/balance/egg-moves.ts +++ b/src/data/balance/egg-moves.ts @@ -1,6 +1,6 @@ import { allMoves } from "../data-lists"; import { getEnumKeys, getEnumValues } from "#app/utils/common"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; diff --git a/src/data/balance/pokemon-evolutions.ts b/src/data/balance/pokemon-evolutions.ts index 4bc110e5929..0f3a5ba4ba6 100644 --- a/src/data/balance/pokemon-evolutions.ts +++ b/src/data/balance/pokemon-evolutions.ts @@ -7,7 +7,7 @@ import { randSeedInt } from "#app/utils/common"; import { WeatherType } from "#enums/weather-type"; import { Nature } from "#enums/nature"; import { Biome } from "#enums/biome"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { SpeciesFormKey } from "#enums/species-form-key"; import { TimeOfDay } from "#enums/time-of-day"; diff --git a/src/data/balance/pokemon-level-moves.ts b/src/data/balance/pokemon-level-moves.ts index ff413af27d9..7e6ed1028ba 100644 --- a/src/data/balance/pokemon-level-moves.ts +++ b/src/data/balance/pokemon-level-moves.ts @@ -1,4 +1,4 @@ -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; export type LevelMoves = ([number, MoveId])[]; diff --git a/src/data/balance/tms.ts b/src/data/balance/tms.ts index 473d14e0652..5cfeed2687e 100644 --- a/src/data/balance/tms.ts +++ b/src/data/balance/tms.ts @@ -1,5 +1,5 @@ import { ModifierTier } from "#app/modifier/modifier-tier"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; interface TmSpecies { diff --git a/src/data/battle-anims.ts b/src/data/battle-anims.ts index 2be2fdca10f..321d9938b2f 100644 --- a/src/data/battle-anims.ts +++ b/src/data/battle-anims.ts @@ -5,7 +5,7 @@ import { MoveFlags } from "#enums/MoveFlags"; import type Pokemon from "../field/pokemon"; import { type nil, getFrameMs, getEnumKeys, getEnumValues, animationFileName } from "../utils/common"; import type { BattlerIndex } from "../battle"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { SubstituteTag } from "./battler-tags"; import { isNullOrUndefined } from "../utils/common"; import Phaser from "phaser"; diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts index cf5e6e01b45..312c574e49a 100644 --- a/src/data/battler-tags.ts +++ b/src/data/battler-tags.ts @@ -37,7 +37,7 @@ import i18next from "#app/plugins/i18n"; import { BooleanHolder, getFrameMs, NumberHolder, toDmgValue } from "#app/utils/common"; import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#enums/battler-tag-type"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { PokemonAnimType } from "#enums/pokemon-anim-type"; import { Species } from "#enums/species"; import { EFFECTIVE_STATS, getStatKey, Stat, type BattleStat, type EffectiveStat } from "#enums/stat"; diff --git a/src/data/challenge.ts b/src/data/challenge.ts index 3de99b98dda..67b2e38b5b0 100644 --- a/src/data/challenge.ts +++ b/src/data/challenge.ts @@ -18,7 +18,7 @@ import { Challenges } from "#enums/challenges"; import { Species } from "#enums/species"; import { TrainerType } from "#enums/trainer-type"; import { Nature } from "#enums/nature"; -import type { MoveId } from "#enums/moves"; +import type { MoveId } from "#enums/move-id"; import { TypeColor, TypeShadow } from "#enums/color"; import { ModifierTier } from "#app/modifier/modifier-tier"; import { globalScene } from "#app/global-scene"; diff --git a/src/data/moves/invalid-moves.ts b/src/data/moves/invalid-moves.ts index af88cb9fa5b..559b679752d 100644 --- a/src/data/moves/invalid-moves.ts +++ b/src/data/moves/invalid-moves.ts @@ -1,4 +1,4 @@ -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; /** Set of moves that cannot be called by {@linkcode MoveId.METRONOME Metronome} */ export const invalidMetronomeMoves: ReadonlySet = new Set([ diff --git a/src/data/moves/move.ts b/src/data/moves/move.ts index fc7b088d2c8..e0bc14a1ddf 100644 --- a/src/data/moves/move.ts +++ b/src/data/moves/move.ts @@ -87,7 +87,7 @@ import { AbilityId } from "#enums/ability-id"; import { ArenaTagType } from "#enums/arena-tag-type"; import { BattlerTagType } from "#enums/battler-tag-type"; import { Biome } from "#enums/biome"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { MoveUsedEvent } from "#app/events/battle-scene"; import { diff --git a/src/data/mystery-encounters/encounters/absolute-avarice-encounter.ts b/src/data/mystery-encounters/encounters/absolute-avarice-encounter.ts index c948ccefc93..fd79c7561aa 100644 --- a/src/data/mystery-encounters/encounters/absolute-avarice-encounter.ts +++ b/src/data/mystery-encounters/encounters/absolute-avarice-encounter.ts @@ -22,7 +22,7 @@ import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { BerryModifier, PokemonInstantReviveModifier } from "#app/modifier/modifier"; import { getPokemonSpecies } from "#app/data/pokemon-species"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { BattlerTagType } from "#enums/battler-tag-type"; import { randInt } from "#app/utils/common"; import { BattlerIndex } from "#app/battle"; diff --git a/src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts b/src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts index d8abf9c5e6e..cf8abaf0a61 100644 --- a/src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts +++ b/src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts @@ -27,7 +27,7 @@ import type Pokemon from "#app/field/pokemon"; import { PokemonMove } from "#app/field/pokemon"; import { getEncounterText, showEncounterDialogue } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; import { LearnMovePhase } from "#app/phases/learn-move-phase"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import type { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler"; import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; diff --git a/src/data/mystery-encounters/encounters/clowning-around-encounter.ts b/src/data/mystery-encounters/encounters/clowning-around-encounter.ts index 20c8fd8f1a7..c4eba7ce824 100644 --- a/src/data/mystery-encounters/encounters/clowning-around-encounter.ts +++ b/src/data/mystery-encounters/encounters/clowning-around-encounter.ts @@ -42,7 +42,7 @@ import { Ability } from "#app/data/abilities/ability-class"; import { BerryModifier } from "#app/modifier/modifier"; import { BerryType } from "#enums/berry-type"; import { BattlerIndex } from "#app/battle"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { EncounterBattleAnim } from "#app/data/battle-anims"; import { MoveCategory } from "#enums/MoveCategory"; import { CustomPokemonData } from "#app/data/custom-pokemon-data"; diff --git a/src/data/mystery-encounters/encounters/dancing-lessons-encounter.ts b/src/data/mystery-encounters/encounters/dancing-lessons-encounter.ts index 8db255bbf45..bf48db614fa 100644 --- a/src/data/mystery-encounters/encounters/dancing-lessons-encounter.ts +++ b/src/data/mystery-encounters/encounters/dancing-lessons-encounter.ts @@ -33,7 +33,7 @@ import type { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler" import { BattlerTagType } from "#enums/battler-tag-type"; import { Biome } from "#enums/biome"; import { EncounterAnim } from "#enums/encounter-anims"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import { MysteryEncounterType } from "#enums/mystery-encounter-type"; diff --git a/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts b/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts index 3d658d0bfab..fa854a3a355 100644 --- a/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts +++ b/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts @@ -27,7 +27,7 @@ import { PokemonType } from "#enums/pokemon-type"; import { BattlerIndex } from "#app/battle"; import type Pokemon from "#app/field/pokemon"; import { PokemonMove } from "#app/field/pokemon"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { EncounterBattleAnim } from "#app/data/battle-anims"; import { WeatherType } from "#enums/weather-type"; import { isNullOrUndefined, randSeedInt } from "#app/utils/common"; diff --git a/src/data/mystery-encounters/encounters/lost-at-sea-encounter.ts b/src/data/mystery-encounters/encounters/lost-at-sea-encounter.ts index 82e560cdcb0..b6e2a4a08c3 100644 --- a/src/data/mystery-encounters/encounters/lost-at-sea-encounter.ts +++ b/src/data/mystery-encounters/encounters/lost-at-sea-encounter.ts @@ -1,5 +1,5 @@ import { getPokemonSpecies } from "#app/data/pokemon-species"; -import { MoveId } from "#app/enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#app/enums/species"; import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { globalScene } from "#app/global-scene"; diff --git a/src/data/mystery-encounters/encounters/mysterious-chest-encounter.ts b/src/data/mystery-encounters/encounters/mysterious-chest-encounter.ts index b59fa680227..27ed9fbdf3f 100644 --- a/src/data/mystery-encounters/encounters/mysterious-chest-encounter.ts +++ b/src/data/mystery-encounters/encounters/mysterious-chest-encounter.ts @@ -19,7 +19,7 @@ import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; import { ModifierTier } from "#app/modifier/modifier-tier"; import { GameOverPhase } from "#app/phases/game-over-phase"; import { randSeedInt } from "#app/utils/common"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import { MysteryEncounterType } from "#enums/mystery-encounter-type"; diff --git a/src/data/mystery-encounters/encounters/slumbering-snorlax-encounter.ts b/src/data/mystery-encounters/encounters/slumbering-snorlax-encounter.ts index df7eacee1d9..72dac33d06d 100644 --- a/src/data/mystery-encounters/encounters/slumbering-snorlax-encounter.ts +++ b/src/data/mystery-encounters/encounters/slumbering-snorlax-encounter.ts @@ -20,7 +20,7 @@ import { } from "../utils/encounter-phase-utils"; import { queueEncounterMessage } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; import { Nature } from "#enums/nature"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { BattlerIndex } from "#app/battle"; import { AiType, PokemonMove } from "#app/field/pokemon"; import { getPokemonSpecies } from "#app/data/pokemon-species"; diff --git a/src/data/mystery-encounters/encounters/the-expert-pokemon-breeder-encounter.ts b/src/data/mystery-encounters/encounters/the-expert-pokemon-breeder-encounter.ts index 70ca7586fcc..35d802523b5 100644 --- a/src/data/mystery-encounters/encounters/the-expert-pokemon-breeder-encounter.ts +++ b/src/data/mystery-encounters/encounters/the-expert-pokemon-breeder-encounter.ts @@ -18,7 +18,7 @@ import { Species } from "#enums/species"; import { getPokemonSpecies } from "#app/data/pokemon-species"; import { speciesStarterCosts } from "#app/data/balance/starters"; import { Nature } from "#enums/nature"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import type { PlayerPokemon } from "#app/field/pokemon"; import { getEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; import type { IEggOptions } from "#app/data/egg"; diff --git a/src/data/mystery-encounters/encounters/the-strong-stuff-encounter.ts b/src/data/mystery-encounters/encounters/the-strong-stuff-encounter.ts index 09c3778c218..ff9b907228c 100644 --- a/src/data/mystery-encounters/encounters/the-strong-stuff-encounter.ts +++ b/src/data/mystery-encounters/encounters/the-strong-stuff-encounter.ts @@ -20,7 +20,7 @@ import type Pokemon from "#app/field/pokemon"; import { PokemonMove } from "#app/field/pokemon"; import { queueEncounterMessage, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; import { modifyPlayerPokemonBST } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { BattlerIndex } from "#app/battle"; import { BattlerTagType } from "#enums/battler-tag-type"; import { BerryType } from "#enums/berry-type"; diff --git a/src/data/mystery-encounters/encounters/the-winstrate-challenge-encounter.ts b/src/data/mystery-encounters/encounters/the-winstrate-challenge-encounter.ts index c0a5bc42e77..a108c093283 100644 --- a/src/data/mystery-encounters/encounters/the-winstrate-challenge-encounter.ts +++ b/src/data/mystery-encounters/encounters/the-winstrate-challenge-encounter.ts @@ -18,7 +18,7 @@ import { TrainerType } from "#enums/trainer-type"; import { Species } from "#enums/species"; import { AbilityId } from "#enums/ability-id"; import { getPokemonSpecies } from "#app/data/pokemon-species"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Nature } from "#enums/nature"; import { PokemonType } from "#enums/pokemon-type"; import { BerryType } from "#enums/berry-type"; diff --git a/src/data/mystery-encounters/encounters/trash-to-treasure-encounter.ts b/src/data/mystery-encounters/encounters/trash-to-treasure-encounter.ts index 08959e7c0df..2f1403aebb6 100644 --- a/src/data/mystery-encounters/encounters/trash-to-treasure-encounter.ts +++ b/src/data/mystery-encounters/encounters/trash-to-treasure-encounter.ts @@ -23,7 +23,7 @@ import { showEncounterText } from "#app/data/mystery-encounters/utils/encounter- import i18next from "#app/plugins/i18n"; import { ModifierTier } from "#app/modifier/modifier-tier"; import { getPokemonSpecies } from "#app/data/pokemon-species"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { BattlerIndex } from "#app/battle"; import { PokemonMove } from "#app/field/pokemon"; import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; diff --git a/src/data/mystery-encounters/encounters/uncommon-breed-encounter.ts b/src/data/mystery-encounters/encounters/uncommon-breed-encounter.ts index aff90a9480a..e51a8554120 100644 --- a/src/data/mystery-encounters/encounters/uncommon-breed-encounter.ts +++ b/src/data/mystery-encounters/encounters/uncommon-breed-encounter.ts @@ -28,7 +28,7 @@ import { } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; import PokemonData from "#app/system/pokemon-data"; import { isNullOrUndefined, randSeedInt } from "#app/utils/common"; -import type { MoveId } from "#enums/moves"; +import type { MoveId } from "#enums/move-id"; import { BattlerIndex } from "#app/battle"; import { SelfStatusMove } from "#app/data/moves/move"; import { PokeballType } from "#enums/pokeball"; diff --git a/src/data/mystery-encounters/mystery-encounter-option.ts b/src/data/mystery-encounters/mystery-encounter-option.ts index 17b744bf7ed..53b53392bb8 100644 --- a/src/data/mystery-encounters/mystery-encounter-option.ts +++ b/src/data/mystery-encounters/mystery-encounter-option.ts @@ -1,5 +1,5 @@ import type { OptionTextDisplay } from "#app/data/mystery-encounters/mystery-encounter-dialogue"; -import type { MoveId } from "#app/enums/moves"; +import type { MoveId } from "#enums/move-id"; import type { PlayerPokemon } from "#app/field/pokemon"; import type Pokemon from "#app/field/pokemon"; import { globalScene } from "#app/global-scene"; diff --git a/src/data/mystery-encounters/mystery-encounter-requirements.ts b/src/data/mystery-encounters/mystery-encounter-requirements.ts index 7b9719a79b3..bfddb0332c2 100644 --- a/src/data/mystery-encounters/mystery-encounter-requirements.ts +++ b/src/data/mystery-encounters/mystery-encounter-requirements.ts @@ -11,7 +11,7 @@ import { AttackTypeBoosterModifier } from "#app/modifier/modifier"; import type { AttackTypeBoosterModifierType } from "#app/modifier/modifier-type"; import { isNullOrUndefined } from "#app/utils/common"; import type { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import type { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { Species } from "#enums/species"; import { SpeciesFormKey } from "#enums/species-form-key"; diff --git a/src/data/mystery-encounters/requirements/can-learn-move-requirement.ts b/src/data/mystery-encounters/requirements/can-learn-move-requirement.ts index a03f6a6462c..7698be7b15d 100644 --- a/src/data/mystery-encounters/requirements/can-learn-move-requirement.ts +++ b/src/data/mystery-encounters/requirements/can-learn-move-requirement.ts @@ -1,4 +1,4 @@ -import type { MoveId } from "#app/enums/moves"; +import type { MoveId } from "#enums/move-id"; import type { PlayerPokemon } from "#app/field/pokemon"; import { PokemonMove } from "#app/field/pokemon"; import { isNullOrUndefined } from "#app/utils/common"; diff --git a/src/data/mystery-encounters/requirements/requirement-groups.ts b/src/data/mystery-encounters/requirements/requirement-groups.ts index 53d4b25e7b7..0140a5fe320 100644 --- a/src/data/mystery-encounters/requirements/requirement-groups.ts +++ b/src/data/mystery-encounters/requirements/requirement-groups.ts @@ -1,4 +1,4 @@ -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { AbilityId } from "#enums/ability-id"; /** diff --git a/src/data/mystery-encounters/utils/encounter-phase-utils.ts b/src/data/mystery-encounters/utils/encounter-phase-utils.ts index 1f5b0a3e8e6..da912d30c88 100644 --- a/src/data/mystery-encounters/utils/encounter-phase-utils.ts +++ b/src/data/mystery-encounters/utils/encounter-phase-utils.ts @@ -39,7 +39,7 @@ import i18next from "i18next"; import Trainer, { TrainerVariant } from "#app/field/trainer"; import type { Gender } from "#app/data/gender"; import type { Nature } from "#enums/nature"; -import type { MoveId } from "#enums/moves"; +import type { MoveId } from "#enums/move-id"; import { initMoveAnim, loadMoveAnimAssets } from "#app/data/battle-anims"; import { MysteryEncounterMode } from "#enums/mystery-encounter-mode"; import { Status } from "#app/data/status-effect"; diff --git a/src/data/pokemon-forms.ts b/src/data/pokemon-forms.ts index 76271c21d29..e6e320b578e 100644 --- a/src/data/pokemon-forms.ts +++ b/src/data/pokemon-forms.ts @@ -5,7 +5,7 @@ import { allMoves } from "./data-lists"; import { MoveCategory } from "#enums/MoveCategory"; import type { Constructor, nil } from "#app/utils/common"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import type { TimeOfDay } from "#enums/time-of-day"; import { getPokemonNameWithAffix } from "#app/messages"; diff --git a/src/data/trainers/trainer-config.ts b/src/data/trainers/trainer-config.ts index 0b4dd8eb705..aee97ad2c88 100644 --- a/src/data/trainers/trainer-config.ts +++ b/src/data/trainers/trainer-config.ts @@ -26,7 +26,7 @@ import { PartyMemberStrength } from "#enums/party-member-strength"; import { Species } from "#enums/species"; import { PokeballType } from "#enums/pokeball"; import { PokemonType } from "#enums/pokemon-type"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { AbilityId } from "#enums/ability-id"; import { TeraAIMode } from "#enums/tera-ai-mode"; import { TrainerPoolTier } from "#enums/trainer-pool-tier"; diff --git a/src/enums/moves.ts b/src/enums/move-id.ts similarity index 100% rename from src/enums/moves.ts rename to src/enums/move-id.ts diff --git a/src/field/arena.ts b/src/field/arena.ts index b263c9a7852..d1732cabae0 100644 --- a/src/field/arena.ts +++ b/src/field/arena.ts @@ -32,7 +32,7 @@ import Overrides from "#app/overrides"; import { TagAddedEvent, TagRemovedEvent, TerrainChangedEvent, WeatherChangedEvent } from "#app/events/arena"; import type { ArenaTagType } from "#enums/arena-tag-type"; import { Biome } from "#enums/biome"; -import type { MoveId } from "#enums/moves"; +import type { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { TimeOfDay } from "#enums/time-of-day"; import { TrainerType } from "#enums/trainer-type"; diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index dabce198ce1..ac6ee274eb9 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -226,7 +226,7 @@ import { BattleSpec } from "#enums/battle-spec"; import { BattlerTagType } from "#enums/battler-tag-type"; import type { BerryType } from "#enums/berry-type"; import { Biome } from "#enums/biome"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { getPokemonNameWithAffix } from "#app/messages"; import { DamageAnimPhase } from "#app/phases/damage-anim-phase"; diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts index b09b99aed63..a7e7368a332 100644 --- a/src/modifier/modifier-type.ts +++ b/src/modifier/modifier-type.ts @@ -119,7 +119,7 @@ import { import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#enums/battler-tag-type"; import { BerryType } from "#enums/berry-type"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Nature } from "#enums/nature"; import { PokeballType } from "#enums/pokeball"; import { Species } from "#enums/species"; diff --git a/src/modifier/modifier.ts b/src/modifier/modifier.ts index fd534c633d9..b1f2e4c621e 100644 --- a/src/modifier/modifier.ts +++ b/src/modifier/modifier.ts @@ -18,7 +18,7 @@ import { addTextObject, TextStyle } from "#app/ui/text"; import { BooleanHolder, hslToHex, isNullOrUndefined, NumberHolder, toDmgValue } from "#app/utils/common"; import { BattlerTagType } from "#enums/battler-tag-type"; import { BerryType } from "#enums/berry-type"; -import type { MoveId } from "#enums/moves"; +import type { MoveId } from "#enums/move-id"; import type { Nature } from "#enums/nature"; import type { PokeballType } from "#enums/pokeball"; import { Species } from "#enums/species"; diff --git a/src/overrides.ts b/src/overrides.ts index cf6521b9213..ecfde88910f 100644 --- a/src/overrides.ts +++ b/src/overrides.ts @@ -10,7 +10,7 @@ import { BattleType } from "#enums/battle-type"; import { BerryType } from "#enums/berry-type"; import { Biome } from "#enums/biome"; import { EggTier } from "#enums/egg-type"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { PokeballType } from "#enums/pokeball"; diff --git a/src/phases/command-phase.ts b/src/phases/command-phase.ts index a4003c2ee46..d35a56a232c 100644 --- a/src/phases/command-phase.ts +++ b/src/phases/command-phase.ts @@ -9,7 +9,7 @@ import { speciesStarterCosts } from "#app/data/balance/starters"; import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#app/enums/battler-tag-type"; import { Biome } from "#app/enums/biome"; -import { MoveId } from "#app/enums/moves"; +import { MoveId } from "#enums/move-id"; import { PokeballType } from "#enums/pokeball"; import type { PlayerPokemon, TurnMove } from "#app/field/pokemon"; import { FieldPosition } from "#app/field/pokemon"; diff --git a/src/phases/learn-move-phase.ts b/src/phases/learn-move-phase.ts index a7ba6bf20c6..65679a7ade7 100644 --- a/src/phases/learn-move-phase.ts +++ b/src/phases/learn-move-phase.ts @@ -3,7 +3,7 @@ import { initMoveAnim, loadMoveAnimAssets } from "#app/data/battle-anims"; import type Move from "#app/data/moves/move"; import { allMoves } from "#app/data/data-lists"; import { SpeciesFormChangeMoveLearnedTrigger } from "#app/data/pokemon-forms"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { getPokemonNameWithAffix } from "#app/messages"; import Overrides from "#app/overrides"; import EvolutionSceneHandler from "#app/ui/evolution-scene-handler"; diff --git a/src/phases/load-move-anim-phase.ts b/src/phases/load-move-anim-phase.ts index 0b0ead353e6..c0b6cd58c54 100644 --- a/src/phases/load-move-anim-phase.ts +++ b/src/phases/load-move-anim-phase.ts @@ -1,5 +1,5 @@ import { initMoveAnim, loadMoveAnimAssets } from "#app/data/battle-anims"; -import type { MoveId } from "#enums/moves"; +import type { MoveId } from "#enums/move-id"; import { Phase } from "#app/phase"; /** diff --git a/src/phases/move-effect-phase.ts b/src/phases/move-effect-phase.ts index fd337e1a1c2..85cd4cd6b14 100644 --- a/src/phases/move-effect-phase.ts +++ b/src/phases/move-effect-phase.ts @@ -65,7 +65,7 @@ import { PokemonPhase } from "#app/phases/pokemon-phase"; import { BooleanHolder, isNullOrUndefined, NumberHolder } from "#app/utils/common"; import type { nil } from "#app/utils/common"; import { BattlerTagType } from "#enums/battler-tag-type"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import i18next from "i18next"; import type { Phase } from "#app/phase"; import { ShowAbilityPhase } from "./show-ability-phase"; diff --git a/src/phases/move-phase.ts b/src/phases/move-phase.ts index a87919ff4c7..4dc35661585 100644 --- a/src/phases/move-phase.ts +++ b/src/phases/move-phase.ts @@ -47,7 +47,7 @@ import { NumberHolder } from "#app/utils/common"; import { AbilityId } from "#enums/ability-id"; import { ArenaTagType } from "#enums/arena-tag-type"; import { BattlerTagType } from "#enums/battler-tag-type"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { StatusEffect } from "#enums/status-effect"; import i18next from "i18next"; diff --git a/src/phases/pokemon-transform-phase.ts b/src/phases/pokemon-transform-phase.ts index df71d70f930..23a9a983bae 100644 --- a/src/phases/pokemon-transform-phase.ts +++ b/src/phases/pokemon-transform-phase.ts @@ -1,6 +1,6 @@ import type { BattlerIndex } from "#app/battle"; import { BattlerTagType } from "#enums/battler-tag-type"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { EFFECTIVE_STATS, BATTLE_STATS } from "#enums/stat"; import { PokemonMove } from "#app/field/pokemon"; import { globalScene } from "#app/global-scene"; diff --git a/src/sprites/pokemon-asset-loader.ts b/src/sprites/pokemon-asset-loader.ts index dcc5f499d45..980d242a880 100644 --- a/src/sprites/pokemon-asset-loader.ts +++ b/src/sprites/pokemon-asset-loader.ts @@ -1,4 +1,4 @@ -import type { MoveId } from "#enums/moves"; +import type { MoveId } from "#enums/move-id"; import { initMoveAnim, loadMoveAnimAssets } from "#app/data/battle-anims"; /** diff --git a/src/system/game-data.ts b/src/system/game-data.ts index 06d8588514e..520ce355703 100644 --- a/src/system/game-data.ts +++ b/src/system/game-data.ts @@ -43,7 +43,7 @@ import { StatusEffect } from "#enums/status-effect"; import ChallengeData from "#app/system/challenge-data"; import { Device } from "#enums/devices"; import { GameDataType } from "#enums/game-data-type"; -import type { MoveId } from "#enums/moves"; +import type { MoveId } from "#enums/move-id"; import { PlayerGender } from "#enums/player-gender"; import { Species } from "#enums/species"; import { applyChallenges, ChallengeType } from "#app/data/challenge"; diff --git a/src/system/pokemon-data.ts b/src/system/pokemon-data.ts index 26ffcff83f1..3698e1f0e78 100644 --- a/src/system/pokemon-data.ts +++ b/src/system/pokemon-data.ts @@ -9,7 +9,7 @@ import Pokemon, { EnemyPokemon, PokemonBattleData, PokemonMove, PokemonSummonDat import { TrainerSlot } from "#enums/trainer-slot"; import type { Variant } from "#app/sprites/variant"; import type { Biome } from "#enums/biome"; -import type { MoveId } from "#enums/moves"; +import type { MoveId } from "#enums/move-id"; import type { Species } from "#enums/species"; import { CustomPokemonData } from "#app/data/custom-pokemon-data"; import type { PokemonType } from "#enums/pokemon-type"; diff --git a/src/system/version_migration/versions/v1_9_0.ts b/src/system/version_migration/versions/v1_9_0.ts index e66cea257fc..0f22b85d072 100644 --- a/src/system/version_migration/versions/v1_9_0.ts +++ b/src/system/version_migration/versions/v1_9_0.ts @@ -2,7 +2,7 @@ import type { SessionSaveMigrator } from "#app/@types/SessionSaveMigrator"; import { PokemonMove } from "#app/field/pokemon"; import type { SessionSaveData } from "#app/system/game-data"; import type PokemonData from "#app/system/pokemon-data"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; /** * Migrate all lingering rage fist data inside `CustomPokemonData`, diff --git a/src/ui/battle-flyout.ts b/src/ui/battle-flyout.ts index ed830c777c5..9a2180eccee 100644 --- a/src/ui/battle-flyout.ts +++ b/src/ui/battle-flyout.ts @@ -6,7 +6,7 @@ import type Move from "#app/data/moves/move"; import type { BerryUsedEvent, MoveUsedEvent } from "../events/battle-scene"; import { BattleSceneEventType } from "../events/battle-scene"; import { BerryType } from "#enums/berry-type"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { UiTheme } from "#enums/ui-theme"; import { getPokemonNameWithAffix } from "#app/messages"; diff --git a/src/ui/party-ui-handler.ts b/src/ui/party-ui-handler.ts index 1ee0bea431a..338eb46556e 100644 --- a/src/ui/party-ui-handler.ts +++ b/src/ui/party-ui-handler.ts @@ -25,7 +25,7 @@ import { applyChallenges, ChallengeType } from "#app/data/challenge"; import MoveInfoOverlay from "#app/ui/move-info-overlay"; import i18next from "i18next"; import type BBCodeText from "phaser3-rex-plugins/plugins/bbcodetext"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { getPokemonNameWithAffix } from "#app/messages"; import type { CommandPhase } from "#app/phases/command-phase"; diff --git a/src/ui/pokedex-page-ui-handler.ts b/src/ui/pokedex-page-ui-handler.ts index f7ce0440b27..c126057e7d0 100644 --- a/src/ui/pokedex-page-ui-handler.ts +++ b/src/ui/pokedex-page-ui-handler.ts @@ -36,7 +36,7 @@ import MoveInfoOverlay from "#app/ui/move-info-overlay"; import PokedexInfoOverlay from "#app/ui/pokedex-info-overlay"; import { getEggTierForSpecies } from "#app/data/egg"; import { Device } from "#enums/devices"; -import type { MoveId } from "#enums/moves"; +import type { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { Button } from "#enums/buttons"; import { EggSourceType } from "#enums/egg-source-types"; diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/starter-select-ui-handler.ts index 641d2ef55bd..aef74f24e03 100644 --- a/src/ui/starter-select-ui-handler.ts +++ b/src/ui/starter-select-ui-handler.ts @@ -47,7 +47,7 @@ import { applyChallenges, ChallengeType } from "#app/data/challenge"; import MoveInfoOverlay from "#app/ui/move-info-overlay"; import { getEggTierForSpecies } from "#app/data/egg"; import { Device } from "#enums/devices"; -import type { MoveId } from "#enums/moves"; +import type { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { Button } from "#enums/buttons"; import { EggSourceType } from "#enums/egg-source-types"; diff --git a/src/ui/target-select-ui-handler.ts b/src/ui/target-select-ui-handler.ts index 412b148610f..a2f89d38970 100644 --- a/src/ui/target-select-ui-handler.ts +++ b/src/ui/target-select-ui-handler.ts @@ -4,7 +4,7 @@ import UiHandler from "./ui-handler"; import { isNullOrUndefined, fixedInt } from "#app/utils/common"; import { getMoveTargets } from "../data/moves/move"; import { Button } from "#enums/buttons"; -import type { MoveId } from "#enums/moves"; +import type { MoveId } from "#enums/move-id"; import type Pokemon from "#app/field/pokemon"; import type { ModifierBar } from "#app/modifier/modifier"; import { SubstituteTag } from "#app/data/battler-tags"; diff --git a/src/utils/common.ts b/src/utils/common.ts index 8389af4dd4c..29923d7ddd4 100644 --- a/src/utils/common.ts +++ b/src/utils/common.ts @@ -1,5 +1,5 @@ import { MoneyFormat } from "#enums/money-format"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import i18next from "i18next"; import { pokerogueApi } from "#app/plugins/api/pokerogue-api"; import type { Variant } from "#app/sprites/variant"; diff --git a/test/abilities/ability_duplication.test.ts b/test/abilities/ability_duplication.test.ts index e422f389332..54cd6b3fb5a 100644 --- a/test/abilities/ability_duplication.test.ts +++ b/test/abilities/ability_duplication.test.ts @@ -1,6 +1,6 @@ import { Stat } from "#app/enums/stat"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/analytic.test.ts b/test/abilities/analytic.test.ts index d56d91d1d98..7abb6cc880a 100644 --- a/test/abilities/analytic.test.ts +++ b/test/abilities/analytic.test.ts @@ -1,7 +1,7 @@ import { BattlerIndex } from "#app/battle"; import { isBetween, toDmgValue } from "#app/utils/common"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/arena_trap.test.ts b/test/abilities/arena_trap.test.ts index e3b7744b73d..d60749d7254 100644 --- a/test/abilities/arena_trap.test.ts +++ b/test/abilities/arena_trap.test.ts @@ -1,6 +1,6 @@ import { allAbilities } from "#app/data/data-lists"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/aroma_veil.test.ts b/test/abilities/aroma_veil.test.ts index ccc28ae1f6d..a0416bb3380 100644 --- a/test/abilities/aroma_veil.test.ts +++ b/test/abilities/aroma_veil.test.ts @@ -1,4 +1,4 @@ -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { AbilityId } from "#enums/ability-id"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/aura_break.test.ts b/test/abilities/aura_break.test.ts index df85ee0814f..0a28e249976 100644 --- a/test/abilities/aura_break.test.ts +++ b/test/abilities/aura_break.test.ts @@ -1,6 +1,6 @@ import { allMoves } from "#app/data/data-lists"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/battery.test.ts b/test/abilities/battery.test.ts index 55cad8dd9d5..6186111a0c1 100644 --- a/test/abilities/battery.test.ts +++ b/test/abilities/battery.test.ts @@ -2,7 +2,7 @@ import { allMoves } from "#app/data/data-lists"; import { AbilityId } from "#enums/ability-id"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/battle_bond.test.ts b/test/abilities/battle_bond.test.ts index 4f98e48af91..81ddf291e1f 100644 --- a/test/abilities/battle_bond.test.ts +++ b/test/abilities/battle_bond.test.ts @@ -3,7 +3,7 @@ import { allMoves } from "#app/data/data-lists"; import { MultiHitType } from "#enums/MultiHitType"; import { Status } from "#app/data/status-effect"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/beast_boost.test.ts b/test/abilities/beast_boost.test.ts index 88b7156e372..3bba4ffeff2 100644 --- a/test/abilities/beast_boost.test.ts +++ b/test/abilities/beast_boost.test.ts @@ -1,6 +1,6 @@ import { BattlerIndex } from "#app/battle"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/commander.test.ts b/test/abilities/commander.test.ts index 245645c5e8d..d02868be7f3 100644 --- a/test/abilities/commander.test.ts +++ b/test/abilities/commander.test.ts @@ -7,7 +7,7 @@ import { StatusEffect } from "#enums/status-effect"; import { WeatherType } from "#enums/weather-type"; import { MoveResult } from "#app/field/pokemon"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/competitive.test.ts b/test/abilities/competitive.test.ts index deb9da1c3fe..8734f3c391c 100644 --- a/test/abilities/competitive.test.ts +++ b/test/abilities/competitive.test.ts @@ -1,7 +1,7 @@ import { Stat } from "#enums/stat"; import { TurnInitPhase } from "#app/phases/turn-init-phase"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/contrary.test.ts b/test/abilities/contrary.test.ts index c1d1b036e0a..81e01b436ea 100644 --- a/test/abilities/contrary.test.ts +++ b/test/abilities/contrary.test.ts @@ -1,4 +1,4 @@ -import { MoveId } from "#app/enums/moves"; +import { MoveId } from "#enums/move-id"; import { AbilityId } from "#enums/ability-id"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; diff --git a/test/abilities/corrosion.test.ts b/test/abilities/corrosion.test.ts index 778e20a06ea..5223300a8fc 100644 --- a/test/abilities/corrosion.test.ts +++ b/test/abilities/corrosion.test.ts @@ -1,5 +1,5 @@ import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/costar.test.ts b/test/abilities/costar.test.ts index a34a2f37017..13950b5b994 100644 --- a/test/abilities/costar.test.ts +++ b/test/abilities/costar.test.ts @@ -1,6 +1,6 @@ import { Stat } from "#enums/stat"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#app/enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#app/enums/species"; import { CommandPhase } from "#app/phases/command-phase"; import { MessagePhase } from "#app/phases/message-phase"; diff --git a/test/abilities/cud_chew.test.ts b/test/abilities/cud_chew.test.ts index 991ea5eae84..fdaafb14921 100644 --- a/test/abilities/cud_chew.test.ts +++ b/test/abilities/cud_chew.test.ts @@ -4,7 +4,7 @@ import { globalScene } from "#app/global-scene"; import { getPokemonNameWithAffix } from "#app/messages"; import { AbilityId } from "#enums/ability-id"; import { BerryType } from "#enums/berry-type"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/dancer.test.ts b/test/abilities/dancer.test.ts index 3572cd3de76..4354b448efe 100644 --- a/test/abilities/dancer.test.ts +++ b/test/abilities/dancer.test.ts @@ -1,7 +1,7 @@ import { BattlerIndex } from "#app/battle"; import type { MovePhase } from "#app/phases/move-phase"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/defiant.test.ts b/test/abilities/defiant.test.ts index 41dadb72217..184e0451ed0 100644 --- a/test/abilities/defiant.test.ts +++ b/test/abilities/defiant.test.ts @@ -1,7 +1,7 @@ import { Stat } from "#enums/stat"; import { TurnInitPhase } from "#app/phases/turn-init-phase"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/desolate-land.test.ts b/test/abilities/desolate-land.test.ts index dacfe3013ec..04bcf52394e 100644 --- a/test/abilities/desolate-land.test.ts +++ b/test/abilities/desolate-land.test.ts @@ -3,7 +3,7 @@ import { WeatherType } from "#app/enums/weather-type"; import type { CommandPhase } from "#app/phases/command-phase"; import { Command } from "#app/ui/command-ui-handler"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/disguise.test.ts b/test/abilities/disguise.test.ts index 47658550e22..00ed5a6cd7b 100644 --- a/test/abilities/disguise.test.ts +++ b/test/abilities/disguise.test.ts @@ -1,7 +1,7 @@ import { BattlerIndex } from "#app/battle"; import { toDmgValue } from "#app/utils/common"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; import { StatusEffect } from "#enums/status-effect"; diff --git a/test/abilities/dry_skin.test.ts b/test/abilities/dry_skin.test.ts index 4b02c618d26..bb8fc37699a 100644 --- a/test/abilities/dry_skin.test.ts +++ b/test/abilities/dry_skin.test.ts @@ -1,6 +1,6 @@ import { Species } from "#app/enums/species"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/early_bird.test.ts b/test/abilities/early_bird.test.ts index bf54e68bf6f..a734b8b7cdf 100644 --- a/test/abilities/early_bird.test.ts +++ b/test/abilities/early_bird.test.ts @@ -1,7 +1,7 @@ import { Status } from "#app/data/status-effect"; import { MoveResult } from "#app/field/pokemon"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/flash_fire.test.ts b/test/abilities/flash_fire.test.ts index 56e8b8ac9db..abec39684ee 100644 --- a/test/abilities/flash_fire.test.ts +++ b/test/abilities/flash_fire.test.ts @@ -4,7 +4,7 @@ import { Species } from "#app/enums/species"; import { MovePhase } from "#app/phases/move-phase"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { StatusEffect } from "#enums/status-effect"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/flower_gift.test.ts b/test/abilities/flower_gift.test.ts index 5b87096b7f9..76572be1078 100644 --- a/test/abilities/flower_gift.test.ts +++ b/test/abilities/flower_gift.test.ts @@ -4,7 +4,7 @@ import { AbilityId } from "#enums/ability-id"; import { Stat } from "#app/enums/stat"; import { WeatherType } from "#app/enums/weather-type"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/flower_veil.test.ts b/test/abilities/flower_veil.test.ts index bf80726cc08..f2da4cfc3f8 100644 --- a/test/abilities/flower_veil.test.ts +++ b/test/abilities/flower_veil.test.ts @@ -1,6 +1,6 @@ import { BattlerIndex } from "#app/battle"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; import { StatusEffect } from "#enums/status-effect"; diff --git a/test/abilities/forecast.test.ts b/test/abilities/forecast.test.ts index 8d9bb373998..281a99fb1f6 100644 --- a/test/abilities/forecast.test.ts +++ b/test/abilities/forecast.test.ts @@ -7,7 +7,7 @@ import { MovePhase } from "#app/phases/move-phase"; import { PostSummonPhase } from "#app/phases/post-summon-phase"; import { QuietFormChangePhase } from "#app/phases/quiet-form-change-phase"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/friend_guard.test.ts b/test/abilities/friend_guard.test.ts index 5537aa05f74..f46dccc047c 100644 --- a/test/abilities/friend_guard.test.ts +++ b/test/abilities/friend_guard.test.ts @@ -1,4 +1,4 @@ -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { AbilityId } from "#enums/ability-id"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/good_as_gold.test.ts b/test/abilities/good_as_gold.test.ts index d20d47ec046..1029d907dea 100644 --- a/test/abilities/good_as_gold.test.ts +++ b/test/abilities/good_as_gold.test.ts @@ -7,7 +7,7 @@ import { Stat } from "#app/enums/stat"; import { StatusEffect } from "#app/enums/status-effect"; import { WeatherType } from "#app/enums/weather-type"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/gorilla_tactics.test.ts b/test/abilities/gorilla_tactics.test.ts index f76fe82c877..aa28959e064 100644 --- a/test/abilities/gorilla_tactics.test.ts +++ b/test/abilities/gorilla_tactics.test.ts @@ -1,5 +1,5 @@ import { BattlerIndex } from "#app/battle"; -import { MoveId } from "#app/enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#app/enums/species"; import { Stat } from "#app/enums/stat"; import { AbilityId } from "#enums/ability-id"; diff --git a/test/abilities/gulp_missile.test.ts b/test/abilities/gulp_missile.test.ts index 8622e9fb830..6a2db7c920e 100644 --- a/test/abilities/gulp_missile.test.ts +++ b/test/abilities/gulp_missile.test.ts @@ -2,7 +2,7 @@ import { BattlerIndex } from "#app/battle"; import type Pokemon from "#app/field/pokemon"; import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#enums/battler-tag-type"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; import { StatusEffect } from "#enums/status-effect"; diff --git a/test/abilities/harvest.test.ts b/test/abilities/harvest.test.ts index 31fac3dc5a7..40d2b4842eb 100644 --- a/test/abilities/harvest.test.ts +++ b/test/abilities/harvest.test.ts @@ -6,7 +6,7 @@ import type { ModifierOverride } from "#app/modifier/modifier-type"; import type { BooleanHolder } from "#app/utils/common"; import { AbilityId } from "#enums/ability-id"; import { BerryType } from "#enums/berry-type"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; import { WeatherType } from "#enums/weather-type"; diff --git a/test/abilities/healer.test.ts b/test/abilities/healer.test.ts index 1c0cdf2e871..81f4477c11d 100644 --- a/test/abilities/healer.test.ts +++ b/test/abilities/healer.test.ts @@ -1,5 +1,5 @@ import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/heatproof.test.ts b/test/abilities/heatproof.test.ts index eb4940e6bbc..364d3985ad6 100644 --- a/test/abilities/heatproof.test.ts +++ b/test/abilities/heatproof.test.ts @@ -3,7 +3,7 @@ import { StatusEffect } from "#app/enums/status-effect"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { toDmgValue } from "#app/utils/common"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/honey_gather.test.ts b/test/abilities/honey_gather.test.ts index d9f5e153f98..d1826436309 100644 --- a/test/abilities/honey_gather.test.ts +++ b/test/abilities/honey_gather.test.ts @@ -1,7 +1,7 @@ import type { CommandPhase } from "#app/phases/command-phase"; import { Command } from "#app/ui/command-ui-handler"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/hustle.test.ts b/test/abilities/hustle.test.ts index 2ecb30daaa5..45042da6f7d 100644 --- a/test/abilities/hustle.test.ts +++ b/test/abilities/hustle.test.ts @@ -1,7 +1,7 @@ import { allMoves } from "#app/data/data-lists"; import { AbilityId } from "#enums/ability-id"; import { Stat } from "#app/enums/stat"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/hyper_cutter.test.ts b/test/abilities/hyper_cutter.test.ts index dae6331beb1..ed7b9f5f68a 100644 --- a/test/abilities/hyper_cutter.test.ts +++ b/test/abilities/hyper_cutter.test.ts @@ -1,6 +1,6 @@ import { Stat } from "#enums/stat"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/ice_face.test.ts b/test/abilities/ice_face.test.ts index 6282363d887..ac783a706d3 100644 --- a/test/abilities/ice_face.test.ts +++ b/test/abilities/ice_face.test.ts @@ -6,7 +6,7 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { TurnInitPhase } from "#app/phases/turn-init-phase"; import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#enums/battler-tag-type"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/illuminate.test.ts b/test/abilities/illuminate.test.ts index 59f09804c3d..ec4f6436041 100644 --- a/test/abilities/illuminate.test.ts +++ b/test/abilities/illuminate.test.ts @@ -1,6 +1,6 @@ import { Stat } from "#app/enums/stat"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest"; diff --git a/test/abilities/illusion.test.ts b/test/abilities/illusion.test.ts index 1822229b65b..666e47055a0 100644 --- a/test/abilities/illusion.test.ts +++ b/test/abilities/illusion.test.ts @@ -1,7 +1,7 @@ import { Gender } from "#app/data/gender"; import { PokeballType } from "#app/enums/pokeball"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/immunity.test.ts b/test/abilities/immunity.test.ts index e085491a70d..d497f33d839 100644 --- a/test/abilities/immunity.test.ts +++ b/test/abilities/immunity.test.ts @@ -1,5 +1,5 @@ import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/imposter.test.ts b/test/abilities/imposter.test.ts index a2d1817d821..ede95370244 100644 --- a/test/abilities/imposter.test.ts +++ b/test/abilities/imposter.test.ts @@ -3,7 +3,7 @@ import Phaser from "phaser"; import GameManager from "#test/testUtils/gameManager"; import { Species } from "#enums/species"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Stat, BATTLE_STATS, EFFECTIVE_STATS } from "#enums/stat"; import { AbilityId } from "#enums/ability-id"; diff --git a/test/abilities/infiltrator.test.ts b/test/abilities/infiltrator.test.ts index 5bbd0938e5f..6c82a0d9add 100644 --- a/test/abilities/infiltrator.test.ts +++ b/test/abilities/infiltrator.test.ts @@ -5,7 +5,7 @@ import { BattlerTagType } from "#enums/battler-tag-type"; import { Stat } from "#enums/stat"; import { StatusEffect } from "#enums/status-effect"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/insomnia.test.ts b/test/abilities/insomnia.test.ts index 4c9b4f63e5f..b3cb3802ec1 100644 --- a/test/abilities/insomnia.test.ts +++ b/test/abilities/insomnia.test.ts @@ -1,5 +1,5 @@ import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/intimidate.test.ts b/test/abilities/intimidate.test.ts index be27576107b..85d5aea76a6 100644 --- a/test/abilities/intimidate.test.ts +++ b/test/abilities/intimidate.test.ts @@ -5,7 +5,7 @@ import { UiMode } from "#enums/ui-mode"; import { Stat } from "#enums/stat"; import { getMovePosition } from "#test/testUtils/gameManagerUtils"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; describe("Abilities - Intimidate", () => { diff --git a/test/abilities/libero.test.ts b/test/abilities/libero.test.ts index ebbd8822292..2879a1e28ec 100644 --- a/test/abilities/libero.test.ts +++ b/test/abilities/libero.test.ts @@ -6,7 +6,7 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#enums/battler-tag-type"; import { Biome } from "#enums/biome"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { WeatherType } from "#enums/weather-type"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/lightningrod.test.ts b/test/abilities/lightningrod.test.ts index 0e0398d021e..f8137832b73 100644 --- a/test/abilities/lightningrod.test.ts +++ b/test/abilities/lightningrod.test.ts @@ -1,6 +1,6 @@ import { BattlerIndex } from "#app/battle"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/limber.test.ts b/test/abilities/limber.test.ts index d7a0d0f14cf..cfbcb4e7389 100644 --- a/test/abilities/limber.test.ts +++ b/test/abilities/limber.test.ts @@ -1,5 +1,5 @@ import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/magic_bounce.test.ts b/test/abilities/magic_bounce.test.ts index 085ba1f38aa..e8d2feb4f3f 100644 --- a/test/abilities/magic_bounce.test.ts +++ b/test/abilities/magic_bounce.test.ts @@ -7,7 +7,7 @@ import { BattlerTagType } from "#app/enums/battler-tag-type"; import { Stat } from "#app/enums/stat"; import { StatusEffect } from "#app/enums/status-effect"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/abilities/magic_guard.test.ts b/test/abilities/magic_guard.test.ts index b21e19b3efe..7d5fe053b66 100644 --- a/test/abilities/magic_guard.test.ts +++ b/test/abilities/magic_guard.test.ts @@ -4,7 +4,7 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { AbilityId } from "#enums/ability-id"; import { ArenaTagType } from "#enums/arena-tag-type"; import { BattlerTagType } from "#enums/battler-tag-type"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; import { WeatherType } from "#enums/weather-type"; diff --git a/test/abilities/magma_armor.test.ts b/test/abilities/magma_armor.test.ts index d917f040fc6..0d3124f6b0b 100644 --- a/test/abilities/magma_armor.test.ts +++ b/test/abilities/magma_armor.test.ts @@ -1,5 +1,5 @@ import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/mimicry.test.ts b/test/abilities/mimicry.test.ts index 7f5b41c7391..6c98fa06800 100644 --- a/test/abilities/mimicry.test.ts +++ b/test/abilities/mimicry.test.ts @@ -1,5 +1,5 @@ import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { PokemonType } from "#enums/pokemon-type"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/mirror_armor.test.ts b/test/abilities/mirror_armor.test.ts index f20d1caed17..e80836a0844 100644 --- a/test/abilities/mirror_armor.test.ts +++ b/test/abilities/mirror_armor.test.ts @@ -1,6 +1,6 @@ import { Stat } from "#enums/stat"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/mold_breaker.test.ts b/test/abilities/mold_breaker.test.ts index 24d56e73907..d1957f2fe1f 100644 --- a/test/abilities/mold_breaker.test.ts +++ b/test/abilities/mold_breaker.test.ts @@ -1,7 +1,7 @@ import { BattlerIndex } from "#app/battle"; import { globalScene } from "#app/global-scene"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/moody.test.ts b/test/abilities/moody.test.ts index 1663aff5d9e..9bc3d86690f 100644 --- a/test/abilities/moody.test.ts +++ b/test/abilities/moody.test.ts @@ -1,6 +1,6 @@ import { BATTLE_STATS, EFFECTIVE_STATS } from "#enums/stat"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/moxie.test.ts b/test/abilities/moxie.test.ts index 86b168c6c6f..d5a33c13d76 100644 --- a/test/abilities/moxie.test.ts +++ b/test/abilities/moxie.test.ts @@ -1,7 +1,7 @@ import { Stat } from "#enums/stat"; import GameManager from "#test/testUtils/gameManager"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/mummy.test.ts b/test/abilities/mummy.test.ts index 7e03933a56c..16fc4e06493 100644 --- a/test/abilities/mummy.test.ts +++ b/test/abilities/mummy.test.ts @@ -1,5 +1,5 @@ import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/mycelium_might.test.ts b/test/abilities/mycelium_might.test.ts index cdea7fd6f19..bbd8fd08ce6 100644 --- a/test/abilities/mycelium_might.test.ts +++ b/test/abilities/mycelium_might.test.ts @@ -3,7 +3,7 @@ import { TurnStartPhase } from "#app/phases/turn-start-phase"; import GameManager from "#test/testUtils/gameManager"; import { AbilityId } from "#enums/ability-id"; import { Stat } from "#enums/stat"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/neutralizing_gas.test.ts b/test/abilities/neutralizing_gas.test.ts index 07d0998a9ef..fa5e59f84f3 100644 --- a/test/abilities/neutralizing_gas.test.ts +++ b/test/abilities/neutralizing_gas.test.ts @@ -4,7 +4,7 @@ import { Command } from "#app/ui/command-ui-handler"; import { PostSummonWeatherChangeAbAttr } from "#app/data/abilities/ability"; import { AbilityId } from "#enums/ability-id"; import { ArenaTagType } from "#enums/arena-tag-type"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { PokeballType } from "#enums/pokeball"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; diff --git a/test/abilities/no_guard.test.ts b/test/abilities/no_guard.test.ts index f5b0068a0ed..d28a02d12e9 100644 --- a/test/abilities/no_guard.test.ts +++ b/test/abilities/no_guard.test.ts @@ -2,7 +2,7 @@ import { BattlerIndex } from "#app/battle"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { MoveEndPhase } from "#app/phases/move-end-phase"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { HitCheckResult } from "#enums/hit-check-result"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/normal-move-type-change.test.ts b/test/abilities/normal-move-type-change.test.ts index 68f01293a39..08b96c29644 100644 --- a/test/abilities/normal-move-type-change.test.ts +++ b/test/abilities/normal-move-type-change.test.ts @@ -2,7 +2,7 @@ import { BattlerIndex } from "#app/battle"; import { allMoves } from "#app/data/data-lists"; import { PokemonType } from "#enums/pokemon-type"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#app/enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#app/enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/normalize.test.ts b/test/abilities/normalize.test.ts index fab94ad256d..eb8e352fd7e 100644 --- a/test/abilities/normalize.test.ts +++ b/test/abilities/normalize.test.ts @@ -2,7 +2,7 @@ import { TYPE_BOOST_ITEM_BOOST_PERCENT } from "#app/constants"; import { allMoves } from "#app/data/data-lists"; import { toDmgValue } from "#app/utils/common"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { PokemonType } from "#enums/pokemon-type"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/oblivious.test.ts b/test/abilities/oblivious.test.ts index 66137ec4eaf..8b424c79e19 100644 --- a/test/abilities/oblivious.test.ts +++ b/test/abilities/oblivious.test.ts @@ -1,6 +1,6 @@ import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#enums/battler-tag-type"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/own_tempo.test.ts b/test/abilities/own_tempo.test.ts index 37865668b11..a611b7fb658 100644 --- a/test/abilities/own_tempo.test.ts +++ b/test/abilities/own_tempo.test.ts @@ -1,6 +1,6 @@ import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#enums/battler-tag-type"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/parental_bond.test.ts b/test/abilities/parental_bond.test.ts index 2b285e72d21..6548bdc3e19 100644 --- a/test/abilities/parental_bond.test.ts +++ b/test/abilities/parental_bond.test.ts @@ -2,7 +2,7 @@ import { PokemonType } from "#enums/pokemon-type"; import { BattlerTagType } from "#enums/battler-tag-type"; import { toDmgValue } from "#app/utils/common"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; import { StatusEffect } from "#enums/status-effect"; diff --git a/test/abilities/pastel_veil.test.ts b/test/abilities/pastel_veil.test.ts index e8cea4e6a98..b4c609d2148 100644 --- a/test/abilities/pastel_veil.test.ts +++ b/test/abilities/pastel_veil.test.ts @@ -2,7 +2,7 @@ import { BattlerIndex } from "#app/battle"; import { AbilityId } from "#enums/ability-id"; import { CommandPhase } from "#app/phases/command-phase"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/perish_body.test.ts b/test/abilities/perish_body.test.ts index f13a9a80515..4bae37f375c 100644 --- a/test/abilities/perish_body.test.ts +++ b/test/abilities/perish_body.test.ts @@ -1,5 +1,5 @@ import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/power_construct.test.ts b/test/abilities/power_construct.test.ts index b9cc66a8c96..35ec88e8668 100644 --- a/test/abilities/power_construct.test.ts +++ b/test/abilities/power_construct.test.ts @@ -2,7 +2,7 @@ import { Status } from "#app/data/status-effect"; import { QuietFormChangePhase } from "#app/phases/quiet-form-change-phase"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/power_spot.test.ts b/test/abilities/power_spot.test.ts index abe0d05ebb2..5d783e14f81 100644 --- a/test/abilities/power_spot.test.ts +++ b/test/abilities/power_spot.test.ts @@ -2,7 +2,7 @@ import { allMoves } from "#app/data/data-lists"; import { AbilityId } from "#enums/ability-id"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/protean.test.ts b/test/abilities/protean.test.ts index d510071eba8..1341b948f97 100644 --- a/test/abilities/protean.test.ts +++ b/test/abilities/protean.test.ts @@ -6,7 +6,7 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#enums/battler-tag-type"; import { Biome } from "#enums/biome"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { WeatherType } from "#enums/weather-type"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/protosynthesis.test.ts b/test/abilities/protosynthesis.test.ts index 23b5043b280..ac248a15739 100644 --- a/test/abilities/protosynthesis.test.ts +++ b/test/abilities/protosynthesis.test.ts @@ -1,5 +1,5 @@ import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Nature } from "#enums/nature"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; diff --git a/test/abilities/quick_draw.test.ts b/test/abilities/quick_draw.test.ts index dda60c8794d..2b7597d6abb 100644 --- a/test/abilities/quick_draw.test.ts +++ b/test/abilities/quick_draw.test.ts @@ -2,7 +2,7 @@ import { BypassSpeedChanceAbAttr } from "#app/data/abilities/ability"; import { allAbilities } from "#app/data/data-lists"; import { FaintPhase } from "#app/phases/faint-phase"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/sand_spit.test.ts b/test/abilities/sand_spit.test.ts index bb5daee51e1..68b4e70bb61 100644 --- a/test/abilities/sand_spit.test.ts +++ b/test/abilities/sand_spit.test.ts @@ -1,6 +1,6 @@ import { WeatherType } from "#app/enums/weather-type"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/sand_veil.test.ts b/test/abilities/sand_veil.test.ts index bc8a1e61897..6c186cd854e 100644 --- a/test/abilities/sand_veil.test.ts +++ b/test/abilities/sand_veil.test.ts @@ -4,7 +4,7 @@ import { CommandPhase } from "#app/phases/command-phase"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { MoveEndPhase } from "#app/phases/move-end-phase"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; import { WeatherType } from "#enums/weather-type"; diff --git a/test/abilities/sap_sipper.test.ts b/test/abilities/sap_sipper.test.ts index 32a01f0527d..f13ebbeb3d0 100644 --- a/test/abilities/sap_sipper.test.ts +++ b/test/abilities/sap_sipper.test.ts @@ -4,7 +4,7 @@ import { MoveEndPhase } from "#app/phases/move-end-phase"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#enums/battler-tag-type"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/schooling.test.ts b/test/abilities/schooling.test.ts index 9509493b03a..42e31258edd 100644 --- a/test/abilities/schooling.test.ts +++ b/test/abilities/schooling.test.ts @@ -2,7 +2,7 @@ import { Status } from "#app/data/status-effect"; import { QuietFormChangePhase } from "#app/phases/quiet-form-change-phase"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/screen_cleaner.test.ts b/test/abilities/screen_cleaner.test.ts index cd3e25cdbb4..cda454f4558 100644 --- a/test/abilities/screen_cleaner.test.ts +++ b/test/abilities/screen_cleaner.test.ts @@ -2,7 +2,7 @@ import { ArenaTagType } from "#app/enums/arena-tag-type"; import { PostSummonPhase } from "#app/phases/post-summon-phase"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/seed_sower.test.ts b/test/abilities/seed_sower.test.ts index a34ea2d9788..36a086cd718 100644 --- a/test/abilities/seed_sower.test.ts +++ b/test/abilities/seed_sower.test.ts @@ -1,6 +1,6 @@ import { TerrainType } from "#app/data/terrain"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/serene_grace.test.ts b/test/abilities/serene_grace.test.ts index 84e447e01fd..0b7210e7af1 100644 --- a/test/abilities/serene_grace.test.ts +++ b/test/abilities/serene_grace.test.ts @@ -1,6 +1,6 @@ import { BattlerIndex } from "#app/battle"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/sheer_force.test.ts b/test/abilities/sheer_force.test.ts index 626dc13bb8e..dfac5d155f7 100644 --- a/test/abilities/sheer_force.test.ts +++ b/test/abilities/sheer_force.test.ts @@ -1,7 +1,7 @@ import { BattlerIndex } from "#app/battle"; import { PokemonType } from "#enums/pokemon-type"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/shield_dust.test.ts b/test/abilities/shield_dust.test.ts index 0d9e2f06980..7cac807f04c 100644 --- a/test/abilities/shield_dust.test.ts +++ b/test/abilities/shield_dust.test.ts @@ -8,7 +8,7 @@ import { import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { NumberHolder } from "#app/utils/common"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/shields_down.test.ts b/test/abilities/shields_down.test.ts index b2a2638a216..8b2d48abb34 100644 --- a/test/abilities/shields_down.test.ts +++ b/test/abilities/shields_down.test.ts @@ -3,7 +3,7 @@ import { BattlerTagType } from "#app/enums/battler-tag-type"; import { QuietFormChangePhase } from "#app/phases/quiet-form-change-phase"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/simple.test.ts b/test/abilities/simple.test.ts index 77d82e541ce..7bc1cd6d305 100644 --- a/test/abilities/simple.test.ts +++ b/test/abilities/simple.test.ts @@ -1,4 +1,4 @@ -import { MoveId } from "#app/enums/moves"; +import { MoveId } from "#enums/move-id"; import { AbilityId } from "#enums/ability-id"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; diff --git a/test/abilities/speed_boost.test.ts b/test/abilities/speed_boost.test.ts index 56cd2956e13..ccb8e125c54 100644 --- a/test/abilities/speed_boost.test.ts +++ b/test/abilities/speed_boost.test.ts @@ -1,6 +1,6 @@ import { Stat } from "#enums/stat"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/stakeout.test.ts b/test/abilities/stakeout.test.ts index cd4d3c65a8c..82fecdf9439 100644 --- a/test/abilities/stakeout.test.ts +++ b/test/abilities/stakeout.test.ts @@ -1,7 +1,7 @@ import { BattlerIndex } from "#app/battle"; import { isBetween } from "#app/utils/common"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/stall.test.ts b/test/abilities/stall.test.ts index ec6ab2bc5b8..a7111792f50 100644 --- a/test/abilities/stall.test.ts +++ b/test/abilities/stall.test.ts @@ -1,5 +1,5 @@ import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/steely_spirit.test.ts b/test/abilities/steely_spirit.test.ts index be4b0d7856c..f0b3c9883e5 100644 --- a/test/abilities/steely_spirit.test.ts +++ b/test/abilities/steely_spirit.test.ts @@ -1,7 +1,7 @@ import { allAbilities } from "#app/data/data-lists"; import { allMoves } from "#app/data/data-lists"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/storm_drain.test.ts b/test/abilities/storm_drain.test.ts index 4433399bdef..fe0983c4b8d 100644 --- a/test/abilities/storm_drain.test.ts +++ b/test/abilities/storm_drain.test.ts @@ -1,6 +1,6 @@ import { BattlerIndex } from "#app/battle"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/sturdy.test.ts b/test/abilities/sturdy.test.ts index 99addb56b4b..cd673942bc4 100644 --- a/test/abilities/sturdy.test.ts +++ b/test/abilities/sturdy.test.ts @@ -2,7 +2,7 @@ import type { EnemyPokemon } from "#app/field/pokemon"; import { DamageAnimPhase } from "#app/phases/damage-anim-phase"; import { MoveEndPhase } from "#app/phases/move-end-phase"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/super_luck.test.ts b/test/abilities/super_luck.test.ts index 02fdc89cccc..194fc7c0620 100644 --- a/test/abilities/super_luck.test.ts +++ b/test/abilities/super_luck.test.ts @@ -1,5 +1,5 @@ import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/supreme_overlord.test.ts b/test/abilities/supreme_overlord.test.ts index 85e06c06cea..cffbdc5e7bb 100644 --- a/test/abilities/supreme_overlord.test.ts +++ b/test/abilities/supreme_overlord.test.ts @@ -1,4 +1,4 @@ -import { MoveId } from "#app/enums/moves"; +import { MoveId } from "#enums/move-id"; import type Move from "#app/data/moves/move"; import { AbilityId } from "#enums/ability-id"; import { Species } from "#enums/species"; diff --git a/test/abilities/sweet_veil.test.ts b/test/abilities/sweet_veil.test.ts index 881310463ab..1f3ca113fb5 100644 --- a/test/abilities/sweet_veil.test.ts +++ b/test/abilities/sweet_veil.test.ts @@ -3,7 +3,7 @@ import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#app/enums/battler-tag-type"; import { CommandPhase } from "#app/phases/command-phase"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/synchronize.test.ts b/test/abilities/synchronize.test.ts index 14ea90111b0..d6e8de2c96c 100644 --- a/test/abilities/synchronize.test.ts +++ b/test/abilities/synchronize.test.ts @@ -1,5 +1,5 @@ import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/tera_shell.test.ts b/test/abilities/tera_shell.test.ts index 3fe8e1863d7..02b93993090 100644 --- a/test/abilities/tera_shell.test.ts +++ b/test/abilities/tera_shell.test.ts @@ -1,6 +1,6 @@ import { BattlerIndex } from "#app/battle"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#app/enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#app/enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/thermal_exchange.test.ts b/test/abilities/thermal_exchange.test.ts index 881b0ef8cfc..0912d12b50e 100644 --- a/test/abilities/thermal_exchange.test.ts +++ b/test/abilities/thermal_exchange.test.ts @@ -1,5 +1,5 @@ import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/trace.test.ts b/test/abilities/trace.test.ts index b01d5187e17..c56001a9f5f 100644 --- a/test/abilities/trace.test.ts +++ b/test/abilities/trace.test.ts @@ -1,6 +1,6 @@ import { Stat } from "#app/enums/stat"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/unburden.test.ts b/test/abilities/unburden.test.ts index fb43a53e51e..19278705a09 100644 --- a/test/abilities/unburden.test.ts +++ b/test/abilities/unburden.test.ts @@ -7,7 +7,7 @@ import type { ContactHeldItemTransferChanceModifier } from "#app/modifier/modifi import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#enums/battler-tag-type"; import { BerryType } from "#enums/berry-type"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/unseen_fist.test.ts b/test/abilities/unseen_fist.test.ts index 750cdf68bbd..b90e568ae54 100644 --- a/test/abilities/unseen_fist.test.ts +++ b/test/abilities/unseen_fist.test.ts @@ -1,6 +1,6 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/victory_star.test.ts b/test/abilities/victory_star.test.ts index a5009068394..fcabdde111f 100644 --- a/test/abilities/victory_star.test.ts +++ b/test/abilities/victory_star.test.ts @@ -1,7 +1,7 @@ import { BattlerIndex } from "#app/battle"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/vital_spirit.test.ts b/test/abilities/vital_spirit.test.ts index 0c1ed2a9bf5..93432ad145d 100644 --- a/test/abilities/vital_spirit.test.ts +++ b/test/abilities/vital_spirit.test.ts @@ -1,5 +1,5 @@ import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/volt_absorb.test.ts b/test/abilities/volt_absorb.test.ts index 6789ffa4d31..8f65b107007 100644 --- a/test/abilities/volt_absorb.test.ts +++ b/test/abilities/volt_absorb.test.ts @@ -2,7 +2,7 @@ import { Stat } from "#enums/stat"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#enums/battler-tag-type"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/wandering_spirit.test.ts b/test/abilities/wandering_spirit.test.ts index 54149911f3a..3f9d3aa610b 100644 --- a/test/abilities/wandering_spirit.test.ts +++ b/test/abilities/wandering_spirit.test.ts @@ -1,6 +1,6 @@ import { Stat } from "#app/enums/stat"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/water_bubble.test.ts b/test/abilities/water_bubble.test.ts index e4a5e954c56..60059d2a6d8 100644 --- a/test/abilities/water_bubble.test.ts +++ b/test/abilities/water_bubble.test.ts @@ -1,5 +1,5 @@ import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/water_veil.test.ts b/test/abilities/water_veil.test.ts index b441ae24775..74b53b7435f 100644 --- a/test/abilities/water_veil.test.ts +++ b/test/abilities/water_veil.test.ts @@ -1,5 +1,5 @@ import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/wimp_out.test.ts b/test/abilities/wimp_out.test.ts index dc3655953a2..fb13c148dfd 100644 --- a/test/abilities/wimp_out.test.ts +++ b/test/abilities/wimp_out.test.ts @@ -6,7 +6,7 @@ import { toDmgValue } from "#app/utils/common"; import { AbilityId } from "#enums/ability-id"; import { ArenaTagType } from "#enums/arena-tag-type"; import { BattlerTagType } from "#enums/battler-tag-type"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; import { StatusEffect } from "#enums/status-effect"; diff --git a/test/abilities/wind_power.test.ts b/test/abilities/wind_power.test.ts index 82b13504af4..d519e149502 100644 --- a/test/abilities/wind_power.test.ts +++ b/test/abilities/wind_power.test.ts @@ -1,7 +1,7 @@ import { BattlerTagType } from "#app/enums/battler-tag-type"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/wind_rider.test.ts b/test/abilities/wind_rider.test.ts index bedd2d4faa8..abc3c50abc6 100644 --- a/test/abilities/wind_rider.test.ts +++ b/test/abilities/wind_rider.test.ts @@ -1,7 +1,7 @@ import { Stat } from "#enums/stat"; import GameManager from "#test/testUtils/gameManager"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/wonder_skin.test.ts b/test/abilities/wonder_skin.test.ts index 447aee1feac..78a9c94fa36 100644 --- a/test/abilities/wonder_skin.test.ts +++ b/test/abilities/wonder_skin.test.ts @@ -1,7 +1,7 @@ import { allMoves } from "#app/data/data-lists"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/zen_mode.test.ts b/test/abilities/zen_mode.test.ts index 475e764af13..2b8f27e7daf 100644 --- a/test/abilities/zen_mode.test.ts +++ b/test/abilities/zen_mode.test.ts @@ -1,6 +1,6 @@ import { Status } from "#app/data/status-effect"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/zero_to_hero.test.ts b/test/abilities/zero_to_hero.test.ts index d2c80111f3e..c27d7ffc933 100644 --- a/test/abilities/zero_to_hero.test.ts +++ b/test/abilities/zero_to_hero.test.ts @@ -2,7 +2,7 @@ import { Status } from "#app/data/status-effect"; import { QuietFormChangePhase } from "#app/phases/quiet-form-change-phase"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/arena/arena_gravity.test.ts b/test/arena/arena_gravity.test.ts index 16c9693c69d..c5de336caf1 100644 --- a/test/arena/arena_gravity.test.ts +++ b/test/arena/arena_gravity.test.ts @@ -3,7 +3,7 @@ import { allMoves } from "#app/data/data-lists"; import { AbilityId } from "#enums/ability-id"; import { ArenaTagType } from "#enums/arena-tag-type"; import { BattlerTagType } from "#enums/battler-tag-type"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/arena/grassy_terrain.test.ts b/test/arena/grassy_terrain.test.ts index 93bbf04eaa9..88d973f67eb 100644 --- a/test/arena/grassy_terrain.test.ts +++ b/test/arena/grassy_terrain.test.ts @@ -1,6 +1,6 @@ import { allMoves } from "#app/data/data-lists"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/arena/weather_fog.test.ts b/test/arena/weather_fog.test.ts index dcb5d9b327c..fa4abb5a441 100644 --- a/test/arena/weather_fog.test.ts +++ b/test/arena/weather_fog.test.ts @@ -1,7 +1,7 @@ import { allMoves } from "#app/data/data-lists"; import { AbilityId } from "#enums/ability-id"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { WeatherType } from "#enums/weather-type"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/arena/weather_hail.test.ts b/test/arena/weather_hail.test.ts index dc66404f404..cafdbf0466f 100644 --- a/test/arena/weather_hail.test.ts +++ b/test/arena/weather_hail.test.ts @@ -1,5 +1,5 @@ import { BattlerIndex } from "#app/battle"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { WeatherType } from "#enums/weather-type"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/arena/weather_sandstorm.test.ts b/test/arena/weather_sandstorm.test.ts index fcb1b52ccb3..c269283a8ed 100644 --- a/test/arena/weather_sandstorm.test.ts +++ b/test/arena/weather_sandstorm.test.ts @@ -1,6 +1,6 @@ import { AbilityId } from "#enums/ability-id"; import { Stat } from "#app/enums/stat"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { WeatherType } from "#enums/weather-type"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/arena/weather_strong_winds.test.ts b/test/arena/weather_strong_winds.test.ts index 80ca76ae055..5522b2c772a 100644 --- a/test/arena/weather_strong_winds.test.ts +++ b/test/arena/weather_strong_winds.test.ts @@ -2,7 +2,7 @@ import { allMoves } from "#app/data/data-lists"; import { StatusEffect } from "#app/enums/status-effect"; import { TurnStartPhase } from "#app/phases/turn-start-phase"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/battle/ability_swap.test.ts b/test/battle/ability_swap.test.ts index a815b1a36d8..1d0cb70e5ac 100644 --- a/test/battle/ability_swap.test.ts +++ b/test/battle/ability_swap.test.ts @@ -1,7 +1,7 @@ import { allAbilities } from "#app/data/data-lists"; import { Stat } from "#app/enums/stat"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/battle/battle-order.test.ts b/test/battle/battle-order.test.ts index 939eafdad91..42ac933e2c6 100644 --- a/test/battle/battle-order.test.ts +++ b/test/battle/battle-order.test.ts @@ -2,7 +2,7 @@ import { EnemyCommandPhase } from "#app/phases/enemy-command-phase"; import { SelectTargetPhase } from "#app/phases/select-target-phase"; import { TurnStartPhase } from "#app/phases/turn-start-phase"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/battle/battle.test.ts b/test/battle/battle.test.ts index 5ef9c610712..6477b579ad1 100644 --- a/test/battle/battle.test.ts +++ b/test/battle/battle.test.ts @@ -20,7 +20,7 @@ import GameManager from "#test/testUtils/gameManager"; import { generateStarter } from "#test/testUtils/gameManagerUtils"; import { UiMode } from "#enums/ui-mode"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { PlayerGender } from "#enums/player-gender"; import { Species } from "#enums/species"; import Phaser from "phaser"; diff --git a/test/battle/damage_calculation.test.ts b/test/battle/damage_calculation.test.ts index 0671d752128..0112c571273 100644 --- a/test/battle/damage_calculation.test.ts +++ b/test/battle/damage_calculation.test.ts @@ -3,7 +3,7 @@ import type { EnemyPersistentModifier } from "#app/modifier/modifier"; import { modifierTypes } from "#app/modifier/modifier-type"; import { AbilityId } from "#enums/ability-id"; import { ArenaTagType } from "#enums/arena-tag-type"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/battle/double_battle.test.ts b/test/battle/double_battle.test.ts index c2bdba14f89..011b7c3ca01 100644 --- a/test/battle/double_battle.test.ts +++ b/test/battle/double_battle.test.ts @@ -3,7 +3,7 @@ import { AbilityId } from "#enums/ability-id"; import { GameModes, getGameMode } from "#app/game-mode"; import { BattleEndPhase } from "#app/phases/battle-end-phase"; import { TurnInitPhase } from "#app/phases/turn-init-phase"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/battle/inverse_battle.test.ts b/test/battle/inverse_battle.test.ts index 4f0d73db441..095cec5a3e7 100644 --- a/test/battle/inverse_battle.test.ts +++ b/test/battle/inverse_battle.test.ts @@ -3,7 +3,7 @@ import { PokemonType } from "#enums/pokemon-type"; import { AbilityId } from "#enums/ability-id"; import { ArenaTagType } from "#enums/arena-tag-type"; import { Challenges } from "#enums/challenges"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/battle/special_battle.test.ts b/test/battle/special_battle.test.ts index 5b3ca1d2500..22fb459dd15 100644 --- a/test/battle/special_battle.test.ts +++ b/test/battle/special_battle.test.ts @@ -1,7 +1,7 @@ import { CommandPhase } from "#app/phases/command-phase"; import { UiMode } from "#enums/ui-mode"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/battlerTags/substitute.test.ts b/test/battlerTags/substitute.test.ts index 89878af56a1..ce16cfdbcd9 100644 --- a/test/battlerTags/substitute.test.ts +++ b/test/battlerTags/substitute.test.ts @@ -4,7 +4,7 @@ import type Pokemon from "#app/field/pokemon"; import { MoveResult } from "#app/field/pokemon"; import type BattleScene from "#app/battle-scene"; import { BattlerTagLapseType, BindTag, SubstituteTag } from "#app/data/battler-tags"; -import { MoveId } from "#app/enums/moves"; +import { MoveId } from "#enums/move-id"; import { PokemonAnimType } from "#app/enums/pokemon-anim-type"; import * as messages from "#app/messages"; import { allMoves } from "#app/data/data-lists"; diff --git a/test/boss-pokemon.test.ts b/test/boss-pokemon.test.ts index fa798253404..5b3e4d02afd 100644 --- a/test/boss-pokemon.test.ts +++ b/test/boss-pokemon.test.ts @@ -3,7 +3,7 @@ import GameManager from "#test/testUtils/gameManager"; import { Species } from "#app/enums/species"; import { getPokemonSpecies } from "#app/data/pokemon-species"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#app/enums/moves"; +import { MoveId } from "#enums/move-id"; import { EFFECTIVE_STATS } from "#app/enums/stat"; import type { EnemyPokemon } from "#app/field/pokemon"; import { toDmgValue } from "#app/utils/common"; diff --git a/test/daily_mode.test.ts b/test/daily_mode.test.ts index 820a5b5ddb6..80fd0a20309 100644 --- a/test/daily_mode.test.ts +++ b/test/daily_mode.test.ts @@ -1,5 +1,5 @@ import { Biome } from "#app/enums/biome"; -import { MoveId } from "#app/enums/moves"; +import { MoveId } from "#enums/move-id"; import { MapModifier } from "#app/modifier/modifier"; import { pokerogueApi } from "#app/plugins/api/pokerogue-api"; import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; diff --git a/test/data/status_effect.test.ts b/test/data/status_effect.test.ts index 3ae6cfffff6..35cf8b8302c 100644 --- a/test/data/status_effect.test.ts +++ b/test/data/status_effect.test.ts @@ -8,7 +8,7 @@ import { } from "#app/data/status-effect"; import { MoveResult } from "#app/field/pokemon"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/enemy_command.test.ts b/test/enemy_command.test.ts index 24d1bc70b08..770bc4cff6c 100644 --- a/test/enemy_command.test.ts +++ b/test/enemy_command.test.ts @@ -2,7 +2,7 @@ import type BattleScene from "#app/battle-scene"; import { allMoves } from "#app/data/data-lists"; import { MoveCategory } from "#enums/MoveCategory"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#app/enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#app/enums/species"; import type { EnemyPokemon } from "#app/field/pokemon"; import { AiType } from "#app/field/pokemon"; diff --git a/test/evolution.test.ts b/test/evolution.test.ts index 074ac054e7b..9e1f6c4b54e 100644 --- a/test/evolution.test.ts +++ b/test/evolution.test.ts @@ -4,7 +4,7 @@ import { SpeciesWildEvolutionDelay, } from "#app/data/balance/pokemon-evolutions"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#app/enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#app/enums/species"; import * as Utils from "#app/utils/common"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/field/pokemon.test.ts b/test/field/pokemon.test.ts index ce467d8d16c..654bf85e3b4 100644 --- a/test/field/pokemon.test.ts +++ b/test/field/pokemon.test.ts @@ -3,7 +3,7 @@ import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; import GameManager from "#test/testUtils/gameManager"; import { PokeballType } from "#enums/pokeball"; import type BattleScene from "#app/battle-scene"; -import { MoveId } from "#app/enums/moves"; +import { MoveId } from "#enums/move-id"; import { PokemonType } from "#enums/pokemon-type"; import { CustomPokemonData } from "#app/data/custom-pokemon-data"; diff --git a/test/final_boss.test.ts b/test/final_boss.test.ts index bb0b54c4d24..12f04c0b732 100644 --- a/test/final_boss.test.ts +++ b/test/final_boss.test.ts @@ -2,7 +2,7 @@ import { GameModes } from "#app/game-mode"; import { TurnHeldItemTransferModifier } from "#app/modifier/modifier"; import { AbilityId } from "#enums/ability-id"; import { Biome } from "#enums/biome"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/items/dire_hit.test.ts b/test/items/dire_hit.test.ts index 8f4e178468f..ea85464237e 100644 --- a/test/items/dire_hit.test.ts +++ b/test/items/dire_hit.test.ts @@ -1,5 +1,5 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phase from "phaser"; diff --git a/test/items/double_battle_chance_booster.test.ts b/test/items/double_battle_chance_booster.test.ts index 8fcc039def6..4280c2cf09d 100644 --- a/test/items/double_battle_chance_booster.test.ts +++ b/test/items/double_battle_chance_booster.test.ts @@ -1,4 +1,4 @@ -import { MoveId } from "#app/enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#app/enums/species"; import { DoubleBattleChanceBoosterModifier } from "#app/modifier/modifier"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/items/grip_claw.test.ts b/test/items/grip_claw.test.ts index 21b477036b6..88ed143980c 100644 --- a/test/items/grip_claw.test.ts +++ b/test/items/grip_claw.test.ts @@ -3,7 +3,7 @@ import type Pokemon from "#app/field/pokemon"; import type { ContactHeldItemTransferChanceModifier } from "#app/modifier/modifier"; import { AbilityId } from "#enums/ability-id"; import { BerryType } from "#enums/berry-type"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phase from "phaser"; diff --git a/test/items/leek.test.ts b/test/items/leek.test.ts index 7ec24a45173..d42a762495d 100644 --- a/test/items/leek.test.ts +++ b/test/items/leek.test.ts @@ -1,6 +1,6 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { randInt } from "#app/utils/common"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phase from "phaser"; diff --git a/test/items/leftovers.test.ts b/test/items/leftovers.test.ts index 12649d9d2ac..3ce271826a6 100644 --- a/test/items/leftovers.test.ts +++ b/test/items/leftovers.test.ts @@ -1,7 +1,7 @@ import { DamageAnimPhase } from "#app/phases/damage-anim-phase"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/items/lock_capsule.test.ts b/test/items/lock_capsule.test.ts index 2a2f3593a57..15a1b4e73d1 100644 --- a/test/items/lock_capsule.test.ts +++ b/test/items/lock_capsule.test.ts @@ -1,5 +1,5 @@ import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#app/enums/moves"; +import { MoveId } from "#enums/move-id"; import { ModifierTier } from "#app/modifier/modifier-tier"; import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; import { UiMode } from "#enums/ui-mode"; diff --git a/test/items/multi_lens.test.ts b/test/items/multi_lens.test.ts index a4833bb0512..ebc0b7608ad 100644 --- a/test/items/multi_lens.test.ts +++ b/test/items/multi_lens.test.ts @@ -1,7 +1,7 @@ import { BattlerIndex } from "#app/battle"; import { Stat } from "#enums/stat"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/items/mystical_rock.test.ts b/test/items/mystical_rock.test.ts index f68ef999fc7..c4487eb981c 100644 --- a/test/items/mystical_rock.test.ts +++ b/test/items/mystical_rock.test.ts @@ -1,5 +1,5 @@ import { globalScene } from "#app/global-scene"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { AbilityId } from "#enums/ability-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/items/reviver_seed.test.ts b/test/items/reviver_seed.test.ts index 5111efc5d9d..f8a7dea3e2a 100644 --- a/test/items/reviver_seed.test.ts +++ b/test/items/reviver_seed.test.ts @@ -3,7 +3,7 @@ import { allMoves } from "#app/data/data-lists"; import { BattlerTagType } from "#app/enums/battler-tag-type"; import type { PokemonInstantReviveModifier } from "#app/modifier/modifier"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/items/scope_lens.test.ts b/test/items/scope_lens.test.ts index 6b3c5cd6068..bcf92a67b90 100644 --- a/test/items/scope_lens.test.ts +++ b/test/items/scope_lens.test.ts @@ -1,5 +1,5 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phase from "phaser"; diff --git a/test/items/temp_stat_stage_booster.test.ts b/test/items/temp_stat_stage_booster.test.ts index 6ccebce2225..c5e93ae7376 100644 --- a/test/items/temp_stat_stage_booster.test.ts +++ b/test/items/temp_stat_stage_booster.test.ts @@ -3,7 +3,7 @@ import GameManager from "#test/testUtils/gameManager"; import { Species } from "#enums/species"; import Phase from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { MoveId } from "#app/enums/moves"; +import { MoveId } from "#enums/move-id"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { AbilityId } from "#enums/ability-id"; import { TempStatStageBoosterModifier } from "#app/modifier/modifier"; diff --git a/test/items/toxic_orb.test.ts b/test/items/toxic_orb.test.ts index ae1faa34346..e030c35d633 100644 --- a/test/items/toxic_orb.test.ts +++ b/test/items/toxic_orb.test.ts @@ -1,6 +1,6 @@ import i18next from "#app/plugins/i18n"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/after_you.test.ts b/test/moves/after_you.test.ts index b742e57b4c3..3fd97c634d9 100644 --- a/test/moves/after_you.test.ts +++ b/test/moves/after_you.test.ts @@ -2,7 +2,7 @@ import { BattlerIndex } from "#app/battle"; import { AbilityId } from "#enums/ability-id"; import { MoveResult } from "#app/field/pokemon"; import { MovePhase } from "#app/phases/move-phase"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/alluring_voice.test.ts b/test/moves/alluring_voice.test.ts index 5cd1549cfee..e46bdc87656 100644 --- a/test/moves/alluring_voice.test.ts +++ b/test/moves/alluring_voice.test.ts @@ -2,7 +2,7 @@ import { BattlerIndex } from "#app/battle"; import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#app/enums/battler-tag-type"; import { BerryPhase } from "#app/phases/berry-phase"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/aromatherapy.test.ts b/test/moves/aromatherapy.test.ts index 5661f9a96f0..61d2ce48c54 100644 --- a/test/moves/aromatherapy.test.ts +++ b/test/moves/aromatherapy.test.ts @@ -1,7 +1,7 @@ import { StatusEffect } from "#app/enums/status-effect"; import { CommandPhase } from "#app/phases/command-phase"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/assist.test.ts b/test/moves/assist.test.ts index 772d11cb7aa..6c693a1821b 100644 --- a/test/moves/assist.test.ts +++ b/test/moves/assist.test.ts @@ -3,7 +3,7 @@ import { Stat } from "#app/enums/stat"; import { MoveResult } from "#app/field/pokemon"; import { CommandPhase } from "#app/phases/command-phase"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/astonish.test.ts b/test/moves/astonish.test.ts index 3dbb382e278..2705f920965 100644 --- a/test/moves/astonish.test.ts +++ b/test/moves/astonish.test.ts @@ -5,7 +5,7 @@ import { CommandPhase } from "#app/phases/command-phase"; import { MoveEndPhase } from "#app/phases/move-end-phase"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/aurora_veil.test.ts b/test/moves/aurora_veil.test.ts index 5542a244f0e..02ff4a2598a 100644 --- a/test/moves/aurora_veil.test.ts +++ b/test/moves/aurora_veil.test.ts @@ -8,7 +8,7 @@ import type Pokemon from "#app/field/pokemon"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { NumberHolder } from "#app/utils/common"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { WeatherType } from "#enums/weather-type"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/autotomize.test.ts b/test/moves/autotomize.test.ts index 29440fdd79f..db51e7b9ebf 100644 --- a/test/moves/autotomize.test.ts +++ b/test/moves/autotomize.test.ts @@ -1,5 +1,5 @@ import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/baddy_bad.test.ts b/test/moves/baddy_bad.test.ts index 93377802cac..6675b431ca7 100644 --- a/test/moves/baddy_bad.test.ts +++ b/test/moves/baddy_bad.test.ts @@ -1,5 +1,5 @@ import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/baneful_bunker.test.ts b/test/moves/baneful_bunker.test.ts index 9d9bd9f8ed2..4ee83e2cb6e 100644 --- a/test/moves/baneful_bunker.test.ts +++ b/test/moves/baneful_bunker.test.ts @@ -3,7 +3,7 @@ import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest import GameManager from "#test/testUtils/gameManager"; import { Species } from "#enums/species"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { BattlerIndex } from "#app/battle"; import { StatusEffect } from "#app/enums/status-effect"; diff --git a/test/moves/baton_pass.test.ts b/test/moves/baton_pass.test.ts index df6a62ff490..3d026eb66cc 100644 --- a/test/moves/baton_pass.test.ts +++ b/test/moves/baton_pass.test.ts @@ -2,7 +2,7 @@ import { BattlerIndex } from "#app/battle"; import GameManager from "#test/testUtils/gameManager"; import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#enums/battler-tag-type"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; import Phaser from "phaser"; diff --git a/test/moves/beak_blast.test.ts b/test/moves/beak_blast.test.ts index 945c83240ab..1fa4967b4bc 100644 --- a/test/moves/beak_blast.test.ts +++ b/test/moves/beak_blast.test.ts @@ -4,7 +4,7 @@ import { BerryPhase } from "#app/phases/berry-phase"; import { MovePhase } from "#app/phases/move-phase"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/beat_up.test.ts b/test/moves/beat_up.test.ts index d057fa69d6b..d246a158167 100644 --- a/test/moves/beat_up.test.ts +++ b/test/moves/beat_up.test.ts @@ -1,5 +1,5 @@ import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#app/enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#app/enums/species"; import { StatusEffect } from "#app/enums/status-effect"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; diff --git a/test/moves/belly_drum.test.ts b/test/moves/belly_drum.test.ts index 7643f457f98..bc0f9d7b147 100644 --- a/test/moves/belly_drum.test.ts +++ b/test/moves/belly_drum.test.ts @@ -1,6 +1,6 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { toDmgValue } from "#app/utils/common"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/burning_jealousy.test.ts b/test/moves/burning_jealousy.test.ts index d830baf3cc8..c62a6bad1a8 100644 --- a/test/moves/burning_jealousy.test.ts +++ b/test/moves/burning_jealousy.test.ts @@ -2,7 +2,7 @@ import { BattlerIndex } from "#app/battle"; import { allMoves } from "#app/data/data-lists"; import { AbilityId } from "#enums/ability-id"; import { StatusEffect } from "#app/enums/status-effect"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/camouflage.test.ts b/test/moves/camouflage.test.ts index 138fdf1bf02..f3173816a0e 100644 --- a/test/moves/camouflage.test.ts +++ b/test/moves/camouflage.test.ts @@ -1,5 +1,5 @@ import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { TerrainType } from "#app/data/terrain"; import { PokemonType } from "#enums/pokemon-type"; diff --git a/test/moves/ceaseless_edge.test.ts b/test/moves/ceaseless_edge.test.ts index fda62929664..52925fdc6a7 100644 --- a/test/moves/ceaseless_edge.test.ts +++ b/test/moves/ceaseless_edge.test.ts @@ -4,7 +4,7 @@ import { AbilityId } from "#enums/ability-id"; import { ArenaTagType } from "#app/enums/arena-tag-type"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/chilly_reception.test.ts b/test/moves/chilly_reception.test.ts index 1f8696191a7..8fa443c0400 100644 --- a/test/moves/chilly_reception.test.ts +++ b/test/moves/chilly_reception.test.ts @@ -1,5 +1,5 @@ import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { WeatherType } from "#enums/weather-type"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/chloroblast.test.ts b/test/moves/chloroblast.test.ts index 81240d461c7..1b70ef3e08b 100644 --- a/test/moves/chloroblast.test.ts +++ b/test/moves/chloroblast.test.ts @@ -1,6 +1,6 @@ import { MoveResult } from "#app/field/pokemon"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/clangorous_soul.test.ts b/test/moves/clangorous_soul.test.ts index d2f833ceff7..c44265c25ab 100644 --- a/test/moves/clangorous_soul.test.ts +++ b/test/moves/clangorous_soul.test.ts @@ -2,7 +2,7 @@ import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; import Phaser from "phaser"; import GameManager from "#test/testUtils/gameManager"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; diff --git a/test/moves/copycat.test.ts b/test/moves/copycat.test.ts index 4b2a15d7996..795b053e2fb 100644 --- a/test/moves/copycat.test.ts +++ b/test/moves/copycat.test.ts @@ -4,7 +4,7 @@ import { allMoves } from "#app/data/data-lists"; import { Stat } from "#app/enums/stat"; import { MoveResult } from "#app/field/pokemon"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/crafty_shield.test.ts b/test/moves/crafty_shield.test.ts index 9b415282e43..564232f85b8 100644 --- a/test/moves/crafty_shield.test.ts +++ b/test/moves/crafty_shield.test.ts @@ -3,7 +3,7 @@ import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest import GameManager from "#test/testUtils/gameManager"; import { Species } from "#enums/species"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Stat } from "#enums/stat"; import { BattlerTagType } from "#app/enums/battler-tag-type"; import { BerryPhase } from "#app/phases/berry-phase"; diff --git a/test/moves/defog.test.ts b/test/moves/defog.test.ts index 0c581372f78..072ff5a36a2 100644 --- a/test/moves/defog.test.ts +++ b/test/moves/defog.test.ts @@ -1,6 +1,6 @@ import { Stat } from "#enums/stat"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/destiny_bond.test.ts b/test/moves/destiny_bond.test.ts index 4a9317429ed..bf0d9b47b15 100644 --- a/test/moves/destiny_bond.test.ts +++ b/test/moves/destiny_bond.test.ts @@ -3,7 +3,7 @@ import { ArenaTagSide } from "#app/data/arena-tag"; import { allMoves } from "#app/data/data-lists"; import { AbilityId } from "#enums/ability-id"; import { ArenaTagType } from "#enums/arena-tag-type"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/diamond_storm.test.ts b/test/moves/diamond_storm.test.ts index 75b5bf7a182..92de8ee174b 100644 --- a/test/moves/diamond_storm.test.ts +++ b/test/moves/diamond_storm.test.ts @@ -1,6 +1,6 @@ import { allMoves } from "#app/data/data-lists"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/dig.test.ts b/test/moves/dig.test.ts index 0e39cae0859..102694bb917 100644 --- a/test/moves/dig.test.ts +++ b/test/moves/dig.test.ts @@ -2,7 +2,7 @@ import { BattlerIndex } from "#app/battle"; import { allMoves } from "#app/data/data-lists"; import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#enums/battler-tag-type"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; import { MoveResult } from "#app/field/pokemon"; diff --git a/test/moves/disable.test.ts b/test/moves/disable.test.ts index 8adf2383c8d..14b939a797a 100644 --- a/test/moves/disable.test.ts +++ b/test/moves/disable.test.ts @@ -1,7 +1,7 @@ import { BattlerIndex } from "#app/battle"; import { MoveResult } from "#app/field/pokemon"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/dive.test.ts b/test/moves/dive.test.ts index 4091678997a..bc4d962b3cf 100644 --- a/test/moves/dive.test.ts +++ b/test/moves/dive.test.ts @@ -2,7 +2,7 @@ import { BattlerTagType } from "#enums/battler-tag-type"; import { StatusEffect } from "#enums/status-effect"; import { MoveResult } from "#app/field/pokemon"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/doodle.test.ts b/test/moves/doodle.test.ts index 1c5939fb434..8440cc10988 100644 --- a/test/moves/doodle.test.ts +++ b/test/moves/doodle.test.ts @@ -1,7 +1,7 @@ import { BattlerIndex } from "#app/battle"; import { Stat } from "#app/enums/stat"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/double_team.test.ts b/test/moves/double_team.test.ts index d873d4fe4d4..84a81c5c941 100644 --- a/test/moves/double_team.test.ts +++ b/test/moves/double_team.test.ts @@ -1,7 +1,7 @@ import { Stat } from "#enums/stat"; import { AbilityId } from "#enums/ability-id"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/dragon_cheer.test.ts b/test/moves/dragon_cheer.test.ts index fd709ffd16c..ff88be46a23 100644 --- a/test/moves/dragon_cheer.test.ts +++ b/test/moves/dragon_cheer.test.ts @@ -1,6 +1,6 @@ import { BattlerIndex } from "#app/battle"; import { PokemonType } from "#enums/pokemon-type"; -import { MoveId } from "#app/enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#app/enums/species"; import { AbilityId } from "#enums/ability-id"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/dragon_rage.test.ts b/test/moves/dragon_rage.test.ts index b3d5b1a103c..f2e9bbacf84 100644 --- a/test/moves/dragon_rage.test.ts +++ b/test/moves/dragon_rage.test.ts @@ -5,7 +5,7 @@ import type { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#enums/battler-tag-type"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/moves/dragon_tail.test.ts b/test/moves/dragon_tail.test.ts index 9faa343d7be..9748a953862 100644 --- a/test/moves/dragon_tail.test.ts +++ b/test/moves/dragon_tail.test.ts @@ -5,7 +5,7 @@ import { Challenges } from "#enums/challenges"; import { StatusEffect } from "#enums/status-effect"; import { PokemonType } from "#enums/pokemon-type"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/dynamax_cannon.test.ts b/test/moves/dynamax_cannon.test.ts index 12b1671814f..f231e37075b 100644 --- a/test/moves/dynamax_cannon.test.ts +++ b/test/moves/dynamax_cannon.test.ts @@ -2,7 +2,7 @@ import { BattlerIndex } from "#app/battle"; import { allMoves } from "#app/data/data-lists"; import { DamageAnimPhase } from "#app/phases/damage-anim-phase"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import type Move from "#app/data/moves/move"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/effectiveness.test.ts b/test/moves/effectiveness.test.ts index f7e4a307623..5877d183ff4 100644 --- a/test/moves/effectiveness.test.ts +++ b/test/moves/effectiveness.test.ts @@ -3,7 +3,7 @@ import { getPokemonSpecies } from "#app/data/pokemon-species"; import { TrainerSlot } from "#enums/trainer-slot"; import { PokemonType } from "#enums/pokemon-type"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#app/enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#app/enums/species"; import * as Messages from "#app/messages"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/electrify.test.ts b/test/moves/electrify.test.ts index d89159e1ea3..e31ac1ead1e 100644 --- a/test/moves/electrify.test.ts +++ b/test/moves/electrify.test.ts @@ -1,7 +1,7 @@ import { BattlerIndex } from "#app/battle"; import { PokemonType } from "#enums/pokemon-type"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/electro_shot.test.ts b/test/moves/electro_shot.test.ts index eb0e7466c39..d9dccc17bad 100644 --- a/test/moves/electro_shot.test.ts +++ b/test/moves/electro_shot.test.ts @@ -3,7 +3,7 @@ import { Stat } from "#enums/stat"; import { WeatherType } from "#enums/weather-type"; import { MoveResult } from "#app/field/pokemon"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/encore.test.ts b/test/moves/encore.test.ts index 146392d285e..0ab87d37679 100644 --- a/test/moves/encore.test.ts +++ b/test/moves/encore.test.ts @@ -2,7 +2,7 @@ import { BattlerTagType } from "#enums/battler-tag-type"; import { BattlerIndex } from "#app/battle"; import { MoveResult } from "#app/field/pokemon"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/endure.test.ts b/test/moves/endure.test.ts index aff1a23edc4..13fe37d7865 100644 --- a/test/moves/endure.test.ts +++ b/test/moves/endure.test.ts @@ -1,5 +1,5 @@ import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/entrainment.test.ts b/test/moves/entrainment.test.ts index c17d99c81c3..e02b0317f40 100644 --- a/test/moves/entrainment.test.ts +++ b/test/moves/entrainment.test.ts @@ -1,6 +1,6 @@ import { Stat } from "#app/enums/stat"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/fairy_lock.test.ts b/test/moves/fairy_lock.test.ts index 3f77374e187..f90f7d54eb4 100644 --- a/test/moves/fairy_lock.test.ts +++ b/test/moves/fairy_lock.test.ts @@ -1,7 +1,7 @@ import { ArenaTagSide } from "#app/data/arena-tag"; import { ArenaTagType } from "#app/enums/arena-tag-type"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/fake_out.test.ts b/test/moves/fake_out.test.ts index c9a9ea81438..8289f14feed 100644 --- a/test/moves/fake_out.test.ts +++ b/test/moves/fake_out.test.ts @@ -1,5 +1,5 @@ import GameManager from "#test/testUtils/gameManager"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/false_swipe.test.ts b/test/moves/false_swipe.test.ts index 6a178cf58d6..064cd967603 100644 --- a/test/moves/false_swipe.test.ts +++ b/test/moves/false_swipe.test.ts @@ -1,6 +1,6 @@ import { MoveResult } from "#app/field/pokemon"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/fell_stinger.test.ts b/test/moves/fell_stinger.test.ts index fc282b8f677..2d8cb101218 100644 --- a/test/moves/fell_stinger.test.ts +++ b/test/moves/fell_stinger.test.ts @@ -3,7 +3,7 @@ import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vite import GameManager from "#test/testUtils/gameManager"; import { Species } from "#enums/species"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Stat } from "#enums/stat"; import { StatusEffect } from "#app/enums/status-effect"; import { WeatherType } from "#app/enums/weather-type"; diff --git a/test/moves/fillet_away.test.ts b/test/moves/fillet_away.test.ts index 03a2ea5cddc..4129cd15828 100644 --- a/test/moves/fillet_away.test.ts +++ b/test/moves/fillet_away.test.ts @@ -1,6 +1,6 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { toDmgValue } from "#app/utils/common"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/fissure.test.ts b/test/moves/fissure.test.ts index e77820400b3..e41f1331206 100644 --- a/test/moves/fissure.test.ts +++ b/test/moves/fissure.test.ts @@ -4,7 +4,7 @@ import type { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon"; import { DamageAnimPhase } from "#app/phases/damage-anim-phase"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/moves/flame_burst.test.ts b/test/moves/flame_burst.test.ts index 8fa00c0b165..18f8718bf4d 100644 --- a/test/moves/flame_burst.test.ts +++ b/test/moves/flame_burst.test.ts @@ -2,7 +2,7 @@ import { allAbilities } from "#app/data/data-lists"; import { AbilityId } from "#enums/ability-id"; import type Pokemon from "#app/field/pokemon"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/flower_shield.test.ts b/test/moves/flower_shield.test.ts index 14cb267f5bd..6bb35c45ef2 100644 --- a/test/moves/flower_shield.test.ts +++ b/test/moves/flower_shield.test.ts @@ -4,7 +4,7 @@ import { PokemonType } from "#enums/pokemon-type"; import { Biome } from "#app/enums/biome"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/fly.test.ts b/test/moves/fly.test.ts index 385cad2b13f..09b67509cd4 100644 --- a/test/moves/fly.test.ts +++ b/test/moves/fly.test.ts @@ -2,7 +2,7 @@ import { BattlerTagType } from "#enums/battler-tag-type"; import { StatusEffect } from "#enums/status-effect"; import { MoveResult } from "#app/field/pokemon"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/focus_punch.test.ts b/test/moves/focus_punch.test.ts index ec9127b10d3..ab14c8294a0 100644 --- a/test/moves/focus_punch.test.ts +++ b/test/moves/focus_punch.test.ts @@ -4,7 +4,7 @@ import { MoveHeaderPhase } from "#app/phases/move-header-phase"; import { SwitchSummonPhase } from "#app/phases/switch-summon-phase"; import { TurnStartPhase } from "#app/phases/turn-start-phase"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import i18next from "i18next"; diff --git a/test/moves/follow_me.test.ts b/test/moves/follow_me.test.ts index 611647fe2c2..856a53441cc 100644 --- a/test/moves/follow_me.test.ts +++ b/test/moves/follow_me.test.ts @@ -2,7 +2,7 @@ import { Stat } from "#enums/stat"; import { BattlerIndex } from "#app/battle"; import { AbilityId } from "#enums/ability-id"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/foresight.test.ts b/test/moves/foresight.test.ts index 0537cf247c8..db84347a457 100644 --- a/test/moves/foresight.test.ts +++ b/test/moves/foresight.test.ts @@ -1,4 +1,4 @@ -import { MoveId } from "#app/enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#app/enums/species"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/forests_curse.test.ts b/test/moves/forests_curse.test.ts index 0d420064734..da6a220e771 100644 --- a/test/moves/forests_curse.test.ts +++ b/test/moves/forests_curse.test.ts @@ -1,5 +1,5 @@ import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { PokemonType } from "#enums/pokemon-type"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/freeze_dry.test.ts b/test/moves/freeze_dry.test.ts index 725349d4da1..22af85c8bee 100644 --- a/test/moves/freeze_dry.test.ts +++ b/test/moves/freeze_dry.test.ts @@ -1,6 +1,6 @@ import { BattlerIndex } from "#app/battle"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#app/enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#app/enums/species"; import { PokemonType } from "#enums/pokemon-type"; import { Challenges } from "#enums/challenges"; diff --git a/test/moves/freezy_frost.test.ts b/test/moves/freezy_frost.test.ts index 5760ced7e54..b1d79fc9751 100644 --- a/test/moves/freezy_frost.test.ts +++ b/test/moves/freezy_frost.test.ts @@ -1,6 +1,6 @@ import { Stat } from "#enums/stat"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/fusion_bolt.test.ts b/test/moves/fusion_bolt.test.ts index 05ff613b26a..2a636f76dfe 100644 --- a/test/moves/fusion_bolt.test.ts +++ b/test/moves/fusion_bolt.test.ts @@ -1,5 +1,5 @@ import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/fusion_flare.test.ts b/test/moves/fusion_flare.test.ts index 9f51035777d..ee261cfac01 100644 --- a/test/moves/fusion_flare.test.ts +++ b/test/moves/fusion_flare.test.ts @@ -1,5 +1,5 @@ import { TurnStartPhase } from "#app/phases/turn-start-phase"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/fusion_flare_bolt.test.ts b/test/moves/fusion_flare_bolt.test.ts index ace537888ff..7ec21081c76 100644 --- a/test/moves/fusion_flare_bolt.test.ts +++ b/test/moves/fusion_flare_bolt.test.ts @@ -6,7 +6,7 @@ import { DamageAnimPhase } from "#app/phases/damage-anim-phase"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { MoveEndPhase } from "#app/phases/move-end-phase"; import { MovePhase } from "#app/phases/move-phase"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/future_sight.test.ts b/test/moves/future_sight.test.ts index 8f834dc6a9f..219caa9b1f6 100644 --- a/test/moves/future_sight.test.ts +++ b/test/moves/future_sight.test.ts @@ -1,5 +1,5 @@ import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/gastro_acid.test.ts b/test/moves/gastro_acid.test.ts index e84e8d0df1c..50bbaebdff1 100644 --- a/test/moves/gastro_acid.test.ts +++ b/test/moves/gastro_acid.test.ts @@ -1,6 +1,6 @@ import { BattlerIndex } from "#app/battle"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#app/enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#app/enums/species"; import { MoveResult } from "#app/field/pokemon"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/geomancy.test.ts b/test/moves/geomancy.test.ts index 1c832f4ac18..291f00b761a 100644 --- a/test/moves/geomancy.test.ts +++ b/test/moves/geomancy.test.ts @@ -2,7 +2,7 @@ import type { EffectiveStat } from "#enums/stat"; import { Stat } from "#enums/stat"; import { MoveResult } from "#app/field/pokemon"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/gigaton_hammer.test.ts b/test/moves/gigaton_hammer.test.ts index a3a91e4be6a..b461fd8a17b 100644 --- a/test/moves/gigaton_hammer.test.ts +++ b/test/moves/gigaton_hammer.test.ts @@ -1,6 +1,6 @@ import { BattlerIndex } from "#app/battle"; import GameManager from "#test/testUtils/gameManager"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/glaive_rush.test.ts b/test/moves/glaive_rush.test.ts index f028e32dd5e..987e31a8b2d 100644 --- a/test/moves/glaive_rush.test.ts +++ b/test/moves/glaive_rush.test.ts @@ -1,6 +1,6 @@ import { allMoves } from "#app/data/data-lists"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#app/enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#app/enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/growth.test.ts b/test/moves/growth.test.ts index bb24efe4e74..282b7b9a4c7 100644 --- a/test/moves/growth.test.ts +++ b/test/moves/growth.test.ts @@ -1,7 +1,7 @@ import { Stat } from "#enums/stat"; import GameManager from "#test/testUtils/gameManager"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/grudge.test.ts b/test/moves/grudge.test.ts index e63936c3602..f9b87c0c020 100644 --- a/test/moves/grudge.test.ts +++ b/test/moves/grudge.test.ts @@ -1,5 +1,5 @@ import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { BattlerIndex } from "#app/battle"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/guard_split.test.ts b/test/moves/guard_split.test.ts index 6d574467bc5..d4e453dc291 100644 --- a/test/moves/guard_split.test.ts +++ b/test/moves/guard_split.test.ts @@ -3,7 +3,7 @@ import Phaser from "phaser"; import GameManager from "#test/testUtils/gameManager"; import { Species } from "#enums/species"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Stat } from "#enums/stat"; import { AbilityId } from "#enums/ability-id"; diff --git a/test/moves/guard_swap.test.ts b/test/moves/guard_swap.test.ts index b290fa77f31..787f0a73ec4 100644 --- a/test/moves/guard_swap.test.ts +++ b/test/moves/guard_swap.test.ts @@ -3,7 +3,7 @@ import Phaser from "phaser"; import GameManager from "#test/testUtils/gameManager"; import { Species } from "#enums/species"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Stat, BATTLE_STATS } from "#enums/stat"; import { AbilityId } from "#enums/ability-id"; import { MoveEndPhase } from "#app/phases/move-end-phase"; diff --git a/test/moves/hard_press.test.ts b/test/moves/hard_press.test.ts index 6142fda7735..0e621120fce 100644 --- a/test/moves/hard_press.test.ts +++ b/test/moves/hard_press.test.ts @@ -1,7 +1,7 @@ import { allMoves } from "#app/data/data-lists"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/haze.test.ts b/test/moves/haze.test.ts index 5309773dcb6..1d6141548ab 100644 --- a/test/moves/haze.test.ts +++ b/test/moves/haze.test.ts @@ -1,7 +1,7 @@ import { Stat } from "#enums/stat"; import GameManager from "#test/testUtils/gameManager"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/heal_bell.test.ts b/test/moves/heal_bell.test.ts index b121635f031..b90c851f797 100644 --- a/test/moves/heal_bell.test.ts +++ b/test/moves/heal_bell.test.ts @@ -1,7 +1,7 @@ import { StatusEffect } from "#app/enums/status-effect"; import { CommandPhase } from "#app/phases/command-phase"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/heal_block.test.ts b/test/moves/heal_block.test.ts index d97c876b450..aea019c5800 100644 --- a/test/moves/heal_block.test.ts +++ b/test/moves/heal_block.test.ts @@ -4,7 +4,7 @@ import GameManager from "#test/testUtils/gameManager"; import { AbilityId } from "#enums/ability-id"; import { ArenaTagType } from "#enums/arena-tag-type"; import { BattlerTagType } from "#enums/battler-tag-type"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { WeatherType } from "#enums/weather-type"; import Phaser from "phaser"; diff --git a/test/moves/heart_swap.test.ts b/test/moves/heart_swap.test.ts index a2b8f37fcd9..fdcc3975d85 100644 --- a/test/moves/heart_swap.test.ts +++ b/test/moves/heart_swap.test.ts @@ -3,7 +3,7 @@ import Phaser from "phaser"; import GameManager from "#test/testUtils/gameManager"; import { Species } from "#enums/species"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { BATTLE_STATS } from "#enums/stat"; import { AbilityId } from "#enums/ability-id"; import { MoveEndPhase } from "#app/phases/move-end-phase"; diff --git a/test/moves/hyper_beam.test.ts b/test/moves/hyper_beam.test.ts index 311d3ed5c5d..f721b71d7ab 100644 --- a/test/moves/hyper_beam.test.ts +++ b/test/moves/hyper_beam.test.ts @@ -1,7 +1,7 @@ import { allMoves } from "#app/data/data-lists"; import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#app/enums/battler-tag-type"; -import { MoveId } from "#app/enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#app/enums/species"; import { BerryPhase } from "#app/phases/berry-phase"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; diff --git a/test/moves/imprison.test.ts b/test/moves/imprison.test.ts index fd18988a518..2674c28a078 100644 --- a/test/moves/imprison.test.ts +++ b/test/moves/imprison.test.ts @@ -1,4 +1,4 @@ -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { AbilityId } from "#enums/ability-id"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/instruct.test.ts b/test/moves/instruct.test.ts index 4aee93ea8f0..54396cc18f6 100644 --- a/test/moves/instruct.test.ts +++ b/test/moves/instruct.test.ts @@ -3,7 +3,7 @@ import type Pokemon from "#app/field/pokemon"; import { MoveResult } from "#app/field/pokemon"; import type { MovePhase } from "#app/phases/move-phase"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/jaw_lock.test.ts b/test/moves/jaw_lock.test.ts index a8aa5b8d7c6..4fac291a9ed 100644 --- a/test/moves/jaw_lock.test.ts +++ b/test/moves/jaw_lock.test.ts @@ -6,7 +6,7 @@ import { FaintPhase } from "#app/phases/faint-phase"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import GameManager from "#test/testUtils/gameManager"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/lash_out.test.ts b/test/moves/lash_out.test.ts index 2f66095893a..b23634cb215 100644 --- a/test/moves/lash_out.test.ts +++ b/test/moves/lash_out.test.ts @@ -1,7 +1,7 @@ import { BattlerIndex } from "#app/battle"; import { allMoves } from "#app/data/data-lists"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/last-resort.test.ts b/test/moves/last-resort.test.ts index 93b6c57b87e..f5c8afaa84b 100644 --- a/test/moves/last-resort.test.ts +++ b/test/moves/last-resort.test.ts @@ -1,7 +1,7 @@ import { BattlerIndex } from "#app/battle"; import { MoveResult } from "#app/field/pokemon"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/last_respects.test.ts b/test/moves/last_respects.test.ts index 9cdc4a79bdd..33b6f590581 100644 --- a/test/moves/last_respects.test.ts +++ b/test/moves/last_respects.test.ts @@ -1,4 +1,4 @@ -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { BattlerIndex } from "#app/battle"; import { Species } from "#enums/species"; import { AbilityId } from "#enums/ability-id"; diff --git a/test/moves/light_screen.test.ts b/test/moves/light_screen.test.ts index 214ae8b1842..a7adbe19f64 100644 --- a/test/moves/light_screen.test.ts +++ b/test/moves/light_screen.test.ts @@ -8,7 +8,7 @@ import { ArenaTagType } from "#app/enums/arena-tag-type"; import type Pokemon from "#app/field/pokemon"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { NumberHolder } from "#app/utils/common"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/lucky_chant.test.ts b/test/moves/lucky_chant.test.ts index 1c64ab05afb..32c05078215 100644 --- a/test/moves/lucky_chant.test.ts +++ b/test/moves/lucky_chant.test.ts @@ -1,6 +1,6 @@ import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#app/enums/battler-tag-type"; -import { MoveId } from "#app/enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#app/enums/species"; import { BerryPhase } from "#app/phases/berry-phase"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; diff --git a/test/moves/lunar_blessing.test.ts b/test/moves/lunar_blessing.test.ts index 24e4cccc24b..7853f2d671f 100644 --- a/test/moves/lunar_blessing.test.ts +++ b/test/moves/lunar_blessing.test.ts @@ -1,7 +1,7 @@ import { StatusEffect } from "#app/enums/status-effect"; import { CommandPhase } from "#app/phases/command-phase"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/lunar_dance.test.ts b/test/moves/lunar_dance.test.ts index b16940b2e8a..5f40d28ee4e 100644 --- a/test/moves/lunar_dance.test.ts +++ b/test/moves/lunar_dance.test.ts @@ -1,7 +1,7 @@ import { StatusEffect } from "#app/enums/status-effect"; import { CommandPhase } from "#app/phases/command-phase"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/magic_coat.test.ts b/test/moves/magic_coat.test.ts index 6a16f53a462..78672fe5c3d 100644 --- a/test/moves/magic_coat.test.ts +++ b/test/moves/magic_coat.test.ts @@ -7,7 +7,7 @@ import { Stat } from "#app/enums/stat"; import { StatusEffect } from "#app/enums/status-effect"; import { MoveResult } from "#app/field/pokemon"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/moves/magnet_rise.test.ts b/test/moves/magnet_rise.test.ts index d191c008076..57af952d7c1 100644 --- a/test/moves/magnet_rise.test.ts +++ b/test/moves/magnet_rise.test.ts @@ -1,6 +1,6 @@ import { CommandPhase } from "#app/phases/command-phase"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/make_it_rain.test.ts b/test/moves/make_it_rain.test.ts index 5c55e834e57..c0f9ad6f58c 100644 --- a/test/moves/make_it_rain.test.ts +++ b/test/moves/make_it_rain.test.ts @@ -1,6 +1,6 @@ import { Stat } from "#enums/stat"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/mat_block.test.ts b/test/moves/mat_block.test.ts index 1af6ae4f58e..2dc0ca67f9f 100644 --- a/test/moves/mat_block.test.ts +++ b/test/moves/mat_block.test.ts @@ -3,7 +3,7 @@ import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest import GameManager from "#test/testUtils/gameManager"; import { Species } from "#enums/species"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Stat } from "#enums/stat"; import { BerryPhase } from "#app/phases/berry-phase"; import { CommandPhase } from "#app/phases/command-phase"; diff --git a/test/moves/metal_burst.test.ts b/test/moves/metal_burst.test.ts index 8c397f42b71..b6fec6c20a8 100644 --- a/test/moves/metal_burst.test.ts +++ b/test/moves/metal_burst.test.ts @@ -1,7 +1,7 @@ import { BattlerIndex } from "#app/battle"; import { MoveResult } from "#app/field/pokemon"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/metronome.test.ts b/test/moves/metronome.test.ts index 9d994862f3a..e7b217c9a27 100644 --- a/test/moves/metronome.test.ts +++ b/test/moves/metronome.test.ts @@ -4,7 +4,7 @@ import { allMoves } from "#app/data/data-lists"; import { AbilityId } from "#enums/ability-id"; import { Stat } from "#app/enums/stat"; import { CommandPhase } from "#app/phases/command-phase"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/miracle_eye.test.ts b/test/moves/miracle_eye.test.ts index 49555c1d868..9f1f37152b9 100644 --- a/test/moves/miracle_eye.test.ts +++ b/test/moves/miracle_eye.test.ts @@ -1,5 +1,5 @@ import { BattlerIndex } from "#app/battle"; -import { MoveId } from "#app/enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#app/enums/species"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/mirror_move.test.ts b/test/moves/mirror_move.test.ts index 1ee5840ecec..6c4a2367212 100644 --- a/test/moves/mirror_move.test.ts +++ b/test/moves/mirror_move.test.ts @@ -2,7 +2,7 @@ import { BattlerIndex } from "#app/battle"; import { Stat } from "#app/enums/stat"; import { MoveResult } from "#app/field/pokemon"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/mist.test.ts b/test/moves/mist.test.ts index 923fcfe7488..c1a38d3678d 100644 --- a/test/moves/mist.test.ts +++ b/test/moves/mist.test.ts @@ -1,6 +1,6 @@ import { Stat } from "#enums/stat"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/moongeist_beam.test.ts b/test/moves/moongeist_beam.test.ts index 8d68bb23ecc..2ebbbf07024 100644 --- a/test/moves/moongeist_beam.test.ts +++ b/test/moves/moongeist_beam.test.ts @@ -1,7 +1,7 @@ import { RandomMoveAttr } from "#app/data/moves/move"; import { allMoves } from "#app/data/data-lists"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/multi_target.test.ts b/test/moves/multi_target.test.ts index 7a5f6cd84ed..b358cbfd96a 100644 --- a/test/moves/multi_target.test.ts +++ b/test/moves/multi_target.test.ts @@ -2,7 +2,7 @@ import { BattlerIndex } from "#app/battle"; import { AbilityId } from "#enums/ability-id"; import { Species } from "#app/enums/species"; import { toDmgValue } from "#app/utils/common"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/nightmare.test.ts b/test/moves/nightmare.test.ts index 79570573ce7..db9b32ee161 100644 --- a/test/moves/nightmare.test.ts +++ b/test/moves/nightmare.test.ts @@ -1,5 +1,5 @@ import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/obstruct.test.ts b/test/moves/obstruct.test.ts index 725deb7b038..2559e8685cf 100644 --- a/test/moves/obstruct.test.ts +++ b/test/moves/obstruct.test.ts @@ -1,5 +1,5 @@ import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/octolock.test.ts b/test/moves/octolock.test.ts index c93cc76e1ea..ba2cf595b04 100644 --- a/test/moves/octolock.test.ts +++ b/test/moves/octolock.test.ts @@ -1,6 +1,6 @@ import { TrappedTag } from "#app/data/battler-tags"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/order_up.test.ts b/test/moves/order_up.test.ts index c53bce385b2..5780b3ae588 100644 --- a/test/moves/order_up.test.ts +++ b/test/moves/order_up.test.ts @@ -4,7 +4,7 @@ import { PokemonAnimType } from "#enums/pokemon-anim-type"; import type { EffectiveStat } from "#enums/stat"; import { Stat } from "#enums/stat"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/parting_shot.test.ts b/test/moves/parting_shot.test.ts index 026d2c45ae5..75e3edfd83b 100644 --- a/test/moves/parting_shot.test.ts +++ b/test/moves/parting_shot.test.ts @@ -1,5 +1,5 @@ import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, test } from "vitest"; diff --git a/test/moves/plasma_fists.test.ts b/test/moves/plasma_fists.test.ts index dc683658304..af1d21f5f17 100644 --- a/test/moves/plasma_fists.test.ts +++ b/test/moves/plasma_fists.test.ts @@ -1,7 +1,7 @@ import { BattlerIndex } from "#app/battle"; import { PokemonType } from "#enums/pokemon-type"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/pledge_moves.test.ts b/test/moves/pledge_moves.test.ts index 47731f4e8ce..1911abe5535 100644 --- a/test/moves/pledge_moves.test.ts +++ b/test/moves/pledge_moves.test.ts @@ -8,7 +8,7 @@ import { ArenaTagType } from "#enums/arena-tag-type"; import { Stat } from "#enums/stat"; import { toDmgValue } from "#app/utils/common"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/pollen_puff.test.ts b/test/moves/pollen_puff.test.ts index faa5b50d59f..64bfd16b6d2 100644 --- a/test/moves/pollen_puff.test.ts +++ b/test/moves/pollen_puff.test.ts @@ -1,6 +1,6 @@ import { BattlerIndex } from "#app/battle"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/powder.test.ts b/test/moves/powder.test.ts index c091149517f..ab834469973 100644 --- a/test/moves/powder.test.ts +++ b/test/moves/powder.test.ts @@ -3,7 +3,7 @@ import { MoveResult, PokemonMove } from "#app/field/pokemon"; import { BerryPhase } from "#app/phases/berry-phase"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { PokemonType } from "#enums/pokemon-type"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; diff --git a/test/moves/power_shift.test.ts b/test/moves/power_shift.test.ts index 101f5a8c8f7..9f52b328519 100644 --- a/test/moves/power_shift.test.ts +++ b/test/moves/power_shift.test.ts @@ -1,4 +1,4 @@ -import { MoveId } from "#app/enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#app/enums/species"; import { Stat } from "#app/enums/stat"; import { AbilityId } from "#enums/ability-id"; diff --git a/test/moves/power_split.test.ts b/test/moves/power_split.test.ts index 998f9799271..69c3baf0a9b 100644 --- a/test/moves/power_split.test.ts +++ b/test/moves/power_split.test.ts @@ -3,7 +3,7 @@ import Phaser from "phaser"; import GameManager from "#test/testUtils/gameManager"; import { Species } from "#enums/species"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Stat } from "#enums/stat"; import { AbilityId } from "#enums/ability-id"; diff --git a/test/moves/power_swap.test.ts b/test/moves/power_swap.test.ts index 6594eb56436..0865490a524 100644 --- a/test/moves/power_swap.test.ts +++ b/test/moves/power_swap.test.ts @@ -3,7 +3,7 @@ import Phaser from "phaser"; import GameManager from "#test/testUtils/gameManager"; import { Species } from "#enums/species"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Stat, BATTLE_STATS } from "#enums/stat"; import { AbilityId } from "#enums/ability-id"; import { MoveEndPhase } from "#app/phases/move-end-phase"; diff --git a/test/moves/power_trick.test.ts b/test/moves/power_trick.test.ts index 74037532327..7e10c52098d 100644 --- a/test/moves/power_trick.test.ts +++ b/test/moves/power_trick.test.ts @@ -1,7 +1,7 @@ import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; import Phaser from "phaser"; import GameManager from "#test/testUtils/gameManager"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Stat } from "#enums/stat"; import { Species } from "#enums/species"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; diff --git a/test/moves/protect.test.ts b/test/moves/protect.test.ts index 44f5ee5270b..87a4b58f431 100644 --- a/test/moves/protect.test.ts +++ b/test/moves/protect.test.ts @@ -3,7 +3,7 @@ import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vi import GameManager from "#test/testUtils/gameManager"; import { Species } from "#enums/species"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Stat } from "#enums/stat"; import { allMoves } from "#app/data/data-lists"; import { ArenaTagSide, ArenaTrapTag } from "#app/data/arena-tag"; diff --git a/test/moves/psycho_shift.test.ts b/test/moves/psycho_shift.test.ts index f7ebdfab3a0..f47c6394ef0 100644 --- a/test/moves/psycho_shift.test.ts +++ b/test/moves/psycho_shift.test.ts @@ -1,6 +1,6 @@ import { StatusEffect } from "#app/enums/status-effect"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/purify.test.ts b/test/moves/purify.test.ts index 3f6b1d76da7..f203f8d77a1 100644 --- a/test/moves/purify.test.ts +++ b/test/moves/purify.test.ts @@ -2,7 +2,7 @@ import { BattlerIndex } from "#app/battle"; import { Status } from "#app/data/status-effect"; import type { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon"; import { MoveEndPhase } from "#app/phases/move-end-phase"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/quash.test.ts b/test/moves/quash.test.ts index 9204bd3a354..7ae21c33361 100644 --- a/test/moves/quash.test.ts +++ b/test/moves/quash.test.ts @@ -1,5 +1,5 @@ import { Species } from "#enums/species"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { AbilityId } from "#enums/ability-id"; import { BattlerIndex } from "#app/battle"; import { WeatherType } from "#enums/weather-type"; diff --git a/test/moves/quick_guard.test.ts b/test/moves/quick_guard.test.ts index 8d64903dbf9..ae5b0084567 100644 --- a/test/moves/quick_guard.test.ts +++ b/test/moves/quick_guard.test.ts @@ -3,7 +3,7 @@ import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest import GameManager from "#test/testUtils/gameManager"; import { Species } from "#enums/species"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Stat } from "#enums/stat"; import { BattlerIndex } from "#app/battle"; import { MoveResult } from "#app/field/pokemon"; diff --git a/test/moves/rage_fist.test.ts b/test/moves/rage_fist.test.ts index fa5509ef89d..cd67f0da36c 100644 --- a/test/moves/rage_fist.test.ts +++ b/test/moves/rage_fist.test.ts @@ -1,6 +1,6 @@ import { BattlerIndex } from "#app/battle"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { allMoves } from "#app/data/data-lists"; import type Move from "#app/data/moves/move"; diff --git a/test/moves/rage_powder.test.ts b/test/moves/rage_powder.test.ts index 154bc910962..c04c2593b99 100644 --- a/test/moves/rage_powder.test.ts +++ b/test/moves/rage_powder.test.ts @@ -1,6 +1,6 @@ import { BattlerIndex } from "#app/battle"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/reflect.test.ts b/test/moves/reflect.test.ts index efd7d4297e9..892902f2a41 100644 --- a/test/moves/reflect.test.ts +++ b/test/moves/reflect.test.ts @@ -8,7 +8,7 @@ import { ArenaTagType } from "#app/enums/arena-tag-type"; import type Pokemon from "#app/field/pokemon"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { NumberHolder } from "#app/utils/common"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/reflect_type.test.ts b/test/moves/reflect_type.test.ts index bc853ba4c02..ac5756df457 100644 --- a/test/moves/reflect_type.test.ts +++ b/test/moves/reflect_type.test.ts @@ -1,5 +1,5 @@ import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { PokemonType } from "#enums/pokemon-type"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/relic_song.test.ts b/test/moves/relic_song.test.ts index a75dadc7615..3f8a08f05f4 100644 --- a/test/moves/relic_song.test.ts +++ b/test/moves/relic_song.test.ts @@ -1,7 +1,7 @@ import { PokemonType } from "#enums/pokemon-type"; import { Challenges } from "#app/enums/challenges"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/retaliate.test.ts b/test/moves/retaliate.test.ts index fc80906a71e..aba55bdeac2 100644 --- a/test/moves/retaliate.test.ts +++ b/test/moves/retaliate.test.ts @@ -2,7 +2,7 @@ import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vite import Phaser from "phaser"; import GameManager from "#test/testUtils/gameManager"; import { Species } from "#enums/species"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { allMoves } from "#app/data/data-lists"; import type Move from "#app/data/moves/move"; diff --git a/test/moves/revival_blessing.test.ts b/test/moves/revival_blessing.test.ts index e29323cd90c..21741896ea9 100644 --- a/test/moves/revival_blessing.test.ts +++ b/test/moves/revival_blessing.test.ts @@ -2,7 +2,7 @@ import { BattlerIndex } from "#app/battle"; import { MoveResult } from "#app/field/pokemon"; import { toDmgValue } from "#app/utils/common"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/role_play.test.ts b/test/moves/role_play.test.ts index c4688f36de1..913e2a707ff 100644 --- a/test/moves/role_play.test.ts +++ b/test/moves/role_play.test.ts @@ -1,6 +1,6 @@ import { Stat } from "#app/enums/stat"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/rollout.test.ts b/test/moves/rollout.test.ts index 83c1a414f4a..ccb491ac644 100644 --- a/test/moves/rollout.test.ts +++ b/test/moves/rollout.test.ts @@ -1,7 +1,7 @@ import { allMoves } from "#app/data/data-lists"; import { CommandPhase } from "#app/phases/command-phase"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/roost.test.ts b/test/moves/roost.test.ts index 7cd971ed39e..624bbf78d1d 100644 --- a/test/moves/roost.test.ts +++ b/test/moves/roost.test.ts @@ -1,7 +1,7 @@ import { BattlerIndex } from "#app/battle"; import { PokemonType } from "#enums/pokemon-type"; import { BattlerTagType } from "#app/enums/battler-tag-type"; -import { MoveId } from "#app/enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#app/enums/species"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; diff --git a/test/moves/round.test.ts b/test/moves/round.test.ts index d06620edee5..0ddcaa67cc7 100644 --- a/test/moves/round.test.ts +++ b/test/moves/round.test.ts @@ -2,7 +2,7 @@ import { BattlerIndex } from "#app/battle"; import { allMoves } from "#app/data/data-lists"; import type { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/safeguard.test.ts b/test/moves/safeguard.test.ts index 3895fa86ee2..522a169b739 100644 --- a/test/moves/safeguard.test.ts +++ b/test/moves/safeguard.test.ts @@ -4,7 +4,7 @@ import { allAbilities } from "#app/data/data-lists"; import { AbilityId } from "#enums/ability-id"; import { StatusEffect } from "#app/enums/status-effect"; import GameManager from "#test/testUtils/gameManager"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/moves/scale_shot.test.ts b/test/moves/scale_shot.test.ts index 70292c57dc5..c86ab5b4111 100644 --- a/test/moves/scale_shot.test.ts +++ b/test/moves/scale_shot.test.ts @@ -5,7 +5,7 @@ import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { MoveEndPhase } from "#app/phases/move-end-phase"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/secret_power.test.ts b/test/moves/secret_power.test.ts index a86c15778c7..bb484c9de2d 100644 --- a/test/moves/secret_power.test.ts +++ b/test/moves/secret_power.test.ts @@ -1,6 +1,6 @@ import { AbilityId } from "#enums/ability-id"; import { Biome } from "#enums/biome"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Stat } from "#enums/stat"; import { allMoves } from "#app/data/data-lists"; import { Species } from "#enums/species"; diff --git a/test/moves/shed_tail.test.ts b/test/moves/shed_tail.test.ts index 5736c76b50e..6cd7070fded 100644 --- a/test/moves/shed_tail.test.ts +++ b/test/moves/shed_tail.test.ts @@ -1,7 +1,7 @@ import { SubstituteTag } from "#app/data/battler-tags"; import { MoveResult } from "#app/field/pokemon"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/shell_side_arm.test.ts b/test/moves/shell_side_arm.test.ts index 4de89da7565..fa3dd7c85e6 100644 --- a/test/moves/shell_side_arm.test.ts +++ b/test/moves/shell_side_arm.test.ts @@ -3,7 +3,7 @@ import { ShellSideArmCategoryAttr } from "#app/data/moves/move"; import { allMoves } from "#app/data/data-lists"; import type Move from "#app/data/moves/move"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/shell_trap.test.ts b/test/moves/shell_trap.test.ts index 589763898f4..a72aaef91ba 100644 --- a/test/moves/shell_trap.test.ts +++ b/test/moves/shell_trap.test.ts @@ -1,6 +1,6 @@ import { BattlerIndex } from "#app/battle"; import { allMoves } from "#app/data/data-lists"; -import { MoveId } from "#app/enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#app/enums/species"; import { MoveResult } from "#app/field/pokemon"; import { BerryPhase } from "#app/phases/berry-phase"; diff --git a/test/moves/simple_beam.test.ts b/test/moves/simple_beam.test.ts index 0ab80328092..b3280886971 100644 --- a/test/moves/simple_beam.test.ts +++ b/test/moves/simple_beam.test.ts @@ -1,5 +1,5 @@ import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/sketch.test.ts b/test/moves/sketch.test.ts index 791a4ac0a66..d7587489a7b 100644 --- a/test/moves/sketch.test.ts +++ b/test/moves/sketch.test.ts @@ -1,5 +1,5 @@ import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { MoveResult, PokemonMove } from "#app/field/pokemon"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/skill_swap.test.ts b/test/moves/skill_swap.test.ts index 7c7385c539b..d4ff089f408 100644 --- a/test/moves/skill_swap.test.ts +++ b/test/moves/skill_swap.test.ts @@ -1,6 +1,6 @@ import { Stat } from "#app/enums/stat"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/sleep_talk.test.ts b/test/moves/sleep_talk.test.ts index 6fb456ebe23..1ed49b6ab12 100644 --- a/test/moves/sleep_talk.test.ts +++ b/test/moves/sleep_talk.test.ts @@ -2,7 +2,7 @@ import { Stat } from "#app/enums/stat"; import { StatusEffect } from "#app/enums/status-effect"; import { MoveResult } from "#app/field/pokemon"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/solar_beam.test.ts b/test/moves/solar_beam.test.ts index b2ab59f61dd..f077937cb1e 100644 --- a/test/moves/solar_beam.test.ts +++ b/test/moves/solar_beam.test.ts @@ -3,7 +3,7 @@ import { BattlerTagType } from "#enums/battler-tag-type"; import { WeatherType } from "#enums/weather-type"; import { MoveResult } from "#app/field/pokemon"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/sparkly_swirl.test.ts b/test/moves/sparkly_swirl.test.ts index 2f7382107af..feb7a3162a1 100644 --- a/test/moves/sparkly_swirl.test.ts +++ b/test/moves/sparkly_swirl.test.ts @@ -2,7 +2,7 @@ import { allMoves } from "#app/data/data-lists"; import { StatusEffect } from "#app/enums/status-effect"; import { CommandPhase } from "#app/phases/command-phase"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/spectral_thief.test.ts b/test/moves/spectral_thief.test.ts index 8aef475fb7f..f512dabb2f2 100644 --- a/test/moves/spectral_thief.test.ts +++ b/test/moves/spectral_thief.test.ts @@ -2,7 +2,7 @@ import { AbilityId } from "#enums/ability-id"; import { BattlerIndex } from "#app/battle"; import { Stat } from "#enums/stat"; import { allMoves } from "#app/data/data-lists"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/speed_swap.test.ts b/test/moves/speed_swap.test.ts index 2839004e2e8..f73c5c06c47 100644 --- a/test/moves/speed_swap.test.ts +++ b/test/moves/speed_swap.test.ts @@ -3,7 +3,7 @@ import Phaser from "phaser"; import GameManager from "#test/testUtils/gameManager"; import { Species } from "#enums/species"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Stat } from "#enums/stat"; import { AbilityId } from "#enums/ability-id"; diff --git a/test/moves/spikes.test.ts b/test/moves/spikes.test.ts index befc8535d0a..758b465a459 100644 --- a/test/moves/spikes.test.ts +++ b/test/moves/spikes.test.ts @@ -1,5 +1,5 @@ import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/spit_up.test.ts b/test/moves/spit_up.test.ts index f78b3fc42d4..5ebff1b1e2f 100644 --- a/test/moves/spit_up.test.ts +++ b/test/moves/spit_up.test.ts @@ -6,7 +6,7 @@ import type { TurnMove } from "#app/field/pokemon"; import { MoveResult } from "#app/field/pokemon"; import GameManager from "#test/testUtils/gameManager"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import type Move from "#app/data/moves/move"; import { Species } from "#enums/species"; import Phaser from "phaser"; diff --git a/test/moves/spotlight.test.ts b/test/moves/spotlight.test.ts index 8fe35ff9269..ad33b522b6a 100644 --- a/test/moves/spotlight.test.ts +++ b/test/moves/spotlight.test.ts @@ -1,6 +1,6 @@ import { BattlerIndex } from "#app/battle"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/steamroller.test.ts b/test/moves/steamroller.test.ts index 7d24e2537d2..744cd6bbd3a 100644 --- a/test/moves/steamroller.test.ts +++ b/test/moves/steamroller.test.ts @@ -3,7 +3,7 @@ import { allMoves } from "#app/data/data-lists"; import { BattlerTagType } from "#app/enums/battler-tag-type"; import type { DamageCalculationResult } from "#app/field/pokemon"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/stockpile.test.ts b/test/moves/stockpile.test.ts index 7c9c9316df7..7a84724638f 100644 --- a/test/moves/stockpile.test.ts +++ b/test/moves/stockpile.test.ts @@ -5,7 +5,7 @@ import { MoveResult } from "#app/field/pokemon"; import { CommandPhase } from "#app/phases/command-phase"; import { TurnInitPhase } from "#app/phases/turn-init-phase"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/struggle.test.ts b/test/moves/struggle.test.ts index 0dd95a3e060..1c3015b2bf0 100644 --- a/test/moves/struggle.test.ts +++ b/test/moves/struggle.test.ts @@ -1,5 +1,5 @@ import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/substitute.test.ts b/test/moves/substitute.test.ts index 4bad56a9147..fa61fcc0b42 100644 --- a/test/moves/substitute.test.ts +++ b/test/moves/substitute.test.ts @@ -12,7 +12,7 @@ import { AbilityId } from "#enums/ability-id"; import { ArenaTagType } from "#enums/arena-tag-type"; import { BattlerTagType } from "#enums/battler-tag-type"; import { BerryType } from "#enums/berry-type"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; import { StatusEffect } from "#enums/status-effect"; diff --git a/test/moves/swallow.test.ts b/test/moves/swallow.test.ts index 979d5f8bda1..8e102e7e628 100644 --- a/test/moves/swallow.test.ts +++ b/test/moves/swallow.test.ts @@ -6,7 +6,7 @@ import { MoveResult } from "#app/field/pokemon"; import { MovePhase } from "#app/phases/move-phase"; import { TurnInitPhase } from "#app/phases/turn-init-phase"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/synchronoise.test.ts b/test/moves/synchronoise.test.ts index 9b5a2df8c99..7a53923cfbb 100644 --- a/test/moves/synchronoise.test.ts +++ b/test/moves/synchronoise.test.ts @@ -1,5 +1,5 @@ import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { PokemonType } from "#enums/pokemon-type"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/syrup_bomb.test.ts b/test/moves/syrup_bomb.test.ts index 62f0a2ce4f4..4682c0a9d63 100644 --- a/test/moves/syrup_bomb.test.ts +++ b/test/moves/syrup_bomb.test.ts @@ -1,4 +1,4 @@ -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#enums/battler-tag-type"; diff --git a/test/moves/tackle.test.ts b/test/moves/tackle.test.ts index d933a993a40..a9dc906c2d1 100644 --- a/test/moves/tackle.test.ts +++ b/test/moves/tackle.test.ts @@ -1,7 +1,7 @@ import { Stat } from "#enums/stat"; import { EnemyCommandPhase } from "#app/phases/enemy-command-phase"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/tail_whip.test.ts b/test/moves/tail_whip.test.ts index 4de632098d6..f23d7b767df 100644 --- a/test/moves/tail_whip.test.ts +++ b/test/moves/tail_whip.test.ts @@ -1,7 +1,7 @@ import { Stat } from "#enums/stat"; import GameManager from "#test/testUtils/gameManager"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/tailwind.test.ts b/test/moves/tailwind.test.ts index 082dcae9d7b..6e15f03fa37 100644 --- a/test/moves/tailwind.test.ts +++ b/test/moves/tailwind.test.ts @@ -1,7 +1,7 @@ import { ArenaTagSide } from "#app/data/arena-tag"; import { ArenaTagType } from "#app/enums/arena-tag-type"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/tar_shot.test.ts b/test/moves/tar_shot.test.ts index 21ce154402a..93b0662e88e 100644 --- a/test/moves/tar_shot.test.ts +++ b/test/moves/tar_shot.test.ts @@ -1,6 +1,6 @@ import { BattlerIndex } from "#app/battle"; import { PokemonType } from "#enums/pokemon-type"; -import { MoveId } from "#app/enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#app/enums/species"; import { Stat } from "#app/enums/stat"; import { AbilityId } from "#enums/ability-id"; diff --git a/test/moves/taunt.test.ts b/test/moves/taunt.test.ts index ae51ce121cf..38e25ed3261 100644 --- a/test/moves/taunt.test.ts +++ b/test/moves/taunt.test.ts @@ -1,4 +1,4 @@ -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { AbilityId } from "#enums/ability-id"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/telekinesis.test.ts b/test/moves/telekinesis.test.ts index 148da32dab3..98f3b3a5205 100644 --- a/test/moves/telekinesis.test.ts +++ b/test/moves/telekinesis.test.ts @@ -1,7 +1,7 @@ import { BattlerTagType } from "#enums/battler-tag-type"; import { allMoves } from "#app/data/data-lists"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { MoveResult } from "#app/field/pokemon"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/tera_blast.test.ts b/test/moves/tera_blast.test.ts index ce2d72cc229..342d6ba7738 100644 --- a/test/moves/tera_blast.test.ts +++ b/test/moves/tera_blast.test.ts @@ -5,7 +5,7 @@ import { allMoves } from "#app/data/data-lists"; import type Move from "#app/data/moves/move"; import { PokemonType } from "#enums/pokemon-type"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/tera_starstorm.test.ts b/test/moves/tera_starstorm.test.ts index 3641df5f1c2..dff0543eff6 100644 --- a/test/moves/tera_starstorm.test.ts +++ b/test/moves/tera_starstorm.test.ts @@ -1,7 +1,7 @@ import { BattlerIndex } from "#app/battle"; import { PokemonType } from "#enums/pokemon-type"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/thousand_arrows.test.ts b/test/moves/thousand_arrows.test.ts index 05db6607bf7..831ce211dfb 100644 --- a/test/moves/thousand_arrows.test.ts +++ b/test/moves/thousand_arrows.test.ts @@ -2,7 +2,7 @@ import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#app/enums/battler-tag-type"; import { BerryPhase } from "#app/phases/berry-phase"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/throat_chop.test.ts b/test/moves/throat_chop.test.ts index e10eccefbea..d48641463db 100644 --- a/test/moves/throat_chop.test.ts +++ b/test/moves/throat_chop.test.ts @@ -1,5 +1,5 @@ import { BattlerIndex } from "#app/battle"; -import { MoveId } from "#app/enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#app/enums/species"; import { Stat } from "#app/enums/stat"; import { AbilityId } from "#enums/ability-id"; diff --git a/test/moves/thunder_wave.test.ts b/test/moves/thunder_wave.test.ts index c21e7ef1deb..553c8bb224d 100644 --- a/test/moves/thunder_wave.test.ts +++ b/test/moves/thunder_wave.test.ts @@ -1,6 +1,6 @@ import type { EnemyPokemon } from "#app/field/pokemon"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/tidy_up.test.ts b/test/moves/tidy_up.test.ts index d39f08c4da0..a57f90a2183 100644 --- a/test/moves/tidy_up.test.ts +++ b/test/moves/tidy_up.test.ts @@ -3,7 +3,7 @@ import { ArenaTagType } from "#app/enums/arena-tag-type"; import { MoveEndPhase } from "#app/phases/move-end-phase"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/torment.test.ts b/test/moves/torment.test.ts index 94ac8f693ab..97ad1fb1331 100644 --- a/test/moves/torment.test.ts +++ b/test/moves/torment.test.ts @@ -1,4 +1,4 @@ -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { AbilityId } from "#enums/ability-id"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/toxic.test.ts b/test/moves/toxic.test.ts index 332e6ea187e..193608856df 100644 --- a/test/moves/toxic.test.ts +++ b/test/moves/toxic.test.ts @@ -1,4 +1,4 @@ -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/toxic_spikes.test.ts b/test/moves/toxic_spikes.test.ts index f1d5c9070f0..6b9aa39e5b2 100644 --- a/test/moves/toxic_spikes.test.ts +++ b/test/moves/toxic_spikes.test.ts @@ -4,7 +4,7 @@ import type { SessionSaveData } from "#app/system/game-data"; import { decrypt, encrypt, GameData } from "#app/system/game-data"; import { AbilityId } from "#enums/ability-id"; import { ArenaTagType } from "#enums/arena-tag-type"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/transform.test.ts b/test/moves/transform.test.ts index c31bd258a2a..b7cd169a224 100644 --- a/test/moves/transform.test.ts +++ b/test/moves/transform.test.ts @@ -3,7 +3,7 @@ import Phaser from "phaser"; import GameManager from "#test/testUtils/gameManager"; import { Species } from "#enums/species"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Stat, EFFECTIVE_STATS } from "#enums/stat"; import { AbilityId } from "#enums/ability-id"; import { BattlerIndex } from "#app/battle"; diff --git a/test/moves/trick_or_treat.test.ts b/test/moves/trick_or_treat.test.ts index 8d53b6dd9dd..dc6e4a24a5d 100644 --- a/test/moves/trick_or_treat.test.ts +++ b/test/moves/trick_or_treat.test.ts @@ -1,5 +1,5 @@ import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { PokemonType } from "#enums/pokemon-type"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/triple_arrows.test.ts b/test/moves/triple_arrows.test.ts index f9d7a68fbfa..6335b1abe2f 100644 --- a/test/moves/triple_arrows.test.ts +++ b/test/moves/triple_arrows.test.ts @@ -1,7 +1,7 @@ import { FlinchAttr, StatStageChangeAttr } from "#app/data/moves/move"; import { allMoves } from "#app/data/data-lists"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import type Move from "#app/data/moves/move"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/u_turn.test.ts b/test/moves/u_turn.test.ts index 242a6e834b0..944cd0ca0d2 100644 --- a/test/moves/u_turn.test.ts +++ b/test/moves/u_turn.test.ts @@ -1,5 +1,5 @@ import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/upper_hand.test.ts b/test/moves/upper_hand.test.ts index ae015931f94..ef94786ff62 100644 --- a/test/moves/upper_hand.test.ts +++ b/test/moves/upper_hand.test.ts @@ -1,7 +1,7 @@ import { BattlerIndex } from "#app/battle"; import { MoveResult } from "#app/field/pokemon"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/whirlwind.test.ts b/test/moves/whirlwind.test.ts index bd5385357b8..d5cdadaf101 100644 --- a/test/moves/whirlwind.test.ts +++ b/test/moves/whirlwind.test.ts @@ -3,7 +3,7 @@ import { Challenges } from "#enums/challenges"; import { PokemonType } from "#enums/pokemon-type"; import { MoveResult } from "#app/field/pokemon"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/wide_guard.test.ts b/test/moves/wide_guard.test.ts index c714f6322b4..f2101350d6b 100644 --- a/test/moves/wide_guard.test.ts +++ b/test/moves/wide_guard.test.ts @@ -3,7 +3,7 @@ import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest import GameManager from "#test/testUtils/gameManager"; import { Species } from "#enums/species"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Stat } from "#enums/stat"; import { BerryPhase } from "#app/phases/berry-phase"; import { CommandPhase } from "#app/phases/command-phase"; diff --git a/test/moves/will_o_wisp.test.ts b/test/moves/will_o_wisp.test.ts index 3eafa256a40..8aba0b5d8be 100644 --- a/test/moves/will_o_wisp.test.ts +++ b/test/moves/will_o_wisp.test.ts @@ -1,6 +1,6 @@ import { BattlerIndex } from "#app/battle"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/mystery-encounter/encounters/absolute-avarice-encounter.test.ts b/test/mystery-encounter/encounters/absolute-avarice-encounter.test.ts index 34d7b0114e4..65c974facdc 100644 --- a/test/mystery-encounter/encounters/absolute-avarice-encounter.test.ts +++ b/test/mystery-encounter/encounters/absolute-avarice-encounter.test.ts @@ -15,7 +15,7 @@ import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encount import { BerryModifier, PokemonHeldItemModifier } from "#app/modifier/modifier"; import { BerryType } from "#enums/berry-type"; import { AbsoluteAvariceEncounter } from "#app/data/mystery-encounters/encounters/absolute-avarice-encounter"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { CommandPhase } from "#app/phases/command-phase"; import { MovePhase } from "#app/phases/move-phase"; import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; diff --git a/test/mystery-encounter/encounters/an-offer-you-cant-refuse-encounter.test.ts b/test/mystery-encounter/encounters/an-offer-you-cant-refuse-encounter.test.ts index 7d9b93ea42e..911e56de5e9 100644 --- a/test/mystery-encounter/encounters/an-offer-you-cant-refuse-encounter.test.ts +++ b/test/mystery-encounter/encounters/an-offer-you-cant-refuse-encounter.test.ts @@ -14,7 +14,7 @@ import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils"; import { getPokemonSpecies } from "#app/data/pokemon-species"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { ShinyRateBoosterModifier } from "#app/modifier/modifier"; import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; import i18next from "i18next"; diff --git a/test/mystery-encounter/encounters/bug-type-superfan-encounter.test.ts b/test/mystery-encounter/encounters/bug-type-superfan-encounter.test.ts index c7a5b4de93d..a2a0ba01a00 100644 --- a/test/mystery-encounter/encounters/bug-type-superfan-encounter.test.ts +++ b/test/mystery-encounter/encounters/bug-type-superfan-encounter.test.ts @@ -9,7 +9,7 @@ import { runSelectMysteryEncounterOption, skipBattleRunMysteryEncounterRewardsPhase, } from "#test/mystery-encounter/encounter-test-utils"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import type BattleScene from "#app/battle-scene"; import { PokemonMove } from "#app/field/pokemon"; import { UiMode } from "#enums/ui-mode"; diff --git a/test/mystery-encounter/encounters/clowning-around-encounter.test.ts b/test/mystery-encounter/encounters/clowning-around-encounter.test.ts index ffa7655dd48..8f7fc982dae 100644 --- a/test/mystery-encounter/encounters/clowning-around-encounter.test.ts +++ b/test/mystery-encounter/encounters/clowning-around-encounter.test.ts @@ -12,7 +12,7 @@ import { runMysteryEncounterToEnd, skipBattleRunMysteryEncounterRewardsPhase, } from "#test/mystery-encounter/encounter-test-utils"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import type BattleScene from "#app/battle-scene"; import type Pokemon from "#app/field/pokemon"; import { PokemonMove } from "#app/field/pokemon"; diff --git a/test/mystery-encounter/encounters/dancing-lessons-encounter.test.ts b/test/mystery-encounter/encounters/dancing-lessons-encounter.test.ts index 4c5d9af6541..9352841f79b 100644 --- a/test/mystery-encounter/encounters/dancing-lessons-encounter.test.ts +++ b/test/mystery-encounter/encounters/dancing-lessons-encounter.test.ts @@ -13,7 +13,7 @@ import type BattleScene from "#app/battle-scene"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { DancingLessonsEncounter } from "#app/data/mystery-encounters/encounters/dancing-lessons-encounter"; import { UiMode } from "#enums/ui-mode"; import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; diff --git a/test/mystery-encounter/encounters/field-trip-encounter.test.ts b/test/mystery-encounter/encounters/field-trip-encounter.test.ts index 5f3bc6fe672..119d6006de3 100644 --- a/test/mystery-encounter/encounters/field-trip-encounter.test.ts +++ b/test/mystery-encounter/encounters/field-trip-encounter.test.ts @@ -10,7 +10,7 @@ import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters"; import { FieldTripEncounter } from "#app/data/mystery-encounters/encounters/field-trip-encounter"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; import { UiMode } from "#enums/ui-mode"; import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; diff --git a/test/mystery-encounter/encounters/fiery-fallout-encounter.test.ts b/test/mystery-encounter/encounters/fiery-fallout-encounter.test.ts index 31a1257cf14..94f21add273 100644 --- a/test/mystery-encounter/encounters/fiery-fallout-encounter.test.ts +++ b/test/mystery-encounter/encounters/fiery-fallout-encounter.test.ts @@ -14,7 +14,7 @@ import { runSelectMysteryEncounterOption, skipBattleRunMysteryEncounterRewardsPhase, } from "#test/mystery-encounter/encounter-test-utils"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import type BattleScene from "#app/battle-scene"; import { AttackTypeBoosterModifier, PokemonHeldItemModifier } from "#app/modifier/modifier"; import { PokemonType } from "#enums/pokemon-type"; diff --git a/test/mystery-encounter/encounters/fight-or-flight-encounter.test.ts b/test/mystery-encounter/encounters/fight-or-flight-encounter.test.ts index ad264ecdb9d..609896c5912 100644 --- a/test/mystery-encounter/encounters/fight-or-flight-encounter.test.ts +++ b/test/mystery-encounter/encounters/fight-or-flight-encounter.test.ts @@ -9,7 +9,7 @@ import { runSelectMysteryEncounterOption, skipBattleRunMysteryEncounterRewardsPhase, } from "#test/mystery-encounter/encounter-test-utils"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import type BattleScene from "#app/battle-scene"; import { PokemonMove } from "#app/field/pokemon"; import { UiMode } from "#enums/ui-mode"; diff --git a/test/mystery-encounter/encounters/fun-and-games-encounter.test.ts b/test/mystery-encounter/encounters/fun-and-games-encounter.test.ts index 86274cea5fc..62efc3324e1 100644 --- a/test/mystery-encounter/encounters/fun-and-games-encounter.test.ts +++ b/test/mystery-encounter/encounters/fun-and-games-encounter.test.ts @@ -21,7 +21,7 @@ import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases"; import { CommandPhase } from "#app/phases/command-phase"; import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; import { FunAndGamesEncounter } from "#app/data/mystery-encounters/encounters/fun-and-games-encounter"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Command } from "#app/ui/command-ui-handler"; import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils"; diff --git a/test/mystery-encounter/encounters/part-timer-encounter.test.ts b/test/mystery-encounter/encounters/part-timer-encounter.test.ts index a6c6476e4e6..dc6f6e4e7a3 100644 --- a/test/mystery-encounter/encounters/part-timer-encounter.test.ts +++ b/test/mystery-encounter/encounters/part-timer-encounter.test.ts @@ -15,7 +15,7 @@ import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import { PartTimerEncounter } from "#app/data/mystery-encounters/encounters/part-timer-encounter"; import { PokemonMove } from "#app/field/pokemon"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases"; const namespace = "mysteryEncounters/partTimer"; diff --git a/test/mystery-encounter/encounters/the-strong-stuff-encounter.test.ts b/test/mystery-encounter/encounters/the-strong-stuff-encounter.test.ts index c0a0b2d399d..8663a444d2d 100644 --- a/test/mystery-encounter/encounters/the-strong-stuff-encounter.test.ts +++ b/test/mystery-encounter/encounters/the-strong-stuff-encounter.test.ts @@ -11,7 +11,7 @@ import { runMysteryEncounterToEnd, skipBattleRunMysteryEncounterRewardsPhase, } from "#test/mystery-encounter/encounter-test-utils"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import type BattleScene from "#app/battle-scene"; import { TheStrongStuffEncounter } from "#app/data/mystery-encounters/encounters/the-strong-stuff-encounter"; import { Nature } from "#enums/nature"; diff --git a/test/mystery-encounter/encounters/the-winstrate-challenge-encounter.test.ts b/test/mystery-encounter/encounters/the-winstrate-challenge-encounter.test.ts index f2c428f1ada..ccec2cff6c2 100644 --- a/test/mystery-encounter/encounters/the-winstrate-challenge-encounter.test.ts +++ b/test/mystery-encounter/encounters/the-winstrate-challenge-encounter.test.ts @@ -16,7 +16,7 @@ import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; import MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; import { TrainerType } from "#enums/trainer-type"; import { Nature } from "#enums/nature"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { getPokemonSpecies } from "#app/data/pokemon-species"; import { TheWinstrateChallengeEncounter } from "#app/data/mystery-encounters/encounters/the-winstrate-challenge-encounter"; import { Status } from "#app/data/status-effect"; diff --git a/test/mystery-encounter/encounters/trash-to-treasure-encounter.test.ts b/test/mystery-encounter/encounters/trash-to-treasure-encounter.test.ts index b6e6dd46962..dbb1d888109 100644 --- a/test/mystery-encounter/encounters/trash-to-treasure-encounter.test.ts +++ b/test/mystery-encounter/encounters/trash-to-treasure-encounter.test.ts @@ -22,7 +22,7 @@ import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; import { UiMode } from "#enums/ui-mode"; import * as Utils from "#app/utils/common"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import { diff --git a/test/mystery-encounter/encounters/uncommon-breed-encounter.test.ts b/test/mystery-encounter/encounters/uncommon-breed-encounter.test.ts index b09b8429880..66493549a85 100644 --- a/test/mystery-encounter/encounters/uncommon-breed-encounter.test.ts +++ b/test/mystery-encounter/encounters/uncommon-breed-encounter.test.ts @@ -8,7 +8,7 @@ import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption, } from "#test/mystery-encounter/encounter-test-utils"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import type BattleScene from "#app/battle-scene"; import { PokemonMove } from "#app/field/pokemon"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; diff --git a/test/phases/form-change-phase.test.ts b/test/phases/form-change-phase.test.ts index 409a9e54788..3b98e1d95e9 100644 --- a/test/phases/form-change-phase.test.ts +++ b/test/phases/form-change-phase.test.ts @@ -1,5 +1,5 @@ import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/phases/frenzy-move-reset.test.ts b/test/phases/frenzy-move-reset.test.ts index 9ecd904f01c..fc38994a328 100644 --- a/test/phases/frenzy-move-reset.test.ts +++ b/test/phases/frenzy-move-reset.test.ts @@ -2,7 +2,7 @@ import { BattlerIndex } from "#app/battle"; import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#enums/battler-tag-type"; import { StatusEffect } from "#enums/status-effect"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/phases/game-over-phase.test.ts b/test/phases/game-over-phase.test.ts index c1fd25634cb..0b211997cc8 100644 --- a/test/phases/game-over-phase.test.ts +++ b/test/phases/game-over-phase.test.ts @@ -1,6 +1,6 @@ import { Biome } from "#enums/biome"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/phases/learn-move-phase.test.ts b/test/phases/learn-move-phase.test.ts index 4d81d46533e..989d8cfa806 100644 --- a/test/phases/learn-move-phase.test.ts +++ b/test/phases/learn-move-phase.test.ts @@ -2,7 +2,7 @@ import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; import Phaser from "phaser"; import GameManager from "#test/testUtils/gameManager"; import { Species } from "#enums/species"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { LearnMovePhase } from "#app/phases/learn-move-phase"; import { UiMode } from "#enums/ui-mode"; import { Button } from "#app/enums/buttons"; diff --git a/test/phases/select-modifier-phase.test.ts b/test/phases/select-modifier-phase.test.ts index 645ba0b5fb8..317fa387895 100644 --- a/test/phases/select-modifier-phase.test.ts +++ b/test/phases/select-modifier-phase.test.ts @@ -10,7 +10,7 @@ import { UiMode } from "#enums/ui-mode"; import { shiftCharCodes } from "#app/utils/common"; import { AbilityId } from "#enums/ability-id"; import { Button } from "#enums/buttons"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils"; diff --git a/test/reload.test.ts b/test/reload.test.ts index de71c75c9bb..88e8a56937a 100644 --- a/test/reload.test.ts +++ b/test/reload.test.ts @@ -4,7 +4,7 @@ import type OptionSelectUiHandler from "#app/ui/settings/option-select-ui-handle import { UiMode } from "#enums/ui-mode"; import { Biome } from "#enums/biome"; import { Button } from "#enums/buttons"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import type { MockClock } from "#test/testUtils/mocks/mockClock"; diff --git a/test/system/game_data.test.ts b/test/system/game_data.test.ts index 20e73796464..b9011cd934f 100644 --- a/test/system/game_data.test.ts +++ b/test/system/game_data.test.ts @@ -2,7 +2,7 @@ import * as bypassLoginModule from "#app/global-vars/bypass-login"; import { pokerogueApi } from "#app/plugins/api/pokerogue-api"; import type { SessionSaveData } from "#app/system/game-data"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/testUtils/gameManagerUtils.ts b/test/testUtils/gameManagerUtils.ts index 16339fe8b4e..db2f82a8751 100644 --- a/test/testUtils/gameManagerUtils.ts +++ b/test/testUtils/gameManagerUtils.ts @@ -8,7 +8,7 @@ import { PlayerPokemon } from "#app/field/pokemon"; import { GameModes, getGameMode } from "#app/game-mode"; import type { StarterMoveset } from "#app/system/game-data"; import type { Starter } from "#app/ui/starter-select-ui-handler"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import type { Species } from "#enums/species"; /** Function to convert Blob to string */ diff --git a/test/testUtils/helpers/moveHelper.ts b/test/testUtils/helpers/moveHelper.ts index 5bbfeb84b0a..02b1efd837f 100644 --- a/test/testUtils/helpers/moveHelper.ts +++ b/test/testUtils/helpers/moveHelper.ts @@ -7,7 +7,7 @@ import type { CommandPhase } from "#app/phases/command-phase"; import type { EnemyCommandPhase } from "#app/phases/enemy-command-phase"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { Command } from "#app/ui/command-ui-handler"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import { UiMode } from "#enums/ui-mode"; import { getMovePosition } from "#test/testUtils/gameManagerUtils"; import { GameManagerHelper } from "#test/testUtils/helpers/gameManagerHelper"; diff --git a/test/testUtils/helpers/overridesHelper.ts b/test/testUtils/helpers/overridesHelper.ts index 7946a484814..240aa4da7d6 100644 --- a/test/testUtils/helpers/overridesHelper.ts +++ b/test/testUtils/helpers/overridesHelper.ts @@ -6,7 +6,7 @@ import type { BattleStyle } from "#app/overrides"; import Overrides, { defaultOverrides } from "#app/overrides"; import type { Unlockables } from "#app/system/unlockables"; import { Biome } from "#enums/biome"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import type { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import type { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { Species } from "#enums/species"; diff --git a/test/ui/battle_info.test.ts b/test/ui/battle_info.test.ts index 2320779bdc1..f66e021289d 100644 --- a/test/ui/battle_info.test.ts +++ b/test/ui/battle_info.test.ts @@ -2,7 +2,7 @@ import { ExpGainsSpeed } from "#app/enums/exp-gains-speed"; import { Species } from "#app/enums/species"; import { ExpPhase } from "#app/phases/exp-phase"; import { AbilityId } from "#enums/ability-id"; -import { MoveId } from "#enums/moves"; +import { MoveId } from "#enums/move-id"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/ui/transfer-item.test.ts b/test/ui/transfer-item.test.ts index 9c92828fc4a..d80e1e481e0 100644 --- a/test/ui/transfer-item.test.ts +++ b/test/ui/transfer-item.test.ts @@ -1,6 +1,6 @@ import { BerryType } from "#app/enums/berry-type"; import { Button } from "#app/enums/buttons"; -import { MoveId } from "#app/enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#app/enums/species"; import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; import PartyUiHandler, { PartyUiMode } from "#app/ui/party-ui-handler"; diff --git a/test/ui/type-hints.test.ts b/test/ui/type-hints.test.ts index 53c9d36a09a..6facfda4509 100644 --- a/test/ui/type-hints.test.ts +++ b/test/ui/type-hints.test.ts @@ -1,5 +1,5 @@ import { Button } from "#app/enums/buttons"; -import { MoveId } from "#app/enums/moves"; +import { MoveId } from "#enums/move-id"; import { Species } from "#app/enums/species"; import { CommandPhase } from "#app/phases/command-phase"; import FightUiHandler from "#app/ui/fight-ui-handler";