Raised version

* .

* .

* Apply suggestion from @CarlosFdez

---------

Co-authored-by: Carlos Fernandez <CarlosFdez@users.noreply.github.com>

lang/en.json

@@ -1451,7 +1451,7 @@
                 },
                 "triggerType": "Trigger Type",
                 "triggeringActorType": "Triggering Actor Type",
-                "triggerError": "{trigger} trigger failed for {actor}. It's probably configured wrong."
+                "triggerError": "{trigger} trigger on {item}({itemUuid}) failed for {actor}. It's probably configured wrong."
             },
             "WeaponFeature": {
                 "barrier": {

module/applications/dialogs/d20RollDialog.mjs

@@ -160,7 +160,7 @@ export default class D20RollDialog extends HandlebarsApplicationMixin(Applicatio
         }
         if (rest.hasOwnProperty('trait')) {
             this.config.roll.trait = rest.trait;
-            if (!this.config.source.item)
+            if (!this.config.source.item && this.config.roll.trait)
                 this.config.title = game.i18n.format('DAGGERHEART.UI.Chat.dualityRoll.abilityCheckTitle', {
                     ability: game.i18n.localize(abilities[this.config.roll.trait]?.label)
                 });
@@ -225,7 +225,6 @@ export default class D20RollDialog extends HandlebarsApplicationMixin(Applicatio
     }
 
     static async submitRoll(event) {
-        event.preventDefault();
         await this.close({ submitted: true });
     }
 

module/applications/sheets-configs/adversary-settings.mjs

@@ -10,11 +10,7 @@ export default class DHAdversarySettings extends DHBaseActorSettings {
         actions: {
             addExperience: DHAdversarySettings.#addExperience,
             removeExperience: DHAdversarySettings.#removeExperience
-        },
+        }
-        dragDrop: [
-            { dragSelector: null, dropSelector: '.tab.features' },
-            { dragSelector: '.feature-item', dropSelector: null }
-        ]
     };
 
     /**@override */
@@ -38,7 +34,8 @@ export default class DHAdversarySettings extends DHBaseActorSettings {
         },
         features: {
             id: 'features',
-            template: 'systems/daggerheart/templates/sheets-settings/adversary-settings/features.hbs'
+            template: 'systems/daggerheart/templates/sheets-settings/adversary-settings/features.hbs',
+            scrollable: ['']
         }
     };
 
@@ -54,12 +51,16 @@ export default class DHAdversarySettings extends DHBaseActorSettings {
     async _prepareContext(options) {
         const context = await super._prepareContext(options);
 
-        const featureForms = Object.keys(CONFIG.DH.ITEM.featureForm);
+        // Get feature groups. Uncategorized go to actions
-        context.features = context.document.system.features.sort((a, b) =>
+        const featureFormsTypes = ['passive', 'action', 'reaction'];
-            a.system.featureForm !== b.system.featureForm
+        const features = this.document.system.features.sort((a, b) => a.sort - b.sort);
-                ? featureForms.indexOf(a.system.featureForm) - featureForms.indexOf(b.system.featureForm)
+        const featureGroups = featureFormsTypes.map(t => ({
-                : a.sort - b.sort
+            featureForm: t,
-        );
+            label: _loc(CONFIG.DH.ITEM.featureForm[t]),
+            features: features.filter(f => f.system.featureForm === t)
+        }));
+        featureGroups[1].features.push(...features.filter(f => !featureFormsTypes.includes(f.system.featureForm)));
+        context.featureGroups = featureGroups;
 
         return context;
     }

module/applications/sheets-configs/environment-settings.mjs

@@ -32,11 +32,13 @@ export default class DHEnvironmentSettings extends DHBaseActorSettings {
         },
         features: {
             id: 'features',
-            template: 'systems/daggerheart/templates/sheets-settings/environment-settings/features.hbs'
+            template: 'systems/daggerheart/templates/sheets-settings/environment-settings/features.hbs',
+            scrollable: ['']
         },
         adversaries: {
             id: 'adversaries',
-            template: 'systems/daggerheart/templates/sheets-settings/environment-settings/adversaries.hbs'
+            template: 'systems/daggerheart/templates/sheets-settings/environment-settings/adversaries.hbs',
+            scrollable: ['']
         }
     };
 
@@ -52,12 +54,16 @@ export default class DHEnvironmentSettings extends DHBaseActorSettings {
     async _prepareContext(options) {
         const context = await super._prepareContext(options);
 
-        const featureForms = ['passive', 'action', 'reaction'];
+        // Get feature groups. Uncategorized go to actions
-        context.features = context.document.system.features.sort((a, b) =>
+        const featureFormsTypes = ['passive', 'action', 'reaction'];
-            a.system.featureForm !== b.system.featureForm
+        const features = this.document.system.features.sort((a, b) => a.sort - b.sort);
-                ? featureForms.indexOf(a.system.featureForm) - featureForms.indexOf(b.system.featureForm)
+        const featureGroups = featureFormsTypes.map(t => ({
-                : a.sort - b.sort
+            featureForm: t,
-        );
+            label: _loc(CONFIG.DH.ITEM.featureForm[t]),
+            features: features.filter(f => f.system.featureForm === t)
+        }));
+        featureGroups[1].features.push(...features.filter(f => !featureFormsTypes.includes(f.system.featureForm)));
+        context.featureGroups = featureGroups;
 
         return context;
     }

module/applications/sheets-configs/npc-settings.mjs

@@ -27,7 +27,8 @@ export default class DHNPCSettings extends DHBaseActorSettings {
         },
         features: {
             id: 'features',
-            template: 'systems/daggerheart/templates/sheets-settings/npc-settings/features.hbs'
+            template: 'systems/daggerheart/templates/sheets-settings/npc-settings/features.hbs',
+            scrollable: ['']
         }
     };
 
@@ -43,12 +44,16 @@ export default class DHNPCSettings extends DHBaseActorSettings {
     async _prepareContext(options) {
         const context = await super._prepareContext(options);
 
-        const featureForms = ['passive', 'action', 'reaction'];
+        // Get feature groups. Uncategorized go to actions
-        context.features = context.document.system.features.sort((a, b) =>
+        const featureFormsTypes = ['passive', 'action', 'reaction'];
-            a.system.featureForm !== b.system.featureForm
+        const features = this.document.system.features.sort((a, b) => a.sort - b.sort);
-                ? featureForms.indexOf(a.system.featureForm) - featureForms.indexOf(b.system.featureForm)
+        const featureGroups = featureFormsTypes.map(t => ({
-                : a.sort - b.sort
+            featureForm: t,
-        );
+            label: _loc(CONFIG.DH.ITEM.featureForm[t]),
+            features: features.filter(f => f.system.featureForm === t)
+        }));
+        featureGroups[1].features.push(...features.filter(f => !featureFormsTypes.includes(f.system.featureForm)));
+        context.featureGroups = featureGroups;
 
         return context;
     }

module/applications/sheets/api/actor-setting.mjs

@@ -25,7 +25,7 @@ export default class DHBaseActorSettings extends DHApplicationMixin(ActorSheetV2
         },
         dragDrop: [
             { dragSelector: null, dropSelector: '.tab.features' },
-            { dragSelector: '.feature-item', dropSelector: null }
+            { dragSelector: '.feature-item, .inventory-item[data-type="feature"]', dropSelector: null }
         ]
     };
 
@@ -77,7 +77,7 @@ export default class DHBaseActorSettings extends DHApplicationMixin(ActorSheetV2
     }
 
     async _onDragStart(event) {
-        const featureItemEl = event.currentTarget.closest('.feature-item');
+        const featureItemEl = event.currentTarget.closest('.feature-item, .inventory-item[data-type="feature"]');
         const feature = this.actor.items.get(featureItemEl?.dataset.itemId);
         if (feature && event.target.closest('.tab.features')) {
             const featureData = { ...feature.toDragData(), fromInternal: true };
@@ -100,4 +100,7 @@ export default class DHBaseActorSettings extends DHApplicationMixin(ActorSheetV2
             await this.actor.createEmbeddedDocuments('Item', [itemData]);
         }
     }
+
+    /** Setting sheets do not auto extend */
+    async _autoExpandDescriptions() {}
 }

module/applications/sheets/api/application-mixin.mjs

@@ -4,6 +4,7 @@ import { getDocFromElement, getDocFromElementSync, tagifyElement } from '../../.
 const typeSettingsMap = {
     character: 'extendCharacterDescriptions',
     adversary: 'extendAdversaryDescriptions',
+    npc: 'extendAdversaryDescriptions',
     environment: 'extendEnvironmentDescriptions',
     ancestry: 'extendItemDescriptions',
     community: 'extendItemDescriptions',
@@ -262,7 +263,7 @@ export default function DHApplicationMixin(Base) {
 
             if (!!this.options.contextMenus.length) this._createContextMenus();
 
-            this.#autoExtendDescriptions(context);
+            this._autoExpandDescriptions(context);
         }
 
         /** @inheritDoc */
@@ -517,7 +518,7 @@ export default function DHApplicationMixin(Base) {
                         const doc = await getDocFromElement(target),
                             action = doc?.system?.attack ?? doc;
                         const config = action.prepareConfig(event);
-                        config.effects = await game.system.api.data.actions.actionsTypes.base.getEffects(
+                        config.effects = await game.system.api.data.actions.actionsTypes.base.getActionRelevantEffects(
                             this.document,
                             doc
                         );
@@ -630,8 +631,9 @@ export default function DHApplicationMixin(Base) {
         /**
          * Extend inventory description when enabled in settings.
          * @returns {Promise<void>}
+         * @protected
          */
-        async #autoExtendDescriptions(context) {
+        async _autoExpandDescriptions(context) {
             const inventoryItems = this.element.querySelectorAll('.inventory-item[data-item-uuid]');
             for (const el of inventoryItems) {
                 // Get the doc uuid from the element
@@ -734,7 +736,7 @@ export default function DHApplicationMixin(Base) {
          * @type {ApplicationClickAction}
          */
         static async #onCreateDoc(event, target) {
-            const { documentClass, type, inVault, disabled } = target.dataset;
+            const { documentClass, type, inVault, disabled, featureForm } = target.dataset;
             const parentIsItem = this.document.documentName === 'Item';
             const featureOnCharacter = this.document.parent?.type === 'character' && type === 'feature';
             const parent = featureOnCharacter
@@ -752,6 +754,7 @@ export default function DHApplicationMixin(Base) {
                     identifier: this.document.system.isMulticlass ? 'multiclass' : null
                 };
             }
+            if (featureForm) systemData.featureForm = featureForm;
 
             const cls =
                 type === 'action' ? game.system.api.models.actions.actionsTypes.base : getDocumentClass(documentClass);

module/applications/sheets/api/base-actor.mjs

@@ -212,7 +212,7 @@ export default class DHBaseActorSheet extends DHApplicationMixin(ActorSheetV2) {
                     const doc = await getDocFromElement(target),
                         action = doc?.system?.attack ?? doc;
                     const config = action.prepareConfig(event);
-                    config.effects = await game.system.api.data.actions.actionsTypes.base.getEffects(
+                    config.effects = await game.system.api.data.actions.actionsTypes.base.getActionRelevantEffects(
                         this.document,
                         doc
                     );

module/applications/ui/countdowns.mjs

@@ -342,29 +342,31 @@ export default class DhCountdowns extends HandlebarsApplicationMixin(Application
      * Sends updates of the countdowns to the GM player. Since this is asynchronous, be sure to
      * update all the countdowns at the same time.
      *
-     * @param  {...any} progressTypes Countdowns to be updated
+     * @param  {...(string | { type: string; undo?: boolean })} progressTypes Countdowns to be updated
      */
     static async updateCountdowns(...progressTypes) {
+        progressTypes = progressTypes.map(p => typeof p === 'string' ? { type: p } : p);
         const { countdownAutomation } = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Automation);
         if (!countdownAutomation) return;
 
         const countdownSetting = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Countdowns);
         const updatedCountdowns = Object.keys(countdownSetting.countdowns).reduce((acc, key) => {
             const countdown = countdownSetting.countdowns[key];
-            if (progressTypes.indexOf(countdown.progress.type) !== -1 && countdown.progress.current > 0) {
+            const progressData = progressTypes.find(x => x.type === countdown.progress.type);
-                acc.push(key);
+            if (progressData && countdown.progress.current > 0) {
+                acc[key] = { value: progressData.undo ? 1 : -1 };
             }
 
             return acc;
-        }, []);
+        }, {});
 
         const countdownData = countdownSetting.toObject();
         const settings = {
             ...countdownData,
             countdowns: Object.keys(countdownData.countdowns).reduce((acc, key) => {
                 const countdown = foundry.utils.deepClone(countdownData.countdowns[key]);
-                if (updatedCountdowns.includes(key)) {
+                if (updatedCountdowns[key]) {
-                    countdown.progress.current -= 1;
+                    countdown.progress.current += updatedCountdowns[key].value;
                 }
 
                 acc[key] = countdown;

module/data/action/baseAction.mjs

@@ -228,7 +228,8 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
         let config = this.prepareConfig(event, configOptions);
         if (!config) return;
 
-        config.effects = await game.system.api.data.actions.actionsTypes.base.getEffects(this.actor, this.item);
+        config.effects = 
+            await game.system.api.data.actions.actionsTypes.base.getActionRelevantEffects(this.actor, this.item);
 
         if (Hooks.call(`${CONFIG.DH.id}.preUseAction`, this, config) === false) return;
 
@@ -333,27 +334,43 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
     }
 
     /**
-     * Get the all potentially applicable effects on the actor
+     * Get the all potentially applicable effects on the actor for the action's RollDialog
      * @param {DHActor} actor The actor performing the action
      * @param {DHItem|DhActor} effectParent The parent of the effect
      * @returns {DhActiveEffect[]}
      */
-    static async getEffects(actor, effectParent) {
+    static async getActionRelevantEffects(actor, effectParent) {
         if (!actor) return [];
 
-        return Array.from(await actor.allApplicableEffects({ noTransferArmor: true, noSelfArmor: true })).filter(
+        // Changes on weapon effects are not typically only applicable to show in the roll dialog for the weapon itself 
-            effect => {
+        // The exemptions to this rule are listed below
-                /* Effects on weapons only ever apply for the weapon itself */
+        const weaponTransferredEffectKeys = [
+            'system.bonuses.roll.spellcast.bonus'
+        ];
+
+        return Array.from(await actor.allApplicableEffects({ noTransferArmor: true, noSelfArmor: true })).reduce(
+            (acc, effect) => {
+                const effectData = effect.toObject();
+                /* Effects on weapons only ever apply for the weapon itself, with a few defined exceptions */
                 if (effect.parent.type === 'weapon') {
                     /* Unless they're secondary - then they apply only to other primary weapons */
                     if (effect.parent.system.secondary) {
-                        if (effectParent?.type !== 'weapon' || effectParent?.system.secondary) return false;
+                        if (effectParent?.type !== 'weapon' || effectParent?.system.secondary) {
-                    } else if (effectParent?.id !== effect.parent.id) return false;
+                            effectData.system.changes = 
+                                effectData.system.changes.filter(x => weaponTransferredEffectKeys.includes(x.key));
+                        } 
+                    } else if (effectParent?.id !== effect.parent.id) {
+                        effectData.system.changes = 
+                            effectData.system.changes.filter(x => weaponTransferredEffectKeys.includes(x.key));
+                    }
                 }
 
-                return !effect.isSuppressed;
+                if (!effect.isSuppressed) {
+                    acc.push(effectData);
                 }
-        );
+
+                return acc;
+            }, []);
     }
 
     /**

module/data/registeredTriggers.mjs

@@ -150,11 +150,14 @@ export default class RegisteredTriggers extends Map {
                         const result = await command(...args);
                         if (result?.updates?.length) updates.push(...result.updates);
                     } catch {
+                        const item = await foundry.utils.fromUuid(itemUuid);
                         const triggerName = game.i18n.localize(triggerData.label);
-                        ui.notifications.error(
+                        console.error(
                             game.i18n.format('DAGGERHEART.CONFIG.Triggers.triggerError', {
                                 trigger: triggerName,
-                                actor: currentActor?.name
+                                actor: currentActor?.name,
+                                item: item?.name ?? '<Missing Item>',
+                                itemUuid: item?.uuid ?? '<Missing UUID>'
                             })
                         );
                     }

module/dice/helpers.mjs

@@ -1,19 +1,28 @@
 import { ResourceUpdateMap } from '../data/action/baseAction.mjs';
 
 export function updateResourcesForDualityReroll(oldDuality, newDuality, actor) {
-    const { hopeFear } = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Automation);
-    if (game.user.isGM ? !hopeFear.gm : !hopeFear.players) return;
-
-    const updates = [];
     const hope = (newDuality >= 0 ? 1 : 0) - (oldDuality >= 0 ? 1 : 0);
     const stress = (newDuality === 0 ? 1 : 0) - (oldDuality === 0 ? 1 : 0);
     const fear = (newDuality === -1 ? 1 : 0) - (oldDuality === -1 ? 1 : 0);
 
+    const { hopeFear, countdownAutomation } = 
+        game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Automation);
+
+    if (game.user.isGM ? hopeFear.gm : hopeFear.players) {
+        const updates = [];
         if (hope !== 0) updates.push({ key: 'hope', value: hope, enabled: true });
         if (stress !== 0) updates.push({ key: 'stress', value: -1 * stress, enabled: true });
-    if (fear !== 0) updates.push({ key: 'fear', value: fear, enabled: true });
+        if (fear !== 0) updates.push({ key: 'fear', value: fear, enabled: true })
 
         const resourceUpdates = new ResourceUpdateMap(actor);
         resourceUpdates.addResources(updates);
         resourceUpdates.updateResources();
     }
+
+    if (countdownAutomation && fear !== 0) {
+        game.system.api.applications.ui.DhCountdowns.updateCountdowns({ 
+            type: CONFIG.DH.GENERAL.countdownProgressionTypes.fear.id, 
+            undo: fear === 1 ? false : true 
+        });
+    }
+}

module/documents/actor.mjs

@@ -549,7 +549,7 @@ export default class DhpActor extends Actor {
             headerTitle: game.i18n.format('DAGGERHEART.UI.Chat.dualityRoll.abilityCheckTitle', {
                 ability: abilityLabel
             }),
-            effects: await game.system.api.data.actions.actionsTypes.base.getEffects(this),
+            effects: await game.system.api.data.actions.actionsTypes.base.getActionRelevantEffects(this),
             roll: {
                 trait: trait,
                 type: 'trait'

module/documents/chatMessage.mjs

@@ -167,7 +167,7 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage {
         if (this.system.action) {
             const actor = await foundry.utils.fromUuid(config.source.actor);
             const item = actor?.items.get(config.source.item) ?? null;
-            config.effects = await game.system.api.data.actions.actionsTypes.base.getEffects(actor, item);
+            config.effects = await game.system.api.data.actions.actionsTypes.base.getActionRelevantEffects(actor, item);
             await this.system.action.workflow.get('damage')?.execute(config, this._id, true);
         }
     }

system.json

@@ -2,7 +2,7 @@
     "id": "daggerheart",
     "title": "Daggerheart",
     "description": "An unofficial implementation of the Daggerheart system",
-    "version": "2.3.4",
+    "version": "2.4.0",
     "compatibility": {
         "minimum": "14.364",
         "verified": "14.364",
@@ -10,7 +10,7 @@
     },
     "url": "https://github.com/Foundryborne/daggerheart",
     "manifest": "https://raw.githubusercontent.com/Foundryborne/daggerheart/v14/system.json",
-    "download": "https://github.com/Foundryborne/daggerheart/releases/download/2.3.4/system.zip",
+    "download": "https://github.com/Foundryborne/daggerheart/releases/download/2.4.0/system.zip",
     "authors": [
         {
             "name": "WBHarry"

templates/sheets-settings/adversary-settings/features.hbs

@@ -3,27 +3,31 @@
     data-tab='{{tabs.features.id}}'
     data-group='{{tabs.features.group}}'
 >
-    <button type="button" class="add-feature-btn" data-action="createDoc" data-document-class="Item" data-type="feature">
+    {{#each featureGroups as |group|}}
-        {{localize "DOCUMENT.New" type=(localize "TYPES.Item.feature")}}
-    </button>
         <fieldset>
-        <legend>{{localize tabs.features.label}}</legend>
+            <legend>
+                {{group.label}}
+                <a data-action="createDoc" data-document-class="Item" data-type="feature" data-tooltip="{{localize 'DOCUMENT.Create' type=(localize "TYPES.Item.feature")}}" data-feature-form="{{group.featureForm}}">
+                    <i class="fa-solid fa-plus icon-button"></i>
+                </a>
+            </legend>
             <ul class="feature-list">
-            {{#each @root.features as |feature|}}
+                {{#each group.features as |feature|}}
-                <li class="feature-item" data-item-id="{{feature.id}}" draggable="true">
+                    {{> 'daggerheart.inventory-item'
-                    <img src="{{feature.img}}" alt="">
+                        item=feature
-                    <div class="label">
+                        type='feature'
-                        <span>{{feature.name}}</span>
+                        actorType=@root.document.type
-                    </div>
+                        hideTags=true
-                    <div class="controls">
+                        hideContextMenu=true
-                        <a data-action="editDoc" data-item-uuid="{{feature.uuid}}" data-tooltip="{{localize 'CONTROLS.CommonEdit'}}"><i class="fa-solid fa-pen-to-square"></i></a>
+                        hideResources=true
-                        <a data-action="deleteDoc"  data-item-uuid="{{feature.uuid}}" data-tooltip="{{localize 'CONTROLS.CommonDelete'}}"><i class="fa-solid fa-trash"></i></a>
+                        showActions=false
-                    </div>
+                        hideTooltip=true
-                </li>
+                    }}
                 {{/each}}
             </ul>
+        </fieldset>
+    {{/each}}
     <div class="features-dragger">
         <span>{{localize "DAGGERHEART.GENERAL.dropFeaturesHere"}}</span>
     </div>
-    </fieldset>
 </section>

templates/sheets-settings/environment-settings/features.hbs

@@ -3,24 +3,31 @@
     data-tab='{{tabs.features.id}}'
     data-group='{{tabs.features.group}}'
 >
-    <button type="button" class="add-feature-btn" data-action="createDoc" data-document-class="Item" data-type="feature">
+    {{#each featureGroups as |group|}}
-        {{localize "DOCUMENT.New" type=(localize "TYPES.Item.feature")}}
-    </button>
         <fieldset>
-        <legend>{{localize tabs.features.label}}</legend>
+            <legend>
+                {{group.label}}
+                <a data-action="createDoc" data-document-class="Item" data-type="feature" data-tooltip="{{localize 'DOCUMENT.Create' type=(localize "TYPES.Item.feature")}}" data-feature-form="{{group.featureForm}}">
+                    <i class="fa-solid fa-plus icon-button"></i>
+                </a>
+            </legend>
             <ul class="feature-list">
-            {{#each @root.features as |feature|}}
+                {{#each group.features as |feature|}}
-                <li class="feature-item" data-item-id="{{feature.id}}">
+                    {{> 'daggerheart.inventory-item'
-                    <img src="{{feature.img}}" alt="">
+                        item=feature
-                    <div class="label">
+                        type='feature'
-                        <span>{{feature.name}}</span>
+                        actorType=@root.document.type
-                    </div>
+                        hideTags=true
-                    <div class="controls">
+                        hideContextMenu=true
-                        <a data-action="editDoc" data-item-uuid="{{feature.uuid}}" data-tooltip="{{localize 'CONTROLS.CommonEdit'}}"><i class="fa-solid fa-pen-to-square"></i></a>
+                        hideResources=true
-                        <a data-action="deleteDoc"  data-item-uuid="{{feature.uuid}}" data-tooltip="{{localize 'CONTROLS.CommonDelete'}}"><i class="fa-solid fa-trash"></i></a>
+                        showActions=false
-                    </div>
+                        hideTooltip=true
-                </li>
+                    }}
                 {{/each}}
             </ul>
         </fieldset>
+    {{/each}}
+    <div class="features-dragger">
+        <span>{{localize "DAGGERHEART.GENERAL.dropFeaturesHere"}}</span>
+    </div>
 </section>

templates/sheets-settings/npc-settings/features.hbs

@@ -3,27 +3,31 @@
     data-tab='{{tabs.features.id}}'
     data-group='{{tabs.features.group}}'
 >
-    <button type="button" class="add-feature-btn" data-action="createDoc" data-document-class="Item" data-type="feature">
+    {{#each featureGroups as |group|}}
-        {{localize "DOCUMENT.New" type=(localize "TYPES.Item.feature")}}
-    </button>
         <fieldset>
-        <legend>{{localize tabs.features.label}}</legend>
+            <legend>
+                {{group.label}}
+                <a data-action="createDoc" data-document-class="Item" data-type="feature" data-tooltip="{{localize 'DOCUMENT.Create' type=(localize "TYPES.Item.feature")}}" data-feature-form="{{group.featureForm}}">
+                    <i class="fa-solid fa-plus icon-button"></i>
+                </a>
+            </legend>
             <ul class="feature-list">
-            {{#each @root.features as |feature|}}
+                {{#each group.features as |feature|}}
-                <li class="feature-item" data-item-id="{{feature.id}}" draggable="true">
+                    {{> 'daggerheart.inventory-item'
-                    <img src="{{feature.img}}" alt="">
+                        item=feature
-                    <div class="label">
+                        type='feature'
-                        <span>{{feature.name}}</span>
+                        actorType=@root.document.type
-                    </div>
+                        hideTags=true
-                    <div class="controls">
+                        hideContextMenu=true
-                        <a data-action="editDoc" data-item-uuid="{{feature.uuid}}" data-tooltip="{{localize 'CONTROLS.CommonEdit'}}"><i class="fa-solid fa-pen-to-square"></i></a>
+                        hideResources=true
-                        <a data-action="deleteDoc"  data-item-uuid="{{feature.uuid}}" data-tooltip="{{localize 'CONTROLS.CommonDelete'}}"><i class="fa-solid fa-trash"></i></a>
+                        showActions=false
-                    </div>
+                        hideTooltip=true
-                </li>
+                    }}
                 {{/each}}
             </ul>
+        </fieldset>
+    {{/each}}
     <div class="features-dragger">
         <span>{{localize "DAGGERHEART.GENERAL.dropFeaturesHere"}}</span>
     </div>
-    </fieldset>
 </section>

templates/sheets/global/partials/inventory-item-V2.hbs

@@ -27,11 +27,11 @@ Parameters:
 >
   <div class="inventory-item-header {{#if hideContextMenu}}padded{{/if}}" {{#unless noExtensible}}data-action="toggleExtended" {{/unless}}>
     {{!-- Image --}}
-    <div class="img-portait" data-action='{{ifThen item.usable "useItem" (ifThen
+    <div class="img-portait" draggable="true"
-      (hasProperty item "toChat" ) "toChat" "editDoc" ) }}' {{#unless hideTooltip}} {{#if (eq type 'attack' )}}
+        {{#unless (eq showActions false)}}data-action='{{ifThen item.usable "useItem" (ifThen (hasProperty item "toChat" ) "toChat" "editDoc" ) }}'{{/unless}}
-      data-tooltip="#attack#{{item.actor.uuid}}" {{else}} data-tooltip="#item#{{item.uuid}}" {{/if}} {{/unless}} draggable="true">
+        {{#unless hideTooltip}} {{#if (eq type 'attack' )}} data-tooltip="#attack#{{item.actor.uuid}}" {{else}} data-tooltip="#item#{{item.uuid}}" {{/if}} {{/unless}}>
         <img src="{{item.img}}" class="item-img {{#if isActor}}actor-img{{/if}}" />
-      {{#if item.usable}}
+        {{#if (and item.usable (ne showActions false))}}
             {{#if @root.isNPC}}
                 <img class="roll-img d20" src="systems/daggerheart/assets/icons/dice/default/d20.svg" alt="d20">
             {{else}}
@@ -46,10 +46,10 @@ Parameters:
         <span class="item-name">{{localize item.name}} {{#unless (or noExtensible (not item.system.description))}}<span class="expanded-icon"><i class="fa-solid fa-expand"></i></span>{{/unless}}</span>
 
         {{!-- Tags Start --}}
-        {{#if (not ../hideTags)}}
+        {{#if (not hideTags)}}
             {{#> "systems/daggerheart/templates/sheets/global/partials/item-tags.hbs" item}}
                 {{#if (eq ../type 'feature')}}
-                    {{#if (and system.featureForm (or (eq @root.document.type "adversary") (eq @root.document.type "environment")))}}
+                    {{#if (and system.featureForm (ne @root.document.type "character"))}}
                         <div class="tag feature-form">
                             <span class="recall-value">{{localize (concat "DAGGERHEART.CONFIG.FeatureForm." system.featureForm)}}</span>
                         </div>