11.17 changes

CHANGELOG.md

@@ -1,3 +1,9 @@
+## Version 11.17
+
+Fixing a silly mistake that made redirecting rolls no longer work
+
+Added the option to use handlebars when redirecting rolls
+
 ## Version 11.16
 
 Fixed issue when trying to call a requested roll or contested roll when there's no event triggering it.

apps/contestedroll.js

@@ -536,7 +536,7 @@ export class ContestedRoll {
                 if (restart.action.data.usetokens == 'fail' || restart.action.data.usetokens == 'succeed') {
                     result.tokens = result.tokenresults.filter(r => r.passed == (restart.action.data.usetokens == 'succeed'));
                 } else {
-                    result.tokens = result.tokenresults;
+                    result.tokens = duplicate(result.tokenresults);
                 }
                 for (let i = 0; i < result.tokens.length; i++) {
                     result.tokens[i] = await fromUuid(result.tokens[i].uuid);

apps/savingthrow.js

@@ -890,7 +890,7 @@ export class SavingThrow {
                 if (restart.action.data.usetokens == 'fail' || restart.action.data.usetokens == 'succeed') {
                     result.tokens = result.tokenresults.filter(r => r.passed == (restart.action.data.usetokens == 'succeed'));
                 } else {
-                    result.tokens = result.tokenresults;
+                    result.tokens = duplicate(result.tokenresults);
                 }
                 for (let i = 0; i < result.tokens.length; i++) {
                     result.tokens[i] = await fromUuid(result.tokens[i].uuid);

module.json

@@ -1,7 +1,7 @@
 {
   "title": "Monk's TokenBar",
   "description": "Add a bar with all the current player tokens.  Limit movement, roll saving throws, assign XP.",
-  "version": "11.16",
+  "version": "11.17",
   "authors": [
     {
       "name": "IronMonk",
@@ -82,7 +82,7 @@
     "css/tokenbar.css"
   ],
   "url": "https://github.com/ironmonk88/monks-tokenbar",
-  "download": "https://github.com/ironmonk88/monks-tokenbar/archive/11.16.zip",
+  "download": "https://github.com/ironmonk88/monks-tokenbar/archive/11.17.zip",
   "manifest": "https://github.com/ironmonk88/monks-tokenbar/releases/latest/download/module.json",
   "bugs": "https://github.com/ironmonk88/monks-tokenbar/issues",
   "allowBugReporter": true,

monks-tokenbar.js

@@ -1737,13 +1737,15 @@ Hooks.on("setupTileActions", (app) => {
 
             let goto = [];
             if (action.data.failed) {
-                let data = { tokens: await Promise.all((value.tokenresults || []).filter(r => !r.passed).map(async (t) => { return await fromUuid(t.uuid); })), tag: action.data.failed };
+                var failed = await game.MonksActiveTiles.getValue(action.data.failed, args, null, { prop: "" });
+                let data = { tokens: await Promise.all((value.tokenresults || []).filter(r => !r.passed).map(async (t) => { return await fromUuid(t.uuid); })), tag: failed };
                 if (data.tokens.length)
                     goto.push(data);
             }
 
             if (action.data.passed) {
-                let data = { tokens: await Promise.all((value.tokenresults || []).filter(r => r.passed).map(async (t) => { return await fromUuid(t.uuid); })), tag: action.data.passed };
+                var passed = await game.MonksActiveTiles.getValue(action.data.passed, args, null, { prop: "" });
+                let data = { tokens: await Promise.all((value.tokenresults || []).filter(r => r.passed).map(async (t) => { return await fromUuid(t.uuid); })), tag: passed };
                 if (data.tokens.length)
                     goto.push(data);
             }
@@ -1810,7 +1812,7 @@ Hooks.on("setupTileActions", (app) => {
 
             entities = entities.map(e => e.object);
 
-            let xp = game.MonksActiveTiles.getValue(action.data.xp, args);
+            let xp = await game.MonksActiveTiles.getValue(action.data.xp, args);
 
             let assignxp = new AssignXPApp(entities, { xp: xp, reason: action.data.reason, dividexp: action.data.dividexp});
             if (action.data.silent === true) {