From a42d708f15cbb5c1a688c06f47ed8c545b903afa Mon Sep 17 00:00:00 2001
From: WBHarry <89362246+WBHarry@users.noreply.github.com>
Date: Sun, 8 Mar 2026 14:34:22 +0100
Subject: [PATCH 01/11] [Feature] Phase Transform (#1710)

* Added transform action to handle phased adversaries

* Added support for keeping currently marked hitPoints/stress when transforming

* Minor fixes

* Compendium update

* Added consideration for an active combatant
---
 lang/en.json                                  |  15 +++
 .../sheets-configs/action-base-config.mjs     |  51 ++++++++-
 module/config/actionConfig.mjs                |   6 ++
 module/data/action/_module.mjs                |   4 +-
 module/data/action/baseAction.mjs             |   6 +-
 module/data/action/transformAction.mjs        |   5 +
 module/data/fields/action/_module.mjs         |   1 +
 module/data/fields/action/transformField.mjs  | 101 ++++++++++++++++++
 module/systemRegistration/handlebars.mjs      |   1 +
 ...rlord__Realm_Breaker_hxZ0sgoFJubh5aj6.json |  30 +++++-
 ...agon__Molten_Scourge_eArAPuB38CNR0ZIM.json |  32 +++++-
 ...n__Obsidian_Predator_ladm7wykhZczYzrQ.json |  32 +++++-
 styles/less/sheets/actions/actions.less       |  92 ++++++++++------
 templates/actionTypes/summon.hbs              |  10 +-
 templates/actionTypes/transform.hbs           |  62 +++++++++++
 .../action-settings/effect.hbs                |   1 +
 16 files changed, 406 insertions(+), 43 deletions(-)
 create mode 100644 module/data/action/transformAction.mjs
 create mode 100644 module/data/fields/action/transformField.mjs
 create mode 100644 templates/actionTypes/transform.hbs

diff --git a/lang/en.json b/lang/en.json
index c9d21944..4e786e28 100755
--- a/lang/en.json
+++ b/lang/en.json
@@ -74,6 +74,15 @@
                     "invalidDrop": "You can only drop Actor entities to summon.",
                     "chatMessageTitle": "Test2",
                     "chatMessageHeaderTitle": "Summoning"
+                },
+                "transform": {
+                    "name": "Transform",
+                    "tooltip": "Transform one actor into another",
+                    "noTransformActor": "There is no assigned actor to transform into",
+                    "transformActorMissing": "The assigned actor to transform into does not exist. It was probably deleted or moved in/out of a compendium",
+                    "canvasError": "There is no active scene.",
+                    "prototypeError": "You can only use a transform action from a Token",
+                    "actorLinkError": "You cannot transform a token with Actor Link set to true"
                 }
             },
             "Config": {
@@ -129,6 +138,12 @@
                 },
                 "summon": {
                     "dropSummonsHere": "Drop Summons Here"
+                },
+                "transform": {
+                    "dropTransformHere": "Drop Transform Here",
+                    "actorIsMissing": "The linked actor is missing. You should delete this link.",
+                    "clearHitPoints": "Clear Hitpoints",
+                    "clearStress": "Clear Stress"
                 }
             }
         },
diff --git a/module/applications/sheets-configs/action-base-config.mjs b/module/applications/sheets-configs/action-base-config.mjs
index 34543086..ce0e7e24 100644
--- a/module/applications/sheets-configs/action-base-config.mjs
+++ b/module/applications/sheets-configs/action-base-config.mjs
@@ -28,6 +28,7 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2)
             removeEffect: this.removeEffect,
             addElement: this.addElement,
             removeElement: this.removeElement,
+            removeTransformActor: this.removeTransformActor,
             editEffect: this.editEffect,
             addDamage: this.addDamage,
             removeDamage: this.removeDamage,
@@ -41,7 +42,7 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2)
             submitOnChange: true,
             closeOnSubmit: false
         },
-        dragDrop: [{ dragSelector: null, dropSelector: '#summon-drop-zone', handlers: ['_onDrop'] }]
+        dragDrop: [{ dragSelector: null, dropSelector: '[data-is-drop-zone]', handlers: ['_onDrop'] }]
     };
 
     static PARTS = {
@@ -120,6 +121,10 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2)
         htmlElement.querySelectorAll('.summon-count-wrapper input').forEach(element => {
             element.addEventListener('change', this.updateSummonCount.bind(this));
         });
+
+        htmlElement.querySelectorAll('.transform-resource input').forEach(element => {
+            element.addEventListener('change', this.updateTransformResource.bind(this));
+        });
     }
 
     async _prepareContext(_options) {
@@ -133,6 +138,18 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2)
             context.summons.push({ actor, count: summon.count });
         }
 
+        if (context.source.transform) {
+            const actor = await foundry.utils.fromUuid(context.source.transform.actorUUID);
+            context.transform = {
+                ...context.source.transform,
+                actor:
+                    actor ??
+                    (context.source.transform.actorUUID && !actor
+                        ? { error: game.i18n.localize('DAGGERHEART.ACTIONS.Settings.transform.actorIsMissing') }
+                        : null)
+            };
+        }
+
         context.openSection = this.openSection;
         context.tabs = this._getTabs(this.constructor.TABS);
         context.config = CONFIG.DH;
@@ -266,6 +283,12 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2)
         if (doc) return doc.sheet.render({ force: true });
     }
 
+    static async removeTransformActor() {
+        const data = this.action.toObject();
+        data.transform.actorUUID = null;
+        this.constructor.updateForm.bind(this)(null, null, { object: foundry.utils.flattenObject(data) });
+    }
+
     static addDamage(_event) {
         if (!this.action.damage.parts) return;
         const data = this.action.toObject(),
@@ -346,6 +369,14 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2)
         this.constructor.updateForm.bind(this)(null, null, { object: foundry.utils.flattenObject(data) });
     }
 
+    updateTransformResource(event) {
+        event.stopPropagation();
+
+        const data = this.action.toObject();
+        data.transform.resourceRefresh[event.target.dataset.resource] = event.target.checked;
+        this.constructor.updateForm.bind(this)(null, null, { object: foundry.utils.flattenObject(data) });
+    }
+
     /** Specific implementation in extending classes **/
     static async addEffect(_event) {}
     static removeEffect(_event, _button) {}
@@ -364,6 +395,18 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2)
             return;
         }
 
+        const dropZone = event.target.closest('[data-is-drop-zone]');
+        if (!dropZone) return;
+
+        switch (dropZone.id) {
+            case 'summon-drop-zone':
+                return this.onSummonDrop(data);
+            case 'transform-drop-zone':
+                return this.onTransformDrop(data);
+        }
+    }
+
+    async onSummonDrop(data) {
         const actionData = this.action.toObject();
         let countvalue = 1;
         for (const entry of actionData.summon) {
@@ -380,4 +423,10 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2)
         actionData.summon.push({ actorUUID: data.uuid, count: countvalue });
         await this.constructor.updateForm.bind(this)(null, null, { object: foundry.utils.flattenObject(actionData) });
     }
+
+    async onTransformDrop(data) {
+        const actionData = this.action.toObject();
+        actionData.transform.actorUUID = data.uuid;
+        await this.constructor.updateForm.bind(this)(null, null, { object: foundry.utils.flattenObject(actionData) });
+    }
 }
diff --git a/module/config/actionConfig.mjs b/module/config/actionConfig.mjs
index c9b70193..0b1bf91d 100644
--- a/module/config/actionConfig.mjs
+++ b/module/config/actionConfig.mjs
@@ -35,6 +35,12 @@ export const actionTypes = {
         icon: 'fa-ghost',
         tooltip: 'DAGGERHEART.ACTIONS.TYPES.summon.tooltip'
     },
+    transform: {
+        id: 'transform',
+        name: 'DAGGERHEART.ACTIONS.TYPES.transform.name',
+        icon: 'fa-dragon',
+        tooltip: 'DAGGERHEART.ACTIONS.TYPES.transform.tooltip'
+    },
     effect: {
         id: 'effect',
         name: 'DAGGERHEART.ACTIONS.TYPES.effect.name',
diff --git a/module/data/action/_module.mjs b/module/data/action/_module.mjs
index 9cfc48cb..043b039c 100644
--- a/module/data/action/_module.mjs
+++ b/module/data/action/_module.mjs
@@ -7,6 +7,7 @@ import EffectAction from './effectAction.mjs';
 import HealingAction from './healingAction.mjs';
 import MacroAction from './macroAction.mjs';
 import SummonAction from './summonAction.mjs';
+import TransformAction from './transformAction.mjs';
 
 export const actionsTypes = {
     base: BaseAction,
@@ -17,5 +18,6 @@ export const actionsTypes = {
     summon: SummonAction,
     effect: EffectAction,
     macro: MacroAction,
-    beastform: BeastformAction
+    beastform: BeastformAction,
+    transform: TransformAction
 };
diff --git a/module/data/action/baseAction.mjs b/module/data/action/baseAction.mjs
index f6ffe75f..992e1714 100644
--- a/module/data/action/baseAction.mjs
+++ b/module/data/action/baseAction.mjs
@@ -197,7 +197,7 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
     async executeWorkflow(config) {
         for (const [key, part] of this.workflow) {
             if (Hooks.call(`${CONFIG.DH.id}.pre${key.capitalize()}Action`, this, config) === false) return;
-            if ((await part.execute(config)) === false) return;
+            if ((await part.execute(config)) === false) return false;
             if (Hooks.call(`${CONFIG.DH.id}.post${key.capitalize()}Action`, this, config) === false) return;
         }
     }
@@ -224,7 +224,9 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
         }
 
         // Execute the Action Worflow in order based of schema fields
-        await this.executeWorkflow(config);
+        const result = await this.executeWorkflow(config);
+        if (result === false) return;
+
         await config.resourceUpdates.updateResources();
 
         if (Hooks.call(`${CONFIG.DH.id}.postUseAction`, this, config) === false) return;
diff --git a/module/data/action/transformAction.mjs b/module/data/action/transformAction.mjs
new file mode 100644
index 00000000..7e552902
--- /dev/null
+++ b/module/data/action/transformAction.mjs
@@ -0,0 +1,5 @@
+import DHBaseAction from './baseAction.mjs';
+
+export default class DHTransformAction extends DHBaseAction {
+    static extraSchemas = [...super.extraSchemas, 'transform'];
+}
diff --git a/module/data/fields/action/_module.mjs b/module/data/fields/action/_module.mjs
index 0bdffca2..fa3b1cd5 100644
--- a/module/data/fields/action/_module.mjs
+++ b/module/data/fields/action/_module.mjs
@@ -10,3 +10,4 @@ export { default as DamageField } from './damageField.mjs';
 export { default as RollField } from './rollField.mjs';
 export { default as MacroField } from './macroField.mjs';
 export { default as SummonField } from './summonField.mjs';
+export { default as TransformField } from './transformField.mjs';
diff --git a/module/data/fields/action/transformField.mjs b/module/data/fields/action/transformField.mjs
new file mode 100644
index 00000000..f6d692af
--- /dev/null
+++ b/module/data/fields/action/transformField.mjs
@@ -0,0 +1,101 @@
+const fields = foundry.data.fields;
+
+export default class DHSummonField extends fields.SchemaField {
+    /**
+     * Action Workflow order
+     */
+    static order = 130;
+
+    constructor(options = {}, context = {}) {
+        const transformFields = {
+            actorUUID: new fields.DocumentUUIDField({
+                type: 'Actor',
+                required: true
+            }),
+            resourceRefresh: new fields.SchemaField({
+                hitPoints: new fields.BooleanField({ initial: true }),
+                stress: new fields.BooleanField({ initial: true })
+            })
+        };
+        super(transformFields, options, context);
+    }
+
+    static async execute() {
+        if (!this.transform.actorUUID) {
+            ui.notifications.warn(game.i18n.localize('DAGGERHEART.ACTIONS.TYPES.transform.noTransformActor'));
+            return false;
+        }
+
+        const baseActor = await foundry.utils.fromUuid(this.transform.actorUUID);
+        if (!baseActor) {
+            ui.notifications.warn(game.i18n.localize('DAGGERHEART.ACTIONS.TYPES.transform.transformActorMissing'));
+            return false;
+        }
+
+        if (!canvas.scene) {
+            ui.notifications.warn(game.i18n.localize('DAGGERHEART.ACTIONS.TYPES.transform.canvasError'));
+            return false;
+        }
+
+        if (this.actor.prototypeToken.actorLink) {
+            ui.notifications.warn(game.i18n.localize('DAGGERHEART.ACTIONS.TYPES.transform.actorLinkError'));
+            return false;
+        }
+
+        if (!this.actor.token) {
+            ui.notifications.warn(game.i18n.localize('DAGGERHEART.ACTIONS.TYPES.transform.prototypeError'));
+            return false;
+        }
+
+        const actor = await DHSummonField.getWorldActor(baseActor);
+        const tokenSizes = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew).tokenSizes;
+        const tokenSize = actor?.system.metadata.usesSize ? tokenSizes[actor.system.size] : actor.prototypeToken.width;
+
+        await this.actor.token.update(
+            { ...actor.prototypeToken.toJSON(), actorId: actor.id, width: tokenSize, height: tokenSize },
+            { diff: false, recursive: false, noHook: true }
+        );
+
+        if (this.actor.token.combatant) {
+            this.actor.token.combatant.update({ actorId: actor.id, img: actor.prototypeToken.texture.src });
+        }
+
+        const marks = { hitPoints: 0, stress: 0 };
+        if (!this.transform.resourceRefresh.hitPoints) {
+            marks.hitPoints = Math.min(
+                this.actor.system.resources.hitPoints.value,
+                this.actor.token.actor.system.resources.hitPoints.max - 1
+            );
+        }
+        if (!this.transform.resourceRefresh.stress) {
+            marks.stress = Math.min(
+                this.actor.system.resources.stress.value,
+                this.actor.token.actor.system.resources.stress.max - 1
+            );
+        }
+        if (marks.hitPoints || marks.stress) {
+            this.actor.token.actor.update({
+                'system.resources': {
+                    hitPoints: { value: marks.hitPoints },
+                    stress: { value: marks.stress }
+                }
+            });
+        }
+
+        const prevPosition = { ...this.actor.sheet.position };
+        this.actor.sheet.close();
+        this.actor.token.actor.sheet.render({ force: true, position: prevPosition });
+    }
+
+    /* Check for any available instances of the actor present in the world, or create a world actor based on compendium */
+    static async getWorldActor(baseActor) {
+        const dataType = game.system.api.data.actors[`Dh${baseActor.type.capitalize()}`];
+        if (baseActor.inCompendium && dataType && baseActor.img === dataType.DEFAULT_ICON) {
+            const worldActorCopy = game.actors.find(x => x.name === baseActor.name);
+            if (worldActorCopy) return worldActorCopy;
+        }
+
+        const worldActor = await game.system.api.documents.DhpActor.create(baseActor.toObject());
+        return worldActor;
+    }
+}
diff --git a/module/systemRegistration/handlebars.mjs b/module/systemRegistration/handlebars.mjs
index ad8c741a..de085221 100644
--- a/module/systemRegistration/handlebars.mjs
+++ b/module/systemRegistration/handlebars.mjs
@@ -33,6 +33,7 @@ export const preloadHandlebarsTemplates = async function () {
         'systems/daggerheart/templates/actionTypes/beastform.hbs',
         'systems/daggerheart/templates/actionTypes/countdown.hbs',
         'systems/daggerheart/templates/actionTypes/summon.hbs',
+        'systems/daggerheart/templates/actionTypes/transform.hbs',
         'systems/daggerheart/templates/settings/components/settings-item-line.hbs',
         'systems/daggerheart/templates/ui/tooltip/parts/tooltipChips.hbs',
         'systems/daggerheart/templates/ui/tooltip/parts/tooltipTags.hbs',
diff --git a/src/packs/adversaries/adversary_Fallen_Warlord__Realm_Breaker_hxZ0sgoFJubh5aj6.json b/src/packs/adversaries/adversary_Fallen_Warlord__Realm_Breaker_hxZ0sgoFJubh5aj6.json
index b2cdc489..8f3865e9 100644
--- a/src/packs/adversaries/adversary_Fallen_Warlord__Realm_Breaker_hxZ0sgoFJubh5aj6.json
+++ b/src/packs/adversaries/adversary_Fallen_Warlord__Realm_Breaker_hxZ0sgoFJubh5aj6.json
@@ -717,7 +717,35 @@
       "system": {
         "description": "<p>When the @Lookup[@name] marks their last HP, replace them with the @UUID[Compendium.daggerheart.adversaries.Actor.RXkZTwBRi4dJ3JE5]{Fallen Warlord: Undefeated Champion} and immediately spotlight them.</p>",
         "resource": null,
-        "actions": {},
+        "actions": {
+          "gP426WmWbtrZEWCD": {
+            "type": "transform",
+            "_id": "gP426WmWbtrZEWCD",
+            "systemPath": "actions",
+            "baseAction": false,
+            "description": "",
+            "chatDisplay": true,
+            "originItem": {
+              "type": "itemCollection"
+            },
+            "actionType": "action",
+            "triggers": [],
+            "cost": [],
+            "uses": {
+              "value": null,
+              "max": null,
+              "recovery": null,
+              "consumeOnSuccess": false
+            },
+            "transform": {
+              "actorUUID": "Compendium.daggerheart.adversaries.Actor.RXkZTwBRi4dJ3JE5",
+              "resourceRefresh": {
+                "hitPoints": true,
+                "stress": true
+              }
+            }
+          }
+        },
         "originItemType": null,
         "originId": null,
         "featureForm": "reaction"
diff --git a/src/packs/adversaries/adversary_Volcanic_Dragon__Molten_Scourge_eArAPuB38CNR0ZIM.json b/src/packs/adversaries/adversary_Volcanic_Dragon__Molten_Scourge_eArAPuB38CNR0ZIM.json
index b23da064..7f9deb6c 100644
--- a/src/packs/adversaries/adversary_Volcanic_Dragon__Molten_Scourge_eArAPuB38CNR0ZIM.json
+++ b/src/packs/adversaries/adversary_Volcanic_Dragon__Molten_Scourge_eArAPuB38CNR0ZIM.json
@@ -846,7 +846,37 @@
       "system": {
         "description": "<p>When the @Lookup[@name] marks their last HP, replace them with the @UUID[Compendium.daggerheart.adversaries.Actor.pMuXGCSOQaxpi5tb]{Ashen Tyrant} and immediately spotlight them.</p>",
         "resource": null,
-        "actions": {},
+        "actions": {
+          "cFqFjemAfAjB0OB0": {
+            "type": "transform",
+            "_id": "cFqFjemAfAjB0OB0",
+            "systemPath": "actions",
+            "baseAction": false,
+            "description": "",
+            "chatDisplay": true,
+            "originItem": {
+              "type": "itemCollection"
+            },
+            "actionType": "action",
+            "triggers": [],
+            "cost": [],
+            "uses": {
+              "value": null,
+              "max": "",
+              "recovery": null,
+              "consumeOnSuccess": false
+            },
+            "transform": {
+              "actorUUID": "Compendium.daggerheart.adversaries.Actor.pMuXGCSOQaxpi5tb",
+              "resourceRefresh": {
+                "hitPoints": true,
+                "stress": true
+              }
+            },
+            "name": "Transform",
+            "range": ""
+          }
+        },
         "originItemType": null,
         "originId": null,
         "featureForm": "reaction"
diff --git a/src/packs/adversaries/adversary_Volcanic_Dragon__Obsidian_Predator_ladm7wykhZczYzrQ.json b/src/packs/adversaries/adversary_Volcanic_Dragon__Obsidian_Predator_ladm7wykhZczYzrQ.json
index 2e2adbdd..5f32aae5 100644
--- a/src/packs/adversaries/adversary_Volcanic_Dragon__Obsidian_Predator_ladm7wykhZczYzrQ.json
+++ b/src/packs/adversaries/adversary_Volcanic_Dragon__Obsidian_Predator_ladm7wykhZczYzrQ.json
@@ -742,7 +742,37 @@
       "system": {
         "description": "<p>When the @Lookup[@name] marks their last HP, replace them with the @UUID[Compendium.daggerheart.adversaries.Actor.eArAPuB38CNR0ZIM]{Molten Scourge} and immediately spotlight them.</p>",
         "resource": null,
-        "actions": {},
+        "actions": {
+          "OxGkCGgIl4vGFufD": {
+            "type": "transform",
+            "_id": "OxGkCGgIl4vGFufD",
+            "systemPath": "actions",
+            "baseAction": false,
+            "description": "",
+            "chatDisplay": true,
+            "originItem": {
+              "type": "itemCollection"
+            },
+            "actionType": "action",
+            "triggers": [],
+            "cost": [],
+            "uses": {
+              "value": null,
+              "max": "",
+              "recovery": null,
+              "consumeOnSuccess": false
+            },
+            "transform": {
+              "actorUUID": "Compendium.daggerheart.adversaries.Actor.eArAPuB38CNR0ZIM",
+              "resourceRefresh": {
+                "hitPoints": true,
+                "stress": true
+              }
+            },
+            "name": "Transform",
+            "range": ""
+          }
+        },
         "originItemType": null,
         "originId": null,
         "featureForm": "reaction"
diff --git a/styles/less/sheets/actions/actions.less b/styles/less/sheets/actions/actions.less
index 9be56c8e..5c21dc60 100644
--- a/styles/less/sheets/actions/actions.less
+++ b/styles/less/sheets/actions/actions.less
@@ -4,48 +4,78 @@
         display: flex;
         flex-direction: column;
         gap: 10px;
+    }
 
-        .actor-summon-line {
+    .transform-container {
+        width: 100%;
+        display: flex;
+        flex-direction: column;
+        gap: 10px;
+
+        .transform-resources {
+            display: flex;
+            flex-direction: column;
+
+            .transform-resource {
+                display: flex;
+                align-items: center;
+                gap: 2px;
+
+                .resource-title {
+                    font-size: var(--font-size-18);
+                }
+            }
+        }
+    }
+
+    .actor-drop-line {
+        display: flex;
+        align-items: center;
+        gap: 5px;
+        border-radius: 3px;
+
+        .actor-drop-name {
+            flex: 2;
             display: flex;
             align-items: center;
             gap: 5px;
-            border-radius: 3px;
 
-            .actor-summon-name {
-                flex: 2;
-                display: flex;
-                align-items: center;
-                gap: 5px;
-
-                img {
-                    height: 40px;
-                }
-            }
-
-            .actor-summon-controls {
-                flex: 1;
-                display: flex;
-                align-items: center;
-                gap: 5px;
-
-                .controls {
-                    display: flex;
-                    gap: 5px;
-                }
+            img {
+                height: 40px;
             }
         }
 
-        .summon-dragger {
+        .actor-drop-controls {
+            flex: 1;
             display: flex;
             align-items: center;
-            justify-content: center;
-            box-sizing: border-box;
-            height: 40px;
-            margin-top: 10px;
-            border: 1px dashed light-dark(@dark-blue-50, @beige-50);
-            border-radius: 3px;
-            color: light-dark(@dark-blue-50, @beige-50);
+            gap: 5px;
+
+            &.transform {
+                justify-content: flex-end;
+            }
+
+            .controls {
+                display: flex;
+                gap: 5px;
+            }
         }
+
+        .actor-drop-hint {
+            flex: none;
+        }
+    }
+
+    .drop-dragger {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        box-sizing: border-box;
+        height: 40px;
+        margin-top: 10px;
+        border: 1px dashed light-dark(@dark-blue-50, @beige-50);
+        border-radius: 3px;
+        color: light-dark(@dark-blue-50, @beige-50);
     }
 
     .trigger-data {
diff --git a/templates/actionTypes/summon.hbs b/templates/actionTypes/summon.hbs
index 429977d9..18fed2e2 100644
--- a/templates/actionTypes/summon.hbs
+++ b/templates/actionTypes/summon.hbs
@@ -1,19 +1,19 @@
-<fieldset class="one-column" id="summon-drop-zone" data-key="summon">
+<fieldset class="one-column" id="summon-drop-zone" data-is-drop-zone="true" data-key="summon">
     <legend>
         {{localize "DAGGERHEART.ACTIONS.TYPES.summon.name"}}
     </legend>
 
     <ul class="actor-summon-items">   
         {{#each @root.summons as |summon index|}} 
-            <li class="actor-summon-line">
-                <div class="actor-summon-name">
+            <li class="actor-drop-line">
+                <div class="actor-drop-name">
                     <img class="image" src="{{summon.actor.img}}" />
                     <h4 class="h4">
                         {{summon.actor.name}}
                     </h4>
                 </div>
 
-                <div class="actor-summon-controls">
+                <div class="actor-drop-controls">
                     <div class="form-group summon-count-wrapper" data-index="{{index}}">
                         <div class="form-fields">
                             <input type="text" value="{{summon.count}}" />
@@ -43,7 +43,7 @@
                 </div>
             </li>
         {{/each}}
-        <div class="summon-dragger">
+        <div class="drop-dragger">
             <span>{{localize "DAGGERHEART.ACTIONS.Settings.summon.dropSummonsHere"}}</span>
         </div>
     </ul>
diff --git a/templates/actionTypes/transform.hbs b/templates/actionTypes/transform.hbs
new file mode 100644
index 00000000..ae17862a
--- /dev/null
+++ b/templates/actionTypes/transform.hbs
@@ -0,0 +1,62 @@
+<fieldset class="one-column" id="transform-drop-zone" data-is-drop-zone="true" data-key="transform">
+    <legend>
+        {{localize "DAGGERHEART.ACTIONS.TYPES.transform.name"}}
+    </legend>
+
+    <div class="transform-container">
+        {{#if transform.actor}}
+            <div class="actor-drop-line">
+                {{#if transform.actor.error}} 
+                    <div class="hint actor-drop-hint">{{transform.actor.error}}</div>
+                {{else}}
+                     <div class="actor-drop-name">
+                        <img class="image" src="{{transform.actor.img}}" />
+                        <h4 class="h4">
+                            {{transform.actor.name}}
+                        </h4>
+                    </div>
+                {{/if}}
+
+                 <div class="actor-drop-controls transform">
+                    <div class="controls">
+                        {{#unless transform.actor.error}} 
+                        <a
+                                class='effect-control'
+                                data-action='editDoc'
+                                data-item-uuid="{{transform.actor.uuid}}"
+                                data-tooltip='{{localize "DAGGERHEART.UI.Tooltip.openItemWorld"}}'
+                            >
+                                <i class="fa-solid fa-globe"></i>
+                        </a>
+                        {{/unless}}
+                        <a
+                            class='effect-control'
+                            data-action='removeTransformActor'
+                            data-tooltip='{{localize "CONTROLS.CommonDelete"}}'
+                        >
+                            <i class='fas fa-trash'></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <line-div></line-div>
+        {{/if}}
+
+        {{#unless transform.actor}}
+            <div class="drop-dragger">
+                <span>{{localize "DAGGERHEART.ACTIONS.Settings.transform.dropTransformHere"}}</span>
+            </div>
+        {{/unless}}
+
+        <div class="transform-resources">
+            <div class="transform-resource">
+                <input type="checkbox" data-resource="hitPoints" {{checked transform.resourceRefresh.hitPoints}}/>
+                <span class="resource-title">{{localize "DAGGERHEART.ACTIONS.Settings.transform.clearHitPoints"}}</span>
+            </div>
+            <div class="transform-resource">
+                <input type="checkbox" data-resource="stress" {{checked transform.resourceRefresh.stress}}/>
+                <span class="resource-title">{{localize "DAGGERHEART.ACTIONS.Settings.transform.clearStress"}}</span>
+            </div>
+        </div>
+    </div>
+</fieldset>
\ No newline at end of file
diff --git a/templates/sheets-settings/action-settings/effect.hbs b/templates/sheets-settings/action-settings/effect.hbs
index e94f4328..1bdd0304 100644
--- a/templates/sheets-settings/action-settings/effect.hbs
+++ b/templates/sheets-settings/action-settings/effect.hbs
@@ -11,4 +11,5 @@
     {{#if fields.beastform}}{{> 'systems/daggerheart/templates/actionTypes/beastform.hbs' fields=fields.beastform.fields source=source.beastform}}{{/if}}
     {{#if fields.summon}}{{> 'systems/daggerheart/templates/actionTypes/summon.hbs' fields=fields.summon.element.fields source=source.summon}}{{/if}}
     {{#if fields.countdown}}{{> 'systems/daggerheart/templates/actionTypes/countdown.hbs' fields=fields.countdown.element.fields source=source.countdown}}{{/if}}
+    {{#if fields.transform}}{{> 'systems/daggerheart/templates/actionTypes/transform.hbs' fields=fields.transform.fields source=source.transform}}{{/if}}
 </section>
\ No newline at end of file

From 59363c57e42e0863edbf79d4d80efff8132fffac Mon Sep 17 00:00:00 2001
From: WBHarry <williambjrklund@gmail.com>
Date: Mon, 9 Mar 2026 13:08:39 +0100
Subject: [PATCH 02/11] Fixed CompendiumBrowserSettings misstakenly being a
 client setting instead of a world setting

---
 module/systemRegistration/settings.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/systemRegistration/settings.mjs b/module/systemRegistration/settings.mjs
index c4acf7ed..6756dcab 100644
--- a/module/systemRegistration/settings.mjs
+++ b/module/systemRegistration/settings.mjs
@@ -144,7 +144,7 @@ const registerNonConfigSettings = () => {
     });
 
     game.settings.register(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.CompendiumBrowserSettings, {
-        scope: 'client',
+        scope: 'world',
         config: false,
         type: CompendiumBrowserSettings
     });

From d518993ec984d6a504c8716799a13274ca2e9c02 Mon Sep 17 00:00:00 2001
From: WBHarry <89362246+WBHarry@users.noreply.github.com>
Date: Mon, 9 Mar 2026 13:18:07 +0100
Subject: [PATCH 03/11] Fixed so that domaincard tooltips properly use the all
 domains including homebrew (#1716)

---
 templates/ui/tooltip/domainCard.hbs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/ui/tooltip/domainCard.hbs b/templates/ui/tooltip/domainCard.hbs
index 9388f1a4..0380a523 100644
--- a/templates/ui/tooltip/domainCard.hbs
+++ b/templates/ui/tooltip/domainCard.hbs
@@ -5,7 +5,7 @@
             <i class="fa-solid fa-bolt"></i>
         </span>
         <span class="item-icon">
-            {{#with (lookup config.DOMAIN.domains item.system.domain) as | domain |}}
+            {{#with (lookup allDomains item.system.domain) as | domain |}}
                 <img src="{{domain.src}}" alt="">
             {{/with}}
         </span>

From 83f6c940dfbae1b70ef6cfa03662cbe7dfe64cf0 Mon Sep 17 00:00:00 2001
From: WBHarry <89362246+WBHarry@users.noreply.github.com>
Date: Mon, 9 Mar 2026 23:09:16 +0100
Subject: [PATCH 04/11] Fixed so that the new feature button in the character
 sheet can take you to the compendium browser (#1719)

---
 .../sheets/api/application-mixin.mjs          |  3 +++
 .../sheets/actors/character/features.hbs      | 22 ++++++++++---------
 .../partials/inventory-fieldset-items-V2.hbs  |  2 +-
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/module/applications/sheets/api/application-mixin.mjs b/module/applications/sheets/api/application-mixin.mjs
index 449880fb..b18176ec 100644
--- a/module/applications/sheets/api/application-mixin.mjs
+++ b/module/applications/sheets/api/application-mixin.mjs
@@ -691,6 +691,9 @@ export default function DHApplicationMixin(Base) {
                 case 'weapon':
                     presets.folder = 'equipments.folders.weapons';
                     break;
+                case 'feature':
+                    presets.folder = 'features';
+                    break;
                 case 'domainCard':
                     presets.folder = 'domains';
                     presets.filter = {
diff --git a/templates/sheets/actors/character/features.hbs b/templates/sheets/actors/character/features.hbs
index acabd37e..3e942468 100644
--- a/templates/sheets/actors/character/features.hbs
+++ b/templates/sheets/actors/character/features.hbs
@@ -4,19 +4,21 @@
         {{#each document.system.sheetLists as |category|}}
         {{#if (eq category.type 'feature' )}}
         {{> 'daggerheart.inventory-items'
-        title=category.title
-        type='feature'
-        collection=category.values
-        canCreate=true
-        showActions=true
+            title=category.title
+            type='feature'
+            actorType='character'
+            collection=category.values
+            canCreate=true
+            showActions=true
         }}
         {{else if category.values}}
         {{> 'daggerheart.inventory-items'
-        title=category.title
-        type='feature'
-        collection=category.values
-        canCreate=false
-        showActions=true
+            title=category.title
+            type='feature'
+            actorType='character'
+            collection=category.values
+            canCreate=false
+            showActions=true
         }}
 
         {{/if}}
diff --git a/templates/sheets/global/partials/inventory-fieldset-items-V2.hbs b/templates/sheets/global/partials/inventory-fieldset-items-V2.hbs
index 0a3275d0..31c8f7f5 100644
--- a/templates/sheets/global/partials/inventory-fieldset-items-V2.hbs
+++ b/templates/sheets/global/partials/inventory-fieldset-items-V2.hbs
@@ -28,7 +28,7 @@ Parameters:
   <legend>
     {{localize title}}
     {{#if canCreate}}
-    <a data-action="{{ifThen (or (eq type 'effect') (eq type 'feature') (eq type 'action')) 'createDoc' 'addNewItem' }}" data-document-class="{{ifThen (eq type 'effect') 'ActiveEffect' 'Item' }}"
+    <a data-action="{{ifThen (or (eq type 'effect') (and (eq type 'feature') (not (eq actorType 'character'))) (eq type 'action')) 'createDoc' 'addNewItem' }}" data-document-class="{{ifThen (eq type 'effect') 'ActiveEffect' 'Item' }}"
       data-type="{{ifThen (eq type 'effect') 'base' type}}"
       {{#if inVault}}data-in-vault="{{inVault}}"{{/if}}
       {{#if disabled}} data-disabled="{{disabled}}"{{/if}}

From f920fa7ba29d5eb6083a3e9072e5aef3e1962b90 Mon Sep 17 00:00:00 2001
From: WBHarry <89362246+WBHarry@users.noreply.github.com>
Date: Tue, 10 Mar 2026 00:10:21 +0100
Subject: [PATCH 05/11] [Fix] 1699 - Trait Generalization For Descriptions
 (#1717)

* Fixed so that domaincard tooltips properly use the all domains including homebrew

* .

* Adjust spacing of compendium browser tags (#1720)

* Remove some vestigial inCompendiums

---------

Co-authored-by: Carlos Fernandez <CarlosFdez@users.noreply.github.com>
Co-authored-by: Carlos Fernandez <cfern1990@gmail.com>
---
 module/applications/ui/itemBrowser.mjs        |  6 ++++
 module/data/item/weapon.mjs                   | 14 ++-------
 module/systemRegistration/handlebars.mjs      |  3 +-
 styles/less/global/global.less                | 18 +++++++++++
 styles/less/global/inventory-item.less        | 18 -----------
 styles/less/ui/item-browser/item-browser.less | 13 ++++++--
 .../global/partials/inventory-item-V2.hbs     | 30 +++++++------------
 .../sheets/global/partials/item-tags.hbs      |  8 +++++
 templates/sheets/items/armor/description.hbs  | 13 --------
 templates/sheets/items/weapon/description.hbs | 30 -------------------
 templates/ui/itemBrowser/itemContainer.hbs    |  5 +++-
 11 files changed, 61 insertions(+), 97 deletions(-)
 create mode 100644 templates/sheets/global/partials/item-tags.hbs

diff --git a/module/applications/ui/itemBrowser.mjs b/module/applications/ui/itemBrowser.mjs
index 2d882eba..f6235101 100644
--- a/module/applications/ui/itemBrowser.mjs
+++ b/module/applications/ui/itemBrowser.mjs
@@ -251,6 +251,12 @@ export class ItemBrowser extends HandlebarsApplicationMixin(ApplicationV2) {
 
             /* If any noticeable slowdown occurs, consider replacing with enriching description on clicking to expand descriptions */
             for (const item of this.items) {
+                if (["weapon", "armor"].includes(item.type)) {
+                    item.system.enrichedTags = await foundry.applications.handlebars.renderTemplate(
+                        'systems/daggerheart/templates/sheets/global/partials/item-tags.hbs',
+                        item.system,
+                    );
+                }
                 item.system.enrichedDescription =
                     (await item.system.getEnrichedDescription?.()) ??
                     (await foundry.applications.ux.TextEditor.implementation.enrichHTML(item.description));
diff --git a/module/data/item/weapon.mjs b/module/data/item/weapon.mjs
index 051fd42d..bb7fde0a 100644
--- a/module/data/item/weapon.mjs
+++ b/module/data/item/weapon.mjs
@@ -112,24 +112,14 @@ export default class DHWeapon extends AttachableItem {
     async getDescriptionData() {
         const baseDescription = this.description;
 
-        const tier = game.i18n.localize(`DAGGERHEART.GENERAL.Tiers.${this.tier}`);
-        const trait = game.i18n.localize(CONFIG.DH.ACTOR.abilities[this.attack.roll.trait].label);
-        const range = game.i18n.localize(`DAGGERHEART.CONFIG.Range.${this.attack.range}.name`);
-        const damage = Roll.replaceFormulaData(this.attack.damageFormula, this.parent.parent ?? this.parent);
-        const burden = game.i18n.localize(CONFIG.DH.GENERAL.burden[this.burden].label);
-
         const allFeatures = CONFIG.DH.ITEM.allWeaponFeatures();
         const features = this.weaponFeatures.map(x => allFeatures[x.value]).filter(x => x);
 
         const prefix = await foundry.applications.handlebars.renderTemplate(
             'systems/daggerheart/templates/sheets/items/weapon/description.hbs',
             {
-                features,
-                tier,
-                trait,
-                range,
-                damage,
-                burden
+                item: this,
+                features
             }
         );
 
diff --git a/module/systemRegistration/handlebars.mjs b/module/systemRegistration/handlebars.mjs
index de085221..9ccb16f4 100644
--- a/module/systemRegistration/handlebars.mjs
+++ b/module/systemRegistration/handlebars.mjs
@@ -17,9 +17,10 @@ export const preloadHandlebarsTemplates = async function () {
         'systems/daggerheart/templates/sheets/global/partials/resource-section/dice-value.hbs',
         'systems/daggerheart/templates/sheets/global/partials/resource-section/die.hbs',
         'systems/daggerheart/templates/sheets/global/partials/resource-bar.hbs',
+        'systems/daggerheart/templates/sheets/global/partials/feature-section-item.hbs',
+        'systems/daggerheart/templates/sheets/global/partials/item-tags.hbs',
         'systems/daggerheart/templates/components/card-preview.hbs',
         'systems/daggerheart/templates/levelup/parts/selectable-card-preview.hbs',
-        'systems/daggerheart/templates/sheets/global/partials/feature-section-item.hbs',
         'systems/daggerheart/templates/ui/combatTracker/combatTrackerSection.hbs',
         'systems/daggerheart/templates/actionTypes/damage.hbs',
         'systems/daggerheart/templates/actionTypes/resource.hbs',
diff --git a/styles/less/global/global.less b/styles/less/global/global.less
index fb995b8c..b9af67c0 100644
--- a/styles/less/global/global.less
+++ b/styles/less/global/global.less
@@ -73,6 +73,24 @@
             }
         }
     }
+
+    .item-tags {
+        display: flex;
+        gap: 10px;
+
+        .tag {
+            align-items: center;
+            background: light-dark(@dark-15, @beige-15);
+            border-radius: 3px;
+            border: 1px solid light-dark(@dark, @beige);
+            display: flex;
+            flex-direction: row;
+            flex-wrap: wrap;
+            font-size: var(--font-size-12);
+            justify-content: start;
+            padding: 3px 5px;
+        }
+    }
 }
 
 /* TODO: Remove me when this issue is resolved https://github.com/foundryvtt/foundryvtt/issues/13734 */
diff --git a/styles/less/global/inventory-item.less b/styles/less/global/inventory-item.less
index d703d189..4bd4d0bb 100644
--- a/styles/less/global/inventory-item.less
+++ b/styles/less/global/inventory-item.less
@@ -138,24 +138,6 @@
                         display: none;
                     }
                 }
-
-                .item-tags {
-                    display: flex;
-                    gap: 10px;
-
-                    .tag {
-                        align-items: center;
-                        background: light-dark(@dark-15, @beige-15);
-                        border-radius: 3px;
-                        border: 1px solid light-dark(@dark, @beige);
-                        display: flex;
-                        flex-direction: row;
-                        flex-wrap: wrap;
-                        font-size: var(--font-size-12);
-                        justify-content: start;
-                        padding: 3px 5px;
-                    }
-                }
             }
 
             .item-resource {
diff --git a/styles/less/ui/item-browser/item-browser.less b/styles/less/ui/item-browser/item-browser.less
index b395f8c8..f558a0ba 100644
--- a/styles/less/ui/item-browser/item-browser.less
+++ b/styles/less/ui/item-browser/item-browser.less
@@ -304,7 +304,15 @@
                 padding: 0 0 0 50px;
                 display: flex;
                 flex-direction: column;
-                gap: 5px;
+
+                .item-description-outer-container:has(div, p) {
+                    margin-top: 8px;
+                }
+
+                /* Some items don't include an outer container, so we attempt a catch-all */
+                > *:last-child {
+                    padding-bottom: 6px;
+                }
 
                 h1 {
                     font-size: var(--font-size-32);
@@ -350,6 +358,7 @@
         .filter-content,
         .item-desc {
             display: grid;
+            opacity: 0;
             grid-template-rows: 0fr;
             transition: all 0.3s ease-in-out;
             width: 100%;
@@ -378,8 +387,8 @@
         }
 
         .expanded + .extensible {
+            opacity: 1;
             grid-template-rows: 1fr;
-            padding-top: 10px;
         }
 
         .welcome-message {
diff --git a/templates/sheets/global/partials/inventory-item-V2.hbs b/templates/sheets/global/partials/inventory-item-V2.hbs
index e496ce4b..86d2e2d3 100644
--- a/templates/sheets/global/partials/inventory-item-V2.hbs
+++ b/templates/sheets/global/partials/inventory-item-V2.hbs
@@ -45,30 +45,20 @@ 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 --}}
-      {{#with item}}
-      {{#if (not ../hideTags)}}
-      <div class="item-tags">
-        {{#each this._getTags as |tag|}}
-        <div class="tag">
-          {{tag}}
-        </div>
-        {{/each}}
-
-        {{!-- Feature Form Tag Start --}}
-        {{#if (eq ../type 'feature')}}
-            {{#if (or (eq @root.document.type 'adversary') (eq @root.document.type 'environment'))}}
-                {{#if system.featureForm}}
-                    <div class="tag feature-form">
-                        <span class="recall-value">{{localize (concat "DAGGERHEART.CONFIG.FeatureForm." system.featureForm)}}</span>
-                    </div>
+        {{#if (not ../hideTags)}}
+          {{#> "systems/daggerheart/templates/sheets/global/partials/item-tags.hbs" item  }}
+            {{#if (eq ../type 'feature')}}
+                {{#if (or (eq @root.document.type 'adversary') (eq @root.document.type 'environment'))}}
+                    {{#if system.featureForm}}
+                        <div class="tag feature-form">
+                            <span class="recall-value">{{localize (concat "DAGGERHEART.CONFIG.FeatureForm." system.featureForm)}}</span>
+                        </div>
+                    {{/if}}
                 {{/if}}
             {{/if}}
+          {{/ "systems/daggerheart/templates/sheets/global/partials/item-tags.hbs"}}
         {{/if}}
-        {{!-- Feature Form Tag End --}}
 
-      </div>
-      {{/if}}
-      {{/with}}
       {{!--Tags End --}}
     </div>
 
diff --git a/templates/sheets/global/partials/item-tags.hbs b/templates/sheets/global/partials/item-tags.hbs
new file mode 100644
index 00000000..b30fcbf2
--- /dev/null
+++ b/templates/sheets/global/partials/item-tags.hbs
@@ -0,0 +1,8 @@
+<div class="item-tags">
+    {{#each _getTags as |tag|}}
+         <div class="tag">
+            {{tag}}
+        </div>
+    {{/each}}
+    {{#if @partial-block}}{{> @partial-block}}{{/if}}
+</div>
\ No newline at end of file
diff --git a/templates/sheets/items/armor/description.hbs b/templates/sheets/items/armor/description.hbs
index c234fa10..af2698ef 100644
--- a/templates/sheets/items/armor/description.hbs
+++ b/templates/sheets/items/armor/description.hbs
@@ -1,19 +1,6 @@
 <div class="item-description-outer-container">
-    <div class="two-columns">
-        <div class="item-description-container">
-            <h4>{{localize "DAGGERHEART.ITEMS.Armor.baseThresholds.base"}}</h4>
-            <span>{{item.system.baseThresholds.major}}/{{item.system.baseThresholds.severe}}</span>
-        </div>
-
-        <div class="item-description-container">
-            <h4>{{localize "DAGGERHEART.ITEMS.Armor.baseScore"}}</h4>
-            <span>{{item.system.baseScore}}</span>
-        </div>
-    </div>
-
     {{#if features.length}}
         <div class="item-description-container">
-            <h4>{{localize "DAGGERHEART.GENERAL.features"}}</h4>
             {{#each features as | feature |}}
                 <div><strong>{{localize feature.label}}</strong>: {{{localize feature.description}}}</div>
             {{/each}}
diff --git a/templates/sheets/items/weapon/description.hbs b/templates/sheets/items/weapon/description.hbs
index d8e128e7..af2698ef 100644
--- a/templates/sheets/items/weapon/description.hbs
+++ b/templates/sheets/items/weapon/description.hbs
@@ -1,36 +1,6 @@
 <div class="item-description-outer-container">
-    <div class="three-columns">
-        <div class="item-description-container">
-            <h4>{{localize "DAGGERHEART.GENERAL.Tiers.singular"}}</h4>
-            <span>{{tier}}</span>
-        </div>
-
-        <div class="item-description-container">
-            <h4>{{localize "DAGGERHEART.GENERAL.Trait.single"}}</h4>
-            <span>{{trait}}</span>
-        </div>
-
-        <div class="item-description-container">
-            <h4>{{localize "DAGGERHEART.GENERAL.range"}}</h4>
-            <span>{{range}}</span>
-        </div>
-    </div>
-
-    <div class="three-columns">
-        <div class="item-description-container">
-            <h4>{{localize "DAGGERHEART.GENERAL.damage"}}</h4>
-            <span>{{damage}}</span>
-        </div>
-
-        <div class="item-description-container">
-            <h4>{{localize "DAGGERHEART.GENERAL.burden"}}</h4>
-            <span>{{burden}}</span>
-        </div>
-    </div>
-
     {{#if features.length}}
         <div class="item-description-container">
-            <h4>{{localize "DAGGERHEART.GENERAL.features"}}</h4>
             {{#each features as | feature |}}
                 <div><strong>{{localize feature.label}}</strong>: {{{localize feature.description}}}</div>
             {{/each}}
diff --git a/templates/ui/itemBrowser/itemContainer.hbs b/templates/ui/itemBrowser/itemContainer.hbs
index 0040a692..8dd75156 100644
--- a/templates/ui/itemBrowser/itemContainer.hbs
+++ b/templates/ui/itemBrowser/itemContainer.hbs
@@ -10,7 +10,10 @@
             </div>
         </div>
         <div class="item-desc extensible">
-            <span class="wrapper">{{{system.enrichedDescription}}}</span>
+            <span class="wrapper">
+                {{{system.enrichedTags}}}
+                {{{system.enrichedDescription}}}
+            </span>
         </div>
     </div>
 {{/each}}
\ No newline at end of file

From af04fb33d08b0d983ef8343ddd8f9a99fcbb2600 Mon Sep 17 00:00:00 2001
From: WBHarry <89362246+WBHarry@users.noreply.github.com>
Date: Tue, 10 Mar 2026 18:48:44 +0100
Subject: [PATCH 06/11] [Fix] Hit/Miss Display (#1711)

* Added an AppearanceSetting that decided if players should get to see information about hit/miss in chat messages

* .

* Improved setting name

* Introduced metagaming settings

* Raised verison
---
 lang/en.json                                  | 13 ++++
 module/applications/settings/_module.mjs      |  1 +
 .../settings/automationSettings.mjs           |  2 +-
 .../settings/metagamingSettings.mjs           | 62 +++++++++++++++++++
 module/config/settingsConfig.mjs              |  5 ++
 module/data/settings/Metagaming.mjs           | 12 ++++
 module/data/settings/_module.mjs              |  1 +
 module/dice/dhRoll.mjs                        |  4 +-
 module/documents/chatMessage.mjs              |  5 +-
 module/systemRegistration/settings.mjs        | 19 +++++-
 styles/less/ui/chat/chat.less                 |  4 ++
 system.json                                   |  2 +-
 .../settings/metagaming-settings/footer.hbs   | 10 +++
 .../settings/metagaming-settings/general.hbs  |  3 +
 .../settings/metagaming-settings/header.hbs   |  3 +
 templates/ui/chat/parts/target-part.hbs       |  2 +-
 16 files changed, 142 insertions(+), 6 deletions(-)
 create mode 100644 module/applications/settings/metagamingSettings.mjs
 create mode 100644 module/data/settings/Metagaming.mjs
 create mode 100644 templates/settings/metagaming-settings/footer.hbs
 create mode 100644 templates/settings/metagaming-settings/general.hbs
 create mode 100644 templates/settings/metagaming-settings/header.hbs

diff --git a/lang/en.json b/lang/en.json
index 4e786e28..4a4d073d 100755
--- a/lang/en.json
+++ b/lang/en.json
@@ -2644,6 +2644,14 @@
                     "title": "Triggers"
                 }
             },
+            "Metagaming": {
+                "FIELDS": {
+                    "hideObserverPermissionInChat": {
+                        "label": "Hide Chat Info From Players",
+                        "hint": "Information such as hit/miss on attack rolls against adversaries will be hidden"
+                    }
+                }
+            },
             "Homebrew": {
                 "newDowntimeMove": "Downtime Move",
                 "downtimeMove": "Downtime Move",
@@ -2703,6 +2711,11 @@
                     "label": "Configure Automation",
                     "hint": "Various settings automating resource management and more"
                 },
+                "metagaming": {
+                    "name": "Metagaming Settings",
+                    "label": "Configure Metagaming",
+                    "hint": "Various settings controlling the flow of information to players"
+                },
                 "homebrew": {
                     "name": "Homebrew Settings",
                     "label": "Configure Homebrew",
diff --git a/module/applications/settings/_module.mjs b/module/applications/settings/_module.mjs
index b565777c..28972397 100644
--- a/module/applications/settings/_module.mjs
+++ b/module/applications/settings/_module.mjs
@@ -1,4 +1,5 @@
 export { default as DhAppearanceSettings } from './appearanceSettings.mjs';
 export { default as DhAutomationSettings } from './automationSettings.mjs';
 export { default as DhHomebrewSettings } from './homebrewSettings.mjs';
+export { default as DhMetagamingSettings } from './metagamingSettings.mjs';
 export { default as DhVariantRuleSettings } from './variantRuleSettings.mjs';
diff --git a/module/applications/settings/automationSettings.mjs b/module/applications/settings/automationSettings.mjs
index e720733e..52def7db 100644
--- a/module/applications/settings/automationSettings.mjs
+++ b/module/applications/settings/automationSettings.mjs
@@ -31,8 +31,8 @@ export default class DhAutomationSettings extends HandlebarsApplicationMixin(App
     };
 
     static PARTS = {
-        tabs: { template: 'systems/daggerheart/templates/sheets/global/tabs/tab-navigation.hbs' },
         header: { template: 'systems/daggerheart/templates/settings/automation-settings/header.hbs' },
+        tabs: { template: 'systems/daggerheart/templates/sheets/global/tabs/tab-navigation.hbs' },
         general: { template: 'systems/daggerheart/templates/settings/automation-settings/general.hbs' },
         rules: { template: 'systems/daggerheart/templates/settings/automation-settings/deathMoves.hbs' },
         roll: { template: 'systems/daggerheart/templates/settings/automation-settings/roll.hbs' },
diff --git a/module/applications/settings/metagamingSettings.mjs b/module/applications/settings/metagamingSettings.mjs
new file mode 100644
index 00000000..c29a021b
--- /dev/null
+++ b/module/applications/settings/metagamingSettings.mjs
@@ -0,0 +1,62 @@
+import { DhMetagaming } from '../../data/settings/_module.mjs';
+
+const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api;
+
+export default class DhMetagamingSettings extends HandlebarsApplicationMixin(ApplicationV2) {
+    constructor() {
+        super({});
+
+        this.settings = new DhMetagaming(
+            game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Metagaming).toObject()
+        );
+    }
+
+    get title() {
+        return game.i18n.localize('DAGGERHEART.SETTINGS.Menu.title');
+    }
+
+    static DEFAULT_OPTIONS = {
+        tag: 'form',
+        id: 'daggerheart-metagaming-settings',
+        classes: ['daggerheart', 'dh-style', 'dialog', 'setting'],
+        position: { width: '600', height: 'auto' },
+        window: {
+            icon: 'fa-solid fa-eye-low-vision'
+        },
+        actions: {
+            reset: this.reset,
+            save: this.save
+        },
+        form: { handler: this.updateData, submitOnChange: true }
+    };
+
+    static PARTS = {
+        header: { template: 'systems/daggerheart/templates/settings/metagaming-settings/header.hbs' },
+        general: { template: 'systems/daggerheart/templates/settings/metagaming-settings/general.hbs' },
+        footer: { template: 'systems/daggerheart/templates/settings/metagaming-settings/footer.hbs' }
+    };
+
+    async _prepareContext(_options) {
+        const context = await super._prepareContext(_options);
+        context.settingFields = this.settings;
+
+        return context;
+    }
+
+    static async updateData(_event, _element, formData) {
+        const updatedSettings = foundry.utils.expandObject(formData.object);
+
+        await this.settings.updateSource(updatedSettings);
+        this.render();
+    }
+
+    static async reset() {
+        this.settings = new DhMetagaming();
+        this.render();
+    }
+
+    static async save() {
+        await game.settings.set(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Metagaming, this.settings.toObject());
+        this.close();
+    }
+}
diff --git a/module/config/settingsConfig.mjs b/module/config/settingsConfig.mjs
index d3f752bb..38ffcf3b 100644
--- a/module/config/settingsConfig.mjs
+++ b/module/config/settingsConfig.mjs
@@ -3,6 +3,10 @@ export const menu = {
         Name: 'GameSettingsAutomation',
         Icon: 'fa-solid fa-robot'
     },
+    Metagaming: {
+        Name: 'GameSettingsMetagaming',
+        Icon: 'fa-solid fa-eye-low-vision'
+    },
     Homebrew: {
         Name: 'GameSettingsHomebrew',
         Icon: 'fa-solid fa-flask-vial'
@@ -19,6 +23,7 @@ export const menu = {
 
 export const gameSettings = {
     Automation: 'Automation',
+    Metagaming: 'Metagaming',
     Homebrew: 'Homebrew',
     appearance: 'Appearance',
     variantRules: 'VariantRules',
diff --git a/module/data/settings/Metagaming.mjs b/module/data/settings/Metagaming.mjs
new file mode 100644
index 00000000..2bb5afdf
--- /dev/null
+++ b/module/data/settings/Metagaming.mjs
@@ -0,0 +1,12 @@
+export default class DhMetagaming extends foundry.abstract.DataModel {
+    static defineSchema() {
+        const fields = foundry.data.fields;
+        return {
+            hideObserverPermissionInChat: new fields.BooleanField({
+                initial: false,
+                label: 'DAGGERHEART.SETTINGS.Metagaming.FIELDS.hideObserverPermissionInChat.label',
+                hint: 'DAGGERHEART.SETTINGS.Metagaming.FIELDS.hideObserverPermissionInChat.hint'
+            })
+        };
+    }
+}
diff --git a/module/data/settings/_module.mjs b/module/data/settings/_module.mjs
index db1fbfec..45405ba5 100644
--- a/module/data/settings/_module.mjs
+++ b/module/data/settings/_module.mjs
@@ -1,4 +1,5 @@
 export { default as DhAppearance } from './Appearance.mjs';
 export { default as DhAutomation } from './Automation.mjs';
 export { default as DhHomebrew } from './Homebrew.mjs';
+export { default as DhMetagaming } from './Metagaming.mjs';
 export { default as DhVariantRules } from './VariantRules.mjs';
diff --git a/module/dice/dhRoll.mjs b/module/dice/dhRoll.mjs
index d8e5f6dd..a836a2ea 100644
--- a/module/dice/dhRoll.mjs
+++ b/module/dice/dhRoll.mjs
@@ -140,8 +140,10 @@ export default class DHRoll extends Roll {
     /** @inheritDoc */
     async render({ flavor, template = this.constructor.CHAT_TEMPLATE, isPrivate = false, ...options } = {}) {
         if (!this._evaluated) return;
+
+        const metagamingSettings = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Metagaming);
         const chatData = await this._prepareChatRenderContext({ flavor, isPrivate, ...options });
-        return foundry.applications.handlebars.renderTemplate(template, chatData);
+        return foundry.applications.handlebars.renderTemplate(template, { ...chatData, metagamingSettings });
     }
 
     /** @inheritDoc */
diff --git a/module/documents/chatMessage.mjs b/module/documents/chatMessage.mjs
index 668ad06b..53921329 100644
--- a/module/documents/chatMessage.mjs
+++ b/module/documents/chatMessage.mjs
@@ -68,8 +68,11 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage {
                 document = fromUuidSync(uuid);
             if (!document) return;
 
-            e.setAttribute('data-view-perm', document.testUserPermission(game.user, 'OBSERVER'));
             e.setAttribute('data-use-perm', document.testUserPermission(game.user, 'OWNER'));
+
+            const settings = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Metagaming);
+            if (settings.hideObserverPermissionInChat)
+                e.setAttribute('data-view-perm', document.testUserPermission(game.user, 'OBSERVER'));
         });
 
         if (this.isContentVisible) {
diff --git a/module/systemRegistration/settings.mjs b/module/systemRegistration/settings.mjs
index 6756dcab..1cd627af 100644
--- a/module/systemRegistration/settings.mjs
+++ b/module/systemRegistration/settings.mjs
@@ -1,10 +1,11 @@
 import { defaultLevelTiers, DhLevelTiers } from '../data/levelTier.mjs';
 import DhCountdowns from '../data/countdowns.mjs';
-import { DhAppearance, DhAutomation, DhHomebrew, DhVariantRules } from '../data/settings/_module.mjs';
+import { DhAppearance, DhAutomation, DhHomebrew, DhMetagaming, DhVariantRules } from '../data/settings/_module.mjs';
 import {
     DhAppearanceSettings,
     DhAutomationSettings,
     DhHomebrewSettings,
+    DhMetagamingSettings,
     DhVariantRuleSettings
 } from '../applications/settings/_module.mjs';
 import { CompendiumBrowserSettings, DhTagTeamRoll } from '../data/_module.mjs';
@@ -38,6 +39,12 @@ const registerMenuSettings = () => {
         type: DhAutomation
     });
 
+    game.settings.register(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Metagaming, {
+        scope: 'world',
+        config: false,
+        type: DhMetagaming
+    });
+
     game.settings.register(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew, {
         scope: 'world',
         config: false,
@@ -76,6 +83,16 @@ const registerMenus = () => {
         type: DhAutomationSettings,
         restricted: true
     });
+
+    game.settings.registerMenu(CONFIG.DH.id, CONFIG.DH.SETTINGS.menu.Metagaming.Name, {
+        name: game.i18n.localize('DAGGERHEART.SETTINGS.Menu.metagaming.name'),
+        label: game.i18n.localize('DAGGERHEART.SETTINGS.Menu.metagaming.label'),
+        hint: game.i18n.localize('DAGGERHEART.SETTINGS.Menu.metagaming.hint'),
+        icon: CONFIG.DH.SETTINGS.menu.Metagaming.Icon,
+        type: DhMetagamingSettings,
+        restricted: true
+    });
+
     game.settings.registerMenu(CONFIG.DH.id, CONFIG.DH.SETTINGS.menu.Homebrew.Name, {
         name: game.i18n.localize('DAGGERHEART.SETTINGS.Menu.homebrew.name'),
         label: game.i18n.localize('DAGGERHEART.SETTINGS.Menu.homebrew.label'),
diff --git a/styles/less/ui/chat/chat.less b/styles/less/ui/chat/chat.less
index 3591fc65..e9ef9147 100644
--- a/styles/less/ui/chat/chat.less
+++ b/styles/less/ui/chat/chat.less
@@ -450,6 +450,10 @@
 
             .target-data {
                 flex: 1;
+
+                .target-name {
+                    text-align: left;
+                }
             }
 
             .target-save {
diff --git a/system.json b/system.json
index fc5e1615..34d7e438 100644
--- a/system.json
+++ b/system.json
@@ -2,7 +2,7 @@
     "id": "daggerheart",
     "title": "Daggerheart",
     "description": "An unofficial implementation of the Daggerheart system",
-    "version": "1.8.0",
+    "version": "1.9.0",
     "compatibility": {
         "minimum": "13.346",
         "verified": "13.351",
diff --git a/templates/settings/metagaming-settings/footer.hbs b/templates/settings/metagaming-settings/footer.hbs
new file mode 100644
index 00000000..54939c17
--- /dev/null
+++ b/templates/settings/metagaming-settings/footer.hbs
@@ -0,0 +1,10 @@
+<footer class="form-footer">
+    <button data-action="reset">
+        <i class="fa-solid fa-arrow-rotate-left"></i>
+        <span>{{localize "Reset"}}</span>
+    </button>
+    <button data-action="save" >
+        <i class="fa-solid fa-floppy-disk"></i>
+        <span>{{localize "Save Changes"}}</span>
+    </button>
+</footer>
\ No newline at end of file
diff --git a/templates/settings/metagaming-settings/general.hbs b/templates/settings/metagaming-settings/general.hbs
new file mode 100644
index 00000000..7f36715e
--- /dev/null
+++ b/templates/settings/metagaming-settings/general.hbs
@@ -0,0 +1,3 @@
+<div>
+    {{formGroup settingFields.schema.fields.hideObserverPermissionInChat value=settingFields._source.hideObserverPermissionInChat localize=true}}
+</div>
\ No newline at end of file
diff --git a/templates/settings/metagaming-settings/header.hbs b/templates/settings/metagaming-settings/header.hbs
new file mode 100644
index 00000000..e0f72ee8
--- /dev/null
+++ b/templates/settings/metagaming-settings/header.hbs
@@ -0,0 +1,3 @@
+<header class="dialog-header">
+    <h1>{{localize 'DAGGERHEART.SETTINGS.Menu.metagaming.name'}}</h1>
+</header>
\ No newline at end of file
diff --git a/templates/ui/chat/parts/target-part.hbs b/templates/ui/chat/parts/target-part.hbs
index 477445a3..9a545926 100644
--- a/templates/ui/chat/parts/target-part.hbs
+++ b/templates/ui/chat/parts/target-part.hbs
@@ -1,6 +1,6 @@
 <div class="roll-part target-section dice-roll" data-action="expandRoll">
     <div class="roll-part-header"><div><span>{{pluralize currentTargets.length "DAGGERHEART.GENERAL.Target"}}</span></div></div>
-    {{#if isGM}}
+    {{#if (or isGM (not metagamingSettings.hideObserverPermissionInChat))}}
         <div class="roll-part-extra on-reduced">
             <div class="wrapper">
                 {{#if (or (gt targetShort.hit 0) (gt targetShort.miss 0))}}

From 552c62adc1c63ae7996e3153bcfffae4462d3a9c Mon Sep 17 00:00:00 2001
From: WBHarry <89362246+WBHarry@users.noreply.github.com>
Date: Wed, 11 Mar 2026 11:10:28 +0100
Subject: [PATCH 07/11] [Feature] Custom Resources (#1714)

* Initial

* .

* Fixed positioning

* .

* Only showing the menu if there are extra resources

* Improved resourceManager clickable

* .

* Changed variable name

* Refactor resources selection and data prep (#1721)

* Move resources select to scrolly text and accept actor object

* Convert isReversed to prepared data and add label

* Removed unused imports

---------

Co-authored-by: WBHarry <williambjrklund@gmail.com>

* Naming

* [Feature] Custom Homebrew Resources (#1718)

* Added resources to the Homebrew Menu

* Fixed translations

* .

* Inverted from isImage to isIcon. Should be more logical for users

* Removed testing resources

* Refactor resource settings to not be a method (#1723)

* Fix editing homebrew resources with a custom ResourcesField

* Fix removing homebrew resources

* Remove vestigial code

* Use custom config for module data instead of including in all (#1724)

* Use custom config for module data instead of including in all

* More simple

* base highest priority

---------

Co-authored-by: Carlos Fernandez <CarlosFdez@users.noreply.github.com>
Co-authored-by: Carlos Fernandez <cfern1990@gmail.com>
---
 daggerheart.mjs                               |   5 +
 lang/en.json                                  |  17 +++
 .../settings/homebrewSettings.mjs             | 106 ++++++++++++++-
 .../applications/sheets/actors/character.mjs  |  82 ++++++++++++
 .../applications/sheets/api/actor-setting.mjs |  26 +++-
 module/config/_module.mjs                     |   1 +
 module/config/actorConfig.mjs                 | 102 ++++++---------
 module/config/hooksConfig.mjs                 |   3 +-
 module/config/resourceConfig.mjs              |  88 +++++++++++++
 module/config/system.mjs                      |   2 +
 module/data/actor/adversary.mjs               |   7 +-
 module/data/actor/base.mjs                    |   2 +-
 module/data/actor/character.mjs               |  27 +---
 module/data/actor/companion.mjs               |   8 +-
 module/data/actor/creature.mjs                |   2 +
 module/data/fields/actorField.mjs             |  81 +++++++++---
 module/data/item/base.mjs                     |   2 +-
 module/data/settings/Homebrew.mjs             | 123 ++++++++++++++++++
 module/documents/tooltipManager.mjs           | 102 ++++++++++++++-
 module/helpers/utils.mjs                      |  13 +-
 module/systemRegistration/settings.mjs        |  29 +----
 .../less/sheets/actors/character/header.less  |  13 +-
 styles/less/ui/index.less                     |   1 +
 .../settings/homebrew-settings/resources.less |  87 +++++++++++++
 styles/less/ux/index.less                     |   2 +
 .../less/ux/tooltip/resource-management.less  |  56 ++++++++
 .../settings/homebrew-settings/resources.hbs  |  78 +++++++++++
 .../adversary-settings/details.hbs            |  16 +--
 .../character-settings/details.hbs            |  15 +--
 .../companion-settings/details.hbs            |   7 +-
 templates/sheets/actors/character/header.hbs  |  35 ++---
 templates/ui/tooltip/resourceManagement.hbs   |  21 +++
 32 files changed, 970 insertions(+), 189 deletions(-)
 create mode 100644 module/config/resourceConfig.mjs
 create mode 100644 styles/less/ui/settings/homebrew-settings/resources.less
 create mode 100644 styles/less/ux/tooltip/resource-management.less
 create mode 100644 templates/settings/homebrew-settings/resources.hbs
 create mode 100644 templates/ui/tooltip/resourceManagement.hbs

diff --git a/daggerheart.mjs b/daggerheart.mjs
index 05b57ac9..5960c6b1 100644
--- a/daggerheart.mjs
+++ b/daggerheart.mjs
@@ -233,6 +233,11 @@ Hooks.once('init', () => {
     return handlebarsRegistration();
 });
 
+Hooks.on('i18nInit', () => {
+    // Setup homebrew resources
+    game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew).refreshConfig();
+});
+
 Hooks.on('setup', () => {
     CONFIG.statusEffects = [
         ...CONFIG.statusEffects.filter(x => !['dead', 'unconscious'].includes(x.id)),
diff --git a/lang/en.json b/lang/en.json
index 4a4d073d..75896218 100755
--- a/lang/en.json
+++ b/lang/en.json
@@ -2281,6 +2281,7 @@
             "identify": "Identity",
             "imagePath": "Image Path",
             "inactiveEffects": "Inactive Effects",
+            "initial": "Initial",
             "inventory": "Inventory",
             "itemResource": "Item Resource",
             "itemQuantity": "Item Quantity",
@@ -2666,6 +2667,8 @@
                 "resetMovesText": "Are you sure you want to reset?",
                 "deleteItemTitle": "Delete Homebrew Item",
                 "deleteItemText": "Are you sure you want to delete the item?",
+                "deleteResourceTitle": "Delete Homebrew Resource",
+                "deleteResourceText": "Are you sure you want to delete the resource?",
                 "FIELDS": {
                     "maxFear": { "label": "Max Fear" },
                     "maxHope": { "label": "Max Hope" },
@@ -2674,6 +2677,13 @@
                         "label": "Max Cards in Loadout",
                         "hint": "Set to blank or 0 for unlimited maximum"
                     },
+                    "resources": {
+                        "resources": {
+                            "value": { "label": "Icon" },
+                            "isIcon": { "label": "Font Awesome Icon" },
+                            "noColorFilter": { "label": "Disable Color Filter" }
+                        }
+                    },
                     "maxDomains": { "label": "Max Class Domains", "hint": "Max domains you can set on a class" }
                 },
                 "currency": {
@@ -2702,6 +2712,13 @@
                 "adversaryType": {
                     "title": "Custom Adversary Types",
                     "newType": "Adversary Type"
+                },
+                "resources": {
+                    "typeTitle": "{type} Resources",
+                    "filledIcon": "Filled Icon",
+                    "emptyIcon": "Empty Icon",
+                    "resourceIdentifier": "Resource Identifier",
+                    "setResourceIdentifier": "Set Resource Identifier"
                 }
             },
             "Menu": {
diff --git a/module/applications/settings/homebrewSettings.mjs b/module/applications/settings/homebrewSettings.mjs
index 083c468f..9cc0ecb1 100644
--- a/module/applications/settings/homebrewSettings.mjs
+++ b/module/applications/settings/homebrewSettings.mjs
@@ -1,4 +1,5 @@
 import { DhHomebrew } from '../../data/settings/_module.mjs';
+import { Resource } from '../../data/settings/Homebrew.mjs';
 import { slugify } from '../../helpers/utils.mjs';
 
 const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api;
@@ -44,6 +45,9 @@ export default class DhHomebrewSettings extends HandlebarsApplicationMixin(Appli
             addAdversaryType: this.addAdversaryType,
             deleteAdversaryType: this.deleteAdversaryType,
             selectAdversaryType: this.selectAdversaryType,
+            addResource: this.addResource,
+            removeResource: this.removeResource,
+            resetResourceImage: this.resetResourceImage,
             save: this.save,
             resetTokenSizes: this.resetTokenSizes,
             reset: this.reset
@@ -56,6 +60,10 @@ export default class DhHomebrewSettings extends HandlebarsApplicationMixin(Appli
         settings: { template: 'systems/daggerheart/templates/settings/homebrew-settings/settings.hbs' },
         domains: { template: 'systems/daggerheart/templates/settings/homebrew-settings/domains.hbs' },
         types: { template: 'systems/daggerheart/templates/settings/homebrew-settings/types.hbs' },
+        resources: {
+            template: 'systems/daggerheart/templates/settings/homebrew-settings/resources.hbs',
+            scrollable: ['.resource-types-container']
+        },
         itemTypes: { template: 'systems/daggerheart/templates/settings/homebrew-settings/itemFeatures.hbs' },
         downtime: { template: 'systems/daggerheart/templates/settings/homebrew-settings/downtime.hbs' },
         footer: { template: 'systems/daggerheart/templates/settings/homebrew-settings/footer.hbs' }
@@ -64,7 +72,14 @@ export default class DhHomebrewSettings extends HandlebarsApplicationMixin(Appli
     /** @inheritdoc */
     static TABS = {
         main: {
-            tabs: [{ id: 'settings' }, { id: 'domains' }, { id: 'types' }, { id: 'itemFeatures' }, { id: 'downtime' }],
+            tabs: [
+                { id: 'settings' },
+                { id: 'domains' },
+                { id: 'types' },
+                { id: 'resources' },
+                { id: 'itemFeatures' },
+                { id: 'downtime' }
+            ],
             initial: 'settings',
             labelPrefix: 'DAGGERHEART.GENERAL.Tabs'
         }
@@ -77,9 +92,17 @@ export default class DhHomebrewSettings extends HandlebarsApplicationMixin(Appli
         this.render();
     }
 
+    _attachPartListeners(partId, htmlElement, options) {
+        super._attachPartListeners(partId, htmlElement, options);
+
+        for (const element of htmlElement.querySelectorAll('.path-field input'))
+            element.addEventListener('change', this.toggleResourceIsIcon.bind(this));
+    }
+
     async _prepareContext(_options) {
         const context = await super._prepareContext(_options);
         context.settingFields = this.settings;
+        context.schemaFields = context.settingFields.schema.fields;
 
         return context;
     }
@@ -103,6 +126,8 @@ export default class DhHomebrewSettings extends HandlebarsApplicationMixin(Appli
                     ? { id: this.selected.adversaryType, ...this.settings.adversaryTypes[this.selected.adversaryType] }
                     : null;
                 break;
+            case 'resources':
+                break;
             case 'downtime':
                 context.restOptions = {
                     shortRest: CONFIG.DH.GENERAL.defaultRestOptions.shortRest(),
@@ -124,6 +149,33 @@ export default class DhHomebrewSettings extends HandlebarsApplicationMixin(Appli
         this.render();
     }
 
+    async toggleResourceIsIcon(event) {
+        const element = event.target.closest('.resource-icon-container');
+        const { actorType, resourceKey, imageKey } = element.dataset;
+
+        const current = this.settings.resources[actorType].resources[resourceKey].images[imageKey];
+        await this.settings.updateSource({
+            [`resources.${actorType}.resources.${resourceKey}.images.${imageKey}`]: {
+                isIcon: !current.isIcon,
+                value: ''
+            }
+        });
+
+        this.render();
+    }
+
+    static async resetResourceImage(_event, button) {
+        const element = button.closest('.resource-icon-container');
+        const { actorType, resourceKey, imageKey } = element.dataset;
+
+        await this.settings.updateSource({
+            [`resources.${actorType}.resources.${resourceKey}.images.${imageKey}`]:
+                Resource.getDefaultImageData(imageKey)
+        });
+
+        this.render();
+    }
+
     static async changeCurrencyIcon(_, target) {
         const type = target.dataset.currency;
         const currentIcon = this.settings.currency[type].icon;
@@ -466,6 +518,58 @@ export default class DhHomebrewSettings extends HandlebarsApplicationMixin(Appli
         this.render();
     }
 
+    static async addResource(_, target) {
+        const { actorType } = target.dataset;
+        const content = new foundry.data.fields.StringField({
+            label: game.i18n.localize('DAGGERHEART.SETTINGS.Homebrew.resources.resourceIdentifier'),
+            required: true
+        }).toFormGroup({}, { name: 'identifier', localize: true }).outerHTML;
+
+        async function callback(_, button) {
+            const identifier = button.form.elements.identifier.value;
+            if (!identifier) return;
+
+            const sluggedIdentifier = slugify(identifier);
+
+            await this.settings.updateSource({
+                [`resources.${actorType}.resources.${sluggedIdentifier}`]: Resource.getDefaultResourceData(identifier)
+            });
+
+            game.settings.set(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew, this.settings.toObject());
+            this.render();
+        }
+
+        await foundry.applications.api.DialogV2.prompt({
+            content: content,
+            rejectClose: false,
+            modal: true,
+            ok: { callback: callback.bind(this) },
+            window: {
+                title: game.i18n.localize('DAGGERHEART.SETTINGS.Homebrew.resources.setResourceIdentifier')
+            },
+            position: { width: 400 }
+        });
+    }
+
+    static async removeResource(_, target) {
+        const confirmed = await foundry.applications.api.DialogV2.confirm({
+            window: {
+                title: game.i18n.localize(`DAGGERHEART.SETTINGS.Homebrew.deleteResourceTitle`)
+            },
+            content: game.i18n.localize('DAGGERHEART.SETTINGS.Homebrew.deleteResourceText')
+        });
+
+        if (!confirmed) return;
+
+        const { actorType, resourceKey } = target.dataset;
+        await this.settings.updateSource({
+            [`resources.${actorType}.resources.-=${resourceKey}`]: null
+        });
+
+        game.settings.set(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew, this.settings.toObject());
+        this.render();
+    }
+
     static async save() {
         await game.settings.set(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew, this.settings.toObject());
         this.close();
diff --git a/module/applications/sheets/actors/character.mjs b/module/applications/sheets/actors/character.mjs
index 4ecaeb06..14dd1ae7 100644
--- a/module/applications/sheets/actors/character.mjs
+++ b/module/applications/sheets/actors/character.mjs
@@ -33,6 +33,7 @@ export default class CharacterSheet extends DHBaseActorSheet {
             handleResourceDice: CharacterSheet.#handleResourceDice,
             advanceResourceDie: CharacterSheet.#advanceResourceDie,
             cancelBeastform: CharacterSheet.#cancelBeastform,
+            toggleResourceManagement: CharacterSheet.#toggleResourceManagement,
             useDowntime: this.useDowntime,
             viewParty: CharacterSheet.#viewParty
         },
@@ -226,6 +227,9 @@ export default class CharacterSheet extends DHBaseActorSheet {
     async _preparePartContext(partId, context, options) {
         context = await super._preparePartContext(partId, context, options);
         switch (partId) {
+            case 'header':
+                await this._prepareHeaderContext(context, options);
+                break;
             case 'loadout':
                 await this._prepareLoadoutContext(context, options);
                 break;
@@ -240,6 +244,12 @@ export default class CharacterSheet extends DHBaseActorSheet {
         return context;
     }
 
+    async _prepareHeaderContext(context, _options) {
+        context.hasExtraResources = Object.keys(CONFIG.DH.RESOURCE.character.all).some(
+            key => !CONFIG.DH.RESOURCE.character.base[key]
+        );
+    }
+
     /**
      * Prepare render context for the Loadout part.
      * @param {ApplicationRenderContext} context
@@ -942,6 +952,78 @@ export default class CharacterSheet extends DHBaseActorSheet {
         });
     }
 
+    static async #toggleResourceManagement(event, button) {
+        event.stopPropagation();
+        const existingTooltip = document.body.querySelector('.locked-tooltip .resource-management-container');
+        if (existingTooltip) {
+            game.tooltip.dismissLockedTooltips();
+            return;
+        }
+
+        const extraResources = Object.values(CONFIG.DH.RESOURCE.character.all).reduce((acc, resource) => {
+            if (CONFIG.DH.RESOURCE.character.base[resource.id]) return acc;
+
+            const resourceData = this.document.system.resources[resource.id];
+            acc[resource.id] = {
+                id: resource.id,
+                label: game.i18n.localize(resource.label),
+                value: resourceData.value,
+                max: resourceData.max,
+                fullIcon: resource.images?.full ?? { value: 'fa-solid fa-circle', isIcon: true },
+                emptyIcon: resource.images?.empty ?? { value: 'fa-regular fa-circle', isIcon: true }
+            };
+
+            return acc;
+        }, {});
+
+        const html = document.createElement('div');
+        html.innerHTML = await foundry.applications.handlebars.renderTemplate(
+            `systems/daggerheart/templates/ui/tooltip/resourceManagement.hbs`,
+            {
+                resources: extraResources
+            }
+        );
+
+        const target = button.closest('.resource-section');
+
+        game.tooltip.dismissLockedTooltips();
+        game.tooltip.activate(target, {
+            html,
+            locked: true,
+            cssClass: 'bordered-tooltip',
+            direction: 'DOWN',
+            noOffset: true
+        });
+
+        const resourceManager = target.querySelector('.resource-manager');
+        resourceManager.classList.toggle('inverted');
+
+        Hooks.once(CONFIG.DH.HOOKS.hooksConfig.lockedTooltipDismissed, () => {
+            resourceManager.classList.toggle('inverted');
+        });
+
+        for (const element of html.querySelectorAll('.resource-value'))
+            element.addEventListener('click', this.onUpdateResource.bind(this));
+    }
+
+    async onUpdateResource(event) {
+        const target = event.target.closest('.resource-value');
+        const { resource, value: textValue } = target.dataset;
+
+        const inputValue = Number.parseInt(textValue);
+        const decreasing = inputValue <= this.document.system.resources[resource].value;
+        const value = decreasing ? inputValue - 1 : inputValue;
+        await this.document.update({ [`system.resources.${resource}.value`]: value }, { render: false });
+
+        /* Update resource symbols */
+        const section = target.closest('.resource-section');
+        for (const element of section.querySelectorAll('.resource-value')) {
+            const showFull = Number.parseInt(element.dataset.value) <= value;
+            element.querySelector('.full').classList.toggle('hidden', !showFull);
+            element.querySelector('.empty').classList.toggle('hidden', showFull);
+        }
+    }
+
     /**
      *  Open the downtime application.
      * @type {ApplicationClickAction}
diff --git a/module/applications/sheets/api/actor-setting.mjs b/module/applications/sheets/api/actor-setting.mjs
index d8cfb40f..738f7002 100644
--- a/module/applications/sheets/api/actor-setting.mjs
+++ b/module/applications/sheets/api/actor-setting.mjs
@@ -44,8 +44,32 @@ export default class DHBaseActorSettings extends DHApplicationMixin(DocumentShee
         const context = await super._prepareContext(options);
         context.isNPC = this.actor.isNPC;
 
-        if (context.systemFields.attack)
+        if (context.systemFields.attack) {
             context.systemFields.attack.fields = this.actor.system.attack.schema.fields;
+        }
+
+        // Create fake fields for actor configurable max resource value.
+        const resourceConfig = CONFIG.DH.RESOURCE[this.actor.type]?.all;
+        if (resourceConfig) {
+            const relevant = ['hitPoints', 'stress'].filter(r => r in resourceConfig);
+            context.resources = relevant.map(key => {
+                const data = this.actor._source.system.resources[key];
+                const config = resourceConfig[key];
+                return {
+                    label: config.label,
+                    name: `system.resources.${key}.max`,
+                    value: data.max ?? config.max,
+                    tooltip: key === 'hitPoints' ? game.i18n.localize('DAGGERHEART.UI.Tooltip.maxHPClassBound') : null,
+                    field: new foundry.data.fields.NumberField({
+                        initial: config.max,
+                        integer: true,
+                        label: game.i18n.format('DAGGERHEART.GENERAL.maxWithThing', {
+                            thing: game.i18n.localize(config.label)
+                        })
+                    })
+                };
+            });
+        }
 
         return context;
     }
diff --git a/module/config/_module.mjs b/module/config/_module.mjs
index 560f3fec..7a725f54 100644
--- a/module/config/_module.mjs
+++ b/module/config/_module.mjs
@@ -11,3 +11,4 @@ export * as settingsConfig from './settingsConfig.mjs';
 export * as systemConfig from './system.mjs';
 export * as itemBrowserConfig from './itemBrowserConfig.mjs';
 export * as triggerConfig from './triggerConfig.mjs';
+export * as resourceConfig from './resourceConfig.mjs';
diff --git a/module/config/actorConfig.mjs b/module/config/actorConfig.mjs
index ac55117a..aa7c3cf7 100644
--- a/module/config/actorConfig.mjs
+++ b/module/config/actorConfig.mjs
@@ -55,24 +55,6 @@ export const abilities = {
     }
 };
 
-export const scrollingTextResource = {
-    hitPoints: {
-        label: 'DAGGERHEART.GENERAL.HitPoints.plural',
-        reversed: true
-    },
-    stress: {
-        label: 'DAGGERHEART.GENERAL.stress',
-        reversed: true
-    },
-    hope: {
-        label: 'DAGGERHEART.GENERAL.hope'
-    },
-    armor: {
-        label: 'DAGGERHEART.GENERAL.armor',
-        reversed: true
-    }
-};
-
 export const featureProperties = {
     agility: {
         name: 'DAGGERHEART.CONFIG.Traits.agility.name',
@@ -506,8 +488,8 @@ export const subclassFeatureLabels = {
  * @property {number[]} damage
  */
 
-/** 
- * @type {Record<string, Record<2 | 3 | 4, TierData>} 
+/**
+ * @type {Record<string, Record<2 | 3 | 4, TierData>}
  * Scaling data used to change an adversary's tier. Each rank is applied incrementally.
  */
 export const adversaryScalingData = {
@@ -518,7 +500,7 @@ export const adversaryScalingData = {
             severeThreshold: 10,
             hp: 1,
             stress: 2,
-            attack: 2,
+            attack: 2
         },
         3: {
             difficulty: 2,
@@ -526,7 +508,7 @@ export const adversaryScalingData = {
             severeThreshold: 15,
             hp: 1,
             stress: 0,
-            attack: 2,
+            attack: 2
         },
         4: {
             difficulty: 2,
@@ -534,7 +516,7 @@ export const adversaryScalingData = {
             severeThreshold: 25,
             hp: 1,
             stress: 0,
-            attack: 2,
+            attack: 2
         }
     },
     horde: {
@@ -544,7 +526,7 @@ export const adversaryScalingData = {
             severeThreshold: 8,
             hp: 2,
             stress: 0,
-            attack: 0,
+            attack: 0
         },
         3: {
             difficulty: 2,
@@ -552,7 +534,7 @@ export const adversaryScalingData = {
             severeThreshold: 12,
             hp: 0,
             stress: 1,
-            attack: 1,
+            attack: 1
         },
         4: {
             difficulty: 2,
@@ -560,7 +542,7 @@ export const adversaryScalingData = {
             severeThreshold: 15,
             hp: 2,
             stress: 0,
-            attack: 0,
+            attack: 0
         }
     },
     leader: {
@@ -570,7 +552,7 @@ export const adversaryScalingData = {
             severeThreshold: 10,
             hp: 0,
             stress: 0,
-            attack: 1,
+            attack: 1
         },
         3: {
             difficulty: 2,
@@ -578,7 +560,7 @@ export const adversaryScalingData = {
             severeThreshold: 15,
             hp: 1,
             stress: 0,
-            attack: 2,
+            attack: 2
         },
         4: {
             difficulty: 2,
@@ -586,7 +568,7 @@ export const adversaryScalingData = {
             severeThreshold: 25,
             hp: 1,
             stress: 1,
-            attack: 3,
+            attack: 3
         }
     },
     minion: {
@@ -596,7 +578,7 @@ export const adversaryScalingData = {
             severeThreshold: 0,
             hp: 0,
             stress: 0,
-            attack: 1,
+            attack: 1
         },
         3: {
             difficulty: 2,
@@ -604,7 +586,7 @@ export const adversaryScalingData = {
             severeThreshold: 0,
             hp: 0,
             stress: 1,
-            attack: 1,
+            attack: 1
         },
         4: {
             difficulty: 2,
@@ -612,7 +594,7 @@ export const adversaryScalingData = {
             severeThreshold: 0,
             hp: 0,
             stress: 0,
-            attack: 1,
+            attack: 1
         }
     },
     ranged: {
@@ -622,7 +604,7 @@ export const adversaryScalingData = {
             severeThreshold: 6,
             hp: 1,
             stress: 0,
-            attack: 1,
+            attack: 1
         },
         3: {
             difficulty: 2,
@@ -630,7 +612,7 @@ export const adversaryScalingData = {
             severeThreshold: 14,
             hp: 1,
             stress: 1,
-            attack: 2,
+            attack: 2
         },
         4: {
             difficulty: 2,
@@ -638,7 +620,7 @@ export const adversaryScalingData = {
             severeThreshold: 10,
             hp: 1,
             stress: 1,
-            attack: 1,
+            attack: 1
         }
     },
     skulk: {
@@ -648,7 +630,7 @@ export const adversaryScalingData = {
             severeThreshold: 8,
             hp: 1,
             stress: 1,
-            attack: 1,
+            attack: 1
         },
         3: {
             difficulty: 2,
@@ -656,7 +638,7 @@ export const adversaryScalingData = {
             severeThreshold: 12,
             hp: 1,
             stress: 1,
-            attack: 1,
+            attack: 1
         },
         4: {
             difficulty: 2,
@@ -664,7 +646,7 @@ export const adversaryScalingData = {
             severeThreshold: 10,
             hp: 1,
             stress: 1,
-            attack: 1,
+            attack: 1
         }
     },
     solo: {
@@ -674,7 +656,7 @@ export const adversaryScalingData = {
             severeThreshold: 10,
             hp: 0,
             stress: 1,
-            attack: 2,
+            attack: 2
         },
         3: {
             difficulty: 2,
@@ -682,7 +664,7 @@ export const adversaryScalingData = {
             severeThreshold: 15,
             hp: 2,
             stress: 1,
-            attack: 2,
+            attack: 2
         },
         4: {
             difficulty: 2,
@@ -690,7 +672,7 @@ export const adversaryScalingData = {
             severeThreshold: 25,
             hp: 0,
             stress: 1,
-            attack: 3,
+            attack: 3
         }
     },
     standard: {
@@ -700,7 +682,7 @@ export const adversaryScalingData = {
             severeThreshold: 8,
             hp: 0,
             stress: 0,
-            attack: 1,
+            attack: 1
         },
         3: {
             difficulty: 2,
@@ -708,7 +690,7 @@ export const adversaryScalingData = {
             severeThreshold: 15,
             hp: 1,
             stress: 1,
-            attack: 1,
+            attack: 1
         },
         4: {
             difficulty: 2,
@@ -716,7 +698,7 @@ export const adversaryScalingData = {
             severeThreshold: 15,
             hp: 0,
             stress: 1,
-            attack: 1,
+            attack: 1
         }
     },
     support: {
@@ -726,7 +708,7 @@ export const adversaryScalingData = {
             severeThreshold: 8,
             hp: 1,
             stress: 1,
-            attack: 1,
+            attack: 1
         },
         3: {
             difficulty: 2,
@@ -734,7 +716,7 @@ export const adversaryScalingData = {
             severeThreshold: 12,
             hp: 0,
             stress: 0,
-            attack: 1,
+            attack: 1
         },
         4: {
             difficulty: 2,
@@ -742,27 +724,27 @@ export const adversaryScalingData = {
             severeThreshold: 10,
             hp: 1,
             stress: 1,
-            attack: 1,
+            attack: 1
         }
     }
 };
 
-/** 
+/**
  * Scaling data used for an adversary's damage.
  * Tier 4 is missing certain adversary types and therefore skews upwards.
  * We manually set tier 4 data to hopefully lead to better results
  */
 export const adversaryExpectedDamage = {
-  basic: {
-    1: { mean: 7.321428571428571, deviation: 1.962519002770912 },
-    2: { mean: 12.444444444444445, deviation: 2.0631069425529676 },
-    3: { mean: 15.722222222222221, deviation: 2.486565208464823 },
-    4: { mean: 26, deviation: 5.2 }
-  },
-  minion: {
-    1: { mean: 2.142857142857143, deviation: 1.0690449676496976 },
-    2: { mean: 5, deviation: 0.816496580927726 },
-    3: { mean: 6.5, deviation: 2.1213203435596424 },
-    4: { mean: 11, deviation: 1 }
-  }
+    basic: {
+        1: { mean: 7.321428571428571, deviation: 1.962519002770912 },
+        2: { mean: 12.444444444444445, deviation: 2.0631069425529676 },
+        3: { mean: 15.722222222222221, deviation: 2.486565208464823 },
+        4: { mean: 26, deviation: 5.2 }
+    },
+    minion: {
+        1: { mean: 2.142857142857143, deviation: 1.0690449676496976 },
+        2: { mean: 5, deviation: 0.816496580927726 },
+        3: { mean: 6.5, deviation: 2.1213203435596424 },
+        4: { mean: 11, deviation: 1 }
+    }
 };
diff --git a/module/config/hooksConfig.mjs b/module/config/hooksConfig.mjs
index 9140ea0a..61ba594c 100644
--- a/module/config/hooksConfig.mjs
+++ b/module/config/hooksConfig.mjs
@@ -1,3 +1,4 @@
 export const hooksConfig = {
-    effectDisplayToggle: 'DHEffectDisplayToggle'
+    effectDisplayToggle: 'DHEffectDisplayToggle',
+    lockedTooltipDismissed: 'DHLockedTooltipDismissed'
 };
diff --git a/module/config/resourceConfig.mjs b/module/config/resourceConfig.mjs
new file mode 100644
index 00000000..f7d56b44
--- /dev/null
+++ b/module/config/resourceConfig.mjs
@@ -0,0 +1,88 @@
+/**
+ *  Full custom typing:
+ *  id
+ *  initial
+ *  max
+ *  reverse
+ *  label
+ *  images {
+ *    full { value, isIcon, noColorFilter }
+ *    empty { value, isIcon noColorFilter }
+ *  }
+ */
+
+const characterBaseResources = Object.freeze({
+    hitPoints: {
+        id: 'hitPoints',
+        initial: 0,
+        max: 0,
+        reverse: true,
+        label: 'DAGGERHEART.GENERAL.HitPoints.plural',
+        maxLabel: 'DAGGERHEART.ACTORS.Character.maxHPBonus'
+    },
+    stress: {
+        id: 'stress',
+        initial: 0,
+        max: 6,
+        reverse: true,
+        label: 'DAGGERHEART.GENERAL.stress'
+    },
+    hope: {
+        id: 'hope',
+        initial: 2,
+        reverse: false,
+        label: 'DAGGERHEART.GENERAL.hope'
+    }
+});
+
+const adversaryBaseResources = Object.freeze({
+    hitPoints: {
+        id: 'hitPoints',
+        initial: 0,
+        max: 0,
+        reverse: true,
+        label: 'DAGGERHEART.GENERAL.HitPoints.plural',
+        maxLabel: 'DAGGERHEART.ACTORS.Character.maxHPBonus'
+    },
+    stress: {
+        id: 'stress',
+        initial: 0,
+        max: 0,
+        reverse: true,
+        label: 'DAGGERHEART.GENERAL.stress'
+    }
+});
+
+const companionBaseResources = Object.freeze({
+    stress: {
+        id: 'stress',
+        initial: 0,
+        max: 0,
+        reverse: true,
+        label: 'DAGGERHEART.GENERAL.stress'
+    },
+    hope: {
+        id: 'hope',
+        initial: 0,
+        reverse: false,
+        label: 'DAGGERHEART.GENERAL.hope'
+    }
+});
+
+export const character = {
+    base: characterBaseResources,
+    custom: {}, // module stuff goes here
+    all: { ...characterBaseResources },
+};
+
+export const adversary = {
+    base: adversaryBaseResources,
+    custom: {}, // module stuff goes here
+    all: { ...adversaryBaseResources },
+};
+
+export const companion = {
+    base: companionBaseResources,
+    custom: {}, // module stuff goes here
+    all: { ...companionBaseResources },
+};
diff --git a/module/config/system.mjs b/module/config/system.mjs
index 47a41e8d..31dba518 100644
--- a/module/config/system.mjs
+++ b/module/config/system.mjs
@@ -2,6 +2,7 @@ import * as GENERAL from './generalConfig.mjs';
 import * as DOMAIN from './domainConfig.mjs';
 import * as ENCOUNTER from './encounterConfig.mjs';
 import * as ACTOR from './actorConfig.mjs';
+import * as RESOURCE from './resourceConfig.mjs';
 import * as ITEM from './itemConfig.mjs';
 import * as SETTINGS from './settingsConfig.mjs';
 import * as EFFECTS from './effectConfig.mjs';
@@ -19,6 +20,7 @@ export const SYSTEM = {
     GENERAL,
     DOMAIN,
     ACTOR,
+    RESOURCE,
     ITEM,
     SETTINGS,
     EFFECTS,
diff --git a/module/data/actor/adversary.mjs b/module/data/actor/adversary.mjs
index 0a446c15..2053ac99 100644
--- a/module/data/actor/adversary.mjs
+++ b/module/data/actor/adversary.mjs
@@ -2,7 +2,7 @@ import DHAdversarySettings from '../../applications/sheets-configs/adversary-set
 import { ActionField } from '../fields/actionField.mjs';
 import { commonActorRules } from './base.mjs';
 import DhCreature from './creature.mjs';
-import { resourceField, bonusField } from '../fields/actorField.mjs';
+import { bonusField } from '../fields/actorField.mjs';
 import { calculateExpectedValue, parseTermsFromSimpleFormula } from '../../helpers/utils.mjs';
 import { adversaryExpectedDamage, adversaryScalingData } from '../../config/actorConfig.mjs';
 
@@ -65,10 +65,6 @@ export default class DhpAdversary extends DhCreature {
                     label: 'DAGGERHEART.GENERAL.DamageThresholds.severeThreshold'
                 })
             }),
-            resources: new fields.SchemaField({
-                hitPoints: resourceField(0, 0, 'DAGGERHEART.GENERAL.HitPoints.plural', true),
-                stress: resourceField(0, 0, 'DAGGERHEART.GENERAL.stress', true)
-            }),
             rules: new fields.SchemaField({
                 ...commonActorRules()
             }),
@@ -191,6 +187,7 @@ export default class DhpAdversary extends DhCreature {
     }
 
     prepareDerivedData() {
+        super.prepareDerivedData();
         this.attack.roll.isStandardAttack = true;
     }
 
diff --git a/module/data/actor/base.mjs b/module/data/actor/base.mjs
index 5e16bac9..e2f910a0 100644
--- a/module/data/actor/base.mjs
+++ b/module/data/actor/base.mjs
@@ -213,7 +213,7 @@ export default class BaseDataActor extends foundry.abstract.TypeDataModel {
             const textData = Object.keys(changes.system.resources).reduce((acc, key) => {
                 const resource = changes.system.resources[key];
                 if (resource.value !== undefined && resource.value !== this.resources[key].value) {
-                    acc.push(getScrollTextData(this.resources, resource, key));
+                    acc.push(getScrollTextData(this.parent, resource, key));
                 }
 
                 return acc;
diff --git a/module/data/actor/character.mjs b/module/data/actor/character.mjs
index 10fba63c..68f7f3a8 100644
--- a/module/data/actor/character.mjs
+++ b/module/data/actor/character.mjs
@@ -3,7 +3,7 @@ import ForeignDocumentUUIDField from '../fields/foreignDocumentUUIDField.mjs';
 import DhLevelData from '../levelData.mjs';
 import { commonActorRules } from './base.mjs';
 import DhCreature from './creature.mjs';
-import { attributeField, resourceField, stressDamageReductionRule, bonusField } from '../fields/actorField.mjs';
+import { attributeField, stressDamageReductionRule, bonusField } from '../fields/actorField.mjs';
 import { ActionField } from '../fields/actionField.mjs';
 import DHCharacterSettings from '../../applications/sheets-configs/character-settings.mjs';
 
@@ -27,28 +27,6 @@ export default class DhCharacter extends DhCreature {
 
         return {
             ...super.defineSchema(),
-            resources: new fields.SchemaField({
-                hitPoints: resourceField(
-                    0,
-                    0,
-                    'DAGGERHEART.GENERAL.HitPoints.plural',
-                    true,
-                    'DAGGERHEART.ACTORS.Character.maxHPBonus'
-                ),
-                stress: resourceField(6, 0, 'DAGGERHEART.GENERAL.stress', true),
-                hope: new fields.SchemaField(
-                    {
-                        value: new fields.NumberField({
-                            initial: 2,
-                            min: 0,
-                            integer: true,
-                            label: 'DAGGERHEART.GENERAL.hope'
-                        }),
-                        isReversed: new fields.BooleanField({ initial: false })
-                    },
-                    { label: 'DAGGERHEART.GENERAL.hope' }
-                )
-            }),
             traits: new fields.SchemaField({
                 agility: attributeField('DAGGERHEART.CONFIG.Traits.agility.name'),
                 strength: attributeField('DAGGERHEART.CONFIG.Traits.strength.name'),
@@ -609,6 +587,7 @@ export default class DhCharacter extends DhCreature {
     }
 
     prepareBaseData() {
+        super.prepareBaseData();
         this.evasion += this.class.value?.system?.evasion ?? 0;
 
         const currentLevel = this.levelData.level.current;
@@ -680,6 +659,7 @@ export default class DhCharacter extends DhCreature {
     }
 
     prepareDerivedData() {
+        super.prepareDerivedData();
         let baseHope = this.resources.hope.value;
         if (this.companion) {
             for (let levelKey in this.companion.system.levelData.levelups) {
@@ -699,6 +679,7 @@ export default class DhCharacter extends DhCreature {
         this.attack.roll.trait = this.rules.attack.roll.trait ?? this.attack.roll.trait;
 
         this.resources.armor = {
+            label: 'DAGGERHEART.GENERAL.armor',
             value: this.armor?.system?.marks?.value ?? 0,
             max: this.armorScore,
             isReversed: true
diff --git a/module/data/actor/companion.mjs b/module/data/actor/companion.mjs
index 6f51b593..7a8f0e64 100644
--- a/module/data/actor/companion.mjs
+++ b/module/data/actor/companion.mjs
@@ -4,7 +4,7 @@ import ForeignDocumentUUIDField from '../fields/foreignDocumentUUIDField.mjs';
 import { ActionField } from '../fields/actionField.mjs';
 import { adjustDice, adjustRange } from '../../helpers/utils.mjs';
 import DHCompanionSettings from '../../applications/sheets-configs/companion-settings.mjs';
-import { resourceField, bonusField } from '../fields/actorField.mjs';
+import { bonusField } from '../fields/actorField.mjs';
 
 export default class DhCompanion extends DhCreature {
     static LOCALIZATION_PREFIXES = ['DAGGERHEART.ACTORS.Companion'];
@@ -26,10 +26,6 @@ export default class DhCompanion extends DhCreature {
         return {
             ...super.defineSchema(),
             partner: new ForeignDocumentUUIDField({ type: 'Actor' }),
-            resources: new fields.SchemaField({
-                stress: resourceField(3, 0, 'DAGGERHEART.GENERAL.stress', true),
-                hope: new fields.NumberField({ initial: 0, integer: true, label: 'DAGGERHEART.GENERAL.hope' })
-            }),
             evasion: new fields.NumberField({
                 required: true,
                 min: 1,
@@ -127,6 +123,7 @@ export default class DhCompanion extends DhCreature {
     }
 
     prepareBaseData() {
+        super.prepareBaseData();
         this.attack.roll.bonus = this.partner?.system?.spellcastModifier ?? 0;
 
         for (let levelKey in this.levelData.levelups) {
@@ -161,6 +158,7 @@ export default class DhCompanion extends DhCreature {
     }
 
     prepareDerivedData() {
+        super.prepareDerivedData();
         /* Partner Related Setup */
         if (this.partner) {
             this.levelData.level.changed = this.partner.system.levelData.level.current;
diff --git a/module/data/actor/creature.mjs b/module/data/actor/creature.mjs
index c8bf8448..601068ad 100644
--- a/module/data/actor/creature.mjs
+++ b/module/data/actor/creature.mjs
@@ -1,3 +1,4 @@
+import { ResourcesField } from '../fields/actorField.mjs';
 import BaseDataActor from './base.mjs';
 
 export default class DhCreature extends BaseDataActor {
@@ -7,6 +8,7 @@ export default class DhCreature extends BaseDataActor {
 
         return {
             ...super.defineSchema(),
+            resources: new ResourcesField(this.metadata.type),
             advantageSources: new fields.ArrayField(new fields.StringField(), {
                 label: 'DAGGERHEART.ACTORS.Character.advantageSources.label',
                 hint: 'DAGGERHEART.ACTORS.Character.advantageSources.hint'
diff --git a/module/data/fields/actorField.mjs b/module/data/fields/actorField.mjs
index db1faad4..65e7abbf 100644
--- a/module/data/fields/actorField.mjs
+++ b/module/data/fields/actorField.mjs
@@ -6,22 +6,6 @@ const attributeField = label =>
         tierMarked: new fields.BooleanField({ initial: false })
     });
 
-const resourceField = (max = 0, initial = 0, label, reverse = false, maxLabel) =>
-    new fields.SchemaField(
-        {
-            value: new fields.NumberField({ initial: initial, min: 0, integer: true, label }),
-            max: new fields.NumberField({
-                initial: max,
-                integer: true,
-                label:
-                    maxLabel ??
-                    game.i18n.format('DAGGERHEART.GENERAL.maxWithThing', { thing: game.i18n.localize(label) })
-            }),
-            isReversed: new fields.BooleanField({ initial: reverse })
-        },
-        { label }
-    );
-
 const stressDamageReductionRule = localizationPath =>
     new fields.SchemaField({
         cost: new fields.NumberField({
@@ -37,4 +21,67 @@ const bonusField = label =>
         dice: new fields.ArrayField(new fields.StringField(), { label: `${game.i18n.localize(label)} Dice` })
     });
 
-export { attributeField, resourceField, stressDamageReductionRule, bonusField };
+/** 
+ * Field used for actor resources. It is a resource that validates dynamically based on the config.
+ * Because "max" may be defined during runtime, we don't attempt to clamp the maximum value.
+ */
+class ResourcesField extends fields.TypedObjectField {
+    constructor(actorType) {
+        super(
+            new fields.SchemaField({
+                value: new fields.NumberField({ min: 0, initial: 0, integer: true }),
+                // Some resources allow changing max. A null max means its the default
+                max: new fields.NumberField({ initial: null, integer: true, nullable: true })
+            })
+        );
+        this.actorType = actorType;
+    }
+
+    getInitialValue() {
+        const resources = CONFIG.DH.RESOURCE[this.actorType].all;
+        return Object.values(resources).reduce((result, resource) => {
+            result[resource.id] = {
+                value: resource.initial,
+                max: null
+            };
+            return result;
+        }, {});
+    }
+
+    _validateKey(key) {
+        return key in CONFIG.DH.RESOURCE[this.actorType].all;
+    }
+
+    _cleanType(value, options) {
+        value = super._cleanType(value, options);
+
+        // If not partial, ensure all data exists
+        if (!options.partial) {
+            value = foundry.utils.mergeObject(this.getInitialValue(), value);
+        }
+
+        return value;
+    }
+
+    /** Initializes the original source data, returning prepared data */
+    initialize(...args) {
+        const data = super.initialize(...args);
+        const resources = CONFIG.DH.RESOURCE[this.actorType].all;
+        for (const [key, value] of Object.entries(data)) {
+            // TypedObjectField only calls _validateKey when persisting, so we also call it here
+            if (!this._validateKey(key)) {
+                delete value[key];
+                continue;
+            }
+
+            // Add basic prepared data.
+            const resource = resources[key];
+            value.label = resource.label;
+            value.isReversed = resources[key].reverse;
+            value.max = typeof resource.max === 'number' ? value.max ?? resource.max : null;
+        }
+        return data;
+    }
+}
+
+export { attributeField, ResourcesField, stressDamageReductionRule, bonusField };
diff --git a/module/data/item/base.mjs b/module/data/item/base.mjs
index 84f39103..6f3256e3 100644
--- a/module/data/item/base.mjs
+++ b/module/data/item/base.mjs
@@ -224,7 +224,7 @@ export default class BaseDataItem extends foundry.abstract.TypeDataModel {
         const armorChanged =
             changed.system?.marks?.value !== undefined && changed.system.marks.value !== this.marks.value;
         if (armorChanged && autoSettings.resourceScrollTexts && this.parent.parent?.type === 'character') {
-            const armorData = getScrollTextData(this.parent.parent.system.resources, changed.system.marks, 'armor');
+            const armorData = getScrollTextData(this.parent.parent, changed.system.marks, 'armor');
             options.scrollingTextData = [armorData];
         }
 
diff --git a/module/data/settings/Homebrew.mjs b/module/data/settings/Homebrew.mjs
index b8804fa7..9b4ee2cf 100644
--- a/module/data/settings/Homebrew.mjs
+++ b/module/data/settings/Homebrew.mjs
@@ -145,6 +145,16 @@ export default class DhHomebrew extends foundry.abstract.DataModel {
                     description: new fields.StringField()
                 })
             ),
+            resources: new fields.TypedObjectField(
+                new fields.SchemaField({
+                    resources: new fields.TypedObjectField(new fields.EmbeddedDataField(Resource))
+                }),
+                {
+                    initial: {
+                        character: { resources: {} }
+                    }
+                }
+            ),
             itemFeatures: new fields.SchemaField({
                 weaponFeatures: new fields.TypedObjectField(
                     new fields.SchemaField({
@@ -185,4 +195,117 @@ export default class DhHomebrew extends foundry.abstract.DataModel {
         }
         return source;
     }
+
+    /** Invoked by the setting when data changes */
+    handleChange() {
+        if (this.maxFear) {
+            if (ui.resources) ui.resources.render({ force: true });
+        }
+
+        this.refreshConfig();
+        this.#resetActors();
+    }
+
+    /** Update config values based on homebrew data. Make sure the references don't change */
+    refreshConfig() {
+        for (const [actorType, actorData] of Object.entries(this.resources)) {
+            const config = CONFIG.DH.RESOURCE[actorType];
+            for (const key of Object.keys(config.all)) {
+                delete config.all[key];
+            }
+            Object.assign(config.all, {
+                ...Object.entries(actorData.resources).reduce((result, [key, value]) => {
+                    result[key] = value.toObject();
+                    result[key].id = key;
+                    return result;
+                }, {}),
+                ...config.custom,
+                ...config.base,
+            });
+        }
+    }
+
+    /**
+     * Triggers a reset and non-forced re-render on all given actors (if given)
+     * or all world actors and actors in all scenes to show immediate results for a changed setting.
+     */
+    #resetActors() {
+        const actors = new Set(
+            [
+                game.actors.contents,
+                game.scenes.contents.flatMap(s => s.tokens.contents).flatMap(t => t.actor ?? [])
+            ].flat()
+        );
+        for (const actor of actors) {
+            for (const app of Object.values(actor.apps)) {
+                for (const element of app.element?.querySelectorAll('prose-mirror.active')) {
+                    element.open = false; // This triggers a save
+                }
+            }
+
+            actor.reset();
+            actor.render();
+        }
+    }
 }
+
+export class Resource extends foundry.abstract.DataModel {
+    static defineSchema() {
+        const fields = foundry.data.fields;
+        return {
+            initial: new fields.NumberField({
+                required: true,
+                integer: true,
+                initial: 0,
+                min: 0,
+                label: 'DAGGERHEART.GENERAL.initial'
+            }),
+            max: new fields.NumberField({
+                nullable: true,
+                initial: null,
+                min: 0,
+                label: 'DAGGERHEART.GENERAL.max'
+            }),
+            label: new fields.StringField({ label: 'DAGGERHEART.GENERAL.label' }),
+            images: new fields.SchemaField({
+                full: imageIconField('fa solid fa-circle'),
+                empty: imageIconField('fa-regular fa-circle')
+            })
+        };
+    }
+
+    static getDefaultResourceData = label => {
+        const images = Resource.schema.fields.images.getInitialValue();
+        return {
+            initial: 0,
+            max: 0,
+            label: label ?? '',
+            images
+        };
+    };
+
+    static getDefaultImageData = imageKey => {
+        return Resource.schema.fields.images.fields[imageKey].getInitialValue();
+    };
+}
+
+const imageIconField = defaultValue =>
+    new foundry.data.fields.SchemaField(
+        {
+            value: new foundry.data.fields.StringField({
+                initial: defaultValue,
+                label: 'DAGGERHEART.SETTINGS.Homebrew.FIELDS.resources.resources.value.label'
+            }),
+            isIcon: new foundry.data.fields.BooleanField({
+                required: true,
+                initial: true,
+                label: 'DAGGERHEART.SETTINGS.Homebrew.FIELDS.resources.resources.isIcon.label'
+            }),
+            noColorFilter: new foundry.data.fields.BooleanField({
+                required: true,
+                initial: false,
+                label: 'DAGGERHEART.SETTINGS.Homebrew.FIELDS.resources.resources.noColorFilter.label'
+            })
+        },
+        { required: true }
+    );
diff --git a/module/documents/tooltipManager.mjs b/module/documents/tooltipManager.mjs
index c4b52bb5..4793f1f7 100644
--- a/module/documents/tooltipManager.mjs
+++ b/module/documents/tooltipManager.mjs
@@ -3,6 +3,7 @@ import { AdversaryBPPerEncounter, BaseBPPerEncounter } from '../config/encounter
 export default class DhTooltipManager extends foundry.helpers.interaction.TooltipManager {
     #wide = false;
     #bordered = false;
+    #active = false;
 
     async activate(element, options = {}) {
         const { TextEditor } = foundry.applications.ux;
@@ -168,7 +169,100 @@ export default class DhTooltipManager extends foundry.helpers.interaction.Toolti
             }
         }
 
-        super.activate(element, { ...options, html: html });
+        this.baseActivate(element, { ...options, html: html });
+    }
+
+    /* Need to pass more options to _setAnchor, so have to copy whole foundry method >_< */
+    async baseActivate(element, options) {
+        let { text, direction, cssClass, locked = false, html, content } = options;
+        if (content && !html) {
+            foundry.utils.logCompatibilityWarning(
+                'The content option has been deprecated in favor of the html option',
+                { since: 13, until: 15, once: true }
+            );
+            html = content;
+        }
+        if (text && html) throw new Error('Cannot provide both text and html options to TooltipManager#activate.');
+        // Deactivate currently active element
+        this.deactivate();
+        // Check if the element still exists in the DOM.
+        if (!document.body.contains(element)) return;
+        // Mark the new element as active
+        this.#active = true;
+        this.element = element;
+        element.setAttribute('aria-describedby', 'tooltip');
+        html ||= element.dataset.tooltipHtml;
+        if (html) {
+            if (typeof html === 'string') this.tooltip.innerHTML = foundry.utils.cleanHTML(html);
+            else {
+                this.tooltip.innerHTML = ''; // Clear existing HTML
+                this.tooltip.appendChild(html);
+            }
+        } else {
+            text ||= element.dataset.tooltipText;
+            if (text) this.tooltip.textContent = text;
+            else {
+                text = element.dataset.tooltip;
+                // Localized message should be safe
+                if (game.i18n.has(text)) this.tooltip.innerHTML = game.i18n.localize(text);
+                else this.tooltip.innerHTML = foundry.utils.cleanHTML(text);
+            }
+        }
+
+        // Activate display of the tooltip
+        this.tooltip.removeAttribute('class');
+        this.tooltip.classList.add('active', 'themed', 'theme-dark');
+        this.tooltip.showPopover();
+        cssClass ??= element.closest('[data-tooltip-class]')?.dataset.tooltipClass;
+        if (cssClass) this.tooltip.classList.add(...cssClass.split(' '));
+
+        // Set tooltip position
+        direction ??= element.closest('[data-tooltip-direction]')?.dataset.tooltipDirection;
+        if (!direction) direction = this._determineDirection();
+        this._setAnchor(direction, options);
+
+        if (locked || element.dataset.hasOwnProperty('locked')) this.lockTooltip();
+    }
+
+    _setAnchor(direction, options) {
+        const directions = this.constructor.TOOLTIP_DIRECTIONS;
+        const pad = this.constructor.TOOLTIP_MARGIN_PX;
+        const pos = this.element.getBoundingClientRect();
+
+        const { innerHeight, innerWidth } = this.tooltip.ownerDocument.defaultView;
+        const tooltipPadding = 16;
+        const horizontalOffset = options.noOffset ? tooltipPadding : this.tooltip.offsetWidth / 2 - pos.width / 2;
+        const verticalOffset = options.noOffset ? tooltipPadding : this.tooltip.offsetHeight / 2 - pos.height / 2;
+
+        const style = {};
+        switch (direction) {
+            case directions.DOWN:
+                style.textAlign = 'center';
+                style.left = pos.left - horizontalOffset;
+                style.top = pos.bottom + pad;
+                break;
+            case directions.LEFT:
+                style.textAlign = 'left';
+                style.right = innerWidth - pos.left + pad;
+                style.top = pos.top - verticalOffset;
+                break;
+            case directions.RIGHT:
+                style.textAlign = 'right';
+                style.left = pos.right + pad;
+                style.top = pos.top - verticalOffset;
+                break;
+            case directions.UP:
+                style.textAlign = 'center';
+                style.left = pos.left - horizontalOffset;
+                style.bottom = innerHeight - pos.top + pad;
+                break;
+            case directions.CENTER:
+                style.textAlign = 'center';
+                style.left = pos.left - horizontalOffset;
+                style.top = pos.top - verticalOffset;
+                break;
+        }
+        return this._setStyle(style);
     }
 
     _determineItemTooltipDirection(element, prefered = this.constructor.TOOLTIP_DIRECTIONS.LEFT) {
@@ -270,6 +364,12 @@ export default class DhTooltipManager extends foundry.helpers.interaction.Toolti
         return clone;
     }
 
+    /**@inheritdoc */
+    dismissLockedTooltips() {
+        super.dismissLockedTooltips();
+        Hooks.callAll(CONFIG.DH.HOOKS.hooksConfig.lockedTooltipDismissed);
+    }
+
     /** Get HTML for Battlepoints tooltip */
     async getBattlepointHTML(combatId) {
         const combat = game.combats.get(combatId);
diff --git a/module/helpers/utils.mjs b/module/helpers/utils.mjs
index c8b62ff6..5704b891 100644
--- a/module/helpers/utils.mjs
+++ b/module/helpers/utils.mjs
@@ -378,17 +378,18 @@ export const arraysEqual = (a, b) =>
 
 export const setsEqual = (a, b) => a.size === b.size && [...a].every(value => b.has(value));
 
-export function getScrollTextData(resources, resource, key) {
-    const { reversed, label } = CONFIG.DH.ACTOR.scrollingTextResource[key];
+export function getScrollTextData(actor, resource, key) {
     const { BOTTOM, TOP } = CONST.TEXT_ANCHOR_POINTS;
+
+    const resources = actor.system.resources;
     const increased = resources[key].value < resource.value;
     const value = -1 * (resources[key].value - resource.value);
+    const { label, isReversed } = resources[key];
 
     const text = `${game.i18n.localize(label)} ${value.signedString()}`;
-
-    const stroke = increased ? (reversed ? 0xffffff : 0x000000) : reversed ? 0x000000 : 0xffffff;
-    const fill = increased ? (reversed ? 0x0032b1 : 0xffe760) : reversed ? 0xffe760 : 0x0032b1;
-    const direction = increased ? (reversed ? BOTTOM : TOP) : reversed ? TOP : BOTTOM;
+    const stroke = increased ? (isReversed ? 0xffffff : 0x000000) : isReversed ? 0x000000 : 0xffffff;
+    const fill = increased ? (isReversed ? 0x0032b1 : 0xffe760) : isReversed ? 0xffe760 : 0x0032b1;
+    const direction = increased ? (isReversed ? BOTTOM : TOP) : isReversed ? TOP : BOTTOM;
 
     return { text, stroke, fill, direction };
 }
diff --git a/module/systemRegistration/settings.mjs b/module/systemRegistration/settings.mjs
index 1cd627af..8440e3fe 100644
--- a/module/systemRegistration/settings.mjs
+++ b/module/systemRegistration/settings.mjs
@@ -50,12 +50,7 @@ const registerMenuSettings = () => {
         config: false,
         type: DhHomebrew,
         onChange: value => {
-            if (value.maxFear) {
-                if (ui.resources) ui.resources.render({ force: true });
-            }
-
-            // Some homebrew settings may change sheets in various ways, so trigger a re-render
-            resetActors();
+            value.handleChange();
         }
     });
 
@@ -166,25 +161,3 @@ const registerNonConfigSettings = () => {
         type: CompendiumBrowserSettings
     });
 };
-
-/**
- * Triggers a reset and non-forced re-render on all given actors (if given)
- * or all world actors and actors in all scenes to show immediate results for a changed setting.
- */
-function resetActors(actors) {
-    actors ??= [
-        game.actors.contents,
-        game.scenes.contents.flatMap(s => s.tokens.contents).flatMap(t => t.actor ?? [])
-    ].flat();
-    actors = new Set(actors);
-    for (const actor of actors) {
-        for (const app of Object.values(actor.apps)) {
-            for (const element of app.element?.querySelectorAll('prose-mirror.active')) {
-                element.open = false; // This triggers a save
-            }
-        }
-
-        actor.reset();
-        actor.render();
-    }
-}
diff --git a/styles/less/sheets/actors/character/header.less b/styles/less/sheets/actors/character/header.less
index 5e8ef002..31fd4256 100644
--- a/styles/less/sheets/actors/character/header.less
+++ b/styles/less/sheets/actors/character/header.less
@@ -133,8 +133,19 @@
             padding: 0;
             margin-bottom: 15px;
 
-            .hope-section {
+            .resource-section {
+                display: flex;
+                align-items: center;
+                gap: 4px;
                 margin-right: 20px;
+
+                .resource-manager {
+                    transition: all 0.1s ease;
+
+                    &.inverted {
+                        transform: rotate(180deg);
+                    }
+                }
             }
 
             .downtime-section {
diff --git a/styles/less/ui/index.less b/styles/less/ui/index.less
index 065e43c5..5a6e5878 100644
--- a/styles/less/ui/index.less
+++ b/styles/less/ui/index.less
@@ -27,6 +27,7 @@
 @import './settings/settings.less';
 @import './settings/homebrew-settings/domains.less';
 @import './settings/homebrew-settings/types.less';
+@import './settings/homebrew-settings/resources.less';
 
 @import './sidebar/tabs.less';
 @import './sidebar/daggerheartMenu.less';
diff --git a/styles/less/ui/settings/homebrew-settings/resources.less b/styles/less/ui/settings/homebrew-settings/resources.less
new file mode 100644
index 00000000..5333e54d
--- /dev/null
+++ b/styles/less/ui/settings/homebrew-settings/resources.less
@@ -0,0 +1,87 @@
+.daggerheart.dh-style.setting.homebrew-settings .resources.tab {
+    .resource-types-container {
+        display: flex;
+        flex-direction: column;
+        gap: 16px;
+        overflow: auto;
+        max-height: 570px;
+
+        fieldset legend {
+            display: flex;
+            align-items: center;
+            gap: 4px;
+        }
+
+        .resource-type-container {
+            width: 100%;
+
+            .resources-container {
+                display: flex;
+                flex-direction: column;
+                gap: 4px;
+
+                .resource-container {
+                    .resource-icons-container {
+                        display: flex;
+                        justify-content: space-between;
+                        gap: 8px;
+                        width: 100%;
+
+                        .resource-icon-container {
+                            display: flex;
+                            flex-direction: column;
+                            gap: 4px;
+                            flex: 1;
+
+                            .resource-icon-title-container {
+                                display: flex;
+                                align-items: center;
+                                justify-content: center;
+                                gap: 4px;
+
+                                &::before,
+                                &::after {
+                                    color: @dark-blue;
+                                    content: '';
+                                    flex: 1;
+                                    height: 2px;
+                                }
+
+                                &::before {
+                                    background: linear-gradient(90deg, rgba(0, 0, 0, 0) 0%, @golden 100%);
+                                }
+
+                                &::after {
+                                    background: linear-gradient(90deg, @golden 0%, rgba(0, 0, 0, 0) 100%);
+                                }
+
+                                .resource-icon-title {
+                                    font-size: var(--font-size-16);
+                                    white-space: nowrap;
+                                    display: flex;
+                                    align-items: center;
+                                    gap: 4px;
+                                    color: light-dark(@dark-blue, @golden);
+
+                                    i {
+                                        font-size: 14px;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    .two-columns {
+        width: 100%;
+    }
+
+    .form-group.vertical {
+        > * {
+            flex: 0 0 100%;
+        }
+    }
+}
diff --git a/styles/less/ux/index.less b/styles/less/ux/index.less
index 0bd1b71e..c6c40f78 100644
--- a/styles/less/ux/index.less
+++ b/styles/less/ux/index.less
@@ -4,3 +4,5 @@
 @import './tooltip/domain-cards.less';
 
 @import './autocomplete/autocomplete.less';
+
+@import './tooltip/resource-management.less';
diff --git a/styles/less/ux/tooltip/resource-management.less b/styles/less/ux/tooltip/resource-management.less
new file mode 100644
index 00000000..ff1f4dd2
--- /dev/null
+++ b/styles/less/ux/tooltip/resource-management.less
@@ -0,0 +1,56 @@
+.bordered-tooltip.locked-tooltip .daggerheart.resource-management-container,
+#tooltip .daggerheart.resource-management-container {
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+
+    .resource-section {
+        position: relative;
+        display: flex;
+        gap: 10px;
+        background-color: light-dark(transparent, @dark-blue);
+        color: light-dark(@dark-blue, @golden);
+        padding: 5px 10px;
+        border: 1px solid light-dark(@dark-blue, @golden);
+        border-radius: 6px;
+        align-items: center;
+        width: fit-content;
+        height: 30px;
+
+        h4 {
+            font-family: var(--dh-font-body, 'Montserrat'), sans-serif;
+            font-size: var(--font-size-14);
+            font-weight: bold;
+            text-transform: uppercase;
+            color: light-dark(@dark-blue, @golden);
+            margin: 0;
+        }
+
+        .resource-value {
+            display: flex;
+            cursor: pointer;
+
+            .hidden {
+                display: none;
+            }
+
+            img {
+                width: 14px;
+                height: 14px;
+
+                &.empty {
+                    opacity: 0.4;
+                }
+
+                &.filter {
+                    filter: @golden-filter;
+                }
+
+                &.non-transparent {
+                    border-radius: 50%;
+                    border: 1px solid @golden;
+                }
+            }
+        }
+    }
+}
diff --git a/templates/settings/homebrew-settings/resources.hbs b/templates/settings/homebrew-settings/resources.hbs
new file mode 100644
index 00000000..7f3dee3e
--- /dev/null
+++ b/templates/settings/homebrew-settings/resources.hbs
@@ -0,0 +1,78 @@
+<section
+    class="tab {{tabs.resources.cssClass}} {{tabs.resources.id}} scrollable"
+    data-tab="{{tabs.resources.id}}"
+    data-group="{{tabs.resources.group}}"
+>
+    <div class="resource-types-container">
+        {{#each settingFields.resources as |type key|}}
+            <fieldset>
+                <legend>
+                    {{localize "DAGGERHEART.SETTINGS.Homebrew.resources.typeTitle" type=(localize (concat "TYPES.Actor." key))}}
+                    <a data-action="addResource" data-actor-type="{{key}}"><i class="fa-solid fa-plus"></i></a>
+                </legend>
+
+                <div class="resource-type-container">
+                    <div class="resources-container">
+                        {{#each type.resources as |resource key|}}
+                            <fieldset class="resource-container">
+                                <legend>{{resource.label}}<a data-action="removeResource" data-actor-type="{{@../key}}" data-resource-key="{{key}}"><i class="fa-solid fa-trash"></i></a></legend>
+
+                                {{formField @root.schemaFields.resources.element.fields.resources.element.fields.label value=resource.label name=(concat "resources." @../key ".resources." key ".label") classes="vertical" localize=true }}
+
+                                <div class="two-columns even">
+                                    {{formField @root.schemaFields.resources.element.fields.resources.element.fields.initial value=resource.initial name=(concat "resources." @../key ".resources." key ".initial") classes="vertical" localize=true }}
+                                    {{formField @root.schemaFields.resources.element.fields.resources.element.fields.max value=resource.max name=(concat "resources." @../key ".resources." key ".max") classes="vertical" localize=true }}
+                                </div>
+
+                                <div class="resource-icons-container">
+                                    <div class="resource-icon-container" data-actor-type="{{@../key}}" data-resource-key="{{key}}" data-image-key="full">
+                                        {{#with @root.schemaFields.resources.element.fields.resources.element.fields.images.fields.full.fields}}
+                                            <div class="resource-icon-title-container">
+                                                <div class="resource-icon-title">
+                                                    <span>{{localize "DAGGERHEART.SETTINGS.Homebrew.resources.filledIcon"}}</span>
+                                                    <a data-action="resetResourceImage"><i class="fa-solid fa-arrow-rotate-left"></i></a>
+                                                </div>
+                                            </div>
+                                            <div class="resource-icon-content">
+                                                {{#if ../images.full.isIcon}}
+                                                    {{formGroup this.value value=../images.full.value name=(concat "resources." @../key ".resources." key ".images.full.value") localize=true }}
+                                                {{else}}
+                                                    <div class="form-fields">
+                                                        <file-picker name="{{concat "resources." @../key ".resources." key ".images.full.value"}}" value="{{../images.full.value}}" type="image"></file-picker>
+                                                    </div>
+                                                {{/if}}
+                                                {{formGroup this.isIcon value=../images.full.isIcon name="" classes="path-field" localize=true }}
+                                                {{formGroup this.noColorFilter value=../images.full.noColorFilter name=(concat "resources." @../key ".resources." key ".images.full.noColorFilter") localize=true }}
+                                            </div>
+                                        {{/with}}
+                                    </div>
+                                    <div class="resource-icon-container" data-actor-type="{{@../key}}" data-resource-key="{{key}}" data-image-key="empty">
+                                        {{#with @root.schemaFields.resources.element.fields.resources.element.fields.images.fields.empty.fields}}
+                                            <div class="resource-icon-title-container">
+                                                <div class="resource-icon-title">
+                                                    <span>{{localize "DAGGERHEART.SETTINGS.Homebrew.resources.emptyIcon"}}</span>
+                                                    <a data-action="resetResourceImage"><i class="fa-solid fa-arrow-rotate-left"></i></a>
+                                                </div>
+                                            </div>
+                                            <div class="resource-icon-content">
+                                                {{#if ../images.empty.isIcon}}
+                                                    {{formGroup this.value value=../images.empty.value name=(concat "resources." @../key ".resources." key ".images.empty.value") localize=true }}
+                                                {{else}}
+                                                    <div class="form-fields">
+                                                        <file-picker name="{{concat "resources." @../key ".resources." key ".images.empty.value"}}" value="{{../images.empty.value}}" type="image"></file-picker>
+                                                    </div>
+                                                {{/if}}
+                                                {{formGroup this.isIcon value=resource.images.empty.isIcon name="" classes="path-field" localize=true }}
+                                                {{formGroup this.noColorFilter value=resource.images.empty.noColorFilter name=(concat "resources." @../key ".resources." key ".images.empty.noColorFilter") localize=true }}
+                                            </div>
+                                        {{/with}}
+                                    </div>
+                                </div>
+                            </fieldset>
+                        {{/each}}
+                    </div>
+                </div>
+            </fieldset>
+        {{/each}}
+    </div>
+</section>
\ No newline at end of file
diff --git a/templates/sheets-settings/adversary-settings/details.hbs b/templates/sheets-settings/adversary-settings/details.hbs
index 065ebe74..dc2fd386 100644
--- a/templates/sheets-settings/adversary-settings/details.hbs
+++ b/templates/sheets-settings/adversary-settings/details.hbs
@@ -20,15 +20,11 @@
 
     <div class="fieldsets-section">
         <fieldset class="flex">
-            <legend>{{localize "DAGGERHEART.GENERAL.HitPoints.plural"}}</legend>
-            {{formGroup systemFields.resources.fields.hitPoints.fields.value value=document._source.system.resources.hitPoints.value label=(localize "DAGGERHEART.ACTORS.Adversary.FIELDS.resources.hitPoints.value.label")}}
-            {{formGroup systemFields.resources.fields.hitPoints.fields.max value=document._source.system.resources.hitPoints.max label=(localize "DAGGERHEART.ACTORS.Adversary.FIELDS.resources.hitPoints.max.label")}}
-        </fieldset>
-        <fieldset class="flex">
-            <legend>{{localize "DAGGERHEART.GENERAL.stress"}}</legend>
-            {{formGroup systemFields.resources.fields.stress.fields.value value=document._source.system.resources.stress.value label=(localize "DAGGERHEART.ACTORS.Adversary.FIELDS.resources.stress.value.label")}}
-            {{formGroup systemFields.resources.fields.stress.fields.max value=document._source.system.resources.stress.max label=(localize "DAGGERHEART.ACTORS.Adversary.FIELDS.resources.stress.max.label")}}
-        </fieldset>
+            <legend>{{localize "DAGGERHEART.GENERAL.Resource.plural"}}</legend>
+            {{#each resources as |resource|}}
+                {{formGroup resource.field value=resource.value name=resource.name}}
+            {{/each}}
+         </fieldset>
     </div>
 
     <fieldset class="flex">
@@ -36,4 +32,4 @@
         {{formGroup systemFields.damageThresholds.fields.major value=document._source.system.damageThresholds.major label=(localize "DAGGERHEART.GENERAL.DamageThresholds.majorThreshold")}}
         {{formGroup systemFields.damageThresholds.fields.severe value=document._source.system.damageThresholds.severe label=(localize "DAGGERHEART.GENERAL.DamageThresholds.severeThreshold")}}
     </fieldset>
-</section>
\ No newline at end of file
+</section>
diff --git a/templates/sheets-settings/character-settings/details.hbs b/templates/sheets-settings/character-settings/details.hbs
index 3f9247e0..4bda501e 100644
--- a/templates/sheets-settings/character-settings/details.hbs
+++ b/templates/sheets-settings/character-settings/details.hbs
@@ -22,15 +22,12 @@
         <legend>{{localize 'DAGGERHEART.GENERAL.basics'}}</legend>
 
         <div class="two-columns even">
-            {{formGroup systemFields.resources.fields.hitPoints.fields.value value=document._source.system.resources.hitPoints.value localize=true}}
-            <span data-tooltip-text="{{localize "DAGGERHEART.UI.Tooltip.maxHPClassBound"}}">
-                {{formGroup systemFields.resources.fields.hitPoints.fields.max value=document._source.system.resources.hitPoints.max localize=true}}
-            </span>
+            {{#each resources as |resource|}}
+                <span {{#if resource.tooltip}}data-tooltip-text="{{resource.tooltip}}"{{/if}}>
+                    {{formGroup resource.field value=resource.value name=resource.name}}
+                </span>
+            {{/each}}
 
-            {{formGroup systemFields.resources.fields.stress.fields.value value=document._source.system.resources.stress.value localize=true}}
-            {{formGroup systemFields.resources.fields.stress.fields.max value=document._source.system.resources.stress.max localize=true}}
-
-            {{formGroup systemFields.resources.fields.hope.fields.value value=document._source.system.resources.hope.value localize=true}}
             {{formGroup systemFields.scars value=document._source.system.scars localize=true}}
 
             {{formGroup systemFields.proficiency value=document._source.system.proficiency localize=true}}
@@ -39,4 +36,4 @@
             </span>
         </div>
     </fieldset>
-</section>
\ No newline at end of file
+</section>
diff --git a/templates/sheets-settings/companion-settings/details.hbs b/templates/sheets-settings/companion-settings/details.hbs
index 88878d67..6a602d38 100644
--- a/templates/sheets-settings/companion-settings/details.hbs
+++ b/templates/sheets-settings/companion-settings/details.hbs
@@ -7,8 +7,9 @@
         <legend>{{localize 'DAGGERHEART.GENERAL.basics'}}</legend>
         <div class="nest-inputs">
             {{formGroup systemFields.evasion value=document._source.system.evasion localize=true}}
-            {{formGroup systemFields.resources.fields.stress.fields.value value=document._source.system.resources.stress.value label='DAGGERHEART.ACTORS.Companion.FIELDS.resources.stress.currentStress.label' localize=true}}
-            {{formGroup systemFields.resources.fields.stress.fields.max value=document._source.system.resources.stress.max label='DAGGERHEART.ACTORS.Companion.FIELDS.resources.stress.maxStress.label' localize=true}}
+            {{#each resources as |resource|}}
+                {{formGroup resource.field value=resource.value name=resource.name}}
+            {{/each}}
         </div>
         <div class="form-group">
             <div class="form-fields">
@@ -19,4 +20,4 @@
             </div>
         </div>
     </fieldset>
-</section>
\ No newline at end of file
+</section>
diff --git a/templates/sheets/actors/character/header.hbs b/templates/sheets/actors/character/header.hbs
index d2c01f3c..06f464fa 100644
--- a/templates/sheets/actors/character/header.hbs
+++ b/templates/sheets/actors/character/header.hbs
@@ -65,22 +65,25 @@
     </div>
 
     <div class="character-row">
-        <div class="hope-section">
-            <h4>{{localize "DAGGERHEART.GENERAL.hope"}}</h4>
-            {{#times document.system.resources.hope.max}}
-                <span class='hope-value' data-action='toggleHope' data-value="{{add this 1}}">
-                    {{#if (gte ../document.system.resources.hope.value (add this 1))}}
-                        <i class='fa-solid fa-diamond'></i>
-                    {{else}}
-                        <i class='fa-regular fa-circle'></i>
-                    {{/if}}
-                </span>
-            {{/times}}
-            {{#times document.system.scars}}
-                <span class='hope-value scar'>
-                    <i class='fa-regular fa-ban'></i>
-                </span>
-            {{/times}}
+        <div class="resource-section">
+            <div class="hope-section">
+                <h4>{{localize "DAGGERHEART.GENERAL.hope"}}</h4>
+                {{#times document.system.resources.hope.max}}
+                    <span class='hope-value' data-action='toggleHope' data-value="{{add this 1}}">
+                        {{#if (gte ../document.system.resources.hope.value (add this 1))}}
+                            <i class='fa-solid fa-diamond'></i>
+                        {{else}}
+                            <i class='fa-regular fa-circle'></i>
+                        {{/if}}
+                    </span>
+                {{/times}}
+                {{#times document.system.scars}}
+                    <span class='hope-value scar'>
+                        <i class='fa-regular fa-ban'></i>
+                    </span>
+                {{/times}}
+                {{#if hasExtraResources}}<a type="button" class="resource-manager" data-action="toggleResourceManagement"><i class="fa-solid fa-angle-down"></i></a>{{/if}}
+            </div>
         </div>
         {{#if document.system.class.value}}
             <div class="domains-section">
diff --git a/templates/ui/tooltip/resourceManagement.hbs b/templates/ui/tooltip/resourceManagement.hbs
new file mode 100644
index 00000000..b9817e6e
--- /dev/null
+++ b/templates/ui/tooltip/resourceManagement.hbs
@@ -0,0 +1,21 @@
+<div class="daggerheart resource-management-container">
+    {{#each resources as |resource|}}
+        <div class="resource-section {{resource.resourceClass}}">
+            <h4>{{resource.label}}</h4>
+            {{#times resource.max}}
+                <span class='resource-value' data-action='toggleResource' data-value="{{add this 1}}" data-resource="{{resource.id}}">
+                    {{#if resource.fullIcon.isIcon}}
+                        <i class='{{resource.fullIcon.value}} full {{#unless (gte ../value (add this 1))}}hidden{{/unless}}'></i>
+                    {{else}}
+                        <img src="{{resource.fullIcon.value}}" class="full {{#unless resource.fullIcon.noColorFilter}}filter{{else}}non-transparent{{/unless}} {{#unless (gte ../value (add this 1))}}hidden{{/unless}}" />
+                    {{/if}}
+                    {{#if resource.emptyIcon.isIcon}}
+                        <i class='{{resource.emptyIcon.value}} empty {{#if (gte ../value (add this 1))}}hidden{{/if}}'></i>
+                    {{else}}
+                        <img src="{{resource.emptyIcon.value}}" class="empty {{#unless resource.fullIcon.noColorFilter}}filter{{else}}non-transparent{{/unless}} {{#if (gte ../value (add this 1))}}hidden{{/if}}" />
+                    {{/if}}
+                </span>
+            {{/times}}
+        </div>
+    {{/each}}
+</div>
\ No newline at end of file

From 4282933dcf1eeeb5dc46ff4bccb179bf4aaaa9f0 Mon Sep 17 00:00:00 2001
From: WBHarry <williambjrklund@gmail.com>
Date: Wed, 11 Mar 2026 18:08:49 +0100
Subject: [PATCH 08/11] Fixed so that TransformActions don't make a new actor
 when transforming into another world actor

---
 module/data/fields/action/transformField.mjs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/module/data/fields/action/transformField.mjs b/module/data/fields/action/transformField.mjs
index f6d692af..07b32166 100644
--- a/module/data/fields/action/transformField.mjs
+++ b/module/data/fields/action/transformField.mjs
@@ -89,8 +89,10 @@ export default class DHSummonField extends fields.SchemaField {
 
     /* Check for any available instances of the actor present in the world, or create a world actor based on compendium */
     static async getWorldActor(baseActor) {
+        if (!baseActor.inCompendium) return baseActor;
+
         const dataType = game.system.api.data.actors[`Dh${baseActor.type.capitalize()}`];
-        if (baseActor.inCompendium && dataType && baseActor.img === dataType.DEFAULT_ICON) {
+        if (dataType && baseActor.img === dataType.DEFAULT_ICON) {
             const worldActorCopy = game.actors.find(x => x.name === baseActor.name);
             if (worldActorCopy) return worldActorCopy;
         }

From 50b4b4cf26a86aae40aed9ab176914a1c1352099 Mon Sep 17 00:00:00 2001
From: WBHarry <williambjrklund@gmail.com>
Date: Thu, 12 Mar 2026 19:52:01 +0100
Subject: [PATCH 09/11] Fixed scars change preUpdate

---
 module/data/actor/character.mjs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/data/actor/character.mjs b/module/data/actor/character.mjs
index 68f7f3a8..3d18fbbe 100644
--- a/module/data/actor/character.mjs
+++ b/module/data/actor/character.mjs
@@ -721,7 +721,8 @@ export default class DhCharacter extends DhCreature {
             const newHopeMax = this.system.resources.hope.max + diff;
             const newHopeValue = Math.min(newHopeMax, this.system.resources.hope.value);
             if (newHopeValue != this.system.resources.hope.value) {
-                if (!changes.system.resources) changes.system.resources = { hope: { value: 0 } };
+                if (!changes.system.resources.hope) changes.system.resources.hope = { value: 0 };
+
                 changes.system.resources.hope = {
                     ...changes.system.resources.hope,
                     value: changes.system.resources.hope.value + newHopeValue

From 6c7937a9ff0c730c51925c9328bc6c0b43928fc8 Mon Sep 17 00:00:00 2001
From: WBHarry <williambjrklund@gmail.com>
Date: Thu, 12 Mar 2026 20:31:40 +0100
Subject: [PATCH 10/11] Fixed Book Of Tyfar missing a spellcast action

---
 .../domains/domainCard_Book_of_Tyfar_1VXzwRbvbBj5bd5V.json    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/packs/domains/domainCard_Book_of_Tyfar_1VXzwRbvbBj5bd5V.json b/src/packs/domains/domainCard_Book_of_Tyfar_1VXzwRbvbBj5bd5V.json
index 5e5cb054..4eabb038 100644
--- a/src/packs/domains/domainCard_Book_of_Tyfar_1VXzwRbvbBj5bd5V.json
+++ b/src/packs/domains/domainCard_Book_of_Tyfar_1VXzwRbvbBj5bd5V.json
@@ -153,9 +153,9 @@
         },
         "effects": [],
         "roll": {
-          "type": null,
+          "type": "spellcast",
           "trait": null,
-          "difficulty": null,
+          "difficulty": 13,
           "bonus": null,
           "advState": "neutral",
           "diceRolling": {

From 8172e8baa74f5eb1c4fa9dacfeb201144224f917 Mon Sep 17 00:00:00 2001
From: WBHarry <89362246+WBHarry@users.noreply.github.com>
Date: Fri, 13 Mar 2026 00:15:52 +0100
Subject: [PATCH 11/11] [Feature] DualityDice DiceSoNice Animations (#1722)

* .

* Fixed translation

* Remove fieldset

* DiceSoNice Animation Overrides (#1726)

* .

* .

* Fixed hope/fear animation input

* Visual tweaks to general tab

* Move general tab to top

* Fixed localizaiton

---------

Co-authored-by: Carlos Fernandez <cfern1990@gmail.com>
---
 lang/en.json                                  |  12 +-
 .../settings/appearanceSettings.mjs           |  53 +++++++-
 module/config/generalConfig.mjs               | 117 +++++++++++++++++-
 module/config/resourceConfig.mjs              |   6 +-
 module/config/settingsConfig.mjs              |   1 +
 module/data/fields/actorField.mjs             |   4 +-
 module/data/settings/Appearance.mjs           |  64 +++++++++-
 module/data/settings/GlobalOverrides.mjs      |  55 ++++++++
 module/data/settings/Homebrew.mjs             |   2 +-
 module/data/settings/_module.mjs              |   1 +
 module/dice/dualityRoll.mjs                   |   6 +-
 module/helpers/utils.mjs                      |   8 +-
 module/systemRegistration/handlebars.mjs      |   3 +-
 module/systemRegistration/settings.mjs        |  22 ++--
 styles/less/global/elements.less              |  59 +--------
 styles/less/ui/index.less                     |   1 +
 .../appearance-settings/diceSoNice.less       |  72 +++++++++++
 .../appearance-settings/diceSoNice.hbs        |  94 +++++---------
 .../appearance-settings/diceSoNiceTab.hbs     |  62 ++++++++++
 19 files changed, 492 insertions(+), 150 deletions(-)
 create mode 100644 module/data/settings/GlobalOverrides.mjs
 create mode 100644 styles/less/ui/settings/appearance-settings/diceSoNice.less
 create mode 100644 templates/settings/appearance-settings/diceSoNiceTab.hbs

diff --git a/lang/en.json b/lang/en.json
index 75896218..98cae76b 100755
--- a/lang/en.json
+++ b/lang/en.json
@@ -1058,6 +1058,10 @@
                 "fear": "Fear",
                 "spotlight": "Spotlight"
             },
+            "DaggerheartDiceAnimationEvents": {
+                "critical": { "name": "Critical" },
+                "higher": { "name": "Highest Roll" }
+            },
             "DamageType": {
                 "physical": {
                     "name": "Physical",
@@ -2309,6 +2313,7 @@
                 "plurial": "Players"
             },
             "portrait": "Portrait",
+            "preview": "Preview",
             "proficiency": "Proficiency",
             "quantity": "Quantity",
             "range": "Range",
@@ -2758,7 +2763,12 @@
                         "colorset": "Theme",
                         "material": "Material",
                         "system": "Dice Preset",
-                        "font": "Font"
+                        "font": "Font",
+                        "critical": "Duality Critical Animation",
+                        "diceAppearance": "Dice Appearance",
+                        "animations": "Animations",
+                        "defaultAnimations": "Set Animations As Player Defaults",
+                        "previewAnimation": "Preview Animation"
                     }
                 },
                 "variantRules": {
diff --git a/module/applications/settings/appearanceSettings.mjs b/module/applications/settings/appearanceSettings.mjs
index 9eb0cfbf..151648e1 100644
--- a/module/applications/settings/appearanceSettings.mjs
+++ b/module/applications/settings/appearanceSettings.mjs
@@ -12,7 +12,7 @@ export default class DHAppearanceSettings extends HandlebarsApplicationMixin(App
     static DEFAULT_OPTIONS = {
         tag: 'form',
         id: 'daggerheart-appearance-settings',
-        classes: ['daggerheart', 'dialog', 'dh-style', 'setting'],
+        classes: ['daggerheart', 'dialog', 'dh-style', 'setting', 'appearance-settings'],
         position: { width: '600', height: 'auto' },
         window: {
             title: 'DAGGERHEART.SETTINGS.Menu.title',
@@ -70,6 +70,14 @@ export default class DHAppearanceSettings extends HandlebarsApplicationMixin(App
         }
     }
 
+    _attachPartListeners(partId, htmlElement, options) {
+        super._attachPartListeners(partId, htmlElement, options);
+
+        htmlElement
+            .querySelector('.default-animations-input')
+            ?.addEventListener('change', this.toggleSFXOverride.bind(this));
+    }
+
     /** @inheritdoc */
     _configureRenderParts(options) {
         const parts = super._configureRenderParts(options);
@@ -83,15 +91,20 @@ export default class DHAppearanceSettings extends HandlebarsApplicationMixin(App
     /**@inheritdoc */
     async _prepareContext(options) {
         const context = await super._prepareContext(options);
-        if (options.isFirstRender)
+        if (options.isFirstRender) {
             this.setting = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.appearance);
+            this.globalOverrides = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.GlobalOverrides);
+        }
 
         context.setting = this.setting;
+        context.globalOverrides = this.globalOverrides;
         context.fields = this.setting.schema.fields;
 
         context.tabs = this._prepareTabs('general');
         context.dsnTabs = this._prepareTabs('diceSoNice');
 
+        context.isGM = game.user.isGM;
+
         return context;
     }
 
@@ -120,6 +133,9 @@ export default class DHAppearanceSettings extends HandlebarsApplicationMixin(App
      * @protected
      */
     async prepareDiceSoNiceContext(context) {
+        context.animationEvents = CONFIG.DH.GENERAL.daggerheartDiceAnimationEvents;
+        context.previewAnimation = this.previewAnimation;
+
         context.diceSoNiceTextures = Object.entries(game.dice3d.exports.TEXTURELIST).reduce(
             (acc, [k, v]) => ({
                 ...acc,
@@ -146,6 +162,13 @@ export default class DHAppearanceSettings extends HandlebarsApplicationMixin(App
         );
         context.diceSoNiceFonts = game.dice3d.exports.Utils.prepareFontList();
 
+        const getAnimationsOptions = key => {
+            const fields = context.fields.diceSoNice.fields[key].fields.sfx.fields;
+            return {
+                higher: fields.higher.fields.class.choices
+            };
+        };
+
         foundry.utils.mergeObject(
             context.dsnTabs,
             ['hope', 'fear', 'advantage', 'disadvantage'].reduce(
@@ -153,7 +176,8 @@ export default class DHAppearanceSettings extends HandlebarsApplicationMixin(App
                     ...acc,
                     [key]: {
                         values: this.setting.diceSoNice[key],
-                        fields: this.setting.schema.getField(`diceSoNice.${key}`).fields
+                        fields: this.setting.schema.getField(`diceSoNice.${key}`).fields,
+                        animations: ['hope', 'fear'].includes(key) ? getAnimationsOptions(key) : {}
                     }
                 }),
                 {}
@@ -169,13 +193,20 @@ export default class DHAppearanceSettings extends HandlebarsApplicationMixin(App
      * @param {foundry.applications.ux.FormDataExtended} formData
      * @returns {Promise<void>}
      */
-    static async #onSubmit(event, form, formData) {
+    static async #onSubmit(_event, _form, formData) {
         const data = this.setting.schema.clean(foundry.utils.expandObject(formData.object));
+
         await game.settings.set(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.appearance, data);
     }
 
     /* -------------------------------------------- */
 
+    async toggleSFXOverride(event) {
+        await this.globalOverrides.diceSoNiceSFXUpdate(this.setting, event.target.checked);
+        this.globalOverrides = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.GlobalOverrides);
+        this.render();
+    }
+
     /**
      * Submit the configuration form.
      * @this {DHAppearanceSettings}
@@ -183,13 +214,25 @@ export default class DHAppearanceSettings extends HandlebarsApplicationMixin(App
      */
     static async #onPreview(_, target) {
         const formData = new foundry.applications.ux.FormDataExtended(target.closest('form'));
-        const { diceSoNice } = foundry.utils.expandObject(formData.object);
+        const { diceSoNice, ...rest } = foundry.utils.expandObject(formData.object);
         const { key } = target.dataset;
         const faces = ['advantage', 'disadvantage'].includes(key) ? 'd6' : 'd12';
         const preset = await getDiceSoNicePreset(diceSoNice[key], faces);
         const diceSoNiceRoll = await new foundry.dice.Roll(`1${faces}`).evaluate();
         diceSoNiceRoll.dice[0].options.appearance = preset.appearance;
         diceSoNiceRoll.dice[0].options.modelFile = preset.modelFile;
+
+        const previewAnimation = rest[`${key}PreviewAnimation`];
+        const events = CONFIG.DH.GENERAL.daggerheartDiceAnimationEvents;
+        if (previewAnimation) {
+            if (previewAnimation === events.critical.id && diceSoNice.sfx.critical.class) {
+                diceSoNiceRoll.dice[0].options.sfx = { specialEffect: diceSoNice.sfx.critical.class };
+            }
+            if (previewAnimation === events.higher.id && diceSoNice[key].sfx.higher) {
+                diceSoNiceRoll.dice[0].options.sfx = { specialEffect: diceSoNice[key].sfx.higher.class };
+            }
+        }
+
         await game.dice3d.showForRoll(diceSoNiceRoll, game.user, false);
     }
 
diff --git a/module/config/generalConfig.mjs b/module/config/generalConfig.mjs
index d46db23a..f1c21d26 100644
--- a/module/config/generalConfig.mjs
+++ b/module/config/generalConfig.mjs
@@ -630,7 +630,95 @@ export const diceSetNumbers = {
     flat: 'Flat'
 };
 
-export const getDiceSoNicePreset = async (type, faces) => {
+export const diceSoNiceSFXClasses = {
+    PlayAnimationBright: {
+        id: 'PlayAnimationBright',
+        label: 'DICESONICE.PlayAnimationBright'
+    },
+    PlayAnimationDark: {
+        id: 'PlayAnimationDark',
+        label: 'DICESONICE.PlayAnimationDark'
+    },
+    PlayAnimationOutline: {
+        id: 'PlayAnimationOutline',
+        label: 'DICESONICE.PlayAnimationOutline'
+    },
+    PlayAnimationImpact: {
+        id: 'PlayAnimationImpact',
+        label: 'DICESONICE.PlayAnimationImpact'
+    },
+    // PlayConfettiStrength1: {
+    //     id: 'PlayConfettiStrength1',
+    //     label: 'DICESONICE.PlayConfettiStrength1'
+    // },
+    // PlayConfettiStrength2: {
+    //     id: 'PlayConfettiStrength2',
+    //     label: 'DICESONICE.PlayConfettiStrength2'
+    // },
+    // PlayConfettiStrength3: {
+    //     id: 'PlayConfettiStrength3',
+    //     label: 'DICESONICE.PlayConfettiStrength3'
+    // },
+    PlayAnimationThormund: {
+        id: 'PlayAnimationThormund',
+        label: 'DICESONICE.PlayAnimationThormund'
+    },
+    PlayAnimationParticleSpiral: {
+        id: 'PlayAnimationParticleSpiral',
+        label: 'DICESONICE.PlayAnimationParticleSpiral'
+    },
+    PlayAnimationParticleSparkles: {
+        id: 'PlayAnimationParticleSparkles',
+        label: 'DICESONICE.PlayAnimationParticleSparkles'
+    },
+    PlayAnimationParticleVortex: {
+        id: 'PlayAnimationParticleVortex',
+        label: 'DICESONICE.PlayAnimationParticleVortex'
+    },
+    PlaySoundEpicWin: {
+        id: 'PlaySoundEpicWin',
+        label: 'DICESONICE.PlaySoundEpicWin'
+    },
+    PlaySoundEpicFail: {
+        id: 'PlaySoundEpicFail',
+        label: 'DICESONICE.PlaySoundEpicFail'
+    }
+    // "PlaySoundCustom",
+    // "PlayMacro"
+};
+
+export const daggerheartDiceAnimationEvents = {
+    critical: {
+        id: 'critical',
+        label: 'DAGGERHEART.CONFIG.DaggerheartDiceAnimationEvents.critical.name'
+    },
+    higher: {
+        id: 'higher',
+        label: 'DAGGERHEART.CONFIG.DaggerheartDiceAnimationEvents.higher.name'
+    }
+};
+
+const getDiceSoNiceSFX = sfxOptions => {
+    const diceSoNice = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.appearance).diceSoNiceData;
+    const criticalAnimationData = diceSoNice.sfx.critical;
+    if (sfxOptions.critical && criticalAnimationData.class) {
+        return {
+            specialEffect: criticalAnimationData.class,
+            options: {}
+        };
+    }
+
+    if (sfxOptions.higher && sfxOptions.data.higher) {
+        return {
+            specialEffect: sfxOptions.data.higher.class,
+            options: {}
+        };
+    }
+
+    return {};
+};
+
+export const getDiceSoNicePreset = async (type, faces, sfxOptions = {}) => {
     const system = game.dice3d.DiceFactory.systems.get(type.system).dice.get(faces);
     if (!system) {
         ui.notifications.error(
@@ -653,16 +741,33 @@ export const getDiceSoNicePreset = async (type, faces) => {
         appearance: {
             ...system.appearance,
             ...type
-        }
+        },
+        sfx: getDiceSoNiceSFX(sfxOptions)
     };
 };
 
-export const getDiceSoNicePresets = async (hopeFaces, fearFaces, advantageFaces = 'd6', disadvantageFaces = 'd6') => {
-    const { diceSoNice } = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.appearance);
+export const getDiceSoNicePresets = async (
+    result,
+    hopeFaces,
+    fearFaces,
+    advantageFaces = 'd6',
+    disadvantageFaces = 'd6'
+) => {
+    const diceSoNice = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.appearance).diceSoNiceData;
+
+    const { isCritical, withHope, withFear } = result;
 
     return {
-        hope: await getDiceSoNicePreset(diceSoNice.hope, hopeFaces),
-        fear: await getDiceSoNicePreset(diceSoNice.fear, fearFaces),
+        hope: await getDiceSoNicePreset(diceSoNice.hope, hopeFaces, {
+            critical: isCritical,
+            higher: withHope,
+            data: diceSoNice.hope.sfx
+        }),
+        fear: await getDiceSoNicePreset(diceSoNice.fear, fearFaces, {
+            critical: isCritical,
+            higher: withFear,
+            data: diceSoNice.fear.sfx
+        }),
         advantage: await getDiceSoNicePreset(diceSoNice.advantage, advantageFaces),
         disadvantage: await getDiceSoNicePreset(diceSoNice.disadvantage, disadvantageFaces)
     };
diff --git a/module/config/resourceConfig.mjs b/module/config/resourceConfig.mjs
index f7d56b44..56ef6cd5 100644
--- a/module/config/resourceConfig.mjs
+++ b/module/config/resourceConfig.mjs
@@ -72,17 +72,17 @@ const companionBaseResources = Object.freeze({
 export const character = {
     base: characterBaseResources,
     custom: {}, // module stuff goes here
-    all: { ...characterBaseResources },
+    all: { ...characterBaseResources }
 };
 
 export const adversary = {
     base: adversaryBaseResources,
     custom: {}, // module stuff goes here
-    all: { ...adversaryBaseResources },
+    all: { ...adversaryBaseResources }
 };
 
 export const companion = {
     base: companionBaseResources,
     custom: {}, // module stuff goes here
-    all: { ...companionBaseResources },
+    all: { ...companionBaseResources }
 };
diff --git a/module/config/settingsConfig.mjs b/module/config/settingsConfig.mjs
index 38ffcf3b..0b28f0ab 100644
--- a/module/config/settingsConfig.mjs
+++ b/module/config/settingsConfig.mjs
@@ -26,6 +26,7 @@ export const gameSettings = {
     Metagaming: 'Metagaming',
     Homebrew: 'Homebrew',
     appearance: 'Appearance',
+    GlobalOverrides: 'GlobalOverrides',
     variantRules: 'VariantRules',
     Resources: {
         Fear: 'ResourcesFear'
diff --git a/module/data/fields/actorField.mjs b/module/data/fields/actorField.mjs
index 65e7abbf..1399fb32 100644
--- a/module/data/fields/actorField.mjs
+++ b/module/data/fields/actorField.mjs
@@ -21,7 +21,7 @@ const bonusField = label =>
         dice: new fields.ArrayField(new fields.StringField(), { label: `${game.i18n.localize(label)} Dice` })
     });
 
-/** 
+/**
  * Field used for actor resources. It is a resource that validates dynamically based on the config.
  * Because "max" may be defined during runtime, we don't attempt to clamp the maximum value.
  */
@@ -78,7 +78,7 @@ class ResourcesField extends fields.TypedObjectField {
             const resource = resources[key];
             value.label = resource.label;
             value.isReversed = resources[key].reverse;
-            value.max = typeof resource.max === 'number' ? value.max ?? resource.max : null;
+            value.max = typeof resource.max === 'number' ? (value.max ?? resource.max) : null;
         }
         return data;
     }
diff --git a/module/data/settings/Appearance.mjs b/module/data/settings/Appearance.mjs
index cd98d6f9..9da3afac 100644
--- a/module/data/settings/Appearance.mjs
+++ b/module/data/settings/Appearance.mjs
@@ -1,6 +1,16 @@
 export default class DhAppearance extends foundry.abstract.DataModel {
     static LOCALIZATION_PREFIXES = ['DAGGERHEART.SETTINGS.Appearance'];
 
+    static sfxSchema = () =>
+        new foundry.data.fields.SchemaField({
+            class: new foundry.data.fields.StringField({
+                nullable: true,
+                initial: null,
+                blank: true,
+                choices: CONFIG.DH.GENERAL.diceSoNiceSFXClasses
+            })
+        });
+
     static defineSchema() {
         const { StringField, ColorField, BooleanField, SchemaField } = foundry.data.fields;
 
@@ -15,7 +25,10 @@ export default class DhAppearance extends foundry.abstract.DataModel {
                 colorset: new StringField({ initial: 'inspired', required: true, blank: false }),
                 material: new StringField({ initial: 'metal', required: true, blank: false }),
                 system: new StringField({ initial: 'standard', required: true, blank: false }),
-                font: new StringField({ initial: 'auto', required: true, blank: false })
+                font: new StringField({ initial: 'auto', required: true, blank: false }),
+                sfx: new SchemaField({
+                    higher: DhAppearance.sfxSchema()
+                })
             });
 
         return {
@@ -30,7 +43,10 @@ export default class DhAppearance extends foundry.abstract.DataModel {
                 hope: diceStyle({ fg: '#ffffff', bg: '#ffe760', outline: '#000000', edge: '#ffffff' }),
                 fear: diceStyle({ fg: '#000000', bg: '#0032b1', outline: '#ffffff', edge: '#000000' }),
                 advantage: diceStyle({ fg: '#ffffff', bg: '#008000', outline: '#000000', edge: '#ffffff' }),
-                disadvantage: diceStyle({ fg: '#000000', bg: '#b30000', outline: '#ffffff', edge: '#000000' })
+                disadvantage: diceStyle({ fg: '#000000', bg: '#b30000', outline: '#ffffff', edge: '#000000' }),
+                sfx: new SchemaField({
+                    critical: DhAppearance.sfxSchema()
+                })
             }),
             extendCharacterDescriptions: new BooleanField(),
             extendAdversaryDescriptions: new BooleanField(),
@@ -65,4 +81,48 @@ export default class DhAppearance extends foundry.abstract.DataModel {
             showGenericStatusEffects: new BooleanField({ initial: true })
         };
     }
+
+    get diceSoNiceData() {
+        const globalOverrides = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.GlobalOverrides);
+        const getSFX = (baseClientData, overrideKey) => {
+            if (!globalOverrides.diceSoNice.sfx.overrideEnabled) return baseClientData;
+            const overrideData = globalOverrides.diceSoNice.sfx[overrideKey];
+            const clientData = foundry.utils.deepClone(baseClientData);
+            return Object.keys(clientData).reduce((acc, key) => {
+                const data = clientData[key];
+                acc[key] = Object.keys(data).reduce((acc, dataKey) => {
+                    const value = data[dataKey];
+                    acc[dataKey] = value ? value : overrideData[key][dataKey];
+                    return acc;
+                }, {});
+                return acc;
+            }, {});
+        };
+
+        return {
+            ...this.diceSoNice,
+            sfx: getSFX(this.diceSoNice.sfx, 'global'),
+            hope: {
+                ...this.diceSoNice.hope,
+                sfx: getSFX(this.diceSoNice.hope.sfx, 'hope')
+            },
+            fear: {
+                ...this.diceSoNice.fear,
+                sfx: getSFX(this.diceSoNice.fear.sfx, 'fear')
+            }
+        };
+    }
+
+    /** Invoked by the setting when data changes */
+    handleChange() {
+        if (this.displayFear) {
+            if (ui.resources) {
+                if (this.displayFear === 'hide') ui.resources.close({ allowed: true });
+                else ui.resources.render({ force: true });
+            }
+        }
+
+        const globalOverrides = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.GlobalOverrides);
+        globalOverrides.diceSoNiceSFXUpdate(this);
+    }
 }
diff --git a/module/data/settings/GlobalOverrides.mjs b/module/data/settings/GlobalOverrides.mjs
new file mode 100644
index 00000000..746a6355
--- /dev/null
+++ b/module/data/settings/GlobalOverrides.mjs
@@ -0,0 +1,55 @@
+import DhAppearance from './Appearance.mjs';
+
+/**
+ * A setting to handle cases where we want to allow the GM to set a global default for client settings.
+ */
+export default class DhGlobalOverrides extends foundry.abstract.DataModel {
+    static defineSchema() {
+        const fields = foundry.data.fields;
+        return {
+            diceSoNice: new fields.SchemaField({
+                sfx: new fields.SchemaField({
+                    overrideEnabled: new fields.BooleanField(),
+                    global: new fields.SchemaField({
+                        critical: DhAppearance.sfxSchema()
+                    }),
+                    hope: new fields.SchemaField({
+                        higher: DhAppearance.sfxSchema()
+                    }),
+                    fear: new fields.SchemaField({
+                        higher: DhAppearance.sfxSchema()
+                    })
+                })
+            })
+        };
+    }
+
+    async diceSoNiceSFXUpdate(appearanceSettings, enabled) {
+        if (!game.user.isGM) return;
+
+        const newEnabled = enabled !== undefined ? enabled : this.diceSoNice.sfx.overrideEnabled;
+        if (newEnabled) {
+            const newOverrides = foundry.utils.mergeObject(this.toObject(), {
+                diceSoNice: {
+                    sfx: {
+                        overrideEnabled: true,
+                        global: appearanceSettings.diceSoNice.sfx,
+                        hope: appearanceSettings.diceSoNice.hope.sfx,
+                        fear: appearanceSettings.diceSoNice.fear.sfx
+                    }
+                }
+            });
+            await game.settings.set(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.GlobalOverrides, newOverrides);
+        } else {
+            const newOverrides = {
+                ...this.toObject(),
+                diceSoNice: {
+                    sfx: {
+                        overrideEnabled: false
+                    }
+                }
+            };
+            await game.settings.set(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.GlobalOverrides, newOverrides);
+        }
+    }
+}
diff --git a/module/data/settings/Homebrew.mjs b/module/data/settings/Homebrew.mjs
index 9b4ee2cf..d4b7b03f 100644
--- a/module/data/settings/Homebrew.mjs
+++ b/module/data/settings/Homebrew.mjs
@@ -220,7 +220,7 @@ export default class DhHomebrew extends foundry.abstract.DataModel {
                     return result;
                 }, {}),
                 ...config.custom,
-                ...config.base,
+                ...config.base
             });
         }
     }
diff --git a/module/data/settings/_module.mjs b/module/data/settings/_module.mjs
index 45405ba5..1343c0c4 100644
--- a/module/data/settings/_module.mjs
+++ b/module/data/settings/_module.mjs
@@ -3,3 +3,4 @@ export { default as DhAutomation } from './Automation.mjs';
 export { default as DhHomebrew } from './Homebrew.mjs';
 export { default as DhMetagaming } from './Metagaming.mjs';
 export { default as DhVariantRules } from './VariantRules.mjs';
+export { default as DhGlobalOverrides } from './GlobalOverrides.mjs';
diff --git a/module/dice/dualityRoll.mjs b/module/dice/dualityRoll.mjs
index 9037250a..75fbdf55 100644
--- a/module/dice/dualityRoll.mjs
+++ b/module/dice/dualityRoll.mjs
@@ -378,6 +378,8 @@ export default class DualityRoll extends D20Roll {
         let parsedRoll = game.system.api.dice.DualityRoll.fromData({ ...rollString, evaluated: false });
         const term = parsedRoll.terms[target.dataset.dieIndex];
         await term.reroll(`/r1=${term.total}`);
+        const result = await parsedRoll.evaluate();
+
         if (game.modules.get('dice-so-nice')?.active) {
             const diceSoNiceRoll = {
                 _evaluated: true,
@@ -391,7 +393,7 @@ export default class DualityRoll extends D20Roll {
                 options: { appearance: {} }
             };
 
-            const diceSoNicePresets = await getDiceSoNicePresets(`d${term._faces}`, `d${term._faces}`);
+            const diceSoNicePresets = await getDiceSoNicePresets(result, `d${term._faces}`, `d${term._faces}`);
             const type = target.dataset.type;
             if (diceSoNicePresets[type]) {
                 diceSoNiceRoll.dice[0].options = diceSoNicePresets[type];
@@ -400,8 +402,6 @@ export default class DualityRoll extends D20Roll {
             await game.dice3d.showForRoll(diceSoNiceRoll, game.user, true);
         }
 
-        await parsedRoll.evaluate();
-
         const newRoll = game.system.api.dice.DualityRoll.postEvaluate(parsedRoll, {
             targets: message.system.targets,
             roll: {
diff --git a/module/helpers/utils.mjs b/module/helpers/utils.mjs
index 5704b891..b49a98ca 100644
--- a/module/helpers/utils.mjs
+++ b/module/helpers/utils.mjs
@@ -60,7 +60,13 @@ export const getCommandTarget = (options = {}) => {
 
 export const setDiceSoNiceForDualityRoll = async (rollResult, advantageState, hopeFaces, fearFaces, advantageFaces) => {
     if (!game.modules.get('dice-so-nice')?.active) return;
-    const diceSoNicePresets = await getDiceSoNicePresets(hopeFaces, fearFaces, advantageFaces, advantageFaces);
+    const diceSoNicePresets = await getDiceSoNicePresets(
+        rollResult,
+        hopeFaces,
+        fearFaces,
+        advantageFaces,
+        advantageFaces
+    );
     rollResult.dice[0].options = diceSoNicePresets.hope;
     rollResult.dice[1].options = diceSoNicePresets.fear;
     if (rollResult.dice[2] && advantageState) {
diff --git a/module/systemRegistration/handlebars.mjs b/module/systemRegistration/handlebars.mjs
index 9ccb16f4..f51e1035 100644
--- a/module/systemRegistration/handlebars.mjs
+++ b/module/systemRegistration/handlebars.mjs
@@ -46,6 +46,7 @@ export const preloadHandlebarsTemplates = async function () {
         'systems/daggerheart/templates/ui/chat/parts/target-part.hbs',
         'systems/daggerheart/templates/ui/chat/parts/button-part.hbs',
         'systems/daggerheart/templates/ui/itemBrowser/itemContainer.hbs',
-        'systems/daggerheart/templates/scene/dh-config.hbs'
+        'systems/daggerheart/templates/scene/dh-config.hbs',
+        'systems/daggerheart/templates/settings/appearance-settings/diceSoNiceTab.hbs'
     ]);
 };
diff --git a/module/systemRegistration/settings.mjs b/module/systemRegistration/settings.mjs
index 8440e3fe..e7ec37f5 100644
--- a/module/systemRegistration/settings.mjs
+++ b/module/systemRegistration/settings.mjs
@@ -1,6 +1,13 @@
 import { defaultLevelTiers, DhLevelTiers } from '../data/levelTier.mjs';
 import DhCountdowns from '../data/countdowns.mjs';
-import { DhAppearance, DhAutomation, DhHomebrew, DhMetagaming, DhVariantRules } from '../data/settings/_module.mjs';
+import {
+    DhAppearance,
+    DhAutomation,
+    DhGlobalOverrides,
+    DhHomebrew,
+    DhMetagaming,
+    DhVariantRules
+} from '../data/settings/_module.mjs';
 import {
     DhAppearanceSettings,
     DhAutomationSettings,
@@ -54,17 +61,18 @@ const registerMenuSettings = () => {
         }
     });
 
+    game.settings.register(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.GlobalOverrides, {
+        scope: 'world',
+        config: false,
+        type: DhGlobalOverrides
+    });
+
     game.settings.register(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.appearance, {
         scope: 'client',
         config: false,
         type: DhAppearance,
         onChange: value => {
-            if (value.displayFear) {
-                if (ui.resources) {
-                    if (value.displayFear === 'hide') ui.resources.close({ allowed: true });
-                    else ui.resources.render({ force: true });
-                }
-            }
+            value.handleChange();
         }
     });
 };
diff --git a/styles/less/global/elements.less b/styles/less/global/elements.less
index f5e92e2c..beffefbb 100755
--- a/styles/less/global/elements.less
+++ b/styles/less/global/elements.less
@@ -565,60 +565,11 @@
 }
 
 .application.setting.dh-style {
-    fieldset {
-        h2,
-        h3,
-        h4 {
-            margin: 8px 0 4px;
-            text-align: center;
-        }
-        .title-hint {
-            font-size: var(--font-size-12);
-            font-variant: small-caps;
-            text-align: center;
-        }
-
-        .field-section {
-            display: flex;
-            flex-direction: column;
-            gap: 10px;
-
-            .split-section {
-                display: grid;
-                grid-template-columns: 1fr 1fr;
-                gap: 10px;
-            }
-        }
-
-        .label-container {
-            display: grid;
-            grid-template-columns: 1fr 1fr;
-            gap: 10px;
-
-            &.full-width {
-                grid-template-columns: 1fr 1fr 1fr 1fr;
-
-                select {
-                    grid-column: span 3;
-                }
-            }
-
-            label {
-                align-self: center;
-                text-align: center;
-                white-space: nowrap;
-            }
-        }
-
-        .button-container {
-            display: grid;
-            grid-template-columns: 1fr;
-            gap: 10px;
-            text-align: center;
-            display: flex;
-            justify-content: center;
-            width: 100%;
-        }
+    h2,
+    h3,
+    h4 {
+        margin: 8px 0 4px;
+        text-align: center;
     }
 
     footer {
diff --git a/styles/less/ui/index.less b/styles/less/ui/index.less
index 5a6e5878..31ea8955 100644
--- a/styles/less/ui/index.less
+++ b/styles/less/ui/index.less
@@ -28,6 +28,7 @@
 @import './settings/homebrew-settings/domains.less';
 @import './settings/homebrew-settings/types.less';
 @import './settings/homebrew-settings/resources.less';
+@import './settings/appearance-settings/diceSoNice.less';
 
 @import './sidebar/tabs.less';
 @import './sidebar/daggerheartMenu.less';
diff --git a/styles/less/ui/settings/appearance-settings/diceSoNice.less b/styles/less/ui/settings/appearance-settings/diceSoNice.less
new file mode 100644
index 00000000..079bebc5
--- /dev/null
+++ b/styles/less/ui/settings/appearance-settings/diceSoNice.less
@@ -0,0 +1,72 @@
+.daggerheart.dh-style.setting.appearance-settings {
+    .tab.active[data-tab='diceSoNice'] {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        gap: 0.5rem;
+    }
+
+    .diceSoNice-footer {
+        display: grid;
+        align-items: center;
+        grid-template-columns: 1fr 1fr 1fr 1fr;
+        gap: 8px;
+        margin-top: 32px;
+
+        label {
+            text-align: center;
+        }
+
+        select {
+            grid-column: span 2;
+        }
+    }
+
+    .title-hint {
+        font-size: var(--font-size-14);
+        font-variant: small-caps;
+        text-align: center;
+    }
+
+    .split-section {
+        display: grid;
+        grid-template-columns: 1fr 1fr;
+        gap: 10px;
+
+        > label {
+            grid-column: span 2;
+            text-align: center;
+            font-size: var(--font-size-18);
+            font-weight: bold;
+        }
+    }
+
+    .field-section {
+        display: flex;
+        flex-direction: column;
+        gap: 10px;
+        margin-bottom: 4px;
+        width: 100%;
+        padding: 0 8px;
+    }
+
+    .label-container {
+        display: grid;
+        grid-template-columns: 1fr 1fr;
+        gap: 10px;
+
+        &.full-width {
+            grid-template-columns: 1fr 1fr 1fr 1fr;
+
+            select {
+                grid-column: span 3;
+            }
+        }
+
+        label {
+            align-self: center;
+            text-align: center;
+            white-space: nowrap;
+        }
+    }
+}
diff --git a/templates/settings/appearance-settings/diceSoNice.hbs b/templates/settings/appearance-settings/diceSoNice.hbs
index 6c89fd2f..afe7dd5a 100644
--- a/templates/settings/appearance-settings/diceSoNice.hbs
+++ b/templates/settings/appearance-settings/diceSoNice.hbs
@@ -1,71 +1,37 @@
 <section class="tab {{#if tab.active}} active{{/if}}" data-group="{{tab.group}}" data-tab="{{tab.id}}">
-  <fieldset>
     <div class="title-hint">{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.hint"}}</div>
-
-    <section class='tab-navigation'>
-      <div class='navigation-container'>
-        <div class="navigation-inner-container">
-          <line-div></line-div>
-          <nav class='feature-tab sheet-tabs tabs' data-group='diceSoNice'>
-            {{#each dsnTabs as |tab|}}
-            <a class='{{tab.id}} {{tab.cssClass}}' data-action='tab' data-group='{{tab.group}}' data-tab='{{tab.id}}'>
-              {{localize tab.label}}
-            </a>
-            {{/each}}
-          </nav>
-          <line-div></line-div>
+    <div class="field-section form-fields">
+        {{#if isGM}}
+            <div class="form-group">
+                <label for="dsn-overrideEnabled">{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.defaultAnimations"}}</label>
+                <input id="dsn-overrideEnabled" type="checkbox" class="default-animations-input" {{checked globalOverrides.diceSoNice.sfx.overrideEnabled}} />
+            </div>
+        {{/if}}
+        <div class="form-group"> 
+            <label>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.critical"}}</label>
+            <div class="form-fields">
+                {{formInput fields.diceSoNice.fields.sfx.fields.critical.fields.class value=setting.diceSoNice.sfx.critical.class blank="" localize=true}}
+            </div>       
+        </div>
+    </div>
+    <section class='tab-navigation'>
+        <div class='navigation-container'>
+            <div class="navigation-inner-container">
+                <line-div></line-div>
+                <nav class='feature-tab sheet-tabs tabs' data-group='diceSoNice'>
+                    {{#each dsnTabs as |tab|}}
+                        <a class='{{tab.id}} {{tab.cssClass}}' data-action='tab' data-group='{{tab.group}}' data-tab='{{tab.id}}'>
+                        {{localize tab.label}}
+                    </a>
+                    {{/each}}
+                </nav>
+                <line-div></line-div>
+            </div>
         </div>
-      </div>
     </section>
     {{#each dsnTabs as |dsnTab|}}
-    <section class="tab {{#if dsnTab.active}} active{{/if}}" data-group="{{dsnTab.group}}" data-tab="{{dsnTab.id}}">
-      <div class="field-section">
-        <div class="label-container full-width">
-          <label>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.system"}}</label>
-          {{formInput fields.system value=values.system localize=true choices=@root.diceSoNiceSystems}}
-        </div>
-        <div class="split-section">
-          <div class="label-container">
-            <label>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.foreground"}}</label>
-            {{formInput fields.foreground value=values.foreground localize=true}}
-          </div>
-          <div class="label-container">
-            <label>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.background"}}</label>
-            {{formInput fields.background value=values.background localize=true}}
-          </div>
-          <div class="label-container">
-            <label>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.outline"}}</label>
-            {{formInput fields.outline value=values.outline localize=true}}
-          </div>
-          <div class="label-container">
-            <label>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.edge"}}</label>
-            {{formInput fields.edge value=values.edge localize=true}}
-          </div>
-          <div class="label-container">
-            <label>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.colorset"}}</label>
-            {{formInput fields.colorset value=values.colorset choices=@root.diceSoNiceColorsets localize=true}}
-          </div>
-          <div class="label-container">
-            <label>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.texture"}}</label>
-            {{formInput fields.texture value=values.texture choices=@root.diceSoNiceTextures localize=true}}
-          </div>
-          <div class="label-container">
-            <label>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.material"}}</label>
-            {{formInput fields.material value=values.material choices=@root.diceSoNiceMaterials localize=true}}
-          </div>
-          <div class="label-container">
-            <label>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.font"}}</label>
-            {{formInput fields.font value=values.font choices=@root.diceSoNiceFonts localize=true}}
-          </div>
-        </div>
-        <div class="button-container">
-          <button type="button" data-action="preview" data-key="{{dsnTab.id}}">
-            <i class="fa-solid fa-dice"></i>
-            <span>{{localize "Preview"}}</span>
-          </button>
-        </div>
-      </div>
-    </section>
+        <section class="tab {{#if dsnTab.active}} active{{/if}}" data-group="{{dsnTab.group}}" data-tab="{{dsnTab.id}}">
+            {{> "systems/daggerheart/templates/settings/appearance-settings/diceSoNiceTab.hbs" dsnTab }}
+        </section>
     {{/each}}
-  </fieldset>
 </section>
\ No newline at end of file
diff --git a/templates/settings/appearance-settings/diceSoNiceTab.hbs b/templates/settings/appearance-settings/diceSoNiceTab.hbs
new file mode 100644
index 00000000..a15b63ec
--- /dev/null
+++ b/templates/settings/appearance-settings/diceSoNiceTab.hbs
@@ -0,0 +1,62 @@
+<div class="field-section">
+    <h3>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.diceAppearance"}}</h3>
+
+    <div class="label-container full-width">
+        <label>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.system"}}</label>
+        {{formInput fields.system value=values.system localize=true choices=@root.diceSoNiceSystems}}
+    </div>
+    <div class="split-section">
+    <div class="label-container">
+        <label>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.foreground"}}</label>
+        {{formInput fields.foreground value=values.foreground localize=true}}
+    </div>
+    <div class="label-container">
+        <label>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.background"}}</label>
+        {{formInput fields.background value=values.background localize=true}}
+    </div>
+    <div class="label-container">
+        <label>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.outline"}}</label>
+        {{formInput fields.outline value=values.outline localize=true}}
+    </div>
+    <div class="label-container">
+        <label>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.edge"}}</label>
+        {{formInput fields.edge value=values.edge localize=true}}
+    </div>
+    <div class="label-container">
+        <label>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.colorset"}}</label>
+        {{formInput fields.colorset value=values.colorset choices=@root.diceSoNiceColorsets localize=true}}
+    </div>
+    <div class="label-container">
+        <label>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.texture"}}</label>
+        {{formInput fields.texture value=values.texture choices=@root.diceSoNiceTextures localize=true}}
+    </div>
+    <div class="label-container">
+        <label>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.material"}}</label>
+        {{formInput fields.material value=values.material choices=@root.diceSoNiceMaterials localize=true}}
+    </div>
+    <div class="label-container">
+        <label>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.font"}}</label>
+        {{formInput fields.font value=values.font choices=@root.diceSoNiceFonts localize=true}}
+    </div>
+    </div>
+
+    {{#if animations}}
+        <h3>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.animations"}}</h3>      
+        <div class="label-container full-width">
+            <label>{{localize "DAGGERHEART.CONFIG.DaggerheartDiceAnimationEvents.higher.name"}}</label>
+            {{formInput fields.sfx.fields.higher.fields.class value=values.sfx.higher.class blank="" localize=true}}
+        </div>
+    {{/if}}
+
+    <div class="diceSoNice-footer">
+        <label>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.previewAnimation"}}</label>
+        <select name="{{concat id "PreviewAnimation"}}">
+            {{selectOptions @root.animationEvents selected=@root.previewAnimation blank="" localize=true }}
+        </select>
+        
+        <button type="button" data-action="preview" data-key="{{id}}">
+            <i class="fa-solid fa-dice"></i>
+            <span>{{localize "DAGGERHEART.GENERAL.preview"}}</span>
+        </button>
+    </div>
+</div>
\ No newline at end of file