From 453181f20b47e5627d78ddb3804a9ca3e0c1a4e2 Mon Sep 17 00:00:00 2001
From: Wlowscha <54003515+Wlowscha@users.noreply.github.com>
Date: Thu, 29 May 2025 15:17:15 +0200
Subject: [PATCH] More import fixes

---
 src/modifier/modifier-pool.ts             | 4 ----
 src/modifier/modifier-type.ts             | 4 ++++
 src/ui/modifier-select-ui-handler.ts      | 3 ++-
 src/ui/run-info-ui-handler.ts             | 2 +-
 test/testUtils/helpers/modifiersHelper.ts | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/modifier/modifier-pool.ts b/src/modifier/modifier-pool.ts
index 5b0499f14a2..8ae88cd0e63 100644
--- a/src/modifier/modifier-pool.ts
+++ b/src/modifier/modifier-pool.ts
@@ -922,10 +922,6 @@ export interface CustomModifierSettings {
   allowLuckUpgrades?: boolean;
 }
 
-export function getModifierTypeFuncById(id: string): ModifierTypeFunc {
-  return modifierTypes[id];
-}
-
 /**
  * Generates modifier options for a {@linkcode SelectModifierPhase}
  * @param count Determines the number of items to generate
diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts
index 3a89528805b..3747a32a21b 100644
--- a/src/modifier/modifier-type.ts
+++ b/src/modifier/modifier-type.ts
@@ -2332,3 +2332,7 @@ export class ModifierTypeOption {
     this.cost = Math.min(Math.round(cost), Number.MAX_SAFE_INTEGER);
   }
 }
+
+export function getModifierTypeFuncById(id: string): ModifierTypeFunc {
+  return modifierTypes[id];
+}
diff --git a/src/ui/modifier-select-ui-handler.ts b/src/ui/modifier-select-ui-handler.ts
index 7f5bf997f88..21a03205930 100644
--- a/src/ui/modifier-select-ui-handler.ts
+++ b/src/ui/modifier-select-ui-handler.ts
@@ -1,6 +1,6 @@
 import { globalScene } from "#app/global-scene";
 import type { ModifierTypeOption } from "../modifier/modifier-type";
-import { getPlayerShopModifierTypeOptionsForWave, TmModifierType } from "../modifier/modifier-type";
+import { TmModifierType } from "../modifier/modifier-type";
 import { getPokeballAtlasKey } from "#app/data/pokeball";
 import { addTextObject, getTextStyleOptions, getModifierTierTextTint, getTextColor, TextStyle } from "./text";
 import AwaitableUiHandler from "./awaitable-ui-handler";
@@ -16,6 +16,7 @@ import i18next from "i18next";
 import { ShopCursorTarget } from "#app/enums/shop-cursor-target";
 import Phaser from "phaser";
 import type { PokeballType } from "#enums/pokeball";
+import { getPlayerShopModifierTypeOptionsForWave } from "#app/modifier/modifier-pool";
 
 export const SHOP_OPTIONS_ROW_LIMIT = 7;
 const SINGLE_SHOP_ROW_YOFFSET = 12;
diff --git a/src/ui/run-info-ui-handler.ts b/src/ui/run-info-ui-handler.ts
index 8487533f465..a27d1dd2f76 100644
--- a/src/ui/run-info-ui-handler.ts
+++ b/src/ui/run-info-ui-handler.ts
@@ -12,7 +12,7 @@ import { Button } from "../enums/buttons";
 import { BattleType } from "#enums/battle-type";
 import { TrainerVariant } from "../field/trainer";
 import { Challenges } from "#enums/challenges";
-import { getLuckString, getLuckTextTint } from "../modifier/modifier-type";
+import { getLuckString, getLuckTextTint } from "../modifier/modifier-utils";
 import RoundRectangle from "phaser3-rex-plugins/plugins/roundrectangle";
 import { getTypeRgb } from "#app/data/type";
 import { PokemonType } from "#enums/pokemon-type";
diff --git a/test/testUtils/helpers/modifiersHelper.ts b/test/testUtils/helpers/modifiersHelper.ts
index 22500c87906..d5183153a12 100644
--- a/test/testUtils/helpers/modifiersHelper.ts
+++ b/test/testUtils/helpers/modifiersHelper.ts
@@ -1,7 +1,7 @@
 import { expect } from "vitest";
 import { GameManagerHelper } from "./gameManagerHelper";
 import type { ModifierTypeKeys } from "#app/modifier/modifier-type";
-import { itemPoolChecks } from "#app/modifier/modifier-type";
+import { itemPoolChecks } from "#app/modifier/modifier-pool";
 
 export class ModifierHelper extends GameManagerHelper {
   /**