Fix damage & healing roll

module/data/action/baseAction.mjs

@@ -1,6 +1,7 @@
 import DhpActor from '../../documents/actor.mjs';
 import D20RollDialog from '../../applications/dialogs/d20RollDialog.mjs';
 import { ActionMixin } from '../fields/actionField.mjs';
+import { abilities } from '../../config/actorConfig.mjs';
 
 const fields = foundry.data.fields;
 
@@ -157,22 +158,26 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
     prepareConfig(event) {
         return {
             event,
-            title: this.item.name,
+            title: `${this.item.name}: ${this.name}`,
             source: {
                 item: this.item._id,
                 action: this._id,
                 actor: this.actor.uuid
             },
-            dialog: {},
+            dialog: {
+                configure: this.hasRoll
+            },
             type: this.type,
             hasRoll: this.hasRoll,
             hasDamage: this.damage?.parts?.length && this.type !== 'healing',
             hasHealing: this.damage?.parts?.length && this.type === 'healing',
             hasEffect: !!this.effects?.length,
             hasSave: this.hasSave,
+            hasTarget: true,
             selectedRollMode: game.settings.get('core', 'rollMode'),
             isFastForward: event.shiftKey,
-            data: this.getRollData()
+            data: this.getRollData(),
+            evaluate: this.hasRoll
         };
     }
 
@@ -189,7 +194,9 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
             formula: this.roll.getFormula(),
             advantage: CONFIG.DH.ACTIONS.advantageState[this.roll.advState].value
         };
-        if (this.roll?.type === 'diceSet') roll.lite = true;
+        if (this.roll?.type === 'diceSet'
+             || !this.hasRoll
+            ) roll.lite = true;
 
         return roll;
     }
@@ -293,19 +300,27 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
     /* SAVE */
     async rollSave(actor, event, message) {
         if (!actor) return;
+        const title = actor.isNPC
+            ? game.i18n.localize('DAGGERHEART.GENERAL.reactionRoll')
+            : game.i18n.format('DAGGERHEART.UI.Chat.dualityRoll.abilityCheckTitle', {
+                ability: game.i18n.localize(abilities[this.save.trait]?.label)
+            });
         return actor.diceRoll({
             event,
-            title: 'Roll Save',
+            title,
             roll: {
                 trait: this.save.trait,
                 difficulty: this.save.difficulty ?? this.actor?.baseSaveDifficulty,
                 type: 'reaction'
             },
+            type: 'trait',
+            hasRoll: true,
             data: actor.getRollData()
         });
     }
 
     updateSaveMessage(result, message, targetId) {
+        if(!result) return;
         const updateMsg = this.updateChatMessage.bind(this, message, targetId, {
             result: result.roll.total,
             success: result.roll.success

module/data/action/damageAction.mjs

@@ -34,6 +34,7 @@ export default class DHDamageAction extends DHBaseAction {
     }
 
     async rollDamage(event, data) {
+        // console.log(data)
         const systemData = data.system ?? data;
 
         let formulas = this.damage.parts.map(p => ({
@@ -46,6 +47,36 @@ export default class DHDamageAction extends DHBaseAction {
 
         formulas = this.formatFormulas(formulas, systemData);
 
+        delete systemData.evaluate;
+        systemData.targets.forEach(t => t.hit = true);
+        const config = {
+            ...systemData,
+            roll: formulas,
+            dialog: {},
+            data: this.getRollData()
+        }
+        if (this.hasSave) config.onSave = this.save.damageMod;
+        if (data.system) {
+            config.source.message = data._id;
+            config.directDamage = false;
+        } else {
+            config.directDamage = true;
+        }
+
+        return CONFIG.Dice.daggerheart.DamageRoll.build(config);
+
+        /* const systemData = data.system ?? data;
+
+        let formulas = this.damage.parts.map(p => ({
+            formula: this.getFormulaValue(p, data).getFormula(this.actor),
+            damageTypes: p.applyTo === 'hitPoints' && !p.type.size ? new Set(['physical']) : p.type,
+            applyTo: p.applyTo
+        }));
+
+        if (!formulas.length) return;
+
+        formulas = this.formatFormulas(formulas, systemData);
+
         const config = {
             title: game.i18n.format(`DAGGERHEART.UI.Chat.${ this.type === 'healing' ? 'healing' : 'damage'}Roll.title`, { damage: game.i18n.localize(this.name) }),
             roll: formulas,
@@ -53,6 +84,9 @@ export default class DHDamageAction extends DHBaseAction {
             hasSave: this.hasSave,
             isCritical: systemData.roll?.isCritical ?? false,
             isHealing: this.type === 'healing',
+            hasDamage: this.type !== 'healing',
+            hasHealing: this.type === 'healing',
+            hasTarget: true,
             source: systemData.source,
             data: this.getRollData(),
             event
@@ -65,6 +99,6 @@ export default class DHDamageAction extends DHBaseAction {
             config.directDamage = true;
         }
 
-        return CONFIG.Dice.daggerheart.DamageRoll.build(config);
+        return CONFIG.Dice.daggerheart.DamageRoll.build(config); */
     }
 }