diff --git a/src/data/abilities/ability.ts b/src/data/abilities/ability.ts index 1cb19e57533..6bdf299b5c2 100644 --- a/src/data/abilities/ability.ts +++ b/src/data/abilities/ability.ts @@ -57,9 +57,9 @@ import { BattlerTagType } from "#enums/battler-tag-type"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { SwitchType } from "#enums/switch-type"; -import { MoveFlags } from "#enums/MoveFlags"; -import { MoveTarget } from "#enums/MoveTarget"; -import { MoveCategory } from "#enums/MoveCategory"; +import { MoveFlags } from "#enums/move-flags"; +import { MoveTarget } from "#enums/move-target"; +import { MoveCategory } from "#enums/move-category"; import type { BerryType } from "#enums/berry-type"; import { CommonAnimPhase } from "#app/phases/common-anim-phase"; import { CommonAnim } from "../battle-anims"; diff --git a/src/data/arena-tag.ts b/src/data/arena-tag.ts index 19c94a8a045..6b301407c12 100644 --- a/src/data/arena-tag.ts +++ b/src/data/arena-tag.ts @@ -3,8 +3,8 @@ import type { Arena } from "#app/field/arena"; import { PokemonType } from "#enums/pokemon-type"; import { BooleanHolder, NumberHolder, toDmgValue } from "#app/utils/common"; import { allMoves } from "#app/data/moves/move"; -import { MoveTarget } from "#enums/MoveTarget"; -import { MoveCategory } from "#enums/MoveCategory"; +import { MoveTarget } from "#enums/move-target"; +import { MoveCategory } from "#enums/move-category"; import { getPokemonNameWithAffix } from "#app/messages"; import type Pokemon from "#app/field/pokemon"; import { HitResult } from "#app/field/pokemon"; diff --git a/src/data/battle-anims.ts b/src/data/battle-anims.ts index 454bd40130c..5f6d75b6e9d 100644 --- a/src/data/battle-anims.ts +++ b/src/data/battle-anims.ts @@ -1,6 +1,6 @@ import { globalScene } from "#app/global-scene"; import { AttackMove, BeakBlastHeaderAttr, DelayedAttackAttr, SelfStatusMove, allMoves } from "./moves/move"; -import { MoveFlags } from "#enums/MoveFlags"; +import { MoveFlags } from "#enums/move-flags"; import type Pokemon from "../field/pokemon"; import { type nil, getFrameMs, getEnumKeys, getEnumValues, animationFileName } from "../utils/common"; import type { BattlerIndex } from "../battle"; diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts index 8a512f3c16c..0cb1efd62ac 100644 --- a/src/data/battler-tags.ts +++ b/src/data/battler-tags.ts @@ -18,8 +18,8 @@ import { HealOnAllyAttr, StatusCategoryOnAllyAttr, } from "#app/data/moves/move"; -import { MoveFlags } from "#enums/MoveFlags"; -import { MoveCategory } from "#enums/MoveCategory"; +import { MoveFlags } from "#enums/move-flags"; +import { MoveCategory } from "#enums/move-category"; import { SpeciesFormChangeAbilityTrigger } from "#app/data/pokemon-forms"; import { getStatusEffectHealText } from "#app/data/status-effect"; import { TerrainType } from "#app/data/terrain"; diff --git a/src/data/moves/move-utils.ts b/src/data/moves/move-utils.ts index 3323d6f4a0c..f5e6516cdcd 100644 --- a/src/data/moves/move-utils.ts +++ b/src/data/moves/move-utils.ts @@ -1,4 +1,4 @@ -import { MoveTarget } from "#enums/MoveTarget"; +import { MoveTarget } from "#enums/move-target"; import type Move from "./move"; /** diff --git a/src/data/moves/move.ts b/src/data/moves/move.ts index 81ae499da10..408893cea66 100644 --- a/src/data/moves/move.ts +++ b/src/data/moves/move.ts @@ -116,11 +116,11 @@ import { LoadMoveAnimPhase } from "#app/phases/load-move-anim-phase"; import { PokemonTransformPhase } from "#app/phases/pokemon-transform-phase"; import { MoveAnimPhase } from "#app/phases/move-anim-phase"; import { loggedInUser } from "#app/account"; -import { MoveCategory } from "#enums/MoveCategory"; -import { MoveTarget } from "#enums/MoveTarget"; -import { MoveFlags } from "#enums/MoveFlags"; -import { MoveEffectTrigger } from "#enums/MoveEffectTrigger"; -import { MultiHitType } from "#enums/MultiHitType"; +import { MoveCategory } from "#enums/move-category"; +import { MoveTarget } from "#enums/move-target"; +import { MoveFlags } from "#enums/move-flags"; +import { MoveEffectTrigger } from "#enums/move-effect-trigger"; +import { MultiHitType } from "#enums/multi-hit-yype"; import { invalidAssistMoves, invalidCopycatMoves, invalidMetronomeMoves, invalidMirrorMoveMoves, invalidSleepTalkMoves } from "./invalid-moves"; import { SelectBiomePhase } from "#app/phases/select-biome-phase"; diff --git a/src/data/mystery-encounters/encounters/clowning-around-encounter.ts b/src/data/mystery-encounters/encounters/clowning-around-encounter.ts index 88ff669be55..f53142101d8 100644 --- a/src/data/mystery-encounters/encounters/clowning-around-encounter.ts +++ b/src/data/mystery-encounters/encounters/clowning-around-encounter.ts @@ -44,7 +44,7 @@ import { BerryType } from "#enums/berry-type"; import { BattlerIndex } from "#app/battle"; import { Moves } from "#enums/moves"; import { EncounterBattleAnim } from "#app/data/battle-anims"; -import { MoveCategory } from "#enums/MoveCategory"; +import { MoveCategory } from "#enums/move-category"; import { CustomPokemonData } from "#app/data/custom-pokemon-data"; import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; import { EncounterAnim } from "#enums/encounter-anims"; diff --git a/src/data/mystery-encounters/encounters/field-trip-encounter.ts b/src/data/mystery-encounters/encounters/field-trip-encounter.ts index 2cd6123838b..b6a6d55c225 100644 --- a/src/data/mystery-encounters/encounters/field-trip-encounter.ts +++ b/src/data/mystery-encounters/encounters/field-trip-encounter.ts @@ -1,4 +1,4 @@ -import { MoveCategory } from "#enums/MoveCategory"; +import { MoveCategory } from "#enums/move-category"; import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; import { generateModifierTypeOption, diff --git a/src/data/pokemon-forms.ts b/src/data/pokemon-forms.ts index f76462d2725..677055b588c 100644 --- a/src/data/pokemon-forms.ts +++ b/src/data/pokemon-forms.ts @@ -2,7 +2,7 @@ import { PokemonFormChangeItemModifier } from "../modifier/modifier"; import type Pokemon from "../field/pokemon"; import { StatusEffect } from "#enums/status-effect"; import { allMoves } from "./moves/move"; -import { MoveCategory } from "#enums/MoveCategory"; +import { MoveCategory } from "#enums/move-category"; import type { Constructor, nil } from "#app/utils/common"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; diff --git a/src/enums/MoveCategory.ts b/src/enums/move-category.ts similarity index 100% rename from src/enums/MoveCategory.ts rename to src/enums/move-category.ts diff --git a/src/enums/MoveEffectTrigger.ts b/src/enums/move-effect-trigger.ts similarity index 100% rename from src/enums/MoveEffectTrigger.ts rename to src/enums/move-effect-trigger.ts diff --git a/src/enums/MoveFlags.ts b/src/enums/move-flags.ts similarity index 100% rename from src/enums/MoveFlags.ts rename to src/enums/move-flags.ts diff --git a/src/enums/MoveTarget.ts b/src/enums/move-target.ts similarity index 100% rename from src/enums/MoveTarget.ts rename to src/enums/move-target.ts diff --git a/src/enums/MultiHitType.ts b/src/enums/multi-hit-yype.ts similarity index 100% rename from src/enums/MultiHitType.ts rename to src/enums/multi-hit-yype.ts diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index b9c64ad071c..68c90eb7acf 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -41,8 +41,8 @@ import { VariableMoveTypeChartAttr, HpSplitAttr, } from "#app/data/moves/move"; -import { MoveTarget } from "#enums/MoveTarget"; -import { MoveCategory } from "#enums/MoveCategory"; +import { MoveTarget } from "#enums/move-target"; +import { MoveCategory } from "#enums/move-category"; import type { PokemonSpeciesForm } from "#app/data/pokemon-species"; import { default as PokemonSpecies, @@ -255,7 +255,7 @@ import { import { Nature } from "#enums/nature"; import { StatusEffect } from "#enums/status-effect"; import { doShinySparkleAnim } from "#app/field/anims"; -import { MoveFlags } from "#enums/MoveFlags"; +import { MoveFlags } from "#enums/move-flags"; import { timedEventManager } from "#app/global-event-manager"; import { loadMoveAnimations } from "#app/sprites/pokemon-asset-loader"; import { ResetStatusPhase } from "#app/phases/reset-status-phase"; diff --git a/src/phases/move-effect-phase.ts b/src/phases/move-effect-phase.ts index 64cae923f07..a5fb1a75cc3 100644 --- a/src/phases/move-effect-phase.ts +++ b/src/phases/move-effect-phase.ts @@ -42,10 +42,10 @@ import { StatChangeBeforeDmgCalcAttr, ToxicAccuracyAttr, } from "#app/data/moves/move"; -import { MoveEffectTrigger } from "#enums/MoveEffectTrigger"; -import { MoveFlags } from "#enums/MoveFlags"; -import { MoveTarget } from "#enums/MoveTarget"; -import { MoveCategory } from "#enums/MoveCategory"; +import { MoveEffectTrigger } from "#enums/move-effect-trigger"; +import { MoveFlags } from "#enums/move-flags"; +import { MoveTarget } from "#enums/move-target"; +import { MoveCategory } from "#enums/move-category"; import { SpeciesFormChangePostMoveTrigger } from "#app/data/pokemon-forms"; import { PokemonType } from "#enums/pokemon-type"; import { DamageResult, PokemonMove, type TurnMove } from "#app/field/pokemon"; diff --git a/src/phases/move-phase.ts b/src/phases/move-phase.ts index e704b040d20..f9357e27351 100644 --- a/src/phases/move-phase.ts +++ b/src/phases/move-phase.ts @@ -27,7 +27,7 @@ import { PreMoveMessageAttr, PreUseInterruptAttr, } from "#app/data/moves/move"; -import { MoveFlags } from "#enums/MoveFlags"; +import { MoveFlags } from "#enums/move-flags"; import { SpeciesFormChangePreMoveTrigger } from "#app/data/pokemon-forms"; import { getStatusEffectActivationText, getStatusEffectHealText } from "#app/data/status-effect"; import { PokemonType } from "#enums/pokemon-type"; diff --git a/src/ui/fight-ui-handler.ts b/src/ui/fight-ui-handler.ts index 5a0978a934d..1058cdedf04 100644 --- a/src/ui/fight-ui-handler.ts +++ b/src/ui/fight-ui-handler.ts @@ -7,7 +7,7 @@ import { Command } from "./command-ui-handler"; import { UiMode } from "#enums/ui-mode"; import UiHandler from "./ui-handler"; import { getLocalizedSpriteKey, fixedInt, padInt } from "#app/utils/common"; -import { MoveCategory } from "#enums/MoveCategory"; +import { MoveCategory } from "#enums/move-category"; import i18next from "i18next"; import { Button } from "#enums/buttons"; import type { PokemonMove } from "#app/field/pokemon"; diff --git a/src/ui/move-info-overlay.ts b/src/ui/move-info-overlay.ts index 2b230d609fd..4bc36b53add 100644 --- a/src/ui/move-info-overlay.ts +++ b/src/ui/move-info-overlay.ts @@ -4,7 +4,7 @@ import { TextStyle, addTextObject } from "./text"; import { addWindow } from "./ui-theme"; import { getLocalizedSpriteKey, fixedInt } from "#app/utils/common"; import type Move from "../data/moves/move"; -import { MoveCategory } from "#enums/MoveCategory"; +import { MoveCategory } from "#enums/move-category"; import { PokemonType } from "#enums/pokemon-type"; import i18next from "i18next"; diff --git a/src/ui/summary-ui-handler.ts b/src/ui/summary-ui-handler.ts index f93a1826b3e..eb94e7ccef7 100644 --- a/src/ui/summary-ui-handler.ts +++ b/src/ui/summary-ui-handler.ts @@ -19,7 +19,7 @@ import { getTypeRgb } from "#app/data/type"; import { PokemonType } from "#enums/pokemon-type"; import { TextStyle, addBBCodeTextObject, addTextObject, getBBCodeFrag } from "#app/ui/text"; import type Move from "#app/data/moves/move"; -import { MoveCategory } from "#enums/MoveCategory"; +import { MoveCategory } from "#enums/move-category"; import { getPokeballAtlasKey } from "#app/data/pokeball"; import { getGenderColor, getGenderSymbol } from "#app/data/gender"; import { getLevelRelExp, getLevelTotalExp } from "#app/data/exp"; diff --git a/test/abilities/battle_bond.test.ts b/test/abilities/battle_bond.test.ts index d599b3212f9..ebc64249d1e 100644 --- a/test/abilities/battle_bond.test.ts +++ b/test/abilities/battle_bond.test.ts @@ -1,5 +1,5 @@ import { allMoves, MultiHitAttr } from "#app/data/moves/move"; -import { MultiHitType } from "#enums/MultiHitType"; +import { MultiHitType } from "#enums/multi-hit-yype"; import { Status } from "#app/data/status-effect"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; diff --git a/test/abilities/friend_guard.test.ts b/test/abilities/friend_guard.test.ts index 43a378c47a2..8e76a630330 100644 --- a/test/abilities/friend_guard.test.ts +++ b/test/abilities/friend_guard.test.ts @@ -7,7 +7,7 @@ import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vite import { BattlerIndex } from "#app/battle"; import { allAbilities } from "#app/data/data-lists"; import { allMoves } from "#app/data/moves/move"; -import { MoveCategory } from "#enums/MoveCategory"; +import { MoveCategory } from "#enums/move-category"; describe("Moves - Friend Guard", () => { let phaserGame: Phaser.Game; diff --git a/test/enemy_command.test.ts b/test/enemy_command.test.ts index ae1f2918798..81fdda3b821 100644 --- a/test/enemy_command.test.ts +++ b/test/enemy_command.test.ts @@ -1,6 +1,6 @@ import type BattleScene from "#app/battle-scene"; import { allMoves } from "#app/data/moves/move"; -import { MoveCategory } from "#enums/MoveCategory"; +import { MoveCategory } from "#enums/move-category"; import { Abilities } from "#app/enums/abilities"; import { Moves } from "#app/enums/moves"; import { Species } from "#app/enums/species";