Fix conflict

module/applications/sheets/activeEffectConfig.mjs

@@ -1,4 +1,4 @@
-export default class DhActiveEffectConfig extends ActiveEffectConfig {
+export default class DhActiveEffectConfig extends foundry.applications.sheets.ActiveEffectConfig {
     static DEFAULT_OPTIONS = {
         classes: ['daggerheart', 'sheet', 'dh-style']
     };

module/applications/sheets/character.mjs

@@ -165,18 +165,18 @@ export default class CharacterSheet extends DaggerheartSheet(ActorSheetV2) {
         context.config = SYSTEM;
 
         const selectedAttributes = Object.values(this.document.system.traits).map(x => x.base);
-        context.abilityScoreArray = JSON.parse(
-            await game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.General.AbilityArray)
-        ).reduce((acc, x) => {
-            const selectedIndex = selectedAttributes.indexOf(x);
-            if (selectedIndex !== -1) {
-                selectedAttributes.splice(selectedIndex, 1);
-            } else {
-                acc.push({ name: x, value: x });
-            }
+        context.abilityScoreArray = await game.settings
+            .get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Homebrew)
+            .traitArray.reduce((acc, x) => {
+                const selectedIndex = selectedAttributes.indexOf(x);
+                if (selectedIndex !== -1) {
+                    selectedAttributes.splice(selectedIndex, 1);
+                } else {
+                    acc.push({ name: x, value: x });
+                }
 
-            return acc;
-        }, []);
+                return acc;
+            }, []);
         if (!context.abilityScoreArray.includes(0)) context.abilityScoreArray.push({ name: 0, value: 0 });
         context.abilityScoresFinished = context.abilityScoreArray.every(x => x.value === 0);
 
@@ -370,7 +370,11 @@ export default class CharacterSheet extends DaggerheartSheet(ActorSheetV2) {
     static async attackRoll(event, button) {
         const weapon = await fromUuid(button.dataset.weapon);
         if (!weapon) return;
-        weapon.use(event);
+
+        const wasUsed = await weapon.use(event);
+        if (wasUsed) {
+            Hooks.callAll(SYSTEM.HOOKS.characterAttack, {});
+        }
     }
 
     static openLevelUp() {

module/applications/sheets/items/class.mjs

@@ -221,46 +221,53 @@ export default class ClassSheet extends DaggerheartSheet(ItemSheetV2) {
     async _onDrop(event) {
         const data = TextEditor.getDragEventData(event);
         const item = await fromUuid(data.uuid);
+        const target = event.target.closest('fieldset.drop-section');
         if (item.type === 'subclass') {
             await this.document.update({
                 'system.subclasses': [...this.document.system.subclasses.map(x => x.uuid), item.uuid]
             });
         } else if (item.type === 'weapon') {
-            if (event.currentTarget.classList.contains('primary-weapon-section')) {
+            if (target.classList.contains('primary-weapon-section')) {
                 if (!this.document.system.characterGuide.suggestedPrimaryWeapon && !item.system.secondary)
                     await this.document.update({
                         'system.characterGuide.suggestedPrimaryWeapon': item.uuid
                     });
-            } else if (event.currentTarget.classList.contains('secondary-weapon-section')) {
+            } else if (target.classList.contains('secondary-weapon-section')) {
                 if (!this.document.system.characterGuide.suggestedSecondaryWeapon && item.system.secondary)
                     await this.document.update({
                         'system.characterGuide.suggestedSecondaryWeapon': item.uuid
                     });
             }
         } else if (item.type === 'armor') {
-            if (event.currentTarget.classList.contains('armor-section')) {
+            if (target.classList.contains('armor-section')) {
                 if (!this.document.system.characterGuide.suggestedArmor)
                     await this.document.update({
                         'system.characterGuide.suggestedArmor': item.uuid
                     });
             }
-        } else if (event.currentTarget.classList.contains('choice-a-section')) {
+        } else if (target.classList.contains('choice-a-section')) {
             if (item.type === 'miscellaneous' || item.type === 'consumable') {
                 if (this.document.system.inventory.choiceA.length < 2)
                     await this.document.update({
-                        'system.inventory.choiceA': [...this.document.system.inventory.choiceA, item.uuid]
+                        'system.inventory.choiceA': [
+                            ...this.document.system.inventory.choiceA.map(x => x.uuid),
+                            item.uuid
+                        ]
                     });
             }
         } else if (item.type === 'miscellaneous') {
-            if (event.currentTarget.classList.contains('take-section')) {
+            if (target.classList.contains('take-section')) {
                 if (this.document.system.inventory.take.length < 3)
                     await this.document.update({
-                        'system.inventory.take': [...this.document.system.inventory.take, item.uuid]
+                        'system.inventory.take': [...this.document.system.inventory.take.map(x => x.uuid), item.uuid]
                     });
-            } else if (event.currentTarget.classList.contains('choice-b-section')) {
+            } else if (target.classList.contains('choice-b-section')) {
                 if (this.document.system.inventory.choiceB.length < 2)
                     await this.document.update({
-                        'system.inventory.choiceB': [...this.document.system.inventory.choiceB, item.uuid]
+                        'system.inventory.choiceB': [
+                            ...this.document.system.inventory.choiceB.map(x => x.uuid),
+                            item.uuid
+                        ]
                     });
             }
         }

module/applications/sheets/pseudo-documents/_module.mjs

@@ -1 +0,0 @@
-export {default as PseudoDocumentSheet }from "./pseudo-documents-sheet.mjs";

module/applications/sheets/pseudo-documents/pseudo-documents-sheet.mjs

@@ -1,66 +0,0 @@
-const { ApplicationV2, HandlebarsApplicationMixin } = foundry.applications.api;
-
-export default class PseudoDocumentSheet extends HandlebarsApplicationMixin(ApplicationV2) {
-  constructor(options) {
-    super(options);
-    this.#pseudoDocument = options.document;
-  }
-
-  /**
-  * The UUID of the associated pseudo-document
-  * @type {string}
-  */
-  get pseudoUuid() {
-    return this.pseudoDocument.uuid;
-  }
-
-  #pseudoDocument;
-
-  /**
-   * The pseudo-document instance this sheet represents
-   * @type {object}
-   */
-  get pseudoDocument() {
-    return this.#pseudoDocument;
-  }
-
-  static DEFAULT_OPTIONS = {
-    tag: 'form',
-    classes: ['daggerheart', 'sheet'],
-    position: { width: 600 },
-    form: {
-      handler: PseudoDocumentSheet.#onSubmitForm,
-      submitOnChange: true,
-      closeOnSubmit: false
-    },
-    dragDrop: [{ dragSelector: null, dropSelector: null }],
-  };
-
-  static PARTS = {
-    header: { template: 'systems/daggerheart/templates/sheets/pseudo-documents/header.hbs' },
-  };
-
-  /** @inheritDoc */
-  async _prepareContext(options) {
-    const context = await super._prepareContext(options);
-    const document = this.pseudoDocument;
-    return Object.assign(context, {
-      document,
-      source: document._source,
-      editable: this.isEditable,
-      user: game.user,
-      rootId: this.id,
-    });
-  }
-
-  /**
-   * Form submission handler
-   * @param {SubmitEvent | Event} event - The originating form submission or input change event
-   * @param {HTMLFormElement} form - The form element that was submitted
-   * @param {foundry.applications.ux.FormDataExtended} formData - Processed data for the submitted form
-   */
-  static async #onSubmitForm(event, form, formData) {
-    const submitData = foundry.utils.expandObject(formData.object);
-    await this.pseudoDocument.update(submitData);
-  }
-}