Merge pull request #247 from winks-vtt/fix-v11-rolls

Fix rolls in V11 of Foundry

.gitignore

@@ -9,5 +9,10 @@ module/foundry.js
 foundry.js
 foundry_07.js
 
+# foundry
+packs/ship-sheet-instructions/
+
 # OS
-.DS_Store
+.DS_Store
+.gitignore
+

module/coriolis-roll.js

@@ -189,7 +189,7 @@ export async function coriolisRoll(chatOptions, rollData) {
   await roll.evaluate({ async: false });
   await showDiceSoNice(roll, chatOptions.rollMode);
   const result = evaluateCoriolisRoll(rollData, roll);
-  await showChatMessage(chatOptions, result);
+  await showChatMessage(chatOptions, result, roll);
 }
 
 /**
@@ -227,7 +227,7 @@ export async function coriolisPushRoll(chatMessage, origRollData, origRoll) {
 
     await showDiceSoNice(origRoll, chatMessage.rollMode);
     const result = evaluateCoriolisRoll(origRollData, origRoll);
-    await updateChatMessage(chatMessage, result, bonus);
+    await updateChatMessage(chatMessage, result, bonus, origRoll);
     if (origRollData.actorType === "npc") {
       await spendDarknessPoints(1);
     } else {
@@ -295,7 +295,6 @@ export function evaluateCoriolisRoll(rollData, roll) {
     criticalSuccess: successes >= 3,
     failure: isDesparation ? successes < 2 : successes === 0,
     rollData: rollData,
-    roll: roll,
     pushed: rollData.pushed,
   };
 
@@ -326,10 +325,10 @@ function getTotalDice(rollData) {
   return 0;
 }
 
-async function showChatMessage(chatMsgOptions, resultData) {
+async function showChatMessage(chatMsgOptions, resultData, roll) {
   let tooltip = await renderTemplate(
     "systems/yzecoriolis/templates/sidebar/dice-results.html",
-    getTooltipData(resultData)
+    getTooltipData(resultData, roll)
   );
   let chatData = {
     title: getRollTitle(resultData.rollData),
@@ -366,7 +365,7 @@ async function showChatMessage(chatMsgOptions, resultData) {
   else if (chatMsgOptions.rollMode === "selfroll")
     chatMsgOptions["whisper"] = [game.user];
 
-  chatMsgOptions.roll = resultData.roll;
+  chatMsgOptions.roll = roll;
   const html = await renderTemplate(chatMsgOptions.template, chatData);
   chatMsgOptions["content"] = html;
   const msg = await ChatMessage.create(chatMsgOptions, false);
@@ -375,10 +374,15 @@ async function showChatMessage(chatMsgOptions, resultData) {
   return msg;
 }
 
-async function updateChatMessage(chatMessage, resultData, prayerBonus) {
+async function updateChatMessage(
+  chatMessage,
+  resultData,
+  prayerBonus,
+  origRoll
+) {
   let tooltip = await renderTemplate(
     "systems/yzecoriolis/templates/sidebar/dice-results.html",
-    getTooltipData(resultData)
+    getTooltipData(resultData, origRoll)
   );
   let chatData = {
     title: getRollTitle(resultData.rollData),
@@ -434,13 +438,13 @@ function getRollIconKey(rollData) {
   return icon ? CONFIG.YZECORIOLIS.icons[icon] : "";
 }
 
-function getTooltipData(results) {
+function getTooltipData(results, roll) {
   const rollData = {
-    formula: results.roll.formula,
+    formula: roll.formula,
     total: results.successes,
   };
   // Prepare dice parts
-  rollData["parts"] = results.roll.dice.map((d) => {
+  rollData["parts"] = roll.dice.map((d) => {
     let maxRoll = CONFIG.YZECORIOLIS.maxRoll;
     // Generate tooltip data
     return {
@@ -553,7 +557,8 @@ export async function coriolisChatListeners(html) {
       messageId = button.parents(".message").attr("data-message-id"),
       message = game.messages.get(messageId);
     let results = message.getFlag("yzecoriolis", "results");
-    coriolisPushRoll(message, results.rollData, message.roll);
+    let originalRoll = message.rolls[0]; // TODO: handle this in a safer manner.
+    coriolisPushRoll(message, results.rollData, originalRoll);
   });
 }
 /**

system.json

@@ -2,10 +2,10 @@
     "name": "yzecoriolis",
     "title": "Coriolis",
     "description": "Coriolis System for Foundry VTT.",
-    "version": "3.3.1",
+    "version": "3.4.0",
     "compatibility": {
         "minimum": "10",
-        "verified": "10"
+        "verified": "11"
     },
     "templateVersion": 2,
     "authors": [