From fc471ce400e604d83142f6c3ec1c379587bbd114 Mon Sep 17 00:00:00 2001 From: CDeenen Date: Wed, 9 Dec 2020 03:22:22 +0100 Subject: [PATCH] v1.1.0 --- MaterialDeck.js | 4 +- changelog.md | 20 ++ .../.thumb/combattracker.png.jpg | Bin 0 -> 6737 bytes .../.thumb/combattracker@2x.png.jpg | Bin 0 -> 7288 bytes img/combattracker/.thumb/nextround.png.jpg | Bin 0 -> 6032 bytes img/combattracker/.thumb/nextturn.png.jpg | Bin 0 -> 6496 bytes .../.thumb/previousround.png.jpg | Bin 0 -> 6117 bytes img/combattracker/.thumb/previousturn.png.jpg | Bin 0 -> 6532 bytes img/combattracker/.thumb/startcombat.png.jpg | Bin 0 -> 5846 bytes img/combattracker/.thumb/stopcombat.png.jpg | Bin 0 -> 5161 bytes img/combattracker/SOURCES.txt | 5 + img/combattracker/combattracker.png | Bin 0 -> 12252 bytes img/combattracker/combattracker@2x.png | Bin 0 -> 13205 bytes img/combattracker/nextround.png | Bin 0 -> 6275 bytes img/combattracker/nextturn.png | Bin 0 -> 8456 bytes img/combattracker/previousround.png | Bin 0 -> 6497 bytes img/combattracker/previousturn.png | Bin 0 -> 8629 bytes img/combattracker/startcombat.png | Bin 0 -> 7764 bytes img/combattracker/stopcombat.png | Bin 0 -> 3681 bytes img/macro/.thumb/macro.png.jpg | Bin 0 -> 12273 bytes img/macro/.thumb/macro@2x.png.jpg | Bin 0 -> 13180 bytes img/macro/SOURCES.txt | 1 + img/macro/macro.png | Bin 0 -> 10807 bytes img/macro/macro@2x.png | Bin 0 -> 13234 bytes img/move/.thumb/center.png.jpg | Bin 0 -> 5791 bytes img/move/.thumb/center@2x.png.jpg | Bin 0 -> 5791 bytes img/move/.thumb/down.png.jpg | Bin 0 -> 5184 bytes img/move/.thumb/downleft.png.jpg | Bin 0 -> 5263 bytes img/move/.thumb/downright.png.jpg | Bin 0 -> 5239 bytes img/move/.thumb/left.png.jpg | Bin 0 -> 5079 bytes img/move/.thumb/right.png.jpg | Bin 0 -> 5069 bytes img/move/.thumb/up.png.jpg | Bin 0 -> 5180 bytes img/move/.thumb/upleft.png.jpg | Bin 0 -> 5235 bytes img/move/.thumb/upright.png.jpg | Bin 0 -> 5267 bytes img/move/.thumb/zoomin.png.jpg | Bin 0 -> 5303 bytes img/move/.thumb/zoomout.png.jpg | Bin 0 -> 7746 bytes img/move/SOURCES.txt | 2 + img/move/center.png | Bin 0 -> 13097 bytes img/move/center@2x.png | Bin 0 -> 13097 bytes img/move/down.png | Bin 0 -> 7854 bytes img/move/downleft.png | Bin 0 -> 7860 bytes img/move/downright.png | Bin 0 -> 7852 bytes img/move/left.png | Bin 0 -> 8201 bytes img/move/right.png | Bin 0 -> 6505 bytes img/move/up.png | Bin 0 -> 7752 bytes img/move/upleft.png | Bin 0 -> 7871 bytes img/move/upright.png | Bin 0 -> 7841 bytes img/move/zoomin.png | Bin 0 -> 5656 bytes img/move/zoomout.png | Bin 0 -> 5664 bytes img/other/.thumb/other.png.jpg | Bin 0 -> 8300 bytes img/other/.thumb/other@2x.png.jpg | Bin 0 -> 8300 bytes img/other/SOURCES.txt | 1 + img/other/darkness/.thumb/darkness.png.jpg | Bin 0 -> 7669 bytes .../darkness/.thumb/decreasedarkness.png.jpg | Bin 0 -> 6131 bytes .../darkness/.thumb/increasedarkness.png.jpg | Bin 0 -> 5983 bytes img/other/darkness/SOURCES.txt | 2 + img/other/darkness/darkness.png | Bin 0 -> 4583 bytes img/other/darkness/decreasedarkness.png | Bin 0 -> 7215 bytes img/other/darkness/increasedarkness.png | Bin 0 -> 6231 bytes img/other/other.png | Bin 0 -> 11045 bytes img/other/other@2x.png | Bin 0 -> 11045 bytes img/other/pause/.thumb/pause.png.jpg | Bin 0 -> 5915 bytes img/other/pause/.thumb/playpause.png.jpg | Bin 0 -> 5631 bytes img/other/pause/.thumb/resume.png.jpg | Bin 0 -> 5846 bytes img/other/pause/SOURCES.txt | 3 + img/other/pause/pause.png | Bin 0 -> 3593 bytes img/other/pause/playpause.png | Bin 0 -> 7234 bytes img/other/pause/resume.png | Bin 0 -> 7764 bytes img/playlist/.thumb/play.png.jpg | Bin 0 -> 5846 bytes img/playlist/.thumb/play@2x.png.jpg | Bin 0 -> 5846 bytes .../.thumb/play_redBrightness.png.jpg | Bin 0 -> 5265 bytes img/playlist/.thumb/stop.png.jpg | Bin 0 -> 5161 bytes img/playlist/SOURCES.txt | 2 + img/playlist/play.png | Bin 0 -> 7764 bytes img/playlist/play@2x.png | Bin 0 -> 7764 bytes img/playlist/play_redBrightness.png | Bin 0 -> 10868 bytes img/playlist/stop.png | Bin 0 -> 3681 bytes img/soundboard/.thumb/soundboard.png.jpg | Bin 0 -> 6387 bytes img/soundboard/.thumb/soundboard@2x.png.jpg | Bin 0 -> 6988 bytes img/soundboard/.thumb/stop.png.jpg | Bin 0 -> 5161 bytes img/soundboard/SOURCES.txt | 2 + img/soundboard/soundboard.png | Bin 0 -> 11622 bytes img/soundboard/soundboard@2x.png | Bin 0 -> 8081 bytes img/soundboard/stop.png | Bin 0 -> 3681 bytes img/token/.thumb/hp.png.jpg | Bin 0 -> 9101 bytes img/token/.thumb/init.png.jpg | Bin 0 -> 16115 bytes img/token/.thumb/mystery-man.png.jpg | Bin 0 -> 9708 bytes img/token/.thumb/mystery-man@2x.png.jpg | Bin 0 -> 9987 bytes img/token/SOURCES.txt | 5 + img/token/ac.webp | Bin 0 -> 38038 bytes img/token/hp.png | Bin 0 -> 9414 bytes img/token/init.png | Bin 0 -> 123713 bytes img/token/mystery-man.png | Bin 0 -> 8388 bytes img/token/mystery-man@2x.png | Bin 0 -> 9688 bytes img/token/speed.webp | Bin 0 -> 66234 bytes module.json | 4 +- src/combattracker.js | 140 ++++---- src/macro.js | 109 +++--- src/move.js | 88 +++-- src/othercontrols.js | 332 +++++++----------- src/playlist.js | 46 +-- src/soundboard.js | 34 +- src/streamDeck.js | 19 +- src/token.js | 295 ++++++++++------ 104 files changed, 586 insertions(+), 528 deletions(-) create mode 100644 img/combattracker/.thumb/combattracker.png.jpg create mode 100644 img/combattracker/.thumb/combattracker@2x.png.jpg create mode 100644 img/combattracker/.thumb/nextround.png.jpg create mode 100644 img/combattracker/.thumb/nextturn.png.jpg create mode 100644 img/combattracker/.thumb/previousround.png.jpg create mode 100644 img/combattracker/.thumb/previousturn.png.jpg create mode 100644 img/combattracker/.thumb/startcombat.png.jpg create mode 100644 img/combattracker/.thumb/stopcombat.png.jpg create mode 100644 img/combattracker/SOURCES.txt create mode 100644 img/combattracker/combattracker.png create mode 100644 img/combattracker/combattracker@2x.png create mode 100644 img/combattracker/nextround.png create mode 100644 img/combattracker/nextturn.png create mode 100644 img/combattracker/previousround.png create mode 100644 img/combattracker/previousturn.png create mode 100644 img/combattracker/startcombat.png create mode 100644 img/combattracker/stopcombat.png create mode 100644 img/macro/.thumb/macro.png.jpg create mode 100644 img/macro/.thumb/macro@2x.png.jpg create mode 100644 img/macro/SOURCES.txt create mode 100644 img/macro/macro.png create mode 100644 img/macro/macro@2x.png create mode 100644 img/move/.thumb/center.png.jpg create mode 100644 img/move/.thumb/center@2x.png.jpg create mode 100644 img/move/.thumb/down.png.jpg create mode 100644 img/move/.thumb/downleft.png.jpg create mode 100644 img/move/.thumb/downright.png.jpg create mode 100644 img/move/.thumb/left.png.jpg create mode 100644 img/move/.thumb/right.png.jpg create mode 100644 img/move/.thumb/up.png.jpg create mode 100644 img/move/.thumb/upleft.png.jpg create mode 100644 img/move/.thumb/upright.png.jpg create mode 100644 img/move/.thumb/zoomin.png.jpg create mode 100644 img/move/.thumb/zoomout.png.jpg create mode 100644 img/move/SOURCES.txt create mode 100644 img/move/center.png create mode 100644 img/move/center@2x.png create mode 100644 img/move/down.png create mode 100644 img/move/downleft.png create mode 100644 img/move/downright.png create mode 100644 img/move/left.png create mode 100644 img/move/right.png create mode 100644 img/move/up.png create mode 100644 img/move/upleft.png create mode 100644 img/move/upright.png create mode 100644 img/move/zoomin.png create mode 100644 img/move/zoomout.png create mode 100644 img/other/.thumb/other.png.jpg create mode 100644 img/other/.thumb/other@2x.png.jpg create mode 100644 img/other/SOURCES.txt create mode 100644 img/other/darkness/.thumb/darkness.png.jpg create mode 100644 img/other/darkness/.thumb/decreasedarkness.png.jpg create mode 100644 img/other/darkness/.thumb/increasedarkness.png.jpg create mode 100644 img/other/darkness/SOURCES.txt create mode 100644 img/other/darkness/darkness.png create mode 100644 img/other/darkness/decreasedarkness.png create mode 100644 img/other/darkness/increasedarkness.png create mode 100644 img/other/other.png create mode 100644 img/other/other@2x.png create mode 100644 img/other/pause/.thumb/pause.png.jpg create mode 100644 img/other/pause/.thumb/playpause.png.jpg create mode 100644 img/other/pause/.thumb/resume.png.jpg create mode 100644 img/other/pause/SOURCES.txt create mode 100644 img/other/pause/pause.png create mode 100644 img/other/pause/playpause.png create mode 100644 img/other/pause/resume.png create mode 100644 img/playlist/.thumb/play.png.jpg create mode 100644 img/playlist/.thumb/play@2x.png.jpg create mode 100644 img/playlist/.thumb/play_redBrightness.png.jpg create mode 100644 img/playlist/.thumb/stop.png.jpg create mode 100644 img/playlist/SOURCES.txt create mode 100644 img/playlist/play.png create mode 100644 img/playlist/play@2x.png create mode 100644 img/playlist/play_redBrightness.png create mode 100644 img/playlist/stop.png create mode 100644 img/soundboard/.thumb/soundboard.png.jpg create mode 100644 img/soundboard/.thumb/soundboard@2x.png.jpg create mode 100644 img/soundboard/.thumb/stop.png.jpg create mode 100644 img/soundboard/SOURCES.txt create mode 100644 img/soundboard/soundboard.png create mode 100644 img/soundboard/soundboard@2x.png create mode 100644 img/soundboard/stop.png create mode 100644 img/token/.thumb/hp.png.jpg create mode 100644 img/token/.thumb/init.png.jpg create mode 100644 img/token/.thumb/mystery-man.png.jpg create mode 100644 img/token/.thumb/mystery-man@2x.png.jpg create mode 100644 img/token/SOURCES.txt create mode 100644 img/token/ac.webp create mode 100644 img/token/hp.png create mode 100644 img/token/init.png create mode 100644 img/token/mystery-man.png create mode 100644 img/token/mystery-man@2x.png create mode 100644 img/token/speed.webp diff --git a/MaterialDeck.js b/MaterialDeck.js index 4b231b2..983f1e0 100644 --- a/MaterialDeck.js +++ b/MaterialDeck.js @@ -51,7 +51,7 @@ async function analyzeWSmessage(msg){ } if (data == undefined || data.payload == undefined) return; - + //console.log("Received",data); const action = data.action; const event = data.event; const context = data.context; @@ -70,6 +70,8 @@ async function analyzeWSmessage(msg){ tokenControl.active = true; tokenControl.update(selectedTokenId); } + else if (action == 'move') + move.update(settings,context); else if (action == 'macro') macroControl.update(settings,context); else if (action == 'combattracker') diff --git a/changelog.md b/changelog.md index 61fe23e..dbfeba0 100644 --- a/changelog.md +++ b/changelog.md @@ -1,4 +1,24 @@ # Changelog Material Deck Module +### v1.1.0 - 09-12-2020 +Fixes +