Bug/fixed character attack (#192)

* Fixed weapon useage in Character

* Added DHContextMenu to pass on the event from clicking a contextmenuitem

daggerheart.mjs

@@ -112,6 +112,7 @@ Hooks.once('init', () => {
     CONFIG.Token.rulerClass = DhpTokenRuler;
 
     CONFIG.ui.resources = Resources;
+    CONFIG.ux.ContextMenu = applications.DhContextMenu;
 
     game.socket.on(`system.${SYSTEM.id}`, handleSocketEvent);
 

module/applications/_module.mjs

@@ -13,5 +13,6 @@ export { default as DhpArmor } from './sheets/items/armor.mjs';
 export { default as DhpChatMessage } from './chatMessage.mjs';
 export { default as DhpEnvironment } from './sheets/environment.mjs';
 export { default as DhActiveEffectConfig } from './sheets/activeEffectConfig.mjs';
+export { default as DhContextMenu } from './contextMenu.mjs';
 
 export * as api from './sheets/api/_modules.mjs';

module/applications/contextMenu.mjs

@@ -0,0 +1,24 @@
+export default class DhContextMenu extends ContextMenu {
+    constructor(container, selector, menuItems, options) {
+        super(container, selector, menuItems, options);
+
+        /** @deprecated since v13 until v15 */
+        this.#jQuery = options.jQuery;
+    }
+
+    #jQuery;
+
+    activateListeners(menu) {
+        menu.addEventListener('click', this.#onClickItem.bind(this));
+    }
+
+    #onClickItem(event) {
+        event.preventDefault();
+        event.stopPropagation();
+        const element = event.target.closest('.context-item');
+        if (!element) return;
+        const item = this.menuItems.find(i => i.element === element);
+        item?.callback(this.#jQuery ? $(this.target) : this.target, event);
+        this.close();
+    }
+}

module/applications/countdowns.mjs

@@ -48,8 +48,8 @@ class Countdowns extends HandlebarsApplicationMixin(ApplicationV2) {
         super._attachPartListeners(partId, htmlElement, options);
 
         htmlElement.querySelectorAll('.mini-countdown-container').forEach(element => {
-            element.addEventListener('click', event => this.updateCountdownValue.bind(this)(event, true));
+            element.addEventListener('click', event => this.updateCountdownValue.bind(this)(event, false));
-            element.addEventListener('contextmenu', event => this.updateCountdownValue.bind(this)(event, false));
+            element.addEventListener('contextmenu', event => this.updateCountdownValue.bind(this)(event, true));
         });
     }
 

module/applications/sheets/character.mjs

@@ -25,7 +25,7 @@ export default class CharacterSheet extends DaggerheartSheet(ActorSheetV2) {
             toggleStress: this.toggleStress,
             toggleHope: this.toggleHope,
             toggleGold: this.toggleGold,
-            attackRoll: this.attackRoll,
+            toggleLoadoutView: this.toggleLoadoutView,
             useDomainCard: this.useDomainCard,
             removeCard: this.removeDomainCard,
             selectClass: this.selectClass,
@@ -222,7 +222,7 @@ export default class CharacterSheet extends DaggerheartSheet(ActorSheetV2) {
             useItem: {
                 name: 'DAGGERHEART.Sheets.PC.ContextMenu.UseItem',
                 icon: '<i class="fa-solid fa-burst"></i>',
-                callback: this.constructor.useItem.bind(this)
+                callback: (element, event) => this.constructor.useItem.bind(this)(event, element)
             },
             equip: {
                 name: 'DAGGERHEART.Sheets.PC.ContextMenu.Equip',
@@ -547,14 +547,10 @@ export default class CharacterSheet extends DaggerheartSheet(ActorSheetV2) {
         await this.document.update({ [update]: newValue });
     }
 
-    static async attackRoll(event, button) {
+    static async toggleLoadoutView(_, button) {
-        const weapon = await fromUuid(button.dataset.weapon);
+        const newAbilityView = !(button.dataset.value === 'true');
-        if (!weapon) return;
+        await game.user.setFlag(SYSTEM.id, SYSTEM.FLAGS.displayDomainCardsAsList, newAbilityView);
-
+        this.render();
-        const wasUsed = await weapon.use(event);
-        if (wasUsed) {
-            Hooks.callAll(SYSTEM.HOOKS.characterAttack, {});
-        }
     }
 
     static levelManagement() {
@@ -644,10 +640,13 @@ export default class CharacterSheet extends DaggerheartSheet(ActorSheetV2) {
         (await game.packs.get('daggerheart.communities'))?.render(true);
     }
 
-    static useItem(element, button) {
+    static async useItem(event, button) {
-        const id = (button ?? element).closest('a').id,
+        const id = button.closest('a').id,
             item = this.document.items.get(id);
-        item.use({});
+        const wasUsed = await item.use(event);
+        if (wasUsed && item.type === 'weapon') {
+            Hooks.callAll(SYSTEM.HOOKS.characterAttack, {});
+        }
     }
 
     static async viewObject(element, button) {