[#4809] Fix base item choices when enchanted.

foundryvtt · Dec 11, 2024 · b9da4b6 · b9da4b6
1 parent cf0c994
commit b9da4b6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/module/applications/item/item-sheet.mjs b/module/applications/item/item-sheet.mjs
@@ -262,17 +262,18 @@ export default class ItemSheet5e extends ItemSheet {
 
   /**
    * Get the base weapons and tools based on the selected type.
+   * @param {object} [context]        Sheet preparation context.
    * @returns {Promise<object|null>}  Object with base items for this type formatted for selectOptions.
    * @protected
    */
-  async _getItemBaseTypes() {
+  async _getItemBaseTypes(context) {
     const baseIds = this.item.type === "equipment" ? {
       ...CONFIG.DND5E.armorIds,
       ...CONFIG.DND5E.shieldIds
     } : CONFIG.DND5E[`${this.item.type}Ids`];
     if ( baseIds === undefined ) return null;
 
-    const baseType = this.item.system.type.value;
+    const baseType = context?.source.type.value ?? this.item.system.type.value;
 
     const items = {};
     for ( const [name, id] of Object.entries(baseIds) ) {

diff --git a/module/applications/item/sheet-v2-mixin.mjs b/module/applications/item/sheet-v2-mixin.mjs
@@ -111,7 +111,6 @@ export default function ItemSheetV2Mixin(Base) {
         user: game.user,
 
         // Physical items
-        baseItems: await this._getItemBaseTypes(),
         isPhysical: "quantity" in this.item.system,
 
         // Identified state
@@ -136,6 +135,9 @@ export default function ItemSheetV2Mixin(Base) {
       context.fields = schema.fields;
       if ( !context.editable ) context.source = context.system;
 
+      // Physical items
+      context.baseItems = await this._getItemBaseTypes(context);
+
       // Set some default collapsed states on first open.
       if ( foundry.utils.isEmpty(this._collapsed) ) Object.assign(this._collapsed, {
         "system.description.chat": true,