Fixed so that formula construction specific to DAMAGE is now only applied to damage.main rather than by applyTo=hitPoints

daggerheart.mjs

@@ -24,7 +24,7 @@ import TokenManager from './module/documents/tokenManager.mjs';
 CONFIG.DH = SYSTEM;
 CONFIG.TextEditor.enrichers.push(...enricherConfig);
 
-CONFIG.Dice.rolls = [BaseRoll, Roll, DHRoll, DualityRoll, D20Roll, DamageRoll, FateRoll];
+CONFIG.Dice.rolls = [Roll = BaseRoll, DHRoll, DualityRoll, D20Roll, DamageRoll, FateRoll];
 CONFIG.Dice.daggerheart = {
     DHRoll: DHRoll,
     DualityRoll: DualityRoll,

module/data/chat-message/actorRoll.mjs

@@ -188,8 +188,8 @@ export default class DHActorRoll extends foundry.abstract.TypeDataModel {
     }
 
     static migrateData(source) {
-        const { main, resources, ...flatDamageKeys } = source.damage;
+        const { main, resources, ...flatDamageKeys } = source.damage ?? {};
-        if (!main && !resources) {
+        if (source.damage && !main && !resources) {
             source.damage.main = null;
             source.damage.resources = {};
 

module/dice/damageRoll.mjs

@@ -150,27 +150,8 @@ export default class DamageRoll extends DHRoll {
         if (!formulaData) return null;
         this.options.isCritical = config.isCritical;
 
-        const isHitpointPart = formulaData.applyTo === CONFIG.DH.GENERAL.healingTypes.hitPoints.id;
         formulaData.roll = new Roll(Roll.replaceFormulaData(formulaData.formula, config.data));
         formulaData.roll.terms = Roll.parse(formulaData.roll.formula, config.data);
-        if (formulaData.applyTo === CONFIG.DH.GENERAL.healingTypes.hitPoints.id) {
-            formulaData.modifiers = this.applyBaseBonus(formulaData);
-            this.addModifiers(formulaData);
-            formulaData.modifiers?.forEach(m => {
-                formulaData.roll.terms.push(...this.formatModifier(m.value));
-            });
-        }
-
-        /* To Remove When Reaction System */
-        if (isDamage && formulaData.applyTo === CONFIG.DH.GENERAL.healingTypes.hitPoints.id) {
-            for (const mod in config.modifiers) {
-                const modifier = config.modifiers[mod];
-                if (
-                    modifier.beforeCrit === true && 
-                    (modifier.enabled || modifier.value)
-                ) modifier.callback(formulaData);
-            }
-        }
 
         if (formulaData.extraFormula) {
             formulaData.roll.terms.push(
@@ -179,28 +160,43 @@ export default class DamageRoll extends DHRoll {
             );
         }
 
-        if (config.damageOptions.groupAttack?.numAttackers > 1 && isHitpointPart) {
-            const damageTypes = [foundry.dice.terms.Die, foundry.dice.terms.NumericTerm];
-            for (const term of formulaData.roll.terms) {
-                if (damageTypes.some(type => term instanceof type)) {
-                    term.number *= config.damageOptions.groupAttack.numAttackers;
-                }
-            }
-        }
-
-        if (config.isCritical && isHitpointPart) {
-            const total = formulaData.roll.dice.reduce((acc, term) => acc + term._faces * term._number, 0);
-            if (total > 0) {
-                formulaData.roll.terms.push(...this.formatModifier(total));
-            }
-        }
-
-        /* To Remove When Reaction System */
         if (isDamage && formulaData.applyTo === CONFIG.DH.GENERAL.healingTypes.hitPoints.id) {
+            formulaData.modifiers = this.applyBaseBonus(formulaData);
+            this.addModifiers(formulaData);
+            formulaData.modifiers?.forEach(m => {
+                formulaData.roll.terms.push(...this.formatModifier(m.value));
+            });
+
+            /* To Remove When Reaction System */
+            for (const mod in config.modifiers) {
+                const modifier = config.modifiers[mod];
+                if (
+                    modifier.beforeCrit === true && 
+                    (modifier.enabled || modifier.value)
+                ) modifier.callback(formulaData);
+            }
+
+            /* To Remove When Reaction System */
             for (const mod in config.modifiers) {
                 const modifier = config.modifiers[mod];
                 if (!modifier.beforeCrit && (modifier.enabled || modifier.value)) modifier.callback(formulaData);
             }
+
+            if (config.damageOptions.groupAttack?.numAttackers > 1) {
+                const damageTypes = [foundry.dice.terms.Die, foundry.dice.terms.NumericTerm];
+                for (const term of formulaData.roll.terms) {
+                    if (damageTypes.some(type => term instanceof type)) {
+                        term.number *= config.damageOptions.groupAttack.numAttackers;
+                    }
+                }
+            }
+
+            if (config.isCritical) {
+                const total = formulaData.roll.dice.reduce((acc, term) => acc + term._faces * term._number, 0);
+                if (total > 0) {
+                    formulaData.roll.terms.push(...this.formatModifier(total));
+                }
+            }
         }
 
         formulaData.roll._formula = this.constructor.getFormula(formulaData.roll.terms);

module/helpers/handlebarsHelper.mjs

@@ -48,9 +48,8 @@ export default class RegisterHandlebarsHelpers {
         return formula;
     }
 
-    static damageSymbols(damageParts) {
+    static damageSymbols(damageData) {
-        const allTypes = [...new Set([...damageParts].flatMap(x => Array.from(x.type)))];
+        const symbols = damageData.type.map(p => CONFIG.DH.GENERAL.damageTypes[p].icon);
-        const symbols = allTypes.map(p => CONFIG.DH.GENERAL.damageTypes[p].icon);
         return new Handlebars.SafeString(Array.from(symbols).map(symbol => `<i class="fa-solid ${symbol}"></i>`));
     }
 

styles/less/dialog/damage-selection/sheet.less

@@ -21,6 +21,7 @@
             font-size: var(--font-size-20);
             color: light-dark(@dark, @beige);
             text-align: center;
+            margin-bottom: -12px;
         }
 
         .bonuses {

templates/dialogs/dice-roll/damageSelection.hbs

@@ -43,25 +43,23 @@
         {{/with}}
     {{/if}}
 
-    <div class="flexcol">
+    {{#unless (empty @root.resourceFormulas)}}
-        {{#unless (empty @root.resourceFormulas)}}
+        <div class="section-header">{{localize "Resource Drain"}}</div>
-            <div class="section-header">{{localize "Resource Drain"}}</div>
+    {{/unless}}
-        {{/unless}}
 
-        {{#each @root.resourceFormulas}}
+    {{#each @root.resourceFormulas}}
-            <div class="damage-formula">
+        <div class="damage-formula">
-                <span class="damage-resource"><b>{{localize "DAGGERHEART.GENERAL.formula"}}:</b> {{roll.formula}}</span>
+            <span class="damage-resource"><b>{{localize "DAGGERHEART.GENERAL.formula"}}:</b> {{roll.formula}}</span>
-                <span class="damage-details">
+            <span class="damage-details">
-                    {{#with (lookup @root.config.GENERAL.healingTypes applyTo)}}
+                {{#with (lookup @root.config.GENERAL.healingTypes applyTo)}}
-                        {{localize label}}
+                    {{localize label}}
-                    {{/with}}
+                {{/with}}
-                </span>
+            </span>
-            </div>
+        </div>
-            <div class="bonuses form-group flexrow">
+        <div class="bonuses form-group flexrow">
-                <input type="text" value="{{extraFormula}}" name={{concat "resourceFormulas." @key ".extraFormula"}} placeholder="{{localize "DAGGERHEART.GENERAL.situationalBonus"}}">
+            <input type="text" value="{{extraFormula}}" name={{concat "resourceFormulas." @key ".extraFormula"}} placeholder="{{localize "DAGGERHEART.GENERAL.situationalBonus"}}">
-            </div>
+        </div>
-        {{/each}}
+    {{/each}}
-    </div>
 
     {{#if damageOptions.groupAttack}}
         <fieldset class="group-attack-container">

templates/ui/tooltip/attack.hbs

@@ -23,7 +23,7 @@
             </div>
         {{/if}}
         <div class="tag">
-            <span>{{{damageFormula attack}}} {{{damageSymbols attack.damage.parts}}}</span>
+            <span>{{{damageFormula attack}}} {{{damageSymbols attack.damage.main}}}</span>
         </div>
     </div>
     {{#if description}}

templates/ui/tooltip/weapon.hbs

@@ -23,7 +23,7 @@
             {{/with}}
         </div>
         <div class="tag">
-          <span>{{{damageFormula item.system.attack}}} {{{damageSymbols item.system.attack.damage.parts}}}</span>
+          <span>{{{damageFormula item.system.attack}}} {{{damageSymbols item.system.attack.damage.main}}}</span>
         </div>
     </div>
     {{#if description}}