diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3538c32..e347b68 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 2.6.9
+- Fix console error when moving token outside of combat
+
# 2.6.8
- Test compatibility with Foundry v0.6.2
- Start marker if enabled will no longer show up until after a token has moved for the first time on it's turn
diff --git a/dist/module.json b/dist/module.json
index 2b31d11..3d17597 100644
--- a/dist/module.json
+++ b/dist/module.json
@@ -3,7 +3,7 @@
"title": "Turn Marker",
"description": "Displays a (optionally animated) marker on the token who's active turn it is.",
"author": "Brunhine",
- "version": "2.6.8",
+ "version": "2.6.9",
"minimumCoreVersion": "0.5.6",
"compatibleCoreVersion": "0.6.2",
"esmodules": [
@@ -35,5 +35,5 @@
],
"url": "https://github.com/Brunhine/TurnMarker",
"manifest": "https://raw.githubusercontent.com/Brunhine/TurnMarker/master/src/module.json",
- "download": "https://github.com/Brunhine/TurnMarker/releases/download/v2.6.8/turnmarker.zip"
+ "download": "https://github.com/Brunhine/TurnMarker/releases/download/v2.6.9/turnmarker.zip"
}
\ No newline at end of file
diff --git a/dist/scripts/turnmarker.js b/dist/scripts/turnmarker.js
index c9b93fb..e8372db 100644
--- a/dist/scripts/turnmarker.js
+++ b/dist/scripts/turnmarker.js
@@ -22,7 +22,7 @@
/*!***********************************!*\
!*** ./src/scripts/turnmarker.js ***!
\***********************************/
-/*! no exports provided */function(e,t,a){"use strict";a.r(t);var s=a(/*! ./chatter.js */"./src/scripts/chatter.js"),n=a(/*! ./marker.js */"./src/scripts/marker.js"),r=a(/*! ./markeranimation.js */"./src/scripts/markeranimation.js"),i=a(/*! ./settings.js */"./src/scripts/settings.js"),o=a(/*! ./updateWindow.js */"./src/scripts/updateWindow.js"),c=a(/*! ./utils.js */"./src/scripts/utils.js");let m,g,d="";Hooks.on("ready",async()=>{i.Settings.registerSettings();let e=canvas.tiles.placeables.find(e=>1==e.data.flags.turnMarker);if(e&&e.id){g=e.id;let t=canvas.tiles.placeables.find(e=>1==e.data.flags.turnMarker);t.zIndex=Math.max(...canvas.tiles.placeables.map(e=>e.zIndex))+1,t.parent.sortChildren(),!game.paused&&i.Settings.getShouldAnimate()&&(m=r.MarkerAnimation.startAnimation(m,g))}game.user.isGM&&isNewerVersion(game.modules.get("turnmarker").data.version,i.Settings.getVersion())&&Object(o.renderUpdateWindow)(),game.socket.on(c.socketName,async e=>{if(game.user.isGM)switch(e.mode){case c.socketAction.placeStartMarker:await canvas.scene.createEmbeddedEntity("Tile",e.tileData),canvas.scene.setFlag(c.FlagScope,c.Flags.startMarkerPlaced,!0)}})}),Hooks.on("createTile",(e,t)=>{1==t.flags.turnMarker&&(g=t._id,(t=canvas.tiles.placeables.find(e=>1==e.data.flags.turnMarker)).zIndex=Math.max(...canvas.tiles.placeables.map(e=>e.zIndex))+1,t.parent.sortChildren(),i.Settings.getShouldAnimate()&&(m=r.MarkerAnimation.startAnimation(m,g)))}),Hooks.on("preUpdateToken",async(e,t)=>{t._id!=game.combat.combatant.token._id||canvas.scene.getFlag(c.FlagScope,c.Flags.startMarkerPlaced)||await n.Marker.placeStartMarker(game.combat.combatant.token._id)}),Hooks.on("updateCombat",async(e,t)=>{if(e.combatant&&t&&d!=e.combatant._id&&game.user.isGM&&game.userId==Object(c.firstGM)()&&(d=e.combatant._id,e&&e.combatant)){let t=canvas.tiles.placeables.find(e=>1==e.data.flags.turnMarker),a=await n.Marker.placeTurnMarker(e.combatant.token._id,t&&t.id||void 0);a&&(g=a.markerId,m=a.animator),i.Settings.getTurnMarkerEnabled()&&(n.Marker.deleteStartMarker(),canvas.scene.unsetFlag(c.FlagScope,c.Flags.startMarkerPlaced)),i.Settings.shouldAnnounceTurns()&&!e.combatant.hidden&&s.Chatter.sendTurnMessage(e.combatant)}}),Hooks.on("deleteCombat",async()=>{game.user.isGM&&n.Marker.clearAllMarkers(),r.MarkerAnimation.stopAnimation(m)}),Hooks.on("updateToken",(e,t,a)=>{let s=canvas.tiles.placeables.find(e=>1==e.data.flags.turnMarker);s&&(a.x||a.y||a.width||a.height||a.hidden)&&game&&game.combat&&game.combat.combatant&&game.combat.combatant.tokenId==t._id&&game.user.isGM&&game.combat&&(n.Marker.moveMarkerToToken(t._id,s.id),s.zIndex=Math.max(...canvas.tiles.placeables.map(e=>e.zIndex))+1,s.parent.sortChildren())}),Hooks.on("updateTile",()=>{if(canvas.scene.data.tokenVision){let e=canvas.tiles.placeables.find(e=>1==e.data.flags.turnMarker);if(e){let t=canvas.tokens.placeables.find(e=>e.id==game.combat.combatant.tokenId);t&&!t.data.hidden&&(e.visible=canvas.sight.testVisibility(t.center,{tolerance:canvas.dimensions.size/4}))}}}),Hooks.on("pauseGame",async e=>{g&&i.Settings.getShouldAnimate()&&(e?r.MarkerAnimation.stopAnimation(m):m=r.MarkerAnimation.startAnimation(m,g))})},"./src/scripts/updateWindow.js":
+/*! no exports provided */function(e,t,a){"use strict";a.r(t);var s=a(/*! ./chatter.js */"./src/scripts/chatter.js"),n=a(/*! ./marker.js */"./src/scripts/marker.js"),r=a(/*! ./markeranimation.js */"./src/scripts/markeranimation.js"),i=a(/*! ./settings.js */"./src/scripts/settings.js"),o=a(/*! ./updateWindow.js */"./src/scripts/updateWindow.js"),m=a(/*! ./utils.js */"./src/scripts/utils.js");let c,g,d="";Hooks.on("ready",async()=>{i.Settings.registerSettings();let e=canvas.tiles.placeables.find(e=>1==e.data.flags.turnMarker);if(e&&e.id){g=e.id;let t=canvas.tiles.placeables.find(e=>1==e.data.flags.turnMarker);t.zIndex=Math.max(...canvas.tiles.placeables.map(e=>e.zIndex))+1,t.parent.sortChildren(),!game.paused&&i.Settings.getShouldAnimate()&&(c=r.MarkerAnimation.startAnimation(c,g))}game.user.isGM&&isNewerVersion(game.modules.get("turnmarker").data.version,i.Settings.getVersion())&&Object(o.renderUpdateWindow)(),game.socket.on(m.socketName,async e=>{if(game.user.isGM)switch(e.mode){case m.socketAction.placeStartMarker:await canvas.scene.createEmbeddedEntity("Tile",e.tileData),canvas.scene.setFlag(m.FlagScope,m.Flags.startMarkerPlaced,!0)}})}),Hooks.on("createTile",(e,t)=>{1==t.flags.turnMarker&&(g=t._id,(t=canvas.tiles.placeables.find(e=>1==e.data.flags.turnMarker)).zIndex=Math.max(...canvas.tiles.placeables.map(e=>e.zIndex))+1,t.parent.sortChildren(),i.Settings.getShouldAnimate()&&(c=r.MarkerAnimation.startAnimation(c,g)))}),Hooks.on("preUpdateToken",async(e,t)=>{game.combat&&(t._id!=game.combat.combatant.token._id||canvas.scene.getFlag(m.FlagScope,m.Flags.startMarkerPlaced)||await n.Marker.placeStartMarker(game.combat.combatant.token._id))}),Hooks.on("updateCombat",async(e,t)=>{if(e.combatant&&t&&d!=e.combatant._id&&game.user.isGM&&game.userId==Object(m.firstGM)()&&(d=e.combatant._id,e&&e.combatant)){let t=canvas.tiles.placeables.find(e=>1==e.data.flags.turnMarker),a=await n.Marker.placeTurnMarker(e.combatant.token._id,t&&t.id||void 0);a&&(g=a.markerId,c=a.animator),i.Settings.getTurnMarkerEnabled()&&(n.Marker.deleteStartMarker(),canvas.scene.unsetFlag(m.FlagScope,m.Flags.startMarkerPlaced)),i.Settings.shouldAnnounceTurns()&&!e.combatant.hidden&&s.Chatter.sendTurnMessage(e.combatant)}}),Hooks.on("deleteCombat",async()=>{game.user.isGM&&n.Marker.clearAllMarkers(),r.MarkerAnimation.stopAnimation(c)}),Hooks.on("updateToken",(e,t,a)=>{let s=canvas.tiles.placeables.find(e=>1==e.data.flags.turnMarker);s&&(a.x||a.y||a.width||a.height||a.hidden)&&game&&game.combat&&game.combat.combatant&&game.combat.combatant.tokenId==t._id&&game.user.isGM&&game.combat&&(n.Marker.moveMarkerToToken(t._id,s.id),s.zIndex=Math.max(...canvas.tiles.placeables.map(e=>e.zIndex))+1,s.parent.sortChildren())}),Hooks.on("updateTile",()=>{if(canvas.scene.data.tokenVision){let e=canvas.tiles.placeables.find(e=>1==e.data.flags.turnMarker);if(e){let t=canvas.tokens.placeables.find(e=>e.id==game.combat.combatant.tokenId);t&&!t.data.hidden&&(e.visible=canvas.sight.testVisibility(t.center,{tolerance:canvas.dimensions.size/4}))}}}),Hooks.on("pauseGame",async e=>{g&&i.Settings.getShouldAnimate()&&(e?r.MarkerAnimation.stopAnimation(c):c=r.MarkerAnimation.startAnimation(c,g))})},"./src/scripts/updateWindow.js":
/*!*************************************!*\
!*** ./src/scripts/updateWindow.js ***!
\*************************************/
@@ -30,5 +30,5 @@
/*!******************************!*\
!*** ./src/scripts/utils.js ***!
\******************************/
-/*! exports provided: modName, FlagScope, Flags, socketName, socketAction, findTokenById, firstGM */function(e,t,a){"use strict";a.r(t),a.d(t,"modName",(function(){return s})),a.d(t,"FlagScope",(function(){return n})),a.d(t,"Flags",(function(){return r})),a.d(t,"socketName",(function(){return i})),a.d(t,"socketAction",(function(){return o})),a.d(t,"findTokenById",(function(){return c})),a.d(t,"firstGM",(function(){return m}));const s="turnmarker",n="turnmarker",r={startMarkerPlaced:"startMarkerPlaced"},i="module.turnmarker",o={placeStartMarker:0};function c(e){return canvas.tokens.ownedTokens.find(t=>t.id==e)}function m(){for(let e of game.users.entities)if(e.data.role>=4&&e.active)return e.data._id}}});
+/*! exports provided: modName, FlagScope, Flags, socketName, socketAction, findTokenById, firstGM */function(e,t,a){"use strict";a.r(t),a.d(t,"modName",(function(){return s})),a.d(t,"FlagScope",(function(){return n})),a.d(t,"Flags",(function(){return r})),a.d(t,"socketName",(function(){return i})),a.d(t,"socketAction",(function(){return o})),a.d(t,"findTokenById",(function(){return m})),a.d(t,"firstGM",(function(){return c}));const s="turnmarker",n="turnmarker",r={startMarkerPlaced:"startMarkerPlaced"},i="module.turnmarker",o={placeStartMarker:0};function m(e){return canvas.tokens.ownedTokens.find(t=>t.id==e)}function c(){for(let e of game.users.entities)if(e.data.role>=4&&e.active)return e.data._id}}});
//# sourceMappingURL=turnmarker.js.map
\ No newline at end of file
diff --git a/dist/scripts/turnmarker.js.map b/dist/scripts/turnmarker.js.map
index c0e85e9..51d2f96 100644
--- a/dist/scripts/turnmarker.js.map
+++ b/dist/scripts/turnmarker.js.map
@@ -1 +1 @@
-{"version":3,"sources":["webpack:///webpack/bootstrap","webpack:///./src/scripts/chatter.js","webpack:///./src/scripts/marker.js","webpack:///./src/scripts/markeranimation.js","webpack:///./src/scripts/settings.js","webpack:///./src/scripts/settingsForm.js","webpack:///./src/scripts/turnmarker.js","webpack:///./src/scripts/updateWindow.js","webpack:///./src/scripts/utils.js"],"names":["installedModules","__webpack_require__","moduleId","exports","module","i","l","modules","call","m","c","d","name","getter","o","Object","defineProperty","enumerable","get","r","Symbol","toStringTag","value","t","mode","__esModule","ns","create","key","bind","n","object","property","prototype","hasOwnProperty","p","s","Chatter","combatant","players","forEach","player","push","length","ChatMessage","speaker","actor","content","this","placeImage","join","getIncludeAnnounceImage","img","flags","core","thumb","Marker","tokenId","markerId","moveMarkerToToken","clearAllMarkers","getTurnMarkerEnabled","token","dims","getRatio","getImageDimensions","center","getImageLocation","newTile","Tile","getImagePath","width","w","height","h","x","y","z","rotation","hidden","data","locked","turnMarker","canvas","scene","createEmbeddedEntity","_id","tile","getEmbeddedCollection","startMarker","deleteEmbeddedEntity","getStartMarkerEnabled","getStartMarker","game","user","isGM","setFlag","startMarkerPlaced","socket","emit","placeStartMarker","tileData","updateEmbeddedEntity","tiles","placeables","find","id","animator","stopAnimation","ignoreRatio","ratio","newWidth","newHeight","grid","type","newX","newY","MarkerAnimation","tileId","getEmbeddedEntity","animateRotation","app","ticker","add","remove","dt","delta","getInterval","err","imageTitles","Settings","settings","val","set","trim","getImageByIndex","index","registerMenu","label","icon","restricted","register","default","String","scope","hint","config","Number","Boolean","choices","onChange","updateImagePath","videos","SettingsForm","FormApplication","options","super","mergeObject","defaultOptions","title","template","classes","closeOnSubmit","turnMarkerEnabled","image","getSelectList","getImageIndex","customImage","getCustomImagePath","announce","shouldAnnounceTurns","announceImage","startMarkerEnabled","startMarkerPath","getStartMarkerPath","previewPath","e","console","log","setRatio","setImage","setCustomImagePath","setShouldAnnounceTurns","setIncludeAnnounceImage","setTurnMarkerEnabled","setStartMarkerEnabled","setStartMarkerPath","html","activateListeners","markerSelect","markerImgPreview","updatePreview","on","event","attr","target","markerVideoPreview","disabled","removeClass","addClass","ext","getExtension","warn","includes","toLowerCase","filePath","slice","lastIndexOf","array","selected","lastTurn","Hooks","async","registerSettings","marker","zIndex","Math","max","map","parent","sortChildren","paused","getShouldAnimate","startAnimation","isNewerVersion","version","getVersion","combat","getFlag","update","userId","result","placeTurnMarker","undefined","deleteStartMarker","unsetFlag","sendTurnMessage","updateToken","updateData","tokenVision","tokens","visible","sight","testVisibility","tolerance","dimensions","size","isPaused","renderUpdateWindow","UpdateWindow","Application","resizable","ev","setVersion","currentTarget","checked","oldVersion","render","modName","FlagScope","Flags","socketName","socketAction","findTokenById","ownedTokens","firstGM","users","entities","role","active"],"mappings":"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","file":"turnmarker.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, { enumerable: true, get: getter });\n \t\t}\n \t};\n\n \t// define __esModule on exports\n \t__webpack_require__.r = function(exports) {\n \t\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n \t\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n \t\t}\n \t\tObject.defineProperty(exports, '__esModule', { value: true });\n \t};\n\n \t// create a fake namespace object\n \t// mode & 1: value is a module id, require it\n \t// mode & 2: merge all properties of value into the ns\n \t// mode & 4: return value when already ns object\n \t// mode & 8|1: behave like require\n \t__webpack_require__.t = function(value, mode) {\n \t\tif(mode & 1) value = __webpack_require__(value);\n \t\tif(mode & 8) return value;\n \t\tif((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;\n \t\tvar ns = Object.create(null);\n \t\t__webpack_require__.r(ns);\n \t\tObject.defineProperty(ns, 'default', { enumerable: true, value: value });\n \t\tif(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));\n \t\treturn ns;\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"modules/turnmarker/scripts/\";\n\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = \"./src/scripts/turnmarker.js\");\n","import { Settings } from \"./settings.js\";\r\n\r\nexport class Chatter {\r\n\r\n static sendTurnMessage(combatant) {\r\n let players = [];\r\n combatant.players.forEach(player => {\r\n players.push(player.name);\r\n });\r\n if (players.length == 0) players.push(\"GM\");\r\n ChatMessage.create({\r\n speaker: { actor: combatant.actor },\r\n //speaker: { actor: {}, alias: 'Turn Marker' },\r\n content:\r\n `${this.placeImage(combatant)}\r\n
\r\n
${combatant.name}'s Turn
\r\n
${players.join(' - ')}
\r\n
\r\n
${this.placeImage(combatant)}\r\n
\r\n
${combatant.name}'s Turn
\r\n
${players.join(' - ')}
\r\n
\r\n
Want to support development?
href="https://github.com/brunhine/turnmarker#support-development">check here for more info.
Important Changes
-Below are just of the changes to the module that should be called out. The full changelog is also available
+
Below are just some of the changes to the module that should be called out. The full changelog is also available
here.
+v2.6.9
+
+ - Fixed a console error when moving a token outside of combat
+
+
v2.6.8
- Test compatibility with Foundry v0.6.2
- Start marker if enabled will no longer show up until after a token has moved for the first time on it's turn
- Video files (webm, ogg, & mp4) should now properly display in the marker previewer in settings
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/package.json b/package.json
index a56f012..0456afd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "turnmarker",
- "version": "2.6.8",
+ "version": "2.6.9",
"description": "",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
diff --git a/src/module.json b/src/module.json
index 2b31d11..3d17597 100644
--- a/src/module.json
+++ b/src/module.json
@@ -3,7 +3,7 @@
"title": "Turn Marker",
"description": "Displays a (optionally animated) marker on the token who's active turn it is.",
"author": "Brunhine",
- "version": "2.6.8",
+ "version": "2.6.9",
"minimumCoreVersion": "0.5.6",
"compatibleCoreVersion": "0.6.2",
"esmodules": [
@@ -35,5 +35,5 @@
],
"url": "https://github.com/Brunhine/TurnMarker",
"manifest": "https://raw.githubusercontent.com/Brunhine/TurnMarker/master/src/module.json",
- "download": "https://github.com/Brunhine/TurnMarker/releases/download/v2.6.8/turnmarker.zip"
+ "download": "https://github.com/Brunhine/TurnMarker/releases/download/v2.6.9/turnmarker.zip"
}
\ No newline at end of file
diff --git a/src/scripts/turnmarker.js b/src/scripts/turnmarker.js
index 2614f7f..a885fb2 100644
--- a/src/scripts/turnmarker.js
+++ b/src/scripts/turnmarker.js
@@ -52,8 +52,10 @@ Hooks.on('createTile', (scene, tile) => {
});
Hooks.on('preUpdateToken', async (scene, token) => {
- if (token._id == game.combat.combatant.token._id && !canvas.scene.getFlag(FlagScope, Flags.startMarkerPlaced)) {
- await Marker.placeStartMarker(game.combat.combatant.token._id);
+ if (game.combat) {
+ if (token._id == game.combat.combatant.token._id && !canvas.scene.getFlag(FlagScope, Flags.startMarkerPlaced)) {
+ await Marker.placeStartMarker(game.combat.combatant.token._id);
+ }
}
});
diff --git a/src/templates/updateWindow.html b/src/templates/updateWindow.html
index 9fe8116..455f6b4 100644
--- a/src/templates/updateWindow.html
+++ b/src/templates/updateWindow.html
@@ -21,15 +21,19 @@ Want to support development?
href="https://github.com/brunhine/turnmarker#support-development">check here for more info.
Important Changes
-Below are just of the changes to the module that should be called out. The full changelog is also available
+
Below are just some of the changes to the module that should be called out. The full changelog is also available
here.
+v2.6.9
+
+ - Fixed a console error when moving a token outside of combat
+
+
v2.6.8
- Test compatibility with Foundry v0.6.2
- Start marker if enabled will no longer show up until after a token has moved for the first time on it's turn
- Video files (webm, ogg, & mp4) should now properly display in the marker previewer in settings
-
-
\ No newline at end of file
+
\ No newline at end of file