From 1c93f9e6566ddbbd0ccc45cb049218b10f3c9202 Mon Sep 17 00:00:00 2001
From: Dapoolp <elcatnet@gmail.com>
Date: Wed, 27 Aug 2025 01:14:12 +0200
Subject: [PATCH] Fixes

---
 module/applications/dialogs/d20RollDialog.mjs | 7 ++++++-
 module/data/fields/action/damageField.mjs     | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/module/applications/dialogs/d20RollDialog.mjs b/module/applications/dialogs/d20RollDialog.mjs
index 2546e127..ed8fd6a1 100644
--- a/module/applications/dialogs/d20RollDialog.mjs
+++ b/module/applications/dialogs/d20RollDialog.mjs
@@ -141,7 +141,12 @@ export default class D20RollDialog extends HandlebarsApplicationMixin(Applicatio
                 this.roll[key] = value;
             });
         }
-        if(rest.hasOwnProperty("trait")) this.config.roll.trait = rest.trait;
+        if(rest.hasOwnProperty("trait")) {
+            this.config.roll.trait = rest.trait;
+            this.config.title = game.i18n.format('DAGGERHEART.UI.Chat.dualityRoll.abilityCheckTitle', {
+                ability: game.i18n.localize(abilities[this.config.roll.trait]?.label)
+            });
+        }
         this.config.extraFormula = rest.extraFormula;
         this.render();
     }
diff --git a/module/data/fields/action/damageField.mjs b/module/data/fields/action/damageField.mjs
index 82b9758c..db43cfb0 100644
--- a/module/data/fields/action/damageField.mjs
+++ b/module/data/fields/action/damageField.mjs
@@ -30,6 +30,7 @@ export default class DamageField extends fields.SchemaField {
      * @param {boolean} [force=false]       If the method should be executed outside of Action workflow, for ChatMessage button for example.
      */
     static async execute(config, messageId = null, force = false) {
+        if(!this.hasDamage && !this.hasHealing) return;
         if((this.hasRoll && DamageField.getAutomation() === CONFIG.DH.SETTINGS.actionAutomationChoices.never.id) && !force) return;
 
         let formulas = this.damage.parts.map(p => ({