Extand action to other item types

module/applications/sheets/item.mjs

@@ -0,0 +1,129 @@
+import DhpApplicationMixin from './daggerheart-sheet.mjs';
+import DHActionConfig from '../config/Action.mjs';
+import { actionsTypes } from '../../data/_module.mjs';
+
+export default function DHItemMixin(Base) {
+    return class DHItemSheetV2 extends DhpApplicationMixin(Base) {
+        constructor(options = {}) {
+            super(options);
+        }
+
+        static DEFAULT_OPTIONS = {
+            tag: 'form',
+            classes: ['daggerheart', 'sheet', 'item', 'dh-style'],
+            position: { width: 600 },
+            form: {
+                handler: this.updateForm,
+                submitOnChange: true,
+                closeOnSubmit: false
+            },
+            actions: {
+                addAction: this.addAction,
+                editAction: this.editAction,
+                removeAction: this.removeAction
+            }
+        }
+
+        static TABS = {
+            description: {
+                active: true,
+                cssClass: '',
+                group: 'primary',
+                id: 'description',
+                icon: null,
+                label: 'DAGGERHEART.Sheets.Feature.Tabs.Description'
+            },
+            actions: {
+                active: false,
+                cssClass: '',
+                group: 'primary',
+                id: 'actions',
+                icon: null,
+                label: 'DAGGERHEART.Sheets.Feature.Tabs.Actions'
+            },
+            settings: {
+                active: false,
+                cssClass: '',
+                group: 'primary',
+                id: 'settings',
+                icon: null,
+                label: 'DAGGERHEART.Sheets.Feature.Tabs.Settings'
+            }
+        }
+
+        async _prepareContext(_options) {
+            const context = await super._prepareContext(_options);
+            context.document = this.document;
+            context.config = CONFIG.daggerheart;
+            context.tabs = super._getTabs(this.constructor.TABS);
+
+            return context;
+        }
+
+        static async updateForm(event, _, formData) {
+            await this.document.update(formData.object);
+            this.render();
+        }
+
+        static async selectActionType() {
+            const content = await foundry.applications.handlebars.renderTemplate(
+                    "systems/daggerheart/templates/views/actionType.hbs",
+                    {types: SYSTEM.ACTIONS.actionTypes}
+                ),
+                title = 'Select Action Type',
+                type = 'form',
+                data = {};
+            return Dialog.prompt({
+                title,
+                label: title,
+                content, type,
+                callback: html => {
+                    const form = html[0].querySelector("form"),
+                        fd = new foundry.applications.ux.FormDataExtended(form);
+                    foundry.utils.mergeObject(data, fd.object, { inplace: true });
+                    // if (!data.name?.trim()) data.name = game.i18n.localize(SYSTEM.ACTIONS.actionTypes[data.type].name);
+                    return data;
+                },
+                rejectClose: false
+            })
+        }
+        
+        static async addAction() {
+            const actionType = await DHItemSheetV2.selectActionType(),
+                actionIndexes = this.document.system.actions.map(x => x._id.split('-')[2]).sort((a, b) => a - b)
+            try {
+                const cls = actionsTypes[actionType?.type] ?? actionsTypes.attack,
+                    action = new cls(
+                        {
+                            // id: `${this.document.id}-Action-${actionIndexes.length > 0 ? actionIndexes[0] + 1 : 1}`
+                            _id: foundry.utils.randomID(),
+                            type: actionType.type,
+                            name: game.i18n.localize(SYSTEM.ACTIONS.actionTypes[actionType.type].name),
+                            ...cls.getSourceConfig(this.document)
+                        },
+                        {
+                            parent: this.document
+                        }
+                    );
+                    await this.document.update({ 'system.actions': [...this.document.system.actions, action] });
+                    await new DHActionConfig(this.document.system.actions[this.document.system.actions.length - 1]).render(true);
+            } catch (error) {
+                console.log(error)
+            }
+        }
+
+        static async editAction(_, button) {
+            const action = this.document.system.actions[button.dataset.index];
+            await new DHActionConfig(action).render(true);
+        }
+
+        static async removeAction(event, button) {
+            event.stopPropagation();
+            await this.document.update({
+                'system.actions': this.document.system.actions.filter(
+                    (_, index) => index !== Number.parseInt(button.dataset.index)
+                )
+            });
+        }
+    }
+}

module/applications/sheets/items/armor.mjs

@@ -1,16 +1,9 @@
-import DaggerheartSheet from '../daggerheart-sheet.mjs';
+import DHItemSheetV2 from '../item.mjs';
 
 const { ItemSheetV2 } = foundry.applications.sheets;
-export default class ArmorSheet extends DaggerheartSheet(ItemSheetV2) {
+export default class ArmorSheet extends DHItemSheetV2(ItemSheetV2) {
     static DEFAULT_OPTIONS = {
-        tag: 'form',
+        classes: ['armor'],
-        classes: ['daggerheart', 'sheet', 'item', 'dh-style', 'armor'],
-        position: { width: 600 },
-        form: {
-            handler: this.updateForm,
-            submitOnChange: true,
-            closeOnSubmit: false
-        },
         dragDrop: [{ dragSelector: null, dropSelector: null }]
     };
 
@@ -18,42 +11,13 @@ export default class ArmorSheet extends DaggerheartSheet(ItemSheetV2) {
         header: { template: 'systems/daggerheart/templates/sheets/items/armor/header.hbs' },
         tabs: { template: 'systems/daggerheart/templates/sheets/global/tabs/tab-navigation.hbs' },
         description: { template: 'systems/daggerheart/templates/sheets/global/tabs/tab-description.hbs' },
+        actions: {
+            template: 'systems/daggerheart/templates/sheets/global/tabs/tab-actions.hbs',
+            scrollable: ['.actions']
+        },
         settings: {
             template: 'systems/daggerheart/templates/sheets/items/armor/settings.hbs',
             scrollable: ['.settings']
         }
     };
-
-    static TABS = {
-        description: {
-            active: true,
-            cssClass: '',
-            group: 'primary',
-            id: 'description',
-            icon: null,
-            label: 'DAGGERHEART.Sheets.Feature.Tabs.Description'
-        },
-        settings: {
-            active: false,
-            cssClass: '',
-            group: 'primary',
-            id: 'settings',
-            icon: null,
-            label: 'DAGGERHEART.Sheets.Feature.Tabs.Settings'
-        }
-    };
-
-    async _prepareContext(_options) {
-        const context = await super._prepareContext(_options);
-        context.document = this.document;
-        context.config = CONFIG.daggerheart;
-        context.tabs = super._getTabs(this.constructor.TABS);
-
-        return context;
-    }
-
-    static async updateForm(event, _, formData) {
-        await this.document.update(formData.object);
-        this.render();
-    }
 }

module/applications/sheets/items/consumable.mjs

@@ -1,57 +1,23 @@
-import DaggerheartSheet from '../daggerheart-sheet.mjs';
+import DHItemSheetV2 from '../item.mjs'
 
 const { ItemSheetV2 } = foundry.applications.sheets;
-export default class ConsumableSheet extends DaggerheartSheet(ItemSheetV2) {
+export default class ConsumableSheet extends DHItemSheetV2(ItemSheetV2) {
     static DEFAULT_OPTIONS = {
-        tag: 'form',
+        classes: ['consumable'],
-        classes: ['daggerheart', 'sheet', 'item', 'dh-style', 'consumable'],
+        position: { width: 550 }
-        position: { width: 550 },
-        form: {
-            handler: this.updateForm,
-            submitOnChange: true,
-            closeOnSubmit: false
-        }
     };
 
     static PARTS = {
         header: { template: 'systems/daggerheart/templates/sheets/items/consumable/header.hbs' },
         tabs: { template: 'systems/daggerheart/templates/sheets/global/tabs/tab-navigation.hbs' },
         description: { template: 'systems/daggerheart/templates/sheets/global/tabs/tab-description.hbs' },
+        actions: {
+            template: 'systems/daggerheart/templates/sheets/global/tabs/tab-actions.hbs',
+            scrollable: ['.actions']
+        },
         settings: {
             template: 'systems/daggerheart/templates/sheets/items/consumable/settings.hbs',
             scrollable: ['.settings']
         }
     };
-
-    static TABS = {
-        description: {
-            active: true,
-            cssClass: '',
-            group: 'primary',
-            id: 'description',
-            icon: null,
-            label: 'DAGGERHEART.Sheets.Feature.Tabs.Description'
-        },
-        settings: {
-            active: false,
-            cssClass: '',
-            group: 'primary',
-            id: 'settings',
-            icon: null,
-            label: 'DAGGERHEART.Sheets.Feature.Tabs.Settings'
-        }
-    };
-
-    async _prepareContext(_options) {
-        const context = await super._prepareContext(_options);
-        context.document = this.document;
-        context.tabs = super._getTabs(this.constructor.TABS);
-
-        return context;
-    }
-
-    static async updateForm(event, _, formData) {
-        await this.document.update(formData.object);
-        this.render();
-    }
 }

module/applications/sheets/items/domainCard.mjs

@@ -1,23 +1,10 @@
-import DHAction from '../../../data/action/action.mjs';
+import DHItemSheetV2 from '../item.mjs'
-import DHActionConfig from '../../config/Action.mjs';
-import DaggerheartSheet from '../daggerheart-sheet.mjs';
 
 const { ItemSheetV2 } = foundry.applications.sheets;
-export default class DomainCardSheet extends DaggerheartSheet(ItemSheetV2) {
+export default class DomainCardSheet extends DHItemSheetV2(ItemSheetV2) {
     static DEFAULT_OPTIONS = {
-        tag: 'form',
+        classes: ['domain-card'],
-        classes: ['daggerheart', 'sheet', 'item', 'dh-style', 'domain-card'],
+        position: { width: 450, height: 700 }
-        position: { width: 450, height: 700 },
-        actions: {
-            addAction: this.addAction,
-            editAction: this.editAction,
-            removeAction: this.removeAction
-        },
-        form: {
-            handler: this.updateForm,
-            submitOnChange: true,
-            closeOnSubmit: false
-        }
     };
 
     static PARTS = {
@@ -33,75 +20,4 @@ export default class DomainCardSheet extends DaggerheartSheet(ItemSheetV2) {
             scrollable: ['.settings']
         }
     };
-
-    static TABS = {
-        description: {
-            active: true,
-            cssClass: '',
-            group: 'primary',
-            id: 'description',
-            icon: null,
-            label: 'DAGGERHEART.Sheets.Feature.Tabs.Description'
-        },
-        actions: {
-            active: false,
-            cssClass: '',
-            group: 'primary',
-            id: 'actions',
-            icon: null,
-            label: 'DAGGERHEART.Sheets.Feature.Tabs.Actions'
-        },
-        settings: {
-            active: false,
-            cssClass: '',
-            group: 'primary',
-            id: 'settings',
-            icon: null,
-            label: 'DAGGERHEART.Sheets.Feature.Tabs.Settings'
-        }
-    };
-
-    async _prepareContext(_options) {
-        const context = await super._prepareContext(_options);
-        context.config = CONFIG.daggerheart;
-        context.tabs = super._getTabs(this.constructor.TABS);
-
-        return context;
-    }
-
-    static async updateForm(event, _, formData) {
-        await this.document.update(formData.object);
-        this.render();
-    }
-
-    static async addAction() {
-        const actionIndexes = this.document.system.actions.map(x => x.id.split('-')[2]).sort((a, b) => a - b);
-        const action = await new DHAction(
-            {
-                id: `${this.document.id}-Action-${actionIndexes.length > 0 ? actionIndexes[0] + 1 : 1}`
-                // id: foundry.utils.randomID()
-            },
-            {
-                parent: this.document
-            }
-        );
-        await this.document.update({ 'system.actions': [...this.document.system.actions, action] });
-        await new DHActionConfig(this.document.system.actions[this.document.system.actions.length - 1]).render(
-            true
-        );
-    }
-
-    static async editAction(_, button) {
-        const action = this.document.system.actions[button.dataset.index];
-        await new DHActionConfig(action).render(true);
-    }
-
-    static async removeAction(event, button) {
-        event.stopPropagation();
-        await this.document.update({
-            'system.actions': this.document.system.actions.filter(
-                (_, index) => index !== Number.parseInt(button.dataset.index)
-            )
-        });
-    }
 }

module/applications/sheets/items/feature.mjs

@@ -1,9 +1,7 @@
-import DHAction from '../../../data/action/action.mjs';
+import DHItemSheetV2 from '../item.mjs'
-import DHActionConfig from '../../config/Action.mjs';
-import DaggerheartSheet from '../daggerheart-sheet.mjs';
 
 const { ItemSheetV2 } = foundry.applications.sheets;
-export default class FeatureSheet extends DaggerheartSheet(ItemSheetV2) {
+export default class FeatureSheet extends DHItemSheetV2(ItemSheetV2) {
     constructor(options = {}) {
         super(options);
 
@@ -11,22 +9,13 @@ export default class FeatureSheet extends DaggerheartSheet(ItemSheetV2) {
     }
 
     static DEFAULT_OPTIONS = {
-        tag: 'form',
         id: 'daggerheart-feature',
-        classes: ['daggerheart', 'sheet', 'item', 'dh-style', 'feature'],
+        classes: ['feature'],
         position: { width: 600, height: 600 },
         window: { resizable: true },
         actions: {
             addEffect: this.addEffect,
-            removeEffect: this.removeEffect,
+            removeEffect: this.removeEffect
-            addAction: this.addAction,
-            editAction: this.editAction,
-            removeAction: this.removeAction
-        },
-        form: {
-            handler: this.updateForm,
-            submitOnChange: true,
-            closeOnSubmit: false
         }
     };
 
@@ -49,30 +38,7 @@ export default class FeatureSheet extends DaggerheartSheet(ItemSheetV2) {
     };
 
     static TABS = {
-        description: {
+        ...super.TABS,
-            active: true,
-            cssClass: '',
-            group: 'primary',
-            id: 'description',
-            icon: null,
-            label: 'DAGGERHEART.Sheets.Feature.Tabs.Description'
-        },
-        actions: {
-            active: false,
-            cssClass: '',
-            group: 'primary',
-            id: 'actions',
-            icon: null,
-            label: 'DAGGERHEART.Sheets.Feature.Tabs.Actions'
-        },
-        settings: {
-            active: false,
-            cssClass: '',
-            group: 'primary',
-            id: 'settings',
-            icon: null,
-            label: 'DAGGERHEART.Sheets.Feature.Tabs.Settings'
-        },
         effects: {
             active: false,
             cssClass: '',
@@ -102,11 +68,6 @@ export default class FeatureSheet extends DaggerheartSheet(ItemSheetV2) {
         return context;
     }
 
-    static async updateForm(event, _, formData) {
-        await this.document.update(formData.object);
-        this.render();
-    }
-
     effectSelect(event) {
         this.selectedEffectType = event.currentTarget.value;
         this.render(true);
@@ -130,29 +91,4 @@ export default class FeatureSheet extends DaggerheartSheet(ItemSheetV2) {
         const path = `system.effects.-=${button.dataset.effect}`;
         await this.item.update({ [path]: null });
     }
-
-    static async addAction() {
-        const action = new DHAction({
-            id: foundry.utils.randomID(),
-            // img: this.document.img
-        }, { parent: this.document });
-        await this.document.update({ 'system.actions': [...this.document.system.actions, action] });
-        await new DHActionConfig(this.document.system.actions[this.document.system.actions.length - 1]).render(
-            true
-        );
-    }
-
-    static async editAction(_, button) {
-        const action = this.document.system.actions[button.dataset.index];
-        await new DHActionConfig(action).render(true);
-    }
-
-    static async removeAction(event, button) {
-        event.stopPropagation();
-        await this.document.update({
-            'system.actions': this.document.system.actions.filter(
-                (_, index) => index !== Number.parseInt(button.dataset.index)
-            )
-        });
-    }
 }

module/applications/sheets/items/miscellaneous.mjs

@@ -1,57 +1,23 @@
-import DaggerheartSheet from '../daggerheart-sheet.mjs';
+import DHItemSheetV2 from '../item.mjs'
 
 const { ItemSheetV2 } = foundry.applications.sheets;
-export default class MiscellaneousSheet extends DaggerheartSheet(ItemSheetV2) {
+export default class MiscellaneousSheet extends DHItemSheetV2(ItemSheetV2) {
     static DEFAULT_OPTIONS = {
-        tag: 'form',
+        classes: ['miscellaneous'],
-        classes: ['daggerheart', 'sheet', 'item', 'dh-style', 'miscellaneous'],
+        position: { width: 550 }
-        position: { width: 550 },
-        form: {
-            handler: this.updateForm,
-            submitOnChange: true,
-            closeOnSubmit: false
-        }
     };
 
     static PARTS = {
         header: { template: 'systems/daggerheart/templates/sheets/items/miscellaneous/header.hbs' },
         tabs: { template: 'systems/daggerheart/templates/sheets/global/tabs/tab-navigation.hbs' },
         description: { template: 'systems/daggerheart/templates/sheets/global/tabs/tab-description.hbs' },
+        actions: {
+            template: 'systems/daggerheart/templates/sheets/global/tabs/tab-actions.hbs',
+            scrollable: ['.actions']
+        },
         settings: {
             template: 'systems/daggerheart/templates/sheets/items/miscellaneous/settings.hbs',
             scrollable: ['.settings']
         }
     };
-
-    static TABS = {
-        description: {
-            active: true,
-            cssClass: '',
-            group: 'primary',
-            id: 'description',
-            icon: null,
-            label: 'DAGGERHEART.Sheets.Feature.Tabs.Description'
-        },
-        settings: {
-            active: false,
-            cssClass: '',
-            group: 'primary',
-            id: 'settings',
-            icon: null,
-            label: 'DAGGERHEART.Sheets.Feature.Tabs.Settings'
-        }
-    };
-
-    async _prepareContext(_options) {
-        const context = await super._prepareContext(_options);
-        context.document = this.document;
-        context.tabs = super._getTabs(this.constructor.TABS);
-
-        return context;
-    }
-
-    static async updateForm(event, _, formData) {
-        await this.document.update(formData.object);
-        this.render();
-    }
 }

module/applications/sheets/items/weapon.mjs

@@ -1,24 +1,10 @@
-import DHActionConfig from '../../config/Action.mjs';
+import DHItemSheetV2 from '../item.mjs'
-import DaggerheartSheet from '../daggerheart-sheet.mjs';
-import { actionsTypes } from '../../../data/_module.mjs';
 
 const { ItemSheetV2 } = foundry.applications.sheets;
-export default class WeaponSheet extends DaggerheartSheet(ItemSheetV2) {
+export default class WeaponSheet extends DHItemSheetV2(ItemSheetV2) {
     static DEFAULT_OPTIONS = {
-        tag: 'form',
+        classes: ['weapon']
-        classes: ['daggerheart', 'sheet', 'item', 'dh-style', 'weapon'],
+    }
-        position: { width: 600 },
-        actions: {
-            addAction: this.addAction,
-            editAction: this.editAction,
-            removeAction: this.removeAction
-        },
-        form: {
-            handler: this.updateForm,
-            submitOnChange: true,
-            closeOnSubmit: false
-        }
-    };
 
     static PARTS = {
         header: { template: 'systems/daggerheart/templates/sheets/items/weapon/header.hbs' },
@@ -32,107 +18,5 @@ export default class WeaponSheet extends DaggerheartSheet(ItemSheetV2) {
             template: 'systems/daggerheart/templates/sheets/items/weapon/settings.hbs',
             scrollable: ['.settings']
         }
-    };
-
-    static TABS = {
-        description: {
-            active: true,
-            cssClass: '',
-            group: 'primary',
-            id: 'description',
-            icon: null,
-            label: 'DAGGERHEART.Sheets.Feature.Tabs.Description'
-        },
-        actions: {
-            active: false,
-            cssClass: '',
-            group: 'primary',
-            id: 'actions',
-            icon: null,
-            label: 'DAGGERHEART.Sheets.Feature.Tabs.Actions'
-        },
-        settings: {
-            active: false,
-            cssClass: '',
-            group: 'primary',
-            id: 'settings',
-            icon: null,
-            label: 'DAGGERHEART.Sheets.Feature.Tabs.Settings'
-        }
-    };
-
-    async _prepareContext(_options) {
-        const context = await super._prepareContext(_options);
-        context.document = this.document;
-        context.config = CONFIG.daggerheart;
-        context.tabs = super._getTabs(this.constructor.TABS);
-
-        return context;
-    }
-
-    static async updateForm(event, _, formData) {
-        await this.document.update(formData.object);
-        this.render();
-    }
-
-    static async selectActionType() {
-        const content = await foundry.applications.handlebars.renderTemplate(
-                "systems/daggerheart/templates/views/actionType.hbs",
-                {types: SYSTEM.ACTIONS.actionTypes}
-            ),
-            title = 'Select Action Type',
-            type = 'form',
-            data = {};
-        return Dialog.prompt({
-            title,
-            label: title,
-            content, type,
-            callback: html => {
-                const form = html[0].querySelector("form"),
-                    fd = new foundry.applications.ux.FormDataExtended(form);
-                foundry.utils.mergeObject(data, fd.object, { inplace: true });
-                // if (!data.name?.trim()) data.name = game.i18n.localize(SYSTEM.ACTIONS.actionTypes[data.type].name);
-                return data;
-            },
-            rejectClose: false
-        })
-    }
-    
-    static async addAction() {
-        const actionType = await WeaponSheet.selectActionType(),
-            actionIndexes = this.document.system.actions.map(x => x._id.split('-')[2]).sort((a, b) => a - b)
-        try {
-            const cls = actionsTypes[actionType?.type] ?? actionsTypes.attack,
-                action = new cls(
-                    {
-                        // id: `${this.document.id}-Action-${actionIndexes.length > 0 ? actionIndexes[0] + 1 : 1}`
-                        _id: foundry.utils.randomID(),
-                        type: actionType.type,
-                        name: game.i18n.localize(SYSTEM.ACTIONS.actionTypes[actionType.type].name),
-                        ...cls.getSourceConfig(this.document)
-                    },
-                    {
-                        parent: this.document
-                    }
-                );
-                await this.document.update({ 'system.actions': [...this.document.system.actions, action] });
-                await new DHActionConfig(this.document.system.actions[this.document.system.actions.length - 1]).render(true);
-        } catch (error) {
-            console.log(error)
-        }
-    }
-
-    static async editAction(_, button) {
-        const action = this.document.system.actions[button.dataset.index];
-        await new DHActionConfig(action).render(true);
-    }
-
-    static async removeAction(event, button) {
-        event.stopPropagation();
-        await this.document.update({
-            'system.actions': this.document.system.actions.filter(
-                (_, index) => index !== Number.parseInt(button.dataset.index)
-            )
-        });
     }
 }

module/data/action/action.mjs

@@ -46,6 +46,8 @@ const fields = foundry.data.fields;
     - Target Check
     - Cost Check
     - Range Check
+    - Area of effect and measurement placement
+    - Auto use costs and action
 */
 
 export class DHBaseAction extends foundry.abstract.DataModel {