From 484b7a0b7f699cc3bcf698316644fe83a8b07f7b Mon Sep 17 00:00:00 2001 From: CDeenen Date: Wed, 5 May 2021 01:00:18 +0200 Subject: [PATCH] v1.4.3 --- MaterialDeck.js | 84 +++++++++++++----------- changelog.md | 19 ++++++ img/token/abilities/.thumb/cha.png.jpg | Bin 0 -> 12165 bytes img/token/abilities/.thumb/cons.png.jpg | Bin 0 -> 7485 bytes img/token/abilities/.thumb/dex.png.jpg | Bin 0 -> 9340 bytes img/token/abilities/.thumb/int.png.jpg | Bin 0 -> 11026 bytes img/token/abilities/.thumb/str.png.jpg | Bin 0 -> 9174 bytes img/token/abilities/.thumb/wis.png.jpg | Bin 0 -> 10548 bytes img/token/skills/.thumb/acr.png.jpg | Bin 0 -> 7971 bytes img/token/skills/.thumb/ani.png.jpg | Bin 0 -> 12178 bytes img/token/skills/.thumb/arc.png.jpg | Bin 0 -> 11431 bytes img/token/skills/.thumb/ath.png.jpg | Bin 0 -> 9045 bytes img/token/skills/.thumb/dec.png.jpg | Bin 0 -> 13606 bytes img/token/skills/.thumb/his.png.jpg | Bin 0 -> 8163 bytes img/token/skills/.thumb/ins.png.jpg | Bin 0 -> 9012 bytes img/token/skills/.thumb/inv.png.jpg | Bin 0 -> 10011 bytes img/token/skills/.thumb/itm.png.jpg | Bin 0 -> 7539 bytes img/token/skills/.thumb/med.png.jpg | Bin 0 -> 7059 bytes img/token/skills/.thumb/nat.png.jpg | Bin 0 -> 13412 bytes img/token/skills/.thumb/per.png.jpg | Bin 0 -> 8963 bytes img/token/skills/.thumb/prc.png.jpg | Bin 0 -> 14005 bytes img/token/skills/.thumb/prf.png.jpg | Bin 0 -> 8714 bytes img/token/skills/.thumb/rel.png.jpg | Bin 0 -> 9312 bytes img/token/skills/.thumb/slt.png.jpg | Bin 0 -> 10068 bytes img/token/skills/.thumb/ste.png.jpg | Bin 0 -> 8928 bytes img/token/skills/.thumb/sur.png.jpg | Bin 0 -> 12023 bytes lang/en.json | 6 +- module.json | 63 +++++++++++------- src/combattracker.js | 1 + src/external.js | 1 + src/macro.js | 78 +++++++++++----------- src/move.js | 2 +- src/othercontrols.js | 41 ++++++++++-- src/playlist.js | 1 + src/scene.js | 1 + src/settings.js | 3 +- src/soundboard.js | 3 +- src/streamDeck.js | 1 + src/token.js | 10 +-- 39 files changed, 197 insertions(+), 117 deletions(-) create mode 100644 img/token/abilities/.thumb/cha.png.jpg create mode 100644 img/token/abilities/.thumb/cons.png.jpg create mode 100644 img/token/abilities/.thumb/dex.png.jpg create mode 100644 img/token/abilities/.thumb/int.png.jpg create mode 100644 img/token/abilities/.thumb/str.png.jpg create mode 100644 img/token/abilities/.thumb/wis.png.jpg create mode 100644 img/token/skills/.thumb/acr.png.jpg create mode 100644 img/token/skills/.thumb/ani.png.jpg create mode 100644 img/token/skills/.thumb/arc.png.jpg create mode 100644 img/token/skills/.thumb/ath.png.jpg create mode 100644 img/token/skills/.thumb/dec.png.jpg create mode 100644 img/token/skills/.thumb/his.png.jpg create mode 100644 img/token/skills/.thumb/ins.png.jpg create mode 100644 img/token/skills/.thumb/inv.png.jpg create mode 100644 img/token/skills/.thumb/itm.png.jpg create mode 100644 img/token/skills/.thumb/med.png.jpg create mode 100644 img/token/skills/.thumb/nat.png.jpg create mode 100644 img/token/skills/.thumb/per.png.jpg create mode 100644 img/token/skills/.thumb/prc.png.jpg create mode 100644 img/token/skills/.thumb/prf.png.jpg create mode 100644 img/token/skills/.thumb/rel.png.jpg create mode 100644 img/token/skills/.thumb/slt.png.jpg create mode 100644 img/token/skills/.thumb/ste.png.jpg create mode 100644 img/token/skills/.thumb/sur.png.jpg diff --git a/MaterialDeck.js b/MaterialDeck.js index 49259dd..6b53492 100644 --- a/MaterialDeck.js +++ b/MaterialDeck.js @@ -22,7 +22,6 @@ export var externalModules; export var sceneControl; export const moduleName = "MaterialDeck"; -export var selectedTokenId; let ready = false; let activeSounds = []; @@ -116,7 +115,7 @@ async function analyzeWSmessage(msg){ if (action == 'token'){ tokenControl.active = true; - tokenControl.pushData(selectedTokenId,settings,context,device); + tokenControl.pushData(canvas.tokens.controlled[0]?.id,settings,context,device); } else if (action == 'move') move.update(settings,context,device); @@ -317,6 +316,43 @@ Hooks.once('ready', async()=>{ for (let i=0; i<64; i++) activeSounds[i] = false; + if (game.user.isGM) { + let soundBoardSettings = game.settings.get(moduleName,'soundboardSettings'); + let macroSettings = game.settings.get(moduleName, 'macroSettings'); + let array = []; + for (let i=0; i<64; i++) array[i] = ""; + let arrayVolume = []; + for (let i=0; i<64; i++) arrayVolume[i] = "50"; + let arrayZero = []; + for (let i=0; i<64; i++) arrayZero[i] = "0"; + + if (macroSettings.color == undefined){ + game.settings.set(moduleName,'macroSettings',{ + macros: array, + color: arrayZero + }); + } + + const settings = { + playlist: "", + sounds: array, + colorOn: arrayZero, + colorOff: arrayZero, + mode: arrayZero, + toggle: arrayZero, + volume: arrayVolume + }; + if (soundBoardSettings.colorOff == undefined){ + game.settings.set(moduleName,'soundboardSettings',settings); + } + } + + + + + + + if (enableModule == false) return; if (getPermission('ENABLE') == false) { ready = true; @@ -325,33 +361,6 @@ Hooks.once('ready', async()=>{ startWebsocket(); - let soundBoardSettings = game.settings.get(moduleName,'soundboardSettings'); - let macroSettings = game.settings.get(moduleName, 'macroSettings'); - let array = []; - for (let i=0; i<64; i++) array[i] = ""; - let arrayVolume = []; - for (let i=0; i<64; i++) arrayVolume[i] = "50"; - let arrayZero = []; - for (let i=0; i<64; i++) arrayZero[i] = "0"; - - if (macroSettings.color == undefined){ - game.settings.set(moduleName,'macroSettings',{ - macros: array, - color: arrayZero - }); - } - if (soundBoardSettings.colorOff == undefined){ - game.settings.set(moduleName,'soundboardSettings',{ - playlist: "", - sounds: array, - colorOn: arrayZero, - colorOff: arrayZero, - mode: arrayZero, - toggle: arrayZero, - volume: arrayVolume - }); - } - const hotbarUsesTemp = game.modules.get("illandril-hotbar-uses"); if (hotbarUsesTemp != undefined) hotbarUses = true; }); @@ -359,7 +368,7 @@ Hooks.once('ready', async()=>{ Hooks.on('updateToken',(scene,token)=>{ if (enableModule == false || ready == false) return; let tokenId = token._id; - if (tokenId == selectedTokenId) tokenControl.update(selectedTokenId); + if (tokenId == canvas.tokens.controlled[0]?.id) tokenControl.update(canvas.tokens.controlled[0]?.id); if (macroControl != undefined) macroControl.updateAll(); }); @@ -369,8 +378,8 @@ Hooks.on('updateActor',(scene,actor)=>{ for (let i=0; i{ Hooks.on('controlToken',(token,controlled)=>{ if (enableModule == false || ready == false) return; if (controlled) { - selectedTokenId = token.data._id; - tokenControl.update(selectedTokenId); + tokenControl.update(token.data._id); if (controlTokenTimer != undefined) { clearTimeout(controlTokenTimer); controlTokenTimer = undefined; } } else { - controlTokenTimer = setTimeout(function(){tokenControl.update(selectedTokenId);},10) - selectedTokenId = undefined; + controlTokenTimer = setTimeout(function(){tokenControl.update(canvas.tokens.controlled[0]?.id);},10) } if (macroControl != undefined) macroControl.updateAll(); @@ -401,7 +408,6 @@ Hooks.on('updateOwnedItem',()=>{ }) Hooks.on('renderHotbar', (hotbar)=>{ - if (compatibleCore("0.8.1")) return; if (enableModule == false || ready == false) return; if (macroControl != undefined) macroControl.hotbar(hotbar.macros); }); @@ -416,7 +422,7 @@ Hooks.on('render', (app)=>{ Hooks.on('renderCombatTracker',()=>{ if (enableModule == false || ready == false) return; if (combatTracker != undefined) combatTracker.updateAll(); - if (tokenControl != undefined) tokenControl.update(selectedTokenId); + if (tokenControl != undefined) tokenControl.update(canvas.tokens.controlled[0]?.id); }); Hooks.on('renderPlaylistDirectory', (playlistDirectory)=>{ @@ -473,7 +479,7 @@ Hooks.on('renderSceneControls',()=>{ Hooks.on('targetToken',(user,token,targeted)=>{ if (enableModule == false || ready == false) return; - if (token.id == selectedTokenId) tokenControl.update(selectedTokenId); + if (token.id == canvas.tokens.controlled[0]?.id) tokenControl.update(canvas.tokens.controlled[0]?.id); }); Hooks.on('sidebarCollapse',()=>{ diff --git a/changelog.md b/changelog.md index 544b4ae..263b7a8 100644 --- a/changelog.md +++ b/changelog.md @@ -1,4 +1,23 @@ # Changelog Material Deck Module +### v1.4.3 - 05-05-2021 +Fixes: + + +Other + + +
+Compatible server app and SD plugin:
+Material Server v1.0.2 (unchanged): https://github.com/CDeenen/MaterialServer/releases
+SD plugin v1.4.2 (unchanged): https://github.com/CDeenen/MaterialDeck_SD/releases
+ ### v1.4.2 - 23-04-2021 Fixes: