From b0a0971d0cf084b5ea6b5ac620a6888b1b798aa4 Mon Sep 17 00:00:00 2001
From: WBHarry <williambjrklund@gmail.com>
Date: Mon, 14 Jul 2025 00:39:51 +0200
Subject: [PATCH] Bugfix for item input to resourceDiceDialog

---
 module/applications/dialogs/resourceDiceDialog.mjs | 9 ++++++---
 styles/less/dialog/resource-dice/sheet.less        | 2 ++
 templates/dialogs/dice-roll/resourceDice.hbs       | 4 ++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/module/applications/dialogs/resourceDiceDialog.mjs b/module/applications/dialogs/resourceDiceDialog.mjs
index c296c803..b79ff895 100644
--- a/module/applications/dialogs/resourceDiceDialog.mjs
+++ b/module/applications/dialogs/resourceDiceDialog.mjs
@@ -1,3 +1,5 @@
+import { itemAbleRollParse } from '../../helpers/utils.mjs';
+
 const { ApplicationV2, HandlebarsApplicationMixin } = foundry.applications.api;
 
 export default class ResourceDiceDialog extends HandlebarsApplicationMixin(ApplicationV2) {
@@ -50,7 +52,7 @@ export default class ResourceDiceDialog extends HandlebarsApplicationMixin(Appli
     static async updateResourceDice(event, _, formData) {
         const { diceStates } = foundry.utils.expandObject(formData.object);
         this.diceStates = Object.keys(diceStates).reduce((acc, key) => {
-            const resourceState = this.resource.diceStates[key];
+            const resourceState = this.item.system.resource.diceStates[key];
             acc[key] = { ...diceStates[key], used: Boolean(resourceState?.used) };
             return acc;
         }, {});
@@ -64,7 +66,8 @@ export default class ResourceDiceDialog extends HandlebarsApplicationMixin(Appli
     }
 
     static async rerollDice() {
-        const diceFormula = `${this.resource.max}d${this.resource.dieFaces}`;
+        const max = itemAbleRollParse(this.item.system.resource.max, this.actor, this.item);
+        const diceFormula = `${max}d${this.item.system.resource.dieFaces}`;
         const roll = await new Roll(diceFormula).evaluate();
         if (game.modules.get('dice-so-nice')?.active) await game.dice3d.showForRoll(roll, game.user, true);
         this.rollValues = roll.terms[0].results.map(x => ({ value: x.result, used: false }));
@@ -77,7 +80,7 @@ export default class ResourceDiceDialog extends HandlebarsApplicationMixin(Appli
                 'systems/daggerheart/templates/ui/chat/resource-roll.hbs',
                 {
                     user: this.actor.name,
-                    name: this.name
+                    name: this.item.name
                 }
             )
         });
diff --git a/styles/less/dialog/resource-dice/sheet.less b/styles/less/dialog/resource-dice/sheet.less
index 62f9ca24..7ddb53ca 100644
--- a/styles/less/dialog/resource-dice/sheet.less
+++ b/styles/less/dialog/resource-dice/sheet.less
@@ -17,6 +17,7 @@
 
     .resource-items {
         display: flex;
+        justify-content: center;
         gap: 8px;
 
         .resource-item {
@@ -51,6 +52,7 @@
 
         button {
             flex: 1;
+            white-space: nowrap;
         }
     }
 }
diff --git a/templates/dialogs/dice-roll/resourceDice.hbs b/templates/dialogs/dice-roll/resourceDice.hbs
index 1063b66a..1b4976d4 100644
--- a/templates/dialogs/dice-roll/resourceDice.hbs
+++ b/templates/dialogs/dice-roll/resourceDice.hbs
@@ -1,10 +1,10 @@
 <div>
     <div class="resource-items">
-        {{#times (rollParsed item.resource.max actor item numerical=true)}}
+        {{#times (rollParsed item.system.resource.max actor item numerical=true)}}
             {{#with (ifThen (lookup ../diceStates this) (lookup ../diceStates this) this) as | state |}}
                 <div class="resource-item" data-dice="{{#if ../../this}}{{../this}}{{else}}{{state}}{{/if}}">
                     <input type="number" data-dtype="Number" name={{concat "diceStates." (ifThen ../../this ../this state) ".value" }} value="{{state.value}}" />
-                    <img src="{{concat "systems/daggerheart/assets/icons/dice/hope/d" (ifThen ../../item.resource.dieFaces ../../item.resource.dieFaces ../item.resource.dieFaces) ".svg"}}" />
+                    <img src="{{concat "systems/daggerheart/assets/icons/dice/hope/d" (ifThen ../../item.system.resource.dieFaces ../../item.system.resource.dieFaces ../item.system.resource.dieFaces) ".svg"}}" />
                 </div>
             {{/with}}
         {{/times}}