diff --git a/src/data/mystery-encounters/encounters/an-offer-you-cant-refuse-encounter.ts b/src/data/mystery-encounters/encounters/an-offer-you-cant-refuse-encounter.ts index 0ec25f537f5..0053bb6b9ff 100644 --- a/src/data/mystery-encounters/encounters/an-offer-you-cant-refuse-encounter.ts +++ b/src/data/mystery-encounters/encounters/an-offer-you-cant-refuse-encounter.ts @@ -1,8 +1,7 @@ import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; -import { allTrainerItems } from "#app/data/data-lists"; import { globalScene } from "#app/global-scene"; import { speciesStarterCosts } from "#balance/starters"; -import { modifierTypes } from "#data/data-lists"; +import { allTrainerItems, modifierTypes } from "#data/data-lists"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import { MysteryEncounterType } from "#enums/mystery-encounter-type"; diff --git a/src/data/mystery-encounters/encounters/shady-vitamin-dealer-encounter.ts b/src/data/mystery-encounters/encounters/shady-vitamin-dealer-encounter.ts index 6e6fe35779d..7d052eaadd7 100644 --- a/src/data/mystery-encounters/encounters/shady-vitamin-dealer-encounter.ts +++ b/src/data/mystery-encounters/encounters/shady-vitamin-dealer-encounter.ts @@ -1,6 +1,6 @@ import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; -import { allHeldItems } from "#app/data/data-lists"; import { globalScene } from "#app/global-scene"; +import { allHeldItems } from "#data/data-lists"; import { getNatureName } from "#data/nature"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; diff --git a/src/field/pokemon-held-item-manager.ts b/src/field/pokemon-held-item-manager.ts index b6daed00920..ae4509b71b1 100644 --- a/src/field/pokemon-held-item-manager.ts +++ b/src/field/pokemon-held-item-manager.ts @@ -1,13 +1,12 @@ -import { allHeldItems } from "#app/data/data-lists"; +import { allHeldItems } from "#data/data-lists"; +import type { FormChangeItem } from "#enums/form-change-item"; import { type HeldItemCategoryId, type HeldItemId, isCategoryId, isItemInCategory, isItemInRequested, -} from "#app/enums/held-item-id"; -import { getTypedEntries, getTypedKeys } from "#app/utils/common"; -import type { FormChangeItem } from "#enums/form-change-item"; +} from "#enums/held-item-id"; import { type FormChangeItemPropertyMap, type FormChangeItemSpecs, @@ -17,6 +16,7 @@ import { type HeldItemSpecs, isHeldItemSpecs, } from "#items/held-item-data-types"; +import { getTypedEntries, getTypedKeys } from "#utils/common"; export class PokemonItemManager { public heldItems: HeldItemDataMap; diff --git a/src/items/all-held-items.ts b/src/items/all-held-items.ts index 2b18fe5399a..8641dbfe652 100644 --- a/src/items/all-held-items.ts +++ b/src/items/all-held-items.ts @@ -1,11 +1,11 @@ -import { allHeldItems } from "#app/data/data-lists"; -import { getEnumValues } from "#app/utils/common"; +import { allHeldItems } from "#data/data-lists"; import { BerryType } from "#enums/berry-type"; import { HeldItemId } from "#enums/held-item-id"; import type { PokemonType } from "#enums/pokemon-type"; import { SpeciesId } from "#enums/species-id"; import { type PermanentStat, Stat } from "#enums/stat"; import { StatusEffect } from "#enums/status-effect"; +import { getEnumValues } from "#utils/common"; import { HeldItemEffect } from "./held-item"; import { AccuracyBoosterHeldItem, type AccuracyBoostParams } from "./held-items/accuracy-booster"; import { diff --git a/src/items/all-trainer-items.ts b/src/items/all-trainer-items.ts index afb15aca431..60abf3b676e 100644 --- a/src/items/all-trainer-items.ts +++ b/src/items/all-trainer-items.ts @@ -1,4 +1,4 @@ -import { allTrainerItems } from "#app/data/data-lists"; +import { allTrainerItems } from "#data/data-lists"; import { Stat, type TempBattleStat } from "#enums/stat"; import { StatusEffect } from "#enums/status-effect"; import { TrainerItemId } from "#enums/trainer-item-id"; diff --git a/src/items/apply-trainer-items.ts b/src/items/apply-trainer-items.ts index 898c4067a68..8a1c0145095 100644 --- a/src/items/apply-trainer-items.ts +++ b/src/items/apply-trainer-items.ts @@ -1,4 +1,4 @@ -import { allTrainerItems } from "#app/data/data-lists"; +import { allTrainerItems } from "#data/data-lists"; import { type BooleanHolderParams, type NumberHolderParams, diff --git a/src/items/held-item-data-types.ts b/src/items/held-item-data-types.ts index 1670b2bb6d0..58d3f25d20c 100644 --- a/src/items/held-item-data-types.ts +++ b/src/items/held-item-data-types.ts @@ -1,8 +1,9 @@ // TODO: move to `src/@types/` -import type Pokemon from "#app/field/pokemon"; + import type { FormChangeItem } from "#enums/form-change-item"; import type { HeldItemCategoryId, HeldItemId } from "#enums/held-item-id"; import type { RewardTier } from "#enums/reward-tier"; +import type { Pokemon } from "#field/pokemon"; export type HeldItemData = { stack: number; diff --git a/src/items/held-item-pool.ts b/src/items/held-item-pool.ts index 8f8a761474d..3d769cc389d 100644 --- a/src/items/held-item-pool.ts +++ b/src/items/held-item-pool.ts @@ -1,13 +1,12 @@ -import { allHeldItems } from "#app/data/data-lists"; -import type Pokemon from "#app/field/pokemon"; -import type { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon"; -import { coerceArray, getEnumValues, isNullOrUndefined, pickWeightedIndex, randSeedInt } from "#app/utils/common"; +import { allHeldItems } from "#data/data-lists"; import { BerryType } from "#enums/berry-type"; import { HeldItemCategoryId, HeldItemId, HeldItemNames, isCategoryId } from "#enums/held-item-id"; import { HeldItemPoolType } from "#enums/modifier-pool-type"; import type { PokemonType } from "#enums/pokemon-type"; import { RewardTier } from "#enums/reward-tier"; import { PERMANENT_STATS } from "#enums/stat"; +import type { EnemyPokemon, PlayerPokemon, Pokemon } from "#field/pokemon"; +import { coerceArray, getEnumValues, isNullOrUndefined, pickWeightedIndex, randSeedInt } from "#utils/common"; import { type HeldItemConfiguration, type HeldItemPool, diff --git a/src/items/held-item.ts b/src/items/held-item.ts index e701a9b69c6..10efe2aae8e 100644 --- a/src/items/held-item.ts +++ b/src/items/held-item.ts @@ -1,7 +1,7 @@ -import { applyAbAttrs } from "#app/data/abilities/apply-ab-attrs"; -import type Pokemon from "#app/field/pokemon"; +import { applyAbAttrs } from "#abilities/apply-ab-attrs"; import { globalScene } from "#app/global-scene"; import { type HeldItemId, HeldItemNames } from "#enums/held-item-id"; +import type { Pokemon } from "#field/pokemon"; import i18next from "i18next"; // TODO: this should be moved to its own file diff --git a/src/items/held-items/accuracy-booster.ts b/src/items/held-items/accuracy-booster.ts index f8aa332ab27..8d7d55bac69 100644 --- a/src/items/held-items/accuracy-booster.ts +++ b/src/items/held-items/accuracy-booster.ts @@ -1,6 +1,6 @@ -import type Pokemon from "#app/field/pokemon"; -import type { NumberHolder } from "#app/utils/common"; import type { HeldItemId } from "#enums/held-item-id"; +import type { Pokemon } from "#field/pokemon"; +import type { NumberHolder } from "#utils/common"; import { HeldItem, HeldItemEffect } from "../held-item"; export interface AccuracyBoostParams { diff --git a/src/items/held-items/attack-type-booster.ts b/src/items/held-items/attack-type-booster.ts index d2f08426e96..ddfd5373be5 100644 --- a/src/items/held-items/attack-type-booster.ts +++ b/src/items/held-items/attack-type-booster.ts @@ -1,8 +1,8 @@ -import type Pokemon from "#app/field/pokemon"; -import type { NumberHolder } from "#app/utils/common"; import { HeldItemId, HeldItemNames } from "#enums/held-item-id"; import { PokemonType } from "#enums/pokemon-type"; +import type { Pokemon } from "#field/pokemon"; import { HeldItem, HeldItemEffect } from "#items/held-item"; +import type { NumberHolder } from "#utils/common"; import i18next from "i18next"; export interface AttackTypeBoostParams { diff --git a/src/items/held-items/base-stat-booster.ts b/src/items/held-items/base-stat-booster.ts index 6f452a12996..284844fd6f9 100644 --- a/src/items/held-items/base-stat-booster.ts +++ b/src/items/held-items/base-stat-booster.ts @@ -1,6 +1,6 @@ -import type Pokemon from "#app/field/pokemon"; import { HeldItemId } from "#enums/held-item-id"; import { getStatKey, type PermanentStat, Stat } from "#enums/stat"; +import type { Pokemon } from "#field/pokemon"; import i18next from "i18next"; import { HeldItem, HeldItemEffect } from "../held-item"; diff --git a/src/items/held-items/base-stat-flat.ts b/src/items/held-items/base-stat-flat.ts index 30c8b5b9f80..4b0992f6dd9 100644 --- a/src/items/held-items/base-stat-flat.ts +++ b/src/items/held-items/base-stat-flat.ts @@ -1,5 +1,5 @@ -import type Pokemon from "#app/field/pokemon"; import { Stat } from "#enums/stat"; +import type { Pokemon } from "#field/pokemon"; import i18next from "i18next"; import { HeldItem, HeldItemEffect } from "../held-item"; diff --git a/src/items/held-items/base-stat-total.ts b/src/items/held-items/base-stat-total.ts index 643c6ef26a0..7e861a07a1a 100644 --- a/src/items/held-items/base-stat-total.ts +++ b/src/items/held-items/base-stat-total.ts @@ -1,5 +1,5 @@ -import type Pokemon from "#app/field/pokemon"; import type { HeldItemId } from "#enums/held-item-id"; +import type { Pokemon } from "#field/pokemon"; import i18next from "i18next"; import { HeldItem, HeldItemEffect } from "../held-item"; diff --git a/src/items/held-items/baton.ts b/src/items/held-items/baton.ts index 5b34fa3d519..63f1f173240 100644 --- a/src/items/held-items/baton.ts +++ b/src/items/held-items/baton.ts @@ -1,5 +1,5 @@ -import type Pokemon from "#app/field/pokemon"; -import type { NumberHolder } from "#app/utils/common"; +import type { Pokemon } from "#field/pokemon"; +import type { NumberHolder } from "#utils/common"; import { HeldItem, HeldItemEffect } from "../held-item"; export interface BatonParams { diff --git a/src/items/held-items/berry.ts b/src/items/held-items/berry.ts index 336eca8e880..7796ef586c0 100644 --- a/src/items/held-items/berry.ts +++ b/src/items/held-items/berry.ts @@ -1,11 +1,11 @@ -import { getBerryEffectDescription, getBerryEffectFunc, getBerryName, getBerryPredicate } from "#app/data/berry"; -import { BerryUsedEvent } from "#app/events/battle-scene"; -import type Pokemon from "#app/field/pokemon"; import { globalScene } from "#app/global-scene"; -import { BooleanHolder } from "#app/utils/common"; +import { getBerryEffectDescription, getBerryEffectFunc, getBerryName, getBerryPredicate } from "#data/berry"; import { BerryType } from "#enums/berry-type"; import { HeldItemId } from "#enums/held-item-id"; +import { BerryUsedEvent } from "#events/battle-scene"; +import type { Pokemon } from "#field/pokemon"; import { ConsumableHeldItem, HeldItemEffect } from "#items/held-item"; +import { BooleanHolder } from "#utils/common"; import { TrainerItemEffect } from "../trainer-item"; interface BerryTypeToHeldItemMap { diff --git a/src/items/held-items/bypass-speed-chance.ts b/src/items/held-items/bypass-speed-chance.ts index b61186ba9d8..df14b07dce0 100644 --- a/src/items/held-items/bypass-speed-chance.ts +++ b/src/items/held-items/bypass-speed-chance.ts @@ -1,9 +1,9 @@ -import type Pokemon from "#app/field/pokemon"; import { globalScene } from "#app/global-scene"; import { getPokemonNameWithAffix } from "#app/messages"; -import type { BooleanHolder } from "#app/utils/common"; import { Command } from "#enums/command"; +import type { Pokemon } from "#field/pokemon"; import { HeldItem, HeldItemEffect } from "#items/held-item"; +import type { BooleanHolder } from "#utils/common"; import i18next from "i18next"; export interface BypassSpeedChanceParams { diff --git a/src/items/held-items/crit-booster.ts b/src/items/held-items/crit-booster.ts index 53698a2b26d..399d3fae060 100644 --- a/src/items/held-items/crit-booster.ts +++ b/src/items/held-items/crit-booster.ts @@ -1,7 +1,7 @@ -import type Pokemon from "#app/field/pokemon"; -import type { NumberHolder } from "#app/utils/common"; import type { HeldItemId } from "#enums/held-item-id"; import type { SpeciesId } from "#enums/species-id"; +import type { Pokemon } from "#field/pokemon"; +import type { NumberHolder } from "#utils/common"; import { HeldItem, HeldItemEffect } from "../held-item"; export interface CritBoostParams { diff --git a/src/items/held-items/damage-money-reward.ts b/src/items/held-items/damage-money-reward.ts index 5f00a751b78..962fd14a580 100644 --- a/src/items/held-items/damage-money-reward.ts +++ b/src/items/held-items/damage-money-reward.ts @@ -1,6 +1,6 @@ -import type Pokemon from "#app/field/pokemon"; import { globalScene } from "#app/global-scene"; -import { NumberHolder } from "#app/utils/common"; +import type { Pokemon } from "#field/pokemon"; +import { NumberHolder } from "#utils/common"; import { HeldItem, HeldItemEffect } from "../held-item"; import { TrainerItemEffect } from "../trainer-item"; diff --git a/src/items/held-items/evo-tracker.ts b/src/items/held-items/evo-tracker.ts index 4f2985a9e2f..c4bab46b1d8 100644 --- a/src/items/held-items/evo-tracker.ts +++ b/src/items/held-items/evo-tracker.ts @@ -1,8 +1,8 @@ -import type Pokemon from "#app/field/pokemon"; import { globalScene } from "#app/global-scene"; import { HeldItemId } from "#enums/held-item-id"; import type { SpeciesId } from "#enums/species-id"; import { TrainerItemId } from "#enums/trainer-item-id"; +import type { Pokemon } from "#field/pokemon"; import i18next from "i18next"; import { HeldItem, HeldItemEffect } from "../held-item"; diff --git a/src/items/held-items/exp-booster.ts b/src/items/held-items/exp-booster.ts index 98eed27392f..0d3d8b7fcb7 100644 --- a/src/items/held-items/exp-booster.ts +++ b/src/items/held-items/exp-booster.ts @@ -1,6 +1,6 @@ -import type Pokemon from "#app/field/pokemon"; -import type { NumberHolder } from "#app/utils/common"; import type { HeldItemId } from "#enums/held-item-id"; +import type { Pokemon } from "#field/pokemon"; +import type { NumberHolder } from "#utils/common"; import i18next from "i18next"; import { HeldItem, HeldItemEffect } from "../held-item"; diff --git a/src/items/held-items/field-effect.ts b/src/items/held-items/field-effect.ts index de680226623..c248143578d 100644 --- a/src/items/held-items/field-effect.ts +++ b/src/items/held-items/field-effect.ts @@ -1,6 +1,6 @@ -import type Pokemon from "#app/field/pokemon"; -import type { NumberHolder } from "#app/utils/common"; +import type { Pokemon } from "#field/pokemon"; import { HeldItem, HeldItemEffect } from "#items/held-item"; +import type { NumberHolder } from "#utils/common"; export interface FieldEffectParams { pokemon: Pokemon; diff --git a/src/items/held-items/flinch-chance.ts b/src/items/held-items/flinch-chance.ts index 904fceb1484..290743fac00 100644 --- a/src/items/held-items/flinch-chance.ts +++ b/src/items/held-items/flinch-chance.ts @@ -1,7 +1,7 @@ -import type Pokemon from "#app/field/pokemon"; -import type { BooleanHolder } from "#app/utils/common"; import type { HeldItemId } from "#enums/held-item-id"; +import type { Pokemon } from "#field/pokemon"; import { HeldItem, HeldItemEffect } from "#items/held-item"; +import type { BooleanHolder } from "#utils/common"; export interface FlinchChanceParams { /** The pokemon with the item */ diff --git a/src/items/held-items/friendship-booster.ts b/src/items/held-items/friendship-booster.ts index 3ad6e48e63e..6aade547b27 100644 --- a/src/items/held-items/friendship-booster.ts +++ b/src/items/held-items/friendship-booster.ts @@ -1,5 +1,5 @@ -import type Pokemon from "#app/field/pokemon"; -import type { NumberHolder } from "#app/utils/common"; +import type { Pokemon } from "#field/pokemon"; +import type { NumberHolder } from "#utils/common"; import i18next from "i18next"; import { HeldItem, HeldItemEffect } from "../held-item"; diff --git a/src/items/held-items/hit-heal.ts b/src/items/held-items/hit-heal.ts index e8bf46d09dd..522c3e018d7 100644 --- a/src/items/held-items/hit-heal.ts +++ b/src/items/held-items/hit-heal.ts @@ -1,9 +1,9 @@ -import type Pokemon from "#app/field/pokemon"; import { globalScene } from "#app/global-scene"; import { getPokemonNameWithAffix } from "#app/messages"; -import { PokemonHealPhase } from "#app/phases/pokemon-heal-phase"; -import { toDmgValue } from "#app/utils/common"; +import type { Pokemon } from "#field/pokemon"; import { HeldItem, HeldItemEffect } from "#items/held-item"; +import { PokemonHealPhase } from "#phases/pokemon-heal-phase"; +import { toDmgValue } from "#utils/common"; import i18next from "i18next"; export interface HitHealParams { @@ -36,7 +36,7 @@ export class HitHealHeldItem extends HeldItem { const stackCount = pokemon.heldItemManager.getStack(this.type); if (pokemon.turnData.totalDamageDealt > 0 && !pokemon.isFullHp()) { // TODO: this shouldn't be undefined AFAIK - globalScene.unshiftPhase( + globalScene.phaseManager.unshiftPhase( new PokemonHealPhase( pokemon.getBattlerIndex(), toDmgValue(pokemon.turnData.totalDamageDealt / 8) * stackCount, diff --git a/src/items/held-items/incrementing-stat.ts b/src/items/held-items/incrementing-stat.ts index a29a2f2a877..e20e4a97f30 100644 --- a/src/items/held-items/incrementing-stat.ts +++ b/src/items/held-items/incrementing-stat.ts @@ -1,6 +1,6 @@ -import type Pokemon from "#app/field/pokemon"; -import type { NumberHolder } from "#app/utils/common"; import { Stat } from "#enums/stat"; +import type { Pokemon } from "#field/pokemon"; +import type { NumberHolder } from "#utils/common"; import i18next from "i18next"; import { HeldItem, HeldItemEffect } from "../held-item"; diff --git a/src/items/held-items/instant-revive.ts b/src/items/held-items/instant-revive.ts index dd97a28ccca..368cd5e51e8 100644 --- a/src/items/held-items/instant-revive.ts +++ b/src/items/held-items/instant-revive.ts @@ -1,9 +1,9 @@ -import { applyAbAttrs } from "#app/data/abilities/apply-ab-attrs"; -import type Pokemon from "#app/field/pokemon"; +import { applyAbAttrs } from "#abilities/apply-ab-attrs"; import { globalScene } from "#app/global-scene"; import { getPokemonNameWithAffix } from "#app/messages"; -import { PokemonHealPhase } from "#app/phases/pokemon-heal-phase"; -import { toDmgValue } from "#app/utils/common"; +import type { Pokemon } from "#field/pokemon"; +import { PokemonHealPhase } from "#phases/pokemon-heal-phase"; +import { toDmgValue } from "#utils/common"; import i18next from "i18next"; import { ConsumableHeldItem, HeldItemEffect } from "../held-item"; diff --git a/src/items/held-items/item-steal.ts b/src/items/held-items/item-steal.ts index 68548a6c77a..e3c1361d62f 100644 --- a/src/items/held-items/item-steal.ts +++ b/src/items/held-items/item-steal.ts @@ -1,9 +1,9 @@ -import { allHeldItems } from "#app/data/data-lists"; -import Pokemon from "#app/field/pokemon"; import { globalScene } from "#app/global-scene"; import { getPokemonNameWithAffix } from "#app/messages"; -import { randSeedFloat } from "#app/utils/common"; +import { allHeldItems } from "#data/data-lists"; import type { HeldItemId } from "#enums/held-item-id"; +import { Pokemon } from "#field/pokemon"; +import { randSeedFloat } from "#utils/common"; import i18next from "i18next"; import { HeldItem, HeldItemEffect } from "../held-item"; diff --git a/src/items/held-items/multi-hit.ts b/src/items/held-items/multi-hit.ts index 1a25b394287..d288039bceb 100644 --- a/src/items/held-items/multi-hit.ts +++ b/src/items/held-items/multi-hit.ts @@ -1,8 +1,8 @@ -import { allMoves } from "#app/data/data-lists"; -import type Pokemon from "#app/field/pokemon"; -import { isNullOrUndefined, type NumberHolder } from "#app/utils/common"; +import { allMoves } from "#data/data-lists"; import type { MoveId } from "#enums/move-id"; +import type { Pokemon } from "#field/pokemon"; import { HeldItem, HeldItemEffect } from "#items/held-item"; +import { isNullOrUndefined, type NumberHolder } from "#utils/common"; import i18next from "i18next"; export interface MultiHitParams { diff --git a/src/items/held-items/nature-weight-booster.ts b/src/items/held-items/nature-weight-booster.ts index 983c9173ab8..41458564510 100644 --- a/src/items/held-items/nature-weight-booster.ts +++ b/src/items/held-items/nature-weight-booster.ts @@ -1,5 +1,5 @@ -import type Pokemon from "#app/field/pokemon"; -import type { NumberHolder } from "#app/utils/common"; +import type { Pokemon } from "#field/pokemon"; +import type { NumberHolder } from "#utils/common"; import { HeldItem, HeldItemEffect } from "../held-item"; export interface NatureWeightBoostParams { diff --git a/src/items/held-items/reset-negative-stat-stage.ts b/src/items/held-items/reset-negative-stat-stage.ts index d0be04849be..e9926ff4955 100644 --- a/src/items/held-items/reset-negative-stat-stage.ts +++ b/src/items/held-items/reset-negative-stat-stage.ts @@ -1,7 +1,7 @@ -import type Pokemon from "#app/field/pokemon"; import { globalScene } from "#app/global-scene"; import { getPokemonNameWithAffix } from "#app/messages"; import { BATTLE_STATS } from "#enums/stat"; +import type { Pokemon } from "#field/pokemon"; import i18next from "i18next"; import { ConsumableHeldItem, HeldItemEffect } from "../held-item"; diff --git a/src/items/held-items/stat-booster.ts b/src/items/held-items/stat-booster.ts index f64770ffce4..410ef244fe4 100644 --- a/src/items/held-items/stat-booster.ts +++ b/src/items/held-items/stat-booster.ts @@ -1,9 +1,9 @@ -import { pokemonEvolutions } from "#app/data/balance/pokemon-evolutions"; -import type Pokemon from "#app/field/pokemon"; -import type { NumberHolder } from "#app/utils/common"; +import { pokemonEvolutions } from "#balance/pokemon-evolutions"; import { HeldItemId } from "#enums/held-item-id"; import type { SpeciesId } from "#enums/species-id"; import type { Stat } from "#enums/stat"; +import type { Pokemon } from "#field/pokemon"; +import type { NumberHolder } from "#utils/common"; import { HeldItem, HeldItemEffect } from "../held-item"; export interface StatBoostParams { diff --git a/src/items/held-items/survive-chance.ts b/src/items/held-items/survive-chance.ts index fd2d7876793..ef9256f030f 100644 --- a/src/items/held-items/survive-chance.ts +++ b/src/items/held-items/survive-chance.ts @@ -1,8 +1,8 @@ -import type Pokemon from "#app/field/pokemon"; import { globalScene } from "#app/global-scene"; import { getPokemonNameWithAffix } from "#app/messages"; -import type { BooleanHolder } from "#app/utils/common"; +import type { Pokemon } from "#field/pokemon"; import { HeldItem, HeldItemEffect } from "#items/held-item"; +import type { BooleanHolder } from "#utils/common"; import i18next from "i18next"; export interface SurviveChanceParams { diff --git a/src/items/held-items/turn-end-heal.ts b/src/items/held-items/turn-end-heal.ts index 5316b728e40..3acc5861a8e 100644 --- a/src/items/held-items/turn-end-heal.ts +++ b/src/items/held-items/turn-end-heal.ts @@ -1,9 +1,9 @@ -import type Pokemon from "#app/field/pokemon"; import { globalScene } from "#app/global-scene"; import { getPokemonNameWithAffix } from "#app/messages"; -import { PokemonHealPhase } from "#app/phases/pokemon-heal-phase"; -import { toDmgValue } from "#app/utils/common"; +import type { Pokemon } from "#field/pokemon"; import { HeldItem, HeldItemEffect } from "#items/held-item"; +import { PokemonHealPhase } from "#phases/pokemon-heal-phase"; +import { toDmgValue } from "#utils/common"; import i18next from "i18next"; export interface TurnEndHealParams { diff --git a/src/items/held-items/turn-end-status.ts b/src/items/held-items/turn-end-status.ts index 630347c6a54..d746b59419d 100644 --- a/src/items/held-items/turn-end-status.ts +++ b/src/items/held-items/turn-end-status.ts @@ -1,6 +1,6 @@ -import type Pokemon from "#app/field/pokemon"; import type { HeldItemId } from "#enums/held-item-id"; import type { StatusEffect } from "#enums/status-effect"; +import type { Pokemon } from "#field/pokemon"; import { HeldItem, HeldItemEffect } from "#items/held-item"; export interface TurnEndStatusParams { diff --git a/src/items/item-utility.ts b/src/items/item-utility.ts index 540406acdf2..db858122bcf 100644 --- a/src/items/item-utility.ts +++ b/src/items/item-utility.ts @@ -1,5 +1,4 @@ -import { allHeldItems, allTrainerItems } from "#app/data/data-lists"; -import { formChangeItemName } from "#app/data/pokemon-forms"; +import { allHeldItems, allTrainerItems } from "#data/data-lists"; import type { FormChangeItem } from "#enums/form-change-item"; import type { HeldItemId } from "#enums/held-item-id"; import type { TrainerItemId } from "#enums/trainer-item-id"; diff --git a/src/items/modifier-to-item-migrator-utils.ts b/src/items/modifier-to-item-migrator-utils.ts index 929c1229bb0..b6f6571fedc 100644 --- a/src/items/modifier-to-item-migrator-utils.ts +++ b/src/items/modifier-to-item-migrator-utils.ts @@ -1,4 +1,3 @@ -import type ModifierData from "#app/system/modifier-data"; import type { BerryType } from "#enums/berry-type"; import { HeldItemId } from "#enums/held-item-id"; import type { PokemonType } from "#enums/pokemon-type"; diff --git a/src/items/trainer-item-manager.ts b/src/items/trainer-item-manager.ts index 4170761665f..6579df69ca5 100644 --- a/src/items/trainer-item-manager.ts +++ b/src/items/trainer-item-manager.ts @@ -1,6 +1,5 @@ -import { allTrainerItems } from "#app/data/data-lists"; -import type { TrainerItemId } from "#app/enums/trainer-item-id"; -import { getTypedEntries, getTypedKeys } from "#app/utils/common"; +import { allTrainerItems } from "#data/data-lists"; +import type { TrainerItemId } from "#enums/trainer-item-id"; import { isTrainerItemSpecs, type TrainerItemConfiguration, @@ -8,6 +7,7 @@ import { type TrainerItemSaveData, type TrainerItemSpecs, } from "#items/trainer-item-data-types"; +import { getTypedEntries, getTypedKeys } from "#utils/common"; export class TrainerItemManager { public trainerItems: TrainerItemDataMap; diff --git a/src/items/trainer-item-pool.ts b/src/items/trainer-item-pool.ts index 12fecd88eaf..5ebe6a2d9a3 100644 --- a/src/items/trainer-item-pool.ts +++ b/src/items/trainer-item-pool.ts @@ -1,8 +1,8 @@ -import { allTrainerItems } from "#app/data/data-lists"; import { globalScene } from "#app/global-scene"; -import { isNullOrUndefined, pickWeightedIndex } from "#app/utils/common"; +import { allTrainerItems } from "#data/data-lists"; import { RewardTier } from "#enums/reward-tier"; import type { TrainerItemId } from "#enums/trainer-item-id"; +import { isNullOrUndefined, pickWeightedIndex } from "#utils/common"; import type { TrainerItemPool, TrainerItemTieredPool } from "./trainer-item-data-types"; import type { TrainerItemManager } from "./trainer-item-manager"; diff --git a/src/items/trainer-item.ts b/src/items/trainer-item.ts index 4858809db55..6ab92ae1827 100644 --- a/src/items/trainer-item.ts +++ b/src/items/trainer-item.ts @@ -1,13 +1,13 @@ -import { getStatusEffectDescriptor, getStatusEffectHealText } from "#app/data/status-effect"; -import type Pokemon from "#app/field/pokemon"; import { globalScene } from "#app/global-scene"; import { getPokemonNameWithAffix } from "#app/messages"; -import { addTextObject, TextStyle } from "#app/ui/text"; -import { type BooleanHolder, hslToHex, type NumberHolder, randSeedFloat, toDmgValue } from "#app/utils/common"; +import { getStatusEffectDescriptor, getStatusEffectHealText } from "#data/status-effect"; import { BattlerTagType } from "#enums/battler-tag-type"; import { getStatKey, Stat, type TempBattleStat } from "#enums/stat"; import { StatusEffect } from "#enums/status-effect"; import { TrainerItemId, TrainerItemNames } from "#enums/trainer-item-id"; +import type { Pokemon } from "#field/pokemon"; +import { addTextObject, TextStyle } from "#ui/text"; +import { type BooleanHolder, hslToHex, type NumberHolder, randSeedFloat, toDmgValue } from "#utils/common"; import i18next from "i18next"; import type { TrainerItemManager } from "./trainer-item-manager"; diff --git a/src/phases/reward-phase.ts b/src/phases/reward-phase.ts index 3c490f6c9cb..07ff9926521 100644 --- a/src/phases/reward-phase.ts +++ b/src/phases/reward-phase.ts @@ -1,7 +1,7 @@ -import type { ModifierTypeFunc } from "#app/@types/modifier-types"; import { globalScene } from "#app/global-scene"; -import { type ModifierType, TrainerItemReward } from "#app/modifier/modifier-type"; -import { getModifierType } from "#app/utils/modifier-utils"; +import { type ModifierType, TrainerItemReward } from "#modifiers/modifier-type"; +import type { ModifierTypeFunc } from "#types/modifier-types"; +import { getModifierType } from "#utils/modifier-utils"; import i18next from "i18next"; import { BattlePhase } from "./battle-phase"; diff --git a/src/ui/item-bar-ui.ts b/src/ui/item-bar-ui.ts index e446b7c0bc0..4cfe5ccd86d 100644 --- a/src/ui/item-bar-ui.ts +++ b/src/ui/item-bar-ui.ts @@ -1,6 +1,6 @@ -import { allHeldItems, allTrainerItems } from "#app/data/data-lists"; -import type { Pokemon } from "#app/field/pokemon"; import { globalScene } from "#app/global-scene"; +import { allHeldItems, allTrainerItems } from "#data/data-lists"; +import type { Pokemon } from "#field/pokemon"; import { heldItemSortFunc, trainerItemSortFunc } from "#items/item-utility"; import type { TrainerItemManager } from "#items/trainer-item-manager"; diff --git a/test/mystery-encounter/encounters/trash-to-treasure-encounter.test.ts b/test/mystery-encounter/encounters/trash-to-treasure-encounter.test.ts index a2fb54974b8..f4cafa9bb2d 100644 --- a/test/mystery-encounter/encounters/trash-to-treasure-encounter.test.ts +++ b/test/mystery-encounter/encounters/trash-to-treasure-encounter.test.ts @@ -1,5 +1,4 @@ import type { BattleScene } from "#app/battle-scene"; -import { randSeedInt } from "#app/utils/common"; import * as BattleAnims from "#data/battle-anims"; import { BiomeId } from "#enums/biome-id"; import { HeldItemCategoryId, HeldItemId } from "#enums/held-item-id"; @@ -27,6 +26,7 @@ import { GameManager } from "#test/testUtils/gameManager"; import { initSceneWithoutEncounterPhase } from "#test/testUtils/gameManagerUtils"; import { RewardSelectUiHandler } from "#ui/reward-select-ui-handler"; import * as Utils from "#utils/common"; +import { randSeedInt } from "#utils/common"; import { getPokemonSpecies } from "#utils/pokemon-utils"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";