diff --git a/src/data/moves/move.ts b/src/data/moves/move.ts index 4847508ec70..08d64a6d9fd 100644 --- a/src/data/moves/move.ts +++ b/src/data/moves/move.ts @@ -124,7 +124,7 @@ import { MultiHitType } from "#enums/MultiHitType"; import { invalidAssistMoves, invalidCopycatMoves, invalidMetronomeMoves, invalidMirrorMoveMoves, invalidSleepTalkMoves } from "./invalid-moves"; import { TrainerVariant } from "#app/field/trainer"; import { SelectBiomePhase } from "#app/phases/select-biome-phase"; -import { applyAttackTypeBoosterHeldItem } from "#app/modifier/held-items/attack-type-booster"; +import { applyAttackTypeBoosterHeldItem } from "#app/items/held-items/attack-type-booster"; type MoveConditionFunc = (user: Pokemon, target: Pokemon, move: Move) => boolean; type UserMoveConditionFunc = (user: Pokemon, move: Move) => boolean; diff --git a/src/field/pokemon-held-item-manager.ts b/src/field/pokemon-held-item-manager.ts index ac3fe1f0afc..06bdc55124d 100644 --- a/src/field/pokemon-held-item-manager.ts +++ b/src/field/pokemon-held-item-manager.ts @@ -1,4 +1,4 @@ -import { allHeldItems } from "#app/modifier/all-held-items"; +import { allHeldItems } from "#app/items/all-held-items"; import type { HeldItems } from "#app/enums/held-items"; interface HeldItemProperties { diff --git a/src/modifier/all-held-items.ts b/src/items/all-held-items.ts similarity index 100% rename from src/modifier/all-held-items.ts rename to src/items/all-held-items.ts diff --git a/src/modifier/held-item.ts b/src/items/held-item.ts similarity index 100% rename from src/modifier/held-item.ts rename to src/items/held-item.ts diff --git a/src/modifier/held-items/attack-type-booster.ts b/src/items/held-items/attack-type-booster.ts similarity index 98% rename from src/modifier/held-items/attack-type-booster.ts rename to src/items/held-items/attack-type-booster.ts index a02c97beb72..9324bec3229 100644 --- a/src/modifier/held-items/attack-type-booster.ts +++ b/src/items/held-items/attack-type-booster.ts @@ -3,7 +3,7 @@ import { PokemonType } from "#enums/pokemon-type"; import i18next from "i18next"; import type { NumberHolder } from "#app/utils/common"; import type Pokemon from "#app/field/pokemon"; -import { HeldItem } from "../held-item"; +import { HeldItem } from "#app/items/held-item"; import { allHeldItems } from "../all-held-items"; interface AttackTypeToHeldItemMap { diff --git a/src/modifier/held-items/turn-heal.ts b/src/items/held-items/turn-heal.ts similarity index 96% rename from src/modifier/held-items/turn-heal.ts rename to src/items/held-items/turn-heal.ts index f2f9ec2f08b..a3e1120abe2 100644 --- a/src/modifier/held-items/turn-heal.ts +++ b/src/items/held-items/turn-heal.ts @@ -1,7 +1,7 @@ import type Pokemon from "#app/field/pokemon"; import { globalScene } from "#app/global-scene"; import i18next from "i18next"; -import { HeldItem } from "../held-item"; +import { HeldItem } from "#app/items/held-item"; import { PokemonHealPhase } from "#app/phases/pokemon-heal-phase"; import { toDmgValue } from "#app/utils/common"; import { getPokemonNameWithAffix } from "#app/messages"; diff --git a/src/loading-scene.ts b/src/loading-scene.ts index 38581e8ad0b..fd0c3f96e33 100644 --- a/src/loading-scene.ts +++ b/src/loading-scene.ts @@ -21,7 +21,7 @@ import { initVouchers } from "#app/system/voucher"; import { Biome } from "#enums/biome"; import { initMysteryEncounters } from "#app/data/mystery-encounters/mystery-encounters"; import { timedEventManager } from "./global-event-manager"; -import { initHeldItems } from "./modifier/all-held-items"; +import { initHeldItems } from "./items/all-held-items"; export class LoadingScene extends SceneBase { public static readonly KEY = "loading"; diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts index c7b064e7dfa..dcd692462eb 100644 --- a/src/modifier/modifier-type.ts +++ b/src/modifier/modifier-type.ts @@ -130,9 +130,9 @@ import { StatusEffect } from "#enums/status-effect"; import i18next from "i18next"; import { timedEventManager } from "#app/global-event-manager"; import { HeldItems } from "#enums/held-items"; -import { allHeldItems } from "./all-held-items"; +import { allHeldItems } from "#app/items/all-held-items"; import { TYPE_BOOST_ITEM_BOOST_PERCENT } from "#app/constants"; -import { attackTypeToHeldItem } from "./held-items/attack-type-booster"; +import { attackTypeToHeldItem } from "#app/items/held-items/attack-type-booster"; const outputModifierData = false; const useMaxWeightForOutput = false; diff --git a/src/phases/turn-end-phase.ts b/src/phases/turn-end-phase.ts index d54a578f9cd..2f6b46d190c 100644 --- a/src/phases/turn-end-phase.ts +++ b/src/phases/turn-end-phase.ts @@ -15,7 +15,7 @@ import i18next from "i18next"; import { FieldPhase } from "./field-phase"; import { PokemonHealPhase } from "./pokemon-heal-phase"; import { globalScene } from "#app/global-scene"; -import { applyTurnHealHeldItem } from "#app/modifier/held-items/turn-heal"; +import { applyTurnHealHeldItem } from "#app/items/held-items/turn-heal"; export class TurnEndPhase extends FieldPhase { start() { diff --git a/src/ui/summary-ui-handler.ts b/src/ui/summary-ui-handler.ts index 6fcf2e766f4..6b21e4d9c92 100644 --- a/src/ui/summary-ui-handler.ts +++ b/src/ui/summary-ui-handler.ts @@ -39,7 +39,7 @@ import { PlayerGender } from "#enums/player-gender"; import { Stat, PERMANENT_STATS, getStatKey } from "#enums/stat"; import { Nature } from "#enums/nature"; import { achvs } from "#app/system/achv"; -import { allHeldItems } from "#app/modifier/all-held-items"; +import { allHeldItems } from "#app/items/all-held-items"; enum Page { PROFILE,