From 8fc44912facb0abe3173056f14a26605d9f19a34 Mon Sep 17 00:00:00 2001
From: Apewall <1915182+apewall@users.noreply.github.com>
Date: Thu, 18 Jan 2024 15:03:11 -0600
Subject: [PATCH 1/5] Get spell dice rolling

---
 src/module/helpers-dice.js          |  1 +
 src/module/item/entity.js           | 31 ++++++++++++++++++++---------
 src/templates/chat/roll-result.html | 20 +++++++++++++++++--
 3 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/src/module/helpers-dice.js b/src/module/helpers-dice.js
index effb09b0..7837e9c9 100644
--- a/src/module/helpers-dice.js
+++ b/src/module/helpers-dice.js
@@ -24,6 +24,7 @@ const OseDice = {
       title,
       flavor,
       data,
+      config: CONFIG.OSE,
     };
 
     // Optionally include a situational bonus
diff --git a/src/module/item/entity.js b/src/module/item/entity.js
index e850a073..f4baeca3 100644
--- a/src/module/item/entity.js
+++ b/src/module/item/entity.js
@@ -138,32 +138,40 @@ export default class OseItem extends Item {
   }
 
   async rollFormula(options = {}) {
-    const data = this.system;
+    const itemData = this.system;
 
-    if (!data.roll) {
+    if (!itemData.roll) {
       throw new Error("This Item does not have a formula to roll!");
     }
 
     const label = `${this.name}`;
-    const rollParts = [data.roll];
+    const rollParts = [itemData.roll];
 
-    const type = data.rollType;
+    const type = itemData.rollType;
 
-    const newData = {
+    const rollData = {
       actor: this.actor,
       item: this._source,
+      description: null,
+      save: itemData.save,
+      properties: this.system.autoTags,
       roll: {
         type,
-        target: data.rollTarget,
-        blindroll: data.blindroll,
+        target: itemData.rollTarget,
+        blindroll: itemData.blindroll,
+        save: itemData.save,
       },
     };
 
+    if (this.type === "spell") {
+      rollData.description = itemData.description
+    };
+
     // Roll and return
     return OseDice.Roll({
       event: options.event,
       parts: rollParts,
-      data: newData,
+      data: rollData,
       skipDialog: true,
       speaker: ChatMessage.getSpeaker({ actor: this }),
       flavor: game.i18n.format("OSE.roll.formula", { label }),
@@ -183,7 +191,12 @@ export default class OseItem extends Item {
         cast: itemData.cast - 1,
       },
     });
-    await this.show({ skipDialog: true });
+
+    if (itemData.roll) {
+      await this.rollFormula()
+    } else {
+      await this.show({ skipDialog: true })
+    };
   }
 
   _getRollTag(data) {
diff --git a/src/templates/chat/roll-result.html b/src/templates/chat/roll-result.html
index efe8863a..66ce1fe1 100644
--- a/src/templates/chat/roll-result.html
+++ b/src/templates/chat/roll-result.html
@@ -1,4 +1,5 @@
-<section class="ose chat-card">
+<div class="ose chat-card" data-actor-id="{{data.actor._id}}" data-item-id="{{data.item._id}}"
+    {{#if tokenId}}data-token-id="{{tokenId}}" {{/if}}>
     <div class="ose chat-block">
         <div class="flexrow chat-header">
             <div class="chat-title"><h2>{{title}}</h2></div>
@@ -8,6 +9,9 @@
             <div class="chat-img" style="background-image:url('{{data.actor.img}}')"></div>
             {{/if}}
         </div>
+        <div class="card-content">
+            {{{data.description}}}
+        </div>
         <div class="blindable" data-blind="{{data.roll.blindroll}}">
             {{#if result.details}}<div class="chat-details">{{{result.details}}}</div>{{/if}}
             {{#if result.isFailure}}<div class='roll-result roll-fail'><b>{{localize 'OSE.Failure'}}</b> ({{result.target}})
@@ -15,6 +19,18 @@
             {{#if result.isSuccess}}<div class='roll-result roll-success'><b>{{localize 'OSE.Success'}}</b>
                 ({{result.target}})</div>{{/if}}
             {{#if rollOSE}}<div>{{{rollOSE}}}</div>{{/if}}
+            <div class="card-buttons">
+                {{#if data.save}}
+                <button data-action="save" data-save="{{data.save}}">
+                    {{lookup config.saves_long data.save}} - {{localize "OSE.spells.Save"}}
+                </button>
+                {{/if}}
+            </div>
         </div>
+        <footer class="card-footer">
+            {{#each data.properties}}
+            <span>{{#if this.icon}}<i class="fas {{this.icon}}"></i>{{/if}}{{this.label}}</span>
+            {{/each}}
+        </footer>
     </div>
-</section>
\ No newline at end of file
+</div>

From 637ae2652594315297d14d61fde24eb3d019d5d3 Mon Sep 17 00:00:00 2001
From: Apewall <1915182+apewall@users.noreply.github.com>
Date: Thu, 8 Feb 2024 20:06:36 -0600
Subject: [PATCH 2/5] Only include button template when saves exist

---
 src/templates/chat/roll-result.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/templates/chat/roll-result.html b/src/templates/chat/roll-result.html
index 66ce1fe1..6c614cff 100644
--- a/src/templates/chat/roll-result.html
+++ b/src/templates/chat/roll-result.html
@@ -19,13 +19,13 @@
             {{#if result.isSuccess}}<div class='roll-result roll-success'><b>{{localize 'OSE.Success'}}</b>
                 ({{result.target}})</div>{{/if}}
             {{#if rollOSE}}<div>{{{rollOSE}}}</div>{{/if}}
+            {{#if data.save}}
             <div class="card-buttons">
-                {{#if data.save}}
                 <button data-action="save" data-save="{{data.save}}">
                     {{lookup config.saves_long data.save}} - {{localize "OSE.spells.Save"}}
                 </button>
-                {{/if}}
             </div>
+            {{/if}}
         </div>
         <footer class="card-footer">
             {{#each data.properties}}

From fe5e550c333f9e90192ed27a1f1f82c0983b9d10 Mon Sep 17 00:00:00 2001
From: Apewall <1915182+apewall@users.noreply.github.com>
Date: Wed, 14 Feb 2024 20:19:56 -0600
Subject: [PATCH 3/5] Update display order on item cards to match roll results

---
 src/templates/chat/item-card.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/templates/chat/item-card.html b/src/templates/chat/item-card.html
index 17270324..ba900c38 100644
--- a/src/templates/chat/item-card.html
+++ b/src/templates/chat/item-card.html
@@ -25,16 +25,16 @@ <h2>{{item.name}}</h2>
             </button>
             {{/if}}
 
+            {{#if data.roll}}
+            <button data-action="formula">{{ localize "OSE.Roll"}} {{data.roll}} {{#if data.blindroll}}({{localize
+                'OSE.items.BlindRoll'}}){{/if}}</button>
+            {{/if}}
+
             {{#if data.save}}
             <button data-action="save" data-save="{{data.save}}">
                 {{lookup config.saves_long data.save}} - {{localize "OSE.spells.Save"}}
             </button>
             {{/if}}
-
-            {{#if data.roll}}
-            <button data-action="formula">{{ localize "OSE.Roll"}} {{data.roll}} {{#if data.blindroll}}({{localize
-                'OSE.items.BlindRoll'}}){{/if}}</button>
-            {{/if}}
         </div>
 
         <footer class="card-footer">
@@ -44,4 +44,4 @@ <h2>{{item.name}}</h2>
         </footer>
     </div>
 
-</div>
\ No newline at end of file
+</div>

From a63e2d681c06c758257605ad2ea2c85b63d26b72 Mon Sep 17 00:00:00 2001
From: Apewall <1915182+apewall@users.noreply.github.com>
Date: Wed, 14 Feb 2024 20:44:44 -0600
Subject: [PATCH 4/5] Remove erroneous save data from roll data

---
 src/module/item/entity.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/module/item/entity.js b/src/module/item/entity.js
index f4baeca3..9c5c5cb7 100644
--- a/src/module/item/entity.js
+++ b/src/module/item/entity.js
@@ -159,7 +159,6 @@ export default class OseItem extends Item {
         type,
         target: itemData.rollTarget,
         blindroll: itemData.blindroll,
-        save: itemData.save,
       },
     };
 

From 4e2f09471684b404ed3c1868ff15b82f804c4b41 Mon Sep 17 00:00:00 2001
From: Apewall <1915182+apewall@users.noreply.github.com>
Date: Fri, 16 Feb 2024 17:05:28 -0600
Subject: [PATCH 5/5] Construct roll formula on chat card buttons

---
 src/module/item/entity.js         | 6 +++---
 src/templates/chat/item-card.html | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/module/item/entity.js b/src/module/item/entity.js
index 9c5c5cb7..087d3566 100644
--- a/src/module/item/entity.js
+++ b/src/module/item/entity.js
@@ -200,9 +200,8 @@ export default class OseItem extends Item {
 
   _getRollTag(data) {
     if (data.roll) {
-      const roll = `${data.roll}${
-        data.rollTarget ? CONFIG.OSE.roll_type[data.rollType] : ""
-      }${data.rollTarget ? data.rollTarget : ""}`;
+      const roll = `${data.roll}${data.rollTarget ? CONFIG.OSE.roll_type[data.rollType] : ""
+        }${data.rollTarget ? data.rollTarget : ""}`;
       return {
         label: `${game.i18n.localize("OSE.items.Roll")} ${roll}`,
       };
@@ -390,6 +389,7 @@ export default class OseItem extends Item {
       hasSave: this.hasSave,
       config: CONFIG.OSE,
     };
+    templateData.rollFormula = new Roll(templateData.data.roll, templateData).formula;
     templateData.data.properties = this.system.autoTags;
 
     // Render the chat card template
diff --git a/src/templates/chat/item-card.html b/src/templates/chat/item-card.html
index ba900c38..3caa352a 100644
--- a/src/templates/chat/item-card.html
+++ b/src/templates/chat/item-card.html
@@ -26,7 +26,7 @@ <h2>{{item.name}}</h2>
             {{/if}}
 
             {{#if data.roll}}
-            <button data-action="formula">{{ localize "OSE.Roll"}} {{data.roll}} {{#if data.blindroll}}({{localize
+            <button data-action="formula">{{ localize "OSE.Roll"}} {{rollFormula}} {{#if data.blindroll}}({{localize
                 'OSE.items.BlindRoll'}}){{/if}}</button>
             {{/if}}