Fixed more imports

src/data/balance/pokemon-evolutions.ts

@@ -11,11 +11,12 @@ import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import { SpeciesFormKey } from "#enums/species-form-key";
 import { TimeOfDay } from "#enums/time-of-day";
-import { DamageMoneyRewardModifier, ExtraModifierModifier, MoneyMultiplierModifier, SpeciesStatBoosterModifier, TempExtraModifierModifier } from "#app/modifier/modifier";
+import { ExtraModifierModifier, MoneyMultiplierModifier, TempExtraModifierModifier } from "#app/modifier/modifier";
 import type { SpeciesStatBoosterModifierType } from "#app/modifier/modifier-type";
 import { speciesStarterCosts } from "./starters";
 import i18next from "i18next";
 import { initI18n } from "#app/plugins/i18n";
+import { DamageMoneyRewardModifier, SpeciesStatBoosterModifier } from "#app/modifier/held-item-modifier";
 
 export enum SpeciesWildEvolutionDelay {
   NONE,

src/data/mystery-encounters/encounters/absolute-avarice-encounter.ts

@@ -20,7 +20,7 @@ import { PersistentModifierRequirement } from "#app/data/mystery-encounters/myst
 import { queueEncounterMessage } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
 import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
-import { BerryModifier, PokemonInstantReviveModifier } from "#app/modifier/modifier";
+import { BerryModifier, PokemonInstantReviveModifier } from "#app/modifier/held-item-modifier";
 import { getPokemonSpecies } from "#app/data/pokemon-species";
 import { Moves } from "#enums/moves";
 import { BattlerTagType } from "#enums/battler-tag-type";

src/data/mystery-encounters/mystery-encounter-requirements.ts

@@ -7,7 +7,7 @@ import { StatusEffect } from "#enums/status-effect";
 import { PokemonType } from "#enums/pokemon-type";
 import { WeatherType } from "#enums/weather-type";
 import type { PlayerPokemon } from "#app/field/pokemon";
-import { AttackTypeBoosterModifier } from "#app/modifier/modifier";
+import { AttackTypeBoosterModifier } from "#app/modifier/held-item-modifier";
 import type { AttackTypeBoosterModifierType } from "#app/modifier/modifier-type";
 import { isNullOrUndefined } from "#app/utils/common";
 import type { Abilities } from "#enums/abilities";

src/data/pokemon-forms.ts

@@ -1,4 +1,4 @@
-import { PokemonFormChangeItemModifier } from "../modifier/modifier";
+import { PokemonFormChangeItemModifier } from "../modifier/held-item-modifier";
 import type Pokemon from "../field/pokemon";
 import { StatusEffect } from "#enums/status-effect";
 import { allMoves } from "./data-lists";

src/field/arena.ts

@@ -40,7 +40,7 @@ import { Abilities } from "#enums/abilities";
 import { SpeciesFormChangeRevertWeatherFormTrigger, SpeciesFormChangeWeatherTrigger } from "#app/data/pokemon-forms";
 import { CommonAnimPhase } from "#app/phases/common-anim-phase";
 import { WeatherType } from "#enums/weather-type";
-import { FieldEffectModifier } from "#app/modifier/modifier";
+import { FieldEffectModifier } from "#app/modifier/held-item-modifier";
 
 export class Arena {
   public biomeType: Biome;

src/phases/battle-end-phase.ts

@@ -1,8 +1,9 @@
 import { globalScene } from "#app/global-scene";
 import { applyPostBattleAbAttrs, PostBattleAbAttr } from "#app/data/abilities/ability";
-import { LapsingPersistentModifier, LapsingPokemonHeldItemModifier } from "#app/modifier/modifier";
+import { LapsingPersistentModifier } from "#app/modifier/modifier";
 import { BattlePhase } from "./battle-phase";
 import { GameOverPhase } from "./game-over-phase";
+import { LapsingPokemonHeldItemModifier } from "#app/modifier/held-item-modifier";
 
 export class BattleEndPhase extends BattlePhase {
   /** If true, will increment battles won */

src/phases/faint-phase.ts

@@ -20,7 +20,7 @@ import type { EnemyPokemon } from "#app/field/pokemon";
 import type Pokemon from "#app/field/pokemon";
 import { HitResult, PlayerPokemon, PokemonMove } from "#app/field/pokemon";
 import { getPokemonNameWithAffix } from "#app/messages";
-import { PokemonInstantReviveModifier } from "#app/modifier/modifier";
+import { PokemonInstantReviveModifier } from "#app/modifier/held-item-modifier";
 import { SwitchType } from "#enums/switch-type";
 import i18next from "i18next";
 import { DamageAnimPhase } from "./damage-anim-phase";

src/phases/select-starter-phase.ts

@@ -3,7 +3,7 @@ import { applyChallenges, ChallengeType } from "#app/data/challenge";
 import { Gender } from "#app/data/gender";
 import { SpeciesFormChangeMoveLearnedTrigger } from "#app/data/pokemon-forms";
 import { getPokemonSpecies } from "#app/data/pokemon-species";
-import { overrideHeldItems, overrideModifiers } from "#app/modifier/modifier";
+import { overrideModifiers } from "#app/modifier/modifier";
 import Overrides from "#app/overrides";
 import { Phase } from "#app/phase";
 import { TitlePhase } from "#app/phases/title-phase";
@@ -13,6 +13,7 @@ import { UiMode } from "#enums/ui-mode";
 import type { Species } from "#enums/species";
 import SoundFade from "phaser3-rex-plugins/plugins/soundfade";
 import { isNullOrUndefined } from "#app/utils/common";
+import { overrideHeldItems } from "#app/modifier/held-item-modifier";
 
 export class SelectStarterPhase extends Phase {
   start() {

src/phases/stat-stage-change-phase.ts

@@ -15,7 +15,7 @@ import { ArenaTagSide, MistTag } from "#app/data/arena-tag";
 import type { ArenaTag } from "#app/data/arena-tag";
 import type Pokemon from "#app/field/pokemon";
 import { getPokemonNameWithAffix } from "#app/messages";
-import { ResetNegativeStatStageModifier } from "#app/modifier/modifier";
+import { ResetNegativeStatStageModifier } from "#app/modifier/held-item-modifier";
 import { handleTutorial, Tutorial } from "#app/tutorial";
 import { NumberHolder, BooleanHolder, isNullOrUndefined } from "#app/utils/common";
 import i18next from "i18next";

src/phases/switch-summon-phase.ts

@@ -13,7 +13,7 @@ import { SpeciesFormChangeActiveTrigger } from "#app/data/pokemon-forms";
 import { TrainerSlot } from "#enums/trainer-slot";
 import type Pokemon from "#app/field/pokemon";
 import { getPokemonNameWithAffix } from "#app/messages";
-import { SwitchEffectTransferModifier } from "#app/modifier/modifier";
+import { SwitchEffectTransferModifier } from "#app/modifier/held-item-modifier";
 import { Command } from "#app/ui/command-ui-handler";
 import i18next from "i18next";
 import { PostSummonPhase } from "./post-summon-phase";
@@ -138,7 +138,6 @@ export class SwitchSummonPhase extends SummonPhase {
       return;
     }
 
-
     if (this.switchType === SwitchType.BATON_PASS) {
       // If switching via baton pass, update opposing tags coming from the prior pokemon
       (this.player ? globalScene.getEnemyField() : globalScene.getPlayerField()).forEach((enemyPokemon: Pokemon) =>

src/phases/turn-end-phase.ts

@@ -5,17 +5,16 @@ import { WeatherType } from "#app/enums/weather-type";
 import { TurnEndEvent } from "#app/events/battle-scene";
 import type Pokemon from "#app/field/pokemon";
 import { getPokemonNameWithAffix } from "#app/messages";
-import {
-  TurnHealModifier,
-  EnemyTurnHealModifier,
-  EnemyStatusEffectHealChanceModifier,
-  TurnStatusEffectModifier,
-  TurnHeldItemTransferModifier,
-} from "#app/modifier/modifier";
+import { EnemyTurnHealModifier, EnemyStatusEffectHealChanceModifier } from "#app/modifier/modifier";
 import i18next from "i18next";
 import { FieldPhase } from "./field-phase";
 import { PokemonHealPhase } from "./pokemon-heal-phase";
 import { globalScene } from "#app/global-scene";
+import {
+  TurnHealModifier,
+  TurnHeldItemTransferModifier,
+  TurnStatusEffectModifier,
+} from "#app/modifier/held-item-modifier";
 
 export class TurnEndPhase extends FieldPhase {
   start() {

test/items/light_ball.test.ts

@@ -1,5 +1,5 @@
 import { Stat } from "#enums/stat";
-import { SpeciesStatBoosterModifier } from "#app/modifier/modifier";
+import { SpeciesStatBoosterModifier } from "#app/modifier/held-item-modifier";
 import { modifierTypes } from "#app/modifier/modifier-type";
 import i18next from "#app/plugins/i18n";
 import { NumberHolder } from "#app/utils/common";

test/items/metal_powder.test.ts

@@ -1,5 +1,5 @@
 import { Stat } from "#enums/stat";
-import { SpeciesStatBoosterModifier } from "#app/modifier/modifier";
+import { SpeciesStatBoosterModifier } from "#app/modifier/held-item-modifier";
 import { modifierTypes } from "#app/modifier/modifier-type";
 import i18next from "#app/plugins/i18n";
 import { NumberHolder } from "#app/utils/common";

test/items/quick_powder.test.ts

@@ -1,5 +1,5 @@
 import { Stat } from "#enums/stat";
-import { SpeciesStatBoosterModifier } from "#app/modifier/modifier";
+import { SpeciesStatBoosterModifier } from "#app/modifier/held-item-modifier";
 import { modifierTypes } from "#app/modifier/modifier-type";
 import i18next from "#app/plugins/i18n";
 import { NumberHolder } from "#app/utils/common";

test/items/reviver_seed.test.ts

@@ -1,7 +1,7 @@
 import { BattlerIndex } from "#app/battle";
 import { allMoves } from "#app/data/data-lists";
 import { BattlerTagType } from "#app/enums/battler-tag-type";
-import type { PokemonInstantReviveModifier } from "#app/modifier/modifier";
+import type { PokemonInstantReviveModifier } from "#app/modifier/held-item-modifier";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";

test/items/thick_club.test.ts

@@ -1,5 +1,5 @@
 import { Stat } from "#enums/stat";
-import { SpeciesStatBoosterModifier } from "#app/modifier/modifier";
+import { SpeciesStatBoosterModifier } from "#app/modifier/held-item-modifier";
 import { modifierTypes } from "#app/modifier/modifier-type";
 import i18next from "#app/plugins/i18n";
 import { NumberHolder, randInt } from "#app/utils/common";

test/moves/destiny_bond.test.ts

@@ -10,7 +10,7 @@ import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import { BattlerIndex } from "#app/battle";
 import { StatusEffect } from "#enums/status-effect";
-import { PokemonInstantReviveModifier } from "#app/modifier/modifier";
+import { PokemonInstantReviveModifier } from "#app/modifier/held-item-modifier";
 
 describe("Moves - Destiny Bond", () => {
   let phaserGame: Phaser.Game;