From aa39edd8faa0ac18c2b8bbc75912f93920588a07 Mon Sep 17 00:00:00 2001 From: Shark that walks like a man <106829671+stwlam@users.noreply.github.com> Date: Wed, 25 Oct 2023 17:11:17 -0500 Subject: [PATCH] Move `ItemPF2e` to "@item/base/document" (#10913) Plus "@item/sheet" and "@item/data" to "@item/base" as well --- build/conditions.ts | 2 +- build/lib/compendium-pack.ts | 6 +++--- build/lib/extractor.ts | 3 +-- build/lib/level-database.ts | 2 +- build/run-migration.ts | 2 +- src/module/actor/base.ts | 3 +-- src/module/actor/character/data.ts | 2 +- src/module/actor/character/document.ts | 2 +- src/module/actor/character/feats.ts | 2 +- src/module/actor/character/sheet.ts | 3 +-- src/module/actor/creature/document.ts | 2 +- src/module/actor/creature/sheet.ts | 5 ++--- .../actor/creature/spell-preparation-sheet.ts | 2 +- src/module/actor/data/base.ts | 2 +- src/module/actor/familiar/document.ts | 2 +- src/module/actor/hazard/document.ts | 2 +- src/module/actor/inventory/index.ts | 2 +- src/module/actor/loot/document.ts | 2 +- src/module/actor/npc/document.ts | 2 +- src/module/actor/npc/skills-editor.ts | 2 +- src/module/actor/party/document.ts | 2 +- src/module/actor/party/invalid-campaign.ts | 4 ++-- src/module/actor/party/kingdom/model.ts | 2 +- src/module/actor/party/kingdom/sheet.ts | 2 +- src/module/actor/party/sheet.ts | 2 +- src/module/actor/party/types.ts | 2 +- src/module/actor/sheet/base.ts | 4 +--- .../actor/sheet/item-summary-renderer.ts | 8 +++---- src/module/actor/vehicle/document.ts | 2 +- src/module/actor/vehicle/sheet.ts | 2 +- src/module/apps/compendium-browser/index.ts | 3 +-- src/module/canvas/token/aura/renderer.ts | 2 +- src/module/chat-message/data.ts | 2 +- src/module/dc.ts | 2 +- src/module/item/abc/data.ts | 2 +- src/module/item/abc/sheet.ts | 2 +- src/module/item/ability/data.ts | 2 +- src/module/item/ability/document.ts | 7 +++---- src/module/item/ability/helpers.ts | 2 +- src/module/item/ability/sheet.ts | 2 +- src/module/item/abstract-effect/data.ts | 2 +- src/module/item/affliction/data.ts | 4 ++-- src/module/item/affliction/sheet.ts | 2 +- src/module/item/ancestry/data.ts | 2 +- src/module/item/armor/document.ts | 2 +- src/module/item/background/data.ts | 2 +- src/module/item/{ => base}/data/helpers.ts | 2 +- src/module/item/{ => base}/data/index.ts | 12 +++++++++-- .../{data/base.ts => base/data/system.ts} | 2 +- src/module/item/{ => base}/data/values.ts | 0 src/module/item/{base.ts => base/document.ts} | 21 ++++++++++--------- src/module/item/{ => base}/sheet/base.ts | 2 +- .../item/{ => base}/sheet/codemirror.ts | 0 src/module/item/{ => base}/sheet/index.ts | 0 .../sheet/rule-element-form/aura.ts | 0 .../sheet/rule-element-form/base.ts | 2 +- .../sheet/rule-element-form/fast-healing.ts | 0 .../sheet/rule-element-form/flat-modifier.ts | 0 .../sheet/rule-element-form/grant-item.ts | 0 .../sheet/rule-element-form/index.ts | 0 .../multiple-attack-penalty.ts | 0 .../sheet/rule-element-form/roll-note.ts | 0 .../sheet/rule-element-form/token-image.ts | 0 .../sheet/rule-element-form/token-light.ts | 0 src/module/item/campaign-feature/data.ts | 2 +- src/module/item/campaign-feature/document.ts | 2 +- src/module/item/campaign-feature/sheet.ts | 2 +- src/module/item/class/data.ts | 2 +- src/module/item/condition/data.ts | 2 +- src/module/item/consumable/document.ts | 2 +- .../item/consumable/spell-consumables.ts | 2 +- src/module/item/container/document.ts | 2 +- src/module/item/deity/data.ts | 2 +- src/module/item/deity/sheet.ts | 2 +- src/module/item/effect/data.ts | 2 +- src/module/item/effect/sheet.ts | 2 +- src/module/item/equipment/document.ts | 2 +- src/module/item/feat/data.ts | 2 +- src/module/item/feat/document.ts | 5 ++--- src/module/item/feat/sheet.ts | 2 +- src/module/item/helpers.ts | 2 +- src/module/item/heritage/data.ts | 2 +- src/module/item/heritage/sheet.ts | 2 +- src/module/item/index.ts | 4 ++-- src/module/item/kit/data.ts | 2 +- src/module/item/kit/sheet.ts | 2 +- src/module/item/lore/data.ts | 2 +- src/module/item/lore/index.ts | 4 ++-- src/module/item/melee/data.ts | 2 +- src/module/item/melee/sheet.ts | 2 +- src/module/item/physical/data.ts | 4 ++-- src/module/item/physical/document.ts | 4 ++-- src/module/item/physical/sheet.ts | 2 +- src/module/item/spell/data.ts | 2 +- src/module/item/spell/document.ts | 2 +- src/module/item/spell/sheet.ts | 2 +- src/module/item/spellcasting-entry/data.ts | 2 +- src/module/item/treasure/document.ts | 2 +- src/module/item/weapon/data.ts | 2 +- src/module/item/weapon/document.ts | 2 +- src/module/migration/base.ts | 2 +- src/module/migration/migrations/600-reach.ts | 2 +- .../601-migrate-effect-compendia.ts | 2 +- .../migrations/604-fix-class-items.ts | 2 +- .../605-catch-up-to-template-json.ts | 4 ++-- .../migrations/606-signature-spells.ts | 2 +- .../migrations/607-melee-item-damage-rolls.ts | 2 +- .../migrations/608-delete-persisted-kits.ts | 2 +- .../migrations/610-set-heritage-feat-type.ts | 2 +- ...11-update-toughness-mountains-stoutness.ts | 2 +- .../migrations/613-remove-ammo-charges.ts | 2 +- .../migrations/614-numify-melee-bonuses.ts | 2 +- .../migrations/615-remove-instinct-trait.ts | 2 +- .../616-migrate-feat-prerequisites.ts | 2 +- .../migrations/618-migrate-item-img-paths.ts | 2 +- .../619-remove-wand-and-scroll-tradition.ts | 2 +- .../migrations/620-rename-to-webp.ts | 2 +- .../621-remove-config-spell-schools.ts | 2 +- .../migrations/623-numify-potency-runes.ts | 2 +- .../migrations/626-update-spell-category.ts | 2 +- .../migrations/627-lowercase-spell-saves.ts | 2 +- .../migrations/629-set-base-items.ts | 4 ++-- .../migrations/630-fix-talisman-spelling.ts | 2 +- .../631-fix-sense-rule-element-selector.ts | 2 +- .../migrations/632-delete-orphaned-spells.ts | 2 +- .../633-delete-unidentified-traits.ts | 4 ++-- .../migrations/634-purge-martial-items.ts | 2 +- .../migrations/635-numify-ac-and-quantity.ts | 4 ++-- .../migrations/636-numify-armor-data.ts | 2 +- .../migrations/637-clean-melee-items.ts | 2 +- .../migrations/638-spell-components.ts | 2 +- .../639-normalize-level-and-price.ts | 4 ++-- .../640-cantrips-are-not-zero-level.ts | 2 +- .../migrations/641-sovereign-steel-value.ts | 2 +- .../migrations/642-track-schema-version.ts | 2 +- .../migrations/644-spellcasting-category.ts | 2 +- .../migrations/646-update-inline-links.ts | 2 +- .../648-remove-invested-property.ts | 2 +- .../migrations/649-focus-to-actor.ts | 2 +- .../650-stringify-weapon-properties.ts | 2 +- .../migrations/651-ephemeral-focus-pool.ts | 2 +- .../migrations/652-kill-halcyon-tradition.ts | 2 +- .../migration/migrations/653-aes-to-res.ts | 2 +- .../migrations/654-action-type-count.ts | 2 +- .../migrations/655-creature-token-sizes.ts | 2 +- .../656-other-focus-pool-sources.ts | 2 +- .../migrations/657-remove-set-property.ts | 2 +- .../658-monk-unarmored-proficiency.ts | 2 +- .../migrations/659-multiple-damage-rows.ts | 2 +- .../migrations/660-derived-spell-traits.ts | 2 +- .../migrations/663-fix-spell-damage.ts | 2 +- .../migrations/665-handwraps-corrections.ts | 2 +- .../666-usage-and-stowing-containers.ts | 4 ++-- .../migrations/667-hp-subproperties.ts | 2 +- .../migrations/668-armor-speed-penalty.ts | 2 +- .../migrations/669-npc-attack-effects.ts | 2 +- .../migrations/670-ancestry-vision.ts | 2 +- .../migrations/670-no-custom-trait.ts | 2 +- .../672-remove-npc-base-properties.ts | 2 +- .../migrations/673-remove-bulwark-res.ts | 2 +- .../migrations/674-stable-homebrew-tag-ids.ts | 2 +- .../675-flat-modifier-aes-to-res.ts | 2 +- .../676-replace-items-with-re-like-aes.ts | 2 +- .../migrations/677-rule-value-data-refs.ts | 2 +- .../678-separate-npc-attack-traits.ts | 2 +- .../679-tower-shield-speed-penalty.ts | 2 +- .../migrations/680-set-weapon-hands.ts | 2 +- .../migrations/681-giant-language-to-jotun.ts | 2 +- .../migrations/684-rations-to-consumable.ts | 2 +- .../migrations/685-fix-melee-usage-traits.ts | 2 +- .../migrations/687-familiarity-aes-to-res.ts | 2 +- .../migrations/688-clamp-spell-level.ts | 2 +- .../migrations/689-encumberance-aes.ts | 2 +- .../migrations/690-tiebreak-items.ts | 2 +- ...691-weapon-range-ability-category-group.ts | 2 +- .../692-crafting-entry-feat-replacement.ts | 2 +- .../migrations/693-armor-category-group.ts | 2 +- .../migrations/695-summon-to-summoned.ts | 2 +- .../migrations/696-flat-ability-modifiers.ts | 2 +- .../migrations/697-weapon-reach-trait.ts | 2 +- .../698-remove-derived-actor-traits.ts | 2 +- .../699-item-description-empty-string.ts | 2 +- .../migrations/700-single-class-features.ts | 2 +- .../migrations/701-modifier-name-to-slug.ts | 2 +- .../702-re-formulas-at-instance-level.ts | 2 +- .../migrations/703-spell-damage-structure.ts | 2 +- .../migrations/704-martial-proficiency-re.ts | 2 +- .../migrations/705-gunslinger-catch-up.ts | 2 +- ...mulas-at-instance-level-everything-else.ts | 2 +- .../migrations/708-specific-rule-label.ts | 2 +- ...709-re-formulas-at-instance-level-redux.ts | 2 +- .../migrations/710-rarity-to-string.ts | 2 +- .../migrations/711-heritage-items.ts | 2 +- .../migrations/713-fist-to-strike-re.ts | 2 +- .../migrations/714-range-increment-res.ts | 2 +- .../migrations/715-dangerous-sorcery.ts | 2 +- .../migrations/716-strike-damage-selector.ts | 2 +- .../migrations/717-take-feat-limits.ts | 2 +- .../migration/migrations/718-carry-type.ts | 4 ++-- .../migrations/719-shrug-flanking.ts | 2 +- .../720-update-spell-descriptions.ts | 2 +- .../migrations/721-set-reload-values.ts | 2 +- .../migrations/723-cumulative-item-bonuses.ts | 2 +- .../migrations/724-crafting-max-item-level.ts | 2 +- .../725-quick-climb-rule-elements.ts | 2 +- .../migrations/727-trim-self-roll-options.ts | 2 +- .../728-flatten-physical-properties.ts | 4 ++-- .../729-cumulative-item-bonus-cleanup.ts | 2 +- .../migrations/730-derune-handwraps.ts | 2 +- .../731-toggle-property-to-roll-option.ts | 2 +- .../732-fix-dedication-feat-types.ts | 2 +- .../733-item-bonus-from-equipment.ts | 2 +- .../734-spell-location-props-and-signature.ts | 2 +- .../migrations/735-firearm-ammo-alchemical.ts | 2 +- .../migrations/736-remove-broken-threshold.ts | 4 ++-- .../migrations/737-normalize-re-keys.ts | 2 +- .../migrations/738-update-laughing-shadow.ts | 2 +- .../migrations/739-recovery-check-dc.ts | 2 +- .../migrations/740-fix-max-takable.ts | 2 +- .../742-rm-class-ability-boost-levels.ts | 2 +- .../migrations/744-migrate-spell-heighten.ts | 2 +- .../745-effect-target-to-choice-set.ts | 2 +- .../migrations/746-standardize-pricing.ts | 4 ++-- .../migrations/747-fixed-heightening.ts | 2 +- .../748-batch-consumable-pricing.ts | 4 ++-- .../migration/migrations/749-assurance-res.ts | 2 +- .../migrations/750-fix-corrupted-price.ts | 4 ++-- .../migrations/752-strike-vs-weapon-traits.ts | 2 +- .../migrations/753-weapon-reload-times.ts | 2 +- .../754-mighty-bulwark-adjust-modifiers.ts | 2 +- .../migrations/755-grant-ids-to-data.ts | 2 +- .../migrations/757-hillock-halfling.ts | 2 +- .../migration/migrations/759-crit-spec-re.ts | 2 +- .../migrations/760-separate-note-title.ts | 2 +- .../migrations/761-update-shot-rules.ts | 2 +- .../migrations/762-update-background-items.ts | 2 +- .../763-restore-animal-strike-options.ts | 2 +- .../migrations/764-panache-vivacious-res.ts | 2 +- .../migrations/765-choice-owned-item-types.ts | 2 +- .../migrations/766-wipe-url-sources.ts | 2 +- .../migrations/767-convert-voluntary-flaws.ts | 2 +- .../migration/migrations/768-add-new-auras.ts | 2 +- .../769-no-universalist-focus-pool.ts | 2 +- .../migrations/770-re-data-to-system.ts | 2 +- .../771-spell-variants-to-system.ts | 2 +- .../migrations/772-v10-embedded-spell-data.ts | 2 +- .../migrations/773-religious-symbol-usage.ts | 2 +- .../774-unpersist-crafting-entries.ts | 2 +- .../migrations/775-agile-finesse-ranged.ts | 2 +- .../776-sluggify-condition-overrides.ts | 2 +- .../migrations/777-hand-of-the-apprentice.ts | 2 +- .../778-rename-feature-effects-refs.ts | 2 +- .../migrations/781-suppress-no-crowbar.ts | 2 +- .../783-remove-class-skill-ae-likes.ts | 2 +- .../migration/migrations/785-abc-kit-items.ts | 2 +- .../migrations/786-remove-identified-data.ts | 4 ++-- .../migrations/787-resolvables-to-system.ts | 2 +- .../migrations/788-update-tanglefoot-bags.ts | 2 +- .../migrations/789-update-precise-strike.ts | 2 +- .../migrations/790-multiple-class-dcs.ts | 2 +- .../migration/migrations/791-ruffian-hands.ts | 2 +- .../migrations/792-remove-token-ae-likes.ts | 2 +- .../migrations/793-make-predicates-arrays.ts | 2 +- .../migrations/794-add-wild-shape-choices.ts | 2 +- .../795-cleanup-flat-footed-toggle.ts | 2 +- .../migrations/796-item-grants-to-objects.ts | 4 ++-- .../798-weapon-to-item-statements.ts | 2 +- .../799-rm-recall-knowledge-duplicates.ts | 2 +- .../800-self-effect-panache-rage.ts | 2 +- .../migrations/801-color-darkvision.ts | 2 +- .../802-strip-feat-action-category.ts | 2 +- .../migrations/803-normalize-spell-area.ts | 2 +- .../804-remove-consumable-properties.ts | 2 +- .../migrations/805-inline-damage-formulas.ts | 2 +- .../806-torch-improvised-othertags.ts | 2 +- .../807-rm-activated-effect-fields.ts | 2 +- .../migrations/808-count-damage-dice.ts | 2 +- .../migrations/809-automaton-enhancements.ts | 2 +- .../811-inline-damage-rolls-persistent.ts | 2 +- .../migrations/812-restructure-iwr.ts | 2 +- .../migrations/813-normalize-cold-iron.ts | 2 +- .../814-calculated-expanded-splash.ts | 2 +- .../migrations/815-consumable-data-cleanup.ts | 2 +- .../816-alchemist-research-fields.ts | 2 +- .../817-field-discovery-predicates.ts | 2 +- .../818-basic-undead-negative-healing.ts | 2 +- .../819-spin-tale-adventure-specific.ts | 2 +- .../820-remove-unused-traits-data.ts | 2 +- .../migrations/821-inline-damage-rolls.ts | 2 +- .../822-blade-ally-consolidation.ts | 2 +- .../migrations/823-heritage-ancestry-slug.ts | 2 +- .../824-sneak-attack-damage-source.ts | 2 +- .../migrations/825-khakkhara-feng-huo-lun.ts | 2 +- .../migrations/826-gut-condition-data.ts | 2 +- .../migrations/827-fix-tv-shield-traits.ts | 2 +- .../migrations/828-prune-invalid-traits.ts | 2 +- .../migrations/829-rm-ritual-entries.ts | 2 +- .../migrations/830-condense-instincts.ts | 2 +- .../migrations/831-cleric-doctrines.ts | 2 +- .../migrations/832-choice-set-flags.ts | 2 +- .../833-add-rogue-toys-fix-precision.ts | 2 +- .../migrations/834-feat-categories.ts | 2 +- .../836-energizing-consolidation.ts | 2 +- .../838-strike-attack-roll-selector.ts | 2 +- .../migrations/839-action-categories.ts | 2 +- .../migrations/840-array-wrap-predicates.ts | 2 +- .../migrations/841-v11-uuid-format.ts | 2 +- .../migrations/844-deity-domains-uuids.ts | 2 +- .../migrations/845-empty-spell-consumables.ts | 2 +- .../migrations/846-spell-school-optional.ts | 2 +- .../migrations/847-temp-hp-rule-events.ts | 2 +- .../848-numeric-armor-properties.ts | 2 +- .../migrations/849-delete-broken-threshold.ts | 2 +- .../850-flat-footed-to-off-guard.ts | 2 +- .../migrations/851-just-innovation-id.ts | 2 +- .../852-ability-scores-to-modifiers.ts | 2 +- .../migrations/853-remaster-languages.ts | 2 +- ...4-bracketed-ability-scores-to-modifiers.ts | 2 +- .../855-apex-equipment-system-data.ts | 2 +- .../migrations/856-no-system-dot-custom.ts | 2 +- .../migrations/857-weapon-spec-re.ts | 2 +- .../858-fake-weapon-specialization.ts | 2 +- .../migrations/859-material-type-grade.ts | 2 +- .../migration/migrations/860-rm-group.ts | 2 +- .../861-aura-colors-to-appearance.ts | 2 +- .../migrations/862-specific-magic-armor.ts | 2 +- .../migration/migrations/864-rm-weapon-map.ts | 2 +- .../migration/migrations/865-vitality-void.ts | 2 +- .../migrations/867-damage-roll-domain-fix.ts | 2 +- .../migrations/868-strike-re-range.ts | 2 +- .../migrations/869-refresh-mighty-bulwark.ts | 2 +- .../870-martial-to-proficiencies.ts | 2 +- .../migrations/872-move-schema-property.ts | 4 ++-- .../migrations/873-remove-bonus-bulk-limit.ts | 2 +- .../migrations/874-move-stamina-stuff.ts | 2 +- .../migrations/875-set-innovation-id-early.ts | 2 +- .../migrations/876-feat-level-taken.ts | 2 +- .../migrations/877-publication-data.ts | 2 +- src/module/migration/runner/base.ts | 2 +- src/module/migration/runner/index.ts | 4 ++-- src/module/rules/helpers.ts | 2 +- src/module/rules/rule-element/base.ts | 2 +- .../rules/rule-element/choice-set/data.ts | 2 +- .../rule-element/choice-set/rule-element.ts | 2 +- .../rules/rule-element/ephemeral-effect.ts | 2 +- .../rule-element/grant-item/rule-element.ts | 4 ++-- .../item-alteration/alteration.ts | 3 +-- .../item-alteration/rule-element.ts | 2 +- .../rule-element/item-alteration/schemas.ts | 2 +- .../rules/rule-element/lose-hit-points.ts | 2 +- .../rules/rule-element/martial-proficiency.ts | 2 +- .../rule-element/token-mark/rule-element.ts | 4 ++-- src/module/rules/synthetics.ts | 2 +- src/module/scene/token-document/aura/index.ts | 2 +- src/module/scene/token-document/aura/types.ts | 2 +- src/module/system/schema-data-fields.ts | 4 ++-- .../system/settings/homebrew/helpers.ts | 2 +- src/module/system/settings/homebrew/menu.ts | 2 +- src/module/system/tag-selector/basic.ts | 2 +- src/module/system/text-editor.ts | 4 ++-- src/scripts/config/traits.ts | 2 +- src/scripts/hooks/init.ts | 2 +- src/scripts/register-sheets.ts | 2 +- src/util/misc.ts | 2 +- tests/mocks/actor.ts | 2 +- tests/mocks/item.ts | 4 ++-- vite.config.ts | 2 +- 367 files changed, 410 insertions(+), 411 deletions(-) rename src/module/item/{ => base}/data/helpers.ts (97%) rename src/module/item/{ => base}/data/index.ts (95%) rename src/module/item/{data/base.ts => base/data/system.ts} (97%) rename src/module/item/{ => base}/data/values.ts (100%) rename src/module/item/{base.ts => base/document.ts} (98%) rename src/module/item/{ => base}/sheet/base.ts (99%) rename src/module/item/{ => base}/sheet/codemirror.ts (100%) rename src/module/item/{ => base}/sheet/index.ts (100%) rename src/module/item/{ => base}/sheet/rule-element-form/aura.ts (100%) rename src/module/item/{ => base}/sheet/rule-element-form/base.ts (99%) rename src/module/item/{ => base}/sheet/rule-element-form/fast-healing.ts (100%) rename src/module/item/{ => base}/sheet/rule-element-form/flat-modifier.ts (100%) rename src/module/item/{ => base}/sheet/rule-element-form/grant-item.ts (100%) rename src/module/item/{ => base}/sheet/rule-element-form/index.ts (100%) rename src/module/item/{ => base}/sheet/rule-element-form/multiple-attack-penalty.ts (100%) rename src/module/item/{ => base}/sheet/rule-element-form/roll-note.ts (100%) rename src/module/item/{ => base}/sheet/rule-element-form/token-image.ts (100%) rename src/module/item/{ => base}/sheet/rule-element-form/token-light.ts (100%) diff --git a/build/conditions.ts b/build/conditions.ts index e33895387d1..a6a1d42d4f3 100644 --- a/build/conditions.ts +++ b/build/conditions.ts @@ -1,4 +1,4 @@ -import { CompendiumPack } from "./lib/compendium-pack.js"; +import { CompendiumPack } from "./lib/compendium-pack.ts"; CompendiumPack.loadJSON("packs/actions"); CompendiumPack.loadJSON("packs/adventure-specific-actions"); diff --git a/build/lib/compendium-pack.ts b/build/lib/compendium-pack.ts index 36a2943471e..3e00d0ddd66 100644 --- a/build/lib/compendium-pack.ts +++ b/build/lib/compendium-pack.ts @@ -1,5 +1,5 @@ import type { ActorSourcePF2e } from "@actor/data/index.ts"; -import { ItemSourcePF2e, MeleeSource, isPhysicalData } from "@item/data/index.ts"; +import { isPhysicalData, ItemSourcePF2e, MeleeSource } from "@item/base/data/index.ts"; import { FEAT_OR_FEATURE_CATEGORIES } from "@item/feat/values.ts"; import { itemIsOfType } from "@item/helpers.ts"; import { SIZES } from "@module/data.ts"; @@ -9,7 +9,7 @@ import { isObject, setHasElement, sluggify, tupleHasValue } from "@util/misc.ts" import fs from "fs"; import path from "path"; import coreIconsJSON from "../core-icons.json" assert { type: "json" }; -import { PackError, getFilesRecursively } from "./helpers.ts"; +import { getFilesRecursively, PackError } from "./helpers.ts"; import { DBFolder, LevelDatabase } from "./level-database.ts"; import { PackEntry } from "./types.ts"; @@ -490,5 +490,5 @@ interface ConvertUUIDOptions { map: Map>; } -export { CompendiumPack, PackError, isActorSource, isItemSource }; +export { CompendiumPack, isActorSource, isItemSource, PackError }; export type { PackMetadata, REMaybeWithUUIDs }; diff --git a/build/lib/extractor.ts b/build/lib/extractor.ts index e908ef622f9..0a7ae7e7b06 100644 --- a/build/lib/extractor.ts +++ b/build/lib/extractor.ts @@ -1,7 +1,6 @@ import type { ActorSourcePF2e } from "@actor/data/index.ts"; import type { NPCAttributesSource, NPCSystemSource } from "@actor/npc/data.ts"; -import { isPhysicalData } from "@item/data/helpers.ts"; -import { ItemSourcePF2e, MeleeSource, SpellSource } from "@item/data/index.ts"; +import { ItemSourcePF2e, MeleeSource, SpellSource, isPhysicalData } from "@item/base/data/index.ts"; import { PublicationData } from "@module/data.ts"; import { RuleElementSource } from "@module/rules/index.ts"; import { isObject, sluggify } from "@util/index.ts"; diff --git a/build/lib/level-database.ts b/build/lib/level-database.ts index 5e5d2239063..086ef7e39b1 100644 --- a/build/lib/level-database.ts +++ b/build/lib/level-database.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { tupleHasValue } from "@util"; import type { AbstractSublevel } from "abstract-level"; import { ClassicLevel, type DatabaseOptions } from "classic-level"; diff --git a/build/run-migration.ts b/build/run-migration.ts index 8eb94db210c..82f78a86a44 100644 --- a/build/run-migration.ts +++ b/build/run-migration.ts @@ -1,5 +1,5 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { sluggify } from "@util"; import fs from "fs-extra"; import { JSDOM } from "jsdom"; diff --git a/src/module/actor/base.ts b/src/module/actor/base.ts index b4b1ce6e824..706e320cd54 100644 --- a/src/module/actor/base.ts +++ b/src/module/actor/base.ts @@ -16,12 +16,11 @@ import { import { AbstractEffectPF2e, ArmorPF2e, ContainerPF2e, ItemPF2e, ItemProxyPF2e, PhysicalItemPF2e } from "@item"; import { ActionTrait } from "@item/ability/types.ts"; import { AfflictionSource } from "@item/affliction/index.ts"; +import { ItemSourcePF2e, ItemType, PhysicalItemSource, hasInvestedProperty } from "@item/base/data/index.ts"; import { ConditionKey, ConditionSlug, ConditionSource, type ConditionPF2e } from "@item/condition/index.ts"; import { PersistentDialog } from "@item/condition/persistent-damage-dialog.ts"; import { CONDITION_SLUGS } from "@item/condition/values.ts"; import { isCycle } from "@item/container/helpers.ts"; -import { hasInvestedProperty } from "@item/data/helpers.ts"; -import { ItemSourcePF2e, ItemType, PhysicalItemSource } from "@item/data/index.ts"; import { EffectFlags, EffectSource } from "@item/effect/data.ts"; import { MAGIC_TRADITIONS } from "@item/spell/values.ts"; import { RitualSpellcasting } from "@item/spellcasting-entry/rituals.ts"; diff --git a/src/module/actor/character/data.ts b/src/module/actor/character/data.ts index 8302411e2ac..4420a02b744 100644 --- a/src/module/actor/character/data.ts +++ b/src/module/actor/character/data.ts @@ -36,7 +36,7 @@ import { import { AttributeString, MovementType, SaveType } from "@actor/types.ts"; import type { WeaponPF2e } from "@item"; import { ArmorCategory } from "@item/armor/types.ts"; -import { ProficiencyRank } from "@item/data/index.ts"; +import { ProficiencyRank } from "@item/base/data/index.ts"; import { DeitySystemData } from "@item/deity/data.ts"; import { DeityDomain } from "@item/deity/types.ts"; import { MagicTradition } from "@item/spell/types.ts"; diff --git a/src/module/actor/character/document.ts b/src/module/actor/character/document.ts index c24c2c26275..911e3f7b7c2 100644 --- a/src/module/actor/character/document.ts +++ b/src/module/actor/character/document.ts @@ -41,7 +41,7 @@ import type { import { ItemPF2e, WeaponPF2e } from "@item"; import { ActionTrait } from "@item/ability/types.ts"; import { ARMOR_CATEGORIES } from "@item/armor/values.ts"; -import { ItemType, PhysicalItemSource } from "@item/data/index.ts"; +import { ItemType, PhysicalItemSource } from "@item/base/data/index.ts"; import { getPropertyRuneStrikeAdjustments, getResilientBonus } from "@item/physical/runes.ts"; import { MagicTradition } from "@item/spell/types.ts"; import { MAGIC_TRADITIONS } from "@item/spell/values.ts"; diff --git a/src/module/actor/character/feats.ts b/src/module/actor/character/feats.ts index e1a9bdbc0ad..18e69f61303 100644 --- a/src/module/actor/character/feats.ts +++ b/src/module/actor/character/feats.ts @@ -1,6 +1,6 @@ import type { ActorPF2e, CharacterPF2e } from "@actor"; import type { FeatPF2e, HeritagePF2e, ItemPF2e } from "@item"; -import { ItemSystemData } from "@item/data/base.ts"; +import { ItemSystemData } from "@item/base/data/system.ts"; import { FeatOrFeatureCategory } from "@item/feat/types.ts"; import { sluggify, tupleHasValue } from "@util"; import * as R from "remeda"; diff --git a/src/module/actor/character/sheet.ts b/src/module/actor/character/sheet.ts index 9b2a1125cc0..e9a5c624ead 100644 --- a/src/module/actor/character/sheet.ts +++ b/src/module/actor/character/sheet.ts @@ -18,8 +18,7 @@ import { PhysicalItemPF2e, } from "@item"; import { isSpellConsumable } from "@item/consumable/spell-consumables.ts"; -import { ActionCost, Frequency } from "@item/data/base.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ActionCost, Frequency, ItemSourcePF2e } from "@item/base/data/index.ts"; import { MagicTradition } from "@item/spell/types.ts"; import { SpellcastingSheetData } from "@item/spellcasting-entry/types.ts"; import { toggleWeaponTrait } from "@item/weapon/helpers.ts"; diff --git a/src/module/actor/creature/document.ts b/src/module/actor/creature/document.ts index 0d1e4197833..b486d9bb170 100644 --- a/src/module/actor/creature/document.ts +++ b/src/module/actor/creature/document.ts @@ -5,7 +5,7 @@ import { MODIFIER_TYPES, ModifierPF2e, RawModifier, StatisticModifier } from "@a import { MovementType, SaveType, SkillLongForm } from "@actor/types.ts"; import { ArmorPF2e, ItemPF2e, type PhysicalItemPF2e } from "@item"; import { isCycle } from "@item/container/helpers.ts"; -import { ArmorSource, ItemType } from "@item/data/index.ts"; +import { ArmorSource, ItemType } from "@item/base/data/index.ts"; import { EquippedData, ItemCarryType } from "@item/physical/data.ts"; import { isEquipped } from "@item/physical/usage.ts"; import type { ActiveEffectPF2e } from "@module/active-effect.ts"; diff --git a/src/module/actor/creature/sheet.ts b/src/module/actor/creature/sheet.ts index ac566f7e34c..b1689816722 100644 --- a/src/module/actor/creature/sheet.ts +++ b/src/module/actor/creature/sheet.ts @@ -3,9 +3,8 @@ import { createSpellcastingDialog } from "@actor/sheet/spellcasting-dialog.ts"; import { ATTRIBUTE_ABBREVIATIONS, SKILL_DICTIONARY } from "@actor/values.ts"; import { ItemPF2e, SpellPF2e, SpellcastingEntryPF2e } from "@item"; import { ActionCategory, ActionTrait } from "@item/ability/index.ts"; -import { ActionType } from "@item/data/base.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; -import { ITEM_CARRY_TYPES } from "@item/data/values.ts"; +import { ActionType, ItemSourcePF2e } from "@item/base/data/index.ts"; +import { ITEM_CARRY_TYPES } from "@item/base/data/values.ts"; import { SpellcastingSheetData } from "@item/spellcasting-entry/index.ts"; import { DropCanvasItemDataPF2e } from "@module/canvas/drop-canvas-data.ts"; import { ZeroToFour, goesToEleven } from "@module/data.ts"; diff --git a/src/module/actor/creature/spell-preparation-sheet.ts b/src/module/actor/creature/spell-preparation-sheet.ts index e9089cdc23e..9a3d10c3ed7 100644 --- a/src/module/actor/creature/spell-preparation-sheet.ts +++ b/src/module/actor/creature/spell-preparation-sheet.ts @@ -2,7 +2,7 @@ import { ActorPF2e, CreaturePF2e } from "@actor"; import { onClickCreateSpell } from "@actor/sheet/helpers.ts"; import { ItemSummaryRenderer } from "@actor/sheet/item-summary-renderer.ts"; import { ItemPF2e, SpellPF2e } from "@item"; -import { ItemSourcePF2e, SpellSource } from "@item/data/index.ts"; +import { ItemSourcePF2e, SpellSource } from "@item/base/data/index.ts"; import { SpellcastingEntryPF2e, SpellcastingSheetData } from "@item/spellcasting-entry/index.ts"; import { ErrorPF2e, htmlClosest, htmlQueryAll } from "@util"; import MiniSearch from "minisearch"; diff --git a/src/module/actor/data/base.ts b/src/module/actor/data/base.ts index a002f5b6f08..f5d3ef5483b 100644 --- a/src/module/actor/data/base.ts +++ b/src/module/actor/data/base.ts @@ -5,7 +5,7 @@ import type { ActorSizePF2e } from "@actor/data/size.ts"; import type { StatisticModifier } from "@actor/modifiers.ts"; import { ActorAlliance, AttributeString, SkillLongForm } from "@actor/types.ts"; import type { ConsumablePF2e, MeleePF2e, WeaponPF2e } from "@item"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationRecord, Rarity, Size, ValueAndMaybeMax, ZeroToTwo } from "@module/data.ts"; import { AutoChangeEntry } from "@module/rules/rule-element/ae-like.ts"; import { AttackRollParams, DamageRollParams, RollParameters } from "@module/system/rolls.ts"; diff --git a/src/module/actor/familiar/document.ts b/src/module/actor/familiar/document.ts index c7d22e07aaa..41c9d4b8252 100644 --- a/src/module/actor/familiar/document.ts +++ b/src/module/actor/familiar/document.ts @@ -5,7 +5,7 @@ import { createEncounterRollOptions, setHitPointsRollOptions } from "@actor/help import { ModifierPF2e, applyStackingRules } from "@actor/modifiers.ts"; import { SaveType } from "@actor/types.ts"; import { SAVE_TYPES, SKILL_ABBREVIATIONS, SKILL_DICTIONARY, SKILL_EXPANDED } from "@actor/values.ts"; -import { ItemType } from "@item/data/index.ts"; +import { ItemType } from "@item/base/data/index.ts"; import type { CombatantPF2e, EncounterPF2e } from "@module/encounter/index.ts"; import type { RuleElementPF2e } from "@module/rules/index.ts"; import type { TokenDocumentPF2e } from "@scene/index.ts"; diff --git a/src/module/actor/hazard/document.ts b/src/module/actor/hazard/document.ts index 1de23ee616d..5345cc5f1dc 100644 --- a/src/module/actor/hazard/document.ts +++ b/src/module/actor/hazard/document.ts @@ -7,7 +7,7 @@ import { ModifierPF2e } from "@actor/modifiers.ts"; import { SaveType } from "@actor/types.ts"; import { SAVE_TYPES } from "@actor/values.ts"; import { ConditionPF2e } from "@item"; -import { ItemType } from "@item/data/index.ts"; +import { ItemType } from "@item/base/data/index.ts"; import { Rarity } from "@module/data.ts"; import { extractModifiers } from "@module/rules/helpers.ts"; import { TokenDocumentPF2e } from "@scene/index.ts"; diff --git a/src/module/actor/inventory/index.ts b/src/module/actor/inventory/index.ts index ad6d2948cff..7d44156d5ed 100644 --- a/src/module/actor/inventory/index.ts +++ b/src/module/actor/inventory/index.ts @@ -1,6 +1,6 @@ import { ActorPF2e } from "@actor"; import { ItemProxyPF2e, KitPF2e, PhysicalItemPF2e } from "@item"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { Coins } from "@item/physical/data.ts"; import { CoinsPF2e, coinCompendiumIds } from "@item/physical/helpers.ts"; import { DENOMINATIONS } from "@item/physical/values.ts"; diff --git a/src/module/actor/loot/document.ts b/src/module/actor/loot/document.ts index 3c4680c381d..7cc1b0b95f7 100644 --- a/src/module/actor/loot/document.ts +++ b/src/module/actor/loot/document.ts @@ -1,6 +1,6 @@ import { ActorPF2e } from "@actor"; import type { ItemPF2e } from "@item"; -import { ItemType } from "@item/data/index.ts"; +import { ItemType } from "@item/base/data/index.ts"; import { PhysicalItemPF2e } from "@item/physical/document.ts"; import { CoinsPF2e } from "@item/physical/helpers.ts"; import { ActiveEffectPF2e } from "@module/active-effect.ts"; diff --git a/src/module/actor/npc/document.ts b/src/module/actor/npc/document.ts index 9c8abfd10ed..73451ca8915 100644 --- a/src/module/actor/npc/document.ts +++ b/src/module/actor/npc/document.ts @@ -7,7 +7,7 @@ import { ModifierPF2e, StatisticModifier } from "@actor/modifiers.ts"; import { AttributeString, SaveType } from "@actor/types.ts"; import { SAVE_TYPES, SKILL_DICTIONARY, SKILL_EXPANDED, SKILL_LONG_FORMS } from "@actor/values.ts"; import { ItemPF2e, LorePF2e, MeleePF2e } from "@item"; -import { ItemType } from "@item/data/index.ts"; +import { ItemType } from "@item/base/data/index.ts"; import { calculateDC } from "@module/dc.ts"; import { RollNotePF2e } from "@module/notes.ts"; import { CreatureIdentificationData, creatureIdentificationDCs } from "@module/recall-knowledge.ts"; diff --git a/src/module/actor/npc/skills-editor.ts b/src/module/actor/npc/skills-editor.ts index 456963f5020..2c49bfc3671 100644 --- a/src/module/actor/npc/skills-editor.ts +++ b/src/module/actor/npc/skills-editor.ts @@ -1,7 +1,7 @@ import type { NPCPF2e } from "@actor"; import { NPCSkillData } from "@actor/npc/data.ts"; import { SKILL_LONG_FORMS } from "@actor/values.ts"; -import { LoreSource } from "@item/data/index.ts"; +import { LoreSource } from "@item/base/data/index.ts"; import { htmlClosest, htmlQuery, htmlQueryAll, setHasElement } from "@util"; /** Specialized form to setup skills for an NPC character. */ diff --git a/src/module/actor/party/document.ts b/src/module/actor/party/document.ts index 48bb55083a0..20849de3078 100644 --- a/src/module/actor/party/document.ts +++ b/src/module/actor/party/document.ts @@ -1,6 +1,6 @@ import { ActorPF2e, type CreaturePF2e } from "@actor"; import { resetActors } from "@actor/helpers.ts"; -import { ItemType } from "@item/data/index.ts"; +import { ItemType } from "@item/base/data/index.ts"; import { CombatantPF2e, EncounterPF2e } from "@module/encounter/index.ts"; import { RuleElementPF2e } from "@module/rules/index.ts"; import { RuleElementSchema } from "@module/rules/rule-element/data.ts"; diff --git a/src/module/actor/party/invalid-campaign.ts b/src/module/actor/party/invalid-campaign.ts index 7c5ddc7fded..a1c86c46709 100644 --- a/src/module/actor/party/invalid-campaign.ts +++ b/src/module/actor/party/invalid-campaign.ts @@ -1,7 +1,7 @@ import { createHTMLElement, fontAwesomeIcon } from "@util"; -import { PartyCampaign } from "./types.ts"; +import type { DataSchema } from "types/foundry/common/data/fields.d.ts"; import { PartyPF2e } from "./document.ts"; -import { DataSchema } from "types/foundry/common/data/fields.js"; +import { PartyCampaign } from "./types.ts"; const { DataModel } = foundry.abstract; diff --git a/src/module/actor/party/kingdom/model.ts b/src/module/actor/party/kingdom/model.ts index 93edf9700ef..249d1fa039a 100644 --- a/src/module/actor/party/kingdom/model.ts +++ b/src/module/actor/party/kingdom/model.ts @@ -2,7 +2,7 @@ import { ActorPF2e } from "@actor"; import { FeatGroup } from "@actor/character/feats.ts"; import { MODIFIER_TYPES, ModifierPF2e, RawModifier, createProficiencyModifier } from "@actor/modifiers.ts"; import { CampaignFeaturePF2e, ItemPF2e } from "@item"; -import { ItemType } from "@item/data/index.ts"; +import { ItemType } from "@item/base/data/index.ts"; import { ChatMessagePF2e } from "@module/chat-message/document.ts"; import { ZeroToFour } from "@module/data.ts"; import { extractModifierAdjustments } from "@module/rules/helpers.ts"; diff --git a/src/module/actor/party/kingdom/sheet.ts b/src/module/actor/party/kingdom/sheet.ts index 552809fb2b7..74c77bb7303 100644 --- a/src/module/actor/party/kingdom/sheet.ts +++ b/src/module/actor/party/kingdom/sheet.ts @@ -4,7 +4,7 @@ import { MODIFIER_TYPES } from "@actor/modifiers.ts"; import { ActorSheetPF2e } from "@actor/sheet/base.ts"; import { ActorSheetDataPF2e } from "@actor/sheet/data-types.ts"; import { ItemPF2e, type CampaignFeaturePF2e } from "@item"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { DropCanvasItemDataPF2e } from "@module/canvas/drop-canvas-data.ts"; import { ChatMessagePF2e } from "@module/chat-message/document.ts"; import { ValueAndMax } from "@module/data.ts"; diff --git a/src/module/actor/party/sheet.ts b/src/module/actor/party/sheet.ts index 5390ba447a7..87398939c4f 100644 --- a/src/module/actor/party/sheet.ts +++ b/src/module/actor/party/sheet.ts @@ -7,7 +7,7 @@ import { ActorSheetDataPF2e, ActorSheetRenderOptionsPF2e } from "@actor/sheet/da import { DistributeCoinsPopup } from "@actor/sheet/popups/distribute-coins-popup.ts"; import { SKILL_LONG_FORMS } from "@actor/values.ts"; import { ItemPF2e } from "@item"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { Bulk } from "@item/physical/index.ts"; import { PHYSICAL_ITEM_TYPES } from "@item/physical/values.ts"; import { ValueAndMax, ZeroToFour } from "@module/data.ts"; diff --git a/src/module/actor/party/types.ts b/src/module/actor/party/types.ts index af7e0c83b24..6c7fcc94b1d 100644 --- a/src/module/actor/party/types.ts +++ b/src/module/actor/party/types.ts @@ -1,5 +1,5 @@ import { ActorUpdateContext } from "@actor/base.ts"; -import { ItemType } from "@item/data/index.ts"; +import { ItemType } from "@item/base/data/index.ts"; import type { TokenDocumentPF2e } from "@scene"; import type { Statistic } from "@system/statistic/index.ts"; import type DataModel from "types/foundry/common/abstract/data.d.ts"; diff --git a/src/module/actor/sheet/base.ts b/src/module/actor/sheet/base.ts index 5751bdddc86..e2c35af8a76 100644 --- a/src/module/actor/sheet/base.ts +++ b/src/module/actor/sheet/base.ts @@ -3,10 +3,8 @@ import { CraftingFormula } from "@actor/character/crafting/index.ts"; import { StrikeData } from "@actor/data/base.ts"; import { SAVE_TYPES } from "@actor/values.ts"; import { AbstractEffectPF2e, ItemPF2e, ItemProxyPF2e, PhysicalItemPF2e, SpellPF2e } from "@item"; +import { ActionType, ItemSourcePF2e, ItemType, isPhysicalData } from "@item/base/data/index.ts"; import { createConsumableFromSpell } from "@item/consumable/spell-consumables.ts"; -import { ActionType } from "@item/data/base.ts"; -import { isPhysicalData } from "@item/data/helpers.ts"; -import { ItemSourcePF2e, ItemType } from "@item/data/index.ts"; import { itemIsOfType } from "@item/helpers.ts"; import { Coins } from "@item/physical/data.ts"; import { DENOMINATIONS, PHYSICAL_ITEM_TYPES } from "@item/physical/values.ts"; diff --git a/src/module/actor/sheet/item-summary-renderer.ts b/src/module/actor/sheet/item-summary-renderer.ts index 2eea7b4356b..1d174280e4e 100644 --- a/src/module/actor/sheet/item-summary-renderer.ts +++ b/src/module/actor/sheet/item-summary-renderer.ts @@ -1,7 +1,7 @@ -import { ActorPF2e } from "@actor/base.ts"; -import { AbstractEffectPF2e, ConsumablePF2e, ItemPF2e, SpellPF2e } from "@item"; -import { ItemSummaryData } from "@item/data/index.ts"; -import { isItemSystemData } from "@item/data/helpers.ts"; +import type { ActorPF2e } from "@actor/base.ts"; +import type { ConsumablePF2e, SpellPF2e } from "@item"; +import { AbstractEffectPF2e, ItemPF2e } from "@item"; +import { ItemSummaryData, isItemSystemData } from "@item/base/data/index.ts"; import { InlineRollLinks } from "@scripts/ui/inline-roll-links.ts"; import { UserVisibilityPF2e } from "@scripts/ui/user-visibility.ts"; import { createHTMLElement, htmlClosest, htmlQuery, htmlQueryAll } from "@util"; diff --git a/src/module/actor/vehicle/document.ts b/src/module/actor/vehicle/document.ts index 592b6882563..7879a5e3399 100644 --- a/src/module/actor/vehicle/document.ts +++ b/src/module/actor/vehicle/document.ts @@ -1,7 +1,7 @@ import { setHitPointsRollOptions } from "@actor/helpers.ts"; import { ModifierPF2e } from "@actor/modifiers.ts"; import { ActorDimensions } from "@actor/types.ts"; -import { ItemType } from "@item/data/index.ts"; +import { ItemType } from "@item/base/data/index.ts"; import { extractModifierAdjustments, extractModifiers } from "@module/rules/helpers.ts"; import type { UserPF2e } from "@module/user/index.ts"; import { TokenDocumentPF2e } from "@scene/index.ts"; diff --git a/src/module/actor/vehicle/sheet.ts b/src/module/actor/vehicle/sheet.ts index 2d1af2b076f..b806bfdf3e5 100644 --- a/src/module/actor/vehicle/sheet.ts +++ b/src/module/actor/vehicle/sheet.ts @@ -1,7 +1,7 @@ import { ActorSheetDataPF2e } from "@actor/sheet/data-types.ts"; import { VehiclePF2e } from "@actor/vehicle/index.ts"; import { AbilityItemPF2e, ItemPF2e } from "@item"; -import { ActionCost, Frequency } from "@item/data/base.ts"; +import { ActionCost, Frequency } from "@item/base/data/system.ts"; import { ErrorPF2e, getActionGlyph, getActionIcon, htmlClosest, htmlQuery, htmlQueryAll } from "@util"; import { ActorSheetPF2e } from "../sheet/base.ts"; import { AdjustedValue, getAdjustment } from "@module/sheet/helpers.ts"; diff --git a/src/module/apps/compendium-browser/index.ts b/src/module/apps/compendium-browser/index.ts index 03e70fd1f7a..dc088d5d639 100644 --- a/src/module/apps/compendium-browser/index.ts +++ b/src/module/apps/compendium-browser/index.ts @@ -1,7 +1,6 @@ import { KitPF2e, PhysicalItemPF2e } from "@item"; import { ActionCategory, ActionTrait } from "@item/ability/index.ts"; -import { ActionType } from "@item/data/base.ts"; -import { ItemType } from "@item/data/index.ts"; +import { ActionType, ItemType } from "@item/base/data/index.ts"; import { PHYSICAL_ITEM_TYPES } from "@item/physical/values.ts"; import { BaseSpellcastingEntry } from "@item/spellcasting-entry/index.ts"; import type { UserPF2e } from "@module/user/document.ts"; diff --git a/src/module/canvas/token/aura/renderer.ts b/src/module/canvas/token/aura/renderer.ts index 7f16a800921..bf60c35161a 100644 --- a/src/module/canvas/token/aura/renderer.ts +++ b/src/module/canvas/token/aura/renderer.ts @@ -1,5 +1,5 @@ import { AuraAppearanceData, AuraData } from "@actor/types.ts"; -import { ItemTrait } from "@item/data/base.ts"; +import { ItemTrait } from "@item/base/data/system.ts"; import { TokenAuraData } from "@scene/token-document/aura/index.ts"; import { isVideoFilePath } from "@util"; import type { EffectAreaSquare } from "../../effect-area-square.ts"; diff --git a/src/module/chat-message/data.ts b/src/module/chat-message/data.ts index 9101d4a3696..1f1e74ba362 100644 --- a/src/module/chat-message/data.ts +++ b/src/module/chat-message/data.ts @@ -1,5 +1,5 @@ import type { BaseRawModifier, DamageDicePF2e } from "@actor/modifiers.ts"; -import { ItemType } from "@item/data/index.ts"; +import { ItemType } from "@item/base/data/index.ts"; import { MagicTradition } from "@item/spell/types.ts"; import { ZeroToTwo } from "@module/data.ts"; import { RollNoteSource } from "@module/notes.ts"; diff --git a/src/module/dc.ts b/src/module/dc.ts index 507ad0a3182..a2c66a9d08a 100644 --- a/src/module/dc.ts +++ b/src/module/dc.ts @@ -1,4 +1,4 @@ -import { ProficiencyRank } from "@item/data/index.ts"; +import { ProficiencyRank } from "@item/base/data/index.ts"; import { Rarity } from "./data.ts"; /** diff --git a/src/module/item/abc/data.ts b/src/module/item/abc/data.ts index 3d30b7a481e..45bd1dd8391 100644 --- a/src/module/item/abc/data.ts +++ b/src/module/item/abc/data.ts @@ -1,4 +1,4 @@ -import { ItemSystemSource } from "@item/data/base.ts"; +import { ItemSystemSource } from "@item/base/data/system.ts"; interface ABCFeatureEntryData { uuid: string; diff --git a/src/module/item/abc/sheet.ts b/src/module/item/abc/sheet.ts index 61f5a059768..0871a49ae2e 100644 --- a/src/module/item/abc/sheet.ts +++ b/src/module/item/abc/sheet.ts @@ -4,7 +4,7 @@ import { ItemPF2e } from "@item"; import { ABCFeatureEntryData } from "@item/abc/data.ts"; import { FeatOrFeatureCategory } from "@item/feat/types.ts"; import { FEAT_CATEGORIES } from "@item/feat/values.ts"; -import { ItemSheetDataPF2e, ItemSheetPF2e } from "@item/sheet/index.ts"; +import { ItemSheetDataPF2e, ItemSheetPF2e } from "@item/base/sheet/index.ts"; import { htmlClosest, htmlQuery, htmlQueryAll, setHasElement } from "@util"; abstract class ABCSheetPF2e extends ItemSheetPF2e { diff --git a/src/module/item/ability/data.ts b/src/module/item/ability/data.ts index 8b37ef6bb9e..deb6b3dd6d2 100644 --- a/src/module/item/ability/data.ts +++ b/src/module/item/ability/data.ts @@ -6,7 +6,7 @@ import { ItemSystemData, ItemSystemSource, ItemTraitsNoRarity, -} from "@item/data/base.ts"; +} from "@item/base/data/system.ts"; import { OneToThree } from "@module/data.ts"; import { ActionCategory, ActionTrait } from "./types.ts"; diff --git a/src/module/item/ability/document.ts b/src/module/item/ability/document.ts index 0b39b001156..21b8277799f 100644 --- a/src/module/item/ability/document.ts +++ b/src/module/item/ability/document.ts @@ -1,9 +1,8 @@ -import { ActorPF2e } from "@actor"; +import type { ActorPF2e } from "@actor"; import { ItemPF2e } from "@item"; -import { ActionCost, Frequency } from "@item/data/base.ts"; -import { ItemSummaryData } from "@item/data/index.ts"; +import { ActionCost, Frequency, ItemSummaryData } from "@item/base/data/index.ts"; import { RangeData } from "@item/types.ts"; -import { UserPF2e } from "@module/user/index.ts"; +import type { UserPF2e } from "@module/user/index.ts"; import { getActionTypeLabel } from "@util"; import { AbilityItemSource, AbilitySystemData } from "./data.ts"; import { normalizeActionChangeData } from "./helpers.ts"; diff --git a/src/module/item/ability/helpers.ts b/src/module/item/ability/helpers.ts index fa2b9e33035..986a9ee65df 100644 --- a/src/module/item/ability/helpers.ts +++ b/src/module/item/ability/helpers.ts @@ -1,5 +1,5 @@ import { EffectPF2e, ItemPF2e } from "@item"; -import { FrequencySource } from "@item/data/base.ts"; +import { FrequencySource } from "@item/base/data/system.ts"; import type { FeatSheetPF2e } from "@item/feat/sheet.ts"; import { RangeData } from "@item/types.ts"; import { ErrorPF2e, htmlQuery, isImageFilePath } from "@util"; diff --git a/src/module/item/ability/sheet.ts b/src/module/item/ability/sheet.ts index 4e680727d3b..f7afca6493a 100644 --- a/src/module/item/ability/sheet.ts +++ b/src/module/item/ability/sheet.ts @@ -1,5 +1,5 @@ import { AbilityItemPF2e } from "@item/ability/document.ts"; -import { ItemSheetDataPF2e, ItemSheetPF2e } from "../sheet/base.ts"; +import { ItemSheetDataPF2e, ItemSheetPF2e } from "../base/sheet/base.ts"; import { activateActionSheetListeners, createSelfEffectSheetData, handleSelfEffectDrop } from "./helpers.ts"; import { SelfEffectReference } from "./index.ts"; diff --git a/src/module/item/abstract-effect/data.ts b/src/module/item/abstract-effect/data.ts index aaff7ecb931..35865e60caf 100644 --- a/src/module/item/abstract-effect/data.ts +++ b/src/module/item/abstract-effect/data.ts @@ -1,6 +1,6 @@ import { AttributeString } from "@actor/types.ts"; import { ActionTrait } from "@item/ability/types.ts"; -import { ItemSystemData, ItemSystemSource, ItemTraitsNoRarity } from "@item/data/base.ts"; +import { ItemSystemData, ItemSystemSource, ItemTraitsNoRarity } from "@item/base/data/system.ts"; import { MagicTradition, SpellTrait } from "@item/spell/index.ts"; import type { CheckRoll } from "@system/check/index.ts"; diff --git a/src/module/item/affliction/data.ts b/src/module/item/affliction/data.ts index d62a0c93dde..67ae89a03fb 100644 --- a/src/module/item/affliction/data.ts +++ b/src/module/item/affliction/data.ts @@ -8,8 +8,8 @@ import { EffectTraits, TimeUnit, } from "@item/abstract-effect/index.ts"; +import { BaseItemSourcePF2e, ItemFlagsPF2e } from "@item/base/data/system.ts"; import { ConditionSlug } from "@item/condition/index.ts"; -import { BaseItemSourcePF2e, ItemFlagsPF2e } from "@item/data/base.ts"; import { DamageCategoryUnique, DamageType } from "@system/damage/index.ts"; type AfflictionSource = BaseItemSourcePF2e<"affliction", AfflictionSystemSource> & { @@ -77,9 +77,9 @@ interface AfflictionEffectData { type AfflictionExpiryType = "turn-end"; export type { - AfflictionExpiryType, AfflictionConditionData, AfflictionDamage, + AfflictionExpiryType, AfflictionFlags, AfflictionOnset, AfflictionSource, diff --git a/src/module/item/affliction/sheet.ts b/src/module/item/affliction/sheet.ts index d7f119ca251..b0d958c3066 100644 --- a/src/module/item/affliction/sheet.ts +++ b/src/module/item/affliction/sheet.ts @@ -1,6 +1,6 @@ import { AfflictionPF2e, ConditionPF2e, EffectPF2e, ItemPF2e } from "@item"; import { ActionTrait } from "@item/ability/types.ts"; -import { ItemSheetDataPF2e, ItemSheetPF2e } from "@item/sheet/base.ts"; +import { ItemSheetDataPF2e, ItemSheetPF2e } from "@item/base/sheet/base.ts"; import { ConditionManager } from "@system/conditions/index.ts"; import { DamageCategoryUnique } from "@system/damage/types.ts"; import { DAMAGE_CATEGORIES_UNIQUE } from "@system/damage/values.ts"; diff --git a/src/module/item/ancestry/data.ts b/src/module/item/ancestry/data.ts index 5665c10f95c..ecd14b4f8f0 100644 --- a/src/module/item/ancestry/data.ts +++ b/src/module/item/ancestry/data.ts @@ -1,7 +1,7 @@ import { CreatureTrait, Language } from "@actor/creature/index.ts"; import { AttributeString } from "@actor/types.ts"; import { ABCSystemData, ABCSystemSource } from "@item/abc/index.ts"; -import { BaseItemSourcePF2e, ItemTraits } from "@item/data/base.ts"; +import { BaseItemSourcePF2e, ItemTraits } from "@item/base/data/system.ts"; import { Size, TraitsWithRarity, ValuesList } from "@module/data.ts"; type AncestrySource = BaseItemSourcePF2e<"ancestry", AncestrySystemSource>; diff --git a/src/module/item/armor/document.ts b/src/module/item/armor/document.ts index cf079e930b8..85187997420 100644 --- a/src/module/item/armor/document.ts +++ b/src/module/item/armor/document.ts @@ -1,6 +1,6 @@ import type { ActorPF2e } from "@actor"; import { AutomaticBonusProgression as ABP } from "@actor/character/automatic-bonus-progression.ts"; -import { ItemSummaryData } from "@item/data/index.ts"; +import { ItemSummaryData } from "@item/base/data/index.ts"; import { PhysicalItemHitPoints, PhysicalItemPF2e, diff --git a/src/module/item/background/data.ts b/src/module/item/background/data.ts index 76fbb955121..600f63ea450 100644 --- a/src/module/item/background/data.ts +++ b/src/module/item/background/data.ts @@ -1,7 +1,7 @@ import { SkillAbbreviation } from "@actor/creature/data.ts"; import { AttributeString } from "@actor/types.ts"; import { ABCSystemData, ABCSystemSource } from "@item/abc/data.ts"; -import { BaseItemSourcePF2e, ItemTraits } from "@item/data/base.ts"; +import { BaseItemSourcePF2e, ItemTraits } from "@item/base/data/system.ts"; import { BackgroundTrait } from "./types.ts"; type BackgroundSource = BaseItemSourcePF2e<"background", BackgroundSystemSource>; diff --git a/src/module/item/data/helpers.ts b/src/module/item/base/data/helpers.ts similarity index 97% rename from src/module/item/data/helpers.ts rename to src/module/item/base/data/helpers.ts index 649c33ee1d3..75d1f9d8ae9 100644 --- a/src/module/item/data/helpers.ts +++ b/src/module/item/base/data/helpers.ts @@ -1,6 +1,6 @@ import { PHYSICAL_ITEM_TYPES } from "@item/physical/values.ts"; import { isObject, setHasElement } from "@util/misc.ts"; -import { ItemSystemData } from "./base.ts"; +import { ItemSystemData } from "./system.ts"; import { ItemSourcePF2e, MagicItemSource, PhysicalItemSource } from "./index.ts"; function isItemSystemData(data: unknown): data is ItemSystemData { diff --git a/src/module/item/data/index.ts b/src/module/item/base/data/index.ts similarity index 95% rename from src/module/item/data/index.ts rename to src/module/item/base/data/index.ts index ee66ee53d48..331e761cc82 100644 --- a/src/module/item/data/index.ts +++ b/src/module/item/base/data/index.ts @@ -24,8 +24,6 @@ import type { TreasureSource } from "@item/treasure/data.ts"; import type { WeaponSource } from "@item/weapon/data.ts"; import type { PROFICIENCY_RANKS } from "@module/data.ts"; -export * from "./helpers.ts"; - type ProficiencyRank = (typeof PROFICIENCY_RANKS)[number]; type NonPhysicalItemType = @@ -95,6 +93,16 @@ interface TraitChatData { excluded?: boolean; } +export type { + ActionCost, + ActionType, + Frequency, + FrequencyInterval, + FrequencySource, + ItemFlagsPF2e, + ItemSystemData, +} from "./system.ts"; +export * from "./helpers.ts"; export type { AbilityItemSource, AncestrySource, diff --git a/src/module/item/data/base.ts b/src/module/item/base/data/system.ts similarity index 97% rename from src/module/item/data/base.ts rename to src/module/item/base/data/system.ts index 8bcdee5acbe..e98a4976e76 100644 --- a/src/module/item/data/base.ts +++ b/src/module/item/base/data/system.ts @@ -5,7 +5,7 @@ import { NPCAttackTrait } from "@item/melee/data.ts"; import { PhysicalItemTrait } from "@item/physical/data.ts"; import { MigrationRecord, OneToThree, PublicationData, Rarity } from "@module/data.ts"; import { RuleElementSource } from "@module/rules/index.ts"; -import type * as fields from "../../../../types/foundry/common/data/fields.d.ts"; +import type * as fields from "types/foundry/common/data/fields.d.ts"; import { ItemType } from "./index.ts"; type BaseItemSourcePF2e< diff --git a/src/module/item/data/values.ts b/src/module/item/base/data/values.ts similarity index 100% rename from src/module/item/data/values.ts rename to src/module/item/base/data/values.ts diff --git a/src/module/item/base.ts b/src/module/item/base/document.ts similarity index 98% rename from src/module/item/base.ts rename to src/module/item/base/document.ts index ef61a045b21..cd98511cb32 100644 --- a/src/module/item/base.ts +++ b/src/module/item/base/document.ts @@ -11,24 +11,25 @@ import { EnrichmentOptionsPF2e } from "@system/text-editor.ts"; import { ErrorPF2e, isObject, setHasElement, sluggify } from "@util"; import { UUIDUtils } from "@util/uuid.ts"; import * as R from "remeda"; -import { AfflictionSource } from "./affliction/data.ts"; -import { ContainerPF2e } from "./container/document.ts"; -import { ItemFlagsPF2e, ItemSystemData } from "./data/base.ts"; -import { isItemSystemData, isPhysicalData } from "./data/helpers.ts"; -import { +import { AfflictionSource } from "../affliction/data.ts"; +import type { ContainerPF2e } from "../container/document.ts"; +import type { PhysicalItemPF2e } from "../physical/document.ts"; +import { PHYSICAL_ITEM_TYPES } from "../physical/values.ts"; +import { ItemSheetPF2e } from "./sheet/base.ts"; +import { MAGIC_TRADITIONS } from "../spell/values.ts"; +import { ItemInstances } from "../types.ts"; +import type { ConditionSource, EffectSource, FeatSource, + ItemFlagsPF2e, ItemSourcePF2e, ItemSummaryData, + ItemSystemData, ItemType, TraitChatData, } from "./data/index.ts"; -import { PhysicalItemPF2e } from "./physical/document.ts"; -import { PHYSICAL_ITEM_TYPES } from "./physical/values.ts"; -import { ItemSheetPF2e } from "./sheet/base.ts"; -import { MAGIC_TRADITIONS } from "./spell/values.ts"; -import { ItemInstances } from "./types.ts"; +import { isItemSystemData, isPhysicalData } from "./data/helpers.ts"; /** The basic `Item` subclass for the system */ class ItemPF2e extends Item { diff --git a/src/module/item/sheet/base.ts b/src/module/item/base/sheet/base.ts similarity index 99% rename from src/module/item/sheet/base.ts rename to src/module/item/base/sheet/base.ts index 0c54305962d..34a628f0033 100644 --- a/src/module/item/sheet/base.ts +++ b/src/module/item/base/sheet/base.ts @@ -1,5 +1,5 @@ import { ItemPF2e } from "@item"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { Rarity } from "@module/data.ts"; import { RuleElements, RuleElementSource } from "@module/rules/index.ts"; import { diff --git a/src/module/item/sheet/codemirror.ts b/src/module/item/base/sheet/codemirror.ts similarity index 100% rename from src/module/item/sheet/codemirror.ts rename to src/module/item/base/sheet/codemirror.ts diff --git a/src/module/item/sheet/index.ts b/src/module/item/base/sheet/index.ts similarity index 100% rename from src/module/item/sheet/index.ts rename to src/module/item/base/sheet/index.ts diff --git a/src/module/item/sheet/rule-element-form/aura.ts b/src/module/item/base/sheet/rule-element-form/aura.ts similarity index 100% rename from src/module/item/sheet/rule-element-form/aura.ts rename to src/module/item/base/sheet/rule-element-form/aura.ts diff --git a/src/module/item/sheet/rule-element-form/base.ts b/src/module/item/base/sheet/rule-element-form/base.ts similarity index 99% rename from src/module/item/sheet/rule-element-form/base.ts rename to src/module/item/base/sheet/rule-element-form/base.ts index bbe0f6f0344..edc7955e69e 100644 --- a/src/module/item/sheet/rule-element-form/base.ts +++ b/src/module/item/base/sheet/rule-element-form/base.ts @@ -1,5 +1,5 @@ import { ActorProxyPF2e } from "@actor"; -import { ItemPF2e, ItemProxyPF2e } from "@item/base.ts"; +import { ItemPF2e, ItemProxyPF2e } from "@item"; import { isBracketedValue } from "@module/rules/helpers.ts"; import { RuleElements, type RuleElementPF2e, type RuleElementSource } from "@module/rules/index.ts"; import { ResolvableValueField, RuleElementSchema } from "@module/rules/rule-element/data.ts"; diff --git a/src/module/item/sheet/rule-element-form/fast-healing.ts b/src/module/item/base/sheet/rule-element-form/fast-healing.ts similarity index 100% rename from src/module/item/sheet/rule-element-form/fast-healing.ts rename to src/module/item/base/sheet/rule-element-form/fast-healing.ts diff --git a/src/module/item/sheet/rule-element-form/flat-modifier.ts b/src/module/item/base/sheet/rule-element-form/flat-modifier.ts similarity index 100% rename from src/module/item/sheet/rule-element-form/flat-modifier.ts rename to src/module/item/base/sheet/rule-element-form/flat-modifier.ts diff --git a/src/module/item/sheet/rule-element-form/grant-item.ts b/src/module/item/base/sheet/rule-element-form/grant-item.ts similarity index 100% rename from src/module/item/sheet/rule-element-form/grant-item.ts rename to src/module/item/base/sheet/rule-element-form/grant-item.ts diff --git a/src/module/item/sheet/rule-element-form/index.ts b/src/module/item/base/sheet/rule-element-form/index.ts similarity index 100% rename from src/module/item/sheet/rule-element-form/index.ts rename to src/module/item/base/sheet/rule-element-form/index.ts diff --git a/src/module/item/sheet/rule-element-form/multiple-attack-penalty.ts b/src/module/item/base/sheet/rule-element-form/multiple-attack-penalty.ts similarity index 100% rename from src/module/item/sheet/rule-element-form/multiple-attack-penalty.ts rename to src/module/item/base/sheet/rule-element-form/multiple-attack-penalty.ts diff --git a/src/module/item/sheet/rule-element-form/roll-note.ts b/src/module/item/base/sheet/rule-element-form/roll-note.ts similarity index 100% rename from src/module/item/sheet/rule-element-form/roll-note.ts rename to src/module/item/base/sheet/rule-element-form/roll-note.ts diff --git a/src/module/item/sheet/rule-element-form/token-image.ts b/src/module/item/base/sheet/rule-element-form/token-image.ts similarity index 100% rename from src/module/item/sheet/rule-element-form/token-image.ts rename to src/module/item/base/sheet/rule-element-form/token-image.ts diff --git a/src/module/item/sheet/rule-element-form/token-light.ts b/src/module/item/base/sheet/rule-element-form/token-light.ts similarity index 100% rename from src/module/item/sheet/rule-element-form/token-light.ts rename to src/module/item/base/sheet/rule-element-form/token-light.ts diff --git a/src/module/item/campaign-feature/data.ts b/src/module/item/campaign-feature/data.ts index 698c04c2e6c..81f16499e3c 100644 --- a/src/module/item/campaign-feature/data.ts +++ b/src/module/item/campaign-feature/data.ts @@ -5,7 +5,7 @@ import { FrequencySource, ItemSystemSource, ItemTraits, -} from "@item/data/base.ts"; +} from "@item/base/data/system.ts"; import { OneToThree } from "@module/data.ts"; import { KingmakerCategory, KingmakerTrait } from "./types.ts"; diff --git a/src/module/item/campaign-feature/document.ts b/src/module/item/campaign-feature/document.ts index b4c003f9a61..f443d6ecec0 100644 --- a/src/module/item/campaign-feature/document.ts +++ b/src/module/item/campaign-feature/document.ts @@ -2,7 +2,7 @@ import { ActorPF2e, PartyPF2e } from "@actor"; import { FeatGroup } from "@actor/character/feats.ts"; import { ItemPF2e } from "@item"; import { normalizeActionChangeData } from "@item/ability/helpers.ts"; -import { ActionCost, Frequency } from "@item/data/base.ts"; +import { ActionCost, Frequency } from "@item/base/data/index.ts"; import { UserPF2e } from "@module/user/index.ts"; import { sluggify, tupleHasValue } from "@util"; import * as R from "remeda"; diff --git a/src/module/item/campaign-feature/sheet.ts b/src/module/item/campaign-feature/sheet.ts index d88d91fe73d..50aa347576b 100644 --- a/src/module/item/campaign-feature/sheet.ts +++ b/src/module/item/campaign-feature/sheet.ts @@ -1,5 +1,5 @@ import { activateActionSheetListeners } from "@item/ability/helpers.ts"; -import { ItemSheetDataPF2e, ItemSheetPF2e } from "@item/sheet/index.ts"; +import { ItemSheetDataPF2e, ItemSheetPF2e } from "@item/base/sheet/index.ts"; import { htmlQuery } from "@util"; import Tagify from "@yaireo/tagify"; import { CampaignFeaturePF2e } from "./document.ts"; diff --git a/src/module/item/class/data.ts b/src/module/item/class/data.ts index 18063fb65b9..180b7546b64 100644 --- a/src/module/item/class/data.ts +++ b/src/module/item/class/data.ts @@ -1,6 +1,6 @@ import { AttributeString, SaveType } from "@actor/types.ts"; import { ABCSystemSource } from "@item/abc/data.ts"; -import { BaseItemSourcePF2e, RarityTraitAndOtherTags } from "@item/data/base.ts"; +import { BaseItemSourcePF2e, RarityTraitAndOtherTags } from "@item/base/data/system.ts"; import { ZeroToFour } from "@module/data.ts"; type ClassSource = BaseItemSourcePF2e<"class", ClassSystemSource>; diff --git a/src/module/item/condition/data.ts b/src/module/item/condition/data.ts index 247d961b9e2..04816dfcb5a 100644 --- a/src/module/item/condition/data.ts +++ b/src/module/item/condition/data.ts @@ -1,5 +1,5 @@ import { AbstractEffectSystemData, AbstractEffectSystemSource, DurationData } from "@item/abstract-effect/data.ts"; -import { BaseItemSourcePF2e, OtherTagsOnly } from "@item/data/base.ts"; +import { BaseItemSourcePF2e, OtherTagsOnly } from "@item/base/data/system.ts"; import { DamageType } from "@system/damage/index.ts"; import type { DamageRoll } from "@system/damage/roll.ts"; import { ConditionSlug } from "./types.ts"; diff --git a/src/module/item/consumable/document.ts b/src/module/item/consumable/document.ts index 09233638725..0cac9cc0d5f 100644 --- a/src/module/item/consumable/document.ts +++ b/src/module/item/consumable/document.ts @@ -1,7 +1,7 @@ import { ActorPF2e } from "@actor"; import { TrickMagicItemPopup } from "@actor/sheet/trick-magic-item-popup.ts"; import { PhysicalItemPF2e, SpellcastingEntryPF2e, SpellPF2e, WeaponPF2e } from "@item"; -import { ItemSummaryData } from "@item/data/index.ts"; +import { ItemSummaryData } from "@item/base/data/index.ts"; import { TrickMagicItemEntry } from "@item/spellcasting-entry/trick.ts"; import { ValueAndMax } from "@module/data.ts"; import { RuleElementPF2e } from "@module/rules/index.ts"; diff --git a/src/module/item/consumable/spell-consumables.ts b/src/module/item/consumable/spell-consumables.ts index 97440935d52..914008ab75a 100644 --- a/src/module/item/consumable/spell-consumables.ts +++ b/src/module/item/consumable/spell-consumables.ts @@ -1,5 +1,5 @@ import { ConsumablePF2e, type SpellPF2e } from "@item"; -import { ConsumableSource } from "@item/data/index.ts"; +import { ConsumableSource } from "@item/base/data/index.ts"; import { MagicTradition } from "@item/spell/types.ts"; import { MAGIC_TRADITIONS } from "@item/spell/values.ts"; import { traditionSkills } from "@item/spellcasting-entry/trick.ts"; diff --git a/src/module/item/container/document.ts b/src/module/item/container/document.ts index 181b74f8f8b..61c5b9d7544 100644 --- a/src/module/item/container/document.ts +++ b/src/module/item/container/document.ts @@ -1,6 +1,6 @@ import { ActorPF2e } from "@actor"; import { InventoryBulk } from "@actor/inventory/index.ts"; -import { ItemSummaryData } from "@item/data/index.ts"; +import { ItemSummaryData } from "@item/base/data/index.ts"; import { EquipmentTrait } from "@item/equipment/data.ts"; import { PhysicalItemPF2e } from "@item/physical/index.ts"; import { Bulk, weightToBulk } from "@item/physical/bulk.ts"; diff --git a/src/module/item/deity/data.ts b/src/module/item/deity/data.ts index 6cf62b5c229..25f2678eb3b 100644 --- a/src/module/item/deity/data.ts +++ b/src/module/item/deity/data.ts @@ -1,7 +1,7 @@ import { SkillAbbreviation } from "@actor/creature/data.ts"; import { Alignment } from "@actor/creature/types.ts"; import { AttributeString } from "@actor/types.ts"; -import { BaseItemSourcePF2e, ItemSystemSource, OtherTagsOnly } from "@item/data/base.ts"; +import { BaseItemSourcePF2e, ItemSystemSource, OtherTagsOnly } from "@item/base/data/system.ts"; import { BaseWeaponType } from "@item/weapon/types.ts"; import { DeityDomain } from "./types.ts"; diff --git a/src/module/item/deity/sheet.ts b/src/module/item/deity/sheet.ts index 02b27cac1b4..087eab2900d 100644 --- a/src/module/item/deity/sheet.ts +++ b/src/module/item/deity/sheet.ts @@ -1,7 +1,7 @@ import { SkillAbbreviation } from "@actor/creature/data.ts"; import { Alignment } from "@actor/creature/types.ts"; import { DeityPF2e, ItemPF2e, SpellPF2e } from "@item"; -import { ItemSheetDataPF2e, ItemSheetPF2e } from "@item/sheet/base.ts"; +import { ItemSheetDataPF2e, ItemSheetPF2e } from "@item/base/sheet/base.ts"; import { SheetOptions, createSheetOptions } from "@module/sheet/helpers.ts"; import { ErrorPF2e, htmlClosest, htmlQuery, htmlQueryAll, tagify } from "@util"; import { UUIDUtils } from "@util/uuid.ts"; diff --git a/src/module/item/effect/data.ts b/src/module/item/effect/data.ts index df215c38516..18ddffd79a7 100644 --- a/src/module/item/effect/data.ts +++ b/src/module/item/effect/data.ts @@ -8,7 +8,7 @@ import { EffectContextData, EffectTraits, } from "@item/abstract-effect/index.ts"; -import { BaseItemSourcePF2e, ItemFlagsPF2e } from "@item/data/base.ts"; +import { BaseItemSourcePF2e, ItemFlagsPF2e } from "@item/base/data/system.ts"; type EffectSource = BaseItemSourcePF2e<"effect", EffectSystemSource> & { flags: DeepPartial; diff --git a/src/module/item/effect/sheet.ts b/src/module/item/effect/sheet.ts index 3fd9bbf5997..a7bbe0797a3 100644 --- a/src/module/item/effect/sheet.ts +++ b/src/module/item/effect/sheet.ts @@ -1,7 +1,7 @@ import { EffectBadgeSource } from "@item/abstract-effect/index.ts"; import { ErrorPF2e } from "@util"; import { htmlQuery, htmlQueryAll } from "@util/dom.ts"; -import { ItemSheetDataPF2e, ItemSheetPF2e } from "../sheet/base.ts"; +import { ItemSheetDataPF2e, ItemSheetPF2e } from "../base/sheet/base.ts"; import { EffectSource } from "./data.ts"; import { EffectPF2e } from "./document.ts"; diff --git a/src/module/item/equipment/document.ts b/src/module/item/equipment/document.ts index 423a1cdcd61..16c30a92390 100644 --- a/src/module/item/equipment/document.ts +++ b/src/module/item/equipment/document.ts @@ -1,5 +1,5 @@ import type { ActorPF2e } from "@actor"; -import { ItemSummaryData } from "@item/data/index.ts"; +import { ItemSummaryData } from "@item/base/data/index.ts"; import { PhysicalItemPF2e } from "@item/physical/index.ts"; import type { UserPF2e } from "@module/user/document.ts"; import { objectHasKey } from "@util"; diff --git a/src/module/item/feat/data.ts b/src/module/item/feat/data.ts index ebcf0375ae8..3136d3b8cc3 100644 --- a/src/module/item/feat/data.ts +++ b/src/module/item/feat/data.ts @@ -7,7 +7,7 @@ import { FrequencySource, ItemSystemSource, ItemTraits, -} from "@item/data/base.ts"; +} from "@item/base/data/system.ts"; import { OneToThree } from "@module/data.ts"; import { FeatOrFeatureCategory, FeatTrait } from "./types.ts"; diff --git a/src/module/item/feat/document.ts b/src/module/item/feat/document.ts index 477db248899..be76be04dee 100644 --- a/src/module/item/feat/document.ts +++ b/src/module/item/feat/document.ts @@ -1,9 +1,8 @@ import type { ActorPF2e } from "@actor"; -import { FeatGroup } from "@actor/character/feats.ts"; +import type { FeatGroup } from "@actor/character/feats.ts"; import { ItemPF2e, type HeritagePF2e } from "@item"; import { normalizeActionChangeData } from "@item/ability/helpers.ts"; -import { ActionCost, Frequency } from "@item/data/base.ts"; -import { ItemSummaryData } from "@item/data/index.ts"; +import { ActionCost, Frequency, ItemSummaryData } from "@item/base/data/index.ts"; import { Rarity } from "@module/data.ts"; import type { UserPF2e } from "@module/user/index.ts"; import { getActionTypeLabel, setHasElement, sluggify } from "@util"; diff --git a/src/module/item/feat/sheet.ts b/src/module/item/feat/sheet.ts index 7902d9ec3c7..01f9fe0e01f 100644 --- a/src/module/item/feat/sheet.ts +++ b/src/module/item/feat/sheet.ts @@ -5,7 +5,7 @@ import { } from "@item/ability/helpers.ts"; import { SelfEffectReference } from "@item/ability/index.ts"; import { FeatPF2e } from "@item/feat/document.ts"; -import { ItemSheetDataPF2e, ItemSheetPF2e } from "@item/sheet/index.ts"; +import { ItemSheetDataPF2e, ItemSheetPF2e } from "@item/base/sheet/index.ts"; import { tagify } from "@util"; import { featCanHaveKeyOptions } from "./helpers.ts"; diff --git a/src/module/item/helpers.ts b/src/module/item/helpers.ts index 25faf43311c..90f15e19e13 100644 --- a/src/module/item/helpers.ts +++ b/src/module/item/helpers.ts @@ -1,6 +1,6 @@ import { ActorPF2e } from "@actor"; import { setHasElement } from "@util"; -import { ItemType } from "./data/index.ts"; +import { ItemType } from "./base/data/index.ts"; import { PhysicalItemPF2e } from "./physical/document.ts"; import { PHYSICAL_ITEM_TYPES } from "./physical/values.ts"; import { ItemInstances } from "./types.ts"; diff --git a/src/module/item/heritage/data.ts b/src/module/item/heritage/data.ts index a9b6834bb36..bf62afb1ef6 100644 --- a/src/module/item/heritage/data.ts +++ b/src/module/item/heritage/data.ts @@ -1,5 +1,5 @@ import { AncestryTraits } from "@item/ancestry/data.ts"; -import { BaseItemSourcePF2e, ItemSystemData, ItemSystemSource } from "@item/data/base.ts"; +import { BaseItemSourcePF2e, ItemSystemData, ItemSystemSource } from "@item/base/data/system.ts"; type HeritageSource = BaseItemSourcePF2e<"heritage", HeritageSystemSource>; diff --git a/src/module/item/heritage/sheet.ts b/src/module/item/heritage/sheet.ts index 8f4ddb758c6..a823aabb0e5 100644 --- a/src/module/item/heritage/sheet.ts +++ b/src/module/item/heritage/sheet.ts @@ -1,5 +1,5 @@ import { AncestryPF2e, HeritagePF2e, ItemPF2e } from "@item"; -import { ItemSheetDataPF2e, ItemSheetPF2e } from "@item/sheet/base.ts"; +import { ItemSheetDataPF2e, ItemSheetPF2e } from "@item/base/sheet/base.ts"; import { ErrorPF2e, sluggify } from "@util"; export class HeritageSheetPF2e extends ItemSheetPF2e { diff --git a/src/module/item/index.ts b/src/module/item/index.ts index 79f6d2a6e16..143b2329724 100644 --- a/src/module/item/index.ts +++ b/src/module/item/index.ts @@ -1,5 +1,5 @@ // Base -export * from "./base.ts"; +export * from "./base/document.ts"; // Effects export { AbstractEffectPF2e } from "./abstract-effect/document.ts"; @@ -35,4 +35,4 @@ export { MeleePF2e } from "./melee/document.ts"; export { SpellPF2e } from "./spell/document.ts"; export { SpellcastingEntryPF2e } from "./spellcasting-entry/document.ts"; -export * from "./sheet/index.ts"; +export * from "./base/sheet/index.ts"; diff --git a/src/module/item/kit/data.ts b/src/module/item/kit/data.ts index 37d151c9c8c..012a93058e5 100644 --- a/src/module/item/kit/data.ts +++ b/src/module/item/kit/data.ts @@ -1,4 +1,4 @@ -import { BaseItemSourcePF2e, ItemSystemSource } from "@item/data/base.ts"; +import { BaseItemSourcePF2e, ItemSystemSource } from "@item/base/data/system.ts"; import { PhysicalItemTraits, PartialPrice } from "@item/physical/data.ts"; type KitSource = BaseItemSourcePF2e<"kit", KitSystemSource>; diff --git a/src/module/item/kit/sheet.ts b/src/module/item/kit/sheet.ts index d0b9168705f..9b1dffc2b17 100644 --- a/src/module/item/kit/sheet.ts +++ b/src/module/item/kit/sheet.ts @@ -1,6 +1,6 @@ import { CoinsPF2e, PhysicalItemPF2e } from "@item/physical/index.ts"; import { htmlClosest, htmlQueryAll } from "@util"; -import { ItemSheetDataPF2e, ItemSheetPF2e } from "../sheet/base.ts"; +import { ItemSheetDataPF2e, ItemSheetPF2e } from "../base/sheet/base.ts"; import { KitEntryData } from "./data.ts"; import { KitPF2e } from "./document.ts"; diff --git a/src/module/item/lore/data.ts b/src/module/item/lore/data.ts index 6a43c2faedb..4bb0761dd64 100644 --- a/src/module/item/lore/data.ts +++ b/src/module/item/lore/data.ts @@ -1,4 +1,4 @@ -import { BaseItemSourcePF2e, ItemSystemSource, OtherTagsOnly } from "@item/data/base.ts"; +import { BaseItemSourcePF2e, ItemSystemSource, OtherTagsOnly } from "@item/base/data/system.ts"; import { ZeroToFour } from "@module/data.ts"; type LoreSource = BaseItemSourcePF2e<"lore", LoreSystemSource>; diff --git a/src/module/item/lore/index.ts b/src/module/item/lore/index.ts index f359c896175..3ac15bd9ceb 100644 --- a/src/module/item/lore/index.ts +++ b/src/module/item/lore/index.ts @@ -1,5 +1,5 @@ -import { ActorPF2e } from "@actor"; -import { ItemPF2e } from "@item/base.ts"; +import type { ActorPF2e } from "@actor"; +import { ItemPF2e } from "@item"; import { LoreSource, LoreSystemData } from "./data.ts"; class LorePF2e extends ItemPF2e {} diff --git a/src/module/item/melee/data.ts b/src/module/item/melee/data.ts index a39d6c4f726..05ecabf9a06 100644 --- a/src/module/item/melee/data.ts +++ b/src/module/item/melee/data.ts @@ -4,7 +4,7 @@ import { ItemSystemData, ItemSystemSource, ItemTraitsNoRarity, -} from "@item/data/base.ts"; +} from "@item/base/data/system.ts"; import { WeaponMaterialData } from "@item/weapon/data.ts"; import { DamageType } from "@system/damage/types.ts"; diff --git a/src/module/item/melee/sheet.ts b/src/module/item/melee/sheet.ts index a032734cd67..e3caf49f1de 100644 --- a/src/module/item/melee/sheet.ts +++ b/src/module/item/melee/sheet.ts @@ -1,4 +1,4 @@ -import { ItemSheetDataPF2e, ItemSheetPF2e } from "@item/sheet/base.ts"; +import { ItemSheetDataPF2e, ItemSheetPF2e } from "@item/base/sheet/base.ts"; import { createSheetOptions, SheetOptions } from "@module/sheet/helpers.ts"; import { damageCategoriesUnique } from "@scripts/config/damage.ts"; import { DamageCategoryUnique } from "@system/damage/types.ts"; diff --git a/src/module/item/physical/data.ts b/src/module/item/physical/data.ts index 88c91ec4597..5094ae6a215 100644 --- a/src/module/item/physical/data.ts +++ b/src/module/item/physical/data.ts @@ -4,8 +4,8 @@ import { ConsumableTrait } from "@item/consumable/data.ts"; import { EquipmentTrait } from "@item/equipment/data.ts"; import { WeaponTrait } from "@item/weapon/types.ts"; import { Size, TraitsWithRarity, ValuesList } from "@module/data.ts"; -import { ActionCost, BaseItemSourcePF2e, Frequency, ItemSystemData, ItemSystemSource } from "../data/base.ts"; -import type { ITEM_CARRY_TYPES } from "../data/values.ts"; +import { ActionCost, BaseItemSourcePF2e, Frequency, ItemSystemData, ItemSystemSource } from "../base/data/system.ts"; +import type { ITEM_CARRY_TYPES } from "../base/data/values.ts"; import type { CoinsPF2e } from "./helpers.ts"; import { PhysicalItemType, PreciousMaterialGrade, PreciousMaterialType } from "./types.ts"; import { UsageDetails } from "./usage.ts"; diff --git a/src/module/item/physical/document.ts b/src/module/item/physical/document.ts index 94e3073f8e4..f8d129f2e2d 100644 --- a/src/module/item/physical/document.ts +++ b/src/module/item/physical/document.ts @@ -1,8 +1,8 @@ import { ActorProxyPF2e, type ActorPF2e } from "@actor"; import { ItemPF2e, type ContainerPF2e } from "@item"; import { isCycle } from "@item/container/helpers.ts"; -import { ItemSummaryData, PhysicalItemSource, TraitChatData } from "@item/data/index.ts"; -import { MystifiedTraits } from "@item/data/values.ts"; +import { ItemSummaryData, PhysicalItemSource, TraitChatData } from "@item/base/data/index.ts"; +import { MystifiedTraits } from "@item/base/data/values.ts"; import { Rarity, Size } from "@module/data.ts"; import type { UserPF2e } from "@module/user/document.ts"; import { ErrorPF2e, isObject, sluggify, sortBy } from "@util"; diff --git a/src/module/item/physical/sheet.ts b/src/module/item/physical/sheet.ts index 917eac44593..720dc7cb121 100644 --- a/src/module/item/physical/sheet.ts +++ b/src/module/item/physical/sheet.ts @@ -1,6 +1,6 @@ import { AutomaticBonusProgression as ABP } from "@actor/character/automatic-bonus-progression.ts"; import { createSheetTags, SheetOptions } from "@module/sheet/helpers.ts"; -import { ItemSheetDataPF2e, ItemSheetPF2e } from "../sheet/base.ts"; +import { ItemSheetDataPF2e, ItemSheetPF2e } from "../base/sheet/base.ts"; import { BasePhysicalItemSource, CoinsPF2e, diff --git a/src/module/item/spell/data.ts b/src/module/item/spell/data.ts index 5788d9b0492..6cf78562548 100644 --- a/src/module/item/spell/data.ts +++ b/src/module/item/spell/data.ts @@ -1,5 +1,5 @@ import { SaveType } from "@actor/types.ts"; -import { BaseItemSourcePF2e, ItemSystemData, ItemSystemSource, ItemTraits } from "@item/data/base.ts"; +import { BaseItemSourcePF2e, ItemSystemData, ItemSystemSource, ItemTraits } from "@item/base/data/system.ts"; import { OneToTen, ValueAndMax } from "@module/data.ts"; import { DamageCategoryUnique, DamageType, MaterialDamageEffect } from "@system/damage/index.ts"; import { EffectAreaSize, EffectAreaType, MagicTradition, SpellComponent, SpellTrait } from "./types.ts"; diff --git a/src/module/item/spell/document.ts b/src/module/item/spell/document.ts index f4c35f17377..c70d9290f50 100644 --- a/src/module/item/spell/document.ts +++ b/src/module/item/spell/document.ts @@ -3,7 +3,7 @@ import { DamageDicePF2e, ModifierPF2e } from "@actor/modifiers.ts"; import { AttributeString } from "@actor/types.ts"; import { ItemPF2e } from "@item"; import { ActionTrait } from "@item/ability/types.ts"; -import { ItemSourcePF2e, ItemSummaryData } from "@item/data/index.ts"; +import { ItemSourcePF2e, ItemSummaryData } from "@item/base/data/index.ts"; import { TrickMagicItemEntry } from "@item/spellcasting-entry/trick.ts"; import { BaseSpellcastingEntry } from "@item/spellcasting-entry/types.ts"; import { RangeData } from "@item/types.ts"; diff --git a/src/module/item/spell/sheet.ts b/src/module/item/spell/sheet.ts index f84110f17cf..02cb14ef5ae 100644 --- a/src/module/item/spell/sheet.ts +++ b/src/module/item/spell/sheet.ts @@ -1,6 +1,6 @@ import * as R from "remeda"; import { SpellPF2e, SpellSystemSource } from "@item/spell/index.ts"; -import { ItemSheetDataPF2e, ItemSheetPF2e } from "../sheet/base.ts"; +import { ItemSheetDataPF2e, ItemSheetPF2e } from "../base/sheet/base.ts"; import { SpellDamage, SpellHeighteningInterval, SpellSystemData } from "./data.ts"; import { ErrorPF2e, diff --git a/src/module/item/spellcasting-entry/data.ts b/src/module/item/spellcasting-entry/data.ts index a1655d60598..ceab60d97a2 100644 --- a/src/module/item/spellcasting-entry/data.ts +++ b/src/module/item/spellcasting-entry/data.ts @@ -1,5 +1,5 @@ import { AttributeString } from "@actor/types.ts"; -import { BaseItemSourcePF2e, ItemSystemData, ItemSystemSource, OtherTagsOnly } from "@item/data/base.ts"; +import { BaseItemSourcePF2e, ItemSystemData, ItemSystemSource, OtherTagsOnly } from "@item/base/data/system.ts"; import { MagicTradition } from "@item/spell/types.ts"; import { OneToTen, ZeroToEleven, ZeroToFour } from "@module/data.ts"; import type { RollNotePF2e } from "@module/notes.ts"; diff --git a/src/module/item/treasure/document.ts b/src/module/item/treasure/document.ts index c77b7775c79..b906e336479 100644 --- a/src/module/item/treasure/document.ts +++ b/src/module/item/treasure/document.ts @@ -1,5 +1,5 @@ import type { ActorPF2e } from "@actor"; -import { ItemSummaryData } from "@item/data/index.ts"; +import { ItemSummaryData } from "@item/base/data/index.ts"; import { PhysicalItemPF2e } from "@item/physical/index.ts"; import { CoinDenomination } from "@item/physical/types.ts"; import { DENOMINATIONS } from "@item/physical/values.ts"; diff --git a/src/module/item/weapon/data.ts b/src/module/item/weapon/data.ts index 3b977a0c249..bd31d389c17 100644 --- a/src/module/item/weapon/data.ts +++ b/src/module/item/weapon/data.ts @@ -1,5 +1,5 @@ import { AttributeString } from "@actor/types.ts"; -import { ItemFlagsPF2e } from "@item/data/base.ts"; +import { ItemFlagsPF2e } from "@item/base/data/system.ts"; import { BasePhysicalItemSource, Investable, diff --git a/src/module/item/weapon/document.ts b/src/module/item/weapon/document.ts index 94ecb65c93d..5bc81556642 100644 --- a/src/module/item/weapon/document.ts +++ b/src/module/item/weapon/document.ts @@ -5,7 +5,7 @@ import { AttributeString } from "@actor/types.ts"; import { ATTRIBUTE_ABBREVIATIONS } from "@actor/values.ts"; import { ConsumablePF2e, MeleePF2e, PhysicalItemPF2e } from "@item"; import { createActionRangeLabel } from "@item/ability/helpers.ts"; -import { ItemSummaryData, MeleeSource } from "@item/data/index.ts"; +import { ItemSummaryData, MeleeSource } from "@item/base/data/index.ts"; import { NPCAttackDamage, NPCAttackTrait } from "@item/melee/data.ts"; import { IdentificationStatus, diff --git a/src/module/migration/base.ts b/src/module/migration/base.ts index ed3a8d1bb36..6f49bf1ecd3 100644 --- a/src/module/migration/base.ts +++ b/src/module/migration/base.ts @@ -1,6 +1,6 @@ import { ActorPF2e } from "@actor"; import { ActorSourcePF2e } from "@actor/data/index.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { ScenePF2e } from "@scene/index.ts"; /** diff --git a/src/module/migration/migrations/600-reach.ts b/src/module/migration/migrations/600-reach.ts index 5ea6164ad5f..49c72128d9d 100644 --- a/src/module/migration/migrations/600-reach.ts +++ b/src/module/migration/migrations/600-reach.ts @@ -1,5 +1,5 @@ import { MigrationBase } from "../base.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; export class Migration600Reach extends MigrationBase { static override version = 0.6; diff --git a/src/module/migration/migrations/601-migrate-effect-compendia.ts b/src/module/migration/migrations/601-migrate-effect-compendia.ts index 9c9e903f081..2c0b7174a9a 100644 --- a/src/module/migration/migrations/601-migrate-effect-compendia.ts +++ b/src/module/migration/migrations/601-migrate-effect-compendia.ts @@ -1,5 +1,5 @@ import { MigrationBase } from "../base.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { objectHasKey } from "@util"; export class Migration601SplitEffectCompendia extends MigrationBase { diff --git a/src/module/migration/migrations/604-fix-class-items.ts b/src/module/migration/migrations/604-fix-class-items.ts index 929c4fd6483..11edc64f021 100644 --- a/src/module/migration/migrations/604-fix-class-items.ts +++ b/src/module/migration/migrations/604-fix-class-items.ts @@ -1,4 +1,4 @@ -import { ClassSource } from "@item/data/index.ts"; +import { ClassSource } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; export class Migration604FixClassItem extends MigrationBase { diff --git a/src/module/migration/migrations/605-catch-up-to-template-json.ts b/src/module/migration/migrations/605-catch-up-to-template-json.ts index 3c03f3aa061..b3a5fa1be76 100644 --- a/src/module/migration/migrations/605-catch-up-to-template-json.ts +++ b/src/module/migration/migrations/605-catch-up-to-template-json.ts @@ -1,7 +1,7 @@ import { MigrationBase } from "../base.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { ActorSourcePF2e } from "@actor/data/index.ts"; -import { isPhysicalData } from "@item/data/helpers.ts"; +import { isPhysicalData } from "@item/base/data/helpers.ts"; /** Catch up actors and items to the current template.json spec */ export class Migration605CatchUpToTemplateJSON extends MigrationBase { diff --git a/src/module/migration/migrations/606-signature-spells.ts b/src/module/migration/migrations/606-signature-spells.ts index 8195087f9d5..c310be8c26f 100644 --- a/src/module/migration/migrations/606-signature-spells.ts +++ b/src/module/migration/migrations/606-signature-spells.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { SpellcastingEntrySystemSource } from "@item/spellcasting-entry/data.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/607-melee-item-damage-rolls.ts b/src/module/migration/migrations/607-melee-item-damage-rolls.ts index 50dfb7288ea..9f1d941d7ca 100644 --- a/src/module/migration/migrations/607-melee-item-damage-rolls.ts +++ b/src/module/migration/migrations/607-melee-item-damage-rolls.ts @@ -1,5 +1,5 @@ import { MigrationBase } from "../base.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { NPCAttackDamage } from "@item/melee/data.ts"; /** Convert damageRolls arrays to objects. */ diff --git a/src/module/migration/migrations/608-delete-persisted-kits.ts b/src/module/migration/migrations/608-delete-persisted-kits.ts index 8b9099adf1a..874edc90689 100644 --- a/src/module/migration/migrations/608-delete-persisted-kits.ts +++ b/src/module/migration/migrations/608-delete-persisted-kits.ts @@ -1,5 +1,5 @@ import { MigrationBase } from "../base.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { ActorSourcePF2e } from "@actor/data/index.ts"; /** Unbreak actor sheets that have kit items in their inventories */ diff --git a/src/module/migration/migrations/610-set-heritage-feat-type.ts b/src/module/migration/migrations/610-set-heritage-feat-type.ts index 6bdcd0eefcd..077b4b0db1e 100644 --- a/src/module/migration/migrations/610-set-heritage-feat-type.ts +++ b/src/module/migration/migrations/610-set-heritage-feat-type.ts @@ -1,5 +1,5 @@ import { MigrationBase } from "../base.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { isObject } from "@util"; /** Convert heritage "feats" be of type "heritage" */ diff --git a/src/module/migration/migrations/611-update-toughness-mountains-stoutness.ts b/src/module/migration/migrations/611-update-toughness-mountains-stoutness.ts index 0be2df43c96..112dd4f05fb 100644 --- a/src/module/migration/migrations/611-update-toughness-mountains-stoutness.ts +++ b/src/module/migration/migrations/611-update-toughness-mountains-stoutness.ts @@ -1,7 +1,7 @@ import { MigrationBase } from "../base.ts"; import { ActorSourcePF2e } from "@actor/data/index.ts"; import { FeatPF2e } from "@item"; -import { FeatSource } from "@item/data/index.ts"; +import { FeatSource } from "@item/base/data/index.ts"; import { ErrorPF2e } from "@util"; export class Migration611UpdateToughnessMountainsStoutness extends MigrationBase { diff --git a/src/module/migration/migrations/613-remove-ammo-charges.ts b/src/module/migration/migrations/613-remove-ammo-charges.ts index a291ca5d91e..4f3e8c26f25 100644 --- a/src/module/migration/migrations/613-remove-ammo-charges.ts +++ b/src/module/migration/migrations/613-remove-ammo-charges.ts @@ -1,5 +1,5 @@ import { MigrationBase } from "../base.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; /** Remove charges from ammunition to ensure ammo consumption works properly. */ export class Migration613RemoveAmmoCharges extends MigrationBase { diff --git a/src/module/migration/migrations/614-numify-melee-bonuses.ts b/src/module/migration/migrations/614-numify-melee-bonuses.ts index 522be44c060..4e35065b8b9 100644 --- a/src/module/migration/migrations/614-numify-melee-bonuses.ts +++ b/src/module/migration/migrations/614-numify-melee-bonuses.ts @@ -1,5 +1,5 @@ import { MigrationBase } from "../base.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; /** Numify melee bonus.value property */ export class Migration614NumifyMeleeBonuses extends MigrationBase { diff --git a/src/module/migration/migrations/615-remove-instinct-trait.ts b/src/module/migration/migrations/615-remove-instinct-trait.ts index f540aa8ea8b..1691c15b117 100644 --- a/src/module/migration/migrations/615-remove-instinct-trait.ts +++ b/src/module/migration/migrations/615-remove-instinct-trait.ts @@ -1,5 +1,5 @@ import { MigrationBase } from "../base.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; /** Remove "instinct" trait from feats */ export class Migration615RemoveInstinctTrait extends MigrationBase { diff --git a/src/module/migration/migrations/616-migrate-feat-prerequisites.ts b/src/module/migration/migrations/616-migrate-feat-prerequisites.ts index 5131d47354e..a10fea03d47 100644 --- a/src/module/migration/migrations/616-migrate-feat-prerequisites.ts +++ b/src/module/migration/migrations/616-migrate-feat-prerequisites.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { isObject } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/618-migrate-item-img-paths.ts b/src/module/migration/migrations/618-migrate-item-img-paths.ts index bb54357f0f6..cf28da60c9b 100644 --- a/src/module/migration/migrations/618-migrate-item-img-paths.ts +++ b/src/module/migration/migrations/618-migrate-item-img-paths.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; export class Migration618MigrateItemImagePaths extends MigrationBase { diff --git a/src/module/migration/migrations/619-remove-wand-and-scroll-tradition.ts b/src/module/migration/migrations/619-remove-wand-and-scroll-tradition.ts index 3fd23f877d3..e11adf40c9d 100644 --- a/src/module/migration/migrations/619-remove-wand-and-scroll-tradition.ts +++ b/src/module/migration/migrations/619-remove-wand-and-scroll-tradition.ts @@ -1,5 +1,5 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { SpellcastingEntrySource } from "@item/spellcasting-entry/data.ts"; import { tupleHasValue } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/620-rename-to-webp.ts b/src/module/migration/migrations/620-rename-to-webp.ts index 2310446b85c..2ccd28cadbd 100644 --- a/src/module/migration/migrations/620-rename-to-webp.ts +++ b/src/module/migration/migrations/620-rename-to-webp.ts @@ -1,7 +1,7 @@ import { CharacterDetailsSource } from "@actor/character/data.ts"; import { ActorSourcePF2e } from "@actor/data/index.ts"; import { ABCFeatureEntryData } from "@item/abc/data.ts"; -import { AncestrySource, BackgroundSource, ClassSource, ItemSourcePF2e, KitSource } from "@item/data/index.ts"; +import { AncestrySource, BackgroundSource, ClassSource, ItemSourcePF2e, KitSource } from "@item/base/data/index.ts"; import { KitEntryData } from "@item/kit/data.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/621-remove-config-spell-schools.ts b/src/module/migration/migrations/621-remove-config-spell-schools.ts index 98d4a87f108..79f709c62b8 100644 --- a/src/module/migration/migrations/621-remove-config-spell-schools.ts +++ b/src/module/migration/migrations/621-remove-config-spell-schools.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MAGIC_SCHOOLS } from "@item/spell/values.ts"; import { objectHasKey, setHasElement } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/623-numify-potency-runes.ts b/src/module/migration/migrations/623-numify-potency-runes.ts index ac13db56732..a216d8da53a 100644 --- a/src/module/migration/migrations/623-numify-potency-runes.ts +++ b/src/module/migration/migrations/623-numify-potency-runes.ts @@ -1,5 +1,5 @@ import { MigrationBase } from "../base.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; export class Migration623NumifyPotencyRunes extends MigrationBase { static override version = 0.623; diff --git a/src/module/migration/migrations/626-update-spell-category.ts b/src/module/migration/migrations/626-update-spell-category.ts index 9d900160174..42b9022cf38 100644 --- a/src/module/migration/migrations/626-update-spell-category.ts +++ b/src/module/migration/migrations/626-update-spell-category.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { SpellSystemSource } from "@item/spell/data.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/627-lowercase-spell-saves.ts b/src/module/migration/migrations/627-lowercase-spell-saves.ts index d61a17a819a..266e06cd3bb 100644 --- a/src/module/migration/migrations/627-lowercase-spell-saves.ts +++ b/src/module/migration/migrations/627-lowercase-spell-saves.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { tupleHasValue } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/629-set-base-items.ts b/src/module/migration/migrations/629-set-base-items.ts index 9338a6a0567..24e91ea8759 100644 --- a/src/module/migration/migrations/629-set-base-items.ts +++ b/src/module/migration/migrations/629-set-base-items.ts @@ -1,8 +1,8 @@ import { MigrationBase } from "../base.ts"; import { sluggify } from "@util"; import { BaseArmorType } from "@item/armor/types.ts"; -import { isPhysicalData } from "@item/data/helpers.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { isPhysicalData } from "@item/base/data/helpers.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; /** Set the `baseItem` property of base armor and weapons for the benefit of better unidentified names */ export class Migration629SetBaseItems extends MigrationBase { diff --git a/src/module/migration/migrations/630-fix-talisman-spelling.ts b/src/module/migration/migrations/630-fix-talisman-spelling.ts index 5c48d5301b3..9076f6b0898 100644 --- a/src/module/migration/migrations/630-fix-talisman-spelling.ts +++ b/src/module/migration/migrations/630-fix-talisman-spelling.ts @@ -1,5 +1,5 @@ import { MigrationBase } from "../base.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; /** Fix spelling of the "talisman" `consumableType` */ export class Migration630FixTalismanSpelling extends MigrationBase { diff --git a/src/module/migration/migrations/631-fix-sense-rule-element-selector.ts b/src/module/migration/migrations/631-fix-sense-rule-element-selector.ts index 09e8d5bc68c..66f0cdb1fb9 100644 --- a/src/module/migration/migrations/631-fix-sense-rule-element-selector.ts +++ b/src/module/migration/migrations/631-fix-sense-rule-element-selector.ts @@ -1,5 +1,5 @@ import { MigrationBase } from "../base.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; /** Correct any sense rule element selector values that are using the old lowercase selector values */ export class Migration631FixSenseRuleElementSelector extends MigrationBase { diff --git a/src/module/migration/migrations/632-delete-orphaned-spells.ts b/src/module/migration/migrations/632-delete-orphaned-spells.ts index 28633c4f049..92966fbb514 100644 --- a/src/module/migration/migrations/632-delete-orphaned-spells.ts +++ b/src/module/migration/migrations/632-delete-orphaned-spells.ts @@ -1,5 +1,5 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; -import { SpellcastingEntrySource, SpellSource } from "@item/data/index.ts"; +import { SpellcastingEntrySource, SpellSource } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Delete owned spells with no corresponding spellcastiong entry */ diff --git a/src/module/migration/migrations/633-delete-unidentified-traits.ts b/src/module/migration/migrations/633-delete-unidentified-traits.ts index 5e402f09ad8..db810a3f2e5 100644 --- a/src/module/migration/migrations/633-delete-unidentified-traits.ts +++ b/src/module/migration/migrations/633-delete-unidentified-traits.ts @@ -1,5 +1,5 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; -import { isPhysicalData } from "@item/data/helpers.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; +import { isPhysicalData } from "@item/base/data/helpers.ts"; import { MeleeSystemSource } from "@item/melee/data.ts"; import { IdentificationData, MystifiedData } from "@item/physical/data.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/634-purge-martial-items.ts b/src/module/migration/migrations/634-purge-martial-items.ts index 86041a9d983..24b46274497 100644 --- a/src/module/migration/migrations/634-purge-martial-items.ts +++ b/src/module/migration/migrations/634-purge-martial-items.ts @@ -1,5 +1,5 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; -import { WeaponSource } from "@item/data/index.ts"; +import { WeaponSource } from "@item/base/data/index.ts"; import { WeaponSystemSource } from "@item/weapon/data.ts"; import { WeaponCategory } from "@item/weapon/types.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/635-numify-ac-and-quantity.ts b/src/module/migration/migrations/635-numify-ac-and-quantity.ts index 2c23656ecf4..8516b23cdec 100644 --- a/src/module/migration/migrations/635-numify-ac-and-quantity.ts +++ b/src/module/migration/migrations/635-numify-ac-and-quantity.ts @@ -1,6 +1,6 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; -import { isPhysicalData } from "@item/data/helpers.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; +import { isPhysicalData } from "@item/base/data/helpers.ts"; import { MigrationBase } from "../base.ts"; /** Ensure AC and quantity values are numeric */ diff --git a/src/module/migration/migrations/636-numify-armor-data.ts b/src/module/migration/migrations/636-numify-armor-data.ts index 0868b919030..5083505ec77 100644 --- a/src/module/migration/migrations/636-numify-armor-data.ts +++ b/src/module/migration/migrations/636-numify-armor-data.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; import { ArmorSystemSource } from "@item/armor/index.ts"; import { isObject } from "@util"; diff --git a/src/module/migration/migrations/637-clean-melee-items.ts b/src/module/migration/migrations/637-clean-melee-items.ts index f8d8c7c8bf5..8dfb9e5ca0b 100644 --- a/src/module/migration/migrations/637-clean-melee-items.ts +++ b/src/module/migration/migrations/637-clean-melee-items.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; const meleeKeys = new Set([ diff --git a/src/module/migration/migrations/638-spell-components.ts b/src/module/migration/migrations/638-spell-components.ts index 42f06813ffd..b4803eecd6e 100644 --- a/src/module/migration/migrations/638-spell-components.ts +++ b/src/module/migration/migrations/638-spell-components.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e, SpellSource } from "@item/data/index.ts"; +import { ItemSourcePF2e, SpellSource } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; const validComponents = ["material", "somatic", "verbal"] as const; diff --git a/src/module/migration/migrations/639-normalize-level-and-price.ts b/src/module/migration/migrations/639-normalize-level-and-price.ts index e0ad6b80c23..3a499233897 100644 --- a/src/module/migration/migrations/639-normalize-level-and-price.ts +++ b/src/module/migration/migrations/639-normalize-level-and-price.ts @@ -1,5 +1,5 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; -import { isPhysicalData } from "@item/data/helpers.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; +import { isPhysicalData } from "@item/base/data/helpers.ts"; import { Coins, PhysicalSystemSource } from "@item/physical/data.ts"; import { CoinsPF2e } from "@item/physical/helpers.ts"; import { isObject } from "@util"; diff --git a/src/module/migration/migrations/640-cantrips-are-not-zero-level.ts b/src/module/migration/migrations/640-cantrips-are-not-zero-level.ts index db48ab2f3a1..4a1a0fe001f 100644 --- a/src/module/migration/migrations/640-cantrips-are-not-zero-level.ts +++ b/src/module/migration/migrations/640-cantrips-are-not-zero-level.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { ZeroToTen } from "@module/data.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/641-sovereign-steel-value.ts b/src/module/migration/migrations/641-sovereign-steel-value.ts index 88503f04a0f..5880dc47237 100644 --- a/src/module/migration/migrations/641-sovereign-steel-value.ts +++ b/src/module/migration/migrations/641-sovereign-steel-value.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Fix precious material value of "sovereign steel" */ diff --git a/src/module/migration/migrations/642-track-schema-version.ts b/src/module/migration/migrations/642-track-schema-version.ts index f1771903f17..99b8db7a48a 100644 --- a/src/module/migration/migrations/642-track-schema-version.ts +++ b/src/module/migration/migrations/642-track-schema-version.ts @@ -1,5 +1,5 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Start recording the schema version and other details of a migration */ diff --git a/src/module/migration/migrations/644-spellcasting-category.ts b/src/module/migration/migrations/644-spellcasting-category.ts index e509da188d0..e37b4b0edfb 100644 --- a/src/module/migration/migrations/644-spellcasting-category.ts +++ b/src/module/migration/migrations/644-spellcasting-category.ts @@ -1,5 +1,5 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; -import { ClassSource, ItemSourcePF2e } from "@item/data/index.ts"; +import { ClassSource, ItemSourcePF2e } from "@item/base/data/index.ts"; import { sluggify, tupleHasValue } from "@util"; import { SpellcastingEntrySource, SpellcastingEntrySystemSource } from "@item/spellcasting-entry/data.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/646-update-inline-links.ts b/src/module/migration/migrations/646-update-inline-links.ts index 3242922555d..b5617323278 100644 --- a/src/module/migration/migrations/646-update-inline-links.ts +++ b/src/module/migration/migrations/646-update-inline-links.ts @@ -1,5 +1,5 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; export class Migration646UpdateInlineLinks extends MigrationBase { diff --git a/src/module/migration/migrations/648-remove-invested-property.ts b/src/module/migration/migrations/648-remove-invested-property.ts index f2b51add9bf..a37be0b9ab7 100644 --- a/src/module/migration/migrations/648-remove-invested-property.ts +++ b/src/module/migration/migrations/648-remove-invested-property.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { PhysicalSystemSource } from "@item/physical/data.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/649-focus-to-actor.ts b/src/module/migration/migrations/649-focus-to-actor.ts index 43184dc8ca4..824cc8054e8 100644 --- a/src/module/migration/migrations/649-focus-to-actor.ts +++ b/src/module/migration/migrations/649-focus-to-actor.ts @@ -2,7 +2,7 @@ import { CharacterSource } from "@actor/character/data.ts"; import { CreatureResourcesSource } from "@actor/creature/index.ts"; import { ActorSourcePF2e } from "@actor/data/index.ts"; import { NPCSource } from "@actor/npc/data.ts"; -import { ItemSourcePF2e, SpellcastingEntrySource } from "@item/data/index.ts"; +import { ItemSourcePF2e, SpellcastingEntrySource } from "@item/base/data/index.ts"; import { SpellcastingEntrySystemSource } from "@item/spellcasting-entry/data.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/650-stringify-weapon-properties.ts b/src/module/migration/migrations/650-stringify-weapon-properties.ts index 87f443ee647..8fcfef566da 100644 --- a/src/module/migration/migrations/650-stringify-weapon-properties.ts +++ b/src/module/migration/migrations/650-stringify-weapon-properties.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { WeaponSystemSource } from "@item/weapon/data.ts"; import { WeaponCategory, WeaponRangeIncrement } from "@item/weapon/types.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/651-ephemeral-focus-pool.ts b/src/module/migration/migrations/651-ephemeral-focus-pool.ts index 224e1ca8396..e3d5b357f81 100644 --- a/src/module/migration/migrations/651-ephemeral-focus-pool.ts +++ b/src/module/migration/migrations/651-ephemeral-focus-pool.ts @@ -1,5 +1,5 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; -import { FeatSource, ItemSourcePF2e } from "@item/data/index.ts"; +import { FeatSource, ItemSourcePF2e } from "@item/base/data/index.ts"; import { RuleElementSource } from "@module/rules/index.ts"; import { isObject, sluggify } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/652-kill-halcyon-tradition.ts b/src/module/migration/migrations/652-kill-halcyon-tradition.ts index 804bbb12d73..011a551fe55 100644 --- a/src/module/migration/migrations/652-kill-halcyon-tradition.ts +++ b/src/module/migration/migrations/652-kill-halcyon-tradition.ts @@ -1,5 +1,5 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; -import { ClassSource, ItemSourcePF2e } from "@item/data/index.ts"; +import { ClassSource, ItemSourcePF2e } from "@item/base/data/index.ts"; import { SpellcastingEntrySystemData } from "@item/spellcasting-entry/data.ts"; import { sluggify } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/653-aes-to-res.ts b/src/module/migration/migrations/653-aes-to-res.ts index eb7fbc7d784..be3da94f5fe 100644 --- a/src/module/migration/migrations/653-aes-to-res.ts +++ b/src/module/migration/migrations/653-aes-to-res.ts @@ -1,6 +1,6 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; import { AttributeString } from "@actor/types.ts"; -import { ClassSource, ItemSourcePF2e } from "@item/data/index.ts"; +import { ClassSource, ItemSourcePF2e } from "@item/base/data/index.ts"; import type { EffectChangeData } from "types/foundry/common/documents/active-effect.d.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/654-action-type-count.ts b/src/module/migration/migrations/654-action-type-count.ts index c38571cfd9a..00bdc1985db 100644 --- a/src/module/migration/migrations/654-action-type-count.ts +++ b/src/module/migration/migrations/654-action-type-count.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; import { OneToThree } from "@module/data.ts"; diff --git a/src/module/migration/migrations/655-creature-token-sizes.ts b/src/module/migration/migrations/655-creature-token-sizes.ts index bc3dfdecf74..b9222ef9b83 100644 --- a/src/module/migration/migrations/655-creature-token-sizes.ts +++ b/src/module/migration/migrations/655-creature-token-sizes.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { Size } from "@module/data.ts"; import { BracketedValue, RuleElementSource } from "@module/rules/rule-element/index.ts"; import { isObject } from "@util"; diff --git a/src/module/migration/migrations/656-other-focus-pool-sources.ts b/src/module/migration/migrations/656-other-focus-pool-sources.ts index 3db8c1604f5..639cceea551 100644 --- a/src/module/migration/migrations/656-other-focus-pool-sources.ts +++ b/src/module/migration/migrations/656-other-focus-pool-sources.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { RuleElementSource } from "@module/rules/index.ts"; import { sluggify } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/657-remove-set-property.ts b/src/module/migration/migrations/657-remove-set-property.ts index d6c45d7d06a..1c04edab78d 100644 --- a/src/module/migration/migrations/657-remove-set-property.ts +++ b/src/module/migration/migrations/657-remove-set-property.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; import { RuleElementSource, RuleValue } from "@module/rules/rule-element/index.ts"; import { ActorSourcePF2e } from "@actor/data/index.ts"; diff --git a/src/module/migration/migrations/658-monk-unarmored-proficiency.ts b/src/module/migration/migrations/658-monk-unarmored-proficiency.ts index 58665777379..4b78967b837 100644 --- a/src/module/migration/migrations/658-monk-unarmored-proficiency.ts +++ b/src/module/migration/migrations/658-monk-unarmored-proficiency.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { sluggify } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/659-multiple-damage-rows.ts b/src/module/migration/migrations/659-multiple-damage-rows.ts index 5a73b076877..e6a357e06e8 100644 --- a/src/module/migration/migrations/659-multiple-damage-rows.ts +++ b/src/module/migration/migrations/659-multiple-damage-rows.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { SpellDamage, SpellSystemSource } from "@item/spell/data.ts"; import { DamageType } from "@system/damage/index.ts"; import { tupleHasValue } from "@util"; diff --git a/src/module/migration/migrations/660-derived-spell-traits.ts b/src/module/migration/migrations/660-derived-spell-traits.ts index 578ea778591..e2c3a9eb278 100644 --- a/src/module/migration/migrations/660-derived-spell-traits.ts +++ b/src/module/migration/migrations/660-derived-spell-traits.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; import { MAGIC_SCHOOLS, MAGIC_TRADITIONS } from "@item/spell/values.ts"; diff --git a/src/module/migration/migrations/663-fix-spell-damage.ts b/src/module/migration/migrations/663-fix-spell-damage.ts index 1c7f042dcfd..179e38a54fb 100644 --- a/src/module/migration/migrations/663-fix-spell-damage.ts +++ b/src/module/migration/migrations/663-fix-spell-damage.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { SpellSystemSource } from "@item/spell/data.ts"; import { DamageType } from "@system/damage/index.ts"; import { sluggify } from "@util"; diff --git a/src/module/migration/migrations/665-handwraps-corrections.ts b/src/module/migration/migrations/665-handwraps-corrections.ts index 3f25c95a02d..ee5d62747aa 100644 --- a/src/module/migration/migrations/665-handwraps-corrections.ts +++ b/src/module/migration/migrations/665-handwraps-corrections.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { sluggify } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/666-usage-and-stowing-containers.ts b/src/module/migration/migrations/666-usage-and-stowing-containers.ts index 88c3c5180fc..332b78bd2b7 100644 --- a/src/module/migration/migrations/666-usage-and-stowing-containers.ts +++ b/src/module/migration/migrations/666-usage-and-stowing-containers.ts @@ -1,5 +1,5 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; -import { isPhysicalData } from "@item/data/helpers.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; +import { isPhysicalData } from "@item/base/data/helpers.ts"; import { sluggify } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/667-hp-subproperties.ts b/src/module/migration/migrations/667-hp-subproperties.ts index bcf901154bf..b051406f346 100644 --- a/src/module/migration/migrations/667-hp-subproperties.ts +++ b/src/module/migration/migrations/667-hp-subproperties.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { RuleElementSource } from "@module/rules/index.ts"; import { sluggify } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/668-armor-speed-penalty.ts b/src/module/migration/migrations/668-armor-speed-penalty.ts index e9cb06c2611..5b9022e4089 100644 --- a/src/module/migration/migrations/668-armor-speed-penalty.ts +++ b/src/module/migration/migrations/668-armor-speed-penalty.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { RuleElementSource } from "@module/rules/index.ts"; import { sluggify } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/669-npc-attack-effects.ts b/src/module/migration/migrations/669-npc-attack-effects.ts index 3aa40b567ab..65e5932258a 100644 --- a/src/module/migration/migrations/669-npc-attack-effects.ts +++ b/src/module/migration/migrations/669-npc-attack-effects.ts @@ -1,5 +1,5 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; import { sluggify } from "@util"; diff --git a/src/module/migration/migrations/670-ancestry-vision.ts b/src/module/migration/migrations/670-ancestry-vision.ts index c8cc0edda70..67cd8431c46 100644 --- a/src/module/migration/migrations/670-ancestry-vision.ts +++ b/src/module/migration/migrations/670-ancestry-vision.ts @@ -1,6 +1,6 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; import { ABCFeatureEntryData } from "@item/abc/data.ts"; -import { AncestrySource, ItemSourcePF2e } from "@item/data/index.ts"; +import { AncestrySource, ItemSourcePF2e } from "@item/base/data/index.ts"; import { sluggify } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/670-no-custom-trait.ts b/src/module/migration/migrations/670-no-custom-trait.ts index 7c2cbd1cc9e..12b4d247506 100644 --- a/src/module/migration/migrations/670-no-custom-trait.ts +++ b/src/module/migration/migrations/670-no-custom-trait.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Remove the "custom" trait that snuck into item traits */ diff --git a/src/module/migration/migrations/672-remove-npc-base-properties.ts b/src/module/migration/migrations/672-remove-npc-base-properties.ts index 21929b6a77f..b75e76ac773 100644 --- a/src/module/migration/migrations/672-remove-npc-base-properties.ts +++ b/src/module/migration/migrations/672-remove-npc-base-properties.ts @@ -1,6 +1,6 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; import { SAVE_TYPES } from "@actor/values.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Remove the extra `base` subproperty of labeled values on NPCs */ diff --git a/src/module/migration/migrations/673-remove-bulwark-res.ts b/src/module/migration/migrations/673-remove-bulwark-res.ts index ca01dbf738b..16f5dd7a3eb 100644 --- a/src/module/migration/migrations/673-remove-bulwark-res.ts +++ b/src/module/migration/migrations/673-remove-bulwark-res.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; import { isObject, sluggify } from "@util"; import { RuleElementSource } from "@module/rules/index.ts"; diff --git a/src/module/migration/migrations/674-stable-homebrew-tag-ids.ts b/src/module/migration/migrations/674-stable-homebrew-tag-ids.ts index dfe65cb4bec..d765b502266 100644 --- a/src/module/migration/migrations/674-stable-homebrew-tag-ids.ts +++ b/src/module/migration/migrations/674-stable-homebrew-tag-ids.ts @@ -1,5 +1,5 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { HomebrewTag, HOMEBREW_TRAIT_KEYS } from "@system/settings/homebrew/index.ts"; import { sluggify } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/675-flat-modifier-aes-to-res.ts b/src/module/migration/migrations/675-flat-modifier-aes-to-res.ts index 665fa7052fd..f478603e0b6 100644 --- a/src/module/migration/migrations/675-flat-modifier-aes-to-res.ts +++ b/src/module/migration/migrations/675-flat-modifier-aes-to-res.ts @@ -1,5 +1,5 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { ModifierType } from "@actor/modifiers.ts"; import { RuleElementSource } from "@module/rules/index.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/676-replace-items-with-re-like-aes.ts b/src/module/migration/migrations/676-replace-items-with-re-like-aes.ts index 2eaa89a9f9a..e3c8ecc9686 100644 --- a/src/module/migration/migrations/676-replace-items-with-re-like-aes.ts +++ b/src/module/migration/migrations/676-replace-items-with-re-like-aes.ts @@ -1,6 +1,6 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; import { ItemPF2e } from "@item"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { ErrorPF2e } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/677-rule-value-data-refs.ts b/src/module/migration/migrations/677-rule-value-data-refs.ts index 56380b1b231..28619be566a 100644 --- a/src/module/migration/migrations/677-rule-value-data-refs.ts +++ b/src/module/migration/migrations/677-rule-value-data-refs.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Fix Rule Element values reaching for too many datas */ diff --git a/src/module/migration/migrations/678-separate-npc-attack-traits.ts b/src/module/migration/migrations/678-separate-npc-attack-traits.ts index 1cef42b3441..88f311eec8f 100644 --- a/src/module/migration/migrations/678-separate-npc-attack-traits.ts +++ b/src/module/migration/migrations/678-separate-npc-attack-traits.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { RARITIES } from "@module/data.ts"; import { isObject, tupleHasValue } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/679-tower-shield-speed-penalty.ts b/src/module/migration/migrations/679-tower-shield-speed-penalty.ts index 3e89ffa3a0c..c9347d1ebfd 100644 --- a/src/module/migration/migrations/679-tower-shield-speed-penalty.ts +++ b/src/module/migration/migrations/679-tower-shield-speed-penalty.ts @@ -1,4 +1,4 @@ -import { ArmorSource, ItemSourcePF2e } from "@item/data/index.ts"; +import { ArmorSource, ItemSourcePF2e } from "@item/base/data/index.ts"; import { ZeroToFour } from "@module/data.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/680-set-weapon-hands.ts b/src/module/migration/migrations/680-set-weapon-hands.ts index 5b14160af8a..85ad46d0f78 100644 --- a/src/module/migration/migrations/680-set-weapon-hands.ts +++ b/src/module/migration/migrations/680-set-weapon-hands.ts @@ -1,4 +1,4 @@ -import { ArmorSource, ItemSourcePF2e } from "@item/data/index.ts"; +import { ArmorSource, ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Set the "hands" (usage) property of weapons */ diff --git a/src/module/migration/migrations/681-giant-language-to-jotun.ts b/src/module/migration/migrations/681-giant-language-to-jotun.ts index 44478164184..11afc32add6 100644 --- a/src/module/migration/migrations/681-giant-language-to-jotun.ts +++ b/src/module/migration/migrations/681-giant-language-to-jotun.ts @@ -1,5 +1,5 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Replace the "Giant" language with "Jotun" */ diff --git a/src/module/migration/migrations/684-rations-to-consumable.ts b/src/module/migration/migrations/684-rations-to-consumable.ts index 5a129e318b7..c5cebaff051 100644 --- a/src/module/migration/migrations/684-rations-to-consumable.ts +++ b/src/module/migration/migrations/684-rations-to-consumable.ts @@ -1,6 +1,6 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; import { ConsumablePF2e } from "@item"; -import { EquipmentSource, ItemSourcePF2e } from "@item/data/index.ts"; +import { EquipmentSource, ItemSourcePF2e } from "@item/base/data/index.ts"; import { KitEntryData } from "@item/kit/data.ts"; import { ErrorPF2e, isObject } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/685-fix-melee-usage-traits.ts b/src/module/migration/migrations/685-fix-melee-usage-traits.ts index 2b156ed5d4c..472844b5fee 100644 --- a/src/module/migration/migrations/685-fix-melee-usage-traits.ts +++ b/src/module/migration/migrations/685-fix-melee-usage-traits.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { ComboWeaponMeleeUsage } from "@item/weapon/data.ts"; import { WeaponTrait } from "@item/weapon/types.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/687-familiarity-aes-to-res.ts b/src/module/migration/migrations/687-familiarity-aes-to-res.ts index b8f2f3e553a..ffaf914d18d 100644 --- a/src/module/migration/migrations/687-familiarity-aes-to-res.ts +++ b/src/module/migration/migrations/687-familiarity-aes-to-res.ts @@ -1,5 +1,5 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { RuleElementSource } from "@module/rules/index.ts"; import { PredicateStatement } from "@system/predication.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/688-clamp-spell-level.ts b/src/module/migration/migrations/688-clamp-spell-level.ts index 50bf77097a9..6cdb81f26a3 100644 --- a/src/module/migration/migrations/688-clamp-spell-level.ts +++ b/src/module/migration/migrations/688-clamp-spell-level.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { OneToTen } from "@module/data.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/689-encumberance-aes.ts b/src/module/migration/migrations/689-encumberance-aes.ts index 31f3290f857..7f7ce7ec2b8 100644 --- a/src/module/migration/migrations/689-encumberance-aes.ts +++ b/src/module/migration/migrations/689-encumberance-aes.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { RuleElementSource } from "@module/rules/index.ts"; import { sluggify } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/690-tiebreak-items.ts b/src/module/migration/migrations/690-tiebreak-items.ts index 4954c7c7a98..d16845e5cfa 100644 --- a/src/module/migration/migrations/690-tiebreak-items.ts +++ b/src/module/migration/migrations/690-tiebreak-items.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Add AE-likes to certain items that give the owner a higher tiebreak priority */ diff --git a/src/module/migration/migrations/691-weapon-range-ability-category-group.ts b/src/module/migration/migrations/691-weapon-range-ability-category-group.ts index 86631f96adf..356db6a808b 100644 --- a/src/module/migration/migrations/691-weapon-range-ability-category-group.ts +++ b/src/module/migration/migrations/691-weapon-range-ability-category-group.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { WeaponSystemSource } from "@item/weapon/data.ts"; import { WeaponCategory, WeaponGroup, WeaponRangeIncrement } from "@item/weapon/types.ts"; import { MANDATORY_RANGED_GROUPS } from "@item/weapon/values.ts"; diff --git a/src/module/migration/migrations/692-crafting-entry-feat-replacement.ts b/src/module/migration/migrations/692-crafting-entry-feat-replacement.ts index 144d54261d4..5ec7a56ee01 100644 --- a/src/module/migration/migrations/692-crafting-entry-feat-replacement.ts +++ b/src/module/migration/migrations/692-crafting-entry-feat-replacement.ts @@ -1,6 +1,6 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; import { ItemPF2e } from "@item"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { ErrorPF2e } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/693-armor-category-group.ts b/src/module/migration/migrations/693-armor-category-group.ts index ca30731a154..d9d01d77c05 100644 --- a/src/module/migration/migrations/693-armor-category-group.ts +++ b/src/module/migration/migrations/693-armor-category-group.ts @@ -1,6 +1,6 @@ import { ArmorSystemSource } from "@item/armor/data.ts"; import { ArmorCategory, ArmorGroup } from "@item/armor/types.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Normalize armor range to numeric or null, remove ability property, and let's do category and group too! */ diff --git a/src/module/migration/migrations/695-summon-to-summoned.ts b/src/module/migration/migrations/695-summon-to-summoned.ts index 3b63ff60044..df960f48178 100644 --- a/src/module/migration/migrations/695-summon-to-summoned.ts +++ b/src/module/migration/migrations/695-summon-to-summoned.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Change the "summon" creature trait to "summoned", correctly set "summon" trait on npc/hazard actions */ diff --git a/src/module/migration/migrations/696-flat-ability-modifiers.ts b/src/module/migration/migrations/696-flat-ability-modifiers.ts index fe508f20be4..f9ed0097098 100644 --- a/src/module/migration/migrations/696-flat-ability-modifiers.ts +++ b/src/module/migration/migrations/696-flat-ability-modifiers.ts @@ -1,6 +1,6 @@ import { AttributeString } from "@actor/types.ts"; import { ATTRIBUTE_ABBREVIATIONS } from "@actor/values.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { RuleElementSource } from "@module/rules/index.ts"; import { setHasElement, sluggify } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/697-weapon-reach-trait.ts b/src/module/migration/migrations/697-weapon-reach-trait.ts index d854c239367..a3f7debdb4e 100644 --- a/src/module/migration/migrations/697-weapon-reach-trait.ts +++ b/src/module/migration/migrations/697-weapon-reach-trait.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Correct the reach trait on weapons */ diff --git a/src/module/migration/migrations/698-remove-derived-actor-traits.ts b/src/module/migration/migrations/698-remove-derived-actor-traits.ts index ed15e360b3e..e2da744c091 100644 --- a/src/module/migration/migrations/698-remove-derived-actor-traits.ts +++ b/src/module/migration/migrations/698-remove-derived-actor-traits.ts @@ -1,6 +1,6 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; import { ALIGNMENT_TRAITS } from "@actor/creature/values.ts"; -import { AncestrySource } from "@item/data/index.ts"; +import { AncestrySource } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; import { isObject } from "@util"; diff --git a/src/module/migration/migrations/699-item-description-empty-string.ts b/src/module/migration/migrations/699-item-description-empty-string.ts index 34c7c9adcc9..26e01a3609d 100644 --- a/src/module/migration/migrations/699-item-description-empty-string.ts +++ b/src/module/migration/migrations/699-item-description-empty-string.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Fix item descriptions set to `null` by `TextEditor` */ diff --git a/src/module/migration/migrations/700-single-class-features.ts b/src/module/migration/migrations/700-single-class-features.ts index 59e72fdb143..d73ace28f29 100644 --- a/src/module/migration/migrations/700-single-class-features.ts +++ b/src/module/migration/migrations/700-single-class-features.ts @@ -1,5 +1,5 @@ import { ABCFeatureEntryData } from "@item/abc/data.ts"; -import { ClassSource, FeatSource, ItemSourcePF2e } from "@item/data/index.ts"; +import { ClassSource, FeatSource, ItemSourcePF2e } from "@item/base/data/index.ts"; import { isObject, sluggify } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/701-modifier-name-to-slug.ts b/src/module/migration/migrations/701-modifier-name-to-slug.ts index c91cd26d4c4..2ddd06d9fb1 100644 --- a/src/module/migration/migrations/701-modifier-name-to-slug.ts +++ b/src/module/migration/migrations/701-modifier-name-to-slug.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { RuleElementSource } from "@module/rules/index.ts"; import { sluggify } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/702-re-formulas-at-instance-level.ts b/src/module/migration/migrations/702-re-formulas-at-instance-level.ts index ab3d25e023b..ecaae01c6d7 100644 --- a/src/module/migration/migrations/702-re-formulas-at-instance-level.ts +++ b/src/module/migration/migrations/702-re-formulas-at-instance-level.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { RuleElementSource } from "@module/rules/index.ts"; import { isObject } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/703-spell-damage-structure.ts b/src/module/migration/migrations/703-spell-damage-structure.ts index 267577be196..e8af587e856 100644 --- a/src/module/migration/migrations/703-spell-damage-structure.ts +++ b/src/module/migration/migrations/703-spell-damage-structure.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Correct the structure of spell damage in case it slipped past a previous migration */ diff --git a/src/module/migration/migrations/704-martial-proficiency-re.ts b/src/module/migration/migrations/704-martial-proficiency-re.ts index 8cdbcc3e7f9..28e782438e3 100644 --- a/src/module/migration/migrations/704-martial-proficiency-re.ts +++ b/src/module/migration/migrations/704-martial-proficiency-re.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { RuleElementSource } from "@module/rules/index.ts"; import { PredicateStatement } from "@system/predication.ts"; import { sluggify } from "@util"; diff --git a/src/module/migration/migrations/705-gunslinger-catch-up.ts b/src/module/migration/migrations/705-gunslinger-catch-up.ts index b488a1dc6ef..a97e43b872f 100644 --- a/src/module/migration/migrations/705-gunslinger-catch-up.ts +++ b/src/module/migration/migrations/705-gunslinger-catch-up.ts @@ -1,4 +1,4 @@ -import { FeatSource, ItemSourcePF2e } from "@item/data/index.ts"; +import { FeatSource, ItemSourcePF2e } from "@item/base/data/index.ts"; import { isObject } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/706-formulas-at-instance-level-everything-else.ts b/src/module/migration/migrations/706-formulas-at-instance-level-everything-else.ts index e05371b7cb9..43d1183e2b1 100644 --- a/src/module/migration/migrations/706-formulas-at-instance-level-everything-else.ts +++ b/src/module/migration/migrations/706-formulas-at-instance-level-everything-else.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { Migration702REFormulasAtInstanceLevel } from "./702-re-formulas-at-instance-level.ts"; /** Change RE formula data replacement to operate at actor and item instance levels */ diff --git a/src/module/migration/migrations/708-specific-rule-label.ts b/src/module/migration/migrations/708-specific-rule-label.ts index b7b06317e55..fc85dbd35ef 100644 --- a/src/module/migration/migrations/708-specific-rule-label.ts +++ b/src/module/migration/migrations/708-specific-rule-label.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; export class Migration708SpecificRuleLabel extends MigrationBase { diff --git a/src/module/migration/migrations/709-re-formulas-at-instance-level-redux.ts b/src/module/migration/migrations/709-re-formulas-at-instance-level-redux.ts index 494debf598f..de1f5277b1b 100644 --- a/src/module/migration/migrations/709-re-formulas-at-instance-level-redux.ts +++ b/src/module/migration/migrations/709-re-formulas-at-instance-level-redux.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { isObject } from "@util"; import { Migration702REFormulasAtInstanceLevel } from "./702-re-formulas-at-instance-level.ts"; diff --git a/src/module/migration/migrations/710-rarity-to-string.ts b/src/module/migration/migrations/710-rarity-to-string.ts index f154da5558f..adfc7ad66d1 100644 --- a/src/module/migration/migrations/710-rarity-to-string.ts +++ b/src/module/migration/migrations/710-rarity-to-string.ts @@ -1,5 +1,5 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; export class Migration710RarityToString extends MigrationBase { diff --git a/src/module/migration/migrations/711-heritage-items.ts b/src/module/migration/migrations/711-heritage-items.ts index 66114daa5a6..a667ab2b231 100644 --- a/src/module/migration/migrations/711-heritage-items.ts +++ b/src/module/migration/migrations/711-heritage-items.ts @@ -1,7 +1,7 @@ import { CharacterDetailsSource } from "@actor/character/data.ts"; import { CreatureTrait } from "@actor/creature/types.ts"; import { ActorSourcePF2e } from "@actor/data/index.ts"; -import { FeatSource, ItemSourcePF2e } from "@item/data/index.ts"; +import { FeatSource, ItemSourcePF2e } from "@item/base/data/index.ts"; import { FeatSystemSource } from "@item/feat/data.ts"; import { HeritageSource, HeritageSystemSource } from "@item/heritage/data.ts"; import { Rarity } from "@module/data.ts"; diff --git a/src/module/migration/migrations/713-fist-to-strike-re.ts b/src/module/migration/migrations/713-fist-to-strike-re.ts index 0efcc875ec5..ee6f5082f38 100644 --- a/src/module/migration/migrations/713-fist-to-strike-re.ts +++ b/src/module/migration/migrations/713-fist-to-strike-re.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Grant an extra fist attack from the "Powerful Fist" and "Martial Artist Dedication" items */ diff --git a/src/module/migration/migrations/714-range-increment-res.ts b/src/module/migration/migrations/714-range-increment-res.ts index bbdb5b101e9..7cace40c4cc 100644 --- a/src/module/migration/migrations/714-range-increment-res.ts +++ b/src/module/migration/migrations/714-range-increment-res.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { RuleElementSource } from "@module/rules/index.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/715-dangerous-sorcery.ts b/src/module/migration/migrations/715-dangerous-sorcery.ts index e4fcee66a85..049854fec16 100644 --- a/src/module/migration/migrations/715-dangerous-sorcery.ts +++ b/src/module/migration/migrations/715-dangerous-sorcery.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { sluggify } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/716-strike-damage-selector.ts b/src/module/migration/migrations/716-strike-damage-selector.ts index f6d1ffb7fcd..0eb7ccb5f57 100644 --- a/src/module/migration/migrations/716-strike-damage-selector.ts +++ b/src/module/migration/migrations/716-strike-damage-selector.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { isObject } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/717-take-feat-limits.ts b/src/module/migration/migrations/717-take-feat-limits.ts index 6df7f742c04..6477f7dec8e 100644 --- a/src/module/migration/migrations/717-take-feat-limits.ts +++ b/src/module/migration/migrations/717-take-feat-limits.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Indicate whether a feat must be taken at level 1 or may only be taken a limited number of times */ diff --git a/src/module/migration/migrations/718-carry-type.ts b/src/module/migration/migrations/718-carry-type.ts index dd137584809..f732dd27a30 100644 --- a/src/module/migration/migrations/718-carry-type.ts +++ b/src/module/migration/migrations/718-carry-type.ts @@ -1,5 +1,5 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; -import { isPhysicalData } from "@item/data/helpers.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; +import { isPhysicalData } from "@item/base/data/helpers.ts"; import { MigrationBase } from "../base.ts"; import { ActorSourcePF2e } from "@actor/data/index.ts"; import { EquippedData } from "@item/physical/data.ts"; diff --git a/src/module/migration/migrations/719-shrug-flanking.ts b/src/module/migration/migrations/719-shrug-flanking.ts index 9d0510b89ec..6a9a26e428b 100644 --- a/src/module/migration/migrations/719-shrug-flanking.ts +++ b/src/module/migration/migrations/719-shrug-flanking.ts @@ -1,6 +1,6 @@ import { RuleElementSource } from "@module/rules/index.ts"; import { MigrationBase } from "../base.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { ActorSourcePF2e } from "@actor/data/index.ts"; import { AELikeSource } from "@module/rules/rule-element/ae-like.ts"; diff --git a/src/module/migration/migrations/720-update-spell-descriptions.ts b/src/module/migration/migrations/720-update-spell-descriptions.ts index 715e94a6db9..b614fec1573 100644 --- a/src/module/migration/migrations/720-update-spell-descriptions.ts +++ b/src/module/migration/migrations/720-update-spell-descriptions.ts @@ -1,5 +1,5 @@ import { MigrationBase } from "../base.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { SpellPF2e } from "@item"; import { UUIDUtils } from "@util/uuid.ts"; import { setHasElement } from "@util"; diff --git a/src/module/migration/migrations/721-set-reload-values.ts b/src/module/migration/migrations/721-set-reload-values.ts index 10722ce2f21..713d68020f8 100644 --- a/src/module/migration/migrations/721-set-reload-values.ts +++ b/src/module/migration/migrations/721-set-reload-values.ts @@ -1,6 +1,6 @@ import { MigrationBase } from "../base.ts"; import { setHasElement } from "@util"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; /** Set a reload of value of 0 to several weapons that had no reload */ export class Migration721SetReloadValues extends MigrationBase { diff --git a/src/module/migration/migrations/723-cumulative-item-bonuses.ts b/src/module/migration/migrations/723-cumulative-item-bonuses.ts index 3e644103085..c3e3052d9bb 100644 --- a/src/module/migration/migrations/723-cumulative-item-bonuses.ts +++ b/src/module/migration/migrations/723-cumulative-item-bonuses.ts @@ -1,6 +1,6 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; import { FeatPF2e } from "@item"; -import { EffectSource, ItemSourcePF2e } from "@item/data/index.ts"; +import { EffectSource, ItemSourcePF2e } from "@item/base/data/index.ts"; import { UUIDUtils } from "@util/uuid.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/724-crafting-max-item-level.ts b/src/module/migration/migrations/724-crafting-max-item-level.ts index 248856a70ad..21b3c5d3892 100644 --- a/src/module/migration/migrations/724-crafting-max-item-level.ts +++ b/src/module/migration/migrations/724-crafting-max-item-level.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { RuleElementSource } from "@module/rules/index.ts"; import { AELikeSource } from "@module/rules/rule-element/ae-like.ts"; import { PredicateStatement } from "@system/predication.ts"; diff --git a/src/module/migration/migrations/725-quick-climb-rule-elements.ts b/src/module/migration/migrations/725-quick-climb-rule-elements.ts index 628c98494bf..b27e49e7d09 100644 --- a/src/module/migration/migrations/725-quick-climb-rule-elements.ts +++ b/src/module/migration/migrations/725-quick-climb-rule-elements.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { RuleElementSource } from "@module/rules/index.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/727-trim-self-roll-options.ts b/src/module/migration/migrations/727-trim-self-roll-options.ts index b3a5c17785e..e8c8a222a7d 100644 --- a/src/module/migration/migrations/727-trim-self-roll-options.ts +++ b/src/module/migration/migrations/727-trim-self-roll-options.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { RuleElementSource } from "@module/rules/index.ts"; import { isObject } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/728-flatten-physical-properties.ts b/src/module/migration/migrations/728-flatten-physical-properties.ts index a568367bfd8..aedabda2519 100644 --- a/src/module/migration/migrations/728-flatten-physical-properties.ts +++ b/src/module/migration/migrations/728-flatten-physical-properties.ts @@ -1,5 +1,5 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; -import { isPhysicalData } from "@item/data/helpers.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; +import { isPhysicalData } from "@item/base/data/helpers.ts"; import { Size, SIZES, ValueAndMax } from "@module/data.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/729-cumulative-item-bonus-cleanup.ts b/src/module/migration/migrations/729-cumulative-item-bonus-cleanup.ts index bd954e332c1..eeed5c64cca 100644 --- a/src/module/migration/migrations/729-cumulative-item-bonus-cleanup.ts +++ b/src/module/migration/migrations/729-cumulative-item-bonus-cleanup.ts @@ -1,4 +1,4 @@ -import { ArmorSource, ItemSourcePF2e } from "@item/data/index.ts"; +import { ArmorSource, ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Clean up after bug overhauling cumulative item bonuses */ diff --git a/src/module/migration/migrations/730-derune-handwraps.ts b/src/module/migration/migrations/730-derune-handwraps.ts index 5f346bafef3..32ac98236e7 100644 --- a/src/module/migration/migrations/730-derune-handwraps.ts +++ b/src/module/migration/migrations/730-derune-handwraps.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Remove Potency and Striking rule elements from handwraps of mighty blows */ diff --git a/src/module/migration/migrations/731-toggle-property-to-roll-option.ts b/src/module/migration/migrations/731-toggle-property-to-roll-option.ts index 9b8f6ee01df..229e2e5876f 100644 --- a/src/module/migration/migrations/731-toggle-property-to-roll-option.ts +++ b/src/module/migration/migrations/731-toggle-property-to-roll-option.ts @@ -1,5 +1,5 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { RuleElementSource } from "@module/rules/index.ts"; import { sluggify } from "@util"; import { Migration727TrimSelfRollOptions } from "./727-trim-self-roll-options.ts"; diff --git a/src/module/migration/migrations/732-fix-dedication-feat-types.ts b/src/module/migration/migrations/732-fix-dedication-feat-types.ts index 33e023a9f73..0174c48638a 100644 --- a/src/module/migration/migrations/732-fix-dedication-feat-types.ts +++ b/src/module/migration/migrations/732-fix-dedication-feat-types.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { FeatSystemSource } from "@item/feat/data.ts"; import { isObject } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/733-item-bonus-from-equipment.ts b/src/module/migration/migrations/733-item-bonus-from-equipment.ts index 0badb3658a9..79492b86782 100644 --- a/src/module/migration/migrations/733-item-bonus-from-equipment.ts +++ b/src/module/migration/migrations/733-item-bonus-from-equipment.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { RuleElementSource } from "@module/rules/index.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/734-spell-location-props-and-signature.ts b/src/module/migration/migrations/734-spell-location-props-and-signature.ts index 207d55fb5c5..0bd04641138 100644 --- a/src/module/migration/migrations/734-spell-location-props-and-signature.ts +++ b/src/module/migration/migrations/734-spell-location-props-and-signature.ts @@ -1,5 +1,5 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { SpellSource, SpellSystemSource } from "@item/spell/data.ts"; import { SpellcastingEntrySource, SpellcastingEntrySystemSource } from "@item/spellcasting-entry/data.ts"; import { OneToTen } from "@module/data.ts"; diff --git a/src/module/migration/migrations/735-firearm-ammo-alchemical.ts b/src/module/migration/migrations/735-firearm-ammo-alchemical.ts index a7377d33ad6..4954d0fb86f 100644 --- a/src/module/migration/migrations/735-firearm-ammo-alchemical.ts +++ b/src/module/migration/migrations/735-firearm-ammo-alchemical.ts @@ -1,4 +1,4 @@ -import { ConsumableSource, ItemSourcePF2e } from "@item/data/index.ts"; +import { ConsumableSource, ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Add the "alchemical" trait to all firearm ammunition */ diff --git a/src/module/migration/migrations/736-remove-broken-threshold.ts b/src/module/migration/migrations/736-remove-broken-threshold.ts index 644051b50f8..1d048ffa298 100644 --- a/src/module/migration/migrations/736-remove-broken-threshold.ts +++ b/src/module/migration/migrations/736-remove-broken-threshold.ts @@ -1,5 +1,5 @@ -import { ItemSourcePF2e, PhysicalItemSource } from "@item/data/index.ts"; -import { isPhysicalData } from "@item/data/helpers.ts"; +import { ItemSourcePF2e, PhysicalItemSource } from "@item/base/data/index.ts"; +import { isPhysicalData } from "@item/base/data/helpers.ts"; import { MigrationBase } from "../base.ts"; /** Remove brokenThreshold property left undeleted in `Migration728FlattenPhysicalProperties` */ diff --git a/src/module/migration/migrations/737-normalize-re-keys.ts b/src/module/migration/migrations/737-normalize-re-keys.ts index fee85590b8f..042447b24b3 100644 --- a/src/module/migration/migrations/737-normalize-re-keys.ts +++ b/src/module/migration/migrations/737-normalize-re-keys.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { isObject } from "@util"; import { Migration731TogglePropertyToRollOption } from "./731-toggle-property-to-roll-option.ts"; diff --git a/src/module/migration/migrations/738-update-laughing-shadow.ts b/src/module/migration/migrations/738-update-laughing-shadow.ts index f4b8b163d37..19c78899f29 100644 --- a/src/module/migration/migrations/738-update-laughing-shadow.ts +++ b/src/module/migration/migrations/738-update-laughing-shadow.ts @@ -1,6 +1,6 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; import { ItemPF2e } from "@item"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { RuleElementSource } from "@module/rules/index.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/739-recovery-check-dc.ts b/src/module/migration/migrations/739-recovery-check-dc.ts index dc598b0c8c4..630ba1f9012 100644 --- a/src/module/migration/migrations/739-recovery-check-dc.ts +++ b/src/module/migration/migrations/739-recovery-check-dc.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; export class Migration739RecoveryCheckDC extends MigrationBase { diff --git a/src/module/migration/migrations/740-fix-max-takable.ts b/src/module/migration/migrations/740-fix-max-takable.ts index 7fe6c4d2512..63e3c58c420 100644 --- a/src/module/migration/migrations/740-fix-max-takable.ts +++ b/src/module/migration/migrations/740-fix-max-takable.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { FeatSystemSource } from "@item/feat/data.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/742-rm-class-ability-boost-levels.ts b/src/module/migration/migrations/742-rm-class-ability-boost-levels.ts index bddc3febf6c..c4b69c80732 100644 --- a/src/module/migration/migrations/742-rm-class-ability-boost-levels.ts +++ b/src/module/migration/migrations/742-rm-class-ability-boost-levels.ts @@ -1,5 +1,5 @@ import { ClassSystemData } from "@item/class/data.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Remove ability boost levels data from class items */ diff --git a/src/module/migration/migrations/744-migrate-spell-heighten.ts b/src/module/migration/migrations/744-migrate-spell-heighten.ts index 8c0ee691e39..260d3be8a93 100644 --- a/src/module/migration/migrations/744-migrate-spell-heighten.ts +++ b/src/module/migration/migrations/744-migrate-spell-heighten.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { SpellSystemSource } from "@item/spell/data.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/745-effect-target-to-choice-set.ts b/src/module/migration/migrations/745-effect-target-to-choice-set.ts index c2b04de726f..5c1c7ecf2e4 100644 --- a/src/module/migration/migrations/745-effect-target-to-choice-set.ts +++ b/src/module/migration/migrations/745-effect-target-to-choice-set.ts @@ -1,5 +1,5 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; -import { ItemSourcePF2e, WeaponSource } from "@item/data/index.ts"; +import { ItemSourcePF2e, WeaponSource } from "@item/base/data/index.ts"; import { RuleElementSource } from "@module/rules/index.ts"; import { ChoiceSetSchema } from "@module/rules/rule-element/choice-set/data.ts"; import { PredicateStatement } from "@system/predication.ts"; diff --git a/src/module/migration/migrations/746-standardize-pricing.ts b/src/module/migration/migrations/746-standardize-pricing.ts index f24411606f8..59d54c6dfef 100644 --- a/src/module/migration/migrations/746-standardize-pricing.ts +++ b/src/module/migration/migrations/746-standardize-pricing.ts @@ -1,5 +1,5 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; -import { isPhysicalData } from "@item/data/helpers.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; +import { isPhysicalData } from "@item/base/data/helpers.ts"; import { TreasureSystemSource } from "@item/treasure/data.ts"; import { CoinsPF2e } from "@item/physical/helpers.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/747-fixed-heightening.ts b/src/module/migration/migrations/747-fixed-heightening.ts index 12b62e1091b..459fb1d2cd7 100644 --- a/src/module/migration/migrations/747-fixed-heightening.ts +++ b/src/module/migration/migrations/747-fixed-heightening.ts @@ -1,5 +1,5 @@ import { SpellPF2e } from "@item"; -import { ItemSourcePF2e, SpellSource } from "@item/data/index.ts"; +import { ItemSourcePF2e, SpellSource } from "@item/base/data/index.ts"; import { sluggify } from "@util"; import { UUIDUtils } from "@util/uuid.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/748-batch-consumable-pricing.ts b/src/module/migration/migrations/748-batch-consumable-pricing.ts index 394f992be4c..75cb53db5fb 100644 --- a/src/module/migration/migrations/748-batch-consumable-pricing.ts +++ b/src/module/migration/migrations/748-batch-consumable-pricing.ts @@ -1,5 +1,5 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; -import { isPhysicalData } from "@item/data/helpers.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; +import { isPhysicalData } from "@item/base/data/helpers.ts"; import { sluggify } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/749-assurance-res.ts b/src/module/migration/migrations/749-assurance-res.ts index 4e37c5ff15e..7aebc095d90 100644 --- a/src/module/migration/migrations/749-assurance-res.ts +++ b/src/module/migration/migrations/749-assurance-res.ts @@ -1,6 +1,6 @@ import { SkillLongForm } from "@actor/types.ts"; import { SKILL_LONG_FORMS } from "@actor/values.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { RuleElementSource } from "@module/rules/index.ts"; import { ChoiceSetSource } from "@module/rules/rule-element/choice-set/data.ts"; import { setHasElement } from "@util"; diff --git a/src/module/migration/migrations/750-fix-corrupted-price.ts b/src/module/migration/migrations/750-fix-corrupted-price.ts index 26f8477ca4e..4c9f4f3e79c 100644 --- a/src/module/migration/migrations/750-fix-corrupted-price.ts +++ b/src/module/migration/migrations/750-fix-corrupted-price.ts @@ -1,5 +1,5 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; -import { isPhysicalData } from "@item/data/helpers.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; +import { isPhysicalData } from "@item/base/data/helpers.ts"; import { CoinsPF2e } from "@item/physical/helpers.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/752-strike-vs-weapon-traits.ts b/src/module/migration/migrations/752-strike-vs-weapon-traits.ts index 3501c506ea4..4e2b6fb414f 100644 --- a/src/module/migration/migrations/752-strike-vs-weapon-traits.ts +++ b/src/module/migration/migrations/752-strike-vs-weapon-traits.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { RuleElementSource } from "@module/rules/index.ts"; import { weaponTraits } from "@scripts/config/traits.ts"; import { objectHasKey } from "@util"; diff --git a/src/module/migration/migrations/753-weapon-reload-times.ts b/src/module/migration/migrations/753-weapon-reload-times.ts index 640a0d1e382..9ee8470e158 100644 --- a/src/module/migration/migrations/753-weapon-reload-times.ts +++ b/src/module/migration/migrations/753-weapon-reload-times.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e, WeaponSource } from "@item/data/index.ts"; +import { ItemSourcePF2e, WeaponSource } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Ensure "backpack" weapons and alchemical bombs have correct reload times */ diff --git a/src/module/migration/migrations/754-mighty-bulwark-adjust-modifiers.ts b/src/module/migration/migrations/754-mighty-bulwark-adjust-modifiers.ts index f5e7f0548d0..6adf4d5d243 100644 --- a/src/module/migration/migrations/754-mighty-bulwark-adjust-modifiers.ts +++ b/src/module/migration/migrations/754-mighty-bulwark-adjust-modifiers.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Add Adjust Modifier REs to Mighty Bulwark to suppress dexterity and standard bulwark modifiers */ diff --git a/src/module/migration/migrations/755-grant-ids-to-data.ts b/src/module/migration/migrations/755-grant-ids-to-data.ts index f0dcda2bd98..c04889387b6 100644 --- a/src/module/migration/migrations/755-grant-ids-to-data.ts +++ b/src/module/migration/migrations/755-grant-ids-to-data.ts @@ -1,5 +1,5 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; -import { ItemGrantSource } from "@item/data/base.ts"; +import { ItemGrantSource } from "@item/base/data/system.ts"; import { MigrationBase } from "../base.ts"; /** Convert grant flags containing IDs to `ItemGrantData` objects */ diff --git a/src/module/migration/migrations/757-hillock-halfling.ts b/src/module/migration/migrations/757-hillock-halfling.ts index 330f2d5eabd..9e711b04484 100644 --- a/src/module/migration/migrations/757-hillock-halfling.ts +++ b/src/module/migration/migrations/757-hillock-halfling.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { RuleElementSource } from "@module/rules/index.ts"; import { sluggify } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/759-crit-spec-re.ts b/src/module/migration/migrations/759-crit-spec-re.ts index 6478beb7bae..6e080765b09 100644 --- a/src/module/migration/migrations/759-crit-spec-re.ts +++ b/src/module/migration/migrations/759-crit-spec-re.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Replace critical specialization roll notes with CritSpec RE */ diff --git a/src/module/migration/migrations/760-separate-note-title.ts b/src/module/migration/migrations/760-separate-note-title.ts index fb6088fe61c..5ad18b69f01 100644 --- a/src/module/migration/migrations/760-separate-note-title.ts +++ b/src/module/migration/migrations/760-separate-note-title.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { RuleElementSource } from "@module/rules/index.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/761-update-shot-rules.ts b/src/module/migration/migrations/761-update-shot-rules.ts index afe977dc80d..e472b340e8f 100644 --- a/src/module/migration/migrations/761-update-shot-rules.ts +++ b/src/module/migration/migrations/761-update-shot-rules.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Update rule elements on Double Shot, Triple Shot, and Stance: Multishot Stance */ diff --git a/src/module/migration/migrations/762-update-background-items.ts b/src/module/migration/migrations/762-update-background-items.ts index af7783a20c5..1560cfd6553 100644 --- a/src/module/migration/migrations/762-update-background-items.ts +++ b/src/module/migration/migrations/762-update-background-items.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Add missing third boost from a pair of backgrounds */ diff --git a/src/module/migration/migrations/763-restore-animal-strike-options.ts b/src/module/migration/migrations/763-restore-animal-strike-options.ts index ca370e42425..9d93321f789 100644 --- a/src/module/migration/migrations/763-restore-animal-strike-options.ts +++ b/src/module/migration/migrations/763-restore-animal-strike-options.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { RuleElementSource } from "@module/rules/index.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/764-panache-vivacious-res.ts b/src/module/migration/migrations/764-panache-vivacious-res.ts index fa5221d51f2..d8ee298e4da 100644 --- a/src/module/migration/migrations/764-panache-vivacious-res.ts +++ b/src/module/migration/migrations/764-panache-vivacious-res.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { RuleElementSource } from "@module/rules/index.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/765-choice-owned-item-types.ts b/src/module/migration/migrations/765-choice-owned-item-types.ts index 253402cb28e..4bc6d3a6d21 100644 --- a/src/module/migration/migrations/765-choice-owned-item-types.ts +++ b/src/module/migration/migrations/765-choice-owned-item-types.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { ChoiceSetOwnedItems } from "@module/rules/rule-element/choice-set/data.ts"; import { isObject } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/766-wipe-url-sources.ts b/src/module/migration/migrations/766-wipe-url-sources.ts index 6246594d15a..05d53386507 100644 --- a/src/module/migration/migrations/766-wipe-url-sources.ts +++ b/src/module/migration/migrations/766-wipe-url-sources.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { isObject } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/767-convert-voluntary-flaws.ts b/src/module/migration/migrations/767-convert-voluntary-flaws.ts index bb61b86f607..70a68a90d37 100644 --- a/src/module/migration/migrations/767-convert-voluntary-flaws.ts +++ b/src/module/migration/migrations/767-convert-voluntary-flaws.ts @@ -1,6 +1,6 @@ import { AttributeString } from "@actor/types.ts"; import { AncestrySystemData } from "@item/ancestry/data.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; export class Migration767ConvertVoluntaryFlaws extends MigrationBase { diff --git a/src/module/migration/migrations/768-add-new-auras.ts b/src/module/migration/migrations/768-add-new-auras.ts index 5c9adf9532a..0b2b345018c 100644 --- a/src/module/migration/migrations/768-add-new-auras.ts +++ b/src/module/migration/migrations/768-add-new-auras.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Add the new Aura rule element to the Marshal Dedication feat */ diff --git a/src/module/migration/migrations/769-no-universalist-focus-pool.ts b/src/module/migration/migrations/769-no-universalist-focus-pool.ts index 33429304ad3..73ac4638b62 100644 --- a/src/module/migration/migrations/769-no-universalist-focus-pool.ts +++ b/src/module/migration/migrations/769-no-universalist-focus-pool.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { RuleElementSource } from "@module/rules/index.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/770-re-data-to-system.ts b/src/module/migration/migrations/770-re-data-to-system.ts index 4f141181715..701c0107b3b 100644 --- a/src/module/migration/migrations/770-re-data-to-system.ts +++ b/src/module/migration/migrations/770-re-data-to-system.ts @@ -1,5 +1,5 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { recursiveReplaceString } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/771-spell-variants-to-system.ts b/src/module/migration/migrations/771-spell-variants-to-system.ts index b969f5508f5..30284010a70 100644 --- a/src/module/migration/migrations/771-spell-variants-to-system.ts +++ b/src/module/migration/migrations/771-spell-variants-to-system.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { SpellOverlayOverride } from "@item/spell/data.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/772-v10-embedded-spell-data.ts b/src/module/migration/migrations/772-v10-embedded-spell-data.ts index bd8c39ffe3c..cef55f919d7 100644 --- a/src/module/migration/migrations/772-v10-embedded-spell-data.ts +++ b/src/module/migration/migrations/772-v10-embedded-spell-data.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e, SpellSource } from "@item/data/index.ts"; +import { ItemSourcePF2e, SpellSource } from "@item/base/data/index.ts"; import { SpellSystemSource } from "@item/spell/data.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/773-religious-symbol-usage.ts b/src/module/migration/migrations/773-religious-symbol-usage.ts index f65cb3ecee2..be198bb8ec8 100644 --- a/src/module/migration/migrations/773-religious-symbol-usage.ts +++ b/src/module/migration/migrations/773-religious-symbol-usage.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Change `usage` of religious symbols to "held-in-one-hand" */ diff --git a/src/module/migration/migrations/774-unpersist-crafting-entries.ts b/src/module/migration/migrations/774-unpersist-crafting-entries.ts index 2beaa8f1969..f4d55ef366c 100644 --- a/src/module/migration/migrations/774-unpersist-crafting-entries.ts +++ b/src/module/migration/migrations/774-unpersist-crafting-entries.ts @@ -1,6 +1,6 @@ import { CraftingEntryData, CraftingFormulaData } from "@actor/character/crafting/index.ts"; import { ActorSourcePF2e } from "@actor/data/index.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { PhysicalItemTrait } from "@item/physical/data.ts"; import { RuleElementSource } from "@module/rules/index.ts"; import { PredicateStatement } from "@system/predication.ts"; diff --git a/src/module/migration/migrations/775-agile-finesse-ranged.ts b/src/module/migration/migrations/775-agile-finesse-ranged.ts index 2540d19bddd..6140e0b2fbf 100644 --- a/src/module/migration/migrations/775-agile-finesse-ranged.ts +++ b/src/module/migration/migrations/775-agile-finesse-ranged.ts @@ -1,4 +1,4 @@ -import { FeatSource, ItemSourcePF2e } from "@item/data/index.ts"; +import { FeatSource, ItemSourcePF2e } from "@item/base/data/index.ts"; import { RuleElementSource } from "@module/rules/index.ts"; import { PredicateStatement } from "@system/predication.ts"; import { isObject } from "@util"; diff --git a/src/module/migration/migrations/776-sluggify-condition-overrides.ts b/src/module/migration/migrations/776-sluggify-condition-overrides.ts index 27e6207e005..ff80fe3956d 100644 --- a/src/module/migration/migrations/776-sluggify-condition-overrides.ts +++ b/src/module/migration/migrations/776-sluggify-condition-overrides.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { sluggify } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/777-hand-of-the-apprentice.ts b/src/module/migration/migrations/777-hand-of-the-apprentice.ts index 3431d07d460..aa2c6f96092 100644 --- a/src/module/migration/migrations/777-hand-of-the-apprentice.ts +++ b/src/module/migration/migrations/777-hand-of-the-apprentice.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { AELikeSource } from "@module/rules/rule-element/ae-like.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/778-rename-feature-effects-refs.ts b/src/module/migration/migrations/778-rename-feature-effects-refs.ts index 56dd1d1a2dc..c431e001707 100644 --- a/src/module/migration/migrations/778-rename-feature-effects-refs.ts +++ b/src/module/migration/migrations/778-rename-feature-effects-refs.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { recursiveReplaceString } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/781-suppress-no-crowbar.ts b/src/module/migration/migrations/781-suppress-no-crowbar.ts index 706e44cf5da..d0eaa805a7e 100644 --- a/src/module/migration/migrations/781-suppress-no-crowbar.ts +++ b/src/module/migration/migrations/781-suppress-no-crowbar.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Suppress the "no-crowbar" penalty applied to the Force Open action */ diff --git a/src/module/migration/migrations/783-remove-class-skill-ae-likes.ts b/src/module/migration/migrations/783-remove-class-skill-ae-likes.ts index 3dcedba6b05..ad375bd8fe9 100644 --- a/src/module/migration/migrations/783-remove-class-skill-ae-likes.ts +++ b/src/module/migration/migrations/783-remove-class-skill-ae-likes.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { RuleElementSource } from "@module/rules/index.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/785-abc-kit-items.ts b/src/module/migration/migrations/785-abc-kit-items.ts index e2a4a4411b8..730912292f1 100644 --- a/src/module/migration/migrations/785-abc-kit-items.ts +++ b/src/module/migration/migrations/785-abc-kit-items.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { KitEntryData } from "@item/kit/data.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/786-remove-identified-data.ts b/src/module/migration/migrations/786-remove-identified-data.ts index e47cad495b4..6e4f5d9e778 100644 --- a/src/module/migration/migrations/786-remove-identified-data.ts +++ b/src/module/migration/migrations/786-remove-identified-data.ts @@ -1,5 +1,5 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; -import { isPhysicalData } from "@item/data/helpers.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; +import { isPhysicalData } from "@item/base/data/helpers.ts"; import { IdentificationStatus } from "@item/physical/data.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/787-resolvables-to-system.ts b/src/module/migration/migrations/787-resolvables-to-system.ts index 293b77a7356..8f45e3ff4e6 100644 --- a/src/module/migration/migrations/787-resolvables-to-system.ts +++ b/src/module/migration/migrations/787-resolvables-to-system.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { recursiveReplaceString } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/788-update-tanglefoot-bags.ts b/src/module/migration/migrations/788-update-tanglefoot-bags.ts index 7714634129d..023c9d9d7c0 100644 --- a/src/module/migration/migrations/788-update-tanglefoot-bags.ts +++ b/src/module/migration/migrations/788-update-tanglefoot-bags.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { RuleElementSource } from "@module/rules/index.ts"; import { DegreeOfSuccessString } from "@system/degree-of-success.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/789-update-precise-strike.ts b/src/module/migration/migrations/789-update-precise-strike.ts index 624bed57c5b..6810f4d8937 100644 --- a/src/module/migration/migrations/789-update-precise-strike.ts +++ b/src/module/migration/migrations/789-update-precise-strike.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { RuleElementSource } from "@module/rules/index.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/790-multiple-class-dcs.ts b/src/module/migration/migrations/790-multiple-class-dcs.ts index d55ad1d5a9d..a3a1ea15479 100644 --- a/src/module/migration/migrations/790-multiple-class-dcs.ts +++ b/src/module/migration/migrations/790-multiple-class-dcs.ts @@ -1,5 +1,5 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; -import { FeatSource, ItemSourcePF2e } from "@item/data/index.ts"; +import { FeatSource, ItemSourcePF2e } from "@item/base/data/index.ts"; import { RuleElementSource } from "@module/rules/index.ts"; import { AELikeSource } from "@module/rules/rule-element/ae-like.ts"; import { isObject } from "@util"; diff --git a/src/module/migration/migrations/791-ruffian-hands.ts b/src/module/migration/migrations/791-ruffian-hands.ts index e80c39925f5..e444691d73e 100644 --- a/src/module/migration/migrations/791-ruffian-hands.ts +++ b/src/module/migration/migrations/791-ruffian-hands.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { RuleElementSource } from "@module/rules/index.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/792-remove-token-ae-likes.ts b/src/module/migration/migrations/792-remove-token-ae-likes.ts index 094defafb4f..b271b04c416 100644 --- a/src/module/migration/migrations/792-remove-token-ae-likes.ts +++ b/src/module/migration/migrations/792-remove-token-ae-likes.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { RuleElementSource } from "@module/rules/index.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/793-make-predicates-arrays.ts b/src/module/migration/migrations/793-make-predicates-arrays.ts index d5938ed5e17..9c434eff670 100644 --- a/src/module/migration/migrations/793-make-predicates-arrays.ts +++ b/src/module/migration/migrations/793-make-predicates-arrays.ts @@ -1,5 +1,5 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { RuleElementSource } from "@module/rules/index.ts"; import { PredicateStatement, RawPredicate } from "@system/predication.ts"; import { isObject } from "@util"; diff --git a/src/module/migration/migrations/794-add-wild-shape-choices.ts b/src/module/migration/migrations/794-add-wild-shape-choices.ts index 7c796bb31ee..9810261caa6 100644 --- a/src/module/migration/migrations/794-add-wild-shape-choices.ts +++ b/src/module/migration/migrations/794-add-wild-shape-choices.ts @@ -1,5 +1,5 @@ import { FeatPF2e } from "@item"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Add AE-likes forming a UUID choice set for Wild Shape effect */ diff --git a/src/module/migration/migrations/795-cleanup-flat-footed-toggle.ts b/src/module/migration/migrations/795-cleanup-flat-footed-toggle.ts index 6098574e17a..c633fef4e02 100644 --- a/src/module/migration/migrations/795-cleanup-flat-footed-toggle.ts +++ b/src/module/migration/migrations/795-cleanup-flat-footed-toggle.ts @@ -1,5 +1,5 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { RuleElementSource } from "@module/rules/index.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/796-item-grants-to-objects.ts b/src/module/migration/migrations/796-item-grants-to-objects.ts index 94f007c3f16..7cc4e8a5338 100644 --- a/src/module/migration/migrations/796-item-grants-to-objects.ts +++ b/src/module/migration/migrations/796-item-grants-to-objects.ts @@ -1,6 +1,6 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; -import { ItemGrantSource } from "@item/data/base.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; +import { ItemGrantSource } from "@item/base/data/system.ts"; import { sluggify } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/798-weapon-to-item-statements.ts b/src/module/migration/migrations/798-weapon-to-item-statements.ts index d9d1d46d537..70f1e14bf32 100644 --- a/src/module/migration/migrations/798-weapon-to-item-statements.ts +++ b/src/module/migration/migrations/798-weapon-to-item-statements.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { RuleElementSource } from "@module/rules/index.ts"; import { RawPredicate } from "@system/predication.ts"; import { recursiveReplaceString } from "@util"; diff --git a/src/module/migration/migrations/799-rm-recall-knowledge-duplicates.ts b/src/module/migration/migrations/799-rm-recall-knowledge-duplicates.ts index 43432cd251f..46c97f1e732 100644 --- a/src/module/migration/migrations/799-rm-recall-knowledge-duplicates.ts +++ b/src/module/migration/migrations/799-rm-recall-knowledge-duplicates.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Remove duplicate Recall Knowledge action items */ diff --git a/src/module/migration/migrations/800-self-effect-panache-rage.ts b/src/module/migration/migrations/800-self-effect-panache-rage.ts index 675d9d09fb8..a2ada883580 100644 --- a/src/module/migration/migrations/800-self-effect-panache-rage.ts +++ b/src/module/migration/migrations/800-self-effect-panache-rage.ts @@ -1,5 +1,5 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { recursiveReplaceString } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/801-color-darkvision.ts b/src/module/migration/migrations/801-color-darkvision.ts index 2458f416a76..b4bcad82519 100644 --- a/src/module/migration/migrations/801-color-darkvision.ts +++ b/src/module/migration/migrations/801-color-darkvision.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Add color darkvision flags to fetchlings and the Resonant Reflection of Life */ diff --git a/src/module/migration/migrations/802-strip-feat-action-category.ts b/src/module/migration/migrations/802-strip-feat-action-category.ts index 0020406d90d..89687ad40bb 100644 --- a/src/module/migration/migrations/802-strip-feat-action-category.ts +++ b/src/module/migration/migrations/802-strip-feat-action-category.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { FeatSystemSource } from "@item/feat/data.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/803-normalize-spell-area.ts b/src/module/migration/migrations/803-normalize-spell-area.ts index be9dd927352..1c2dc283c71 100644 --- a/src/module/migration/migrations/803-normalize-spell-area.ts +++ b/src/module/migration/migrations/803-normalize-spell-area.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { EffectAreaSize, EffectAreaType } from "@item/spell/index.ts"; import { isObject } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/804-remove-consumable-properties.ts b/src/module/migration/migrations/804-remove-consumable-properties.ts index 5425619aeb1..388c0bf978c 100644 --- a/src/module/migration/migrations/804-remove-consumable-properties.ts +++ b/src/module/migration/migrations/804-remove-consumable-properties.ts @@ -1,5 +1,5 @@ import { ConsumableSystemSource } from "@item/consumable/data.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; export class Migration804RemoveConsumableProperties extends MigrationBase { diff --git a/src/module/migration/migrations/805-inline-damage-formulas.ts b/src/module/migration/migrations/805-inline-damage-formulas.ts index 8f3c4a48d85..b46a82cc349 100644 --- a/src/module/migration/migrations/805-inline-damage-formulas.ts +++ b/src/module/migration/migrations/805-inline-damage-formulas.ts @@ -1,5 +1,5 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { recursiveReplaceString } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/806-torch-improvised-othertags.ts b/src/module/migration/migrations/806-torch-improvised-othertags.ts index b928a8b02dd..e3af4c8675c 100644 --- a/src/module/migration/migrations/806-torch-improvised-othertags.ts +++ b/src/module/migration/migrations/806-torch-improvised-othertags.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { RuleElementSource } from "@module/rules/index.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/807-rm-activated-effect-fields.ts b/src/module/migration/migrations/807-rm-activated-effect-fields.ts index 5b2eee63022..409e2a337fd 100644 --- a/src/module/migration/migrations/807-rm-activated-effect-fields.ts +++ b/src/module/migration/migrations/807-rm-activated-effect-fields.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Remove properties from unused "activatedEffect" template defaults */ diff --git a/src/module/migration/migrations/808-count-damage-dice.ts b/src/module/migration/migrations/808-count-damage-dice.ts index d29d86a6710..db1ced799a4 100644 --- a/src/module/migration/migrations/808-count-damage-dice.ts +++ b/src/module/migration/migrations/808-count-damage-dice.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { recursiveReplaceString } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/809-automaton-enhancements.ts b/src/module/migration/migrations/809-automaton-enhancements.ts index 3730842833c..933cd26fb63 100644 --- a/src/module/migration/migrations/809-automaton-enhancements.ts +++ b/src/module/migration/migrations/809-automaton-enhancements.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { AELikeSource } from "@module/rules/rule-element/ae-like.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/811-inline-damage-rolls-persistent.ts b/src/module/migration/migrations/811-inline-damage-rolls-persistent.ts index 6f2bd30d0f3..3844690f0f3 100644 --- a/src/module/migration/migrations/811-inline-damage-rolls-persistent.ts +++ b/src/module/migration/migrations/811-inline-damage-rolls-persistent.ts @@ -1,5 +1,5 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { recursiveReplaceString } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/812-restructure-iwr.ts b/src/module/migration/migrations/812-restructure-iwr.ts index 73bd25a05ea..1e28965616c 100644 --- a/src/module/migration/migrations/812-restructure-iwr.ts +++ b/src/module/migration/migrations/812-restructure-iwr.ts @@ -3,7 +3,7 @@ import { ActorTraitsSource } from "@actor/data/base.ts"; import { ImmunitySource, ResistanceSource, WeaknessSource } from "@actor/data/iwr.ts"; import { ImmunityType, ResistanceType, WeaknessType } from "@actor/types.ts"; import { IMMUNITY_TYPES, RESISTANCE_TYPES, WEAKNESS_TYPES } from "@actor/values.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { isObject, pick, setHasElement, sluggify } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/813-normalize-cold-iron.ts b/src/module/migration/migrations/813-normalize-cold-iron.ts index 2811a908756..52fc34c9a89 100644 --- a/src/module/migration/migrations/813-normalize-cold-iron.ts +++ b/src/module/migration/migrations/813-normalize-cold-iron.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e, WeaponSource } from "@item/data/index.ts"; +import { ItemSourcePF2e, WeaponSource } from "@item/base/data/index.ts"; import { isObject } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/814-calculated-expanded-splash.ts b/src/module/migration/migrations/814-calculated-expanded-splash.ts index 271a04c497c..787e3ac06e6 100644 --- a/src/module/migration/migrations/814-calculated-expanded-splash.ts +++ b/src/module/migration/migrations/814-calculated-expanded-splash.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Add/update rule elements for the Calculated Splash and Expanded Splash feats */ diff --git a/src/module/migration/migrations/815-consumable-data-cleanup.ts b/src/module/migration/migrations/815-consumable-data-cleanup.ts index 5c8ff1f598c..da60b6a9b70 100644 --- a/src/module/migration/migrations/815-consumable-data-cleanup.ts +++ b/src/module/migration/migrations/815-consumable-data-cleanup.ts @@ -1,5 +1,5 @@ import { ConsumableSystemSource } from "@item/consumable/data.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { isObject } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/816-alchemist-research-fields.ts b/src/module/migration/migrations/816-alchemist-research-fields.ts index dbab7643aa8..6d63557c7f8 100644 --- a/src/module/migration/migrations/816-alchemist-research-fields.ts +++ b/src/module/migration/migrations/816-alchemist-research-fields.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { AELikeSource } from "@module/rules/rule-element/ae-like.ts"; import { RuleElementSource } from "@module/rules/index.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/817-field-discovery-predicates.ts b/src/module/migration/migrations/817-field-discovery-predicates.ts index 8bfcbfc3744..f7c7c470455 100644 --- a/src/module/migration/migrations/817-field-discovery-predicates.ts +++ b/src/module/migration/migrations/817-field-discovery-predicates.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { AELikeSource } from "@module/rules/rule-element/ae-like.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/818-basic-undead-negative-healing.ts b/src/module/migration/migrations/818-basic-undead-negative-healing.ts index 19defcee958..37512ec6daf 100644 --- a/src/module/migration/migrations/818-basic-undead-negative-healing.ts +++ b/src/module/migration/migrations/818-basic-undead-negative-healing.ts @@ -1,4 +1,4 @@ -import { FeatSource, ItemSourcePF2e } from "@item/data/index.ts"; +import { FeatSource, ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Add negative healing to basic undead benefits */ diff --git a/src/module/migration/migrations/819-spin-tale-adventure-specific.ts b/src/module/migration/migrations/819-spin-tale-adventure-specific.ts index b31e40c0198..b2d2a32e4ae 100644 --- a/src/module/migration/migrations/819-spin-tale-adventure-specific.ts +++ b/src/module/migration/migrations/819-spin-tale-adventure-specific.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Replace links to adventure-specific Spin Tale */ diff --git a/src/module/migration/migrations/820-remove-unused-traits-data.ts b/src/module/migration/migrations/820-remove-unused-traits-data.ts index e90a3fafe01..95b777943a4 100644 --- a/src/module/migration/migrations/820-remove-unused-traits-data.ts +++ b/src/module/migration/migrations/820-remove-unused-traits-data.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Removed unused traits data structures from items that don't use them */ diff --git a/src/module/migration/migrations/821-inline-damage-rolls.ts b/src/module/migration/migrations/821-inline-damage-rolls.ts index 7122380fdec..9d13b16f482 100644 --- a/src/module/migration/migrations/821-inline-damage-rolls.ts +++ b/src/module/migration/migrations/821-inline-damage-rolls.ts @@ -1,5 +1,5 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { recursiveReplaceString } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/822-blade-ally-consolidation.ts b/src/module/migration/migrations/822-blade-ally-consolidation.ts index 1adc06f7d46..6cb861f576d 100644 --- a/src/module/migration/migrations/822-blade-ally-consolidation.ts +++ b/src/module/migration/migrations/822-blade-ally-consolidation.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Rename references to retired compendiums */ diff --git a/src/module/migration/migrations/823-heritage-ancestry-slug.ts b/src/module/migration/migrations/823-heritage-ancestry-slug.ts index 03463ed8d8a..d07147c740b 100644 --- a/src/module/migration/migrations/823-heritage-ancestry-slug.ts +++ b/src/module/migration/migrations/823-heritage-ancestry-slug.ts @@ -1,5 +1,5 @@ import { AncestryPF2e } from "@item"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { sluggify } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/824-sneak-attack-damage-source.ts b/src/module/migration/migrations/824-sneak-attack-damage-source.ts index 1abe7f82e65..26c8480979a 100644 --- a/src/module/migration/migrations/824-sneak-attack-damage-source.ts +++ b/src/module/migration/migrations/824-sneak-attack-damage-source.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Record PC sneak attack damage in an actor flag for reuse by related abilities */ diff --git a/src/module/migration/migrations/825-khakkhara-feng-huo-lun.ts b/src/module/migration/migrations/825-khakkhara-feng-huo-lun.ts index c15149dd688..d5738373ce9 100644 --- a/src/module/migration/migrations/825-khakkhara-feng-huo-lun.ts +++ b/src/module/migration/migrations/825-khakkhara-feng-huo-lun.ts @@ -1,5 +1,5 @@ import { BaseWeaponType } from "@item/weapon/types.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Update from khakkara to khakkhara; wind and fire wheel to feng huo lun */ diff --git a/src/module/migration/migrations/826-gut-condition-data.ts b/src/module/migration/migrations/826-gut-condition-data.ts index ff88da212ae..bddf286183a 100644 --- a/src/module/migration/migrations/826-gut-condition-data.ts +++ b/src/module/migration/migrations/826-gut-condition-data.ts @@ -1,5 +1,5 @@ import { ConditionSystemSource } from "@item/condition/data.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Remove unused cruft from condition data */ diff --git a/src/module/migration/migrations/827-fix-tv-shield-traits.ts b/src/module/migration/migrations/827-fix-tv-shield-traits.ts index e3049be5d39..d38341875a1 100644 --- a/src/module/migration/migrations/827-fix-tv-shield-traits.ts +++ b/src/module/migration/migrations/827-fix-tv-shield-traits.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { isObject } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/828-prune-invalid-traits.ts b/src/module/migration/migrations/828-prune-invalid-traits.ts index bd8d74c65b0..01e19333a87 100644 --- a/src/module/migration/migrations/828-prune-invalid-traits.ts +++ b/src/module/migration/migrations/828-prune-invalid-traits.ts @@ -1,7 +1,7 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; import { ActionTrait } from "@item/ability/types.ts"; import { ArmorTrait } from "@item/armor/index.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { SpellTrait } from "@item/spell/index.ts"; import { actionTraits, diff --git a/src/module/migration/migrations/829-rm-ritual-entries.ts b/src/module/migration/migrations/829-rm-ritual-entries.ts index 6da76ed3759..34c4f1be0c5 100644 --- a/src/module/migration/migrations/829-rm-ritual-entries.ts +++ b/src/module/migration/migrations/829-rm-ritual-entries.ts @@ -1,5 +1,5 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { SpellcastingEntrySource } from "@item/spellcasting-entry/index.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/830-condense-instincts.ts b/src/module/migration/migrations/830-condense-instincts.ts index 94cc49416bd..ea8bcb36af3 100644 --- a/src/module/migration/migrations/830-condense-instincts.ts +++ b/src/module/migration/migrations/830-condense-instincts.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Remove links to deleted compendium items */ diff --git a/src/module/migration/migrations/831-cleric-doctrines.ts b/src/module/migration/migrations/831-cleric-doctrines.ts index ca5dd713eb9..49870f4aaef 100644 --- a/src/module/migration/migrations/831-cleric-doctrines.ts +++ b/src/module/migration/migrations/831-cleric-doctrines.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { AELikeSource } from "@module/rules/rule-element/ae-like.ts"; import { RuleElementSource } from "@module/rules/index.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/832-choice-set-flags.ts b/src/module/migration/migrations/832-choice-set-flags.ts index 608a5c937ac..aaf7e1691dd 100644 --- a/src/module/migration/migrations/832-choice-set-flags.ts +++ b/src/module/migration/migrations/832-choice-set-flags.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { RuleElementSource } from "@module/rules/index.ts"; import { recursiveReplaceString, sluggify } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/833-add-rogue-toys-fix-precision.ts b/src/module/migration/migrations/833-add-rogue-toys-fix-precision.ts index 5223f40fc33..a8c33a358e5 100644 --- a/src/module/migration/migrations/833-add-rogue-toys-fix-precision.ts +++ b/src/module/migration/migrations/833-add-rogue-toys-fix-precision.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Add rule elements to Surprise Attack and Dread Striker, fix damage type of Precision edge */ diff --git a/src/module/migration/migrations/834-feat-categories.ts b/src/module/migration/migrations/834-feat-categories.ts index 65b8fb88249..7078b57206f 100644 --- a/src/module/migration/migrations/834-feat-categories.ts +++ b/src/module/migration/migrations/834-feat-categories.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { FeatSystemSource } from "@item/feat/data.ts"; import { FEAT_OR_FEATURE_CATEGORIES } from "@item/feat/values.ts"; import { isObject, recursiveReplaceString, setHasElement } from "@util"; diff --git a/src/module/migration/migrations/836-energizing-consolidation.ts b/src/module/migration/migrations/836-energizing-consolidation.ts index 93faf260fe2..5e26602b6d9 100644 --- a/src/module/migration/migrations/836-energizing-consolidation.ts +++ b/src/module/migration/migrations/836-energizing-consolidation.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Rename references to retired compendiums */ diff --git a/src/module/migration/migrations/838-strike-attack-roll-selector.ts b/src/module/migration/migrations/838-strike-attack-roll-selector.ts index 2f508edab2e..96663586a60 100644 --- a/src/module/migration/migrations/838-strike-attack-roll-selector.ts +++ b/src/module/migration/migrations/838-strike-attack-roll-selector.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Replace all instances of "mundane-attack" selector with "strike-attack-roll" */ diff --git a/src/module/migration/migrations/839-action-categories.ts b/src/module/migration/migrations/839-action-categories.ts index a99052525fd..0acac1c0cfd 100644 --- a/src/module/migration/migrations/839-action-categories.ts +++ b/src/module/migration/migrations/839-action-categories.ts @@ -1,5 +1,5 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; -import { AbilityItemSource, ItemSourcePF2e } from "@item/data/index.ts"; +import { AbilityItemSource, ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** actionCategory changed from a value object to just a string */ diff --git a/src/module/migration/migrations/840-array-wrap-predicates.ts b/src/module/migration/migrations/840-array-wrap-predicates.ts index 6a88524f043..2761993fc41 100644 --- a/src/module/migration/migrations/840-array-wrap-predicates.ts +++ b/src/module/migration/migrations/840-array-wrap-predicates.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; import { PredicatePF2e, RawPredicate } from "@system/predication.ts"; diff --git a/src/module/migration/migrations/841-v11-uuid-format.ts b/src/module/migration/migrations/841-v11-uuid-format.ts index 21e585dcbd8..3f912eaa11e 100644 --- a/src/module/migration/migrations/841-v11-uuid-format.ts +++ b/src/module/migration/migrations/841-v11-uuid-format.ts @@ -1,5 +1,5 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { isObject, recursiveReplaceString } from "@util"; import { MigrationBase } from "../base.ts"; import { itemIsOfType } from "@item/helpers.ts"; diff --git a/src/module/migration/migrations/844-deity-domains-uuids.ts b/src/module/migration/migrations/844-deity-domains-uuids.ts index 7d746904ec7..d4f150d20bc 100644 --- a/src/module/migration/migrations/844-deity-domains-uuids.ts +++ b/src/module/migration/migrations/844-deity-domains-uuids.ts @@ -1,5 +1,5 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Update UUIDS of domain journal entries to newer pages */ diff --git a/src/module/migration/migrations/845-empty-spell-consumables.ts b/src/module/migration/migrations/845-empty-spell-consumables.ts index fad6b048ae1..723598d0f5b 100644 --- a/src/module/migration/migrations/845-empty-spell-consumables.ts +++ b/src/module/migration/migrations/845-empty-spell-consumables.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { isObject } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/846-spell-school-optional.ts b/src/module/migration/migrations/846-spell-school-optional.ts index 7d14df43b75..9e0b9104bf1 100644 --- a/src/module/migration/migrations/846-spell-school-optional.ts +++ b/src/module/migration/migrations/846-spell-school-optional.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; import { MagicSchool, SpellSystemSource } from "@item/spell/index.ts"; import * as R from "remeda"; diff --git a/src/module/migration/migrations/847-temp-hp-rule-events.ts b/src/module/migration/migrations/847-temp-hp-rule-events.ts index a0f85059fea..2b8df35e170 100644 --- a/src/module/migration/migrations/847-temp-hp-rule-events.ts +++ b/src/module/migration/migrations/847-temp-hp-rule-events.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Move TempHPRuleElement source `onCreate` and `onTurnStart` to `events` object */ diff --git a/src/module/migration/migrations/848-numeric-armor-properties.ts b/src/module/migration/migrations/848-numeric-armor-properties.ts index e9e30e99689..4c2d137d237 100644 --- a/src/module/migration/migrations/848-numeric-armor-properties.ts +++ b/src/module/migration/migrations/848-numeric-armor-properties.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; import { isObject, tupleHasValue } from "@util"; diff --git a/src/module/migration/migrations/849-delete-broken-threshold.ts b/src/module/migration/migrations/849-delete-broken-threshold.ts index 5dabae0b582..684de0cb21d 100644 --- a/src/module/migration/migrations/849-delete-broken-threshold.ts +++ b/src/module/migration/migrations/849-delete-broken-threshold.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { PhysicalItemHPSource } from "@item/physical/data.ts"; import { isObject } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/850-flat-footed-to-off-guard.ts b/src/module/migration/migrations/850-flat-footed-to-off-guard.ts index 12927202c06..5fdcc3394b6 100644 --- a/src/module/migration/migrations/850-flat-footed-to-off-guard.ts +++ b/src/module/migration/migrations/850-flat-footed-to-off-guard.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { recursiveReplaceString } from "@util"; import type { JournalEntrySource } from "types/foundry/common/documents/journal-entry.d.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/851-just-innovation-id.ts b/src/module/migration/migrations/851-just-innovation-id.ts index 98073546341..e6349ae6496 100644 --- a/src/module/migration/migrations/851-just-innovation-id.ts +++ b/src/module/migration/migrations/851-just-innovation-id.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { RuleElementSource } from "@module/rules/index.ts"; import { AELikeSchema } from "@module/rules/rule-element/ae-like.ts"; import { recursiveReplaceString } from "@util"; diff --git a/src/module/migration/migrations/852-ability-scores-to-modifiers.ts b/src/module/migration/migrations/852-ability-scores-to-modifiers.ts index b7fbe50b818..c6c379a4644 100644 --- a/src/module/migration/migrations/852-ability-scores-to-modifiers.ts +++ b/src/module/migration/migrations/852-ability-scores-to-modifiers.ts @@ -1,5 +1,5 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { RuleElementSource } from "@module/rules/index.ts"; import { AELikeChangeMode } from "@module/rules/rule-element/ae-like.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/853-remaster-languages.ts b/src/module/migration/migrations/853-remaster-languages.ts index 181042ca706..573ff7cfbbd 100644 --- a/src/module/migration/migrations/853-remaster-languages.ts +++ b/src/module/migration/migrations/853-remaster-languages.ts @@ -1,5 +1,5 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; import { recursiveReplaceString } from "@util"; diff --git a/src/module/migration/migrations/854-bracketed-ability-scores-to-modifiers.ts b/src/module/migration/migrations/854-bracketed-ability-scores-to-modifiers.ts index a0b94f8be75..8fcead7a7de 100644 --- a/src/module/migration/migrations/854-bracketed-ability-scores-to-modifiers.ts +++ b/src/module/migration/migrations/854-bracketed-ability-scores-to-modifiers.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; import { AELikeChangeMode } from "@module/rules/rule-element/ae-like.ts"; import { RuleElementSource } from "@module/rules/index.ts"; diff --git a/src/module/migration/migrations/855-apex-equipment-system-data.ts b/src/module/migration/migrations/855-apex-equipment-system-data.ts index db2081c6d2c..9d1b59dace3 100644 --- a/src/module/migration/migrations/855-apex-equipment-system-data.ts +++ b/src/module/migration/migrations/855-apex-equipment-system-data.ts @@ -1,5 +1,5 @@ import { ATTRIBUTE_ABBREVIATIONS } from "@actor/values.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { RuleElementSource } from "@module/rules/index.ts"; import { setHasElement } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/856-no-system-dot-custom.ts b/src/module/migration/migrations/856-no-system-dot-custom.ts index 22840cc8c4a..6ca0f62fbad 100644 --- a/src/module/migration/migrations/856-no-system-dot-custom.ts +++ b/src/module/migration/migrations/856-no-system-dot-custom.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { recursiveReplaceString, sluggify } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/857-weapon-spec-re.ts b/src/module/migration/migrations/857-weapon-spec-re.ts index e5443ab415c..e76de991ea6 100644 --- a/src/module/migration/migrations/857-weapon-spec-re.ts +++ b/src/module/migration/migrations/857-weapon-spec-re.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; import { sluggify } from "@util"; import { RuleElementSource } from "@module/rules/index.ts"; diff --git a/src/module/migration/migrations/858-fake-weapon-specialization.ts b/src/module/migration/migrations/858-fake-weapon-specialization.ts index 9d47c09b466..5a1789170c2 100644 --- a/src/module/migration/migrations/858-fake-weapon-specialization.ts +++ b/src/module/migration/migrations/858-fake-weapon-specialization.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; import { sluggify } from "@util"; import { RuleElementSource } from "@module/rules/index.ts"; diff --git a/src/module/migration/migrations/859-material-type-grade.ts b/src/module/migration/migrations/859-material-type-grade.ts index d6bcb6c888d..26b35e8eb5b 100644 --- a/src/module/migration/migrations/859-material-type-grade.ts +++ b/src/module/migration/migrations/859-material-type-grade.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e, PhysicalItemSource } from "@item/data/index.ts"; +import { ItemSourcePF2e, PhysicalItemSource } from "@item/base/data/index.ts"; import { itemIsOfType } from "@item/helpers.ts"; import { PRECIOUS_MATERIAL_GRADES, PRECIOUS_MATERIAL_TYPES } from "@item/physical/values.ts"; import { WeaponMaterialType } from "@item/weapon/types.ts"; diff --git a/src/module/migration/migrations/860-rm-group.ts b/src/module/migration/migrations/860-rm-group.ts index b810a8be5b4..fd223016713 100644 --- a/src/module/migration/migrations/860-rm-group.ts +++ b/src/module/migration/migrations/860-rm-group.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { itemIsOfType } from "@item/helpers.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/861-aura-colors-to-appearance.ts b/src/module/migration/migrations/861-aura-colors-to-appearance.ts index ee45c884b08..a7164ef1981 100644 --- a/src/module/migration/migrations/861-aura-colors-to-appearance.ts +++ b/src/module/migration/migrations/861-aura-colors-to-appearance.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { RuleElementSource } from "@module/rules/index.ts"; import { isObject } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/862-specific-magic-armor.ts b/src/module/migration/migrations/862-specific-magic-armor.ts index 0a558b0b467..8f8f84050b7 100644 --- a/src/module/migration/migrations/862-specific-magic-armor.ts +++ b/src/module/migration/migrations/862-specific-magic-armor.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { ZeroToThree } from "@module/data.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/864-rm-weapon-map.ts b/src/module/migration/migrations/864-rm-weapon-map.ts index ee49a640f0d..532a8816a51 100644 --- a/src/module/migration/migrations/864-rm-weapon-map.ts +++ b/src/module/migration/migrations/864-rm-weapon-map.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { isObject } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/865-vitality-void.ts b/src/module/migration/migrations/865-vitality-void.ts index af96298f449..05a77b51b8b 100644 --- a/src/module/migration/migrations/865-vitality-void.ts +++ b/src/module/migration/migrations/865-vitality-void.ts @@ -1,5 +1,5 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { recursiveReplaceString } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/867-damage-roll-domain-fix.ts b/src/module/migration/migrations/867-damage-roll-domain-fix.ts index 36f25f7384d..16d6c8e9b6e 100644 --- a/src/module/migration/migrations/867-damage-roll-domain-fix.ts +++ b/src/module/migration/migrations/867-damage-roll-domain-fix.ts @@ -1,4 +1,4 @@ -import type { ItemSourcePF2e } from "@item/data/index.ts"; +import type { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; export class Migration867DamageRollDomainFix extends MigrationBase { diff --git a/src/module/migration/migrations/868-strike-re-range.ts b/src/module/migration/migrations/868-strike-re-range.ts index b04e054714d..993bd0f1323 100644 --- a/src/module/migration/migrations/868-strike-re-range.ts +++ b/src/module/migration/migrations/868-strike-re-range.ts @@ -1,4 +1,4 @@ -import type { ItemSourcePF2e } from "@item/data/index.ts"; +import type { ItemSourcePF2e } from "@item/base/data/index.ts"; import { RuleElementSource } from "@module/rules/index.ts"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/869-refresh-mighty-bulwark.ts b/src/module/migration/migrations/869-refresh-mighty-bulwark.ts index afcef68f694..825e3564e44 100644 --- a/src/module/migration/migrations/869-refresh-mighty-bulwark.ts +++ b/src/module/migration/migrations/869-refresh-mighty-bulwark.ts @@ -1,4 +1,4 @@ -import type { ItemSourcePF2e } from "@item/data/index.ts"; +import type { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Refresh rule elements on mighty bulwark feat. */ diff --git a/src/module/migration/migrations/870-martial-to-proficiencies.ts b/src/module/migration/migrations/870-martial-to-proficiencies.ts index 8eaa3a56c3f..d1b8e1989a3 100644 --- a/src/module/migration/migrations/870-martial-to-proficiencies.ts +++ b/src/module/migration/migrations/870-martial-to-proficiencies.ts @@ -1,7 +1,7 @@ import { CharacterSystemSource, MartialProficiency } from "@actor/character/data.ts"; import { ActorSourcePF2e } from "@actor/data/index.ts"; import { ARMOR_CATEGORIES } from "@item/armor/values.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { isObject, recursiveReplaceString, setHasElement } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/872-move-schema-property.ts b/src/module/migration/migrations/872-move-schema-property.ts index fbeee4ee29c..b1e155791d3 100644 --- a/src/module/migration/migrations/872-move-schema-property.ts +++ b/src/module/migration/migrations/872-move-schema-property.ts @@ -1,7 +1,7 @@ import { ActorSystemSource } from "@actor/data/base.ts"; import { ActorSourcePF2e } from "@actor/data/index.ts"; -import { ItemSystemSource } from "@item/data/base.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSystemSource } from "@item/base/data/system.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { isObject } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/873-remove-bonus-bulk-limit.ts b/src/module/migration/migrations/873-remove-bonus-bulk-limit.ts index e9320137ebe..2d1b66620e1 100644 --- a/src/module/migration/migrations/873-remove-bonus-bulk-limit.ts +++ b/src/module/migration/migrations/873-remove-bonus-bulk-limit.ts @@ -1,5 +1,5 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { recursiveReplaceString } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/874-move-stamina-stuff.ts b/src/module/migration/migrations/874-move-stamina-stuff.ts index 8efa66bd9ef..6d740c6f398 100644 --- a/src/module/migration/migrations/874-move-stamina-stuff.ts +++ b/src/module/migration/migrations/874-move-stamina-stuff.ts @@ -1,6 +1,6 @@ import { CharacterSystemSource } from "@actor/character/data.ts"; import { ActorSourcePF2e } from "@actor/data/index.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { isObject, recursiveReplaceString } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/875-set-innovation-id-early.ts b/src/module/migration/migrations/875-set-innovation-id-early.ts index 94834815574..579a30046c9 100644 --- a/src/module/migration/migrations/875-set-innovation-id-early.ts +++ b/src/module/migration/migrations/875-set-innovation-id-early.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationBase } from "../base.ts"; /** Set very low priority orders on AE-likes setting inventor innovation ID. */ diff --git a/src/module/migration/migrations/876-feat-level-taken.ts b/src/module/migration/migrations/876-feat-level-taken.ts index 401778e39fa..e551d4c6845 100644 --- a/src/module/migration/migrations/876-feat-level-taken.ts +++ b/src/module/migration/migrations/876-feat-level-taken.ts @@ -1,4 +1,4 @@ -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { FEAT_CATEGORIES } from "@item/feat/values.ts"; import { setHasElement } from "@util"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/migrations/877-publication-data.ts b/src/module/migration/migrations/877-publication-data.ts index 8b09b90c92d..35c4dd0f37c 100644 --- a/src/module/migration/migrations/877-publication-data.ts +++ b/src/module/migration/migrations/877-publication-data.ts @@ -1,5 +1,5 @@ import type { ActorSourcePF2e } from "@actor/data/index.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { PublicationData } from "@module/data.ts"; import * as R from "remeda"; import { MigrationBase } from "../base.ts"; diff --git a/src/module/migration/runner/base.ts b/src/module/migration/runner/base.ts index 8b4e3f87ed7..1790267be8c 100644 --- a/src/module/migration/runner/base.ts +++ b/src/module/migration/runner/base.ts @@ -1,5 +1,5 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { MigrationRecord } from "@module/data.ts"; import { MigrationBase } from "@module/migration/base.ts"; import type { ScenePF2e, TokenDocumentPF2e } from "@scene"; diff --git a/src/module/migration/runner/index.ts b/src/module/migration/runner/index.ts index 44b3a4a57ee..38fca159fdc 100644 --- a/src/module/migration/runner/index.ts +++ b/src/module/migration/runner/index.ts @@ -1,7 +1,7 @@ import type { ActorPF2e } from "@actor/base.ts"; import { ActorSourcePF2e } from "@actor/data/index.ts"; -import type { ItemPF2e } from "@item/base.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import type { ItemPF2e } from "@item"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import type { MacroPF2e } from "@module/macro.ts"; import { MigrationBase } from "@module/migration/base.ts"; import { MigrationRunnerBase } from "@module/migration/runner/base.ts"; diff --git a/src/module/rules/helpers.ts b/src/module/rules/helpers.ts index 7fd7711f5bb..f79922158a2 100644 --- a/src/module/rules/helpers.ts +++ b/src/module/rules/helpers.ts @@ -8,7 +8,7 @@ import { TestableDeferredValueParams, } from "@actor/modifiers.ts"; import { ItemPF2e } from "@item"; -import { ConditionSource, EffectSource, ItemSourcePF2e } from "@item/data/index.ts"; +import { ConditionSource, EffectSource, ItemSourcePF2e } from "@item/base/data/index.ts"; import { RollNotePF2e } from "@module/notes.ts"; import { BaseDamageData } from "@system/damage/index.ts"; import { DegreeOfSuccessAdjustment } from "@system/degree-of-success.ts"; diff --git a/src/module/rules/rule-element/base.ts b/src/module/rules/rule-element/base.ts index 58d8169ea87..ceddbd20521 100644 --- a/src/module/rules/rule-element/base.ts +++ b/src/module/rules/rule-element/base.ts @@ -2,7 +2,7 @@ import type { ActorPF2e } from "@actor"; import { ActorType } from "@actor/data/index.ts"; import type { CheckModifier, DamageDicePF2e, ModifierPF2e } from "@actor/modifiers.ts"; import { ItemPF2e, PhysicalItemPF2e, type WeaponPF2e } from "@item"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { reduceItemName } from "@item/helpers.ts"; import type { TokenDocumentPF2e } from "@scene/index.ts"; import { CheckRoll, CheckRollContext } from "@system/check/index.ts"; diff --git a/src/module/rules/rule-element/choice-set/data.ts b/src/module/rules/rule-element/choice-set/data.ts index 1b394391082..5c8ddae1d41 100644 --- a/src/module/rules/rule-element/choice-set/data.ts +++ b/src/module/rules/rule-element/choice-set/data.ts @@ -1,4 +1,4 @@ -import { ItemType } from "@item/data/index.ts"; +import { ItemType } from "@item/base/data/index.ts"; import { PickableThing } from "@module/apps/pick-a-thing-prompt.ts"; import { RawPredicate } from "@system/predication.ts"; import type { diff --git a/src/module/rules/rule-element/choice-set/rule-element.ts b/src/module/rules/rule-element/choice-set/rule-element.ts index 542ff416af9..db9723e39f8 100644 --- a/src/module/rules/rule-element/choice-set/rule-element.ts +++ b/src/module/rules/rule-element/choice-set/rule-element.ts @@ -1,6 +1,6 @@ import { StrikeData } from "@actor/data/base.ts"; import { FeatPF2e, ItemPF2e, ItemProxyPF2e } from "@item"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { PickableThing } from "@module/apps/pick-a-thing-prompt.ts"; import { PredicatePF2e } from "@system/predication.ts"; import { Progress } from "@system/progress.ts"; diff --git a/src/module/rules/rule-element/ephemeral-effect.ts b/src/module/rules/rule-element/ephemeral-effect.ts index 26fcf0dbfab..eabb6e77334 100644 --- a/src/module/rules/rule-element/ephemeral-effect.ts +++ b/src/module/rules/rule-element/ephemeral-effect.ts @@ -1,6 +1,6 @@ import { DeferredValueParams } from "@actor/modifiers.ts"; import { ItemPF2e } from "@item"; -import { ConditionSource, EffectSource } from "@item/data/index.ts"; +import { ConditionSource, EffectSource } from "@item/base/data/index.ts"; import { UUIDUtils } from "@util/uuid.ts"; import type { ArrayField, BooleanField, EmbeddedDataField, StringField } from "types/foundry/common/data/fields.d.ts"; import { ItemAlteration } from "./item-alteration/alteration.ts"; diff --git a/src/module/rules/rule-element/grant-item/rule-element.ts b/src/module/rules/rule-element/grant-item/rule-element.ts index 5805c1f11b7..805752fa8e9 100644 --- a/src/module/rules/rule-element/grant-item/rule-element.ts +++ b/src/module/rules/rule-element/grant-item/rule-element.ts @@ -1,8 +1,8 @@ import type { ActorPF2e } from "@actor"; import { ActorType } from "@actor/data/index.ts"; import { ConditionPF2e, ItemPF2e, ItemProxyPF2e, PhysicalItemPF2e } from "@item"; -import { ItemGrantDeleteAction } from "@item/data/base.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemGrantDeleteAction } from "@item/base/data/system.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { PHYSICAL_ITEM_TYPES } from "@item/physical/values.ts"; import { SlugField, StrictArrayField } from "@system/schema-data-fields.ts"; import { ErrorPF2e, isObject, pick, setHasElement, sluggify, tupleHasValue } from "@util"; diff --git a/src/module/rules/rule-element/item-alteration/alteration.ts b/src/module/rules/rule-element/item-alteration/alteration.ts index 5130b20fd58..49c62b2c5e7 100644 --- a/src/module/rules/rule-element/item-alteration/alteration.ts +++ b/src/module/rules/rule-element/item-alteration/alteration.ts @@ -1,8 +1,7 @@ import type { ActorPF2e } from "@actor"; import type { ItemPF2e, PhysicalItemPF2e } from "@item"; import { PersistentSourceData } from "@item/condition/data.ts"; -import { FrequencyInterval } from "@item/data/base.ts"; -import { ItemSourcePF2e, PhysicalItemSource } from "@item/data/index.ts"; +import { FrequencyInterval, ItemSourcePF2e, PhysicalItemSource } from "@item/base/data/index.ts"; import { itemIsOfType } from "@item/helpers.ts"; import { organizeBulkData } from "@item/physical/helpers.ts"; import { isObject, objectHasKey } from "@util"; diff --git a/src/module/rules/rule-element/item-alteration/rule-element.ts b/src/module/rules/rule-element/item-alteration/rule-element.ts index 4acc30d45a4..8f006c3ed4f 100644 --- a/src/module/rules/rule-element/item-alteration/rule-element.ts +++ b/src/module/rules/rule-element/item-alteration/rule-element.ts @@ -1,6 +1,6 @@ import type { ActorPF2e } from "@actor"; import type { ItemPF2e, PhysicalItemPF2e } from "@item"; -import { ItemType } from "@item/data/index.ts"; +import { ItemType } from "@item/base/data/index.ts"; import * as R from "remeda"; import type { StringField } from "types/foundry/common/data/fields.d.ts"; import { AELikeRuleElement } from "../ae-like.ts"; diff --git a/src/module/rules/rule-element/item-alteration/schemas.ts b/src/module/rules/rule-element/item-alteration/schemas.ts index a1ba0650a08..3849610947f 100644 --- a/src/module/rules/rule-element/item-alteration/schemas.ts +++ b/src/module/rules/rule-element/item-alteration/schemas.ts @@ -1,6 +1,6 @@ import { ItemPF2e } from "@item"; import { ArmorTrait } from "@item/armor/types.ts"; -import type { ItemSourcePF2e, ItemType } from "@item/data/index.ts"; +import type { ItemSourcePF2e, ItemType } from "@item/base/data/index.ts"; import { itemIsOfType } from "@item/helpers.ts"; import { BulkValue } from "@item/physical/types.ts"; import { BULK_VALUES, PHYSICAL_ITEM_TYPES, PRECIOUS_MATERIAL_TYPES } from "@item/physical/values.ts"; diff --git a/src/module/rules/rule-element/lose-hit-points.ts b/src/module/rules/rule-element/lose-hit-points.ts index 64e5e112122..eacebefb8ee 100644 --- a/src/module/rules/rule-element/lose-hit-points.ts +++ b/src/module/rules/rule-element/lose-hit-points.ts @@ -1,6 +1,6 @@ import { CreaturePF2e } from "@actor"; import { ActorType } from "@actor/data/index.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { RuleElementPF2e, RuleElementSchema } from "./index.ts"; import type { BooleanField } from "types/foundry/common/data/fields.d.ts"; import { ResolvableValueField } from "./data.ts"; diff --git a/src/module/rules/rule-element/martial-proficiency.ts b/src/module/rules/rule-element/martial-proficiency.ts index 6a92d1d4fc0..8979ff5c0f7 100644 --- a/src/module/rules/rule-element/martial-proficiency.ts +++ b/src/module/rules/rule-element/martial-proficiency.ts @@ -2,7 +2,7 @@ import { CharacterPF2e } from "@actor"; import { ActorType } from "@actor/data/index.ts"; import { ArmorCategory } from "@item/armor/types.ts"; import { ARMOR_CATEGORIES } from "@item/armor/values.ts"; -import { ProficiencyRank } from "@item/data/index.ts"; +import { ProficiencyRank } from "@item/base/data/index.ts"; import { WeaponCategory } from "@item/weapon/types.ts"; import { WEAPON_CATEGORIES } from "@item/weapon/values.ts"; import { ZeroToFour } from "@module/data.ts"; diff --git a/src/module/rules/rule-element/token-mark/rule-element.ts b/src/module/rules/rule-element/token-mark/rule-element.ts index d37d8c16272..f8c2d79b5b5 100644 --- a/src/module/rules/rule-element/token-mark/rule-element.ts +++ b/src/module/rules/rule-element/token-mark/rule-element.ts @@ -3,8 +3,8 @@ import { SlugField } from "@system/schema-data-fields.ts"; import { ErrorPF2e } from "@util"; import { UUIDUtils } from "@util/uuid.ts"; import type { StringField } from "types/foundry/common/data/fields.d.ts"; -import { RuleElementPF2e, RuleElementSchema, RuleElementSource } from "../index.js"; -import { MarkTargetPrompt } from "./prompt.js"; +import { RuleElementPF2e, RuleElementSchema, RuleElementSource } from "../index.ts"; +import { MarkTargetPrompt } from "./prompt.ts"; /** Remember a token for later referencing */ class TokenMarkRuleElement extends RuleElementPF2e { diff --git a/src/module/rules/synthetics.ts b/src/module/rules/synthetics.ts index 4c2d1d3022d..e1cf7a1eca9 100644 --- a/src/module/rules/synthetics.ts +++ b/src/module/rules/synthetics.ts @@ -7,7 +7,7 @@ import type { TokenEffect } from "@actor/token-effect.ts"; import { MovementType } from "@actor/types.ts"; import { MeleePF2e, WeaponPF2e } from "@item"; import { ActionTrait } from "@item/ability/index.ts"; -import { ConditionSource, EffectSource } from "@item/data/index.ts"; +import { ConditionSource, EffectSource } from "@item/base/data/index.ts"; import { WeaponPropertyRuneType } from "@item/weapon/types.ts"; import { RollNotePF2e } from "@module/notes.ts"; import { MaterialDamageEffect } from "@system/damage/types.ts"; diff --git a/src/module/scene/token-document/aura/index.ts b/src/module/scene/token-document/aura/index.ts index 5cde1eee216..421a34f477d 100644 --- a/src/module/scene/token-document/aura/index.ts +++ b/src/module/scene/token-document/aura/index.ts @@ -1,5 +1,5 @@ import { AuraAppearanceData, AuraData, AuraEffectData } from "@actor/types.ts"; -import { ItemTrait } from "@item/data/base.ts"; +import { ItemTrait } from "@item/base/data/system.ts"; import { EffectAreaSquare } from "@module/canvas/effect-area-square.ts"; import { measureDistanceCuboid } from "@module/canvas/index.ts"; import { getAreaSquares } from "@module/canvas/token/aura/util.ts"; diff --git a/src/module/scene/token-document/aura/types.ts b/src/module/scene/token-document/aura/types.ts index e20290e066b..b837458a009 100644 --- a/src/module/scene/token-document/aura/types.ts +++ b/src/module/scene/token-document/aura/types.ts @@ -1,5 +1,5 @@ import { AuraAppearanceData } from "@actor/types.ts"; -import { ItemTrait } from "@item/data/base.ts"; +import { ItemTrait } from "@item/base/data/system.ts"; import type { TokenPF2e } from "@module/canvas/index.ts"; import type { TokenDocumentPF2e } from "../index.ts"; diff --git a/src/module/system/schema-data-fields.ts b/src/module/system/schema-data-fields.ts index b0a5bb05643..ceab7e2847e 100644 --- a/src/module/system/schema-data-fields.ts +++ b/src/module/system/schema-data-fields.ts @@ -1,7 +1,7 @@ import { PredicatePF2e, PredicateStatement, RawPredicate, StatementValidator } from "@system/predication.ts"; import { SlugCamel, sluggify } from "@util"; import { isObject } from "remeda"; -import DataModel, { _DataModel } from "types/foundry/common/abstract/data.js"; +import type DataModel from "types/foundry/common/abstract/data.d.ts"; import type { ArrayFieldOptions, CleanFieldOptions, @@ -196,7 +196,7 @@ class DataUnionField< override initialize( value: unknown, - model?: ConstructorOf> | undefined, + model?: ConstructorOf | undefined, options?: object | undefined ): MaybeUnionSchemaProp { const field = this.fields.find((f) => !f.validate(value)); diff --git a/src/module/system/settings/homebrew/helpers.ts b/src/module/system/settings/homebrew/helpers.ts index 84917772f5e..a0a257c1f98 100644 --- a/src/module/system/settings/homebrew/helpers.ts +++ b/src/module/system/settings/homebrew/helpers.ts @@ -1,5 +1,5 @@ import { ActorSourcePF2e } from "@actor/data/index.ts"; -import { ItemSourcePF2e, MeleeSource, WeaponSource } from "@item/data/index.ts"; +import { ItemSourcePF2e, MeleeSource, WeaponSource } from "@item/base/data/index.ts"; import { MigrationBase } from "@module/migration/base.ts"; import { MigrationRunnerBase } from "@module/migration/runner/base.ts"; import { isObject } from "@util"; diff --git a/src/module/system/settings/homebrew/menu.ts b/src/module/system/settings/homebrew/menu.ts index 5025d6977a2..7fdff35deca 100644 --- a/src/module/system/settings/homebrew/menu.ts +++ b/src/module/system/settings/homebrew/menu.ts @@ -1,4 +1,4 @@ -import { ItemSheetPF2e } from "@item/sheet/base.ts"; +import { ItemSheetPF2e } from "@item/base/sheet/base.ts"; import { MigrationBase } from "@module/migration/base.ts"; import { MigrationRunner } from "@module/migration/runner/index.ts"; import { immunityTypes, resistanceTypes, weaknessTypes } from "@scripts/config/iwr.ts"; diff --git a/src/module/system/tag-selector/basic.ts b/src/module/system/tag-selector/basic.ts index 4f9942e1ed4..8f34293a906 100644 --- a/src/module/system/tag-selector/basic.ts +++ b/src/module/system/tag-selector/basic.ts @@ -1,7 +1,7 @@ import type { ActorPF2e } from "@actor"; import { ActorSourcePF2e } from "@actor/data/index.ts"; import type { ItemPF2e } from "@item"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import { ValuesList } from "@module/data.ts"; import { htmlQuery, htmlQueryAll } from "@util"; import { BaseTagSelector, TagSelectorData } from "./base.ts"; diff --git a/src/module/system/text-editor.ts b/src/module/system/text-editor.ts index 872fc9b060b..00175cfdd3e 100644 --- a/src/module/system/text-editor.ts +++ b/src/module/system/text-editor.ts @@ -4,7 +4,7 @@ import { ActorSheetPF2e } from "@actor/sheet/base.ts"; import { StrikeSelf } from "@actor/types.ts"; import { SAVE_TYPES, SKILL_DICTIONARY, SKILL_EXPANDED } from "@actor/values.ts"; import { ItemPF2e, ItemSheetPF2e } from "@item"; -import { ItemSystemData } from "@item/data/base.ts"; +import { ItemSystemData } from "@item/base/data/system.ts"; import { ChatMessagePF2e } from "@module/chat-message/index.ts"; import { extractDamageDice, @@ -27,9 +27,9 @@ import { import { UUIDUtils } from "@util/uuid.ts"; import * as R from "remeda"; import { DamagePF2e } from "./damage/damage.ts"; +import { DamageModifierDialog } from "./damage/dialog.ts"; import { createDamageFormula } from "./damage/formula.ts"; import { applyDamageDiceOverrides, damageDiceIcon, extractBaseDamage, looksLikeDamageRoll } from "./damage/helpers.ts"; -import { DamageModifierDialog } from "./damage/dialog.ts"; import { DamageRoll } from "./damage/roll.ts"; import { DamageFormulaData, DamageRollContext, SimpleDamageTemplate } from "./damage/types.ts"; import { Statistic } from "./statistic/index.ts"; diff --git a/src/scripts/config/traits.ts b/src/scripts/config/traits.ts index 50cea24a687..2f7af6c0247 100644 --- a/src/scripts/config/traits.ts +++ b/src/scripts/config/traits.ts @@ -3,7 +3,7 @@ import { OtherArmorTag } from "@item/armor/types.ts"; import { BackgroundTrait } from "@item/background/types.ts"; import { ClassTrait } from "@item/class/types.ts"; import { OtherConsumableTag } from "@item/consumable/types.ts"; -import { RANGE_TRAITS } from "@item/data/values.ts"; +import { RANGE_TRAITS } from "@item/base/data/values.ts"; import { PreciousMaterialType } from "@item/physical/types.ts"; import { MagicSchool, MagicTradition } from "@item/spell/types.ts"; import { OtherWeaponTag } from "@item/weapon/types.ts"; diff --git a/src/scripts/hooks/init.ts b/src/scripts/hooks/init.ts index 46a2d8c88f6..16559c11764 100644 --- a/src/scripts/hooks/init.ts +++ b/src/scripts/hooks/init.ts @@ -1,4 +1,4 @@ -import { MystifiedTraits } from "@item/data/values.ts"; +import { MystifiedTraits } from "@item/base/data/values.ts"; import { HotbarPF2e } from "@module/apps/hotbar.ts"; import { ActorDirectoryPF2e, diff --git a/src/scripts/register-sheets.ts b/src/scripts/register-sheets.ts index 1e4ac5de446..b48450cc3e3 100644 --- a/src/scripts/register-sheets.ts +++ b/src/scripts/register-sheets.ts @@ -24,7 +24,7 @@ import { KitSheetPF2e } from "@item/kit/sheet.ts"; import { MeleeSheetPF2e } from "@item/melee/sheet.ts"; import { PhysicalItemSheetPF2e } from "@item/physical/sheet.ts"; import { PHYSICAL_ITEM_TYPES } from "@item/physical/values.ts"; -import { ItemSheetPF2e } from "@item/sheet/base.ts"; +import { ItemSheetPF2e } from "@item/base/sheet/base.ts"; import { SpellSheetPF2e } from "@item/spell/index.ts"; import { TreasureSheetPF2e } from "@item/treasure/sheet.ts"; import { WeaponSheetPF2e } from "@item/weapon/sheet.ts"; diff --git a/src/util/misc.ts b/src/util/misc.ts index c0d1c7d1467..7f21e86babc 100644 --- a/src/util/misc.ts +++ b/src/util/misc.ts @@ -1,4 +1,4 @@ -import { ActionCost } from "@item/data/base.ts"; +import { ActionCost } from "@item/base/data/system.ts"; import Sortable from "sortablejs"; /** diff --git a/tests/mocks/actor.ts b/tests/mocks/actor.ts index db579b13972..c4153ba9c62 100644 --- a/tests/mocks/actor.ts +++ b/tests/mocks/actor.ts @@ -2,7 +2,7 @@ import type { ActorPF2e } from "@actor"; import { ActorSystemSource } from "@actor/data/base.ts"; import { ActorSourcePF2e } from "@actor/data/index.ts"; import type { ItemPF2e } from "@item"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import type { ActiveEffectPF2e } from "@module/active-effect.ts"; import type { ScenePF2e } from "@scene"; import type { TokenDocumentPF2e } from "@scene/token-document/document.ts"; diff --git a/tests/mocks/item.ts b/tests/mocks/item.ts index d5e4f248efc..29e31f939d8 100644 --- a/tests/mocks/item.ts +++ b/tests/mocks/item.ts @@ -1,6 +1,6 @@ import type { ActorPF2e } from "@actor/index.ts"; -import { ItemSystemSource } from "@item/data/base.ts"; -import { ItemSourcePF2e } from "@item/data/index.ts"; +import { ItemSystemSource } from "@item/base/data/system.ts"; +import { ItemSourcePF2e } from "@item/base/data/index.ts"; import type { ItemPF2e } from "@item/index.ts"; export class MockItem { diff --git a/vite.config.ts b/vite.config.ts index e626e9489fe..e92eb782106 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -1,4 +1,4 @@ -import { ConditionSource } from "@item/data/index.ts"; +import { ConditionSource } from "@item/base/data/index.ts"; import { execSync } from "child_process"; import esbuild from "esbuild"; import fs from "fs-extra";