v1.0.1

MaterialDeck.js

@@ -50,9 +50,6 @@ async function analyzeWSmessage(msg){
         console.log("streamdeck connected to server");
     }
 
-
-
-
     if (data == undefined || data.payload == undefined) return;
       
     const action = data.action;
@@ -62,7 +59,6 @@ async function analyzeWSmessage(msg){
     if (coordinates == undefined) coordinates = 0;
     const settings = data.payload.settings;
 
-    
     if (data.data == 'init'){
 
     }
@@ -181,7 +177,6 @@ export function sendWS(txt){
 Hooks.once('ready', ()=>{
     enableModule = (game.settings.get(moduleName,'Enable')) ? true : false;
     
-    
     game.socket.on(`module.MaterialDeck`, (payload) =>{
         //console.log(payload);
         if (payload.msgType != "playSound") return;
@@ -265,6 +260,18 @@ Hooks.on('updateToken',(scene,token)=>{
         tokenControl.update(selectedTokenId);
 });
 
+Hooks.on('updateActor',(scene,actor)=>{
+    if (enableModule == false || ready == false) return;
+    let children = canvas.tokens.children[0].children;
+    for (let i=0; i<children.length; i++){
+        if (children[i].actor.id == actor._id){
+            let tokenId = children[i].id;
+            if (tokenId == selectedTokenId)
+                tokenControl.update(selectedTokenId);
+        }
+    }
+});
+
 Hooks.on('controlToken',(token,controlled)=>{
     if (enableModule == false || ready == false) return;
     if (controlled) {
@@ -355,62 +362,4 @@ Hooks.once('init', ()=>{
 
 Hooks.once('canvasReady',()=>{
     ready = true;
-});
+});
-
-export function getFromJSONArray(data,i){
-    if (i>9) return 'nul';
-    let val;
-    if (i == 0) val = data.a;
-    else if (i == 1) val = data.a;
-    else if (i == 2) val = data.c;
-    else if (i == 3) val = data.d;
-    else if (i == 4) val = data.e;
-    else if (i == 5) val = data.f;
-    else if (i == 6) val = data.g;
-    else if (i == 7) val = data.h;
-    else if (i == 8) val = data.i;
-    else if (i == 9) val = data.j;
-    else if (i == 10) val = data.k;
-    else if (i == 11) val = data.l;
-    else if (i == 12) val = data.m;
-    else if (i == 13) val = data.n;
-    else if (i == 14) val = data.o;
-    else if (i == 15) val = data.p;
-    else if (i == 16) val = data.q;
-    else if (i == 17) val = data.r;
-    else if (i == 18) val = data.s;
-    else if (i == 19) val = data.t;
-    else if (i == 20) val = data.u;
-    else if (i == 21) val = data.v;
-    else if (i == 22) val = data.w;
-    else if (i == 23) val = data.x;
-    return val;
-}
-
-export function setToJSONArray(data,i,val){
-    if (i>9) return 'nul';
-    if (i == 0) data.a = val;
-    else if (i == 1) data.b = val;
-    else if (i == 2) data.c = val;
-    else if (i == 3) data.d = val;
-    else if (i == 4) data.e = val;
-    else if (i == 5) data.f = val;
-    else if (i == 6) data.g = val;
-    else if (i == 7) data.h = val;
-    else if (i == 8) data.i = val;
-    else if (i == 9) data.j = val;
-    else if (i == 10) data.k = val;
-    else if (i == 11) data.l = val;
-    else if (i == 12) data.m = val;
-    else if (i == 13) data.n = val;
-    else if (i == 14) data.o = val;
-    else if (i == 15) data.p = val;
-    else if (i == 16) data.q = val;
-    else if (i == 17) data.r = val;
-    else if (i == 18) data.s = val;
-    else if (i == 19) data.t = val;
-    else if (i == 20) data.u = val;
-    else if (i == 21) data.v = val;
-    else if (i == 22) data.w = val;
-    else if (i == 23) data.x = val;
-}

README.md

@@ -1,8 +1,67 @@
-# Stream Deck
+<b>Note:</b> At the moment Windows and OSX support has been confirmed. Linux support is unknown, there is no official Linux support for the Stream Deck, but there exist a 3rd party <a href="https://timothycrosley.com/project-7-streamdeck_ui">Stream Deck UI</a> that might be compatible.<br>
-Material Deck is a Foundry VTT module that allows you to control certain Foundry functions using an Elgato Stream Deck.
+<b>In any case: Proceed at your own risk, I will not take any responsibility if you spent money and the module doesn't work!</b>
 
-## Instructions
+<b>Please read the documentation carefully, especially if you want to modify the default profile!</b>
-Instructions are on the <a href="https://github.com/CDeenen/MaterialDeck/wiki">wiki</a>.
+
+I created a <a href="https://discord.gg/3hd4G6TkmA">Discord server</a> to discuss this and other hardware-based Foundry modules. Feel free to join if you'd like to join the discussion and be updated on this module.
+
+[![Youtube Video](https://github.com/CDeenen/MaterialDeck/blob/Master/wiki/img/Youtube.png)](https://youtu.be/7h5Ew8cJYxg "FoundryVTT Material Deck Demonstration")
+
+# Material Deck
+Material Deck is a Foundry VTT module that allows you to control certain Foundry functions using an Elgato Stream Deck. A Stream Deck is a device that has physical buttons with displays behind them. Material Deck uses this to, for example, control playlists, execute macros, display and control the combat tracker.<br><br>
+The module allows a high degree of customization, where each button on the Stream Deck can be assigned any desired function. Furthermore, it supports folder structures, allowing easy switching between various button configurations so you can easily switch between the combat tracker, soundboard, or any other (custom) configuration.<br><br>
+The functions are categorized into actions. Here is a list of the available actions and their most important functions:
+<ul>
+  <li>Playlist Action: Control Foundry's playlists</li>
+  <ul>
+    <li>Play/Stop playlists</li>
+    <li>Play/Stop tracks</li>
+    <li>Stop all tracks & playlists</li>
+  </ul>
+  <li>Soundboard Action: Play sounds</li>
+  <ul>
+    <li>Play/Stop sound</li>
+    <li>Stop all sounds</li>
+  </ul>
+  <li>Token Action: Display token info</li>
+  <ul>
+    <li>Display selected token's name, icon or stats (HP/AC/Movement/etc)</li>
+    <li>Open selected token's character sheet or token config</li>
+    <li>Target token</li>
+    <li>Toggle token visibility, combat state, conditions</li>
+  </ul>
+  <li>Move Action: Move selected token or the canvas</li>
+  <ul>
+    <li>Move token (in a specified direction)</li>
+    <li>Move canvas (in a specified direction)</li>
+    <li>Zoom canvas in/out</li>
+  </ul>
+  <li>Macro Actions: Execute macros</li>
+  <ul>
+    <li>Execute macro from hotbar</li>
+    <li>Execute macro from macro board</li>
+  </ul>
+  <li>Combat Tracker Actions: Control and display the combat tracker</li>
+  <ul>
+    <li>Display combatants</li>
+    <li>Start/Stop combat</li>
+    <li>Next/Previous turn/round</li>
+  </ul>
+  <li>Other Actions: Misc other actions</li>
+  <ul>
+    <li>Pause/Resume game</li>
+    <li>Scene selection/activation</li>
+    <li>Toggle control buttons</li>
+    <li>Control darkness level</li>
+    <li>Open/Roll from a roll table</li>
+    <li>Open sidebar tab</li>
+    <li>Open compendium pack</li>
+    <li>Open journal entry</li>
+  </ul>
+</ul>
+  
+## Instructions and More Info
+Instructions and more info can be found in the <a href="https://github.com/CDeenen/MaterialDeck/wiki">wiki</a>.
 
 ## Latest releases
 <a href="https://github.com/CDeenen/MaterialDeck/releases">Module</a><br>
@@ -10,3 +69,28 @@ Instructions are on the <a href="https://github.com/CDeenen/MaterialDeck/wiki">w
 <a href="https://github.com/CDeenen/MaterialServer/releases">Server</a><br>
 <br>
 Module manifest: https://raw.githubusercontent.com/CDeenen/MaterialDeck/Master/module.json
+
+## Software Versions & Module Incompatibilities
+<b>Foundry VTT:</b> Tested on 0.7.7<br>
+<b>Module Incompatibilities:</b> None known.<br>
+
+## Feedback
+If you have any suggestions or bugs to report, feel free to create an issue, contact me on Discord (Cris#6864), or send me an email: cdeenen@outlook.com.
+
+## Credits
+<b>Author:</b> Cristian Deenen (Cris#6864 on Discord)<br>
+<br>
+Special thanks to Asmodeus#7588 who made this module possible by generously donating a Stream Deck XL
+
+## Abandonment
+Abandoned modules are a (potential) problem for Foundry, because users and/or other modules might rely on abandoned modules, which might break in future Foundry updates.<br>
+I consider this module abandoned if all of the below cases apply:
+<ul>
+  <li>This module/github page has not received any updates in at least 3 months</li>
+  <li>I have not posted anything on "the Foundry", "the League of Extraordinary Foundry VTT Developers" or the "Material Foundry" Discord servers in at least 3 months</li>
+  <li>I have not responded to emails or PMs on Discord in at least 1 month</li>
+  <li>I have not announced a temporary break from development, unless the announced end date of this break has been passed by at least 3 months</li>
+</ul>
+If the above cases apply (as judged by the "League of Extraordinary Foundry VTT Developers" admins), I give permission to the "League of Extraordinary Foundry VTT Developers" admins to assign one or more developers to take over this module, including requesting the Foundry team to reassign the module to the new developer(s).<br>
+I require the "League of Extraordinary Foundry VTT Developers" admins to send me an email 2 weeks before the reassignment takes place, to give me one last chance to prevent the reassignment.<br>
+I require to be credited for my work in all future releases.

changelog.md

@@ -1,5 +1,47 @@
 # Changelog Material Deck Module
-### v0.8.7 - 19-11-2020
+### V1.0.1 - 26-11-2020
+<ul>
+<li>Fixed issue where macro from macroboard wouldn't execute if furnace arguments were not defined</li>
+<li>Fixed issue where soundboard wouldn't save if no previous data existed for that sound</li>
+</ul>
+
+<b>Compatible server app and SD plugin:</b><br>
+Material Server v1.0.2 (unchanged): https://github.com/CDeenen/MaterialServer/releases <br>
+SD plugin v1.0.0 (unchanged): https://github.com/CDeenen/MaterialDeck_SD/releases<br>
+
+### v1.0.0 - 24-11-2020
+Release
+<ul>
+<li>Fixed issue where the last column in 'Soundboard Configuration' would not work properly</li>
+</ul>
+
+<b>Compatible server app and SD plugin:</b><br>
+Material Server v1.0.2: https://github.com/CDeenen/MaterialServer/releases <br>
+SD plugin v1.0.0: https://github.com/CDeenen/MaterialDeck_SD/releases<br>
+
+### v0.9.2 - 24-11-2020
+<ul>
+<li>Removed unnecessary errors when module is not fully configured</li>
+<li>Solved issue that soundboard config couldn't be saved on a world that hadn't run Material Deck previously</li>
+</ul>
+
+### v0.9.1 - 23-11-2020
+<ul>
+<li>Fixed 'Playlist' action issue where 'TrackNr' wouldn't show</li>
+<li>Fixed 'Soundboard Configuration' issue where changing the playlist would reset everything you've changed since last save</li>
+<li>'Soundboard Configuration', 'Macro Configuration' and 'Playlist Configuration' now save after each change, and update the SD instantly</li>
+<li>Save button has been removed from configuration screens, since it is now redundant</li>
+<li>Added support for DnD3.5e and Pathfinder 2e</li>
+</ul>
+
+<b>Note1:</b> In 'Macro Configuration', previously saved Furnace arguments have to be filled in again.<br>
+<b>Note2:</b> Any settings set in 'Playlist Configuration' have to be set again<br>
+<br>
+<b>Compatible server app and SD plugin:</b><br>
+Material Server v1.0.1 (unchanged): https://github.com/CDeenen/MaterialServer/releases <br>
+SD plugin v0.9.1: https://github.com/CDeenen/MaterialDeck_SD/releases<br>
+
+### v0.9.0 - 19-11-2020
 <ul>
 <li>Added support for more playlists</li>
 <li>Added playmode setting for each playlist, which overrides the default playmode</li>

lang/en.json

@@ -20,7 +20,7 @@
     "MaterialDeck.PL.OneTrackTotal": "One track in total",
     "MaterialDeck.PL.OneTrack": "One track",
     "MaterialDeck.PL.Settings": "Settings",
-    "MaterialDeck.PL.Mode": "Default Playmode",
+    "MaterialDeck.PL.Mode": "Default Play Mode",
     "MaterialDeck.PL.Nr": "Number of playlists",
     
     "MaterialDeck.Playlists": "Playlists",

module.json

@@ -1,8 +1,8 @@
 {
     "name": "MaterialDeck",
     "title": "Material Deck",
-    "description": "",
+    "description": "Material Deck allows you to control Foundry using an Elgato Stream Deck",
-    "version": "0.9.0",
+    "version": "1.0.1",
     "author": "CDeenen",
     "esmodules": [
       "./MaterialDeck.js"

src/combattracker.js

@@ -46,8 +46,7 @@ export class CombatTracker{
                 else {
                     streamDeck.setIcon(0,context,src,background);
                     streamDeck.setTitle(txt,context);
-                }
+                } 
-                
             }
             else {
                 streamDeck.setIcon(0,context,src,background);
@@ -63,8 +62,6 @@ export class CombatTracker{
                 streamDeck.setIcon(0,context,src,background);
                 streamDeck.setTitle(txt,context);
             }
-            
-
         }
         else if (mode == 2){
             
@@ -139,7 +136,8 @@ export class CombatTracker{
                 if (combat != null && combat != undefined && combat.started)
                     tokenId = combat.combatant.tokenId;
                 
-            let token = canvas.tokens.children[0].children.find(p => p.id == tokenId);
+            let token
+            if (canvas.tokens.children[0] != undefined) token = canvas.tokens.children[0].children.find(p => p.id == tokenId);
             if (token == undefined) return;
             if (onClick == 0)   //Do nothing
                 return;

src/macro.js

@@ -196,11 +196,11 @@ export class MacroControl{
         if (macroId != undefined){
             let macro = game.macros.get(macroId);
             if (macro != undefined && macro != null) {
-                const args = game.settings.get(MODULE.moduleName,'macroArgs')[macroNumber];
+                const args = game.settings.get(MODULE.moduleName,'macroSettings').args;
                 let furnaceEnabled = false;
                 let furnace = game.modules.get("furnace");
                 if (furnace != undefined && furnace.active) furnaceEnabled = true;
-                if (args == "") furnaceEnabled = false;
+                if (args == undefined || args[number] == undefined || args[macroNumber] == "") furnaceEnabled = false;
                 if (furnaceEnabled == false) macro.execute();
                 else {
                     let chatData = {

src/misc.js

@@ -1,5 +1,5 @@
 import * as MODULE from "../MaterialDeck.js";
-import {macroControl} from "../MaterialDeck.js";
+import {macroControl,soundboard,playlistControl} from "../MaterialDeck.js";
 
 export class playlistConfigForm extends FormApplication {
     constructor(data, options) {
@@ -26,33 +26,43 @@ export class playlistConfigForm extends FormApplication {
      * Provide data to the template
      */
     getData() {
-        let selectedPlaylists = game.settings.get(MODULE.moduleName,'selectedPlaylists');
+        let settings = game.settings.get(MODULE.moduleName,'playlists');
+        let selectedPlaylists = settings.selectedPlaylist;
         if (selectedPlaylists == undefined) selectedPlaylists = [];
-        let selectedPlaylistMethod = game.settings.get(MODULE.moduleName, 'selectedPlaylistMethod');
+        let selectedPlaylistMode = settings.playlistMode;
-        if (selectedPlaylistMethod == undefined) selectedPlaylistMethod = [];
+        if (selectedPlaylistMode == undefined) selectedPlaylistMode = [];
-        let playlistData = [];
+        let numberOfPlaylists = settings.playlistNumber;
-        let numberOfPlaylists = game.settings.get(MODULE.moduleName,'numberOfPlaylists');
         if (this.updatePlaylistNr) numberOfPlaylists = this.playlistNr;
+        if (numberOfPlaylists == undefined) numberOfPlaylists = 9;
+        let playMode = settings.playMode;
+        if (playMode == undefined) playMode = 0;
+        let playlistData = [];
+        
         this.updatePlaylistNr = false;
         for (let i=0; i<numberOfPlaylists; i++){
             if (selectedPlaylists[i] == undefined) selectedPlaylists[i] = 'none';
-            if (selectedPlaylistMethod[i] == undefined) selectedPlaylistMethod[i] = 0;
+            if (selectedPlaylistMode[i] == undefined) selectedPlaylistMode[i] = 0;
             let dataThis = {
                 iteration: i+1,
                 playlist: selectedPlaylists[i],
-                playlistMethod: selectedPlaylistMethod[i],
+                playlistMode: selectedPlaylistMode[i],
                 playlists: game.playlists.entities
             }
             playlistData.push(dataThis);
         }
-        if (!this.data && selectedPlaylists) {
+
-            this.data = selectedPlaylists;
+        this.data = {
+            playMode: playMode,
+            playlistNumber: numberOfPlaylists,
+            selectedPlaylist: selectedPlaylists,
+            playlistMode: selectedPlaylistMode
         }
+
         return {
             playlists: game.playlists.entities,
             numberOfPlaylists: numberOfPlaylists,
             playlistData: playlistData,
-            playMethod: game.settings.get(MODULE.moduleName,'playlistMethod')
+            playMode: playMode
         } 
     }
 
@@ -62,21 +72,44 @@ export class playlistConfigForm extends FormApplication {
      * @param {*} formData 
      */
     async _updateObject(event, formData) {
-        await game.settings.set(MODULE.moduleName,'selectedPlaylists', formData["selectedPlaylist"]);
-        await game.settings.set(MODULE.moduleName,'playlistMethod',formData["playMethod"]);
-        await game.settings.set(MODULE.moduleName,'numberOfPlaylists',formData["plNum"]);
-        await game.settings.set(MODULE.moduleName,'selectedPlaylistMethod',formData["playlistMethod"]);
 
     }
 
     activateListeners(html) {
         super.activateListeners(html);
+        const playMode = html.find("select[name='playMode']");
         const numberOfPlaylists = html.find("input[name='plNum']");
+        const selectedPlaylist = html.find("select[name='selectedPlaylist']");
+        const playlistMode = html.find("select[name='playlistMode']");
+
+        playMode.on("change", event => {
+            this.data.playMode=event.target.value;
+            this.updateSettings(this.data);
+        });
+
         numberOfPlaylists.on("change", event => {
             this.playlistNr = event.target.value;
             this.updatePlaylistNr = true;
-            this.render();
+            this.data.playlistNumber=event.target.value;
+            this.updateSettings(this.data);
         });
+
+        selectedPlaylist.on("change", event => {
+            let id = event.target.id.replace('playlist','');
+            this.data.selectedPlaylist[id-1]=event.target.value;
+            this.updateSettings(this.data);
+        });
+
+        playlistMode.on("change", event => {
+            let id = event.target.id.replace('playlistMode','');
+            this.data.playlistMode[id-1]=event.target.value;
+            this.updateSettings(this.data);
+        });
+    }
+    async updateSettings(settings){
+        await game.settings.set(MODULE.moduleName,'playlists', settings);
+        if (MODULE.enableModule) playlistControl.updateAll();
+        this.render();
     }
 }
 
@@ -98,7 +131,7 @@ export class macroConfigForm extends FormApplication {
         if (streamDeckModel == 0)
             width = 550;
         else if (streamDeckModel == 1)
-            width= 885;
+            width= 1500;
         else   
             width = 1400;
         */
@@ -116,7 +149,7 @@ export class macroConfigForm extends FormApplication {
     getData() {
         var selectedMacros = game.settings.get(MODULE.moduleName,'macroSettings').macros;
         var color = game.settings.get(MODULE.moduleName,'macroSettings').color;
-        var args = game.settings.get(MODULE.moduleName,'macroArgs');
+        var args = game.settings.get(MODULE.moduleName,'macroSettings').args;
         if (selectedMacros == undefined) selectedMacros = [];
         if (color == undefined) color = [];
         if (args == undefined) args = [];
@@ -191,20 +224,41 @@ export class macroConfigForm extends FormApplication {
      * @param {*} formData 
      */
     async _updateObject(event, formData) {
-       await game.settings.set(MODULE.moduleName,'macroSettings',{
-            macros: formData["macros"],
-            color: formData["colorPicker"]
-       });
 
-        let furnace = game.modules.get("furnace");
-        if (furnace != undefined && furnace.active) 
-            await game.settings.set(MODULE.moduleName,'macroArgs', formData["args"]);
-        if (MODULE.enableModule)
-            macroControl.updateAll();
     }
 
     activateListeners(html) {
         super.activateListeners(html); 
+        const macro = html.find("select[name='macros']");
+        const args = html.find("input[name='args']");
+        const color = html.find("input[name='colorPicker']");
+
+        macro.on("change", event => {
+            let id = event.target.id.replace('macros','');
+            let settings = game.settings.get(MODULE.moduleName,'macroSettings');
+            settings.macros[id-1]=event.target.value;
+            this.updateSettings(settings);
+        });
+
+        args.on("change", event => {
+            let id = event.target.id.replace('args','');
+            let settings = game.settings.get(MODULE.moduleName,'macroSettings');
+            settings.args[id-1]=event.target.value;
+            this.updateSettings(settings);
+        });
+
+        color.on("change", event => {
+            let id = event.target.id.replace('colorpicker','');
+            let settings = game.settings.get(MODULE.moduleName,'macroSettings');
+            settings.color[id-1]=event.target.value;
+            this.updateSettings(settings);
+        });
+    }
+
+    async updateSettings(settings){
+        await game.settings.set(MODULE.moduleName,'macroSettings',settings);
+        if (MODULE.enableModule) macroControl.updateAll();
+        this.render();
     }
 }
 
@@ -214,9 +268,12 @@ export class soundboardConfigForm extends FormApplication {
     constructor(data, options) {
         super(data, options);
         this.data = data;
-        //this.soundData = {};
         this.playlists = [];
         this.updatePlaylist = false;
+        this.update = false;
+        this.iMax;
+        this.jMax;
+        this.settings = {};
     }
 
     /**
@@ -250,17 +307,12 @@ export class soundboardConfigForm extends FormApplication {
     /**
      * Provide data to the template
      */
-    getData() {     
+    getData() { 
-        let selectedSounds = game.settings.get(MODULE.moduleName,'soundboardSettings').sounds;
+        if (this.update) {
-        let colorOn = game.settings.get(MODULE.moduleName,'soundboardSettings').colorOn;
+            this.update=false;
-        let colorOff = game.settings.get(MODULE.moduleName,'soundboardSettings').colorOff;
+            return {soundData: this.data};
-        let mode = game.settings.get(MODULE.moduleName,'soundboardSettings').mode;
+        }
-        let volume = game.settings.get(MODULE.moduleName,'soundboardSettings').volume;
+        this.settings = game.settings.get(MODULE.moduleName,'soundboardSettings');
-        let img = game.settings.get(MODULE.moduleName,'soundboardSettings').img;
-        let name = game.settings.get(MODULE.moduleName,'soundboardSettings').name;
-        let selectedPlaylists = game.settings.get(MODULE.moduleName,'soundboardSettings').selectedPlaylists;
-        let src = game.settings.get(MODULE.moduleName,'soundboardSettings').src;
-
         let playlists = [];
         playlists.push({id:"none",name:game.i18n.localize("MaterialDeck.None")});
         playlists.push({id:"FP",name:game.i18n.localize("MaterialDeck.FilePicker")})
@@ -268,48 +320,45 @@ export class soundboardConfigForm extends FormApplication {
             playlists.push({id:game.playlists.entities[i]._id,name:game.playlists.entities[i].name});
         }
 
-        if (selectedSounds == undefined) selectedSounds = [];
+        if (this.settings.sounds == undefined) this.settings.sounds = [];
-        if (colorOn == undefined) colorOn = [];
+        if (this.settings.colorOn == undefined) this.settings.colorOn = [];
-        if (colorOff == undefined) colorOff = [];
+        if (this.settings.colorOff == undefined) this.settings.colorOff = [];
-        if (mode == undefined) mode = [];
+        if (this.settings.mode == undefined) this.settings.mode = [];
-        if (img == undefined) img = [];
+        if (this.settings.img == undefined) this.settings.img = [];
-        if (name == undefined) name = [];
+        if (this.settings.volume == undefined) this.settings.volume = [];
-        if (selectedPlaylists == undefined) selectedPlaylists = [];
+        if (this.settings.name == undefined) this.settings.name = [];
-        if (src == undefined) src = [];
+        if (this.settings.selectedPlaylists == undefined) this.settings.selectedPlaylists = [];
+        if (this.settings.src == undefined) this.settings.src = [];
         let soundData = [];
 
         let streamDeckModel = game.settings.get(MODULE.moduleName,'streamDeckModel');
-        let iMax,jMax;
+       
         if (streamDeckModel == 0){
-            jMax = 6;
+            this.jMax = 6;
-            iMax = 3;
+            this.iMax = 3;
         }
         else if (streamDeckModel == 1){
-            jMax = 6;
+            this.jMax = 6;
-            iMax = 5;
+            this.iMax = 5;
         }
         else {
-            jMax = 8;
+            this.jMax = 8;
-            iMax = 8;
+            this.iMax = 8;
         }
 
-        if (this.updatePlaylist) selectedPlaylists = this.playlists;
-        else this.playlists = selectedPlaylists;
-        this.updatePlaylist = false;
-
         let iteration = 0;
 
-        for (let j=0; j<jMax; j++){
+        for (let j=0; j<this.jMax; j++){
             let soundsThis = [];
-            for (let i=0; i<iMax; i++){
+            for (let i=0; i<this.iMax; i++){
                 let selectedPlaylist;
                 let sounds = [];
-                if (volume == undefined) volume = 50;
+                if (this.settings.volume[iteration] == undefined) this.settings.volume[iteration] = 50;
-                if (selectedPlaylists[iteration]==undefined) selectedPlaylist = 'none';
+                if (this.settings.selectedPlaylists[iteration]==undefined) selectedPlaylist = 'none';
-                else if (selectedPlaylists[iteration] == 'none') selectedPlaylist = 'none';
+                else if (this.settings.selectedPlaylists[iteration] == 'none') selectedPlaylist = 'none';
-                else if (selectedPlaylists[iteration] == 'FP') selectedPlaylist = 'FP';
+                else if (this.settings.selectedPlaylists[iteration] == 'FP') selectedPlaylist = 'FP';
                 else {
-                    const pl = game.playlists.entities.find(p => p._id == selectedPlaylists[iteration]);
+                    const pl = game.playlists.entities.find(p => p._id == this.settings.selectedPlaylists[iteration]);
                     selectedPlaylist = pl._id;
                     sounds = pl.sounds;
                 }
@@ -323,15 +372,15 @@ export class soundboardConfigForm extends FormApplication {
                     iteration: iteration+1,
                     playlists: playlists,
                     selectedPlaylist: selectedPlaylist,
-                    sound: selectedSounds[iteration],
+                    sound: this.settings.sounds[iteration],
                     sounds: sounds,
-                    srcPath: src[iteration],
+                    srcPath: this.settings.src[iteration],
-                    colorOn: colorOn[iteration],
+                    colorOn: this.settings.colorOn[iteration],
-                    colorOff: colorOff[iteration],
+                    colorOff: this.settings.colorOff[iteration],
-                    mode: mode[iteration],
+                    mode: this.settings.mode[iteration],
-                    volume: volume[iteration],
+                    volume: this.settings.volume[iteration],
-                    imgPath: img[iteration],
+                    imgPath: this.settings.img[iteration],
-                    name: name[iteration],
+                    name: this.settings.name[iteration],
                     styleSS: styleSS,
                     styleFP: styleFP
                 }
@@ -343,8 +392,10 @@ export class soundboardConfigForm extends FormApplication {
             };
             soundData.push(data);
         }
+        this.data = soundData;
+
         return {
-            soundData: soundData
+            soundData: this.data
         } 
     }
 
@@ -354,44 +405,148 @@ export class soundboardConfigForm extends FormApplication {
      * @param {*} formData 
      */
     async _updateObject(event, formData) {
-        let length = formData["sounds"].length;
+   
-        let img = [];
-        let soundSrc = []
-        for (let i=0; i<length; i++){
-            let name = "img"+(i+1);
-            let src = formData[name];
-            img[i] = src;
-
-            name = "src"+(i+1);
-            src = formData[name];
-            soundSrc[i] = src;
-        }
-
-        await game.settings.set(MODULE.moduleName,'soundboardSettings',{
-            selectedPlaylists: formData["playlist"],
-            sounds: formData["sounds"],
-            colorOn: formData["colorOn"],
-            colorOff: formData["colorOff"],
-            mode: formData["mode"],
-            img: img,
-            volume: formData["volume"],
-            name: formData["name"],
-            src: soundSrc
-        });
     }
 
     async activateListeners(html) {
         super.activateListeners(html);
+        const nameField = html.find("input[name='namebox']");
         const playlistSelect = html.find("select[name='playlist']");
+        const soundSelect = html.find("select[name='sounds']");
+        const soundFP = html.find("input[name2='soundSrc']");
+        const imgFP = html.find("input[name2='imgSrc']");
+        const onCP = html.find("input[name='colorOn']");
+        const offCP = html.find("input[name='colorOff']");
+        const playMode = html.find("select[name='mode']");
+        const volume = html.find("input[name='volume']");
+
+        nameField.on("change",event => {
+            let id = event.target.id.replace('name','')-1;
+            let j = Math.floor(id/this.jMax);
+            let i = id % this.jMax;
+            this.data[j].dataThis[i].name=event.target.value;
+            this.update = true;
+
+            this.settings.name[id]=event.target.value;
+            this.updateSettings(this.settings);
+        });
 
         if (playlistSelect.length > 0) {
             playlistSelect.on("change", event => {
-                let id = event.target.id.replace('playlists','');
+                let id = event.target.id.replace('playlists','')-1;
-                this.playlists[id-1] = event.target.value;
+                let j = Math.floor(id/this.jMax);
-                this.updatePlaylist = true;
+                let i = id % this.jMax;
-                this.render();
+                this.data[j].dataThis[i].selectedPlaylist=event.target.value;
+
+                let selectedPlaylist;
+                let sounds = [];
+                if (event.target.value==undefined) selectedPlaylist = 'none';
+                else if (event.target.value == 'none') selectedPlaylist = 'none';
+                else if (event.target.value == 'FP') selectedPlaylist = 'FP';
+                else {
+                    const pl = game.playlists.entities.find(p => p._id == event.target.value);
+                    selectedPlaylist = pl._id;
+                    sounds = pl.sounds;
+                }
+                this.data[j].dataThis[i].sounds=sounds;
+
+                let styleSS = "";
+                let styleFP ="display:none";
+                if (selectedPlaylist == 'FP') {
+                    styleSS = 'display:none';
+                    styleFP = ''
+                }
+                this.data[j].dataThis[i].styleSS=styleSS;
+                this.data[j].dataThis[i].styleFP=styleFP;
+                this.update = true;
+
+                this.settings.selectedPlaylists[id]=event.target.value;
+                this.updateSettings(this.settings);
             });
         }
+
+        soundSelect.on("change", event => {
+            let id = event.target.id.replace('soundSelect','')-1;
+            let j = Math.floor(id/this.jMax);
+            let i = id % this.jMax;
+            this.data[j].dataThis[i].sound=event.target.value;
+            this.update = true;
+
+            this.settings.sounds[id]=event.target.value;
+            this.updateSettings(this.settings);
+        });
+        
+        soundFP.on("change",event => {
+            let id = event.target.id.replace('srcPath','')-1;
+            let j = Math.floor(id/this.jMax);
+            let i = id % this.jMax;
+            this.data[j].dataThis[i].srcPath=event.target.value;
+            this.update = true;
+
+            this.settings.src[id]=event.target.value;
+            this.updateSettings(this.settings);
+        });
+
+        imgFP.on("change",event => {
+            let id = event.target.id.replace('imgPath','')-1;
+            let j = Math.floor(id/this.jMax);
+            let i = id % this.jMax;
+            this.data[j].dataThis[i].imgPath=event.target.value;
+            this.update = true;
+
+            this.settings.img[id]=event.target.value;
+            this.updateSettings(this.settings);
+        });
+
+        onCP.on("change",event => {
+            let id = event.target.id.replace('colorOn','')-1;
+            let j = Math.floor(id/this.jMax);
+            let i = id % this.jMax;
+            this.data[j].dataThis[i].colorOn=event.target.value;
+            this.update = true;
+
+            this.settings.colorOn[id]=event.target.value;
+            this.updateSettings(this.settings);
+        });
+
+        offCP.on("change",event => {
+            let id = event.target.id.replace('colorOff','')-1;
+            let j = Math.floor(id/this.jMax);
+            let i = id % this.jMax;
+            this.data[j].dataThis[i].colorOff=event.target.value;
+            this.update = true;
+
+            this.settings.colorOff[id]=event.target.value;
+            this.updateSettings(this.settings);
+        });
+
+        playMode.on("change",event => {
+            let id = event.target.id.replace('playmode','')-1;
+            let j = Math.floor(id/this.jMax);
+            let i = id % this.jMax;
+            this.data[j].dataThis[i].mode=event.target.value;
+            this.update = true;
+
+            this.settings.mode[id]=event.target.value;
+            this.updateSettings(this.settings);
+        });
+
+        volume.on("change",event => {
+            let id = event.target.id.replace('volume','')-1;
+            let j = Math.floor(id/this.jMax);
+            let i = id % this.jMax;
+            this.data[j].dataThis[i].volume=event.target.value;
+            this.update = true;
+
+            this.settings.volume[id]=event.target.value;
+            this.updateSettings(this.settings); 
+        });
+    }
+    
+    async updateSettings(settings){
+        await game.settings.set(MODULE.moduleName,'soundboardSettings',settings);
+        if (MODULE.enableModule) soundboard.updateAll();
+        this.render();
     }
     
 }

src/move.js

@@ -6,7 +6,7 @@ export class Move{
     }
 
     keyPress(settings){
-        console.log('move',settings)
+        if (canvas.scene == null) return;
         let dir = settings.dir;
         let mode = settings.mode;
         if (mode == undefined) mode = 0;

src/othercontrols.js

@@ -133,6 +133,7 @@ export class OtherControls{
     //////////////////////////////////////////////////////////////////////////////////////////////////
 
     updateScene(settings,context){
+        if (canvas.scene == null) return;
         let func = settings.sceneFunction;
         if (func == undefined) func = 0;
 
@@ -168,7 +169,6 @@ export class OtherControls{
                 if (settings.displaySceneIcon) src = scene.img;
                 if (scene.active) name += "\n(Active)";
             }
-            
         }
         else if (func == 1) {   //all scenes
             let scene = game.scenes.apps[1].entities.find(p=>p.data.name == name);
@@ -305,6 +305,7 @@ export class OtherControls{
     }
 
     keyPressControl(settings){
+        if (canvas.scene == null) return;
         let control = settings.control;
         if (control == undefined) control = 0;
 
@@ -474,7 +475,8 @@ export class OtherControls{
         }
         else if (func == 2){    //display darkness
             src = 'action/images/other/darkness/darkness.png';
-            let darkness = Math.floor(canvas.scene.data.darkness*100)/100;
+            let darkness = '';
+            if (canvas.scene != null) darkness = Math.floor(canvas.scene.data.darkness*100)/100;
             txt += darkness;
         }
         streamDeck.setTitle(txt,context);
@@ -482,6 +484,7 @@ export class OtherControls{
     }
 
     keyPressDarkness(settings) {
+        if (canvas.scene == null) return;
         let func = settings.darknessFunction;
         if (func == undefined) func = 0;
 
@@ -659,7 +662,6 @@ export class OtherControls{
         let ringOnColor = settings.onRing;
         if (ringOnColor == undefined) ringOnColor = '#00FF00';
 
-        
         if (compendium.rendered) ringColor = ringOnColor;
         else ringColor = ringOffColor;
 
@@ -698,8 +700,6 @@ export class OtherControls{
 
         let ringOnColor = settings.onRing;
         if (ringOnColor == undefined) ringOnColor = '#00FF00';
-
-        
        
         if (journal.sheet.rendered) ringColor = ringOnColor;
         else ringColor = ringOffColor;
@@ -714,7 +714,7 @@ export class OtherControls{
 
         const journal = game.journal.entries.find(p=>p.name == name);
         if (journal == undefined) return;
-        //if (journal.sheet.rendered) journal.close();
+        
         journal.render(true);
     }
 }

src/playlist.js

@@ -136,22 +136,21 @@ export class PlaylistControl{
         }
         else {
             let playing = game.playlists.playing;
-            console.log(playing);
+            let settings = game.settings.get(MODULE.moduleName,'playlists');
-            let selectedPlaylists = game.settings.get(MODULE.moduleName,'selectedPlaylists');
+            let selectedPlaylists = settings.selectedPlaylist;
-            console.log(selectedPlaylists);
             for (let i=0; i<playing.length; i++){
                 const playlistNr = selectedPlaylists.findIndex(p => p == playing[i]._id);
-                const mode = game.settings.get(MODULE.moduleName,'selectedPlaylistMethod')[playlistNr];
+                const mode = settings.playlistMode[playlistNr];
                 if (mode == 0) playing[i].stopAll();
-                console.log(playlistNr,mode);
             }
-            
         }
     }
 
     getPlaylist(num){
-        let playlistId = game.settings.get(MODULE.moduleName,'selectedPlaylists')[num];
+        let selectedPlaylists = game.settings.get(MODULE.moduleName,'playlists').selectedPlaylist;
-        return game.playlists.entities.find(p => p._id == playlistId);
+        if (selectedPlaylists != undefined) 
+            return game.playlists.entities.find(p => p._id == selectedPlaylists[num]);
+        else return undefined;
     }
 
     keyPress(settings,context){
@@ -202,9 +201,9 @@ export class PlaylistControl{
             playlist.stopAll();
             return;
         }
-        let mode = game.settings.get(MODULE.moduleName,'selectedPlaylistMethod')[playlistNr];
+        let mode = game.settings.get(MODULE.moduleName,'playlists').playlistMode[playlistNr];
         if (mode == 0) {
-            mode = game.settings.get(MODULE.moduleName,'playlistMethod');
+            mode = game.settings.get(MODULE.moduleName,'playlists').playMode;
             if (mode == 2) await this.stopAll();
         }
         playlist.playAll();
@@ -216,10 +215,9 @@ export class PlaylistControl{
             play = false;
         else {
             play = true;
-            let mode = game.settings.get(MODULE.moduleName,'selectedPlaylistMethod')[playlistNr];
+            let mode = game.settings.get(MODULE.moduleName,'playlists').playlistMode[playlistNr];
-            console.log('mode',mode);
             if (mode == 0) {
-                mode = game.settings.get(MODULE.moduleName,'playlistMethod');
+                mode = game.settings.get(MODULE.moduleName,'playlists').playMode;
                 if (mode == 1) await playlist.stopAll();
                 else if (mode == 2) await this.stopAll();
             }
@@ -228,7 +226,4 @@ export class PlaylistControl{
         await playlist.updateEmbeddedEntity("PlaylistSound", {_id: track._id, playing: play});
         playlist.update({playing: play});
     }
-
-
-
 }

src/settings.js

@@ -42,15 +42,6 @@ export const registerSettings = function() {
     /**
      * Playlist soundboard
      */
-    game.settings.register(MODULE.moduleName,'playlistMethod', {
-        name: "Playlist play method",
-        scope: "world",
-        config: false,
-        type:Number,
-        default:0,
-        choices:["MaterialDeck.Playlist.Playmethod.Unrestricted","MaterialDeck.Playlist.Playmethod.OneTrackPlaylist","MaterialDeck.Playlist.Playmethod.OneTrackTotal"],
-    });
-
     game.settings.registerMenu(MODULE.moduleName, 'playlistConfigMenu',{
         name: "MaterialDeck.Sett.PlaylistConfig",
         label: "MaterialDeck.Sett.PlaylistConfig",
@@ -58,7 +49,7 @@ export const registerSettings = function() {
         restricted: true
     });
 
-    game.settings.register(MODULE.moduleName, 'selectedPlaylists', {
+    game.settings.register(MODULE.moduleName, 'playlists', {
         name: "selectedPlaylists",
         scope: "world",
         type: Object,
@@ -66,22 +57,6 @@ export const registerSettings = function() {
         config: false
     });
 
-    game.settings.register(MODULE.moduleName, 'selectedPlaylistMethod', {
-        name: "selectedPlaylistMethod",
-        scope: "world",
-        type: Object,
-        default: {},
-        config: false
-    });
-
-    game.settings.register(MODULE.moduleName, 'numberOfPlaylists', {
-        name: "numberOfPlaylists",
-        scope: "world",
-        type: Number,
-        default: 9,
-        config: false
-    });
-
     /**
      * Macro Board
      */

src/soundboard.js

@@ -45,8 +45,8 @@ export class SoundboardControl{
             else 
                 ringColor = soundboardSettings.colorOn[soundNr];
 
-            if (settings.displayName) txt = soundboardSettings.name[soundNr];
+            if (settings.displayName && soundboardSettings.name != undefined) txt = soundboardSettings.name[soundNr];
-            if (settings.displayIcon) src = soundboardSettings.img[soundNr];
+            if (settings.displayIcon && soundboardSettings.img != undefined) src = soundboardSettings.img[soundNr];
             streamDeck.setTitle(txt,context);
             streamDeck.setIcon(1,context,src,background,2,ringColor);
         }
@@ -119,7 +119,8 @@ export class SoundboardControl{
 
     async playSound(soundNr,repeat,play){  
         const soundBoardSettings = game.settings.get(MODULE.moduleName,'soundboardSettings');
-        const playlistId = soundBoardSettings.selectedPlaylists[soundNr];
+        let playlistId;
+        if (soundBoardSettings.selectedPlaylists != undefined) playlistId = soundBoardSettings.selectedPlaylists[soundNr];
         let src;
         if (playlistId == "" || playlistId == undefined) return;
         if (playlistId == 'none') return;
@@ -176,6 +177,5 @@ export class SoundboardControl{
             this.activeSounds[soundNr] = false;
         }
         this.updateAll();
-        
     }
 }

src/streamDeck.js

@@ -61,7 +61,6 @@ export class StreamDeck{
         }
         return false;
     }
-
     
     /*
     *  Get syllables of a word. Taken from: https://stackoverflow.com/a/49407494
@@ -70,12 +69,15 @@ export class StreamDeck{
         return words.match(this.syllableRegex);
     }
 
-    formatTitle(txt){
+    formatTitle(txt=''){
         let txtArrayOriginal = txt.split("\n");
         let txtArray = [];
         let counter = 0;
         for (let i=0; i<txtArrayOriginal.length; i++){
-            
+            if (i>0){
+                txtArray[counter] = '';
+                counter++;
+            }
             let txtArrayTemp = txtArrayOriginal[i].split(" ");
             for (let j=0; j<txtArrayTemp.length; j++){
                 txtArray[counter] = txtArrayTemp[j];
@@ -133,6 +135,7 @@ export class StreamDeck{
     }
 
     setTitle(txt,context){
+        if (txt == null || txt == undefined) txt = '';
         txt = this.formatTitle(txt);
         for (let i=0; i<32; i++){
             if (this.buttonContext[i] == undefined) continue;
@@ -168,8 +171,6 @@ export class StreamDeck{
     }
 
     setImage(image,context){
-        //var image = "data:image/svg+xml;charset=utf8,<?xml version=\"1.0\" encoding=\"iso-8859-1\"?><!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  --><svg version=\"1.1\" id=\"Capa_1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" x=\"0px\" y=\"0px\"	 viewBox=\"0 0 288 288\" style=\"enable-background:new 0 0 288 288;\" xml:space=\"preserve\">	 <style>	 	.text {			 font-family: sans-serif;			 fill: red;			 font-size: 10em;		 }	</style><g>  <text x=\"0px\" y=\"100px\"  class=\"text\">GPUUTILIZATION</text></g></svg>";
-
         var json = {
             target: "SD",
             event: "setImage",
@@ -182,7 +183,8 @@ export class StreamDeck{
         MODULE.sendWS(JSON.stringify(json));
     }
 
-    setIcon(iconLocation, context,src,background = '#000000',ring=0,ringColor = "#000000",overlay=false){
+    setIcon(iconLocation, context,src='',background = '#000000',ring=0,ringColor = "#000000",overlay=false){
+        if (src == null || src == undefined) src = '';
         for (let i=0; i<32; i++){
             if (this.buttonContext[i] == undefined) continue;
             if (this.buttonContext[i].context == context) {
@@ -266,7 +268,6 @@ export class StreamDeck{
     getImage(data){
         if (data == undefined) 
             return;
-        //console.log('image',data)
         const context = data.context;
         var url = data.url;
         const format = data.format;
@@ -288,7 +289,7 @@ export class StreamDeck{
             canvas.id = canvasId;
             canvas.width="144";
             canvas.height="144";
-            canvas.style="background-color:transparent";
+            canvas.style="background-color:transparent;visibility:hidden";
             document.getElementById('sdCanvasBox').appendChild(canvas); // adds the canvas to #someBox
         }
         this.counter++;

src/token.js

@@ -18,62 +18,125 @@ export class TokenControl{
     pushData(tokenId,settings,context,ring=0,ringColor='#000000'){
         let name = false;
         let icon = false;
-        let type = 0;
+        let stats =  settings.stats;
         let background = "#000000";
 
         if (settings.displayIcon) icon = true;
         if (settings.displayName) name = true;
-        if (settings.stats != undefined) type = settings.stats;
+        if (stats == undefined) stats = 0;
         if (settings.background) background = settings.background;
-        
+
+        let system = settings.system;
+        if (system == undefined) system = 'dnd5e';
+
         let tokenName = "";
-        let hp = "";
-        let AC = "";
-        let speed = "";
-        let initiative = "";
         let txt = "";
         let iconSrc = "";
         if (tokenId != undefined) {
             let token = canvas.tokens.children[0].children.find(p => p.id == tokenId);
             tokenName = token.data.name;
+            if (name) txt += tokenName;
+            if (name && stats != 0) txt += "\n";
             iconSrc += token.data.img;
             let actor = canvas.tokens.children[0].children.find(p => p.id == tokenId).actor;
-            let system = game.system.id;
+            if (system == 'dnd5e' && game.system.id == 'dnd5e'){
-            if (system == 'dnd5e'){
                 let attributes = actor.data.data.attributes;
-                let hpCurrent = attributes.hp.value;
+                if (stats == 'HP') txt += attributes.hp.value + "/" + attributes.hp.max;
-                let hpMax = attributes.hp.max;
+                else if (stats == 'TempHP') {
-                hp = hpCurrent + "/" + hpMax;
+                    txt += attributes.hp.temp;
-                AC = attributes.ac.value;
+                    if (attributes.hp.tempmax != null)
-                
+                    txt += "/" + attributes.hp.tempmax;
-                if (attributes.speed._deprecated){
-                    if (attributes.movement.burrow > 0) speed += attributes.movement.burrow + attributes.movement.units + " burrow";
-                    if (attributes.movement.climb > 0) {
-                        if (speed.length > 0) speed += '\n';
-                        speed += attributes.movement.climb + attributes.movement.units + " climb";
-                    }
-                    if (attributes.movement.fly > 0) {
-                        if (speed.length > 0) speed += '\n';
-                        speed += attributes.movement.fly + attributes.movement.units + " fly";
-                    }
-                    if (attributes.movement.hover > 0) {
-                        if (speed.length > 0) speed += '\n';
-                        speed += attributes.movement.hover + attributes.movement.units + " hover";
-                    }
-                    if (attributes.movement.swim > 0) {
-                        if (speed.length > 0) speed += '\n';
-                        speed += attributes.movement.swim + attributes.movement.units + " swim";
-                    }
-                    if (attributes.movement.walk > 0) {
-                        if (speed.length > 0) speed += '\n';
-                        speed += attributes.movement.walk + attributes.movement.units + " walk";
-                    }
                 }
-                else {
+                else if (stats == 'AC') txt += attributes.ac.value;
-                    speed = attributes.speed.value;
+                else if (stats == 'Speed'){
-                    if (attributes.speed.special.length > 0) speed + "\n" + attributes.speed.special;
+                    let speed = "";
+                    if (attributes.speed._deprecated){
+                        if (attributes.movement.burrow > 0) speed += game.i18n.localize("DND5E.MovementBurrow") + ': ' +  attributes.movement.burrow + attributes.movement.units;
+                        if (attributes.movement.climb > 0) {
+                            if (speed.length > 0) speed += '\n';
+                            speed += game.i18n.localize("DND5E.MovementClimb") + ': ' + attributes.movement.climb + attributes.movement.units;
+                        }
+                        if (attributes.movement.fly > 0) {
+                            if (speed.length > 0) speed += '\n';
+                            speed += game.i18n.localize("DND5E.MovementFly") + ': ' + attributes.movement.fly + attributes.movement.units;
+                        }
+                        if (attributes.movement.hover > 0) {
+                            if (speed.length > 0) speed += '\n';
+                            speed += game.i18n.localize("DND5E.MovementHover") + ': ' + attributes.movement.hover + attributes.movement.units;
+                        }
+                        if (attributes.movement.swim > 0) {
+                            if (speed.length > 0) speed += '\n';
+                            speed += game.i18n.localize("DND5E.MovementSwim") + ': ' + attributes.movement.swim + attributes.movement.units;
+                        }
+                        if (attributes.movement.walk > 0) {
+                            if (speed.length > 0) speed += '\n';
+                            speed += game.i18n.localize("DND5E.MovementWalk") + ': ' + attributes.movement.walk + attributes.movement.units;
+                        }
+                    }
+                    else {
+                        speed = attributes.speed.value;
+                        if (attributes.speed.special.length > 0) speed + "\n" + attributes.speed.special;
+                    }
+                    txt += speed;
+                }
+                else if (stats == 'Init') txt += attributes.init.total;
+                else if (stats == 'PassivePerception') txt += actor.data.data.skills.prc.passive;
+                else if (stats == 'PassiveInvestigation') txt += actor.data.data.skills.inv.passive;
+            }
+            else if (system == 'dnd3.5e' && game.system.id == 'D35E'){
+                let attributes = actor.data.data.attributes;
+                if (stats == 'HP') txt += attributes.hp.value + "/" + attributes.hp.max;
+                else if (stats == 'TempHP') {
+                    if (attributes.hp.temp == null) txt += '0';
+                    else txt += attributes.hp.temp;
+                }
+                else if (stats == 'AC') txt += attributes.ac.normal.total;
+                else if (stats == 'Speed'){
+                    let speed = "";
+                    if (attributes.speed.burrow.total > 0) speed += 'Burrow: ' +  attributes.speed.burrow.total + 'Ft';
+                    if (attributes.speed.climb.total > 0) {
+                        if (speed.length > 0) speed += '\n';
+                        speed += 'Climb: ' + attributes.speed.climb.total + 'Ft';
+                    }
+                    if (attributes.speed.fly.total > 0) {
+                        if (speed.length > 0) speed += '\n';
+                        speed += 'Fly: ' + attributes.speed.fly.total + 'Ft';
+                    }
+                    if (attributes.speed.land.total > 0) {
+                        if (speed.length > 0) speed += '\n';
+                        speed += 'Land: ' + attributes.speed.land.total + 'Ft';
+                    }
+                    if (attributes.speed.swim.total > 0) {
+                        if (speed.length > 0) speed += '\n';
+                        speed += 'Swim: ' + attributes.speed.swim.total + 'Ft';
+                    }
+                    txt += speed;
+                }
+                else if (stats == 'Init') txt += attributes.init.total;
+            }
+            else if (system == 'pf2e' && game.system.id == 'pf2e'){
+                let attributes = actor.data.data.attributes;
+                if (stats == 'HP') txt += attributes.hp.value + "/" + attributes.hp.max;
+                else if (stats == 'TempHP') {
+                    if (attributes.hp.temp == null) txt += '0';
+                    else {
+                        txt += attributes.hp.temp;
+                        if (attributes.hp.tempmax > 0) txt += '/' + attributes.hp.tempmax;
+                    }  
+                }
+                else if (stats == 'AC') txt += attributes.ac.value;
+                else if (stats == 'Speed'){
+                    let speed = "Land: " + attributes.speed.value.replace('feet','') + ' feet';
+                    const otherSpeeds = attributes.speed.otherSpeeds;
+                    if (otherSpeeds.length > 0)
+                        for (let i=0; i<otherSpeeds.length; i++)
+                            speed += '\n' + otherSpeeds[i].type + ": " + otherSpeeds[i].value;    
+                    txt += speed;
+                }
+                else if (stats == 'Init') {
+                    let init = attributes.initiative.totalModifier;
+                    if (init != undefined) txt += init;
                 }
-                initiative = attributes.init.total;
             }
             else {
                 //Other systems
@@ -82,6 +145,7 @@ export class TokenControl{
 
 
             }
+
             if (settings.onClick == 4) { //toggle visibility
                 ring = 1;
                 if (token.data.hidden){
@@ -119,18 +183,29 @@ export class TokenControl{
                 ring = 1;
                 let condition = settings.condition;
                 if (condition == undefined) condition = 0;
-
                 if (condition == 0 && icon == false){
                     iconSrc = window.CONFIG.controlIcons.effects;
                 }
                 else if (icon == false) {
-                    let effect = CONFIG.statusEffects.find(e => e.id === this.getStatusId(condition));
+                    if ((system == 'dnd5e' && game.system.id == 'dnd5e') || (system == 'dnd3.5e' && game.system.id == 'D35E')){
-                    iconSrc = effect.icon;
+                        let effect = CONFIG.statusEffects.find(e => e.id === this.getStatusId(condition));
-                    let effects = token.actor.effects.entries;
+                        iconSrc = effect.icon;
-                    let active = effects.find(e => e.isTemporary === this.getStatusId(condition));
+                        let effects = token.actor.effects.entries;
-                    if (active != undefined){
+                        let active = effects.find(e => e.isTemporary === this.getStatusId(condition));
-                        ring = 2;
+                        if (active != undefined){
-                        ringColor = "#FF7B00";
+                            ring = 2;
+                            ringColor = "#FF7B00";
+                        }
+                    }
+                    else if (system == 'pf2e' && game.system.id == 'pf2e') {
+                        let effects = token.data.effects;
+                        for (let i=0; i<effects.length; i++){
+                            if (CONFIG.statusEffects[condition-1] == effects[i]){
+                                ring = 2;
+                                ringColor = "#FF7B00";
+                            }       
+                        }
+                        iconSrc = CONFIG.statusEffects[condition-1];
                     }
                 } 
                 streamDeck.setIcon(1,context,iconSrc,background,ring,ringColor,true);
@@ -164,19 +239,16 @@ export class TokenControl{
                     iconSrc = window.CONFIG.controlIcons.effects;
                 }
                 else if (icon == false) {
-                    iconSrc = CONFIG.statusEffects.find(e => e.id === this.getStatusId(condition)).icon;
+                    if ((system == 'dnd5e' && game.system.id == 'dnd5e') || (system == 'dnd3.5e' && game.system.id == 'D35E'))
+                        iconSrc = CONFIG.statusEffects.find(e => e.id === this.getStatusId(condition)).icon;
+                    else if (system == 'pf2e' && game.system.id == 'pf2e')
+                        iconSrc = CONFIG.statusEffects[condition-1];
                 } 
                 streamDeck.setIcon(1,context,iconSrc,background,1,'#000000',true);
             }
         }
         if (icon) streamDeck.setIcon(1,context,iconSrc,background,ring,ringColor);
         
-        if (name) txt += tokenName;
-        if (name && type > 0) txt += "\n";
-        if (type == 1) txt += hp;
-        else if (type == 2) txt += AC;
-        else if (type == 3) txt += speed;
-        else if (type == 4) txt += initiative;
         streamDeck.setTitle(txt,context);
     }
     
@@ -185,11 +257,14 @@ export class TokenControl{
         const tokenId = MODULE.selectedTokenId;
 
         let onClick = settings.onClick;
-        if (onClick == undefined) conClick = 0;
+        if (onClick == undefined) onClick = 0;
 
         const token = canvas.tokens.children[0].children.find(p => p.id == tokenId);
         if (token == undefined) return;
 
+        let system = settings.system;
+        if (system == undefined) system = 'dnd5e';
+
         if (onClick == 0)   //Do nothing
             return;
         else if (onClick == 1){ //center on token
@@ -218,12 +293,20 @@ export class TokenControl{
             if (condition == 0){
                 const effects = token.actor.effects.entries;
                 for (let i=0; i<effects.length; i++){
-                    const effect = CONFIG.statusEffects.find(e => e.icon === effects[i].data.icon);
+                    let effect;
+                    if ((system == 'dnd5e' && game.system.id == 'dnd5e') || (system == 'dnd3.5e' && game.system.id == 'D35E'))
+                        effect = CONFIG.statusEffects.find(e => e.icon === effects[i].data.icon);
+                    else if (system == 'pf2e' && game.system.id == 'pf2e')
+                        effect = CONFIG.statusEffects[condition-1];
                     await token.toggleEffect(effect)
                 }
             }
             else {
-                const effect = CONFIG.statusEffects.find(e => e.id === this.getStatusId(condition));
+                let effect;
+                if ((system == 'dnd5e' && game.system.id == 'dnd5e') || (system == 'dnd3.5e' && game.system.id == 'D35E'))
+                    effect = CONFIG.statusEffects.find(e => e.id === this.getStatusId(condition));
+                else if (system == 'pf2e' && game.system.id == 'pf2e')
+                    effect = CONFIG.statusEffects[condition-1];
                 token.toggleEffect(effect);
             }
             

templates/macroConfig.html

@@ -16,7 +16,7 @@
                         {{localize "MaterialDeck.Macro"}} {{this.iteration}}
                     </div>
                     <div>
-                        <select name="macros" class="macros-select" default="" style="max-width:140px;">
+                        <select name="macros" class="macros-select" id="macros{{this.iteration}}" default="" style="max-width:140px;">
                             {{#select this.macro}}
                                 <option value="">{{localize "MaterialDeck.None"}}</option>
                                 {{#each macros}}
@@ -27,19 +27,15 @@
                     </div>
                     {{#if this.furnace}}
                         <label>{{localize "MaterialDeck.FurnaceArgs"}}</label>
-                        <input type="text" name="args" value="{{this.args}}">
+                        <input type="text" name="args" id="args{{this.iteration}}" value="{{this.args}}">
                     {{/if}}
                     
                     <div class="flex-container" style="display:flex;flex-direction:row;padding-top:10px">  
                         <label style="flex:1">{{localize "MaterialDeck.Background"}}</label>
-                        <input style="flex:1" type="color" name="colorPicker" data-dtype="String" value="{{this.color}}">
+                        <input style="flex:1" type="color" name="colorPicker" id="colorpicker{{this.iteration}}" data-dtype="String" value="{{this.color}}">
                     </div>
                 </div>
             {{/each}}
         </div>
     {{/each}}
-    <button type="submit" name="submit">
-        <i class="far fa-save"></i> {{localize "MaterialDeck.Save"}}
-    </button>
-
 </form>

templates/playlistConfig.html

@@ -4,8 +4,8 @@
     </div>
     <div class="form-group">     
         <label>{{localize "MaterialDeck.PL.Mode"}}</label>
-        <select name="playMethod" class="playMethod" default="">
+        <select name="playMode" class="playMode" default="">
-            {{#select playMethod}}
+            {{#select playMode}}
                 <option value="0">{{localize "MaterialDeck.PL.Unrestricted"}}</option>
                 <option value="1">{{localize "MaterialDeck.PL.OneTrackPlaylist"}}</option>
                 <option value="2">{{localize "MaterialDeck.PL.OneTrackTotal"}}</option>
@@ -22,7 +22,7 @@
     {{#each playlistData}}
         <div class="form-group">
             <label>{{localize "MaterialDeck.Playlist"}} {{this.iteration}}</label>
-            <select name="selectedPlaylist" class="playlist-select" default="">
+            <select name="selectedPlaylist" class="playlist-select" id="playlist{{this.iteration}}" default="">
                 {{#select this.playlist}}
                     <option value="">{{localize "MaterialDeck.None"}}</option>
                     {{#each this.playlists}}
@@ -31,8 +31,8 @@
                 {{/select}}
             </select>
             &nbsp;
-            <select name="playlistMethod" class="playlistMethod" default="">
+            <select name="playlistMode" class="playlistMode" id="playlistMode{{this.iteration}}" default="">
-                {{#select this.playlistMethod}}
+                {{#select this.playlistMode}}
                     <option value="0">{{localize "MaterialDeck.PL.Mode"}}</option>
                     <option value="1">{{localize "MaterialDeck.PL.Unrestricted"}}</option>
                     <option value="2">{{localize "MaterialDeck.PL.OneTrack"}}</option>
@@ -40,9 +40,4 @@
             </select>
         </div>
     {{/each}}
-
-    <button type="submit" name="submit">
-        <i class="far fa-save"></i> {{localize "MaterialDeck.Save"}}
-    </button>
-
 </form>

templates/soundboardConfig.html

@@ -18,13 +18,13 @@
                     <div style="text-align:center;">                    
                         {{localize "MaterialDeck.Name"}}
                     </div>
-                    <input type="text" name="name" value="{{this.name}}">
+                    <input type="text" name="namebox" value="{{this.name}}" id="name{{this.iteration}}" style="width:100%;" >
 
                     <div style="text-align:center;">                    
                         {{localize "MaterialDeck.Playlist"}}
                     </div>
                     <div>
-                        <select name="playlist" class="playlist-select" default="" style="width:132px;" id="playlists{{this.iteration}}">
+                        <select name="playlist" class="playlist-select" default="" style="width:100%;" id="playlists{{this.iteration}}">
                             {{#select this.selectedPlaylist}}
                                 {{#each playlists}}
                                 <option value="{{this.id}}">{{this.name}}</option>
@@ -37,7 +37,7 @@
                         {{localize "MaterialDeck.Sound"}}
                     </div>
                     <div class="form-fields" style={{this.styleSS}}>
-                        <select name="sounds" class="sounds-select" default="" style="width:132px;" id="soundSelect{{this.iteration}}">
+                        <select name="sounds" class="sounds-select" default="" style="width:100%;" id="soundSelect{{this.iteration}}">
                             {{#select this.sound}}
                                 <option value="">{{localize "MaterialDeck.None"}}</option>
                                 {{#each sounds}}
@@ -50,7 +50,7 @@
                         <button type="button" class="file-picker" data-type="audio" data-target="src{{this.iteration}}" title="Browse Files" tabindex="-1">
                             <i class="fas fa-file-import fa-fw"></i>
                         </button>
-                        <input class="image" type="text" name="src{{this.iteration}}" id="srcPath{{this.iteration}}" placeholder="path/audio.mp3" value={{this.srcPath}}>
+                        <input class="image" type="text" name="src{{this.iteration}}" name2="soundSrc" id="srcPath{{this.iteration}}" placeholder="path/audio.mp3" value={{this.srcPath}}>
                     </div>
                     <div style="text-align:center;">                    
                         {{localize "MaterialDeck.Icon"}}
@@ -59,7 +59,7 @@
                         <button type="button" class="file-picker" data-type="image" data-target="img{{this.iteration}}" title="Browse Files" tabindex="-1">
                             <i class="fas fa-file-import fa-fw"></i>
                         </button>
-                        <input class="image" type="text" name="img{{this.iteration}}" id="imgPath{{this.iteration}}" placeholder="path/image.png" value={{this.imgPath}}>
+                        <input class="image" type="text" name="img{{this.iteration}}" name2="imgSrc"  id="imgPath{{this.iteration}}" placeholder="path/image.png" value={{this.imgPath}}>
                     </div>
                     <div class="flex-container" style="display:flex;flex-direction:row;padding-top:5px">  
                         <label style="flex:1">{{localize "MaterialDeck.On"}}&nbsp;&nbsp;&nbsp;</label>
@@ -70,7 +70,7 @@
                     
                     <div class="form-group options">
                         <label>{{localize "MaterialDeck.Playback"}}</label>
-                        <select name="mode" style="flex:1">
+                        <select name="mode" id="playmode{{this.iteration}}" style="flex:1">
                             {{#select this.mode}}
                             <option value="0">{{localize "MaterialDeck.Once"}}</option>
                             <option value="1">{{localize "MaterialDeck.Repeat"}}</option>
@@ -87,8 +87,4 @@
             {{/each}}
         </div>
     {{/each}}
-    <button type="submit" name="submit">
-        <i class="far fa-save"></i> {{localize "MaterialDeck.Save"}}
-    </button>
-
 </form>