v0.1.0

module/helpers/actor-helper.js

@@ -13,8 +13,8 @@ export default class ActorHelpers {
         }, {});
 
         // Remove modifications which are no longer used
-        if (this.object.data?.data?.relationships) {
-            for (let k of Object.keys(this.object.data.data.relationships)) {
+        if (this.object.data?.relationships) {
+            for (let k of Object.keys(this.object.data.relationships)) {
                 if (!relationships.hasOwnProperty(k)) relationships[`-=${k}`] = null;
             }
         }
@@ -36,8 +36,8 @@ export default class ActorHelpers {
         }, {});
 
         // Remove modifications which are no longer used
-        if (this.object.data?.data?.learning) {
-            for (let k of Object.keys(this.object.data.data.learning)) {
+        if (this.object.data?.learning) {
+            for (let k of Object.keys(this.object.data.learning)) {
                 if (!learning.hasOwnProperty(k)) learning[`-=${k}`] = null;
             }
         }

module/helpers/dice-helper.js

@@ -4,11 +4,11 @@ export default class KHDiceRoller {
 
         const roll = new Roll(formula);
 
-        let res = roll.roll();
+        await roll.evaluate();
 
         let rollData = {
             name: "SPELL.COST",
-            res: res,
+            res: roll,
             showFormula: true
         };
 
@@ -37,11 +37,11 @@ export default class KHDiceRoller {
 
         const roll = new Roll(formula);
 
-        let res = roll.roll();
+        await roll.evaluate();
 
         let rollData = {
             name: "ITEM.DAMAGE",
-            res: res,
+            res: roll,
             showFormula: true
         };
 
@@ -68,11 +68,11 @@ export default class KHDiceRoller {
 
         const roll = new Roll(formula);
 
-        let res = roll.roll();
+        await roll.evaluate();
 
         let rollData = {
             name: "ITEM.DEFENCE",
-            res: res,
+            res: roll,
             showFormula: true
         };
 
@@ -93,7 +93,7 @@ export default class KHDiceRoller {
     async rollSkillInChat(skillName, skillValue, showValue, speaker, openclosed, opposite) {
         const roll = new Roll(`1d100`);
 
-        let res = roll.roll();
+        await roll.evaluate();
 
         let computedName = skillName
 
@@ -120,13 +120,13 @@ export default class KHDiceRoller {
 
         let rollData = {
             name: computedName,
-            res: res,
+            res: roll,
             opposite: oppositeValue
         };
 
         if(skillValue > 0) {
-            let oneRes = Math.floor((res.total / 1) % 10);
-            let tenRes = Math.floor((res.total / 10) % 10);
+            let oneRes = Math.floor((roll.total / 1) % 10);
+            let tenRes = Math.floor((roll.total / 10) % 10);
 
             if(openclosed < 0) {
                 rollData.closed = Math.abs(openclosed)
@@ -143,7 +143,7 @@ export default class KHDiceRoller {
                 // roll is opened
                 rollData.success = true
             } else {
-                if (res.total <= skillValue) {
+                if (roll.total <= skillValue) {
                     rollData.success = true
                 } else {
                     rollData.failure = true
@@ -295,7 +295,7 @@ export default class KHDiceRoller {
             totalrolls++
             const roll = new Roll(`1d100`);
 
-            let res = roll.roll();
+            await roll.evaluate();
 
             let skillName = skill.name
             let success = false
@@ -307,7 +307,7 @@ export default class KHDiceRoller {
 
             let rollData2 = {
                 name: skillName,
-                res: res,
+                res: roll,
             };
 
             if(openclosed < 0) {
@@ -319,7 +319,7 @@ export default class KHDiceRoller {
             }
 
             if(skill.value > 0) {
-                let oneRes = Math.floor((res.total / 1) % 10);
+                let oneRes = Math.floor((roll.total / 1) % 10);
                 //let tenRes = Math.floor((res.total / 10) % 10);
 
                 if(openclosed < 0 && oneRes !== 0 && Math.abs(openclosed) >= oneRes) {
@@ -330,7 +330,7 @@ export default class KHDiceRoller {
                     success = true
                     successes++
                 } else {
-                    if (res.total <= skill.value) {
+                    if (roll.total <= skill.value) {
                         success = true
                         successes++
                     } else {
@@ -343,7 +343,7 @@ export default class KHDiceRoller {
                 name: skillName,
                 failure: failure,
                 success: success,
-                result: res,
+                result: roll,
             })
 
             rollData2.success = success

module/helpers/item-helpers.js

@@ -17,8 +17,8 @@ export default class ItemHelpers {
         }, {});
 
         // Remove modifications which are no longer used
-        if (this.object.data?.data?.modifications) {
-            for (let k of Object.keys(this.object.data.data.modifications)) {
+        if (this.object.data?.modifications) {
+            for (let k of Object.keys(this.object.data.modifications)) {
                 if (!modifications.hasOwnProperty(k)) modifications[`-=${k}`] = null;
             }
         }