More import fixes

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

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];
+}

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;

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

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 {
   /**