[Feature] Become Unstoppable (#1321)

* Added implementation of unstoppable

* Forgot to add the updated Unstoppable Feature itself

* Added immunity for hidden and SRD additions for immunity

lang/en.json

@@ -130,7 +130,8 @@
             "RangeDependance": {
                 "hint": "Settings for an optional distance at which this effect should activate",
                 "title": "Range Dependant"
-            }
+            },
+            "immuneStatusText": "Immunity: {status}"
         },
         "ACTORS": {
             "Adversary": {
@@ -396,7 +397,8 @@
                 "stressReduction": "Reduce By Stress",
                 "title": "Damage Reduction",
                 "unncessaryStress": "You don't need to expend stress",
-                "usedMarks": "Used Marks"
+                "usedMarks": "Used Marks",
+                "reduceSeverity": "Severity Reduced By {nr}"
             },
             "DeathMove": {
                 "selectMove": "Select Move",
@@ -1034,7 +1036,8 @@
             },
             "ItemResourceType": {
                 "simple": "Simple",
-                "diceValue": "Dice Value"
+                "diceValue": "Dice Value",
+                "die": "Die"
             },
             "Range": {
                 "self": {
@@ -2530,7 +2533,8 @@
                     "abilityCheckTitle": "{ability} Check"
                 },
                 "effectSummary": {
-                    "title": "Effects Applied"
+                    "title": "Effects Applied",
+                    "immunityTo": "Immunity: {immunities}"
                 },
                 "featureTitle": "Class Feature",
                 "groupRoll": {
@@ -2728,7 +2732,8 @@
                 "rightClickExtand": "Right-Click to extand",
                 "companionPartnerLevelBlock": "The companion needs an assigned partner to level up.",
                 "configureAttribution": "Configure Attribution",
-                "deleteItem": "Delete Item"
+                "deleteItem": "Delete Item",
+                "immune": "Immune"
             }
         }
     }

module/applications/dialogs/damageReductionDialog.mjs

@@ -10,6 +10,7 @@ export default class DamageReductionDialog extends HandlebarsApplicationMixin(Ap
         this.reject = reject;
         this.actor = actor;
         this.damage = damage;
+        this.damageType = damageType;
         this.rulesDefault = game.settings.get(
             CONFIG.DH.id,
             CONFIG.DH.SETTINGS.gameSettings.Automation
@@ -57,6 +58,11 @@ export default class DamageReductionDialog extends HandlebarsApplicationMixin(Ap
             null
         );
 
+        this.reduceSeverity = this.damageType.reduce((value, curr) => {
+            return Math.max(this.actor.system.rules.damageReduction.reduceSeverity[curr], value);
+        }, 0);
+        this.actor.system.rules.damageReduction.reduceSeverity[this.damageType];
+
         this.thresholdImmunities = Object.keys(actor.system.rules.damageReduction.thresholdImmunities).reduce(
             (acc, key) => {
                 if (actor.system.rules.damageReduction.thresholdImmunities[key])
@@ -111,7 +117,9 @@ export default class DamageReductionDialog extends HandlebarsApplicationMixin(Ap
             CONFIG.DH.GENERAL.ruleChoice.onWithToggle.id,
             CONFIG.DH.GENERAL.ruleChoice.offWithToggle.id
         ].includes(this.rulesDefault);
-        context.thresholdImmunities = this.thresholdImmunities;
+        context.reduceSeverity = this.reduceSeverity;
+        context.thresholdImmunities =
+            Object.keys(this.thresholdImmunities).length > 0 ? this.thresholdImmunities : null;
 
         const { selectedArmorMarks, selectedStressMarks, stressReductions, currentMarks, currentDamage } =
             this.getDamageInfo();
@@ -173,6 +181,9 @@ export default class DamageReductionDialog extends HandlebarsApplicationMixin(Ap
             this.damage - armorMarkReduction - selectedStressMarks.length - stressReductions.length,
             0
         );
+        if (this.reduceSeverity) {
+            currentDamage = Math.max(currentDamage - this.reduceSeverity, 0);
+        }
 
         if (this.thresholdImmunities[currentDamage]) currentDamage = 0;
 

module/applications/hud/tokenHUD.mjs

@@ -33,7 +33,10 @@ export default class DHTokenHUD extends foundry.applications.hud.TokenHUD {
             : context.canToggleCombat;
         context.systemStatusEffects = Object.keys(context.statusEffects).reduce((acc, key) => {
             const effect = context.statusEffects[key];
-            if (effect.systemEffect) acc[key] = effect;
+            if (effect.systemEffect) {
+                const disabled = !effect.isActive && this.actor.system.rules.conditionImmunities[key];
+                acc[key] = { ...effect, disabled };
+            }
 
             return acc;
         }, {});

module/applications/sheets/actors/character.mjs

@@ -30,6 +30,7 @@ export default class CharacterSheet extends DHBaseActorSheet {
             toggleEquipItem: CharacterSheet.#toggleEquipItem,
             toggleResourceDice: CharacterSheet.#toggleResourceDice,
             handleResourceDice: CharacterSheet.#handleResourceDice,
+            advanceResourceDie: CharacterSheet.#advanceResourceDie,
             cancelBeastform: CharacterSheet.#cancelBeastform,
             useDowntime: this.useDowntime
         },
@@ -147,6 +148,10 @@ export default class CharacterSheet extends DHBaseActorSheet {
         htmlElement.querySelectorAll('.armor-marks-input').forEach(element => {
             element.addEventListener('change', this.updateArmorMarks.bind(this));
         });
+
+        htmlElement.querySelectorAll('.item-resource.die').forEach(element => {
+            element.addEventListener('contextmenu', this.lowerResourceDie.bind(this));
+        });
     }
 
     /**  @inheritdoc */
@@ -857,6 +862,27 @@ export default class CharacterSheet extends DHBaseActorSheet {
         });
     }
 
+    /** */
+    static #advanceResourceDie(_, target) {
+        this.updateResourceDie(target, true);
+    }
+
+    lowerResourceDie(event) {
+        event.preventDefault();
+        event.stopPropagation();
+        this.updateResourceDie(event.target, false);
+    }
+
+    async updateResourceDie(target, advance) {
+        const item = await getDocFromElement(target);
+        if (!item) return;
+
+        const advancedValue = item.system.resource.value + (advance ? 1 : -1);
+        await item.update({
+            'system.resource.value': Math.min(advancedValue, Number(item.system.resource.dieFaces.split('d')[1]))
+        });
+    }
+
     /**
      *
      */

module/canvas/placeables/token.mjs

@@ -24,7 +24,7 @@ export default class DhTokenPlaceable extends foundry.canvas.placeables.Token {
                         acc.push({
                             name: game.i18n.localize(statusData.name),
                             statuses: [status],
-                            img: statusData.icon,
+                            img: statusData.icon ?? statusData.img,
                             tint: effect.tint
                         });
                     }

module/config/itemConfig.mjs

@@ -1519,6 +1519,10 @@ export const itemResourceTypes = {
     diceValue: {
         id: 'diceValue',
         label: 'DAGGERHEART.CONFIG.ItemResourceType.diceValue'
+    },
+    die: {
+        id: 'die',
+        label: 'DAGGERHEART.CONFIG.ItemResourceType.die'
     }
 };
 

module/data/actor/adversary.mjs

@@ -57,6 +57,13 @@ export default class DhpAdversary extends BaseDataActor {
                 hitPoints: resourceField(0, 0, 'DAGGERHEART.GENERAL.HitPoints.plural', true),
                 stress: resourceField(0, 0, 'DAGGERHEART.GENERAL.stress', true)
             }),
+            rules: new fields.SchemaField({
+                conditionImmunities: new fields.SchemaField({
+                    hidden: new fields.BooleanField({ initial: false }),
+                    restrained: new fields.BooleanField({ initial: false }),
+                    vulnerable: new fields.BooleanField({ initial: false })
+                })
+            }),
             attack: new ActionField({
                 initial: {
                     name: 'Attack',

module/data/actor/character.mjs

@@ -250,6 +250,10 @@ export default class DhCharacter extends BaseDataActor {
                     thresholdImmunities: new fields.SchemaField({
                         minor: new fields.BooleanField({ initial: false })
                     }),
+                    reduceSeverity: new fields.SchemaField({
+                        magical: new fields.NumberField({ initial: 0, min: 0 }),
+                        physical: new fields.NumberField({ initial: 0, min: 0 })
+                    }),
                     disabledArmor: new fields.BooleanField({ intial: false })
                 }),
                 attack: new fields.SchemaField({
@@ -279,6 +283,11 @@ export default class DhCharacter extends BaseDataActor {
                         })
                     })
                 }),
+                conditionImmunities: new fields.SchemaField({
+                    hidden: new fields.BooleanField({ initial: false }),
+                    restrained: new fields.BooleanField({ initial: false }),
+                    vulnerable: new fields.BooleanField({ initial: false })
+                }),
                 runeWard: new fields.BooleanField({ initial: false }),
                 burden: new fields.SchemaField({
                     ignore: new fields.BooleanField()

module/data/actor/companion.mjs

@@ -51,6 +51,13 @@ export default class DhCompanion extends BaseDataActor {
                     }
                 }
             ),
+            rules: new fields.SchemaField({
+                conditionImmunities: new fields.SchemaField({
+                    hidden: new fields.BooleanField({ initial: false }),
+                    restrained: new fields.BooleanField({ initial: false }),
+                    vulnerable: new fields.BooleanField({ initial: false })
+                })
+            }),
             attack: new ActionField({
                 initial: {
                     name: 'Attack',

module/data/fields/action/effectsField.mjs

@@ -47,6 +47,7 @@ export default class EffectsField extends fields.ArrayField {
     static async applyEffects(targets) {
         if (!this.effects?.length || !targets?.length) return;
 
+        const conditions = CONFIG.DH.GENERAL.conditions();
         let effects = this.effects;
         const messageTargets = [];
         targets.forEach(async baseToken => {
@@ -56,7 +57,20 @@ export default class EffectsField extends fields.ArrayField {
             const token =
                 canvas.tokens.get(baseToken.id) ?? foundry.utils.fromUuidSync(baseToken.actorId).prototypeToken;
             if (!token) return;
-            messageTargets.push(token.document ?? token);
+
+            const messageToken = token.document ?? token;
+            const conditionImmunities = messageToken.actor.system.rules.conditionImmunities ?? {};
+            messageTargets.push({
+                token: messageToken,
+                conditionImmunities: Object.values(conditionImmunities).some(x => x)
+                    ? game.i18n.format('DAGGERHEART.UI.Chat.effectSummary.immunityTo', {
+                          immunities: Object.keys(conditionImmunities)
+                              .filter(x => conditionImmunities[x])
+                              .map(x => game.i18n.localize(conditions[x].name))
+                              .join(', ')
+                      })
+                    : null
+            });
 
             effects.forEach(async e => {
                 const effect = this.item.effects.get(e._id);

module/documents/activeEffect.mjs

@@ -57,6 +57,27 @@ export default class DhActiveEffect extends foundry.documents.ActiveEffect {
             update.img = 'icons/magic/life/heart-cross-blue.webp';
         }
 
+        const immuneStatuses =
+            data.statuses?.filter(
+                status =>
+                    this.parent.system.rules?.conditionImmunities &&
+                    this.parent.system.rules.conditionImmunities[status]
+            ) ?? [];
+        if (immuneStatuses.length > 0) {
+            update.statuses = data.statuses.filter(x => !immuneStatuses.includes(x));
+            const conditions = CONFIG.DH.GENERAL.conditions();
+            const scrollingTexts = immuneStatuses.map(status => ({
+                text: game.i18n.format('DAGGERHEART.ACTIVEEFFECT.immuneStatusText', {
+                    status: game.i18n.localize(conditions[status].name)
+                })
+            }));
+            if (update.statuses.length > 0) {
+                setTimeout(() => scrollingTexts, 500);
+            } else {
+                this.parent.queueScrollText(scrollingTexts);
+            }
+        }
+
         if (Object.keys(update).length > 0) {
             await this.updateSource(update);
         }
@@ -76,7 +97,10 @@ export default class DhActiveEffect extends foundry.documents.ActiveEffect {
             change.value = change.value.replaceAll(/origin\.@/gi, '@');
             try {
                 const effect = foundry.utils.fromUuidSync(change.effect.origin);
-                const doc = effect.parent?.parent;
+                const doc =
+                    effect.parent?.parent instanceof game.system.api.documents.DhpActor
+                        ? effect.parent
+                        : effect.parent.parent;
                 if (doc) parseModel = doc;
             } catch (_) {}
         }

module/systemRegistration/handlebars.mjs

@@ -12,7 +12,10 @@ export const preloadHandlebarsTemplates = async function () {
         'systems/daggerheart/templates/sheets/global/partials/action-item.hbs',
         'systems/daggerheart/templates/sheets/global/partials/domain-card-item.hbs',
         'systems/daggerheart/templates/sheets/global/partials/item-resource.hbs',
-        'systems/daggerheart/templates/sheets/global/partials/resource-section.hbs',
+        'systems/daggerheart/templates/sheets/global/partials/resource-section/resource-section.hbs',
+        'systems/daggerheart/templates/sheets/global/partials/resource-section/simple.hbs',
+        '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/components/card-preview.hbs',
         'systems/daggerheart/templates/levelup/parts/selectable-card-preview.hbs',

src/packs/adversaries/adversary_Bear_71qKDLKO3CsrNkdy.json

@@ -401,7 +401,7 @@
           "description": "<p>You are <em>Restrained</em> until you break free with a successful Strength Roll.</p>",
           "tint": "#ffffff",
           "statuses": [
-            "restrain"
+            "restrained"
           ],
           "sort": 0,
           "flags": {},

src/packs/adversaries/adversary_Chaos_Skull_jDmHqGvzg5wjgmxE.json

@@ -239,7 +239,59 @@
       },
       "_id": "m6uPm4vujrUjSFPw",
       "img": "icons/magic/air/fog-gas-smoke-blue-gray.webp",
-      "effects": [],
+      "effects": [
+        {
+          "name": "Levitation",
+          "type": "base",
+          "system": {
+            "rangeDependence": {
+              "enabled": false,
+              "type": "withinRange",
+              "target": "hostile",
+              "range": "melee"
+            }
+          },
+          "_id": "k6iaQVfMZhrpwYQj",
+          "img": "icons/magic/air/fog-gas-smoke-blue-gray.webp",
+          "changes": [
+            {
+              "key": "system.rules.conditionImmunities.restrained",
+              "mode": 5,
+              "value": "1",
+              "priority": null
+            }
+          ],
+          "disabled": false,
+          "duration": {
+            "startTime": null,
+            "combat": null,
+            "seconds": null,
+            "rounds": null,
+            "turns": null,
+            "startRound": null,
+            "startTurn": null
+          },
+          "description": "<p>The Skull levitates several feet off the ground and can’t be <em>Restrained</em>.</p>",
+          "origin": null,
+          "tint": "#ffffff",
+          "transfer": true,
+          "statuses": [],
+          "sort": 0,
+          "flags": {},
+          "_stats": {
+            "compendiumSource": null,
+            "duplicateSource": null,
+            "exportSource": null,
+            "coreVersion": "13.351",
+            "systemId": "daggerheart",
+            "systemVersion": "1.2.4",
+            "createdTime": 1763845938979,
+            "modifiedTime": 1763846023794,
+            "lastModifiedBy": "Q4RzhhaPfvLUzzbw"
+          },
+          "_key": "!actors.items.effects!jDmHqGvzg5wjgmxE.m6uPm4vujrUjSFPw.k6iaQVfMZhrpwYQj"
+        }
+      ],
       "folder": null,
       "sort": 0,
       "ownership": {

src/packs/adversaries/adversary_Cult_Adept_0NxCSugvKQ4W8OYZ.json

@@ -580,7 +580,7 @@
           "description": "<p>You are<em> Restrained</em> in smoky chains until you break free with a successful Strength or Instinct Roll. A target Restrained by this feature must spend a Hope to make an action roll.</p>",
           "tint": "#ffffff",
           "statuses": [
-            "restrain"
+            "restrained"
           ],
           "sort": 0,
           "flags": {},

src/packs/adversaries/adversary_Deeproot_Defender_9x2xY9zwc3xzbXo5.json

@@ -439,7 +439,7 @@
           "description": "<p>You are <em>Restrained </em>until the Defender takes Severe damage.</p>",
           "tint": "#ffffff",
           "statuses": [
-            "restrain"
+            "restrained"
           ],
           "sort": 0,
           "flags": {},

src/packs/adversaries/adversary_Giant_Beastmaster_8VZIgU12cB3cvlyH.json

@@ -385,7 +385,7 @@
           "description": "<p>You are <em>Restrained</em> until you break free with a successful Finesse or Strength Roll.</p>",
           "tint": "#ffffff",
           "statuses": [
-            "restrain"
+            "restrained"
           ],
           "sort": 0,
           "flags": {},

src/packs/adversaries/adversary_Giant_Eagle_OMQ0v6PE8s1mSU0K.json

@@ -624,7 +624,7 @@
           "description": "",
           "tint": "#ffffff",
           "statuses": [
-            "restrain"
+            "restrained"
           ],
           "sort": 0,
           "flags": {},

src/packs/adversaries/adversary_Gorgon_8mJYMpbLTb8qIOrr.json

@@ -355,7 +355,14 @@
               "range": "melee"
             }
           },
-          "changes": [],
+          "changes": [
+            {
+              "key": "system.rules.conditionImmunities.hidden",
+              "mode": 5,
+              "value": "1",
+              "priority": null
+            }
+          ],
           "disabled": false,
           "duration": {
             "startTime": null,
@@ -366,7 +373,7 @@
             "startRound": null,
             "startTurn": null
           },
-          "description": "<p> You Glow until the end of the scene and can’t become <em>Hidden</em>. Attack rolls made against you have advantage.</p>",
+          "description": "<p>You Glow until the end of the scene and can’t become <em>Hidden</em>. Attack rolls made against you have advantage.</p>",
           "tint": "#ffffff",
           "statuses": [],
           "sort": 0,
@@ -375,12 +382,12 @@
             "compendiumSource": null,
             "duplicateSource": null,
             "exportSource": null,
-            "coreVersion": "13.346",
+            "coreVersion": "13.351",
             "systemId": "daggerheart",
             "systemVersion": "0.0.1",
             "createdTime": 1754079525282,
-            "modifiedTime": 1754079558712,
-            "lastModifiedBy": "MQSznptE5yLT7kj8"
+            "modifiedTime": 1763847816177,
+            "lastModifiedBy": "Q4RzhhaPfvLUzzbw"
           },
           "_key": "!actors.items.effects!8mJYMpbLTb8qIOrr.NepVGKOo1lHYjA1F.bYBrgiSwHwYfQyjn"
         }

src/packs/adversaries/adversary_Kraken_4nqv3ZwJGjnmic8j.json

@@ -426,7 +426,7 @@
           "description": "<p>You are <em>Restrained</em> and <em>Vulnerable</em> until you break free with a successful Strength Roll or the Kraken takes Major or greater damage. While <em>Restrained</em> and <em>Vulnerable</em> in this way, you must mark a Stress when you make an action roll.</p>",
           "tint": "#ffffff",
           "statuses": [
-            "restrain",
+            "restrained",
             "vulnerable"
           ],
           "sort": 0,

src/packs/adversaries/adversary_Masked_Thief_niBpVU7yeo5ccskE.json

@@ -432,7 +432,7 @@
           "description": "<p>You are <em>Restrained</em> and <em>Vulnerable</em> until you break free, ending both conditions, with a successful Finesse or Strength Roll (13).</p><p>[[/dr trait=finesse difficulty=13]]<br />[[/dr trait=strength difficulty=13]]</p>",
           "tint": "#ffffff",
           "statuses": [
-            "restrain",
+            "restrained",
             "vulnerable"
           ],
           "sort": 0,

src/packs/adversaries/adversary_Vault_Guardian_Gaoler_JqYraOqNmmhHk4Yy.json

@@ -361,7 +361,7 @@
           "description": "<p>You are<strong> </strong><em>Restrained</em> within the Gaoler until freed with a successful Strength Roll (18). While <em>Restrained</em>, you can only attack the Gaoler. </p>",
           "tint": "#ffffff",
           "statuses": [
-            "restrain"
+            "restrained"
           ],
           "sort": 0,
           "flags": {},

src/packs/adversaries/adversary_Young_Dryad_8yUj2Mzvnifhxegm.json

@@ -399,7 +399,7 @@
           "description": "<p>You are <em>Restrained</em> until you're freed with a successful Strength Roll. When a creature makes an action roll against the cage, they must mark a Stress. </p>",
           "tint": "#ffffff",
           "statuses": [
-            "restrain"
+            "restrained"
           ],
           "sort": 0,
           "flags": {},

src/packs/classes/feature_Unstoppable_PnD2UCgzIlwX6cY3.json

@@ -5,9 +5,46 @@
   "_id": "PnD2UCgzIlwX6cY3",
   "img": "icons/magic/defensive/shield-barrier-glowing-blue.webp",
   "system": {
-    "description": "<p><strong>(Note: This needs to be manually implemented. Unstoppable die feature is not implemented as of this time)</strong><br /><br />Once per long rest, you can become Unstoppable. You gain an Unstoppable Die. At level 1, your Unstoppable Die is a d4. Place it on your character sheet in the space provided, starting with the 1 value facing up. After you make a damage roll that deals 1 or more Hit Points to a target, increase the Unstoppable Die value by one. When the die’s value would exceed its maximum value or when the scene ends, remove the die and drop out of Unstoppable. At level 5, your Unstoppable Die increases to a d6. While Unstoppable, you gain the following benefits:</p><ul><li><p>You reduce the severity of physical damage by one threshold (Severe to Major, Major to Minor, Minor to None).</p></li><li><p>You add the current value of the Unstoppable Die to your damage roll.</p></li><li><p>You can’t be Restrained or Vulnerable.</p></li></ul><blockquote><p>Tip: If your Unstoppable Die is a d4 and the 4 is currently facing up, you remove the die the next time you would increase it. However, if your Unstoppable Die has increased to a d6 and the 4 is currently facing up, you’ll turn it to 5 the next time you would increase it. In this case, you’ll remove the die after you would need to increase it higher than 6.</p></blockquote>",
-    "resource": null,
-    "actions": {},
+    "description": "<p>Once per long rest, you can become Unstoppable. You gain an Unstoppable Die. At level 1, your Unstoppable Die is a d4. Place it on your character sheet in the space provided, starting with the 1 value facing up. After you make a damage roll that deals 1 or more Hit Points to a target, increase the Unstoppable Die value by one. When the die’s value would exceed its maximum value or when the scene ends, remove the die and drop out of Unstoppable. At level 5, your Unstoppable Die increases to a d6. While Unstoppable, you gain the following benefits:</p><ul><li><p>You reduce the severity of physical damage by one threshold (Severe to Major, Major to Minor, Minor to None).</p></li><li><p>You add the current value of the Unstoppable Die to your damage roll.</p></li><li><p>You can’t be Restrained or Vulnerable.</p></li></ul><blockquote><p>Tip: If your Unstoppable Die is a d4 and the 4 is currently facing up, you remove the die the next time you would increase it. However, if your Unstoppable Die has increased to a d6 and the 4 is currently facing up, you’ll turn it to 5 the next time you would increase it. In this case, you’ll remove the die after you would need to increase it higher than 6.</p></blockquote>",
+    "resource": {
+      "type": "die",
+      "value": 0,
+      "max": "",
+      "icon": ""
+    },
+    "actions": {
+      "KZiZ8m8uqH5iG96d": {
+        "type": "effect",
+        "_id": "KZiZ8m8uqH5iG96d",
+        "systemPath": "actions",
+        "description": "<p>Once per long rest, you can become Unstoppable. You gain an Unstoppable Die. At level 1, your Unstoppable Die is a d4. Place it on your character sheet in the space provided, starting with the 1 value facing up. After you make a damage roll that deals 1 or more Hit Points to a target, increase the Unstoppable Die value by one. When the die’s value would exceed its maximum value or when the scene ends, remove the die and drop out of Unstoppable. At level 5, your Unstoppable Die increases to a d6. While Unstoppable, you gain the following benefits:</p><ul><li><p>You reduce the severity of physical damage by one threshold (Severe to Major, Major to Minor, Minor to None).</p></li><li><p>You add the current value of the Unstoppable Die to your damage roll.</p></li><li><p>You can’t be Restrained or Vulnerable.</p></li></ul><blockquote><p>Tip: If your Unstoppable Die is a d4 and the 4 is currently facing up, you remove the die the next time you would increase it. However, if your Unstoppable Die has increased to a d6 and the 4 is currently facing up, you’ll turn it to 5 the next time you would increase it. In this case, you’ll remove the die after you would need to increase it higher than 6.</p></blockquote>",
+        "chatDisplay": true,
+        "originItem": {
+          "type": "itemCollection"
+        },
+        "actionType": "action",
+        "cost": [],
+        "uses": {
+          "value": null,
+          "max": "1",
+          "recovery": "longRest",
+          "consumeOnSuccess": false
+        },
+        "effects": [
+          {
+            "_id": "xzQtFSuDS48kUdAZ",
+            "onSave": false
+          }
+        ],
+        "target": {
+          "type": "self",
+          "amount": null
+        },
+        "name": "Become Unstoppable",
+        "img": "icons/magic/defensive/shield-barrier-glowing-blue.webp",
+        "range": ""
+      }
+    },
     "originItemType": null,
     "originId": null,
     "attribution": {
@@ -16,7 +53,83 @@
       "artist": ""
     }
   },
-  "effects": [],
+  "effects": [
+    {
+      "name": "Unstoppable",
+      "img": "icons/magic/defensive/shield-barrier-glowing-blue.webp",
+      "origin": "Compendium.daggerheart.classes.Item.PnD2UCgzIlwX6cY3",
+      "transfer": false,
+      "_id": "xzQtFSuDS48kUdAZ",
+      "type": "base",
+      "system": {
+        "rangeDependence": {
+          "enabled": false,
+          "type": "withinRange",
+          "target": "hostile",
+          "range": "melee"
+        }
+      },
+      "changes": [
+        {
+          "key": "system.bonuses.damage.physical.bonus",
+          "mode": 2,
+          "value": "ORIGIN.@item.resource.value",
+          "priority": null
+        },
+        {
+          "key": "system.bonuses.damage.magical.bonus",
+          "mode": 2,
+          "value": "ORIGIN.@item.resource.value",
+          "priority": null
+        },
+        {
+          "key": "system.rules.damageReduction.reduceSeverity.physical",
+          "mode": 2,
+          "value": "1",
+          "priority": null
+        },
+        {
+          "key": "system.rules.conditionImmunities.vulnerable",
+          "mode": 5,
+          "value": "1",
+          "priority": null
+        },
+        {
+          "key": "system.rules.conditionImmunities.restrained",
+          "mode": 5,
+          "value": "1",
+          "priority": null
+        }
+      ],
+      "disabled": false,
+      "duration": {
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
+      },
+      "description": "",
+      "tint": "#ffffff",
+      "statuses": [],
+      "sort": 0,
+      "flags": {},
+      "_stats": {
+        "compendiumSource": null,
+        "duplicateSource": null,
+        "exportSource": null,
+        "coreVersion": "13.351",
+        "systemId": "daggerheart",
+        "systemVersion": "1.2.4",
+        "createdTime": 1763835871799,
+        "modifiedTime": 1763843691784,
+        "lastModifiedBy": "Q4RzhhaPfvLUzzbw"
+      },
+      "_key": "!items.effects!PnD2UCgzIlwX6cY3.xzQtFSuDS48kUdAZ"
+    }
+  ],
   "sort": 0,
   "ownership": {
     "default": 0,
@@ -27,12 +140,12 @@
     "compendiumSource": null,
     "duplicateSource": null,
     "exportSource": null,
-    "coreVersion": "13.347",
+    "coreVersion": "13.351",
     "systemId": "daggerheart",
-    "systemVersion": "1.0.5",
+    "systemVersion": "1.2.4",
     "createdTime": 1754246498657,
-    "modifiedTime": 1755391250586,
-    "lastModifiedBy": "VZIeX2YDvX338Zvr"
+    "modifiedTime": 1763839481783,
+    "lastModifiedBy": "Q4RzhhaPfvLUzzbw"
   },
   "_key": "!items!PnD2UCgzIlwX6cY3"
 }

src/packs/domains/domainCard_Book_of_Norai_WtwSWXTRZa7QVvmo.json

@@ -211,7 +211,7 @@
       "description": "",
       "tint": "#ffffff",
       "statuses": [
-        "restrain"
+        "restrained"
       ],
       "sort": 0,
       "flags": {},

src/packs/domains/domainCard_Death_Grip_x0FVGE1YbfXalJiw.json

@@ -267,7 +267,7 @@
       "description": "",
       "tint": "#ffffff",
       "statuses": [
-        "restrain"
+        "restrained"
       ],
       "sort": 0,
       "flags": {},
@@ -313,7 +313,7 @@
       "description": "",
       "tint": "#ffffff",
       "statuses": [
-        "restrain"
+        "restrained"
       ],
       "sort": 0,
       "flags": {},
@@ -359,7 +359,7 @@
       "description": "",
       "tint": "#ffffff",
       "statuses": [
-        "restrain"
+        "restrained"
       ],
       "sort": 0,
       "flags": {},

src/packs/domains/domainCard_Force_of_Nature_LzVpMkD5I4QeaIHf.json

@@ -122,6 +122,12 @@
           "mode": 2,
           "value": "10",
           "priority": null
+        },
+        {
+          "key": "system.rules.conditionImmunities.restrained",
+          "mode": 5,
+          "value": "1",
+          "priority": null
         }
       ],
       "disabled": false,
@@ -134,7 +140,7 @@
         "startRound": null,
         "startTurn": null
       },
-      "description": "<ul><li><p><span class=\"vertical-card-list\" style=\"box-sizing:border-box;margin:0px 0px 0.25rem;scrollbar-width:thin;scrollbar-color:rgb(93, 20, 43) rgba(0, 0, 0, 0);font-family:Montserrat, sans-serif\">When you succeed on an attack or Spellcast Roll, gain a +10 bonus to the damage roll.</p></li><li><p><span class=\"vertical-card-list\" style=\"box-sizing:border-box;margin:0px 0px 0.25rem;scrollbar-width:thin;scrollbar-color:rgb(93, 20, 43) rgba(0, 0, 0, 0);font-family:Montserrat, sans-serif\">When you deal enough damage to defeat a creature within Close range, you absorb them and clear an Armor Slot.</p></li><li><p><span class=\"vertical-card-list\" style=\"box-sizing:border-box;margin:0px 0px 0.25rem;scrollbar-width:thin;scrollbar-color:rgb(93, 20, 43) rgba(0, 0, 0, 0);font-family:Montserrat, sans-serif\">You can’t be <em style=\"box-sizing:border-box;scrollbar-width:thin;scrollbar-color:rgb(93, 20, 43) rgba(0, 0, 0, 0)\">Restrained</em>.</p></li><li><p><span style=\"color:rgb(239, 230, 216);font-family:Montserrat, sans-serif;font-size:14px;font-style:normal;font-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:normal;orphans:2;text-align:start;text-indent:0px;text-transform:none;widows:2;word-spacing:0px;-webkit-text-stroke-width:0px;white-space:normal;background-color:rgba(24, 22, 46, 0.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\">Before you make an action roll, you must </span><span style=\"box-sizing:border-box;scrollbar-width:thin;scrollbar-color:rgb(93, 20, 43) rgba(0, 0, 0, 0);color:rgb(239, 230, 216);font-family:Montserrat, sans-serif;font-size:14px;font-style:normal;font-variant-ligatures:normal;font-variant-caps:normal;letter-spacing:normal;orphans:2;text-align:start;text-indent:0px;text-transform:none;widows:2;word-spacing:0px;-webkit-text-stroke-width:0px;white-space:normal;background-color:rgba(24, 22, 46, 0.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial\">spend a Hope</span><span style=\"color:rgb(239, 230, 216);font-family:Montserrat, sans-serif;font-size:14px;font-style:normal;font-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:normal;orphans:2;text-align:start;text-indent:0px;text-transform:none;widows:2;word-spacing:0px;-webkit-text-stroke-width:0px;white-space:normal;background-color:rgba(24, 22, 46, 0.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\">. If you can’t, you revert to your normal form.</p></li></ul>",
+      "description": "<ul><li><p><span class=\"vertical-card-list\" style=\"box-sizing:border-box;margin:0px 0px 0.25rem;scrollbar-width:thin;scrollbar-color:rgb(93, 20, 43) rgba(0, 0, 0, 0);font-family:Montserrat, sans-serif\">When you succeed on an attack or Spellcast Roll, gain a +10 bonus to the damage roll.</span></p></li><li><p><span class=\"vertical-card-list\" style=\"box-sizing:border-box;margin:0px 0px 0.25rem;scrollbar-width:thin;scrollbar-color:rgb(93, 20, 43) rgba(0, 0, 0, 0);font-family:Montserrat, sans-serif\">When you deal enough damage to defeat a creature within Close range, you absorb them and clear an Armor Slot.</span></p></li><li><p><span class=\"vertical-card-list\" style=\"box-sizing:border-box;margin:0px 0px 0.25rem;scrollbar-width:thin;scrollbar-color:rgb(93, 20, 43) rgba(0, 0, 0, 0);font-family:Montserrat, sans-serif\">You can’t be <em style=\"box-sizing:border-box;scrollbar-width:thin;scrollbar-color:rgb(93, 20, 43) rgba(0, 0, 0, 0)\">Restrained</em>.</span></p></li><li><p><span style=\"color:rgb(239, 230, 216);font-family:Montserrat, sans-serif;font-size:14px;font-style:normal;font-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:normal;orphans:2;text-align:start;text-indent:0px;text-transform:none;widows:2;word-spacing:0px;-webkit-text-stroke-width:0px;white-space:normal;background-color:rgba(24, 22, 46, 0.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\">Before you make an action roll, you must </span><span style=\"box-sizing:border-box;scrollbar-width:thin;scrollbar-color:rgb(93, 20, 43) rgba(0, 0, 0, 0);color:rgb(239, 230, 216);font-family:Montserrat, sans-serif;font-size:14px;font-style:normal;font-variant-ligatures:normal;font-variant-caps:normal;letter-spacing:normal;orphans:2;text-align:start;text-indent:0px;text-transform:none;widows:2;word-spacing:0px;-webkit-text-stroke-width:0px;white-space:normal;background-color:rgba(24, 22, 46, 0.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial\">spend a Hope</span><span style=\"color:rgb(239, 230, 216);font-family:Montserrat, sans-serif;font-size:14px;font-style:normal;font-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:normal;orphans:2;text-align:start;text-indent:0px;text-transform:none;widows:2;word-spacing:0px;-webkit-text-stroke-width:0px;white-space:normal;background-color:rgba(24, 22, 46, 0.376);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\">. If you can’t, you revert to your normal form.</span></p></li></ul>",
       "tint": "#ffffff",
       "statuses": [],
       "sort": 0,
@@ -143,12 +149,12 @@
         "compendiumSource": null,
         "duplicateSource": null,
         "exportSource": null,
-        "coreVersion": "13.346",
+        "coreVersion": "13.351",
         "systemId": "daggerheart",
         "systemVersion": "0.0.1",
         "createdTime": 1754120504134,
-        "modifiedTime": 1754340362524,
-        "lastModifiedBy": "Q9NoTaEarn3VMS6Z"
+        "modifiedTime": 1763846303087,
+        "lastModifiedBy": "Q4RzhhaPfvLUzzbw"
       },
       "_key": "!items.effects!LzVpMkD5I4QeaIHf.ptBC882plZW39Ld9"
     }

src/packs/domains/domainCard_Shadowbind_kguhWlidhxe2GbT0.json

@@ -112,7 +112,7 @@
       "description": "",
       "tint": "#ffffff",
       "statuses": [
-        "restrain"
+        "restrained"
       ],
       "sort": 0,
       "flags": {},

src/packs/domains/domainCard_Vicious_Entangle_qvpvTnkAoRn9vYO4.json

@@ -173,7 +173,7 @@
       "description": "",
       "tint": "#ffffff",
       "statuses": [
-        "restrain"
+        "restrained"
       ],
       "sort": 0,
       "flags": {},
@@ -219,7 +219,7 @@
       "description": "",
       "tint": "#ffffff",
       "statuses": [
-        "restrain"
+        "restrained"
       ],
       "sort": 0,
       "flags": {},

src/packs/environments/environment_Abandoned_Grove_pGEdzdLkqYtBhxnG.json

@@ -302,7 +302,7 @@
           "description": "<p><em>Restrained</em> lasts until you’re freed with a successful Finesse or Strength roll or by dealing at least 6 damage to the vines.</p>",
           "tint": "#ffffff",
           "statuses": [
-            "restrain"
+            "restrained"
           ],
           "sort": 0,
           "flags": {},

src/packs/environments/environment_Burning_Heart_of_the_Woods_oY69NN4rYxoRE4hl.json

@@ -313,7 +313,7 @@
           "description": "<p><em>Restrained</em> and <em>Vulnerable</em> until you break free, clearing both conditions, with a successful Finesse or Strength Roll or by dealing 10 damage to the vines. When the target makes a roll to escape, they take <strong>1d8+4</strong> physical damage and lose a Hope.</p><section class=\"secret\" id=\"secret-Eui1zx8GKoUhEXq6\"><p><em>What painful memories do the vines bring to the surface as they pierce flesh?</em></p></section>",
           "tint": "#ffffff",
           "statuses": [
-            "restrain",
+            "restrained",
             "vulnerable"
           ],
           "sort": 0,

styles/less/hud/token-hud/token-hud.less

@@ -1,6 +1,18 @@
 .theme-light .daggerheart.placeable-hud {
-    .status-effects .effect-control {
-        filter: none;
+    .status-effects {
+        .effect-control {
+            filter: none;
+        }
+
+        .effect-control-container {
+            .effect-control {
+                filter: none;
+            }
+
+            .effect-control-disabled-marker {
+                color: @red;
+            }
+        }
     }
 }
 
@@ -21,4 +33,25 @@
             }
         }
     }
+
+    .status-effects {
+        .effect-control-container {
+            position: relative;
+
+            .effect-control-disabled-marker {
+                position: absolute;
+                height: 100%;
+                width: 100%;
+                top: -1px;
+                left: 1px;
+                color: @medium-red;
+                font-weight: 700;
+                font-size: 2.1em;
+                rotate: 29deg;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+            }
+        }
+    }
 }

styles/less/ui/chat/effect-summary.less

@@ -80,39 +80,52 @@
         gap: 5px;
     }
 
-    .token-target-container {
+    .token-target-outer-container {
         display: flex;
-        align-items: center;
-        gap: 13px;
-        border-radius: 6px;
-        padding: 0 2px;
-        border-radius: 6px;
-        background: transparent;
-        transition: all 0.3s ease;
-        padding: 5px;
-        transition: all 0.3s ease;
+        flex-direction: column;
+        gap: 2px;
 
-        &.clickable {
-            cursor: pointer;
+        .token-target-container {
+            display: flex;
+            align-items: center;
+            gap: 13px;
+            border-radius: 6px;
+            padding: 0 2px;
+            border-radius: 6px;
+            background: transparent;
+            transition: all 0.3s ease;
+            padding: 5px;
+            transition: all 0.3s ease;
 
-            &:hover {
-                background: @golden-10;
+            &.clickable {
+                cursor: pointer;
+
+                &:hover {
+                    background: @golden-10;
+                }
+            }
+
+            img {
+                width: 40px;
+                height: 40px;
+                border-radius: 50%;
+                pointer-events: none;
+            }
+
+            .title {
+                font-size: var(--font-size-20);
+                color: @golden;
+                font-weight: 700;
+                margin: 0;
+                pointer-events: none;
             }
         }
 
-        img {
-            width: 40px;
-            height: 40px;
-            border-radius: 50%;
-            pointer-events: none;
-        }
-
-        .title {
-            font-size: var(--font-size-20);
-            color: @golden;
-            font-weight: 700;
-            margin: 0;
-            pointer-events: none;
+        .token-target-immunity {
+            white-space: nowrap;
+            font-style: italic;
+            font-size: 8px;
+            padding: 0 5px;
         }
     }
 

templates/dialogs/damageReduction.hbs

@@ -71,12 +71,20 @@
         </div>
     {{/each}}
 
-    {{#if thresholdImmunities}}
-    <div class="resources-container">
-        <div class="resource-container">
-            <h4 class="armor-title">{{localize "DAGGERHEART.APPLICATIONS.DamageReduction.thresholdImmunities"}}</h4>
+    {{#if reduceSeverity}}
+        <div class="resources-container">
+            <div class="resource-container">
+                <h4 class="armor-title">{{localize "DAGGERHEART.APPLICATIONS.DamageReduction.reduceSeverity" nr=reduceSeverity}}</h4>
+            </div>
+        </div>
+    {{/if}}
+
+    {{#if thresholdImmunities}}
+        <div class="resources-container">
+            <div class="resource-container">
+                <h4 class="armor-title">{{localize "DAGGERHEART.APPLICATIONS.DamageReduction.thresholdImmunities"}}</h4>
+            </div>
         </div>
-    </div>
     {{/if}}
 
     {{#each thresholdImmunities as | immunity key |}}

templates/hud/tokenHUD.hbs

@@ -46,7 +46,12 @@
     </button>
     <div class="palette status-effects" data-palette="effects">
         {{#each systemStatusEffects as |status|}}
-            <img class="effect-control {{status.cssClass}}" src="{{status.src}}" data-action="effect" data-status-id="{{status.id}}" {{#if status.title}}data-tooltip-text="{{status.title}}"{{/if}}>
+            <div class="effect-control-container" {{#if status.disabled}}data-tooltip="{{localize "DAGGERHEART.UI.Tooltip.immune"}}"{{/if}}>
+                <img class="effect-control {{status.cssClass}} {{#if status.disabled}}disabled{{/if}}" src="{{status.src}}" data-action="effect" data-status-id="{{status.id}}" {{#if status.title}}data-tooltip-text="{{status.title}}"{{/if}}>
+                {{#if status.disabled}}
+                    <span class="effect-control-disabled-marker">/</span>
+                {{/if}}
+            </div>
         {{/each}}
         {{#if genericStatusEffects}}
             <label class="palette-category-title">{{localize "DAGGERHEART.APPLICATIONS.HUD.tokenHUD.genericEffects"}}</label>

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

@@ -56,7 +56,7 @@ Parameters:
     </div>
 
     {{!-- Simple Resource --}}
-    {{#if (and (not hideResources) (eq item.system.resource.type 'simple'))}}
+    {{#if (and (not hideResources) (not (eq item.system.resource.type 'diceValue')))}}
     {{> "systems/daggerheart/templates/sheets/global/partials/item-resource.hbs"}}
     {{/if}}
     {{#if (and (not hideResources) (gte item.system.quantity 0))}}

templates/sheets/global/partials/item-resource.hbs

@@ -3,7 +3,7 @@
         <i class="{{#if item.system.resource.icon}}{{item.system.resource.icon}}{{else}}fa-solid fa-hashtag{{/if}}"></i>
         <input type="number" class="inventory-item-resource" value="{{item.system.resource.value}}" min="0" max="{{rollParsed item.system.resource.max item.actor item true}}" />
     </div>
-{{else}}
+{{else if (eq item.system.resource.type 'diceValue')}}
     <div class="item-resources">
         {{#times (rollParsed item.system.resource.max item.parent item numerical=true)}}
             {{#with (ifThen (lookup ../item.system.resource.diceStates this) (lookup ../item.system.resource.diceStates this) this) as | state |}}
@@ -18,4 +18,11 @@
         {{/times}}
         <a data-action="handleResourceDice" data-tooltip="DAGGERHEART.APPLICATIONS.ResourceDice.rerollDice"><i class="fa-solid fa-dice resource-edit"></i></a>
     </div>
+{{else if (eq item.system.resource.type 'die')}}
+    <a class="item-resource die" data-action="advanceResourceDie">
+        <div class="item-dice-resource">
+            <label>{{#if item.system.resource.value}}{{item.system.resource.value}}{{/if}}</label>
+            <img src="{{concat "systems/daggerheart/assets/icons/dice/hope/" item.system.resource.dieFaces ".svg"}}" />
+        </div>
+    </a>
 {{/if}}

templates/sheets/global/partials/resource-section.hbs

@@ -1,33 +0,0 @@
-<fieldset>
-    <legend>
-        {{localize "DAGGERHEART.GENERAL.Resource.single"}} 
-        {{#unless source.system.resource}}
-            <a data-action="addResource"><i class="fa-solid fa-plus icon-button"></i></a>
-        {{else}}
-            <a data-action="removeResource"><i class="fa-solid fa-trash"></i></a>
-        {{/unless}}
-    </legend>
-
-    {{#if source.system.resource}}
-        <div class="{{#if (eq source.system.resource.type 'simple')}}nest-inputs{{else}}two-columns{{/if}} even">
-            {{formGroup systemFields.resource.fields.type value=source.system.resource.type localize=true blank=false}}
-            {{formGroup systemFields.resource.fields.recovery value=source.system.resource.recovery localize=true}}
-
-            {{#if (eq source.system.resource.type 'simple')}}
-                {{formGroup systemFields.resource.fields.progression value=source.system.resource.progression localize=true}}
-            {{/if}}
-        </div>
-
-            <div class="two-columns even">
-                {{#if (eq source.system.resource.type 'simple')}}
-                    {{formGroup systemFields.resource.fields.value value=source.system.resource.value localize=true}}
-                    {{formGroup systemFields.resource.fields.max value=source.system.resource.max localize=true}}
-                {{else}}
-                    {{formGroup systemFields.resource.fields.dieFaces value=source.system.resource.dieFaces localize=true blank=false}}
-                    {{formGroup systemFields.resource.fields.max value=source.system.resource.max label="DAGGERHEART.GENERAL.amount" localize=true}}
-                {{/if}}
-            </div>
-
-        {{#if (eq source.system.resource.type 'simple')}}{{formGroup systemFields.resource.fields.icon value=source.system.resource.icon localize=true placeholder="fa-solid fa-hashtag"}}{{/if}}
-    {{/if}}
-</fieldset>

templates/sheets/global/partials/resource-section/dice-value.hbs

@@ -0,0 +1,11 @@
+ <span>
+    <div class="two-columns even">
+        {{formGroup systemFields.resource.fields.type value=source.system.resource.type localize=true blank=false}}
+        {{formGroup systemFields.resource.fields.recovery value=source.system.resource.recovery localize=true}}
+    </div>
+
+    <div class="two-columns even">
+        {{formGroup systemFields.resource.fields.dieFaces value=source.system.resource.dieFaces localize=true blank=false}}
+        {{formGroup systemFields.resource.fields.max value=source.system.resource.max label="DAGGERHEART.GENERAL.amount" localize=true}}
+    </div>
+</span>

templates/sheets/global/partials/resource-section/die.hbs

@@ -0,0 +1,6 @@
+ <span>
+    <div class="two-columns even">
+        {{formGroup systemFields.resource.fields.type value=source.system.resource.type localize=true blank=false}}
+        {{formGroup systemFields.resource.fields.dieFaces value=source.system.resource.dieFaces localize=true blank=false}}
+    </div>
+</span>

templates/sheets/global/partials/resource-section/resource-section.hbs

@@ -0,0 +1,20 @@
+<fieldset>
+    <legend>
+        {{localize "DAGGERHEART.GENERAL.Resource.single"}} 
+        {{#unless source.system.resource}}
+            <a data-action="addResource"><i class="fa-solid fa-plus icon-button"></i></a>
+        {{else}}
+            <a data-action="removeResource"><i class="fa-solid fa-trash"></i></a>
+        {{/unless}}
+    </legend>
+
+    {{#if source.system.resource}}
+        {{#if (eq source.system.resource.type 'simple')}}
+            {{> "systems/daggerheart/templates/sheets/global/partials/resource-section/simple.hbs"}}
+        {{else if (eq source.system.resource.type 'diceValue')}}
+            {{> "systems/daggerheart/templates/sheets/global/partials/resource-section/dice-value.hbs"}}
+        {{else}}
+            {{> "systems/daggerheart/templates/sheets/global/partials/resource-section/die.hbs"}}
+        {{/if}}
+    {{/if}}
+</fieldset>

templates/sheets/global/partials/resource-section/simple.hbs

@@ -0,0 +1,14 @@
+ <span>
+    <div class="nest-inputs even">
+        {{formGroup systemFields.resource.fields.type value=source.system.resource.type localize=true blank=false}}
+        {{formGroup systemFields.resource.fields.recovery value=source.system.resource.recovery localize=true}}
+        {{formGroup systemFields.resource.fields.progression value=source.system.resource.progression localize=true}}
+    </div>
+
+    <div class="two-columns even">
+        {{formGroup systemFields.resource.fields.value value=source.system.resource.value localize=true}}
+        {{formGroup systemFields.resource.fields.max value=source.system.resource.max localize=true}}
+    </div>
+
+    {{formGroup systemFields.resource.fields.icon value=source.system.resource.icon localize=true placeholder="fa-solid fa-hashtag"}}
+</span>

templates/sheets/items/domainCard/settings.hbs

@@ -16,5 +16,5 @@
         {{formField systemFields.recallCost value=source.system.recallCost data-dtype="Number"}}
     </fieldset>
 
-    {{> "systems/daggerheart/templates/sheets/global/partials/resource-section.hbs" }}
+    {{> "systems/daggerheart/templates/sheets/global/partials/resource-section/resource-section.hbs" }}
 </section>

templates/sheets/items/feature/settings.hbs

@@ -3,5 +3,5 @@
     data-tab='{{tabs.settings.id}}'
     data-group='{{tabs.settings.group}}'
 >
-    {{> "systems/daggerheart/templates/sheets/global/partials/resource-section.hbs" }}
+    {{> "systems/daggerheart/templates/sheets/global/partials/resource-section/resource-section.hbs" }}
 </section>

templates/ui/chat/effectSummary.hbs

@@ -23,9 +23,14 @@
         </div>
         <div class="targets-container">
             {{#each targets}}
-                <div class="token-target-container  {{#if this.id}}clickable{{/if}}" data-token="{{this.id}}">
-                    <img src="{{this.texture.src}}" />
-                    <h2 class="title">{{this.name}}</h2>
+                <div class="token-target-outer-container">
+                    <div class="token-target-container  {{#if this.token.id}}clickable{{/if}}" data-token="{{this.token.id}}">
+                        <img src="{{this.token.texture.src}}" />
+                        <h2 class="title">{{this.token.name}}</h2>
+                    </div>
+                    {{#if this.conditionImmunities}}
+                        <span class="token-target-immunity">{{this.conditionImmunities}}</span>
+                    {{/if}}
                 </div>
             {{/each}}
         </div>