diff --git a/src/data/abilities/ability-class.ts b/src/data/abilities/ability-class.ts index cc476468693..9da83a32c4d 100644 --- a/src/data/abilities/ability-class.ts +++ b/src/data/abilities/ability-class.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import type { AbAttrCondition } from "#app/@types/ability-types"; import type { AbAttr } from "#app/data/abilities/ab-attrs/ab-attr"; import i18next from "i18next"; diff --git a/src/data/abilities/ability.ts b/src/data/abilities/ability.ts index 9b82c8a3dfa..1ba61a2b931 100644 --- a/src/data/abilities/ability.ts +++ b/src/data/abilities/ability.ts @@ -5,20 +5,20 @@ import { BattlerTagLapseType, GroundedTag } from "#app/data/battler-tags"; import { getNonVolatileStatusEffects, getStatusEffectDescriptor, getStatusEffectHealText } from "#app/data/status-effect"; import { Gender } from "#app/data/gender"; import { - AttackMove, - FlinchAttr, - OneHitKOAttr, - HitHealAttr, - StatusMove, - SelfStatusMove, - VariablePowerAttr, - applyMoveAttrs, - RandomMovesetMoveAttr, - RandomMoveAttr, - NaturePowerAttr, - CopyMoveAttr, - NeutralDamageAgainstFlyingTypeMultiplierAttr, - FixedDamageAttr, + AttackMove, + FlinchAttr, + OneHitKOAttr, + HitHealAttr, + StatusMove, + SelfStatusMove, + VariablePowerAttr, + applyMoveAttrs, + RandomMovesetMoveAttr, + RandomMoveAttr, + NaturePowerAttr, + CopyMoveAttr, + NeutralDamageAgainstFlyingTypeMultiplierAttr, + FixedDamageAttr, } from "#app/data/moves/move"; import { allMoves } from "../data-lists"; import { ArenaTagSide } from "#app/data/arena-tag"; @@ -50,7 +50,7 @@ import { PokemonType } from "#enums/pokemon-type"; import { PokemonAnimType } from "#enums/pokemon-anim-type"; import { StatusEffect } from "#enums/status-effect"; import { WeatherType } from "#enums/weather-type"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { ArenaTagType } from "#enums/arena-tag-type"; import { BattlerTagType } from "#enums/battler-tag-type"; import { Moves } from "#enums/moves"; diff --git a/src/data/arena-tag.ts b/src/data/arena-tag.ts index 3ec45e00aa8..c7c9e47de9f 100644 --- a/src/data/arena-tag.ts +++ b/src/data/arena-tag.ts @@ -22,7 +22,7 @@ import { import { Stat } from "#enums/stat"; import { CommonAnim, CommonBattleAnim } from "#app/data/battle-anims"; import i18next from "i18next"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { ArenaTagType } from "#enums/arena-tag-type"; import { BattlerTagType } from "#enums/battler-tag-type"; import { Moves } from "#enums/moves"; diff --git a/src/data/balance/passives.ts b/src/data/balance/passives.ts index 13158936692..958462ebca6 100644 --- a/src/data/balance/passives.ts +++ b/src/data/balance/passives.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#app/enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Species } from "#app/enums/species"; export interface PassiveAbilities { diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts index 40024ea27bb..b9795ab5a85 100644 --- a/src/data/battler-tags.ts +++ b/src/data/battler-tags.ts @@ -35,7 +35,7 @@ import type { StatStageChangeCallback } from "#app/phases/stat-stage-change-phas import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase"; import i18next from "#app/plugins/i18n"; import { BooleanHolder, getFrameMs, NumberHolder, toDmgValue } from "#app/utils/common"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#enums/battler-tag-type"; import { Moves } from "#enums/moves"; import { PokemonAnimType } from "#enums/pokemon-anim-type"; diff --git a/src/data/custom-pokemon-data.ts b/src/data/custom-pokemon-data.ts index a3aee3bbf96..252e302ccf3 100644 --- a/src/data/custom-pokemon-data.ts +++ b/src/data/custom-pokemon-data.ts @@ -1,4 +1,4 @@ -import type { AbilityId } from "#enums/abilities"; +import type { AbilityId } from "#enums/ability-id"; import type { PokemonType } from "#enums/pokemon-type"; import type { Nature } from "#enums/nature"; diff --git a/src/data/moves/move.ts b/src/data/moves/move.ts index 938086d7421..036441b8910 100644 --- a/src/data/moves/move.ts +++ b/src/data/moves/move.ts @@ -1,31 +1,31 @@ import { ChargeAnim, MoveChargeAnim } from "../battle-anims"; import { - CommandedTag, - EncoreTag, - GulpMissileTag, - HelpingHandTag, - SemiInvulnerableTag, - ShellTrapTag, - StockpilingTag, - SubstituteTag, - TrappedTag, - TypeBoostTag, + CommandedTag, + EncoreTag, + GulpMissileTag, + HelpingHandTag, + SemiInvulnerableTag, + ShellTrapTag, + StockpilingTag, + SubstituteTag, + TrappedTag, + TypeBoostTag, } from "../battler-tags"; import { getPokemonNameWithAffix } from "../../messages"; import type { AttackMoveResult, TurnMove } from "../../field/pokemon"; import type Pokemon from "../../field/pokemon"; import { - EnemyPokemon, - FieldPosition, - HitResult, - MoveResult, - PlayerPokemon, - PokemonMove, + EnemyPokemon, + FieldPosition, + HitResult, + MoveResult, + PlayerPokemon, + PokemonMove, } from "../../field/pokemon"; import { - getNonVolatileStatusEffects, - getStatusEffectHealText, - isNonVolatileStatusEffect, + getNonVolatileStatusEffects, + getStatusEffectHealText, + isNonVolatileStatusEffect, } from "../status-effect"; import { getTypeDamageMultiplier } from "../type"; import { PokemonType } from "#enums/pokemon-type"; @@ -34,46 +34,46 @@ import { WeatherType } from "#enums/weather-type"; import type { ArenaTrapTag } from "../arena-tag"; import { ArenaTagSide, WeakenMoveTypeTag } from "../arena-tag"; import { - AllyMoveCategoryPowerBoostAbAttr, - applyAbAttrs, - applyPostAttackAbAttrs, - applyPostItemLostAbAttrs, - applyPreAttackAbAttrs, - applyPreDefendAbAttrs, - BlockItemTheftAbAttr, - BlockNonDirectDamageAbAttr, - BlockOneHitKOAbAttr, - BlockRecoilDamageAttr, - ChangeMovePriorityAbAttr, - ConfusionOnStatusEffectAbAttr, - FieldMoveTypePowerBoostAbAttr, - FieldPreventExplosiveMovesAbAttr, - ForceSwitchOutImmunityAbAttr, - HealFromBerryUseAbAttr, - IgnoreContactAbAttr, - IgnoreMoveEffectsAbAttr, - IgnoreProtectOnContactAbAttr, - InfiltratorAbAttr, - MaxMultiHitAbAttr, - MoveAbilityBypassAbAttr, - MoveEffectChanceMultiplierAbAttr, - MoveTypeChangeAbAttr, - PostDamageForceSwitchAbAttr, - PostItemLostAbAttr, - ReflectStatusMoveAbAttr, - ReverseDrainAbAttr, - UserFieldMoveTypePowerBoostAbAttr, - VariableMovePowerAbAttr, - WonderSkinAbAttr, + AllyMoveCategoryPowerBoostAbAttr, + applyAbAttrs, + applyPostAttackAbAttrs, + applyPostItemLostAbAttrs, + applyPreAttackAbAttrs, + applyPreDefendAbAttrs, + BlockItemTheftAbAttr, + BlockNonDirectDamageAbAttr, + BlockOneHitKOAbAttr, + BlockRecoilDamageAttr, + ChangeMovePriorityAbAttr, + ConfusionOnStatusEffectAbAttr, + FieldMoveTypePowerBoostAbAttr, + FieldPreventExplosiveMovesAbAttr, + ForceSwitchOutImmunityAbAttr, + HealFromBerryUseAbAttr, + IgnoreContactAbAttr, + IgnoreMoveEffectsAbAttr, + IgnoreProtectOnContactAbAttr, + InfiltratorAbAttr, + MaxMultiHitAbAttr, + MoveAbilityBypassAbAttr, + MoveEffectChanceMultiplierAbAttr, + MoveTypeChangeAbAttr, + PostDamageForceSwitchAbAttr, + PostItemLostAbAttr, + ReflectStatusMoveAbAttr, + ReverseDrainAbAttr, + UserFieldMoveTypePowerBoostAbAttr, + VariableMovePowerAbAttr, + WonderSkinAbAttr, } from "../abilities/ability"; import { allAbilities, allMoves } from "../data-lists"; import { - AttackTypeBoosterModifier, - BerryModifier, - PokemonHeldItemModifier, - PokemonMoveAccuracyBoosterModifier, - PokemonMultiHitModifier, - PreserveBerryModifier, + AttackTypeBoosterModifier, + BerryModifier, + PokemonHeldItemModifier, + PokemonMoveAccuracyBoosterModifier, + PokemonMultiHitModifier, + PreserveBerryModifier, } from "../../modifier/modifier"; import type { BattlerIndex } from "../../battle"; import { BattleType } from "#enums/battle-type"; @@ -83,7 +83,7 @@ import { Command } from "../../ui/command-ui-handler"; import i18next from "i18next"; import type { Localizable } from "#app/interfaces/locales"; import { getBerryEffectFunc } from "../berry"; -import { AbilityId } from "#enums/abilities"; +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"; @@ -91,11 +91,11 @@ import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { MoveUsedEvent } from "#app/events/battle-scene"; import { - BATTLE_STATS, - type BattleStat, - type EffectiveStat, - getStatKey, - Stat, + BATTLE_STATS, + type BattleStat, + type EffectiveStat, + getStatKey, + Stat, } from "#app/enums/stat"; import { BattleEndPhase } from "#app/phases/battle-end-phase"; import { MoveEndPhase } from "#app/phases/move-end-phase"; diff --git a/src/data/mystery-encounters/encounters/clowning-around-encounter.ts b/src/data/mystery-encounters/encounters/clowning-around-encounter.ts index 8ad17a5039e..bace0d82dda 100644 --- a/src/data/mystery-encounters/encounters/clowning-around-encounter.ts +++ b/src/data/mystery-encounters/encounters/clowning-around-encounter.ts @@ -23,7 +23,7 @@ import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import { Species } from "#enums/species"; import { TrainerType } from "#enums/trainer-type"; import { getPokemonSpecies } from "#app/data/pokemon-species"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { applyAbilityOverrideToPokemon, applyModifierTypeToPlayerPokemon, diff --git a/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts b/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts index 5fc2e219ae3..e3bdfe3ec40 100644 --- a/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts +++ b/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts @@ -42,7 +42,7 @@ import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { EncounterAnim } from "#enums/encounter-anims"; import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#enums/battler-tag-type"; import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase"; import { Stat } from "#enums/stat"; diff --git a/src/data/mystery-encounters/encounters/the-pokemon-salesman-encounter.ts b/src/data/mystery-encounters/encounters/the-pokemon-salesman-encounter.ts index 4a4d63d4f1f..7554cf9f2ef 100644 --- a/src/data/mystery-encounters/encounters/the-pokemon-salesman-encounter.ts +++ b/src/data/mystery-encounters/encounters/the-pokemon-salesman-encounter.ts @@ -27,7 +27,7 @@ import PokemonData from "#app/system/pokemon-data"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { NON_LEGEND_PARADOX_POKEMON, NON_LEGEND_ULTRA_BEASTS } from "#app/data/balance/special-species-groups"; import { timedEventManager } from "#app/global-event-manager"; 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 f8780bfbaae..37c77741f6e 100644 --- a/src/data/mystery-encounters/encounters/the-winstrate-challenge-encounter.ts +++ b/src/data/mystery-encounters/encounters/the-winstrate-challenge-encounter.ts @@ -16,7 +16,7 @@ import { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-en import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import { TrainerType } from "#enums/trainer-type"; import { Species } from "#enums/species"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { getPokemonSpecies } from "#app/data/pokemon-species"; import { Moves } from "#enums/moves"; import { Nature } from "#enums/nature"; diff --git a/src/data/mystery-encounters/mystery-encounter-requirements.ts b/src/data/mystery-encounters/mystery-encounter-requirements.ts index f4a3d94f1fb..c727b61b55c 100644 --- a/src/data/mystery-encounters/mystery-encounter-requirements.ts +++ b/src/data/mystery-encounters/mystery-encounter-requirements.ts @@ -10,7 +10,7 @@ import type { PlayerPokemon } from "#app/field/pokemon"; 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/abilities"; +import type { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import type { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { Species } from "#enums/species"; diff --git a/src/data/mystery-encounters/requirements/requirement-groups.ts b/src/data/mystery-encounters/requirements/requirement-groups.ts index 1eb18cbf490..e429be64c19 100644 --- a/src/data/mystery-encounters/requirements/requirement-groups.ts +++ b/src/data/mystery-encounters/requirements/requirement-groups.ts @@ -1,5 +1,5 @@ import { Moves } from "#enums/moves"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; /** * Moves that "steal" things diff --git a/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts b/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts index 176f8b7c267..7410e70ea80 100644 --- a/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts +++ b/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts @@ -35,7 +35,7 @@ import type { PermanentStat } from "#enums/stat"; import { VictoryPhase } from "#app/phases/victory-phase"; import { SummaryUiMode } from "#app/ui/summary-ui-handler"; import { CustomPokemonData } from "#app/data/custom-pokemon-data"; -import type { AbilityId } from "#enums/abilities"; +import type { AbilityId } from "#enums/ability-id"; import type { PokeballType } from "#enums/pokeball"; import { StatusEffect } from "#enums/status-effect"; diff --git a/src/data/pokemon-forms.ts b/src/data/pokemon-forms.ts index 6075f026bca..af2e5a20439 100644 --- a/src/data/pokemon-forms.ts +++ b/src/data/pokemon-forms.ts @@ -4,7 +4,7 @@ import { StatusEffect } from "#enums/status-effect"; import { allMoves } from "./data-lists"; import { MoveCategory } from "#enums/MoveCategory"; import type { Constructor, nil } from "#app/utils/common"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import type { TimeOfDay } from "#enums/time-of-day"; diff --git a/src/data/pokemon-species.ts b/src/data/pokemon-species.ts index 5dab30dd218..558d1f7101f 100644 --- a/src/data/pokemon-species.ts +++ b/src/data/pokemon-species.ts @@ -1,5 +1,5 @@ import type { Localizable } from "#app/interfaces/locales"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { PartyMemberStrength } from "#enums/party-member-strength"; import { Species } from "#enums/species"; import { QuantizerCelebi, argbFromRgba, rgbaFromArgb } from "@material/material-color-utilities"; diff --git a/src/data/trainers/trainer-config.ts b/src/data/trainers/trainer-config.ts index 24857e84d8d..0f1660c4c4c 100644 --- a/src/data/trainers/trainer-config.ts +++ b/src/data/trainers/trainer-config.ts @@ -27,7 +27,7 @@ import { Species } from "#enums/species"; import { PokeballType } from "#enums/pokeball"; import { PokemonType } from "#enums/pokemon-type"; import { Moves } from "#enums/moves"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { TeraAIMode } from "#enums/tera-ai-mode"; import { TrainerPoolTier } from "#enums/trainer-pool-tier"; import { TrainerSlot } from "#enums/trainer-slot"; diff --git a/src/enums/abilities.ts b/src/enums/ability-id.ts similarity index 100% rename from src/enums/abilities.ts rename to src/enums/ability-id.ts diff --git a/src/field/arena.ts b/src/field/arena.ts index ffc09d402e6..1e281ebc643 100644 --- a/src/field/arena.ts +++ b/src/field/arena.ts @@ -36,7 +36,7 @@ import type { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { TimeOfDay } from "#enums/time-of-day"; import { TrainerType } from "#enums/trainer-type"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { SpeciesFormChangeRevertWeatherFormTrigger, SpeciesFormChangeWeatherTrigger } from "#app/data/pokemon-forms"; import { CommonAnimPhase } from "#app/phases/common-anim-phase"; import { WeatherType } from "#enums/weather-type"; diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 1ae8926a20f..fe2bb5d148b 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -220,7 +220,7 @@ import i18next from "i18next"; import { speciesEggMoves } from "#app/data/balance/egg-moves"; import { ModifierTier } from "#app/modifier/modifier-tier"; import { applyChallenges, ChallengeType } from "#app/data/challenge"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { ArenaTagType } from "#enums/arena-tag-type"; import { BattleSpec } from "#enums/battle-spec"; import { BattlerTagType } from "#enums/battler-tag-type"; diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts index 2213113e6c2..423453d5408 100644 --- a/src/modifier/modifier-type.ts +++ b/src/modifier/modifier-type.ts @@ -116,7 +116,7 @@ import { padInt, randSeedInt, } from "#app/utils/common"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#enums/battler-tag-type"; import { BerryType } from "#enums/berry-type"; import { Moves } from "#enums/moves"; diff --git a/src/overrides.ts b/src/overrides.ts index cee0a187471..7219f2b0ed6 100644 --- a/src/overrides.ts +++ b/src/overrides.ts @@ -5,7 +5,7 @@ import { FormChangeItem } from "#app/data/pokemon-forms"; import { type ModifierOverride } from "#app/modifier/modifier-type"; import { Variant } from "#app/sprites/variant"; import { Unlockables } from "#app/system/unlockables"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { BattleType } from "#enums/battle-type"; import { BerryType } from "#enums/berry-type"; import { Biome } from "#enums/biome"; diff --git a/src/phases/command-phase.ts b/src/phases/command-phase.ts index b96afdb58a6..d0edf7f2712 100644 --- a/src/phases/command-phase.ts +++ b/src/phases/command-phase.ts @@ -6,7 +6,7 @@ import { TrappedTag } from "#app/data/battler-tags"; import type { MoveTargetSet } from "#app/data/moves/move"; import { getMoveTargets } from "#app/data/moves/move"; import { speciesStarterCosts } from "#app/data/balance/starters"; -import { AbilityId } from "#app/enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#app/enums/battler-tag-type"; import { Biome } from "#app/enums/biome"; import { Moves } from "#app/enums/moves"; diff --git a/src/phases/enemy-command-phase.ts b/src/phases/enemy-command-phase.ts index 9ff1a7b7211..2a1719f9002 100644 --- a/src/phases/enemy-command-phase.ts +++ b/src/phases/enemy-command-phase.ts @@ -2,7 +2,7 @@ import { globalScene } from "#app/global-scene"; import { BattlerIndex } from "#app/battle"; import { Command } from "#app/ui/command-ui-handler"; import { FieldPhase } from "./field-phase"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#enums/battler-tag-type"; /** diff --git a/src/phases/move-phase.ts b/src/phases/move-phase.ts index 4147365f05e..ccddaf3c857 100644 --- a/src/phases/move-phase.ts +++ b/src/phases/move-phase.ts @@ -44,7 +44,7 @@ import { MoveChargePhase } from "#app/phases/move-charge-phase"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { MoveEndPhase } from "#app/phases/move-end-phase"; import { NumberHolder } from "#app/utils/common"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { ArenaTagType } from "#enums/arena-tag-type"; import { BattlerTagType } from "#enums/battler-tag-type"; import { Moves } from "#enums/moves"; diff --git a/src/phases/turn-start-phase.ts b/src/phases/turn-start-phase.ts index 6ce1b11e6d5..a02d869af10 100644 --- a/src/phases/turn-start-phase.ts +++ b/src/phases/turn-start-phase.ts @@ -1,7 +1,7 @@ import { applyAbAttrs, BypassSpeedChanceAbAttr, PreventBypassSpeedChanceAbAttr } from "#app/data/abilities/ability"; import { MoveHeaderAttr } from "#app/data/moves/move"; import { allMoves } from "#app/data/data-lists"; -import { AbilityId } from "#app/enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Stat } from "#app/enums/stat"; import type Pokemon from "#app/field/pokemon"; import { PokemonMove } from "#app/field/pokemon"; diff --git a/src/ui/pokedex-page-ui-handler.ts b/src/ui/pokedex-page-ui-handler.ts index b4e3cf77d9d..e3348a3f794 100644 --- a/src/ui/pokedex-page-ui-handler.ts +++ b/src/ui/pokedex-page-ui-handler.ts @@ -60,7 +60,7 @@ import type { BiomeTierTod } from "#app/data/balance/biomes"; import { BiomePoolTier, catchableSpecies } from "#app/data/balance/biomes"; import { Biome } from "#app/enums/biome"; import { TimeOfDay } from "#app/enums/time-of-day"; -import type { AbilityId } from "#app/enums/abilities"; +import type { AbilityId } from "#enums/ability-id"; import { BaseStatsOverlay } from "#app/ui/base-stats-overlay"; import { globalScene } from "#app/global-scene"; import type BBCodeText from "phaser3-rex-plugins/plugins/gameobjects/tagtext/bbcodetext/BBCodeText"; diff --git a/src/ui/pokedex-ui-handler.ts b/src/ui/pokedex-ui-handler.ts index ab101ef3a47..7d52bc9fdd3 100644 --- a/src/ui/pokedex-ui-handler.ts +++ b/src/ui/pokedex-ui-handler.ts @@ -26,7 +26,7 @@ import { PokedexMonContainer } from "#app/ui/pokedex-mon-container"; import { FilterBar } from "#app/ui/filter-bar"; import { DropDownColumn } from "#enums/drop-down-column"; import { ScrollBar } from "#app/ui/scroll-bar"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { getPassiveCandyCount, getValueReductionCandyCounts, diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/starter-select-ui-handler.ts index c8e28b34726..ca01df0775e 100644 --- a/src/ui/starter-select-ui-handler.ts +++ b/src/ui/starter-select-ui-handler.ts @@ -59,7 +59,7 @@ import { ScrollBar } from "#app/ui/scroll-bar"; import { SelectChallengePhase } from "#app/phases/select-challenge-phase"; import { EncounterPhase } from "#app/phases/encounter-phase"; import { TitlePhase } from "#app/phases/title-phase"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { getPassiveCandyCount, getValueReductionCandyCounts, diff --git a/test/abilities/ability_duplication.test.ts b/test/abilities/ability_duplication.test.ts index cb0912f14f1..38f5a3b1df7 100644 --- a/test/abilities/ability_duplication.test.ts +++ b/test/abilities/ability_duplication.test.ts @@ -1,5 +1,5 @@ import { Stat } from "#app/enums/stat"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/ability_timing.test.ts b/test/abilities/ability_timing.test.ts index ed631a64a6b..266fc959486 100644 --- a/test/abilities/ability_timing.test.ts +++ b/test/abilities/ability_timing.test.ts @@ -3,7 +3,7 @@ import { CommandPhase } from "#app/phases/command-phase"; import { TurnInitPhase } from "#app/phases/turn-init-phase"; import i18next from "#app/plugins/i18n"; import { UiMode } from "#enums/ui-mode"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-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 50bd23b06f8..f1b018cbb24 100644 --- a/test/abilities/analytic.test.ts +++ b/test/abilities/analytic.test.ts @@ -1,6 +1,6 @@ import { BattlerIndex } from "#app/battle"; import { isBetween, toDmgValue } from "#app/utils/common"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/arena_trap.test.ts b/test/abilities/arena_trap.test.ts index fc433cd001c..fd003d7213b 100644 --- a/test/abilities/arena_trap.test.ts +++ b/test/abilities/arena_trap.test.ts @@ -1,5 +1,5 @@ import { allAbilities } from "#app/data/data-lists"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/aroma_veil.test.ts b/test/abilities/aroma_veil.test.ts index cfc75274f29..4b827bb19c0 100644 --- a/test/abilities/aroma_veil.test.ts +++ b/test/abilities/aroma_veil.test.ts @@ -1,6 +1,6 @@ import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/aura_break.test.ts b/test/abilities/aura_break.test.ts index 7be6136b22e..59e31990886 100644 --- a/test/abilities/aura_break.test.ts +++ b/test/abilities/aura_break.test.ts @@ -1,5 +1,5 @@ import { allMoves } from "#app/data/data-lists"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/battery.test.ts b/test/abilities/battery.test.ts index 728deb762e2..e0cc2d2108e 100644 --- a/test/abilities/battery.test.ts +++ b/test/abilities/battery.test.ts @@ -1,5 +1,5 @@ import { allMoves } from "#app/data/data-lists"; -import { AbilityId } from "#app/enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Moves } from "#enums/moves"; diff --git a/test/abilities/battle_bond.test.ts b/test/abilities/battle_bond.test.ts index 233b6eac7fd..7de50b51995 100644 --- a/test/abilities/battle_bond.test.ts +++ b/test/abilities/battle_bond.test.ts @@ -2,7 +2,7 @@ import { MultiHitAttr } from "#app/data/moves/move"; import { allMoves } from "#app/data/data-lists"; import { MultiHitType } from "#enums/MultiHitType"; import { Status } from "#app/data/status-effect"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; diff --git a/test/abilities/beast_boost.test.ts b/test/abilities/beast_boost.test.ts index bf158b9a2a8..a0759a32035 100644 --- a/test/abilities/beast_boost.test.ts +++ b/test/abilities/beast_boost.test.ts @@ -1,5 +1,5 @@ import { BattlerIndex } from "#app/battle"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; diff --git a/test/abilities/commander.test.ts b/test/abilities/commander.test.ts index 05731d84e37..27adf2702ce 100644 --- a/test/abilities/commander.test.ts +++ b/test/abilities/commander.test.ts @@ -6,7 +6,7 @@ import { Stat } from "#enums/stat"; import { StatusEffect } from "#enums/status-effect"; import { WeatherType } from "#enums/weather-type"; import { MoveResult } from "#app/field/pokemon"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/competitive.test.ts b/test/abilities/competitive.test.ts index 957bf73a915..e308cfc671a 100644 --- a/test/abilities/competitive.test.ts +++ b/test/abilities/competitive.test.ts @@ -1,6 +1,6 @@ import { Stat } from "#enums/stat"; import { TurnInitPhase } from "#app/phases/turn-init-phase"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/contrary.test.ts b/test/abilities/contrary.test.ts index cde84622f3d..d5562c6014c 100644 --- a/test/abilities/contrary.test.ts +++ b/test/abilities/contrary.test.ts @@ -1,5 +1,5 @@ import { Moves } from "#app/enums/moves"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/corrosion.test.ts b/test/abilities/corrosion.test.ts index 2e7797b793b..564e49b2484 100644 --- a/test/abilities/corrosion.test.ts +++ b/test/abilities/corrosion.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/costar.test.ts b/test/abilities/costar.test.ts index b101c102d32..aea3fb73b32 100644 --- a/test/abilities/costar.test.ts +++ b/test/abilities/costar.test.ts @@ -1,5 +1,5 @@ import { Stat } from "#enums/stat"; -import { AbilityId } from "#app/enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#app/enums/moves"; import { Species } from "#app/enums/species"; import { CommandPhase } from "#app/phases/command-phase"; diff --git a/test/abilities/cud_chew.test.ts b/test/abilities/cud_chew.test.ts index a143666c539..ac722aea711 100644 --- a/test/abilities/cud_chew.test.ts +++ b/test/abilities/cud_chew.test.ts @@ -2,7 +2,7 @@ import { RepeatBerryNextTurnAbAttr } from "#app/data/abilities/ability"; import Pokemon from "#app/field/pokemon"; import { globalScene } from "#app/global-scene"; import { getPokemonNameWithAffix } from "#app/messages"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { BerryType } from "#enums/berry-type"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; diff --git a/test/abilities/dancer.test.ts b/test/abilities/dancer.test.ts index f7e74992178..d4ff977189b 100644 --- a/test/abilities/dancer.test.ts +++ b/test/abilities/dancer.test.ts @@ -1,6 +1,6 @@ import { BattlerIndex } from "#app/battle"; import type { MovePhase } from "#app/phases/move-phase"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/defiant.test.ts b/test/abilities/defiant.test.ts index d27dd1ed8c6..73025a39e95 100644 --- a/test/abilities/defiant.test.ts +++ b/test/abilities/defiant.test.ts @@ -1,6 +1,6 @@ import { Stat } from "#enums/stat"; import { TurnInitPhase } from "#app/phases/turn-init-phase"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/desolate-land.test.ts b/test/abilities/desolate-land.test.ts index c79da6b1230..82dba211842 100644 --- a/test/abilities/desolate-land.test.ts +++ b/test/abilities/desolate-land.test.ts @@ -2,7 +2,7 @@ import { PokeballType } from "#app/enums/pokeball"; 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/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/disguise.test.ts b/test/abilities/disguise.test.ts index 860941ffe47..ab6d942e703 100644 --- a/test/abilities/disguise.test.ts +++ b/test/abilities/disguise.test.ts @@ -1,6 +1,6 @@ import { BattlerIndex } from "#app/battle"; import { toDmgValue } from "#app/utils/common"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; diff --git a/test/abilities/dry_skin.test.ts b/test/abilities/dry_skin.test.ts index f0e5c0f797e..6c1e9b6d9cb 100644 --- a/test/abilities/dry_skin.test.ts +++ b/test/abilities/dry_skin.test.ts @@ -1,5 +1,5 @@ import { Species } from "#app/enums/species"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/early_bird.test.ts b/test/abilities/early_bird.test.ts index 9f06b4689d7..7d5d5d75483 100644 --- a/test/abilities/early_bird.test.ts +++ b/test/abilities/early_bird.test.ts @@ -1,6 +1,6 @@ import { Status } from "#app/data/status-effect"; import { MoveResult } from "#app/field/pokemon"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; diff --git a/test/abilities/flash_fire.test.ts b/test/abilities/flash_fire.test.ts index ddfb60e8c84..2e98dac471c 100644 --- a/test/abilities/flash_fire.test.ts +++ b/test/abilities/flash_fire.test.ts @@ -3,7 +3,7 @@ import { BattlerTagType } from "#app/enums/battler-tag-type"; 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/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { StatusEffect } from "#enums/status-effect"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/flower_gift.test.ts b/test/abilities/flower_gift.test.ts index 1c3672f6d62..3d9c0f7adcd 100644 --- a/test/abilities/flower_gift.test.ts +++ b/test/abilities/flower_gift.test.ts @@ -1,6 +1,6 @@ import { BattlerIndex } from "#app/battle"; import { allAbilities } from "#app/data/data-lists"; -import { AbilityId } from "#app/enums/abilities"; +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"; diff --git a/test/abilities/flower_veil.test.ts b/test/abilities/flower_veil.test.ts index 4bbb90aee8b..95caf0e117f 100644 --- a/test/abilities/flower_veil.test.ts +++ b/test/abilities/flower_veil.test.ts @@ -1,5 +1,5 @@ import { BattlerIndex } from "#app/battle"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; diff --git a/test/abilities/forecast.test.ts b/test/abilities/forecast.test.ts index 94d140616ca..a182eb85378 100644 --- a/test/abilities/forecast.test.ts +++ b/test/abilities/forecast.test.ts @@ -1,6 +1,6 @@ import { BattlerIndex } from "#app/battle"; import { allAbilities } from "#app/data/data-lists"; -import { AbilityId } from "#app/enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { WeatherType } from "#app/enums/weather-type"; import { DamageAnimPhase } from "#app/phases/damage-anim-phase"; import { MovePhase } from "#app/phases/move-phase"; diff --git a/test/abilities/friend_guard.test.ts b/test/abilities/friend_guard.test.ts index 69900673568..87d40aba360 100644 --- a/test/abilities/friend_guard.test.ts +++ b/test/abilities/friend_guard.test.ts @@ -1,6 +1,6 @@ import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-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/abilities/good_as_gold.test.ts b/test/abilities/good_as_gold.test.ts index 75724fcc03b..abb0220c28f 100644 --- a/test/abilities/good_as_gold.test.ts +++ b/test/abilities/good_as_gold.test.ts @@ -6,7 +6,7 @@ import { BattlerTagType } from "#app/enums/battler-tag-type"; import { Stat } from "#app/enums/stat"; import { StatusEffect } from "#app/enums/status-effect"; import { WeatherType } from "#app/enums/weather-type"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/gorilla_tactics.test.ts b/test/abilities/gorilla_tactics.test.ts index 984447835b8..1a253884e80 100644 --- a/test/abilities/gorilla_tactics.test.ts +++ b/test/abilities/gorilla_tactics.test.ts @@ -2,7 +2,7 @@ import { BattlerIndex } from "#app/battle"; import { Moves } from "#app/enums/moves"; import { Species } from "#app/enums/species"; import { Stat } from "#app/enums/stat"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/gulp_missile.test.ts b/test/abilities/gulp_missile.test.ts index 4a81f1e5a74..c75268fc33e 100644 --- a/test/abilities/gulp_missile.test.ts +++ b/test/abilities/gulp_missile.test.ts @@ -1,6 +1,6 @@ import { BattlerIndex } from "#app/battle"; import type Pokemon from "#app/field/pokemon"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#enums/battler-tag-type"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; diff --git a/test/abilities/harvest.test.ts b/test/abilities/harvest.test.ts index 036231aaaf6..cfa33a76f48 100644 --- a/test/abilities/harvest.test.ts +++ b/test/abilities/harvest.test.ts @@ -4,7 +4,7 @@ import type Pokemon from "#app/field/pokemon"; import { BerryModifier, PreserveBerryModifier } from "#app/modifier/modifier"; import type { ModifierOverride } from "#app/modifier/modifier-type"; import type { BooleanHolder } from "#app/utils/common"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { BerryType } from "#enums/berry-type"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; diff --git a/test/abilities/healer.test.ts b/test/abilities/healer.test.ts index b98ff2e8ce8..0be6fbe4ac1 100644 --- a/test/abilities/healer.test.ts +++ b/test/abilities/healer.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; diff --git a/test/abilities/heatproof.test.ts b/test/abilities/heatproof.test.ts index bf30ecac149..1f6f0fc2744 100644 --- a/test/abilities/heatproof.test.ts +++ b/test/abilities/heatproof.test.ts @@ -2,7 +2,7 @@ import { Species } from "#app/enums/species"; 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/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/honey_gather.test.ts b/test/abilities/honey_gather.test.ts index 9049913d6cc..eabba4484a4 100644 --- a/test/abilities/honey_gather.test.ts +++ b/test/abilities/honey_gather.test.ts @@ -1,6 +1,6 @@ import type { CommandPhase } from "#app/phases/command-phase"; import { Command } from "#app/ui/command-ui-handler"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/hustle.test.ts b/test/abilities/hustle.test.ts index 3b06b103271..907b555b3aa 100644 --- a/test/abilities/hustle.test.ts +++ b/test/abilities/hustle.test.ts @@ -1,5 +1,5 @@ import { allMoves } from "#app/data/data-lists"; -import { AbilityId } from "#app/enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Stat } from "#app/enums/stat"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; diff --git a/test/abilities/hyper_cutter.test.ts b/test/abilities/hyper_cutter.test.ts index 6f785523a8a..57d43459344 100644 --- a/test/abilities/hyper_cutter.test.ts +++ b/test/abilities/hyper_cutter.test.ts @@ -1,5 +1,5 @@ import { Stat } from "#enums/stat"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/ice_face.test.ts b/test/abilities/ice_face.test.ts index 148a1d746bc..a07ca173727 100644 --- a/test/abilities/ice_face.test.ts +++ b/test/abilities/ice_face.test.ts @@ -4,7 +4,7 @@ import { MoveEndPhase } from "#app/phases/move-end-phase"; import { QuietFormChangePhase } from "#app/phases/quiet-form-change-phase"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { TurnInitPhase } from "#app/phases/turn-init-phase"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#enums/battler-tag-type"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; diff --git a/test/abilities/illuminate.test.ts b/test/abilities/illuminate.test.ts index 24f20be72e3..4ff54fd4c38 100644 --- a/test/abilities/illuminate.test.ts +++ b/test/abilities/illuminate.test.ts @@ -1,5 +1,5 @@ import { Stat } from "#app/enums/stat"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/abilities/illusion.test.ts b/test/abilities/illusion.test.ts index 054db59ff90..23cb6a3d874 100644 --- a/test/abilities/illusion.test.ts +++ b/test/abilities/illusion.test.ts @@ -1,6 +1,6 @@ import { Gender } from "#app/data/gender"; import { PokeballType } from "#app/enums/pokeball"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/immunity.test.ts b/test/abilities/immunity.test.ts index 815dda18f1b..6df8121fe9f 100644 --- a/test/abilities/immunity.test.ts +++ b/test/abilities/immunity.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; diff --git a/test/abilities/imposter.test.ts b/test/abilities/imposter.test.ts index 69504275f90..1b904c46ba6 100644 --- a/test/abilities/imposter.test.ts +++ b/test/abilities/imposter.test.ts @@ -5,7 +5,7 @@ import { Species } from "#enums/species"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Moves } from "#enums/moves"; import { Stat, BATTLE_STATS, EFFECTIVE_STATS } from "#enums/stat"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; // TODO: Add more tests once Imposter is fully implemented describe("Abilities - Imposter", () => { diff --git a/test/abilities/infiltrator.test.ts b/test/abilities/infiltrator.test.ts index c4bbb68ed39..3f79b0e2f1f 100644 --- a/test/abilities/infiltrator.test.ts +++ b/test/abilities/infiltrator.test.ts @@ -4,7 +4,7 @@ import { ArenaTagType } from "#enums/arena-tag-type"; import { BattlerTagType } from "#enums/battler-tag-type"; import { Stat } from "#enums/stat"; import { StatusEffect } from "#enums/status-effect"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/insomnia.test.ts b/test/abilities/insomnia.test.ts index dd6e9ac1ce4..3a21e3dae27 100644 --- a/test/abilities/insomnia.test.ts +++ b/test/abilities/insomnia.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; diff --git a/test/abilities/intimidate.test.ts b/test/abilities/intimidate.test.ts index 0f0839ecf95..705128321ac 100644 --- a/test/abilities/intimidate.test.ts +++ b/test/abilities/intimidate.test.ts @@ -4,7 +4,7 @@ import GameManager from "#test/testUtils/gameManager"; import { UiMode } from "#enums/ui-mode"; import { Stat } from "#enums/stat"; import { getMovePosition } from "#test/testUtils/gameManagerUtils"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; diff --git a/test/abilities/intrepid_sword.test.ts b/test/abilities/intrepid_sword.test.ts index 265416c0abd..e3e9bb386ea 100644 --- a/test/abilities/intrepid_sword.test.ts +++ b/test/abilities/intrepid_sword.test.ts @@ -1,7 +1,7 @@ import { Stat } from "#enums/stat"; import GameManager from "#test/testUtils/gameManager"; import { CommandPhase } from "#app/phases/command-phase"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Species } from "#enums/species"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/abilities/libero.test.ts b/test/abilities/libero.test.ts index 72f033072df..21ebed2093a 100644 --- a/test/abilities/libero.test.ts +++ b/test/abilities/libero.test.ts @@ -3,7 +3,7 @@ import { PokemonType } from "#enums/pokemon-type"; import { Weather } from "#app/data/weather"; import type { PlayerPokemon } from "#app/field/pokemon"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#enums/battler-tag-type"; import { Biome } from "#enums/biome"; import { Moves } from "#enums/moves"; diff --git a/test/abilities/lightningrod.test.ts b/test/abilities/lightningrod.test.ts index 27dfc84f933..4fa63ac7f53 100644 --- a/test/abilities/lightningrod.test.ts +++ b/test/abilities/lightningrod.test.ts @@ -1,5 +1,5 @@ import { BattlerIndex } from "#app/battle"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; diff --git a/test/abilities/limber.test.ts b/test/abilities/limber.test.ts index 41465a0b245..292edf8c80e 100644 --- a/test/abilities/limber.test.ts +++ b/test/abilities/limber.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; diff --git a/test/abilities/magic_bounce.test.ts b/test/abilities/magic_bounce.test.ts index c454f159e6b..ad0ce88a60b 100644 --- a/test/abilities/magic_bounce.test.ts +++ b/test/abilities/magic_bounce.test.ts @@ -6,7 +6,7 @@ import { ArenaTagType } from "#app/enums/arena-tag-type"; import { BattlerTagType } from "#app/enums/battler-tag-type"; import { Stat } from "#app/enums/stat"; import { StatusEffect } from "#app/enums/status-effect"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/magic_guard.test.ts b/test/abilities/magic_guard.test.ts index 00ccef56a22..038f0586af5 100644 --- a/test/abilities/magic_guard.test.ts +++ b/test/abilities/magic_guard.test.ts @@ -1,7 +1,7 @@ import { ArenaTagSide, getArenaTag } from "#app/data/arena-tag"; import { getStatusEffectCatchRateMultiplier } from "#app/data/status-effect"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { ArenaTagType } from "#enums/arena-tag-type"; import { BattlerTagType } from "#enums/battler-tag-type"; import { Moves } from "#enums/moves"; diff --git a/test/abilities/magma_armor.test.ts b/test/abilities/magma_armor.test.ts index 826fb4151c0..4a146248aab 100644 --- a/test/abilities/magma_armor.test.ts +++ b/test/abilities/magma_armor.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; diff --git a/test/abilities/mimicry.test.ts b/test/abilities/mimicry.test.ts index 0bf86b52064..1e7a2df5e86 100644 --- a/test/abilities/mimicry.test.ts +++ b/test/abilities/mimicry.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { PokemonType } from "#enums/pokemon-type"; diff --git a/test/abilities/mirror_armor.test.ts b/test/abilities/mirror_armor.test.ts index 22705f804f5..408fadce5d1 100644 --- a/test/abilities/mirror_armor.test.ts +++ b/test/abilities/mirror_armor.test.ts @@ -1,5 +1,5 @@ import { Stat } from "#enums/stat"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/mold_breaker.test.ts b/test/abilities/mold_breaker.test.ts index b837d101e18..a6c1081b9b2 100644 --- a/test/abilities/mold_breaker.test.ts +++ b/test/abilities/mold_breaker.test.ts @@ -1,6 +1,6 @@ import { BattlerIndex } from "#app/battle"; import { globalScene } from "#app/global-scene"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/moody.test.ts b/test/abilities/moody.test.ts index 625fe6c4083..78212b01a8a 100644 --- a/test/abilities/moody.test.ts +++ b/test/abilities/moody.test.ts @@ -1,5 +1,5 @@ import { BATTLE_STATS, EFFECTIVE_STATS } from "#enums/stat"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/moxie.test.ts b/test/abilities/moxie.test.ts index 5e70214e535..0ffeef1c8e2 100644 --- a/test/abilities/moxie.test.ts +++ b/test/abilities/moxie.test.ts @@ -1,6 +1,6 @@ import { Stat } from "#enums/stat"; import GameManager from "#test/testUtils/gameManager"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import Phaser from "phaser"; diff --git a/test/abilities/mummy.test.ts b/test/abilities/mummy.test.ts index 66f2539a952..dc1419a3562 100644 --- a/test/abilities/mummy.test.ts +++ b/test/abilities/mummy.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/mycelium_might.test.ts b/test/abilities/mycelium_might.test.ts index 41ed3f7b775..71276ab06b3 100644 --- a/test/abilities/mycelium_might.test.ts +++ b/test/abilities/mycelium_might.test.ts @@ -1,7 +1,7 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { TurnStartPhase } from "#app/phases/turn-start-phase"; import GameManager from "#test/testUtils/gameManager"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Stat } from "#enums/stat"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; diff --git a/test/abilities/neutralizing_gas.test.ts b/test/abilities/neutralizing_gas.test.ts index 1292086e616..5c98bef0f19 100644 --- a/test/abilities/neutralizing_gas.test.ts +++ b/test/abilities/neutralizing_gas.test.ts @@ -2,7 +2,7 @@ import { BattlerIndex } from "#app/battle"; import type { CommandPhase } from "#app/phases/command-phase"; import { Command } from "#app/ui/command-ui-handler"; import { PostSummonWeatherChangeAbAttr } from "#app/data/abilities/ability"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { ArenaTagType } from "#enums/arena-tag-type"; import { Moves } from "#enums/moves"; import { PokeballType } from "#enums/pokeball"; diff --git a/test/abilities/no_guard.test.ts b/test/abilities/no_guard.test.ts index 81c0640c5b0..b1036ad2554 100644 --- a/test/abilities/no_guard.test.ts +++ b/test/abilities/no_guard.test.ts @@ -1,7 +1,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/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { HitCheckResult } from "#enums/hit-check-result"; diff --git a/test/abilities/normal-move-type-change.test.ts b/test/abilities/normal-move-type-change.test.ts index 5cc35f05133..35a9b1b146c 100644 --- a/test/abilities/normal-move-type-change.test.ts +++ b/test/abilities/normal-move-type-change.test.ts @@ -1,7 +1,7 @@ import { BattlerIndex } from "#app/battle"; import { allMoves } from "#app/data/data-lists"; import { PokemonType } from "#enums/pokemon-type"; -import { AbilityId } from "#app/enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#app/enums/moves"; import { Species } from "#app/enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/normalize.test.ts b/test/abilities/normalize.test.ts index 5abf54584ab..1647e5e3c27 100644 --- a/test/abilities/normalize.test.ts +++ b/test/abilities/normalize.test.ts @@ -1,7 +1,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/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { PokemonType } from "#enums/pokemon-type"; import { Species } from "#enums/species"; diff --git a/test/abilities/oblivious.test.ts b/test/abilities/oblivious.test.ts index 23fc205981b..1a3729fc982 100644 --- a/test/abilities/oblivious.test.ts +++ b/test/abilities/oblivious.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#enums/battler-tag-type"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; diff --git a/test/abilities/own_tempo.test.ts b/test/abilities/own_tempo.test.ts index 906b4beacd2..e7963c09a29 100644 --- a/test/abilities/own_tempo.test.ts +++ b/test/abilities/own_tempo.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#enums/battler-tag-type"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; diff --git a/test/abilities/parental_bond.test.ts b/test/abilities/parental_bond.test.ts index 7ba6bd073c8..66280698f8a 100644 --- a/test/abilities/parental_bond.test.ts +++ b/test/abilities/parental_bond.test.ts @@ -1,7 +1,7 @@ import { PokemonType } from "#enums/pokemon-type"; import { BattlerTagType } from "#enums/battler-tag-type"; import { toDmgValue } from "#app/utils/common"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; diff --git a/test/abilities/pastel_veil.test.ts b/test/abilities/pastel_veil.test.ts index bf154ae0099..4ac0934b5c3 100644 --- a/test/abilities/pastel_veil.test.ts +++ b/test/abilities/pastel_veil.test.ts @@ -1,5 +1,5 @@ import { BattlerIndex } from "#app/battle"; -import { AbilityId } from "#app/enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { CommandPhase } from "#app/phases/command-phase"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Moves } from "#enums/moves"; diff --git a/test/abilities/perish_body.test.ts b/test/abilities/perish_body.test.ts index fb5cf794e1d..8395032b84e 100644 --- a/test/abilities/perish_body.test.ts +++ b/test/abilities/perish_body.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/power_construct.test.ts b/test/abilities/power_construct.test.ts index 33bba18b6ca..289459c5fc3 100644 --- a/test/abilities/power_construct.test.ts +++ b/test/abilities/power_construct.test.ts @@ -1,7 +1,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/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; diff --git a/test/abilities/power_spot.test.ts b/test/abilities/power_spot.test.ts index 253606c88fb..d80d36fa903 100644 --- a/test/abilities/power_spot.test.ts +++ b/test/abilities/power_spot.test.ts @@ -1,5 +1,5 @@ import { allMoves } from "#app/data/data-lists"; -import { AbilityId } from "#app/enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Moves } from "#enums/moves"; diff --git a/test/abilities/protean.test.ts b/test/abilities/protean.test.ts index 89315c77942..e3b4e6e6ac0 100644 --- a/test/abilities/protean.test.ts +++ b/test/abilities/protean.test.ts @@ -3,7 +3,7 @@ import { PokemonType } from "#enums/pokemon-type"; import { Weather } from "#app/data/weather"; import type { PlayerPokemon } from "#app/field/pokemon"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#enums/battler-tag-type"; import { Biome } from "#enums/biome"; import { Moves } from "#enums/moves"; diff --git a/test/abilities/protosynthesis.test.ts b/test/abilities/protosynthesis.test.ts index 1a35d7bf7ec..6642a04fc18 100644 --- a/test/abilities/protosynthesis.test.ts +++ b/test/abilities/protosynthesis.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Nature } from "#enums/nature"; import { Species } from "#enums/species"; diff --git a/test/abilities/quick_draw.test.ts b/test/abilities/quick_draw.test.ts index a0e1889fc0e..35261899a96 100644 --- a/test/abilities/quick_draw.test.ts +++ b/test/abilities/quick_draw.test.ts @@ -1,7 +1,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/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/sand_spit.test.ts b/test/abilities/sand_spit.test.ts index 67b8620f41a..433355700d9 100644 --- a/test/abilities/sand_spit.test.ts +++ b/test/abilities/sand_spit.test.ts @@ -1,5 +1,5 @@ import { WeatherType } from "#app/enums/weather-type"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/sand_veil.test.ts b/test/abilities/sand_veil.test.ts index 17f7ec32d9f..93183d47acb 100644 --- a/test/abilities/sand_veil.test.ts +++ b/test/abilities/sand_veil.test.ts @@ -3,7 +3,7 @@ import { allAbilities } from "#app/data/data-lists"; import { CommandPhase } from "#app/phases/command-phase"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { MoveEndPhase } from "#app/phases/move-end-phase"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; diff --git a/test/abilities/sap_sipper.test.ts b/test/abilities/sap_sipper.test.ts index b62242f9041..1d78b04da5f 100644 --- a/test/abilities/sap_sipper.test.ts +++ b/test/abilities/sap_sipper.test.ts @@ -2,7 +2,7 @@ import { Stat } from "#enums/stat"; import { TerrainType } from "#app/data/terrain"; import { MoveEndPhase } from "#app/phases/move-end-phase"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#enums/battler-tag-type"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; diff --git a/test/abilities/schooling.test.ts b/test/abilities/schooling.test.ts index 806c7fcd0e6..de3a47c5be3 100644 --- a/test/abilities/schooling.test.ts +++ b/test/abilities/schooling.test.ts @@ -1,7 +1,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/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; diff --git a/test/abilities/screen_cleaner.test.ts b/test/abilities/screen_cleaner.test.ts index 32f5c597005..1187441142b 100644 --- a/test/abilities/screen_cleaner.test.ts +++ b/test/abilities/screen_cleaner.test.ts @@ -1,7 +1,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/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/seed_sower.test.ts b/test/abilities/seed_sower.test.ts index 8260aab73ed..7d0b6f72f29 100644 --- a/test/abilities/seed_sower.test.ts +++ b/test/abilities/seed_sower.test.ts @@ -1,5 +1,5 @@ import { TerrainType } from "#app/data/terrain"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/serene_grace.test.ts b/test/abilities/serene_grace.test.ts index c7c7770e6cd..25de95f61cf 100644 --- a/test/abilities/serene_grace.test.ts +++ b/test/abilities/serene_grace.test.ts @@ -1,5 +1,5 @@ import { BattlerIndex } from "#app/battle"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/sheer_force.test.ts b/test/abilities/sheer_force.test.ts index 2a8d7540958..714489fb40a 100644 --- a/test/abilities/sheer_force.test.ts +++ b/test/abilities/sheer_force.test.ts @@ -1,6 +1,6 @@ import { BattlerIndex } from "#app/battle"; import { PokemonType } from "#enums/pokemon-type"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; diff --git a/test/abilities/shield_dust.test.ts b/test/abilities/shield_dust.test.ts index ddc6809492e..beb62322580 100644 --- a/test/abilities/shield_dust.test.ts +++ b/test/abilities/shield_dust.test.ts @@ -7,7 +7,7 @@ import { } from "#app/data/abilities/ability"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { NumberHolder } from "#app/utils/common"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; diff --git a/test/abilities/shields_down.test.ts b/test/abilities/shields_down.test.ts index 863ab52c8d3..8fa6ba9319e 100644 --- a/test/abilities/shields_down.test.ts +++ b/test/abilities/shields_down.test.ts @@ -2,7 +2,7 @@ import { Status } from "#app/data/status-effect"; import { BattlerTagType } from "#app/enums/battler-tag-type"; import { QuietFormChangePhase } from "#app/phases/quiet-form-change-phase"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; diff --git a/test/abilities/simple.test.ts b/test/abilities/simple.test.ts index 889c7d0605c..ed019eab4a0 100644 --- a/test/abilities/simple.test.ts +++ b/test/abilities/simple.test.ts @@ -1,5 +1,5 @@ import { Moves } from "#app/enums/moves"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/speed_boost.test.ts b/test/abilities/speed_boost.test.ts index 88b32f0297e..4f686cbe608 100644 --- a/test/abilities/speed_boost.test.ts +++ b/test/abilities/speed_boost.test.ts @@ -1,5 +1,5 @@ import { Stat } from "#enums/stat"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/stakeout.test.ts b/test/abilities/stakeout.test.ts index 40894729e0b..3543768b932 100644 --- a/test/abilities/stakeout.test.ts +++ b/test/abilities/stakeout.test.ts @@ -1,6 +1,6 @@ import { BattlerIndex } from "#app/battle"; import { isBetween } from "#app/utils/common"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/stall.test.ts b/test/abilities/stall.test.ts index 6223adcfc65..d49f2d7fb6d 100644 --- a/test/abilities/stall.test.ts +++ b/test/abilities/stall.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/steely_spirit.test.ts b/test/abilities/steely_spirit.test.ts index e29f6a1306c..9613ea27914 100644 --- a/test/abilities/steely_spirit.test.ts +++ b/test/abilities/steely_spirit.test.ts @@ -1,6 +1,6 @@ import { allAbilities } from "#app/data/data-lists"; import { allMoves } from "#app/data/data-lists"; -import { AbilityId } from "#app/enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/storm_drain.test.ts b/test/abilities/storm_drain.test.ts index 7a61acd15a6..abf2fdfbda2 100644 --- a/test/abilities/storm_drain.test.ts +++ b/test/abilities/storm_drain.test.ts @@ -1,5 +1,5 @@ import { BattlerIndex } from "#app/battle"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; diff --git a/test/abilities/sturdy.test.ts b/test/abilities/sturdy.test.ts index 8d4885d4455..63622f25e0c 100644 --- a/test/abilities/sturdy.test.ts +++ b/test/abilities/sturdy.test.ts @@ -1,7 +1,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/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/super_luck.test.ts b/test/abilities/super_luck.test.ts index de333c1b8ac..549c91b87e4 100644 --- a/test/abilities/super_luck.test.ts +++ b/test/abilities/super_luck.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/supreme_overlord.test.ts b/test/abilities/supreme_overlord.test.ts index ce1b7f942d6..e5d44b1858d 100644 --- a/test/abilities/supreme_overlord.test.ts +++ b/test/abilities/supreme_overlord.test.ts @@ -1,6 +1,6 @@ import { Moves } from "#app/enums/moves"; import type Move from "#app/data/moves/move"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Species } from "#enums/species"; import { BattlerIndex } from "#app/battle"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; diff --git a/test/abilities/sweet_veil.test.ts b/test/abilities/sweet_veil.test.ts index ccc0e24dbf1..08da5956124 100644 --- a/test/abilities/sweet_veil.test.ts +++ b/test/abilities/sweet_veil.test.ts @@ -1,5 +1,5 @@ import { BattlerIndex } from "#app/battle"; -import { AbilityId } from "#app/enums/abilities"; +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"; diff --git a/test/abilities/synchronize.test.ts b/test/abilities/synchronize.test.ts index e9b97d6a082..31e0ef684f7 100644 --- a/test/abilities/synchronize.test.ts +++ b/test/abilities/synchronize.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; diff --git a/test/abilities/tera_shell.test.ts b/test/abilities/tera_shell.test.ts index 04147385289..85df738f836 100644 --- a/test/abilities/tera_shell.test.ts +++ b/test/abilities/tera_shell.test.ts @@ -1,5 +1,5 @@ import { BattlerIndex } from "#app/battle"; -import { AbilityId } from "#app/enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#app/enums/moves"; import { Species } from "#app/enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/thermal_exchange.test.ts b/test/abilities/thermal_exchange.test.ts index a6dcd73c22f..62d5f18f0b7 100644 --- a/test/abilities/thermal_exchange.test.ts +++ b/test/abilities/thermal_exchange.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; diff --git a/test/abilities/trace.test.ts b/test/abilities/trace.test.ts index cf0bc3a4e4c..e109dd7d9cc 100644 --- a/test/abilities/trace.test.ts +++ b/test/abilities/trace.test.ts @@ -1,5 +1,5 @@ import { Stat } from "#app/enums/stat"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/unburden.test.ts b/test/abilities/unburden.test.ts index d839a4f360a..f5d5cc3aec3 100644 --- a/test/abilities/unburden.test.ts +++ b/test/abilities/unburden.test.ts @@ -4,7 +4,7 @@ import { StealHeldItemChanceAttr } from "#app/data/moves/move"; import { allMoves } from "#app/data/data-lists"; import type Pokemon from "#app/field/pokemon"; import type { ContactHeldItemTransferChanceModifier } from "#app/modifier/modifier"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#enums/battler-tag-type"; import { BerryType } from "#enums/berry-type"; import { Moves } from "#enums/moves"; diff --git a/test/abilities/unseen_fist.test.ts b/test/abilities/unseen_fist.test.ts index 865fd869f8e..8a2c146adfb 100644 --- a/test/abilities/unseen_fist.test.ts +++ b/test/abilities/unseen_fist.test.ts @@ -1,5 +1,5 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/victory_star.test.ts b/test/abilities/victory_star.test.ts index fa186b697f0..998688438cb 100644 --- a/test/abilities/victory_star.test.ts +++ b/test/abilities/victory_star.test.ts @@ -1,6 +1,6 @@ import { BattlerIndex } from "#app/battle"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/vital_spirit.test.ts b/test/abilities/vital_spirit.test.ts index 3d43994d7be..9acef0d66ad 100644 --- a/test/abilities/vital_spirit.test.ts +++ b/test/abilities/vital_spirit.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; diff --git a/test/abilities/volt_absorb.test.ts b/test/abilities/volt_absorb.test.ts index a0e62e7ed9c..8188fa36f44 100644 --- a/test/abilities/volt_absorb.test.ts +++ b/test/abilities/volt_absorb.test.ts @@ -1,6 +1,6 @@ import { Stat } from "#enums/stat"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#enums/battler-tag-type"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; diff --git a/test/abilities/wandering_spirit.test.ts b/test/abilities/wandering_spirit.test.ts index ec18db044e9..10f36054078 100644 --- a/test/abilities/wandering_spirit.test.ts +++ b/test/abilities/wandering_spirit.test.ts @@ -1,5 +1,5 @@ import { Stat } from "#app/enums/stat"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/water_bubble.test.ts b/test/abilities/water_bubble.test.ts index fcd56ff0ab9..ea8c4702743 100644 --- a/test/abilities/water_bubble.test.ts +++ b/test/abilities/water_bubble.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; diff --git a/test/abilities/water_veil.test.ts b/test/abilities/water_veil.test.ts index 26aaa841e9e..45e54618868 100644 --- a/test/abilities/water_veil.test.ts +++ b/test/abilities/water_veil.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; diff --git a/test/abilities/wimp_out.test.ts b/test/abilities/wimp_out.test.ts index 26dd0999792..51b4ecdecc7 100644 --- a/test/abilities/wimp_out.test.ts +++ b/test/abilities/wimp_out.test.ts @@ -3,7 +3,7 @@ import { ArenaTagSide } from "#app/data/arena-tag"; import { allMoves } from "#app/data/data-lists"; import GameManager from "#test/testUtils/gameManager"; import { toDmgValue } from "#app/utils/common"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { ArenaTagType } from "#enums/arena-tag-type"; import { BattlerTagType } from "#enums/battler-tag-type"; import { Moves } from "#enums/moves"; diff --git a/test/abilities/wind_power.test.ts b/test/abilities/wind_power.test.ts index 1eacd9245f4..e2a2dc84ba9 100644 --- a/test/abilities/wind_power.test.ts +++ b/test/abilities/wind_power.test.ts @@ -1,6 +1,6 @@ import { BattlerTagType } from "#app/enums/battler-tag-type"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/wind_rider.test.ts b/test/abilities/wind_rider.test.ts index 0309324fa75..3cdce2c1da1 100644 --- a/test/abilities/wind_rider.test.ts +++ b/test/abilities/wind_rider.test.ts @@ -1,6 +1,6 @@ import { Stat } from "#enums/stat"; import GameManager from "#test/testUtils/gameManager"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import Phaser from "phaser"; diff --git a/test/abilities/wonder_skin.test.ts b/test/abilities/wonder_skin.test.ts index 8f39aa429e2..ae531cc7fac 100644 --- a/test/abilities/wonder_skin.test.ts +++ b/test/abilities/wonder_skin.test.ts @@ -1,6 +1,6 @@ import { allMoves } from "#app/data/data-lists"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/abilities/zen_mode.test.ts b/test/abilities/zen_mode.test.ts index 46fc63591c1..d6af164b4e0 100644 --- a/test/abilities/zen_mode.test.ts +++ b/test/abilities/zen_mode.test.ts @@ -1,5 +1,5 @@ import { Status } from "#app/data/status-effect"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; diff --git a/test/abilities/zero_to_hero.test.ts b/test/abilities/zero_to_hero.test.ts index 5801955bab6..217d1a415a0 100644 --- a/test/abilities/zero_to_hero.test.ts +++ b/test/abilities/zero_to_hero.test.ts @@ -1,7 +1,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/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; diff --git a/test/arena/arena_gravity.test.ts b/test/arena/arena_gravity.test.ts index 6cf18625a94..1097054687d 100644 --- a/test/arena/arena_gravity.test.ts +++ b/test/arena/arena_gravity.test.ts @@ -1,6 +1,6 @@ import { BattlerIndex } from "#app/battle"; import { allMoves } from "#app/data/data-lists"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { ArenaTagType } from "#enums/arena-tag-type"; import { BattlerTagType } from "#enums/battler-tag-type"; import { Moves } from "#enums/moves"; diff --git a/test/arena/grassy_terrain.test.ts b/test/arena/grassy_terrain.test.ts index 7f7655064ae..0fa711c5c91 100644 --- a/test/arena/grassy_terrain.test.ts +++ b/test/arena/grassy_terrain.test.ts @@ -1,5 +1,5 @@ import { allMoves } from "#app/data/data-lists"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/arena/weather_fog.test.ts b/test/arena/weather_fog.test.ts index 37050eed3dc..0cd47c32d00 100644 --- a/test/arena/weather_fog.test.ts +++ b/test/arena/weather_fog.test.ts @@ -1,5 +1,5 @@ import { allMoves } from "#app/data/data-lists"; -import { AbilityId } from "#app/enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; diff --git a/test/arena/weather_sandstorm.test.ts b/test/arena/weather_sandstorm.test.ts index 2a5c7e1b8fa..8b59c5c8c34 100644 --- a/test/arena/weather_sandstorm.test.ts +++ b/test/arena/weather_sandstorm.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#app/enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Stat } from "#app/enums/stat"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; diff --git a/test/arena/weather_strong_winds.test.ts b/test/arena/weather_strong_winds.test.ts index ad5d501c716..320bb266c56 100644 --- a/test/arena/weather_strong_winds.test.ts +++ b/test/arena/weather_strong_winds.test.ts @@ -1,7 +1,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/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/battle/ability_swap.test.ts b/test/battle/ability_swap.test.ts index c30e28a2ffe..ffdf3fe0c7f 100644 --- a/test/battle/ability_swap.test.ts +++ b/test/battle/ability_swap.test.ts @@ -1,6 +1,6 @@ import { allAbilities } from "#app/data/data-lists"; import { Stat } from "#app/enums/stat"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/battle/battle-order.test.ts b/test/battle/battle-order.test.ts index fde5b14e155..c4c21d9e122 100644 --- a/test/battle/battle-order.test.ts +++ b/test/battle/battle-order.test.ts @@ -1,7 +1,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/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/battle/battle.test.ts b/test/battle/battle.test.ts index 3ceead0fc3c..aad389b3efb 100644 --- a/test/battle/battle.test.ts +++ b/test/battle/battle.test.ts @@ -19,7 +19,7 @@ import { VictoryPhase } from "#app/phases/victory-phase"; import GameManager from "#test/testUtils/gameManager"; import { generateStarter } from "#test/testUtils/gameManagerUtils"; import { UiMode } from "#enums/ui-mode"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { PlayerGender } from "#enums/player-gender"; import { Species } from "#enums/species"; diff --git a/test/battle/damage_calculation.test.ts b/test/battle/damage_calculation.test.ts index 327893255bb..65379de0248 100644 --- a/test/battle/damage_calculation.test.ts +++ b/test/battle/damage_calculation.test.ts @@ -1,7 +1,7 @@ import { allMoves } from "#app/data/data-lists"; import type { EnemyPersistentModifier } from "#app/modifier/modifier"; import { modifierTypes } from "#app/modifier/modifier-type"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { ArenaTagType } from "#enums/arena-tag-type"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; diff --git a/test/battle/double_battle.test.ts b/test/battle/double_battle.test.ts index 9ca2b9975b3..abf43761718 100644 --- a/test/battle/double_battle.test.ts +++ b/test/battle/double_battle.test.ts @@ -1,5 +1,5 @@ import { Status } from "#app/data/status-effect"; -import { AbilityId } from "#enums/abilities"; +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"; diff --git a/test/battle/inverse_battle.test.ts b/test/battle/inverse_battle.test.ts index 417848847bb..64355dd108a 100644 --- a/test/battle/inverse_battle.test.ts +++ b/test/battle/inverse_battle.test.ts @@ -1,6 +1,6 @@ import { BattlerIndex } from "#app/battle"; import { PokemonType } from "#enums/pokemon-type"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { ArenaTagType } from "#enums/arena-tag-type"; import { Challenges } from "#enums/challenges"; import { Moves } from "#enums/moves"; diff --git a/test/battle/special_battle.test.ts b/test/battle/special_battle.test.ts index ddd13933d2c..e11917591fc 100644 --- a/test/battle/special_battle.test.ts +++ b/test/battle/special_battle.test.ts @@ -1,6 +1,6 @@ import { CommandPhase } from "#app/phases/command-phase"; import { UiMode } from "#enums/ui-mode"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/boss-pokemon.test.ts b/test/boss-pokemon.test.ts index 42b6866f0ac..a83c0155480 100644 --- a/test/boss-pokemon.test.ts +++ b/test/boss-pokemon.test.ts @@ -2,7 +2,7 @@ import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; import GameManager from "#test/testUtils/gameManager"; import { Species } from "#app/enums/species"; import { getPokemonSpecies } from "#app/data/pokemon-species"; -import { AbilityId } from "#app/enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#app/enums/moves"; import { EFFECTIVE_STATS } from "#app/enums/stat"; import type { EnemyPokemon } from "#app/field/pokemon"; diff --git a/test/data/status_effect.test.ts b/test/data/status_effect.test.ts index c350b857751..7c3ff3c25ea 100644 --- a/test/data/status_effect.test.ts +++ b/test/data/status_effect.test.ts @@ -7,7 +7,7 @@ import { getStatusEffectOverlapText, } from "#app/data/status-effect"; import { MoveResult } from "#app/field/pokemon"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; diff --git a/test/enemy_command.test.ts b/test/enemy_command.test.ts index 5ad4856d156..f9ec51f51dc 100644 --- a/test/enemy_command.test.ts +++ b/test/enemy_command.test.ts @@ -1,7 +1,7 @@ import type BattleScene from "#app/battle-scene"; import { allMoves } from "#app/data/data-lists"; import { MoveCategory } from "#enums/MoveCategory"; -import { AbilityId } from "#app/enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#app/enums/moves"; import { Species } from "#app/enums/species"; import type { EnemyPokemon } from "#app/field/pokemon"; diff --git a/test/escape-calculations.test.ts b/test/escape-calculations.test.ts index 877ade9e818..d0befb2869f 100644 --- a/test/escape-calculations.test.ts +++ b/test/escape-calculations.test.ts @@ -2,7 +2,7 @@ import { AttemptRunPhase } from "#app/phases/attempt-run-phase"; import type { CommandPhase } from "#app/phases/command-phase"; import { Command } from "#app/ui/command-ui-handler"; import { NumberHolder } from "#app/utils/common"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/evolution.test.ts b/test/evolution.test.ts index 641a0ae3e91..f5ccc29a54f 100644 --- a/test/evolution.test.ts +++ b/test/evolution.test.ts @@ -3,7 +3,7 @@ import { SpeciesFormEvolution, SpeciesWildEvolutionDelay, } from "#app/data/balance/pokemon-evolutions"; -import { AbilityId } from "#app/enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#app/enums/moves"; import { Species } from "#app/enums/species"; import * as Utils from "#app/utils/common"; diff --git a/test/final_boss.test.ts b/test/final_boss.test.ts index 27f4ded3d8b..6ade7724518 100644 --- a/test/final_boss.test.ts +++ b/test/final_boss.test.ts @@ -1,6 +1,6 @@ import { GameModes } from "#app/game-mode"; import { TurnHeldItemTransferModifier } from "#app/modifier/modifier"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Biome } from "#enums/biome"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; diff --git a/test/internals.test.ts b/test/internals.test.ts index 111c9a79451..6cb48a355e7 100644 --- a/test/internals.test.ts +++ b/test/internals.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#app/enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Species } from "#app/enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/items/exp_booster.test.ts b/test/items/exp_booster.test.ts index fd4a49bbe7f..f5273a78a55 100644 --- a/test/items/exp_booster.test.ts +++ b/test/items/exp_booster.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#app/enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { PokemonExpBoosterModifier } from "#app/modifier/modifier"; import { NumberHolder } from "#app/utils/common"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/items/grip_claw.test.ts b/test/items/grip_claw.test.ts index b353c83f7a4..d16de60185e 100644 --- a/test/items/grip_claw.test.ts +++ b/test/items/grip_claw.test.ts @@ -1,7 +1,7 @@ import { BattlerIndex } from "#app/battle"; import type Pokemon from "#app/field/pokemon"; import type { ContactHeldItemTransferChanceModifier } from "#app/modifier/modifier"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { BerryType } from "#enums/berry-type"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; diff --git a/test/items/leftovers.test.ts b/test/items/leftovers.test.ts index db24c5a8bf9..60fd976a1b1 100644 --- a/test/items/leftovers.test.ts +++ b/test/items/leftovers.test.ts @@ -1,6 +1,6 @@ import { DamageAnimPhase } from "#app/phases/damage-anim-phase"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/items/lock_capsule.test.ts b/test/items/lock_capsule.test.ts index 174254b0f3f..90b55c7b933 100644 --- a/test/items/lock_capsule.test.ts +++ b/test/items/lock_capsule.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#app/enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#app/enums/moves"; import { ModifierTier } from "#app/modifier/modifier-tier"; import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; diff --git a/test/items/multi_lens.test.ts b/test/items/multi_lens.test.ts index 7b83d7afa63..b7be8675d00 100644 --- a/test/items/multi_lens.test.ts +++ b/test/items/multi_lens.test.ts @@ -1,6 +1,6 @@ import { BattlerIndex } from "#app/battle"; import { Stat } from "#enums/stat"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/items/mystical_rock.test.ts b/test/items/mystical_rock.test.ts index 17b6866c60c..2eb52ad9958 100644 --- a/test/items/mystical_rock.test.ts +++ b/test/items/mystical_rock.test.ts @@ -1,6 +1,6 @@ import { globalScene } from "#app/global-scene"; import { Moves } from "#enums/moves"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phase from "phaser"; diff --git a/test/items/reviver_seed.test.ts b/test/items/reviver_seed.test.ts index 8d021ea8554..621fd20ca0f 100644 --- a/test/items/reviver_seed.test.ts +++ b/test/items/reviver_seed.test.ts @@ -2,7 +2,7 @@ import { BattlerIndex } from "#app/battle"; 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/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/items/temp_stat_stage_booster.test.ts b/test/items/temp_stat_stage_booster.test.ts index 3c3a88d4537..0958db676d2 100644 --- a/test/items/temp_stat_stage_booster.test.ts +++ b/test/items/temp_stat_stage_booster.test.ts @@ -5,7 +5,7 @@ import Phase from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; import { Moves } from "#app/enums/moves"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { AbilityId } from "#app/enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { TempStatStageBoosterModifier } from "#app/modifier/modifier"; import { UiMode } from "#enums/ui-mode"; import { Button } from "#app/enums/buttons"; diff --git a/test/items/toxic_orb.test.ts b/test/items/toxic_orb.test.ts index 074db826e55..67814b98e8d 100644 --- a/test/items/toxic_orb.test.ts +++ b/test/items/toxic_orb.test.ts @@ -1,5 +1,5 @@ import i18next from "#app/plugins/i18n"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; diff --git a/test/moves/after_you.test.ts b/test/moves/after_you.test.ts index d83040ea8c8..fa7563c3f52 100644 --- a/test/moves/after_you.test.ts +++ b/test/moves/after_you.test.ts @@ -1,5 +1,5 @@ import { BattlerIndex } from "#app/battle"; -import { AbilityId } from "#app/enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { MoveResult } from "#app/field/pokemon"; import { MovePhase } from "#app/phases/move-phase"; import { Moves } from "#enums/moves"; diff --git a/test/moves/alluring_voice.test.ts b/test/moves/alluring_voice.test.ts index d88f4606cf1..05fe4d5586f 100644 --- a/test/moves/alluring_voice.test.ts +++ b/test/moves/alluring_voice.test.ts @@ -1,5 +1,5 @@ import { BattlerIndex } from "#app/battle"; -import { AbilityId } from "#app/enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#app/enums/battler-tag-type"; import { BerryPhase } from "#app/phases/berry-phase"; import { Moves } from "#enums/moves"; diff --git a/test/moves/aromatherapy.test.ts b/test/moves/aromatherapy.test.ts index 2fd3bdbd9a2..0eaf8455c77 100644 --- a/test/moves/aromatherapy.test.ts +++ b/test/moves/aromatherapy.test.ts @@ -1,6 +1,6 @@ import { StatusEffect } from "#app/enums/status-effect"; import { CommandPhase } from "#app/phases/command-phase"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/assist.test.ts b/test/moves/assist.test.ts index e33a1443768..5c1a2a60775 100644 --- a/test/moves/assist.test.ts +++ b/test/moves/assist.test.ts @@ -2,7 +2,7 @@ import { BattlerIndex } from "#app/battle"; import { Stat } from "#app/enums/stat"; import { MoveResult } from "#app/field/pokemon"; import { CommandPhase } from "#app/phases/command-phase"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/astonish.test.ts b/test/moves/astonish.test.ts index a8ab190c88f..9635f7cb85d 100644 --- a/test/moves/astonish.test.ts +++ b/test/moves/astonish.test.ts @@ -4,7 +4,7 @@ import { BerryPhase } from "#app/phases/berry-phase"; import { CommandPhase } from "#app/phases/command-phase"; import { MoveEndPhase } from "#app/phases/move-end-phase"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/aurora_veil.test.ts b/test/moves/aurora_veil.test.ts index e54d5afdee1..83a74c2b963 100644 --- a/test/moves/aurora_veil.test.ts +++ b/test/moves/aurora_veil.test.ts @@ -7,7 +7,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 { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { WeatherType } from "#enums/weather-type"; diff --git a/test/moves/autotomize.test.ts b/test/moves/autotomize.test.ts index 8f531f11f82..403086678e3 100644 --- a/test/moves/autotomize.test.ts +++ b/test/moves/autotomize.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/baddy_bad.test.ts b/test/moves/baddy_bad.test.ts index 867c4d86324..4ec84aa423f 100644 --- a/test/moves/baddy_bad.test.ts +++ b/test/moves/baddy_bad.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/baneful_bunker.test.ts b/test/moves/baneful_bunker.test.ts index 487b243d0e6..d9a77420a58 100644 --- a/test/moves/baneful_bunker.test.ts +++ b/test/moves/baneful_bunker.test.ts @@ -2,7 +2,7 @@ import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; import GameManager from "#test/testUtils/gameManager"; import { Species } from "#enums/species"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; 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 8cd74dceed7..03485c5d09d 100644 --- a/test/moves/baton_pass.test.ts +++ b/test/moves/baton_pass.test.ts @@ -1,6 +1,6 @@ import { BattlerIndex } from "#app/battle"; import GameManager from "#test/testUtils/gameManager"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#enums/battler-tag-type"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; diff --git a/test/moves/beak_blast.test.ts b/test/moves/beak_blast.test.ts index 713e2719948..4309fdd2be4 100644 --- a/test/moves/beak_blast.test.ts +++ b/test/moves/beak_blast.test.ts @@ -3,7 +3,7 @@ import { StatusEffect } from "#app/enums/status-effect"; import { BerryPhase } from "#app/phases/berry-phase"; import { MovePhase } from "#app/phases/move-phase"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/beat_up.test.ts b/test/moves/beat_up.test.ts index 59b366fb571..bc165035e1d 100644 --- a/test/moves/beat_up.test.ts +++ b/test/moves/beat_up.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#app/enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#app/enums/moves"; import { Species } from "#app/enums/species"; import { StatusEffect } from "#app/enums/status-effect"; diff --git a/test/moves/belly_drum.test.ts b/test/moves/belly_drum.test.ts index b4a3294f117..1e281ebac4b 100644 --- a/test/moves/belly_drum.test.ts +++ b/test/moves/belly_drum.test.ts @@ -6,7 +6,7 @@ import { Stat } from "#enums/stat"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; -import { AbilityId } from "#app/enums/abilities"; +import { AbilityId } from "#enums/ability-id"; // RATIO : HP Cost of Move const RATIO = 2; diff --git a/test/moves/burning_jealousy.test.ts b/test/moves/burning_jealousy.test.ts index d0e84ca99c4..64c5cfc10f8 100644 --- a/test/moves/burning_jealousy.test.ts +++ b/test/moves/burning_jealousy.test.ts @@ -1,6 +1,6 @@ import { BattlerIndex } from "#app/battle"; import { allMoves } from "#app/data/data-lists"; -import { AbilityId } from "#app/enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { StatusEffect } from "#app/enums/status-effect"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; diff --git a/test/moves/camouflage.test.ts b/test/moves/camouflage.test.ts index 22358ae386e..a766c439f3b 100644 --- a/test/moves/camouflage.test.ts +++ b/test/moves/camouflage.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { TerrainType } from "#app/data/terrain"; diff --git a/test/moves/ceaseless_edge.test.ts b/test/moves/ceaseless_edge.test.ts index 9983d1951ea..31539d82b73 100644 --- a/test/moves/ceaseless_edge.test.ts +++ b/test/moves/ceaseless_edge.test.ts @@ -1,6 +1,6 @@ import { ArenaTagSide, ArenaTrapTag } from "#app/data/arena-tag"; import { allMoves } from "#app/data/data-lists"; -import { AbilityId } from "#app/enums/abilities"; +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"; diff --git a/test/moves/chilly_reception.test.ts b/test/moves/chilly_reception.test.ts index cd5d378ab3a..0304e8515dd 100644 --- a/test/moves/chilly_reception.test.ts +++ b/test/moves/chilly_reception.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#app/enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { WeatherType } from "#enums/weather-type"; diff --git a/test/moves/chloroblast.test.ts b/test/moves/chloroblast.test.ts index d8bc2cefd75..bda20bbfe94 100644 --- a/test/moves/chloroblast.test.ts +++ b/test/moves/chloroblast.test.ts @@ -1,5 +1,5 @@ import { MoveResult } from "#app/field/pokemon"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/copycat.test.ts b/test/moves/copycat.test.ts index 49c1d0e09d5..1d2067cfea9 100644 --- a/test/moves/copycat.test.ts +++ b/test/moves/copycat.test.ts @@ -3,7 +3,7 @@ import { RandomMoveAttr } from "#app/data/moves/move"; import { allMoves } from "#app/data/data-lists"; import { Stat } from "#app/enums/stat"; import { MoveResult } from "#app/field/pokemon"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/crafty_shield.test.ts b/test/moves/crafty_shield.test.ts index ba4d778af0c..1630dc2e94f 100644 --- a/test/moves/crafty_shield.test.ts +++ b/test/moves/crafty_shield.test.ts @@ -2,7 +2,7 @@ import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; import GameManager from "#test/testUtils/gameManager"; import { Species } from "#enums/species"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Stat } from "#enums/stat"; import { BattlerTagType } from "#app/enums/battler-tag-type"; diff --git a/test/moves/defog.test.ts b/test/moves/defog.test.ts index 7e21c32f808..e8b1026abb9 100644 --- a/test/moves/defog.test.ts +++ b/test/moves/defog.test.ts @@ -1,5 +1,5 @@ import { Stat } from "#enums/stat"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/destiny_bond.test.ts b/test/moves/destiny_bond.test.ts index 895b76c69d3..696c221cd2b 100644 --- a/test/moves/destiny_bond.test.ts +++ b/test/moves/destiny_bond.test.ts @@ -1,7 +1,7 @@ import type { ArenaTrapTag } from "#app/data/arena-tag"; import { ArenaTagSide } from "#app/data/arena-tag"; import { allMoves } from "#app/data/data-lists"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { ArenaTagType } from "#enums/arena-tag-type"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; diff --git a/test/moves/diamond_storm.test.ts b/test/moves/diamond_storm.test.ts index efd02dd01b8..3a1b8e7eaea 100644 --- a/test/moves/diamond_storm.test.ts +++ b/test/moves/diamond_storm.test.ts @@ -1,5 +1,5 @@ import { allMoves } from "#app/data/data-lists"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; diff --git a/test/moves/dig.test.ts b/test/moves/dig.test.ts index fc07775cf5f..2daa11a97c2 100644 --- a/test/moves/dig.test.ts +++ b/test/moves/dig.test.ts @@ -1,6 +1,6 @@ import { BattlerIndex } from "#app/battle"; import { allMoves } from "#app/data/data-lists"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#enums/battler-tag-type"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; diff --git a/test/moves/disable.test.ts b/test/moves/disable.test.ts index 7db40407714..d1b95349b53 100644 --- a/test/moves/disable.test.ts +++ b/test/moves/disable.test.ts @@ -1,6 +1,6 @@ import { BattlerIndex } from "#app/battle"; import { MoveResult } from "#app/field/pokemon"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/dive.test.ts b/test/moves/dive.test.ts index fa8d72aeb15..e67f439adf4 100644 --- a/test/moves/dive.test.ts +++ b/test/moves/dive.test.ts @@ -1,7 +1,7 @@ import { BattlerTagType } from "#enums/battler-tag-type"; import { StatusEffect } from "#enums/status-effect"; import { MoveResult } from "#app/field/pokemon"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/doodle.test.ts b/test/moves/doodle.test.ts index 94792765e66..2caf6487844 100644 --- a/test/moves/doodle.test.ts +++ b/test/moves/doodle.test.ts @@ -1,6 +1,6 @@ import { BattlerIndex } from "#app/battle"; import { Stat } from "#app/enums/stat"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/double_team.test.ts b/test/moves/double_team.test.ts index 18864125d62..530324b8e12 100644 --- a/test/moves/double_team.test.ts +++ b/test/moves/double_team.test.ts @@ -1,5 +1,5 @@ import { Stat } from "#enums/stat"; -import { AbilityId } from "#app/enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; diff --git a/test/moves/dragon_cheer.test.ts b/test/moves/dragon_cheer.test.ts index 5af26014fe6..ada7385132b 100644 --- a/test/moves/dragon_cheer.test.ts +++ b/test/moves/dragon_cheer.test.ts @@ -2,7 +2,7 @@ import { BattlerIndex } from "#app/battle"; import { PokemonType } from "#enums/pokemon-type"; import { Moves } from "#app/enums/moves"; import { Species } from "#app/enums/species"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/test/moves/dragon_rage.test.ts b/test/moves/dragon_rage.test.ts index 3f4d5896d4d..366e774cae8 100644 --- a/test/moves/dragon_rage.test.ts +++ b/test/moves/dragon_rage.test.ts @@ -3,7 +3,7 @@ import { PokemonType } from "#enums/pokemon-type"; import { Species } from "#app/enums/species"; import type { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#enums/battler-tag-type"; import { Moves } from "#enums/moves"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/dragon_tail.test.ts b/test/moves/dragon_tail.test.ts index 5a39b6a8f50..3800a8a5bf0 100644 --- a/test/moves/dragon_tail.test.ts +++ b/test/moves/dragon_tail.test.ts @@ -4,7 +4,7 @@ import { Status } from "#app/data/status-effect"; import { Challenges } from "#enums/challenges"; import { StatusEffect } from "#enums/status-effect"; import { PokemonType } from "#enums/pokemon-type"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; 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 43fd913ec88..20da553d15d 100644 --- a/test/moves/effectiveness.test.ts +++ b/test/moves/effectiveness.test.ts @@ -2,7 +2,7 @@ import { allMoves } from "#app/data/data-lists"; import { getPokemonSpecies } from "#app/data/pokemon-species"; import { TrainerSlot } from "#enums/trainer-slot"; import { PokemonType } from "#enums/pokemon-type"; -import { AbilityId } from "#app/enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#app/enums/moves"; import { Species } from "#app/enums/species"; import * as Messages from "#app/messages"; diff --git a/test/moves/electrify.test.ts b/test/moves/electrify.test.ts index cf1d3b473fd..d692ebd7b72 100644 --- a/test/moves/electrify.test.ts +++ b/test/moves/electrify.test.ts @@ -1,6 +1,6 @@ import { BattlerIndex } from "#app/battle"; import { PokemonType } from "#enums/pokemon-type"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/electro_shot.test.ts b/test/moves/electro_shot.test.ts index 49fe3dc0168..af699eba92d 100644 --- a/test/moves/electro_shot.test.ts +++ b/test/moves/electro_shot.test.ts @@ -2,7 +2,7 @@ import { BattlerTagType } from "#enums/battler-tag-type"; import { Stat } from "#enums/stat"; import { WeatherType } from "#enums/weather-type"; import { MoveResult } from "#app/field/pokemon"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/encore.test.ts b/test/moves/encore.test.ts index 2377684f796..6d6bc9344ce 100644 --- a/test/moves/encore.test.ts +++ b/test/moves/encore.test.ts @@ -1,7 +1,7 @@ import { BattlerTagType } from "#enums/battler-tag-type"; import { BattlerIndex } from "#app/battle"; import { MoveResult } from "#app/field/pokemon"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/endure.test.ts b/test/moves/endure.test.ts index 6aa61bafe04..0c1d3fbd99b 100644 --- a/test/moves/endure.test.ts +++ b/test/moves/endure.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/entrainment.test.ts b/test/moves/entrainment.test.ts index 9d138b79364..dfb26aae6de 100644 --- a/test/moves/entrainment.test.ts +++ b/test/moves/entrainment.test.ts @@ -1,5 +1,5 @@ import { Stat } from "#app/enums/stat"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/fairy_lock.test.ts b/test/moves/fairy_lock.test.ts index 1e396bb7d69..e3557a8b147 100644 --- a/test/moves/fairy_lock.test.ts +++ b/test/moves/fairy_lock.test.ts @@ -1,6 +1,6 @@ import { ArenaTagSide } from "#app/data/arena-tag"; import { ArenaTagType } from "#app/enums/arena-tag-type"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/false_swipe.test.ts b/test/moves/false_swipe.test.ts index 324518bcde1..12266169719 100644 --- a/test/moves/false_swipe.test.ts +++ b/test/moves/false_swipe.test.ts @@ -1,5 +1,5 @@ import { MoveResult } from "#app/field/pokemon"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/fell_stinger.test.ts b/test/moves/fell_stinger.test.ts index 2fd6deb1a47..759537ba129 100644 --- a/test/moves/fell_stinger.test.ts +++ b/test/moves/fell_stinger.test.ts @@ -2,7 +2,7 @@ import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; import GameManager from "#test/testUtils/gameManager"; import { Species } from "#enums/species"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Stat } from "#enums/stat"; import { StatusEffect } from "#app/enums/status-effect"; diff --git a/test/moves/fissure.test.ts b/test/moves/fissure.test.ts index 61066a73887..9d6bea97e99 100644 --- a/test/moves/fissure.test.ts +++ b/test/moves/fissure.test.ts @@ -3,7 +3,7 @@ import { Species } from "#app/enums/species"; 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/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/flame_burst.test.ts b/test/moves/flame_burst.test.ts index 42cc3013055..c4c959bd44d 100644 --- a/test/moves/flame_burst.test.ts +++ b/test/moves/flame_burst.test.ts @@ -1,5 +1,5 @@ import { allAbilities } from "#app/data/data-lists"; -import { AbilityId } from "#app/enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import type Pokemon from "#app/field/pokemon"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Moves } from "#enums/moves"; diff --git a/test/moves/flower_shield.test.ts b/test/moves/flower_shield.test.ts index f41dacb9058..bfea7faf3ac 100644 --- a/test/moves/flower_shield.test.ts +++ b/test/moves/flower_shield.test.ts @@ -3,7 +3,7 @@ import { SemiInvulnerableTag } from "#app/data/battler-tags"; import { PokemonType } from "#enums/pokemon-type"; import { Biome } from "#app/enums/biome"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/fly.test.ts b/test/moves/fly.test.ts index b33bacce2b7..a340df2a358 100644 --- a/test/moves/fly.test.ts +++ b/test/moves/fly.test.ts @@ -1,7 +1,7 @@ import { BattlerTagType } from "#enums/battler-tag-type"; import { StatusEffect } from "#enums/status-effect"; import { MoveResult } from "#app/field/pokemon"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/focus_punch.test.ts b/test/moves/focus_punch.test.ts index 6f62285571d..e3da07852fd 100644 --- a/test/moves/focus_punch.test.ts +++ b/test/moves/focus_punch.test.ts @@ -3,7 +3,7 @@ import { MessagePhase } from "#app/phases/message-phase"; import { MoveHeaderPhase } from "#app/phases/move-header-phase"; import { SwitchSummonPhase } from "#app/phases/switch-summon-phase"; import { TurnStartPhase } from "#app/phases/turn-start-phase"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/follow_me.test.ts b/test/moves/follow_me.test.ts index 732e6b22161..4e55330525e 100644 --- a/test/moves/follow_me.test.ts +++ b/test/moves/follow_me.test.ts @@ -1,6 +1,6 @@ import { Stat } from "#enums/stat"; import { BattlerIndex } from "#app/battle"; -import { AbilityId } from "#app/enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; diff --git a/test/moves/forests_curse.test.ts b/test/moves/forests_curse.test.ts index d47b3071563..1273fbe62bc 100644 --- a/test/moves/forests_curse.test.ts +++ b/test/moves/forests_curse.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { PokemonType } from "#enums/pokemon-type"; diff --git a/test/moves/freeze_dry.test.ts b/test/moves/freeze_dry.test.ts index 20cfdc28db3..09b38bb277f 100644 --- a/test/moves/freeze_dry.test.ts +++ b/test/moves/freeze_dry.test.ts @@ -1,5 +1,5 @@ import { BattlerIndex } from "#app/battle"; -import { AbilityId } from "#app/enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#app/enums/moves"; import { Species } from "#app/enums/species"; import { PokemonType } from "#enums/pokemon-type"; diff --git a/test/moves/freezy_frost.test.ts b/test/moves/freezy_frost.test.ts index c0331eaa3ca..c8b5b806fe1 100644 --- a/test/moves/freezy_frost.test.ts +++ b/test/moves/freezy_frost.test.ts @@ -1,5 +1,5 @@ import { Stat } from "#enums/stat"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/fusion_bolt.test.ts b/test/moves/fusion_bolt.test.ts index 0a461232b91..49dfda99054 100644 --- a/test/moves/fusion_bolt.test.ts +++ b/test/moves/fusion_bolt.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/future_sight.test.ts b/test/moves/future_sight.test.ts index 44a96f5371b..4a6c95cbc65 100644 --- a/test/moves/future_sight.test.ts +++ b/test/moves/future_sight.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/gastro_acid.test.ts b/test/moves/gastro_acid.test.ts index 98f2e33628f..bae134ab6c3 100644 --- a/test/moves/gastro_acid.test.ts +++ b/test/moves/gastro_acid.test.ts @@ -1,5 +1,5 @@ import { BattlerIndex } from "#app/battle"; -import { AbilityId } from "#app/enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#app/enums/moves"; import { Species } from "#app/enums/species"; import { MoveResult } from "#app/field/pokemon"; diff --git a/test/moves/geomancy.test.ts b/test/moves/geomancy.test.ts index 6b1c51d0b34..e3f2a1c3d78 100644 --- a/test/moves/geomancy.test.ts +++ b/test/moves/geomancy.test.ts @@ -1,7 +1,7 @@ import type { EffectiveStat } from "#enums/stat"; import { Stat } from "#enums/stat"; import { MoveResult } from "#app/field/pokemon"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/glaive_rush.test.ts b/test/moves/glaive_rush.test.ts index da7c1befbf7..e6c2f470584 100644 --- a/test/moves/glaive_rush.test.ts +++ b/test/moves/glaive_rush.test.ts @@ -1,5 +1,5 @@ import { allMoves } from "#app/data/data-lists"; -import { AbilityId } from "#app/enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#app/enums/moves"; import { Species } from "#app/enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/growth.test.ts b/test/moves/growth.test.ts index 7ea566e82a1..ea8bf623f30 100644 --- a/test/moves/growth.test.ts +++ b/test/moves/growth.test.ts @@ -1,6 +1,6 @@ import { Stat } from "#enums/stat"; import GameManager from "#test/testUtils/gameManager"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import Phaser from "phaser"; diff --git a/test/moves/grudge.test.ts b/test/moves/grudge.test.ts index 3fe217d6961..4da3e2e6d09 100644 --- a/test/moves/grudge.test.ts +++ b/test/moves/grudge.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { BattlerIndex } from "#app/battle"; diff --git a/test/moves/guard_split.test.ts b/test/moves/guard_split.test.ts index e1806dcbf16..7c2427041db 100644 --- a/test/moves/guard_split.test.ts +++ b/test/moves/guard_split.test.ts @@ -5,7 +5,7 @@ import { Species } from "#enums/species"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Moves } from "#enums/moves"; import { Stat } from "#enums/stat"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; describe("Moves - Guard Split", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/guard_swap.test.ts b/test/moves/guard_swap.test.ts index 989aa4afd90..606cfe8a8af 100644 --- a/test/moves/guard_swap.test.ts +++ b/test/moves/guard_swap.test.ts @@ -5,7 +5,7 @@ import { Species } from "#enums/species"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Moves } from "#enums/moves"; import { Stat, BATTLE_STATS } from "#enums/stat"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { MoveEndPhase } from "#app/phases/move-end-phase"; describe("Moves - Guard Swap", () => { diff --git a/test/moves/hard_press.test.ts b/test/moves/hard_press.test.ts index b73f701ec1c..ac5bd4459d0 100644 --- a/test/moves/hard_press.test.ts +++ b/test/moves/hard_press.test.ts @@ -1,6 +1,6 @@ import { allMoves } from "#app/data/data-lists"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/haze.test.ts b/test/moves/haze.test.ts index 8cd14f2a7c9..1ce0108eb3e 100644 --- a/test/moves/haze.test.ts +++ b/test/moves/haze.test.ts @@ -1,6 +1,6 @@ import { Stat } from "#enums/stat"; import GameManager from "#test/testUtils/gameManager"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import Phaser from "phaser"; diff --git a/test/moves/heal_bell.test.ts b/test/moves/heal_bell.test.ts index 79d47c57ec0..879ebc946e4 100644 --- a/test/moves/heal_bell.test.ts +++ b/test/moves/heal_bell.test.ts @@ -1,6 +1,6 @@ import { StatusEffect } from "#app/enums/status-effect"; import { CommandPhase } from "#app/phases/command-phase"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/heal_block.test.ts b/test/moves/heal_block.test.ts index 3f20a09f37a..723402e717c 100644 --- a/test/moves/heal_block.test.ts +++ b/test/moves/heal_block.test.ts @@ -1,7 +1,7 @@ import { BattlerIndex } from "#app/battle"; import { ArenaTagSide } from "#app/data/arena-tag"; import GameManager from "#test/testUtils/gameManager"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { ArenaTagType } from "#enums/arena-tag-type"; import { BattlerTagType } from "#enums/battler-tag-type"; import { Moves } from "#enums/moves"; diff --git a/test/moves/heart_swap.test.ts b/test/moves/heart_swap.test.ts index cedca65a742..d4701143bd8 100644 --- a/test/moves/heart_swap.test.ts +++ b/test/moves/heart_swap.test.ts @@ -5,7 +5,7 @@ import { Species } from "#enums/species"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Moves } from "#enums/moves"; import { BATTLE_STATS } from "#enums/stat"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { MoveEndPhase } from "#app/phases/move-end-phase"; describe("Moves - Heart Swap", () => { diff --git a/test/moves/hyper_beam.test.ts b/test/moves/hyper_beam.test.ts index 181d0b43ce4..a7e263c29b5 100644 --- a/test/moves/hyper_beam.test.ts +++ b/test/moves/hyper_beam.test.ts @@ -1,5 +1,5 @@ import { allMoves } from "#app/data/data-lists"; -import { AbilityId } from "#app/enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#app/enums/battler-tag-type"; import { Moves } from "#app/enums/moves"; import { Species } from "#app/enums/species"; diff --git a/test/moves/imprison.test.ts b/test/moves/imprison.test.ts index 6af80cc7dc2..e2777d8c87a 100644 --- a/test/moves/imprison.test.ts +++ b/test/moves/imprison.test.ts @@ -1,6 +1,6 @@ import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/instruct.test.ts b/test/moves/instruct.test.ts index 50d4529f6be..ec924c58bdf 100644 --- a/test/moves/instruct.test.ts +++ b/test/moves/instruct.test.ts @@ -2,7 +2,7 @@ import { BattlerIndex } from "#app/battle"; 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/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/jaw_lock.test.ts b/test/moves/jaw_lock.test.ts index ee36dfcc6b8..8bc07334ed8 100644 --- a/test/moves/jaw_lock.test.ts +++ b/test/moves/jaw_lock.test.ts @@ -1,5 +1,5 @@ import { BattlerIndex } from "#app/battle"; -import { AbilityId } from "#app/enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#app/enums/battler-tag-type"; import { BerryPhase } from "#app/phases/berry-phase"; import { FaintPhase } from "#app/phases/faint-phase"; diff --git a/test/moves/lash_out.test.ts b/test/moves/lash_out.test.ts index 90929a0f483..592fc28250c 100644 --- a/test/moves/lash_out.test.ts +++ b/test/moves/lash_out.test.ts @@ -1,6 +1,6 @@ import { BattlerIndex } from "#app/battle"; import { allMoves } from "#app/data/data-lists"; -import { AbilityId } from "#app/enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/last-resort.test.ts b/test/moves/last-resort.test.ts index 3fa0835b70a..dcd85ee1366 100644 --- a/test/moves/last-resort.test.ts +++ b/test/moves/last-resort.test.ts @@ -1,6 +1,6 @@ import { BattlerIndex } from "#app/battle"; import { MoveResult } from "#app/field/pokemon"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/last_respects.test.ts b/test/moves/last_respects.test.ts index c1dfea6c88a..2ddc49df5df 100644 --- a/test/moves/last_respects.test.ts +++ b/test/moves/last_respects.test.ts @@ -1,7 +1,7 @@ import { Moves } from "#enums/moves"; import { BattlerIndex } from "#app/battle"; import { Species } from "#enums/species"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import GameManager from "#test/testUtils/gameManager"; import { allMoves } from "#app/data/data-lists"; import type Move from "#app/data/moves/move"; diff --git a/test/moves/light_screen.test.ts b/test/moves/light_screen.test.ts index 2d6e17471cd..be4cd7910ee 100644 --- a/test/moves/light_screen.test.ts +++ b/test/moves/light_screen.test.ts @@ -3,7 +3,7 @@ import { ArenaTagSide } from "#app/data/arena-tag"; import type Move from "#app/data/moves/move"; import { CritOnlyAttr } from "#app/data/moves/move"; import { allMoves } from "#app/data/data-lists"; -import { AbilityId } from "#app/enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { ArenaTagType } from "#app/enums/arena-tag-type"; import type Pokemon from "#app/field/pokemon"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; diff --git a/test/moves/lucky_chant.test.ts b/test/moves/lucky_chant.test.ts index 88c742cd008..ee83944fb92 100644 --- a/test/moves/lucky_chant.test.ts +++ b/test/moves/lucky_chant.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#app/enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#app/enums/battler-tag-type"; import { Moves } from "#app/enums/moves"; import { Species } from "#app/enums/species"; diff --git a/test/moves/lunar_blessing.test.ts b/test/moves/lunar_blessing.test.ts index fafcfd6b409..a5472057170 100644 --- a/test/moves/lunar_blessing.test.ts +++ b/test/moves/lunar_blessing.test.ts @@ -1,6 +1,6 @@ import { StatusEffect } from "#app/enums/status-effect"; import { CommandPhase } from "#app/phases/command-phase"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/lunar_dance.test.ts b/test/moves/lunar_dance.test.ts index 96e6399c552..61c6e9b79e0 100644 --- a/test/moves/lunar_dance.test.ts +++ b/test/moves/lunar_dance.test.ts @@ -1,6 +1,6 @@ import { StatusEffect } from "#app/enums/status-effect"; import { CommandPhase } from "#app/phases/command-phase"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/magic_coat.test.ts b/test/moves/magic_coat.test.ts index 2da4e63aade..500262fb3ac 100644 --- a/test/moves/magic_coat.test.ts +++ b/test/moves/magic_coat.test.ts @@ -6,7 +6,7 @@ import { BattlerTagType } from "#app/enums/battler-tag-type"; import { Stat } from "#app/enums/stat"; import { StatusEffect } from "#app/enums/status-effect"; import { MoveResult } from "#app/field/pokemon"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/make_it_rain.test.ts b/test/moves/make_it_rain.test.ts index ca594a6dc6a..452e447db3b 100644 --- a/test/moves/make_it_rain.test.ts +++ b/test/moves/make_it_rain.test.ts @@ -1,5 +1,5 @@ import { Stat } from "#enums/stat"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/mat_block.test.ts b/test/moves/mat_block.test.ts index 71d1d601c3f..5d70d94c9d2 100644 --- a/test/moves/mat_block.test.ts +++ b/test/moves/mat_block.test.ts @@ -2,7 +2,7 @@ import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; import GameManager from "#test/testUtils/gameManager"; import { Species } from "#enums/species"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Stat } from "#enums/stat"; import { BerryPhase } from "#app/phases/berry-phase"; diff --git a/test/moves/metal_burst.test.ts b/test/moves/metal_burst.test.ts index e547b00a420..d0cbc3ab61d 100644 --- a/test/moves/metal_burst.test.ts +++ b/test/moves/metal_burst.test.ts @@ -1,6 +1,6 @@ import { BattlerIndex } from "#app/battle"; import { MoveResult } from "#app/field/pokemon"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/metronome.test.ts b/test/moves/metronome.test.ts index b8dd155ed90..12dab595d53 100644 --- a/test/moves/metronome.test.ts +++ b/test/moves/metronome.test.ts @@ -1,7 +1,7 @@ import { RechargingTag, SemiInvulnerableTag } from "#app/data/battler-tags"; import { RandomMoveAttr } from "#app/data/moves/move"; import { allMoves } from "#app/data/data-lists"; -import { AbilityId } from "#app/enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Stat } from "#app/enums/stat"; import { CommandPhase } from "#app/phases/command-phase"; import { Moves } from "#enums/moves"; diff --git a/test/moves/mirror_move.test.ts b/test/moves/mirror_move.test.ts index 99e88a6eb63..7ece5ed8358 100644 --- a/test/moves/mirror_move.test.ts +++ b/test/moves/mirror_move.test.ts @@ -1,7 +1,7 @@ import { BattlerIndex } from "#app/battle"; import { Stat } from "#app/enums/stat"; import { MoveResult } from "#app/field/pokemon"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/mist.test.ts b/test/moves/mist.test.ts index a4702a53f1a..c404dfb17e2 100644 --- a/test/moves/mist.test.ts +++ b/test/moves/mist.test.ts @@ -1,5 +1,5 @@ import { Stat } from "#enums/stat"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/moongeist_beam.test.ts b/test/moves/moongeist_beam.test.ts index fcc9fe3fbd5..8065efd0231 100644 --- a/test/moves/moongeist_beam.test.ts +++ b/test/moves/moongeist_beam.test.ts @@ -1,6 +1,6 @@ import { RandomMoveAttr } from "#app/data/moves/move"; import { allMoves } from "#app/data/data-lists"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/multi_target.test.ts b/test/moves/multi_target.test.ts index 30da8537cc7..17958a96c02 100644 --- a/test/moves/multi_target.test.ts +++ b/test/moves/multi_target.test.ts @@ -1,5 +1,5 @@ import { BattlerIndex } from "#app/battle"; -import { AbilityId } from "#app/enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Species } from "#app/enums/species"; import { toDmgValue } from "#app/utils/common"; import { Moves } from "#enums/moves"; diff --git a/test/moves/nightmare.test.ts b/test/moves/nightmare.test.ts index d8cbef79426..9b6b3eb8cee 100644 --- a/test/moves/nightmare.test.ts +++ b/test/moves/nightmare.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; diff --git a/test/moves/obstruct.test.ts b/test/moves/obstruct.test.ts index 2372a116d12..3614cb2a199 100644 --- a/test/moves/obstruct.test.ts +++ b/test/moves/obstruct.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; diff --git a/test/moves/octolock.test.ts b/test/moves/octolock.test.ts index 9739511c28a..27b188a2bed 100644 --- a/test/moves/octolock.test.ts +++ b/test/moves/octolock.test.ts @@ -1,5 +1,5 @@ import { TrappedTag } from "#app/data/battler-tags"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; diff --git a/test/moves/order_up.test.ts b/test/moves/order_up.test.ts index c22386a7173..d858f84e824 100644 --- a/test/moves/order_up.test.ts +++ b/test/moves/order_up.test.ts @@ -3,7 +3,7 @@ import { BattlerTagType } from "#enums/battler-tag-type"; import { PokemonAnimType } from "#enums/pokemon-anim-type"; import type { EffectiveStat } from "#enums/stat"; import { Stat } from "#enums/stat"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/parting_shot.test.ts b/test/moves/parting_shot.test.ts index 74a0947b051..e9d3c992694 100644 --- a/test/moves/parting_shot.test.ts +++ b/test/moves/parting_shot.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import Phaser from "phaser"; diff --git a/test/moves/plasma_fists.test.ts b/test/moves/plasma_fists.test.ts index 0a0f6f4a921..1054ff38e80 100644 --- a/test/moves/plasma_fists.test.ts +++ b/test/moves/plasma_fists.test.ts @@ -1,6 +1,6 @@ import { BattlerIndex } from "#app/battle"; import { PokemonType } from "#enums/pokemon-type"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/pledge_moves.test.ts b/test/moves/pledge_moves.test.ts index 834930af9a8..260e1e9827b 100644 --- a/test/moves/pledge_moves.test.ts +++ b/test/moves/pledge_moves.test.ts @@ -7,7 +7,7 @@ import { PokemonType } from "#enums/pokemon-type"; import { ArenaTagType } from "#enums/arena-tag-type"; import { Stat } from "#enums/stat"; import { toDmgValue } from "#app/utils/common"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/pollen_puff.test.ts b/test/moves/pollen_puff.test.ts index 8b3d44d0529..e0a4f0ef5ee 100644 --- a/test/moves/pollen_puff.test.ts +++ b/test/moves/pollen_puff.test.ts @@ -1,5 +1,5 @@ import { BattlerIndex } from "#app/battle"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/powder.test.ts b/test/moves/powder.test.ts index 9fe405c308d..4f536896ae4 100644 --- a/test/moves/powder.test.ts +++ b/test/moves/powder.test.ts @@ -2,7 +2,7 @@ import { BattlerIndex } from "#app/battle"; 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/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { PokemonType } from "#enums/pokemon-type"; import { Species } from "#enums/species"; diff --git a/test/moves/power_shift.test.ts b/test/moves/power_shift.test.ts index c60ee98aaba..c8aad53e0e9 100644 --- a/test/moves/power_shift.test.ts +++ b/test/moves/power_shift.test.ts @@ -1,7 +1,7 @@ import { Moves } from "#app/enums/moves"; import { Species } from "#app/enums/species"; import { Stat } from "#app/enums/stat"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/power_split.test.ts b/test/moves/power_split.test.ts index 6f9141cf094..971da2b5ee0 100644 --- a/test/moves/power_split.test.ts +++ b/test/moves/power_split.test.ts @@ -5,7 +5,7 @@ import { Species } from "#enums/species"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Moves } from "#enums/moves"; import { Stat } from "#enums/stat"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; describe("Moves - Power Split", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/power_swap.test.ts b/test/moves/power_swap.test.ts index 8151a4bb436..fd095a678c3 100644 --- a/test/moves/power_swap.test.ts +++ b/test/moves/power_swap.test.ts @@ -5,7 +5,7 @@ import { Species } from "#enums/species"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Moves } from "#enums/moves"; import { Stat, BATTLE_STATS } from "#enums/stat"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { MoveEndPhase } from "#app/phases/move-end-phase"; describe("Moves - Power Swap", () => { diff --git a/test/moves/power_trick.test.ts b/test/moves/power_trick.test.ts index a846cc7fbad..b0f1d4265e5 100644 --- a/test/moves/power_trick.test.ts +++ b/test/moves/power_trick.test.ts @@ -5,7 +5,7 @@ import { Moves } from "#enums/moves"; import { Stat } from "#enums/stat"; import { Species } from "#enums/species"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#enums/battler-tag-type"; describe("Moves - Power Trick", () => { diff --git a/test/moves/protect.test.ts b/test/moves/protect.test.ts index 19fbe4af062..9471d772ae1 100644 --- a/test/moves/protect.test.ts +++ b/test/moves/protect.test.ts @@ -2,7 +2,7 @@ import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vitest"; import GameManager from "#test/testUtils/gameManager"; import { Species } from "#enums/species"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Stat } from "#enums/stat"; import { allMoves } from "#app/data/data-lists"; diff --git a/test/moves/psycho_shift.test.ts b/test/moves/psycho_shift.test.ts index 1e87efe191f..5f6c84b2f2d 100644 --- a/test/moves/psycho_shift.test.ts +++ b/test/moves/psycho_shift.test.ts @@ -1,5 +1,5 @@ import { StatusEffect } from "#app/enums/status-effect"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/quash.test.ts b/test/moves/quash.test.ts index 734fccdfb37..725970b7afe 100644 --- a/test/moves/quash.test.ts +++ b/test/moves/quash.test.ts @@ -1,6 +1,6 @@ import { Species } from "#enums/species"; import { Moves } from "#enums/moves"; -import { AbilityId } from "#app/enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { BattlerIndex } from "#app/battle"; import { WeatherType } from "#enums/weather-type"; import { MoveResult } from "#app/field/pokemon"; diff --git a/test/moves/quick_guard.test.ts b/test/moves/quick_guard.test.ts index df1873dbfd4..6fbe15a1a03 100644 --- a/test/moves/quick_guard.test.ts +++ b/test/moves/quick_guard.test.ts @@ -2,7 +2,7 @@ import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; import GameManager from "#test/testUtils/gameManager"; import { Species } from "#enums/species"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Stat } from "#enums/stat"; import { BattlerIndex } from "#app/battle"; diff --git a/test/moves/rage_fist.test.ts b/test/moves/rage_fist.test.ts index a7c0c376619..1d4d8a5d905 100644 --- a/test/moves/rage_fist.test.ts +++ b/test/moves/rage_fist.test.ts @@ -1,5 +1,5 @@ import { BattlerIndex } from "#app/battle"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { allMoves } from "#app/data/data-lists"; diff --git a/test/moves/rage_powder.test.ts b/test/moves/rage_powder.test.ts index f3d60c17242..92a38a210e3 100644 --- a/test/moves/rage_powder.test.ts +++ b/test/moves/rage_powder.test.ts @@ -1,5 +1,5 @@ import { BattlerIndex } from "#app/battle"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/reflect.test.ts b/test/moves/reflect.test.ts index 1637193e294..fde4d211d34 100644 --- a/test/moves/reflect.test.ts +++ b/test/moves/reflect.test.ts @@ -3,7 +3,7 @@ import { ArenaTagSide } from "#app/data/arena-tag"; import type Move from "#app/data/moves/move"; import { CritOnlyAttr } from "#app/data/moves/move"; import { allMoves } from "#app/data/data-lists"; -import { AbilityId } from "#app/enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { ArenaTagType } from "#app/enums/arena-tag-type"; import type Pokemon from "#app/field/pokemon"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; diff --git a/test/moves/reflect_type.test.ts b/test/moves/reflect_type.test.ts index 99750947753..a504cbc652a 100644 --- a/test/moves/reflect_type.test.ts +++ b/test/moves/reflect_type.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { PokemonType } from "#enums/pokemon-type"; diff --git a/test/moves/relic_song.test.ts b/test/moves/relic_song.test.ts index d83623407e9..aa3143a4bd2 100644 --- a/test/moves/relic_song.test.ts +++ b/test/moves/relic_song.test.ts @@ -1,6 +1,6 @@ import { PokemonType } from "#enums/pokemon-type"; import { Challenges } from "#app/enums/challenges"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/revival_blessing.test.ts b/test/moves/revival_blessing.test.ts index 20cc97416d1..a434ea97cbc 100644 --- a/test/moves/revival_blessing.test.ts +++ b/test/moves/revival_blessing.test.ts @@ -1,7 +1,7 @@ import { BattlerIndex } from "#app/battle"; import { MoveResult } from "#app/field/pokemon"; import { toDmgValue } from "#app/utils/common"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/role_play.test.ts b/test/moves/role_play.test.ts index 5ebb157427a..5aa9da892c5 100644 --- a/test/moves/role_play.test.ts +++ b/test/moves/role_play.test.ts @@ -1,5 +1,5 @@ import { Stat } from "#app/enums/stat"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/rollout.test.ts b/test/moves/rollout.test.ts index 45063bc0505..008bd049c38 100644 --- a/test/moves/rollout.test.ts +++ b/test/moves/rollout.test.ts @@ -1,6 +1,6 @@ import { allMoves } from "#app/data/data-lists"; import { CommandPhase } from "#app/phases/command-phase"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/round.test.ts b/test/moves/round.test.ts index 729dde357f0..c24c1cb8382 100644 --- a/test/moves/round.test.ts +++ b/test/moves/round.test.ts @@ -1,7 +1,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/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/safeguard.test.ts b/test/moves/safeguard.test.ts index 8d2d6c4bc74..a2bdafef41e 100644 --- a/test/moves/safeguard.test.ts +++ b/test/moves/safeguard.test.ts @@ -1,7 +1,7 @@ import { BattlerIndex } from "#app/battle"; import { PostDefendContactApplyStatusEffectAbAttr } from "#app/data/abilities/ability"; import { allAbilities } from "#app/data/data-lists"; -import { AbilityId } from "#app/enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { StatusEffect } from "#app/enums/status-effect"; import GameManager from "#test/testUtils/gameManager"; import { Moves } from "#enums/moves"; diff --git a/test/moves/scale_shot.test.ts b/test/moves/scale_shot.test.ts index 4775998acd7..5b0e826e003 100644 --- a/test/moves/scale_shot.test.ts +++ b/test/moves/scale_shot.test.ts @@ -4,7 +4,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 { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; diff --git a/test/moves/secret_power.test.ts b/test/moves/secret_power.test.ts index c84536c18f2..d0125c1a4fc 100644 --- a/test/moves/secret_power.test.ts +++ b/test/moves/secret_power.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Biome } from "#enums/biome"; import { Moves } from "#enums/moves"; import { Stat } from "#enums/stat"; diff --git a/test/moves/shed_tail.test.ts b/test/moves/shed_tail.test.ts index c01099a407d..ad8f8230894 100644 --- a/test/moves/shed_tail.test.ts +++ b/test/moves/shed_tail.test.ts @@ -1,6 +1,6 @@ import { SubstituteTag } from "#app/data/battler-tags"; import { MoveResult } from "#app/field/pokemon"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/shell_side_arm.test.ts b/test/moves/shell_side_arm.test.ts index 317c7b1d4d3..14683827eb0 100644 --- a/test/moves/shell_side_arm.test.ts +++ b/test/moves/shell_side_arm.test.ts @@ -2,7 +2,7 @@ import { BattlerIndex } from "#app/battle"; 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/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/simple_beam.test.ts b/test/moves/simple_beam.test.ts index 3b692eae8e7..8fefb3bfeb1 100644 --- a/test/moves/simple_beam.test.ts +++ b/test/moves/simple_beam.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/sketch.test.ts b/test/moves/sketch.test.ts index af470361ec9..d140f706982 100644 --- a/test/moves/sketch.test.ts +++ b/test/moves/sketch.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { MoveResult, PokemonMove } from "#app/field/pokemon"; diff --git a/test/moves/skill_swap.test.ts b/test/moves/skill_swap.test.ts index 5efc47a8589..0955d239352 100644 --- a/test/moves/skill_swap.test.ts +++ b/test/moves/skill_swap.test.ts @@ -1,5 +1,5 @@ import { Stat } from "#app/enums/stat"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/sleep_talk.test.ts b/test/moves/sleep_talk.test.ts index eb20abc1ce6..4edc86df24e 100644 --- a/test/moves/sleep_talk.test.ts +++ b/test/moves/sleep_talk.test.ts @@ -1,7 +1,7 @@ import { Stat } from "#app/enums/stat"; import { StatusEffect } from "#app/enums/status-effect"; import { MoveResult } from "#app/field/pokemon"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/solar_beam.test.ts b/test/moves/solar_beam.test.ts index beaacae990c..ef32925ceac 100644 --- a/test/moves/solar_beam.test.ts +++ b/test/moves/solar_beam.test.ts @@ -2,7 +2,7 @@ import { allMoves } from "#app/data/data-lists"; import { BattlerTagType } from "#enums/battler-tag-type"; import { WeatherType } from "#enums/weather-type"; import { MoveResult } from "#app/field/pokemon"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/sparkly_swirl.test.ts b/test/moves/sparkly_swirl.test.ts index 21fa9e58038..0cde057d124 100644 --- a/test/moves/sparkly_swirl.test.ts +++ b/test/moves/sparkly_swirl.test.ts @@ -1,7 +1,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/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/spectral_thief.test.ts b/test/moves/spectral_thief.test.ts index df509a8878b..e3cd0196fc3 100644 --- a/test/moves/spectral_thief.test.ts +++ b/test/moves/spectral_thief.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { BattlerIndex } from "#app/battle"; import { Stat } from "#enums/stat"; import { allMoves } from "#app/data/data-lists"; diff --git a/test/moves/speed_swap.test.ts b/test/moves/speed_swap.test.ts index 9fbdc35221f..a99031321a4 100644 --- a/test/moves/speed_swap.test.ts +++ b/test/moves/speed_swap.test.ts @@ -5,7 +5,7 @@ import { Species } from "#enums/species"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Moves } from "#enums/moves"; import { Stat } from "#enums/stat"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; describe("Moves - Speed Swap", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/spikes.test.ts b/test/moves/spikes.test.ts index 527e2858d7a..594edaec7fd 100644 --- a/test/moves/spikes.test.ts +++ b/test/moves/spikes.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/spit_up.test.ts b/test/moves/spit_up.test.ts index baeda1000d6..66df40e757b 100644 --- a/test/moves/spit_up.test.ts +++ b/test/moves/spit_up.test.ts @@ -5,7 +5,7 @@ import { BattlerTagType } from "#app/enums/battler-tag-type"; import type { TurnMove } from "#app/field/pokemon"; import { MoveResult } from "#app/field/pokemon"; import GameManager from "#test/testUtils/gameManager"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import type Move from "#app/data/moves/move"; import { Species } from "#enums/species"; diff --git a/test/moves/steamroller.test.ts b/test/moves/steamroller.test.ts index 44022ac0d6f..f2e688f7857 100644 --- a/test/moves/steamroller.test.ts +++ b/test/moves/steamroller.test.ts @@ -2,7 +2,7 @@ import { BattlerIndex } from "#app/battle"; 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/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/stockpile.test.ts b/test/moves/stockpile.test.ts index 0a5b6d56ebd..810d876b6ce 100644 --- a/test/moves/stockpile.test.ts +++ b/test/moves/stockpile.test.ts @@ -4,7 +4,7 @@ import type { TurnMove } from "#app/field/pokemon"; 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/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/struggle.test.ts b/test/moves/struggle.test.ts index 1cad69472cd..35cb5c49451 100644 --- a/test/moves/struggle.test.ts +++ b/test/moves/struggle.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/substitute.test.ts b/test/moves/substitute.test.ts index 0d4be517a29..15665472ca9 100644 --- a/test/moves/substitute.test.ts +++ b/test/moves/substitute.test.ts @@ -8,7 +8,7 @@ import type { CommandPhase } from "#app/phases/command-phase"; import GameManager from "#test/testUtils/gameManager"; import { Command } from "#app/ui/command-ui-handler"; import { UiMode } from "#enums/ui-mode"; -import { AbilityId } from "#enums/abilities"; +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"; diff --git a/test/moves/swallow.test.ts b/test/moves/swallow.test.ts index ffb30193d05..ed6c81a3d99 100644 --- a/test/moves/swallow.test.ts +++ b/test/moves/swallow.test.ts @@ -5,7 +5,7 @@ import type { TurnMove } from "#app/field/pokemon"; 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/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/synchronoise.test.ts b/test/moves/synchronoise.test.ts index d40fbf83db4..599e6885d49 100644 --- a/test/moves/synchronoise.test.ts +++ b/test/moves/synchronoise.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { PokemonType } from "#enums/pokemon-type"; import { Species } from "#enums/species"; diff --git a/test/moves/syrup_bomb.test.ts b/test/moves/syrup_bomb.test.ts index f35c6b2103c..a8418fb0dbb 100644 --- a/test/moves/syrup_bomb.test.ts +++ b/test/moves/syrup_bomb.test.ts @@ -1,6 +1,6 @@ import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#enums/battler-tag-type"; import { Stat } from "#enums/stat"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/tail_whip.test.ts b/test/moves/tail_whip.test.ts index 0d09de30fcf..8cb6fa65eeb 100644 --- a/test/moves/tail_whip.test.ts +++ b/test/moves/tail_whip.test.ts @@ -1,6 +1,6 @@ import { Stat } from "#enums/stat"; import GameManager from "#test/testUtils/gameManager"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import Phaser from "phaser"; diff --git a/test/moves/tailwind.test.ts b/test/moves/tailwind.test.ts index c499cf06770..d0ce3796eab 100644 --- a/test/moves/tailwind.test.ts +++ b/test/moves/tailwind.test.ts @@ -1,6 +1,6 @@ import { ArenaTagSide } from "#app/data/arena-tag"; import { ArenaTagType } from "#app/enums/arena-tag-type"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; diff --git a/test/moves/tar_shot.test.ts b/test/moves/tar_shot.test.ts index be5ab9a29dd..97bd50c7009 100644 --- a/test/moves/tar_shot.test.ts +++ b/test/moves/tar_shot.test.ts @@ -3,7 +3,7 @@ import { PokemonType } from "#enums/pokemon-type"; import { Moves } from "#app/enums/moves"; import { Species } from "#app/enums/species"; import { Stat } from "#app/enums/stat"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-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/taunt.test.ts b/test/moves/taunt.test.ts index 7b6011cae7b..b7b7911895f 100644 --- a/test/moves/taunt.test.ts +++ b/test/moves/taunt.test.ts @@ -1,6 +1,6 @@ import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/telekinesis.test.ts b/test/moves/telekinesis.test.ts index 3692c510b12..d2827a0c063 100644 --- a/test/moves/telekinesis.test.ts +++ b/test/moves/telekinesis.test.ts @@ -1,6 +1,6 @@ import { BattlerTagType } from "#enums/battler-tag-type"; import { allMoves } from "#app/data/data-lists"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { MoveResult } from "#app/field/pokemon"; diff --git a/test/moves/tera_blast.test.ts b/test/moves/tera_blast.test.ts index 317ba95b604..5baef1fe2a7 100644 --- a/test/moves/tera_blast.test.ts +++ b/test/moves/tera_blast.test.ts @@ -4,7 +4,7 @@ import { TeraMoveCategoryAttr } from "#app/data/moves/move"; import { allMoves } from "#app/data/data-lists"; import type Move from "#app/data/moves/move"; import { PokemonType } from "#enums/pokemon-type"; -import { AbilityId } from "#app/enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/tera_starstorm.test.ts b/test/moves/tera_starstorm.test.ts index 573a4acd600..5069ce3c20a 100644 --- a/test/moves/tera_starstorm.test.ts +++ b/test/moves/tera_starstorm.test.ts @@ -1,6 +1,6 @@ import { BattlerIndex } from "#app/battle"; import { PokemonType } from "#enums/pokemon-type"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/thousand_arrows.test.ts b/test/moves/thousand_arrows.test.ts index a2508da5e55..4cb8a5ceb6c 100644 --- a/test/moves/thousand_arrows.test.ts +++ b/test/moves/thousand_arrows.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#app/enums/abilities"; +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"; diff --git a/test/moves/throat_chop.test.ts b/test/moves/throat_chop.test.ts index b951360b736..713f5243047 100644 --- a/test/moves/throat_chop.test.ts +++ b/test/moves/throat_chop.test.ts @@ -2,7 +2,7 @@ import { BattlerIndex } from "#app/battle"; import { Moves } from "#app/enums/moves"; import { Species } from "#app/enums/species"; import { Stat } from "#app/enums/stat"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest"; diff --git a/test/moves/thunder_wave.test.ts b/test/moves/thunder_wave.test.ts index 02acbbdaf9e..6f321c6fcfe 100644 --- a/test/moves/thunder_wave.test.ts +++ b/test/moves/thunder_wave.test.ts @@ -1,5 +1,5 @@ import type { EnemyPokemon } from "#app/field/pokemon"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; diff --git a/test/moves/tidy_up.test.ts b/test/moves/tidy_up.test.ts index fde6089bc82..5f0a5c579fc 100644 --- a/test/moves/tidy_up.test.ts +++ b/test/moves/tidy_up.test.ts @@ -2,7 +2,7 @@ import { Stat } from "#enums/stat"; import { ArenaTagType } from "#app/enums/arena-tag-type"; import { MoveEndPhase } from "#app/phases/move-end-phase"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/torment.test.ts b/test/moves/torment.test.ts index 3c7afc7296d..07015a2b9e5 100644 --- a/test/moves/torment.test.ts +++ b/test/moves/torment.test.ts @@ -1,6 +1,6 @@ import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; diff --git a/test/moves/toxic_spikes.test.ts b/test/moves/toxic_spikes.test.ts index 3661e8086ca..af3d37336ba 100644 --- a/test/moves/toxic_spikes.test.ts +++ b/test/moves/toxic_spikes.test.ts @@ -2,7 +2,7 @@ import type { ArenaTrapTag } from "#app/data/arena-tag"; import { ArenaTagSide } from "#app/data/arena-tag"; import type { SessionSaveData } from "#app/system/game-data"; import { decrypt, encrypt, GameData } from "#app/system/game-data"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { ArenaTagType } from "#enums/arena-tag-type"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; diff --git a/test/moves/transform.test.ts b/test/moves/transform.test.ts index e855652962f..c1d0666845e 100644 --- a/test/moves/transform.test.ts +++ b/test/moves/transform.test.ts @@ -5,7 +5,7 @@ import { Species } from "#enums/species"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Moves } from "#enums/moves"; import { Stat, EFFECTIVE_STATS } from "#enums/stat"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { BattlerIndex } from "#app/battle"; // TODO: Add more tests once Transform is fully implemented diff --git a/test/moves/trick_or_treat.test.ts b/test/moves/trick_or_treat.test.ts index 59de7dde139..3f346cb8f2c 100644 --- a/test/moves/trick_or_treat.test.ts +++ b/test/moves/trick_or_treat.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { PokemonType } from "#enums/pokemon-type"; diff --git a/test/moves/triple_arrows.test.ts b/test/moves/triple_arrows.test.ts index e366924360c..abb5d69fdc7 100644 --- a/test/moves/triple_arrows.test.ts +++ b/test/moves/triple_arrows.test.ts @@ -1,6 +1,6 @@ import { FlinchAttr, StatStageChangeAttr } from "#app/data/moves/move"; import { allMoves } from "#app/data/data-lists"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import type Move from "#app/data/moves/move"; import { Species } from "#enums/species"; diff --git a/test/moves/u_turn.test.ts b/test/moves/u_turn.test.ts index 48ad687933e..75eeb36ac10 100644 --- a/test/moves/u_turn.test.ts +++ b/test/moves/u_turn.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; diff --git a/test/moves/upper_hand.test.ts b/test/moves/upper_hand.test.ts index 560f810eebd..a6137479b16 100644 --- a/test/moves/upper_hand.test.ts +++ b/test/moves/upper_hand.test.ts @@ -1,6 +1,6 @@ import { BattlerIndex } from "#app/battle"; import { MoveResult } from "#app/field/pokemon"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/whirlwind.test.ts b/test/moves/whirlwind.test.ts index 5f85bccaac6..f3739f83a62 100644 --- a/test/moves/whirlwind.test.ts +++ b/test/moves/whirlwind.test.ts @@ -2,7 +2,7 @@ import { BattlerTagType } from "#enums/battler-tag-type"; import { Challenges } from "#enums/challenges"; import { PokemonType } from "#enums/pokemon-type"; import { MoveResult } from "#app/field/pokemon"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/wide_guard.test.ts b/test/moves/wide_guard.test.ts index 2a8551d443a..414c90d41e6 100644 --- a/test/moves/wide_guard.test.ts +++ b/test/moves/wide_guard.test.ts @@ -2,7 +2,7 @@ import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; import GameManager from "#test/testUtils/gameManager"; import { Species } from "#enums/species"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Stat } from "#enums/stat"; import { BerryPhase } from "#app/phases/berry-phase"; diff --git a/test/moves/will_o_wisp.test.ts b/test/moves/will_o_wisp.test.ts index 1761d784721..f8137845155 100644 --- a/test/moves/will_o_wisp.test.ts +++ b/test/moves/will_o_wisp.test.ts @@ -1,5 +1,5 @@ import { BattlerIndex } from "#app/battle"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; 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 8936052572c..d66e2d97c66 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 @@ -18,7 +18,7 @@ import { Moves } from "#enums/moves"; import { ShinyRateBoosterModifier } from "#app/modifier/modifier"; import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; import i18next from "i18next"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; const namespace = "mysteryEncounters/anOfferYouCantRefuse"; /** Gyarados for Indimidate */ diff --git a/test/mystery-encounter/encounters/berries-abound-encounter.test.ts b/test/mystery-encounter/encounters/berries-abound-encounter.test.ts index ca71d15e783..f80e59a4798 100644 --- a/test/mystery-encounter/encounters/berries-abound-encounter.test.ts +++ b/test/mystery-encounter/encounters/berries-abound-encounter.test.ts @@ -20,7 +20,7 @@ import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encount import * as EncounterDialogueUtils from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; import { CommandPhase } from "#app/phases/command-phase"; import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; const namespace = "mysteryEncounters/berriesAbound"; const defaultParty = [Species.PYUKUMUKU, Species.MAGIKARP, Species.PIKACHU]; diff --git a/test/mystery-encounter/encounters/clowning-around-encounter.test.ts b/test/mystery-encounter/encounters/clowning-around-encounter.test.ts index 21383217293..4ac30401b4c 100644 --- a/test/mystery-encounter/encounters/clowning-around-encounter.test.ts +++ b/test/mystery-encounter/encounters/clowning-around-encounter.test.ts @@ -23,7 +23,7 @@ import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils import { ModifierTier } from "#app/modifier/modifier-tier"; import { ClowningAroundEncounter } from "#app/data/mystery-encounters/encounters/clowning-around-encounter"; import { TrainerType } from "#enums/trainer-type"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { PostMysteryEncounterPhase } from "#app/phases/mystery-encounter-phases"; import { Button } from "#enums/buttons"; import type PartyUiHandler from "#app/ui/party-ui-handler"; diff --git a/test/mystery-encounter/encounters/fiery-fallout-encounter.test.ts b/test/mystery-encounter/encounters/fiery-fallout-encounter.test.ts index 777ad075d2a..9dec21f7ce2 100644 --- a/test/mystery-encounter/encounters/fiery-fallout-encounter.test.ts +++ b/test/mystery-encounter/encounters/fiery-fallout-encounter.test.ts @@ -27,7 +27,7 @@ import { CommandPhase } from "#app/phases/command-phase"; import { MovePhase } from "#app/phases/move-phase"; import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; import { BattlerTagType } from "#enums/battler-tag-type"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import i18next from "i18next"; import { StatusEffect } from "#enums/status-effect"; diff --git a/test/mystery-encounter/encounters/teleporting-hijinks-encounter.test.ts b/test/mystery-encounter/encounters/teleporting-hijinks-encounter.test.ts index 73cb26414f7..45412033491 100644 --- a/test/mystery-encounter/encounters/teleporting-hijinks-encounter.test.ts +++ b/test/mystery-encounter/encounters/teleporting-hijinks-encounter.test.ts @@ -1,7 +1,7 @@ import type BattleScene from "#app/battle-scene"; import { TeleportingHijinksEncounter } from "#app/data/mystery-encounters/encounters/teleporting-hijinks-encounter"; import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Biome } from "#enums/biome"; import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { Species } from "#enums/species"; 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 6c0ba0cf615..5401d5e9d08 100644 --- a/test/mystery-encounter/encounters/the-strong-stuff-encounter.test.ts +++ b/test/mystery-encounter/encounters/the-strong-stuff-encounter.test.ts @@ -28,7 +28,7 @@ import { CustomPokemonData } from "#app/data/custom-pokemon-data"; import { CommandPhase } from "#app/phases/command-phase"; import { MovePhase } from "#app/phases/move-phase"; import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; const namespace = "mysteryEncounters/theStrongStuff"; const defaultParty = [Species.LAPRAS, Species.GENGAR, Species.ABRA]; diff --git a/test/mystery-encounter/encounters/uncommon-breed-encounter.test.ts b/test/mystery-encounter/encounters/uncommon-breed-encounter.test.ts index f05796df250..5b32429e1bf 100644 --- a/test/mystery-encounter/encounters/uncommon-breed-encounter.test.ts +++ b/test/mystery-encounter/encounters/uncommon-breed-encounter.test.ts @@ -27,7 +27,7 @@ import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase"; import { Stat } from "#enums/stat"; import type { BerryModifier } from "#app/modifier/modifier"; import { modifierTypes } from "#app/modifier/modifier-type"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; const namespace = "mysteryEncounters/uncommonBreed"; const defaultParty = [Species.LAPRAS, Species.GENGAR, Species.ABRA]; diff --git a/test/phases/form-change-phase.test.ts b/test/phases/form-change-phase.test.ts index 2c7006248a0..df89846a474 100644 --- a/test/phases/form-change-phase.test.ts +++ b/test/phases/form-change-phase.test.ts @@ -1,4 +1,4 @@ -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/phases/frenzy-move-reset.test.ts b/test/phases/frenzy-move-reset.test.ts index b69ebd967c3..b52b198661f 100644 --- a/test/phases/frenzy-move-reset.test.ts +++ b/test/phases/frenzy-move-reset.test.ts @@ -1,5 +1,5 @@ import { BattlerIndex } from "#app/battle"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { BattlerTagType } from "#enums/battler-tag-type"; import { StatusEffect } from "#enums/status-effect"; import { Moves } from "#enums/moves"; diff --git a/test/phases/game-over-phase.test.ts b/test/phases/game-over-phase.test.ts index b781061afa8..49b687eee10 100644 --- a/test/phases/game-over-phase.test.ts +++ b/test/phases/game-over-phase.test.ts @@ -1,5 +1,5 @@ import { Biome } from "#enums/biome"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/phases/select-modifier-phase.test.ts b/test/phases/select-modifier-phase.test.ts index 1e3674d6603..64ab17e9d15 100644 --- a/test/phases/select-modifier-phase.test.ts +++ b/test/phases/select-modifier-phase.test.ts @@ -8,7 +8,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 { shiftCharCodes } from "#app/utils/common"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Button } from "#enums/buttons"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; diff --git a/test/system/game_data.test.ts b/test/system/game_data.test.ts index 9599c9e0703..7d9b7cdd712 100644 --- a/test/system/game_data.test.ts +++ b/test/system/game_data.test.ts @@ -1,7 +1,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/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/testUtils/helpers/field-helper.ts b/test/testUtils/helpers/field-helper.ts index 80127e96b87..08b7a210e68 100644 --- a/test/testUtils/helpers/field-helper.ts +++ b/test/testUtils/helpers/field-helper.ts @@ -8,7 +8,7 @@ import type { Ability } from "#app/data/abilities/ability-class"; import { allAbilities } from "#app/data/data-lists"; import type Pokemon from "#app/field/pokemon"; import type { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon"; -import type { AbilityId } from "#enums/abilities"; +import type { AbilityId } from "#enums/ability-id"; import type { PokemonType } from "#enums/pokemon-type"; import { Stat } from "#enums/stat"; import { GameManagerHelper } from "#test/testUtils/helpers/gameManagerHelper"; diff --git a/test/testUtils/helpers/overridesHelper.ts b/test/testUtils/helpers/overridesHelper.ts index 62e2648f4c5..36b4264119d 100644 --- a/test/testUtils/helpers/overridesHelper.ts +++ b/test/testUtils/helpers/overridesHelper.ts @@ -1,6 +1,6 @@ import type { Variant } from "#app/sprites/variant"; import { Weather } from "#app/data/weather"; -import { AbilityId } from "#app/enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import type { ModifierOverride } from "#app/modifier/modifier-type"; import type { BattleStyle } from "#app/overrides"; import Overrides, { defaultOverrides } from "#app/overrides"; diff --git a/test/ui/battle_info.test.ts b/test/ui/battle_info.test.ts index badf4206d74..55eb2591ead 100644 --- a/test/ui/battle_info.test.ts +++ b/test/ui/battle_info.test.ts @@ -1,7 +1,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/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Moves } from "#enums/moves"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/ui/pokedex.test.ts b/test/ui/pokedex.test.ts index ac40c868877..4d7f5d2d10c 100644 --- a/test/ui/pokedex.test.ts +++ b/test/ui/pokedex.test.ts @@ -4,7 +4,7 @@ import { afterEach, beforeAll, beforeEach, describe, expect, it, type MockInstan import PokedexUiHandler from "#app/ui/pokedex-ui-handler"; import { FilterTextRow } from "#app/ui/filter-text"; import { allAbilities } from "#app/data/data-lists"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Species } from "#enums/species"; import { allSpecies, getPokemonSpecies, type PokemonForm } from "#app/data/pokemon-species"; import { Button } from "#enums/buttons"; diff --git a/test/ui/starter-select.test.ts b/test/ui/starter-select.test.ts index 257dbcd5a60..01ee0d36aa2 100644 --- a/test/ui/starter-select.test.ts +++ b/test/ui/starter-select.test.ts @@ -10,7 +10,7 @@ import type SaveSlotSelectUiHandler from "#app/ui/save-slot-select-ui-handler"; import type OptionSelectUiHandler from "#app/ui/settings/option-select-ui-handler"; import type StarterSelectUiHandler from "#app/ui/starter-select-ui-handler"; import { UiMode } from "#enums/ui-mode"; -import { AbilityId } from "#enums/abilities"; +import { AbilityId } from "#enums/ability-id"; import { Button } from "#enums/buttons"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager";