From e2f55a8d79f2d73d466ff2912c1c002e48050a39 Mon Sep 17 00:00:00 2001
From: Dapoolp <elcatnet@gmail.com>
Date: Wed, 2 Jul 2025 21:10:49 +0200
Subject: [PATCH] Fix reaction roll

---
 module/applications/roll.mjs                    | 13 +++++++++----
 module/applications/sheets/actors/adversary.mjs |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/module/applications/roll.mjs b/module/applications/roll.mjs
index 0f4502fa..1c89644f 100644
--- a/module/applications/roll.mjs
+++ b/module/applications/roll.mjs
@@ -38,6 +38,7 @@ export class DHRoll extends Roll {
         if (config.dialog.configure !== false) {
             // Open Roll Dialog
             const DialogClass = config.dialog?.class ?? this.DefaultDialog;
+            console.log(roll, config)
             const configDialog = await DialogClass.configure(roll, config, message);
             if (!configDialog) return;
         }
@@ -246,13 +247,15 @@ export class D20Roll extends DHRoll {
     }
 
     applyBaseBonus() {
-        this.options.roll.modifiers = [
+        this.options.roll.modifiers = [];
+        if(!this.options.roll.bonus) return;
+        this.options.roll.modifiers.push(
             {
                 label: 'Bonus to Hit',
                 value: this.options.roll.bonus
                 // value: Roll.replaceFormulaData('@attackBonus', this.data)
             }
-        ];
+        );
     }
 
     static postEvaluate(roll, config = {}) {
@@ -398,12 +401,14 @@ export class DualityRoll extends D20Roll {
     }
 
     applyBaseBonus() {
-        this.options.roll.modifiers = [
+        this.options.roll.modifiers = [];
+        if(!this.options.roll.trait) return;
+        this.options.roll.modifiers.push(
             {
                 label: `DAGGERHEART.Abilities.${this.options.roll.trait}.name`,
                 value: Roll.replaceFormulaData(`@traits.${this.options.roll.trait}.total`, this.data)
             }
-        ];
+        );
     }
 
     static postEvaluate(roll, config = {}) {
diff --git a/module/applications/sheets/actors/adversary.mjs b/module/applications/sheets/actors/adversary.mjs
index a588ba0f..e2f5c978 100644
--- a/module/applications/sheets/actors/adversary.mjs
+++ b/module/applications/sheets/actors/adversary.mjs
@@ -87,7 +87,7 @@ export default class AdversarySheet extends DaggerheartSheet(ActorSheetV2) {
             event: event,
             title: `${this.actor.name} - Reaction Roll`,
             roll: {
-                modifier: null,
+                // modifier: null,
                 type: 'reaction'
             },
             chatMessage: {