From 9f4f142a49f80aa1ad39a9967ff01d108f59a809 Mon Sep 17 00:00:00 2001
From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
Date: Sun, 8 Jun 2025 11:02:32 -0500
Subject: [PATCH] Move trainer-variant to own file

Reduces circ deps to 313
---
 src/battle-scene.ts                                        | 3 ++-
 src/battle.ts                                              | 3 ++-
 src/data/challenge.ts                                      | 3 ++-
 src/data/mystery-encounters/utils/encounter-phase-utils.ts | 3 ++-
 src/data/trainers/trainer-config.ts                        | 2 +-
 src/enums/trainer-variant.ts                               | 6 ++++++
 src/field/trainer.ts                                       | 7 +------
 src/system/game-data.ts                                    | 2 +-
 src/system/trainer-data.ts                                 | 3 ++-
 src/ui/run-history-ui-handler.ts                           | 2 +-
 src/ui/run-info-ui-handler.ts                              | 2 +-
 11 files changed, 21 insertions(+), 15 deletions(-)
 create mode 100644 src/enums/trainer-variant.ts

diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index 4373deb4950..fa5ca45c647 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -87,7 +87,8 @@ import SpritePipeline from "#app/pipelines/sprite";
 import PartyExpBar from "#app/ui/party-exp-bar";
 import type { TrainerSlot } from "./enums/trainer-slot";
 import { trainerConfigs } from "#app/data/trainers/trainer-config";
-import Trainer, { TrainerVariant } from "#app/field/trainer";
+import Trainer from "#app/field/trainer";
+import { TrainerVariant } from "#enums/trainer-variant";
 import type TrainerData from "#app/system/trainer-data";
 import SoundFade from "phaser3-rex-plugins/plugins/soundfade";
 import { pokemonPrevolutions } from "#app/data/balance/pokemon-evolutions";
diff --git a/src/battle.ts b/src/battle.ts
index 69e02e5fa4e..1814e0a1bf8 100644
--- a/src/battle.ts
+++ b/src/battle.ts
@@ -10,7 +10,8 @@ import {
   randInt,
   randSeedFloat,
 } from "#app/utils/common";
-import Trainer, { TrainerVariant } from "./field/trainer";
+import Trainer from "./field/trainer";
+import { TrainerVariant } from "#enums/trainer-variant";
 import type { GameMode } from "./game-mode";
 import { MoneyMultiplierModifier, PokemonHeldItemModifier } from "./modifier/modifier";
 import type { PokeballType } from "#enums/pokeball";
diff --git a/src/data/challenge.ts b/src/data/challenge.ts
index 8dd303c34fd..5c17e571605 100644
--- a/src/data/challenge.ts
+++ b/src/data/challenge.ts
@@ -12,7 +12,8 @@ import type { FixedBattleConfig } from "#app/battle";
 import { getRandomTrainerFunc } from "#app/battle";
 import { ClassicFixedBossWaves } from "#enums/fixed-boss-waves";
 import { BattleType } from "#enums/battle-type";
-import Trainer, { TrainerVariant } from "#app/field/trainer";
+import Trainer from "#app/field/trainer";
+import { TrainerVariant } from "#enums/trainer-variant";
 import { PokemonType } from "#enums/pokemon-type";
 import { Challenges } from "#enums/challenges";
 import { SpeciesId } from "#enums/species-id";
diff --git a/src/data/mystery-encounters/utils/encounter-phase-utils.ts b/src/data/mystery-encounters/utils/encounter-phase-utils.ts
index 580066356b1..fa1353b62fd 100644
--- a/src/data/mystery-encounters/utils/encounter-phase-utils.ts
+++ b/src/data/mystery-encounters/utils/encounter-phase-utils.ts
@@ -30,7 +30,8 @@ import type { BattlerTagType } from "#enums/battler-tag-type";
 import { BiomeId } from "#enums/biome-id";
 import type { TrainerType } from "#enums/trainer-type";
 import i18next from "i18next";
-import Trainer, { TrainerVariant } from "#app/field/trainer";
+import Trainer from "#app/field/trainer";
+import { TrainerVariant } from "#enums/trainer-variant";
 import type { Gender } from "#app/data/gender";
 import type { Nature } from "#enums/nature";
 import type { MoveId } from "#enums/move-id";
diff --git a/src/data/trainers/trainer-config.ts b/src/data/trainers/trainer-config.ts
index 8e704b0b301..dab18537ea9 100644
--- a/src/data/trainers/trainer-config.ts
+++ b/src/data/trainers/trainer-config.ts
@@ -6,7 +6,7 @@ import { pokemonEvolutions, pokemonPrevolutions } from "#app/data/balance/pokemo
 import { getPokemonSpecies } from "#app/data/pokemon-species";
 import { tmSpecies } from "#app/data/balance/tms";
 import { doubleBattleDialogue } from "#app/data/dialogue";
-import { TrainerVariant } from "#app/field/trainer";
+import { TrainerVariant } from "#enums/trainer-variant";
 import { getIsInitialized, initI18n } from "#app/plugins/i18n";
 import i18next from "i18next";
 import { Gender } from "#app/data/gender";
diff --git a/src/enums/trainer-variant.ts b/src/enums/trainer-variant.ts
new file mode 100644
index 00000000000..af8788819f6
--- /dev/null
+++ b/src/enums/trainer-variant.ts
@@ -0,0 +1,6 @@
+
+export enum TrainerVariant {
+  DEFAULT,
+  FEMALE,
+  DOUBLE
+}
diff --git a/src/field/trainer.ts b/src/field/trainer.ts
index 244a23185da..e7785e68ca7 100644
--- a/src/field/trainer.ts
+++ b/src/field/trainer.ts
@@ -20,12 +20,7 @@ import { PartyMemberStrength } from "#enums/party-member-strength";
 import { SpeciesId } from "#enums/species-id";
 import { TrainerType } from "#enums/trainer-type";
 import { signatureSpecies } from "#app/data/balance/signature-species";
-
-export enum TrainerVariant {
-  DEFAULT,
-  FEMALE,
-  DOUBLE,
-}
+import { TrainerVariant } from "#enums/trainer-variant";
 
 export default class Trainer extends Phaser.GameObjects.Container {
   public config: TrainerConfig;
diff --git a/src/system/game-data.ts b/src/system/game-data.ts
index 46feb4427a2..afe658b0d86 100644
--- a/src/system/game-data.ts
+++ b/src/system/game-data.ts
@@ -32,7 +32,7 @@ import { GameStats } from "#app/system/game-stats";
 import { Tutorial } from "#app/tutorial";
 import { speciesEggMoves } from "#app/data/balance/egg-moves";
 import { allMoves } from "#app/data/data-lists";
-import { TrainerVariant } from "#app/field/trainer";
+import { TrainerVariant } from "#enums/trainer-variant";
 import type { Variant } from "#app/sprites/variant";
 import { setSettingGamepad, SettingGamepad, settingGamepadDefaults } from "#app/system/settings/settings-gamepad";
 import type { SettingKeyboard } from "#app/system/settings/settings-keyboard";
diff --git a/src/system/trainer-data.ts b/src/system/trainer-data.ts
index 0e6298309bc..7c9bffd99ee 100644
--- a/src/system/trainer-data.ts
+++ b/src/system/trainer-data.ts
@@ -1,5 +1,6 @@
 import type { TrainerType } from "#enums/trainer-type";
-import Trainer, { TrainerVariant } from "../field/trainer";
+import Trainer from "../field/trainer";
+import { TrainerVariant } from "#enums/trainer-variant";
 
 export default class TrainerData {
   public trainerType: TrainerType;
diff --git a/src/ui/run-history-ui-handler.ts b/src/ui/run-history-ui-handler.ts
index d4c6155867b..06ef590c1e8 100644
--- a/src/ui/run-history-ui-handler.ts
+++ b/src/ui/run-history-ui-handler.ts
@@ -11,7 +11,7 @@ import { Button } from "../enums/buttons";
 import { BattleType } from "#enums/battle-type";
 import type { RunEntry } from "../system/game-data";
 import { PlayerGender } from "#enums/player-gender";
-import { TrainerVariant } from "../field/trainer";
+import { TrainerVariant } from "#enums/trainer-variant";
 import { RunDisplayMode } from "#app/ui/run-info-ui-handler";
 
 export type RunSelectCallback = (cursor: number) => void;
diff --git a/src/ui/run-info-ui-handler.ts b/src/ui/run-info-ui-handler.ts
index 7ec48bbf64f..a4de2215fa4 100644
--- a/src/ui/run-info-ui-handler.ts
+++ b/src/ui/run-info-ui-handler.ts
@@ -10,7 +10,7 @@ import type PokemonData from "../system/pokemon-data";
 import i18next from "i18next";
 import { Button } from "../enums/buttons";
 import { BattleType } from "#enums/battle-type";
-import { TrainerVariant } from "../field/trainer";
+import { TrainerVariant } from "#enums/trainer-variant";
 import { Challenges } from "#enums/challenges";
 import { getLuckString, getLuckTextTint } from "../modifier/modifier-type";
 import RoundRectangle from "phaser3-rex-plugins/plugins/roundrectangle";