Merge 3a4a8d30f3 into 1042b528ec

create-test-boilerplate.js

@@ -71,15 +71,17 @@ async function runInteractive() {
   const fileNameAnswer = await promptFileName(typeAnswer.selectedOption);
 
   const type = typeAnswer.selectedOption.toLowerCase();
-  // Convert fileName from kebab-case or camelCase to snake_case
-  const fileName = fileNameAnswer.userInput
-    .replace(/-+/g, "_") // Convert kebab-case (dashes) to underscores
-    .replace(/([a-z])([A-Z])/g, "$1_$2") // Convert camelCase to snake_case
-    .replace(/\s+/g, "_") // Replace spaces with underscores
+  // Convert fileName to kebab-case
+  // Ex: "Cud Chew/Cud-Chew" --> "cud-chew"
+  const fileName = fileNameAnswer.userInput;
+  replace(/_+/g, "-") // Convert snake-case (underscores) to dashes
+    .replace(/([a-z])([A-Z])/g, "$1-$2") // Convert camelCase to kebab-case
+    .replace(/\s+/g, "-") // Replace spaces with dashes
     .toLowerCase(); // Ensure all lowercase
-  // Format the description for the test case
 
-  const formattedName = fileName.replace(/_/g, " ").replace(/\b\w/g, char => char.toUpperCase());
+  // Get Title Case name for the test header ("cud-chew" --> Cud Chew)
+  const formattedName = fileName.replace(/-/g, " ").replace(/\b\w/g, char => char.toUpperCase());
+
   // Determine the directory based on the type
   let dir;
   let description;
@@ -130,9 +132,9 @@ describe("${description}", () => {
   beforeEach(() => {
     game = new GameManager(phaserGame);
     game.override
-      .moveset([ Moves.SPLASH ])
+      .moveset(Moves.SPLASH)
       .ability(Abilities.BALL_FETCH)
-      .battleType("single")
+      .battleStyle("single")
       .disableCrits()
       .enemySpecies(Species.MAGIKARP)
       .enemyAbility(Abilities.BALL_FETCH)

src/@types/pokerogue-account-api.ts

@@ -1,4 +1,4 @@
-import type { UserInfo } from "#app/@types/UserInfo";
+import type { UserInfo } from "#app/@types/user-Info";
 
 export interface AccountInfoResponse extends UserInfo {}
 

src/account.ts

@@ -1,5 +1,5 @@
 import { pokerogueApi } from "#app/plugins/api/pokerogue-api";
-import type { UserInfo } from "#app/@types/UserInfo";
+import type { UserInfo } from "#app/@types/user-Info";
 import { bypassLogin } from "./global-vars/bypass-login";
 import { randomString } from "#app/utils/common";
 

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";

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";

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";

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";

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";
 
 /**

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";
 

src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts

@@ -10,8 +10,8 @@ import {
   transitionMysteryEncounterIntroVisuals,
 } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import { getRandomPartyMemberFunc, trainerConfigs } from "#app/data/trainers/trainer-config";
-import { TrainerPartyCompoundTemplate } from "#app/data/trainers/TrainerPartyTemplate";
-import { TrainerPartyTemplate } from "#app/data/trainers/TrainerPartyTemplate";
+import { TrainerPartyCompoundTemplate } from "#app/data/trainers/trainer-party-template";
+import { TrainerPartyTemplate } from "#app/data/trainers/trainer-party-template";
 import { TrainerSlot } from "#enums/trainer-slot";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { PartyMemberStrength } from "#enums/party-member-strength";
@@ -144,20 +144,14 @@ const POOL_3_POKEMON: { species: Species; formIndex?: number }[] = [
 
 const POOL_4_POKEMON = [Species.GENESECT, Species.SLITHER_WING, Species.BUZZWOLE, Species.PHEROMOSA];
 
-const PHYSICAL_TUTOR_MOVES = [
-  Moves.MEGAHORN,
-  Moves.ATTACK_ORDER,
-  Moves.BUG_BITE,
-  Moves.FIRST_IMPRESSION,
-  Moves.LUNGE
-];
+const PHYSICAL_TUTOR_MOVES = [Moves.MEGAHORN, Moves.ATTACK_ORDER, Moves.BUG_BITE, Moves.FIRST_IMPRESSION, Moves.LUNGE];
 
 const SPECIAL_TUTOR_MOVES = [
   Moves.SILVER_WIND,
   Moves.SIGNAL_BEAM,
   Moves.BUG_BUZZ,
   Moves.POLLEN_PUFF,
-  Moves.STRUGGLE_BUG
+  Moves.STRUGGLE_BUG,
 ];
 
 const STATUS_TUTOR_MOVES = [
@@ -165,16 +159,10 @@ const STATUS_TUTOR_MOVES = [
   Moves.DEFEND_ORDER,
   Moves.RAGE_POWDER,
   Moves.STICKY_WEB,
-  Moves.SILK_TRAP
+  Moves.SILK_TRAP,
 ];
 
-const MISC_TUTOR_MOVES = [
-  Moves.LEECH_LIFE,
-  Moves.U_TURN,
-  Moves.HEAL_ORDER,
-  Moves.QUIVER_DANCE,
-  Moves.INFESTATION,
-];
+const MISC_TUTOR_MOVES = [Moves.LEECH_LIFE, Moves.U_TURN, Moves.HEAL_ORDER, Moves.QUIVER_DANCE, Moves.INFESTATION];
 
 /**
  * Wave breakpoints that determine how strong to make the Bug-Type Superfan's team

src/data/mystery-encounters/encounters/clowning-around-encounter.ts

@@ -9,8 +9,8 @@ import {
   transitionMysteryEncounterIntroVisuals,
 } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import { trainerConfigs } from "#app/data/trainers/trainer-config";
-import { TrainerPartyCompoundTemplate } from "#app/data/trainers/TrainerPartyTemplate";
-import { TrainerPartyTemplate } from "#app/data/trainers/TrainerPartyTemplate";
+import { TrainerPartyCompoundTemplate } from "#app/data/trainers/trainer-party-template";
+import { TrainerPartyTemplate } from "#app/data/trainers/trainer-party-template";
 import { ModifierTier } from "#app/modifier/modifier-tier";
 import type { PokemonHeldItemModifierType } from "#app/modifier/modifier-type";
 import { ModifierPoolType, modifierTypes } from "#app/modifier/modifier-type";
@@ -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";

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,

src/data/mystery-encounters/encounters/mysterious-challengers-encounter.ts

@@ -4,9 +4,9 @@ import {
   setEncounterRewards,
 } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
 import { trainerConfigs } from "#app/data/trainers/trainer-config";
-import { trainerPartyTemplates } from "#app/data/trainers/TrainerPartyTemplate";
-import { TrainerPartyCompoundTemplate } from "#app/data/trainers/TrainerPartyTemplate";
-import { TrainerPartyTemplate } from "#app/data/trainers/TrainerPartyTemplate";
+import { trainerPartyTemplates } from "#app/data/trainers/trainer-party-template";
+import { TrainerPartyCompoundTemplate } from "#app/data/trainers/trainer-party-template";
+import { TrainerPartyTemplate } from "#app/data/trainers/trainer-party-template";
 import { ModifierTier } from "#app/modifier/modifier-tier";
 import { modifierTypes } from "#app/modifier/modifier-type";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";

src/data/mystery-encounters/encounters/weird-dream-encounter.ts

@@ -41,7 +41,7 @@ import PokemonData from "#app/system/pokemon-data";
 import { Nature } from "#enums/nature";
 import type HeldModifierConfig from "#app/interfaces/held-modifier-config";
 import { trainerConfigs } from "#app/data/trainers/trainer-config";
-import { TrainerPartyTemplate } from "#app/data/trainers/TrainerPartyTemplate";
+import { TrainerPartyTemplate } from "#app/data/trainers/trainer-party-template";
 import { PartyMemberStrength } from "#enums/party-member-strength";
 
 /** i18n namespace for encounter */

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";

src/data/trainers/evil-admin-trainer-pools.ts

@@ -1,4 +1,4 @@
-import type { TrainerTierPools } from "#app/data/trainers/typedefs";
+import type { TrainerTierPools } from "#app/data/trainers/type-defs";
 import { TrainerPoolTier } from "#enums/trainer-pool-tier";
 import { Species } from "#enums/species";
 

src/data/trainers/trainer-party-template.ts

@@ -250,7 +250,7 @@ export function getGymLeaderPartyTemplate() {
   switch (gameMode.modeId) {
     case GameModes.DAILY:
       if (currentBattle?.waveIndex <= 20) {
-        return trainerPartyTemplates.GYM_LEADER_2
+        return trainerPartyTemplates.GYM_LEADER_2;
       }
       return trainerPartyTemplates.GYM_LEADER_3;
     case GameModes.CHALLENGE: // In the future, there may be a ChallengeType to call here. For now, use classic's.
@@ -258,13 +258,15 @@ export function getGymLeaderPartyTemplate() {
       if (currentBattle?.waveIndex <= 20) {
         return trainerPartyTemplates.GYM_LEADER_1; // 1 avg 1 strong
       }
-      else if (currentBattle?.waveIndex <= 30) {
+      if (currentBattle?.waveIndex <= 30) {
         return trainerPartyTemplates.GYM_LEADER_2; // 1 avg 1 strong 1 stronger
       }
-      else if (currentBattle?.waveIndex <= 60) { // 50 and 60
+      if (currentBattle?.waveIndex <= 60) {
+        // 50 and 60
         return trainerPartyTemplates.GYM_LEADER_3; // 2 avg 1 strong 1 stronger
       }
-      else if (currentBattle?.waveIndex <= 90) { // 80 and 90
+      if (currentBattle?.waveIndex <= 90) {
+        // 80 and 90
         return trainerPartyTemplates.GYM_LEADER_4; // 3 avg 1 strong 1 stronger
       }
       // 110+

src/data/trainers/type-defs.ts

@@ -3,7 +3,7 @@ import type { PersistentModifier } from "#app/modifier/modifier";
 import type { PartyMemberStrength } from "#enums/party-member-strength";
 import type { Species } from "#enums/species";
 import type { TrainerConfig } from "./trainer-config";
-import type { TrainerPartyTemplate } from "./TrainerPartyTemplate";
+import type { TrainerPartyTemplate } from "./trainer-party-template";
 
 export type PartyTemplateFunc = () => TrainerPartyTemplate;
 export type PartyMemberFunc = (level: number, strength: PartyMemberStrength) => EnemyPokemon;

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";

src/field/trainer.ts

@@ -3,10 +3,10 @@ import { pokemonPrevolutions } from "#app/data/balance/pokemon-evolutions";
 import type PokemonSpecies from "#app/data/pokemon-species";
 import { getPokemonSpecies } from "#app/data/pokemon-species";
 import type { TrainerConfig } from "#app/data/trainers/trainer-config";
-import type { TrainerPartyTemplate } from "#app/data/trainers/TrainerPartyTemplate";
+import type { TrainerPartyTemplate } from "#app/data/trainers/trainer-party-template";
 import { trainerConfigs } from "#app/data/trainers/trainer-config";
-import { trainerPartyTemplates } from "#app/data/trainers/TrainerPartyTemplate";
-import { TrainerPartyCompoundTemplate } from "#app/data/trainers/TrainerPartyTemplate";
+import { trainerPartyTemplates } from "#app/data/trainers/trainer-party-template";
+import { TrainerPartyCompoundTemplate } from "#app/data/trainers/trainer-party-template";
 import { TrainerSlot } from "#enums/trainer-slot";
 import { TrainerPoolTier } from "#enums/trainer-pool-tier";
 import { TeraAIMode } from "#enums/tera-ai-mode";

src/inputs-controller.ts

@@ -1,16 +1,16 @@
 import Phaser from "phaser";
 import { getEnumValues } from "#app/utils/common";
 import { deepCopy } from "#app/utils/data";
-import pad_generic from "./configs/inputs/pad_generic";
-import pad_unlicensedSNES from "./configs/inputs/pad_unlicensedSNES";
-import pad_xbox360 from "./configs/inputs/pad_xbox360";
-import pad_dualshock from "./configs/inputs/pad_dualshock";
-import pad_procon from "./configs/inputs/pad_procon";
+import pad_generic from "./configs/inputs/pad-generic";
+import pad_unlicensedSNES from "./configs/inputs/pad-unlicensed-snes";
+import pad_xbox360 from "./configs/inputs/pad-xbox360";
+import pad_dualshock from "./configs/inputs/pad-dualshock";
+import pad_procon from "./configs/inputs/pad-procon";
 import { UiMode } from "#enums/ui-mode";
 import type SettingsGamepadUiHandler from "./ui/settings/settings-gamepad-ui-handler";
 import type SettingsKeyboardUiHandler from "./ui/settings/settings-keyboard-ui-handler";
-import cfg_keyboard_qwerty from "./configs/inputs/cfg_keyboard_qwerty";
-import { assign, getButtonWithKeycode, getIconForLatestInput, swap } from "#app/configs/inputs/configHandler";
+import cfg_keyboard_qwerty from "./configs/inputs/cfg-keyboard-qwerty";
+import { assign, getButtonWithKeycode, getIconForLatestInput, swap } from "#app/configs/inputs/config-handler";
 import { globalScene } from "#app/global-scene";
 import type { SettingGamepad } from "#app/system/settings/settings-gamepad";
 import type { SettingKeyboard } from "#app/system/settings/settings-keyboard";

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";

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";

src/pipelines/field-sprite.ts

@@ -1,8 +1,8 @@
 import { globalScene } from "#app/global-scene";
 import { TerrainType, getTerrainColor } from "../data/terrain";
 import { getCurrentTime } from "#app/utils/common";
-import fieldSpriteFragShader from "./glsl/fieldSpriteFragShader.frag?raw";
-import spriteVertShader from "./glsl/spriteShader.vert?raw";
+import fieldSpriteFragShader from "./glsl/field-sprite-frag-shader.frag?raw";
+import spriteVertShader from "./glsl/sprite-shader.vert?raw";
 
 export default class FieldSpritePipeline extends Phaser.Renderer.WebGL.Pipelines.MultiPipeline {
   constructor(game: Phaser.Game, config?: Phaser.Types.Renderer.WebGL.WebGLPipelineConfig) {

src/pipelines/sprite.ts

@@ -5,8 +5,8 @@ import Trainer from "#app/field/trainer";
 import { globalScene } from "#app/global-scene";
 import { rgbHexToRgba } from "#app/utils/common";
 import FieldSpritePipeline from "./field-sprite";
-import spriteFragShader from "./glsl/spriteFragShader.frag?raw";
-import spriteVertShader from "./glsl/spriteShader.vert?raw";
+import spriteFragShader from "./glsl/sprite-frag-shader.frag?raw";
+import spriteVertShader from "./glsl/sprite-shader.vert?raw";
 
 export default class SpritePipeline extends FieldSpritePipeline {
   private _tone: number[];

src/plugins/api/pokerogue-account-api.ts

@@ -3,7 +3,7 @@ import type {
   AccountLoginRequest,
   AccountLoginResponse,
   AccountRegisterRequest,
-} from "#app/@types/PokerogueAccountApi";
+} from "#app/@types/pokerogue-account-api";
 import { SESSION_ID_COOKIE_NAME } from "#app/constants";
 import { ApiBase } from "#app/plugins/api/api-base";
 import { removeCookie, setCookie } from "#app/utils/cookies";

src/plugins/api/pokerogue-admin-api.ts

@@ -5,7 +5,7 @@ import type {
   SearchAccountResponse,
   UnlinkAccountFromDiscordIdRequest,
   UnlinkAccountFromGoogledIdRequest,
-} from "#app/@types/PokerogueAdminApi";
+} from "#app/@types/pokerogue-admin-api";
 import { ApiBase } from "#app/plugins/api/api-base";
 
 export class PokerogueAdminApi extends ApiBase {

src/plugins/api/pokerogue-api.ts

@@ -1,4 +1,4 @@
-import type { TitleStatsResponse } from "#app/@types/PokerogueApi";
+import type { TitleStatsResponse } from "#app/@types/pokerogue-api";
 import { ApiBase } from "#app/plugins/api/api-base";
 import { PokerogueAccountApi } from "#app/plugins/api/pokerogue-account-api";
 import { PokerogueAdminApi } from "#app/plugins/api/pokerogue-admin-api";

src/plugins/api/pokerogue-daily-api.ts

@@ -1,4 +1,4 @@
-import type { GetDailyRankingsPageCountRequest, GetDailyRankingsRequest } from "#app/@types/PokerogueDailyApi";
+import type { GetDailyRankingsPageCountRequest, GetDailyRankingsRequest } from "#app/@types/pokerogue-daily-api";
 import { ApiBase } from "#app/plugins/api/api-base";
 import type { RankingEntry } from "#app/ui/daily-run-scoreboard";
 

src/plugins/api/pokerogue-savedata-api.ts

@@ -1,4 +1,4 @@
-import type { UpdateAllSavedataRequest } from "#app/@types/PokerogueSavedataApi";
+import type { UpdateAllSavedataRequest } from "#app/@types/pokerogue-save-data-api";
 import { MAX_INT_ATTR_VALUE } from "#app/constants";
 import { ApiBase } from "#app/plugins/api/api-base";
 import { PokerogueSessionSavedataApi } from "#app/plugins/api/pokerogue-session-savedata-api";

src/plugins/api/pokerogue-session-savedata-api.ts

@@ -5,7 +5,7 @@ import type {
   GetSessionSavedataRequest,
   NewClearSessionSavedataRequest,
   UpdateSessionSavedataRequest,
-} from "#app/@types/PokerogueSessionSavedataApi";
+} from "#app/@types/pokerogue-session-save-data-api";
 import { ApiBase } from "#app/plugins/api/api-base";
 import type { SessionSaveData } from "#app/system/game-data";
 

src/plugins/api/pokerogue-system-savedata-api.ts

@@ -3,7 +3,7 @@ import type {
   UpdateSystemSavedataRequest,
   VerifySystemSavedataRequest,
   VerifySystemSavedataResponse,
-} from "#app/@types/PokerogueSystemSavedataApi";
+} from "#app/@types/pokerogue-system-save-data-api";
 import { ApiBase } from "#app/plugins/api/api-base";
 
 /**

src/system/game-data.ts

@@ -55,7 +55,7 @@ import {
   applySessionVersionMigration,
   applySystemVersionMigration,
   applySettingsVersionMigration,
-} from "./version_migration/version_converter";
+} from "./version-migration/version-converter";
 import { MysteryEncounterSaveData } from "#app/data/mystery-encounters/mystery-encounter-save-data";
 import type { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { pokerogueApi } from "#app/plugins/api/pokerogue-api";

src/system/version-migration/version-converter.ts

@@ -1,6 +1,6 @@
-import type { SessionSaveMigrator } from "#app/@types/SessionSaveMigrator";
-import type { SettingsSaveMigrator } from "#app/@types/SettingsSaveMigrator";
-import type { SystemSaveMigrator } from "#app/@types/SystemSaveMigrator";
+import type { SessionSaveMigrator } from "#app/@types/session-save-migrator";
+import type { SettingsSaveMigrator } from "#app/@types/settings-save-migrator";
+import type { SystemSaveMigrator } from "#app/@types/system-save-migrator";
 import type { SessionSaveData, SystemSaveData } from "#app/system/game-data";
 import { compareVersions } from "compare-versions";
 import { version } from "../../../package.json";

src/system/version-migration/versions/v1_0_4.ts

@@ -4,9 +4,9 @@ import { AbilityAttr, defaultStarterSpecies, DexAttr } from "#app/system/game-da
 import { allSpecies } from "#app/data/pokemon-species";
 import { CustomPokemonData } from "#app/data/custom-pokemon-data";
 import { isNullOrUndefined } from "#app/utils/common";
-import type { SystemSaveMigrator } from "#app/@types/SystemSaveMigrator";
-import type { SettingsSaveMigrator } from "#app/@types/SettingsSaveMigrator";
-import type { SessionSaveMigrator } from "#app/@types/SessionSaveMigrator";
+import type { SystemSaveMigrator } from "#app/@types/system-save-migrator";
+import type { SettingsSaveMigrator } from "#app/@types/settings-save-migrator";
+import type { SessionSaveMigrator } from "#app/@types/session-save-migrator";
 
 /**
  * Migrate ability starter data if empty for caught species.

src/system/version-migration/versions/v1_7_0.ts

@@ -1,5 +1,5 @@
-import type { SessionSaveMigrator } from "#app/@types/SessionSaveMigrator";
-import type { SystemSaveMigrator } from "#app/@types/SystemSaveMigrator";
+import type { SessionSaveMigrator } from "#app/@types/session-save-migrator";
+import type { SystemSaveMigrator } from "#app/@types/system-save-migrator";
 import { getPokemonSpecies, getPokemonSpeciesForm } from "#app/data/pokemon-species";
 import { globalScene } from "#app/global-scene";
 import { DexAttr, type SessionSaveData, type SystemSaveData } from "#app/system/game-data";

src/system/version-migration/versions/v1_8_3.ts

@@ -1,4 +1,4 @@
-import type { SystemSaveMigrator } from "#app/@types/SystemSaveMigrator";
+import type { SystemSaveMigrator } from "#app/@types/system-save-migrator";
 import { getPokemonSpecies } from "#app/data/pokemon-species";
 import { DexAttr, type SystemSaveData } from "#app/system/game-data";
 import { Species } from "#enums/species";

src/system/version-migration/versions/v1_9_0.ts

@@ -1,4 +1,4 @@
-import type { SessionSaveMigrator } from "#app/@types/SessionSaveMigrator";
+import type { SessionSaveMigrator } from "#app/@types/session-save-migrator";
 import { Status } from "#app/data/status-effect";
 import { PokemonMove } from "#app/field/pokemon";
 import type { SessionSaveData } from "#app/system/game-data";

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";

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";
 

src/ui/settings/abstract-binding-ui-handler.ts

@@ -3,7 +3,7 @@ import type { UiMode } from "#enums/ui-mode";
 import { addWindow } from "../ui-theme";
 import { addTextObject, TextStyle } from "../text";
 import { Button } from "#enums/buttons";
-import { NavigationManager } from "#app/ui/settings/navigationMenu";
+import { NavigationManager } from "#app/ui/settings/navigation-menu";
 import i18next from "i18next";
 import { globalScene } from "#app/global-scene";
 

src/ui/settings/abstract-control-settings-ui-handler.ts

@@ -4,8 +4,8 @@ import type { InterfaceConfig } from "#app/inputs-controller";
 import { addWindow } from "#app/ui/ui-theme";
 import { addTextObject, TextStyle } from "#app/ui/text";
 import { ScrollBar } from "#app/ui/scroll-bar";
-import { getIconWithSettingName } from "#app/configs/inputs/configHandler";
-import NavigationMenu, { NavigationManager } from "#app/ui/settings/navigationMenu";
+import { getIconWithSettingName } from "#app/configs/inputs/config-handler";
+import NavigationMenu, { NavigationManager } from "#app/ui/settings/navigation-menu";
 import type { Device } from "#enums/devices";
 import { Button } from "#enums/buttons";
 import i18next from "i18next";

src/ui/settings/abstract-settings-ui-handler.ts

@@ -5,7 +5,7 @@ import { addWindow } from "#app/ui/ui-theme";
 import { ScrollBar } from "#app/ui/scroll-bar";
 import { Button } from "#enums/buttons";
 import type { InputsIcons } from "#app/ui/settings/abstract-control-settings-ui-handler";
-import NavigationMenu, { NavigationManager } from "#app/ui/settings/navigationMenu";
+import NavigationMenu, { NavigationManager } from "#app/ui/settings/navigation-menu";
 import type { SettingType } from "#app/system/settings/settings";
 import { Setting, SettingKeys } from "#app/system/settings/settings";
 import i18next from "i18next";

src/ui/settings/gamepad-binding-ui-handler.ts

@@ -1,7 +1,7 @@
 import AbstractBindingUiHandler from "./abstract-binding-ui-handler";
 import type { UiMode } from "#enums/ui-mode";
 import { Device } from "#enums/devices";
-import { getIconWithSettingName, getKeyWithKeycode } from "#app/configs/inputs/configHandler";
+import { getIconWithSettingName, getKeyWithKeycode } from "#app/configs/inputs/config-handler";
 import { addTextObject, TextStyle } from "#app/ui/text";
 import { globalScene } from "#app/global-scene";
 

src/ui/settings/keyboard-binding-ui-handler.ts

@@ -1,6 +1,6 @@
 import AbstractBindingUiHandler from "./abstract-binding-ui-handler";
 import type { UiMode } from "#enums/ui-mode";
-import { getKeyWithKeycode } from "#app/configs/inputs/configHandler";
+import { getKeyWithKeycode } from "#app/configs/inputs/config-handler";
 import { Device } from "#enums/devices";
 import { addTextObject, TextStyle } from "#app/ui/text";
 import { globalScene } from "#app/global-scene";

src/ui/settings/settings-gamepad-ui-handler.ts

@@ -7,9 +7,9 @@ import {
   settingGamepadDefaults,
   settingGamepadOptions,
 } from "../../system/settings/settings-gamepad";
-import pad_xbox360 from "#app/configs/inputs/pad_xbox360";
-import pad_dualshock from "#app/configs/inputs/pad_dualshock";
-import pad_unlicensedSNES from "#app/configs/inputs/pad_unlicensedSNES";
+import pad_xbox360 from "#app/configs/inputs/pad-xbox360";
+import pad_dualshock from "#app/configs/inputs/pad-dualshock";
+import pad_unlicensedSNES from "#app/configs/inputs/pad-unlicensed-snes";
 import type { InterfaceConfig } from "#app/inputs-controller";
 import AbstractControlSettingsUiHandler from "#app/ui/settings/abstract-control-settings-ui-handler";
 import { Device } from "#enums/devices";

src/ui/settings/settings-keyboard-ui-handler.ts

@@ -1,5 +1,5 @@
 import { UiMode } from "#enums/ui-mode";
-import cfg_keyboard_qwerty from "#app/configs/inputs/cfg_keyboard_qwerty";
+import cfg_keyboard_qwerty from "#app/configs/inputs/cfg-keyboard-qwerty";
 import {
   setSettingKeyboard,
   SettingKeyboard,
@@ -11,9 +11,9 @@ import { reverseValueToKeySetting, truncateString } from "#app/utils/common";
 import AbstractControlSettingsUiHandler from "#app/ui/settings/abstract-control-settings-ui-handler";
 import type { InterfaceConfig } from "#app/inputs-controller";
 import { addTextObject, TextStyle } from "#app/ui/text";
-import { deleteBind } from "#app/configs/inputs/configHandler";
+import { deleteBind } from "#app/configs/inputs/config-handler";
 import { Device } from "#enums/devices";
-import { NavigationManager } from "#app/ui/settings/navigationMenu";
+import { NavigationManager } from "#app/ui/settings/navigation-menu";
 import i18next from "i18next";
 import { globalScene } from "#app/global-scene";
 

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";

src/ui/ui.ts

@@ -56,7 +56,7 @@ import { Device } from "#enums/devices";
 import MysteryEncounterUiHandler from "./mystery-encounter-ui-handler";
 import PokedexScanUiHandler from "./pokedex-scan-ui-handler";
 import PokedexPageUiHandler from "./pokedex-page-ui-handler";
-import { NavigationManager } from "./settings/navigationMenu";
+import { NavigationManager } from "./settings/navigation-menu";
 import { UiMode } from "#enums/ui-mode";
 
 const transitionModes = [

test/abilities/ability-duplication.test.ts

@@ -2,7 +2,7 @@ import { Stat } from "#app/enums/stat";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest";
 

test/abilities/ability-timing.test.ts

@@ -5,7 +5,7 @@ import i18next from "#app/plugins/i18n";
 import { UiMode } from "#enums/ui-mode";
 import { Abilities } from "#enums/abilities";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 

test/abilities/analytic.test.ts

@@ -3,7 +3,7 @@ import { isBetween, toDmgValue } from "#app/utils/common";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 

test/abilities/arena-trap.test.ts

@@ -2,7 +2,7 @@ import { allAbilities } from "#app/data/data-lists";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest";
 

test/abilities/aroma-veil.test.ts

@@ -1,7 +1,7 @@
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { Abilities } from "#enums/abilities";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import { BattlerTagType } from "#enums/battler-tag-type";

test/abilities/aura-break.test.ts

@@ -2,7 +2,7 @@ import { allMoves } from "#app/data/moves/move";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 

test/abilities/battery.test.ts

@@ -4,7 +4,7 @@ import { MoveEffectPhase } from "#app/phases/move-effect-phase";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 

test/abilities/battle-bond.test.ts

@@ -1,11 +1,11 @@
 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";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
 describe("Abilities - BATTLE BOND", () => {

test/abilities/beast-boost.test.ts

@@ -3,7 +3,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { Stat } from "#enums/stat";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 

test/abilities/commander.test.ts

@@ -9,7 +9,7 @@ import { MoveResult } from "#app/field/pokemon";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 

test/abilities/competitive.test.ts

@@ -3,7 +3,7 @@ import { TurnInitPhase } from "#app/phases/turn-init-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 

test/abilities/contrary.test.ts

@@ -2,7 +2,7 @@ import { Moves } from "#app/enums/moves";
 import { Abilities } from "#enums/abilities";
 import { Species } from "#enums/species";
 import { Stat } from "#enums/stat";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 

test/abilities/corrosion.test.ts

@@ -1,7 +1,7 @@
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 

test/abilities/costar.test.ts

@@ -4,7 +4,7 @@ import { Moves } from "#app/enums/moves";
 import { Species } from "#app/enums/species";
 import { CommandPhase } from "#app/phases/command-phase";
 import { MessagePhase } from "#app/phases/message-phase";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
 

test/abilities/cud-chew.test.ts

@@ -7,7 +7,7 @@ import { BerryType } from "#enums/berry-type";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { Stat } from "#enums/stat";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import i18next from "i18next";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";

test/abilities/dancer.test.ts

@@ -3,7 +3,7 @@ import type { MovePhase } from "#app/phases/move-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 

test/abilities/defiant.test.ts

@@ -3,7 +3,7 @@ import { TurnInitPhase } from "#app/phases/turn-init-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 

test/abilities/desolate-land.test.ts

@@ -5,7 +5,7 @@ import { Command } from "#app/ui/command-ui-handler";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest";
 

test/abilities/disguise.test.ts

@@ -5,7 +5,7 @@ import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { Stat } from "#enums/stat";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
 describe("Abilities - Disguise", () => {

test/abilities/dry-skin.test.ts

@@ -1,7 +1,7 @@
 import { Species } from "#app/enums/species";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 

test/abilities/early-bird.test.ts

@@ -4,7 +4,7 @@ import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 

test/abilities/flash-fire.test.ts

@@ -6,7 +6,7 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 

test/abilities/flower-gift.test.ts

@@ -6,7 +6,7 @@ import { WeatherType } from "#app/enums/weather-type";
 import { TurnEndPhase } from "#app/phases/turn-end-phase";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
-import GameManager from "#test/testUtils/gameManager";
+import GameManager from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";