v1.4.5

WFRP4e implementation

.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: MaterialFoundry
+open_collective: # Replace with a single Open Collective username
+ko_fi: materialfoundry
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,28 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: "[BUG]"
+labels: bug
+assignees: ''
+
+---
+
+**Setup**
+ - OS: [e.g. windows]
+ - Browser: [e.g. chrome, safari, Foundry app]
+ - Module version: [e.g. 1.2.5]
+ - Foundry version: [e.g. 0.8.6]
+ - Gaming system & version: [e.g. dnd5e 1.3.3]
+ - Any other modules enabled: [yes/no]
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Console Log**
+Please check the console (F12) to see if there are any errors and also include them.
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: "[FEATURE]"
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/other-issues.md

@@ -0,0 +1,10 @@
+---
+name: Other issues
+about: For any other issues
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+

DEVGUIDE.md

@@ -0,0 +1,40 @@
+
+# Dev Guide
+
+In addition to this repo, you will also need to check out the [MaterialDeck_SD github repo](https://github.com/CDeenen/MaterialDeck_SD).
+
+## Module Development 
+
+### Make a new system.js file
+
+In the [src/systems](src/systems) directory, create a new system file by copying and pasting a similar system to it; for example, `cp demonlord.js wfrp4.js`
+You then need to go through all the functions in there and make sure that the correct data is set.
+
+### Update TokenHelper
+In [src/systems/TokenHelper.js](src/systems/TokenHelper.js), you need to add an `import {}` for your new system.
+
+In the same file, in the setSystem() function, you need to wire in your system to the if/else block.
+
+## Debugging
+
+It's possible to debug on the Stream Deck, so you can do `console.log`. Just follow the instructions [from elgato here](https://developer.elgato.com/documentation/stream-deck/sdk/create-your-own-plugin/).  After editing the code for the plugin, you need to either refresh by refreshing the debug window, or by deselecting the current button, and selecting it again.
+
+When you go to the debugging page, there should be multiple options. With the property inspector open, you should connect to the one with property inspector in its name. If you go to to propertyinspector/js/common.js, near the top there's the debugEn variable. Set it to true, and you should get tons of messages, especially if you change any settings.
+In the module, in MaterialDeck.js, at line 60, there's //console.log("Received",data);. If you uncomment that, it'll log everything that's send from the SD to the module. Might be helpful for debugging.
+
+
+## Streamdeck
+
+To enable logging on the streamdeck, [follow these instructions](https://developer.elgato.com/documentation/stream-deck/sdk/create-your-own-plugin/) from Elgato.
+
+The plugin in Windows is located at (Windows) `AppData/Roaming/Elgato/StreamDeck/Plugins/com.cdeenen.materialdeck.sdPlugin`
+In `propertyinspector/js/common.js::getStats()` there are various functions that are used to get the relevant options to show up in the SD plugin. Each array element has a value and a name, you should keep the value the same, but the name can be whatever you like. I think you'll be able to figure out how to add stuff for wfrp by looking at the others.
+
+
+## Property discovery
+In a Foundry client browser instance, if you go to the dev console, you can browser your tokens via the `canvas.tokens` path, for example `canvas.tokens.children[0].children[0].actor.data`.
+
+## Module Deployment
+If you make changes to files in this project, you'll need to copy the changed files to your Foundry install folder, probably found here: `C:\Users\$USER\AppData\Local\FoundryVTT\Data\modules\MaterialDeck`.
+
+If you change the `MaterialDeck_SD` code (for example, `propertyinspector\js\common.js`), you will need to copy that file to the Elgato streamdeck plugins directory, probably found here: `C:\Users\$USER\AppData\Roaming\Elgato\StreamDeck\Plugins\com.cdeenen.materialdeck.sdPlugin`. 

MaterialDeck.js

@@ -32,6 +32,8 @@ let controlTokenTimer;
 
 export let sdVersion;
 export let msVersion;
+
+let updateDialog;
        
 //CONFIG.debug.hooks = true;
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -57,7 +59,7 @@ let WSconnected = false;
 async function analyzeWSmessage(msg){
     if (enableModule == false) return;
     const data = JSON.parse(msg);
-    //console.log("Received",data);
+//    console.log("Received",data);
 
     if (data.type == "connected" && data.data == "SD"){
         const msg = {
@@ -86,8 +88,8 @@ async function analyzeWSmessage(msg){
         
         sdVersion = data.version;
 
-        if (data.version < minimumSDversion) {
-            let d = new Dialog({
+        if (data.version < minimumSDversion && updateDialog == undefined) {
+            updateDialog = new Dialog({
                 title: "Material Deck: Update Needed",
                 content: "<p>The Stream Deck plugin version you're using is v" + data.version + ", which is incompatible with this verion of the module.<br>Update to v" + minimumSDversion + " or newer.</p>",
                 buttons: {
@@ -103,7 +105,7 @@ async function analyzeWSmessage(msg){
                 },
                 default: "download"
             });
-            d.render(true);
+            updateDialog.render(true);
         }
     }
 
@@ -225,19 +227,22 @@ let messageCount = 0;
  */
 function resetWS(){
     const maxMessages = game.settings.get(moduleName, 'nrOfConnMessages');
-    if (maxMessages == 0 || maxMessages > messageCount) {
-        messageCount++;
-        const countString = maxMessages == 0 ? "" : " (" + messageCount + "/" + maxMessages + ")";
-        if (wsOpen) {
-            ui.notifications.warn("Material Deck: "+game.i18n.localize("MaterialDeck.Notifications.Disconnected"));
-            wsOpen = false;
-            messageCount = 0;
-        }
-        else ui.notifications.warn("Material Deck: "+game.i18n.localize("MaterialDeck.Notifications.ConnectFail") + countString);
+    if (wsOpen) {
+        ui.notifications.warn("Material Deck: "+game.i18n.localize("MaterialDeck.Notifications.Disconnected"));
+        wsOpen = false;
+        messageCount = 0;
+        WSconnected = false;
+        startWebsocket();
+    }
+    else if (ws.readyState == 3){
+        if (maxMessages == 0 || maxMessages > messageCount) {
+            messageCount++;
+            const countString = maxMessages == 0 ? "" : " (" + messageCount + "/" + maxMessages + ")";
+            ui.notifications.warn("Material Deck: "+game.i18n.localize("MaterialDeck.Notifications.ConnectFail") + countString);
+        }
+        WSconnected = false;
+        startWebsocket();
     }
-    
-    WSconnected = false;
-    startWebsocket();
 }
 
 export function sendWS(txt){
@@ -275,8 +280,6 @@ Hooks.once('ready', async()=>{
     registerSettings();
     enableModule = (game.settings.get(moduleName,'Enable')) ? true : false;
 
-    
-    
     soundboard = new SoundboardControl();
     streamDeck = new StreamDeck();
     tokenControl = new TokenControl();
@@ -365,12 +368,6 @@ Hooks.once('ready', async()=>{
         }
     }
 
-
-
-
-
-
-
     if (enableModule == false) return;
     if (getPermission('ENABLE') == false) {
         ready = true;
@@ -390,7 +387,7 @@ Hooks.on('updateToken',(scene,token)=>{
     if (macroControl != undefined) macroControl.updateAll();
 });
 
-Hooks.on('updateActor',(scene,actor)=>{
+Hooks.on('updateActor',(actor)=>{
     if (enableModule == false || ready == false) return;
     let children = canvas.tokens.children[0].children;
     for (let i=0; i<children.length; i++){
@@ -472,6 +469,10 @@ Hooks.on('renderSidebarTab',(app)=>{
     if (enableModule == false || ready == false) return;
     if (otherControls != undefined) otherControls.updateAll(options);
     if (sceneControl != undefined) sceneControl.updateAll();
+    if (document.getElementsByClassName("roll-type-select")[0] != undefined)
+        document.getElementsByClassName("roll-type-select")[0].addEventListener('change',function(){
+            if (otherControls != undefined) otherControls.updateAll(options);
+        })
 });
 
 Hooks.on('closeSidebarTab',(app)=>{
@@ -578,4 +579,8 @@ Hooks.once('init', ()=>{
 
 Hooks.once('canvasReady',()=>{
     ready = true;
+});
+
+Hooks.on("soundscape", (data) => {
+    externalModules.newSoundscapeData(data);
 });

README.md

@@ -69,6 +69,9 @@ Module manifest: https://raw.githubusercontent.com/CDeenen/MaterialDeck/Master/m
 <b>Foundry VTT:</b> Tested on 0.7.9 - 0.8.5<br>
 <b>Module Incompatibilities:</b> None known.<br>
 
+## Developer Guide
+See the [developer guide](./DEVGUIDE.md) for a guide on how to add new systems to `MaterialDeck`.
+
 ## 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.
 
@@ -79,6 +82,7 @@ Special thanks to Asmodeus#7588 who made this module possible by generously dona
 <br>
 Please consider supporting me on <a href="https://www.patreon.com/materialfoundry">Patreon</a>, and feel free to join the Material Foundry <a href="https://discord.gg/3hd4G6TkmA">Discord</a> server.
 
+
 ## 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:

changelog.md

@@ -1,4 +1,28 @@
 # Changelog Material Deck Module
+### v1.4.5 - 27-07-2021
+Fixes:
+<ul>
+<li>Combat Tracker Action => Turn Display: If only 'Display Round' was enabled, the vertical alignment would be off. This has been fixed.</li>
+<li>WebSocket client no longer creates duplicate connections</li>
+<li>Token Action => If 'Display Uses/Quantity' is enabled for an item that has no maximum uses/quantity, the uses/quantity border is now consistently black.</li>
+<li>Update dialog that appears if the SD plugin needs to be updated now only appears once</li>
+</ul>
+
+Additions:
+<ul>
+<li>External Modules: Added support for the Soundscape module. Requires Soundscape v1.0.3</li>
+<li>Macro Action => Advanced Macros is now supported for calling macros with arguments</li>
+<li>Combat Tracker Action => Function: Added option to select the combatant after changing the turn</li>
+<li>Other Actions => Added 'Set Roll Mode' which sets the roll mode for all rolls to public, private gm, blind gm or self roll</li>
+<li>Added support for wfrp4e (thanks to sozin#8622 & eccobold#3541)</li>
+<li>Added DEVGUIDE.md to help developers add support for new systems (thanks to sozin#8622 & eccobold#3541)</li>
+</ul>
+
+<br>
+<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.4.5 (<b>must be updated!</b>): https://github.com/CDeenen/MaterialDeck_SD/releases<br>
+
 ### v1.4.4 - 26-05-2021
 Fixes:
 <ul>

lang/ja.json

@@ -13,13 +13,13 @@
     "MaterialDeck.Sett.MacroConfig": "マクロ設定",
     "MaterialDeck.Sett.SoundboardConfig": "サウンド設定",
     "MaterialDeck.Sett.ServerAddr": "Material Server アドレス",
-    "MaterialDeck.Sett.ServerAddrHint": "MaterialServerのIPアドレスとポート。デフォルト値は99％の人に有効ですが、何をしているのかがわかっている場合にのみ変更してください。[ip_address]:[port]の形式に従う必要があります。例：｢localhost:3001｣または｢192.168.1.1:4000｣。",
+    "MaterialDeck.Sett.ServerAddrHint": "Material ServerのIPアドレスとポート。デフォルト値は99％の人に有効ですが、何をしているのかがわかっている場合にのみ変更してください。[ip_address]:[port]の形式に従う必要があります。例：｢localhost:3001｣または｢192.168.1.1:4000｣。",
     "MaterialDeck.Sett.ImageBuffer": "画像キャッシュサイズ",
     "MaterialDeck.Sett.ImageBufferHint": "画像キャッシュに保存する画像のデータ量を設定します。画像キャッシュは、ストリームデッキに送信されたすべての画像をローカルに保存します。これにより更新速度は向上しますが、メモリ使用量は増加します。",
     "MaterialDeck.Sett.ImageBrightness": "画像の明るさ",
     "MaterialDeck.Sett.ImageBrightnessHint": "デフォルトの画像の明るさを設定します。画像キャッシュサイズが0より大きい場合、更新を実行してください。",
-    "MaterialDeck.Sett.NrOfConnMessages": "Number of Connection Warnings",
-    "MaterialDeck.Sett.NrOfConnMessagesHint": "Sets the number of times a connection warning is displayed if Material Deck cannot connect to Material Server. If set to 0, it will give not be limited.",
+    "MaterialDeck.Sett.NrOfConnMessages": "接続警告回数",
+    "MaterialDeck.Sett.NrOfConnMessagesHint": "Material DeckがMaterial Serverに接続できない場合に表示される接続警告回数を設定します。０に設定すると､無制限となります。",
 
     "MaterialDeck.PL.Unrestricted": "無制限",
     "MaterialDeck.PL.OneTrackPlaylist": "プレイリストごとに1つのトラック",
@@ -49,24 +49,24 @@
     "MaterialDeck.Name": "名前",
     "MaterialDeck.None": "無し",
     "MaterialDeck.Save": "セーブ",
-    "MaterialDeck.ClearAll": "Clear All",
-    "MaterialDeck.ClearAll_Content": "This will clear all the data. This cannot be undone, are you sure you want to proceed?",
-    "MaterialDeck.ClearPage": "Clear Page",
-    "MaterialDeck.ClearPage_Content": "This will clear all the data on this page. This cannot be undone, are you sure you want to proceed?",
-    "MaterialDeck.Continue": "Continue",
-    "MaterialDeck.Cancel": "Cancel",
-    "MaterialDeck.Import": "Import",
-    "MaterialDeck.Export": "Export",
-    "MaterialDeck.Filename": "Filename",
+    "MaterialDeck.ClearAll": "すべて クリア",
+    "MaterialDeck.ClearAll_Content": "すべてのデータがクリアされます。この操作は取り消すことができません､続行しますか？",
+    "MaterialDeck.ClearPage": "ページ クリア",
+    "MaterialDeck.ClearPage_Content": "このページのすべてのデータがクリアされます。この操作は取り消すことができません､続行しますか？",
+    "MaterialDeck.Continue": "継続",
+    "MaterialDeck.Cancel": "キャンセル",
+    "MaterialDeck.Import": "インポート",
+    "MaterialDeck.Export": "エクスポート",
+    "MaterialDeck.Filename": "ファイル名",
 
-    "MaterialDeck.ExportDialog.Title": "Export",
-    "MaterialDeck.ExportDialog.SoundboardContent": "Export the soundboard data. Please note that only the metadata is exported, so you will have to make sure the audio files are in the same relative location when you import them.",
-    "MaterialDeck.ExportDialog.MacroboardContent": "Export the macro board data. Please note that only the metadata is exported, so you will have to make sure the same macros are available when you import them.",
+    "MaterialDeck.ExportDialog.Title": "エクスポート",
+    "MaterialDeck.ExportDialog.SoundboardContent": "SouseBoardデータをエクスポートします。メタデータのみがエクスポートされるので､インポートするときにオーディオファイルが相対的に同じ場所にあることを確認する必要があります。",
+    "MaterialDeck.ExportDialog.MacroboardContent": "MacroBoardデータをエクスポートします。メタデータのみがエクスポートされるため､インポートしたときに同じマクロが使用可能であることを確認する必要があります。",
 
-    "MaterialDeck.ImportDialog.Title": "Import",
-    "MaterialDeck.ImportDialog.SoundboardContent": "Select a file to import. Please note that only the metadata is imported, so you will have to make sure the audio files are in the same relative location as when you exported them.",
-    "MaterialDeck.ImportDialog.MacroboardContent": "Import the macro board data. ",
-    "MaterialDeck.ImportDialog.Warning": "This will overwrite your current settings, and cannot be undone.",
+    "MaterialDeck.ImportDialog.Title": "インポート",
+    "MaterialDeck.ImportDialog.SoundboardContent": "インポートするファイルを選択してください。メタデータのみがインポートされるので､オーディオファイルがそれらをエクスポートしたときと同じ相対的な場所にあることを確認する必要があります。",
+    "MaterialDeck.ImportDialog.MacroboardContent": "MacroBoardデータをインポートします。 ",
+    "MaterialDeck.ImportDialog.Warning": "現在の設定が上書きされ､元に戻すことはできません。",
 
     "MaterialDeck.FxMaster.Colorize": "色付け",
     "MaterialDeck.FxMaster.Clear": "すべてクリア",
@@ -190,20 +190,20 @@
     "MaterialDeck.AboutTime.Fourth": "４",
     "MaterialDeck.AboutTime.Of": "/",
 
-    "MaterialDeck.DownloadUtility.Title": "Download Utility",
-    "MaterialDeck.DownloadUtility.Plugin": "Plugin & Material Server",
-    "MaterialDeck.DownloadUtility.Minimum": "Minimum",
-    "MaterialDeck.DownloadUtility.Current": "Current",
-    "MaterialDeck.DownloadUtility.Latest": "Latest",
+    "MaterialDeck.DownloadUtility.Title": "ダウンロード･ユーティリティ",
+    "MaterialDeck.DownloadUtility.Plugin": "プラグイン＆Material Server",
+    "MaterialDeck.DownloadUtility.Minimum": "最小",
+    "MaterialDeck.DownloadUtility.Current": "現在",
+    "MaterialDeck.DownloadUtility.Latest": "最新",
     "MaterialDeck.DownloadUtility.OS": "OS",
-    "MaterialDeck.DownloadUtility.Download": "Download",
-    "MaterialDeck.DownloadUtility.SDplugin": "SD Plugin",
+    "MaterialDeck.DownloadUtility.Download": "ﾀﾞｳﾝﾛｰﾄﾞ",
+    "MaterialDeck.DownloadUtility.SDplugin": "SDプラグイン",
     "MaterialDeck.DownloadUtility.MSserver": "Material Server",
     "MaterialDeck.DownloadUtility.Windows": "Windows",
     "MaterialDeck.DownloadUtility.Macos": "MacOS",
     "MaterialDeck.DownloadUtility.Linux": "Linux",
-    "MaterialDeck.DownloadUtility.Source": "Source",
-    "MaterialDeck.DownloadUtility.Profiles": "Profiles",
-    "MaterialDeck.DownloadUtility.Name": "Name",
-    "MaterialDeck.DownloadUtility.Refresh": "Refresh"
+    "MaterialDeck.DownloadUtility.Source": "ソース",
+    "MaterialDeck.DownloadUtility.Profiles": "プロファイル",
+    "MaterialDeck.DownloadUtility.Name": "名前",
+    "MaterialDeck.DownloadUtility.Refresh": "更新"
 }

module.json

@@ -2,7 +2,7 @@
   "name": "MaterialDeck",
   "title": "Material Deck",
   "description": "Material Deck allows you to control Foundry using an Elgato Stream Deck",
-  "version": "1.4.4",
+  "version": "1.4.5",
   "author": "CDeenen",
   "authors": {
     "name": "CDeenen",
@@ -22,7 +22,7 @@
   ],
   "socket": true,
   "minimumCoreVersion": "0.7.5",
-  "compatibleCoreVersion": "0.8.5",
+  "compatibleCoreVersion": "0.8.8",
   "languages": [
     {
       "lang": "en",

src/combattracker.js

@@ -127,16 +127,18 @@ export class CombatTracker{
                     turn = combat.turn+1;
                 }
                 if (settings.displayRound) txt += "Round\n"+round;
-                if (txt != "") txt += "\n";
+                if (settings.displayRound && settings.displayTurn) txt += "\n";
                 if (settings.displayTurn) txt += "Turn\n"+turn;
             }
+
             streamDeck.setIcon(context,device,src,{background:background});
             streamDeck.setTitle(txt,context);
         }
     }
 
-    keyPress(settings,context,device){
+    async keyPress(settings,context,device){
         const mode = settings.combatTrackerMode ? settings.combatTrackerMode : 'combatants';
+        const selectCombatant = settings.selectCombatant ? settings.selectCombatant : false;
         const combat = game.combat;
 
         if (mode == 'function'){
@@ -169,11 +171,17 @@ export class CombatTracker{
             }
             if (game.combat.started == false) return;
             
-            if (ctFunction == 'nextTurn') game.combat.nextTurn();
-            else if (ctFunction == 'prevTurn') game.combat.previousTurn();
-            else if (ctFunction == 'nextRound') game.combat.nextRound();
-            else if (ctFunction == 'prevRound') game.combat.previousRound();
-            else if (ctFunction == 'endTurn' && game.combat.combatant.owner) game.combat.nextTurn();
+            if (ctFunction == 'nextTurn') await game.combat.nextTurn();
+            else if (ctFunction == 'prevTurn') await game.combat.previousTurn();
+            else if (ctFunction == 'nextRound') await game.combat.nextRound();
+            else if (ctFunction == 'prevRound') await game.combat.previousRound();
+            else if (ctFunction == 'endTurn' && game.combat.combatant.owner) await game.combat.nextTurn();
+            
+            if (selectCombatant) {
+                const token = canvas.tokens.placeables.filter(token => token.id == game.combat.combatant.token.id)[0];
+                if (token.can(game.userId,"control")) token.control();
+            }
+            
         }
         else {
             const onClick = settings.onClick ? settings.onClick : 'doNothing';

src/external.js

@@ -1,9 +1,44 @@
 import {streamDeck} from "../MaterialDeck.js";
 
 export class ExternalModules{
+    soundscapeSettings = {
+        channels: [],
+        master: {
+            mute: false,
+            volume: 1,
+            playing: false,
+            name: 'Master'
+        },
+        soundboard: [],
+        soundboardVolume: 1,
+        playing: false
+    }
     constructor(){
         this.active = false;
         this.gmScreenOpen = false;
+
+        let channelData = [];
+        let soundboardData = [];
+        for (let i=0; i<8; i++) {
+            channelData.push({
+                volume: 1,
+                mute: false,
+                solo: false,
+                link: false,
+                playing: false,
+                pan: 1,
+                name: ''
+            })
+        }
+        for (let i=0; i<25; i++) {
+            soundboardData.push({
+                active: false,
+                name: '',
+                icon: ''
+            })
+        }
+        this.soundscapeSettings.channels = channelData;
+        this.soundscapeSettings.soundboard = soundboardData;
     }
 
     async updateAll(data={}){
@@ -33,6 +68,7 @@ export class ExternalModules{
         else if (module == 'notYourTurn')   this.updateNotYourTurn(settings,context,device);
         else if (module == 'lockView')      this.updateLockView(settings,context,device);
         else if (module == 'aboutTime')     this.updateAboutTime(settings,context,device);
+        else if (module == 'soundscape')    this.updateSoundscape(settings,context,device);
     }
 
     keyPress(settings,context,device){
@@ -47,6 +83,7 @@ export class ExternalModules{
         else if (module == 'notYourTurn')   this.keyPressNotYourTurn(settings,context,device);
         else if (module == 'lockView')      this.keyPressLockView(settings,context,device);
         else if (module == 'aboutTime')     this.keyPressAboutTime(settings,context,device);
+        else if (module == 'soundscape')    this.keyPressSoundscape(settings,context,device);
     }
 
     getModuleEnable(moduleId){
@@ -698,6 +735,327 @@ export class ExternalModules{
                 game.Gametime.advanceTime({ hours: -1 });
         }
     }
+
+    //////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    //Soundscape
+    //////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    updateSoundscape(settings,context,device) {
+        
+        if (this.getModuleEnable("soundscape") == false) return;
+        if (game.user.isGM == false) return;
+
+        const target = settings.soundscapeTarget ? settings.soundscapeTarget : 'mixer';
+        let channel = settings.soundscapeChannel ? settings.soundscapeChannel : 1;
+        
+        let background = '#000000';
+        let ring = 0;
+        let ringColor = '#000000';
+
+        let txt = '';
+        let src = 'modules/MaterialDeck/img/transparant.png';
+        let name = '';
+
+        if (target == 'mixer') {
+            let mode = settings.soundscapeMixerMode ? settings.soundscapeMixerMode : 'startStopAll';
+            const displayName = settings.soundscapeMixerName;
+            const displayChannel = settings.soundscapeDisplayMixerChannel;
+
+            if (mode == 'startStopAll') {
+                channel = 'master';
+                mode = 'startStop';
+            }
+
+            if (channel == 'Master') channel = 'master';
+
+            let channelSettings;
+            if (channel == 'master') {
+                channelSettings = this.soundscapeSettings.master;
+                channelSettings.playing = this.soundscapeSettings.playing;
+                channelSettings.name = 'Master';
+            }
+            else channelSettings = this.soundscapeSettings.channels[channel-1];
+            if (displayChannel && channel == 'master') txt += 'Master';
+            else if (displayChannel) txt += channel;
+
+            if (mode == 'startStop') {
+                if (displayChannel) txt += '\n';
+                if (channelSettings.playing) {
+                    src = "fas fa-stop";
+                    ringColor = '#00ff00';
+                }
+                else {
+                    src = "fas fa-play";
+                    ringColor = '#006600';
+                }
+                ring=2;
+                
+            }
+            else if (mode == 'mute') {
+                if (displayChannel) txt += '\n';
+                txt += 'M';
+                if (displayName) txt += '\n';
+                ring=2;
+                ringColor = '#ff0000';
+                background = channelSettings.mute ? '#ff0000' : '#660000'
+            }
+            else if (mode == 'solo') {
+                if (channel == 'master') return;
+                if (displayChannel) txt += '\n';
+                txt += 'S';
+                if (displayName) txt += '\n';
+                ring=2;
+                ringColor = '#ffff00';
+                background = channelSettings.solo ? '#ffff00' : '#666600'
+            }
+            else if (mode == 'link') {
+                if (channel == 'master') return;
+                if (displayChannel) txt += '\n';
+                txt += 'L';
+                if (displayName) txt += '\n';
+                ring=2;
+                ringColor = '#00ffff';
+                background = channelSettings.link ? '#00ffff' : '#000066'
+            }
+            else if (displayName && displayChannel) txt += '\n';
+
+            if (displayName) txt += channelSettings.name;
+
+            if (mode == 'volume') {
+                const displayValue = settings.soundscapeDisplayMixerValue;
+                const volume = Math.floor(channelSettings.volume*100);
+                if (displayValue && (displayName || displayChannel)) txt += '\n';
+                if (displayValue) txt += volume;
+            }
+            
+        }
+        else if (target == 'soundboard') {
+            const displayName = settings.soundscapeSoundboardName;
+            const displayIcon = settings.soundscapeSoundboardIcon;
+            const displayChannel = settings.soundscapeDisplayChannel;
+            const displayValue = settings.soundscapeSoundboardValue;
+            const mode = settings.soundscapeSoundboardMode ? settings.soundscapeSoundboardMode : 'play';
+
+            if (mode == 'play') {
+                channel -= 1;
+                let sound = this.soundscapeSettings.soundboard[channel];
+
+                if (displayChannel) txt += channel+1;
+                if (displayChannel && displayName) txt += '\n';
+                if (displayName) txt += sound.name;
+                if (displayIcon) src = sound.icon;
+            }
+            else if (mode == 'volume') {
+                const volume = Math.floor(this.soundscapeSettings.soundboardVolume*100);
+                if (displayValue) txt += volume;
+            }
+            else if (mode == 'stop') {
+                src = 'modules/MaterialDeck/img/playlist/stop.png';
+            }
+        }
+       
+        streamDeck.setTitle(txt,context);
+        streamDeck.setIcon(context,device,src,{background:background,ring:ring,ringColor:ringColor});
+    }
+
+    async keyPressSoundscape(settings,context,device) {
+        if (this.getModuleEnable("soundscape") == false) return;
+        if (game.user.isGM == false) return;
+
+        const target = settings.soundscapeTarget ? settings.soundscapeTarget : 'mixer';
+        let channel = settings.soundscapeChannel ? settings.soundscapeChannel : 1;
+
+        if (target == 'mixer') {
+            const mode = settings.soundscapeMixerMode ? settings.soundscapeMixerMode : 'startStopAll';
+
+            if (mode == 'startStopAll') {
+                const playing = !this.soundscapeSettings.playing;
+                if (playing) {
+                    Hooks.call('setSoundscape',{"msgType":"start","channelNr":undefined});
+                    return;
+                }
+                else {
+                    Hooks.call('setSoundscape',{"msgType":"stop","channelNr":undefined});
+                    return;
+                }
+            }
+
+            if (channel == 'Master') channel = 'master';
+
+            let channelSettings;
+            if (channel == 'master') {
+                channelSettings = this.soundscapeSettings.master;
+                channelSettings.playing = this.soundscapeSettings.playing;
+            }
+            else channelSettings = this.soundscapeSettings.channels[channel-1];
+
+            let mute, solo, link, playing;
+            let setChannel = false;
+
+            if (mode == 'startStop') {
+                setChannel = true;
+                playing = !channelSettings.playing;
+                if (channel == 'master' && playing) {
+                    Hooks.call('setSoundscape',{"msgType":"stop"});
+                    return;
+                }
+                else if (channel == 'master') {
+                    Hooks.call('setSoundscape',{"msgType":"start"});
+                    return;
+                }
+            }
+            else if (mode == 'mute') {
+                setChannel = true;
+                mute = !channelSettings.mute;
+            }
+            else if (mode == 'solo') {
+                if (channel == 'master') return;
+                setChannel = true;
+                solo = !channelSettings.solo;
+            }
+            else if (mode == 'link') {
+                if (channel == 'master') return;
+                setChannel = true;
+                link = !channelSettings.link;
+            }
+            if (setChannel) {
+                const channelNr = channel == 'master' ? 'master' : channel-1;
+                const payload = {
+                    "msgType": "setChannel",
+                    "channelNr": channelNr,
+                    mute,
+                    solo,
+                    link,
+                    playing
+                };
+                Hooks.call('setSoundscape',payload);
+                return;
+            }
+
+            if (mode == 'volume') {
+                const volumeMode = settings.soundscapeMixerValueMode ? settings.soundscapeMixerValueMode : 'incrementDecrement';
+                const value = parseInt(settings.soundscapeMixerValue);
+                if (isNaN(value) == false) {
+                    let volume = channelSettings.volume*100;
+                    
+                    if (volumeMode == 'set') 
+                        volume = value;
+                    else
+                        volume += value;
+                    
+                    volume = Math.floor(volume*100)/10000;
+                    const channelNr = channel == 'master' ? 'master' : channel-1;
+                    const payload = {
+                        "msgType": "setVolume",
+                        "channelNr": channelNr,
+                        volume
+                    };
+                    Hooks.call('setSoundscape',payload);
+                }
+            }
+
+
+        }
+        else if (target == 'soundboard') {
+            const mode = settings.soundscapeSoundboardMode ? settings.soundscapeSoundboardMode : 'play';
+
+            if (mode == 'play') {
+                channel -= 1;
+                const payload = {
+                    "msgType": "playSoundboard",
+                    channelNr: channel
+                };
+                Hooks.call('setSoundscape',payload);
+            }
+            else if (mode == 'volume') {
+                const volumeMode = settings.soundscapeSoundboardValueMode ? settings.soundscapeSoundboardValueMode : 'incrementDecrement';
+                const value = parseInt(settings.soundscapeSoundboardValue);
+                if (isNaN(value) == false) {
+                    let volume = this.soundscapeSettings.soundboardVolume*100;
+                    
+                    if (volumeMode == 'set') 
+                        volume = value;
+                    else
+                        volume += value;
+                    
+                    volume = Math.floor(volume*100)/10000;
+                    const payload = {
+                        "msgType": "setSoundboardVolume",
+                        volume
+                    };
+                    Hooks.call('setSoundscape',payload);
+                }
+            }
+            else if (mode == 'stop') {
+                const payload = {
+                    "msgType": "stopSoundboard"
+                };
+                Hooks.call('setSoundscape',payload);
+            }
+        }
+    }
+
+    newSoundscapeData(data) {
+        let channel;
+        if (data.channel != undefined) channel = data.channel;
+        else if (data.channelNr != undefined) channel = data.channelNr;
+
+        let channelSettings = channel == 'master' ? this.soundscapeSettings.master : this.soundscapeSettings.channels[channel]
+        if (data.msgType == 'soundConfig') {
+            
+            let newChannelSettings = {
+                volume: data.data.settings.volume,
+                mute: data.data.settings.mute,
+                solo: data.data.settings.solo,
+                link: data.data.settings.link,
+                playing: false,
+                pan: data.data.settings.pan,
+                name: data.data.settings.name
+            };
+            this.soundscapeSettings.channels[channel] = newChannelSettings;
+        }
+        else if (data.msgType == 'setMute') channelSettings.mute = data.mute;
+        else if (data.msgType == 'setSolo') channelSettings.solo = data.solo;
+        else if (data.msgType == 'setLink') channelSettings.link = data.link;
+        else if (data.msgType == 'setVolume') {
+            if (channel >= 100) return;
+            channelSettings.volume = data.volume;
+        }
+        else if (data.msgType == 'start') {
+            this.soundscapeSettings.playing = true;
+            this.soundscapeSettings.master.playing = true;
+            if (data.channel == undefined) for (let i=0; i<8; i++) this.soundscapeSettings.channels[i].playing = true;
+            else this.soundscapeSettings.channels[data.channel].playing = true;
+        }
+        else if (data.msgType == 'stop') {
+            
+            if (data.channel == undefined) {
+                for (let i=0; i<8; i++) this.soundscapeSettings.channels[i].playing = false;
+                this.soundscapeSettings.playing = false;
+            }
+            else {
+                this.soundscapeSettings.channels[data.channel].playing = false;
+                let check = 0;
+                for (let i=0; i<8; i++) if (this.soundscapeSettings.channels[data.channel].playing) check++;
+                if (check == 0) this.soundscapeSettings.playing = false;
+            }
+        }
+        else if (data.msgType == 'sbSoundConfig') {
+            
+            const channel = data.channel - 100;
+            let active = true;
+            if (data.data.soundArray == undefined) active = false;
+            this.soundscapeSettings.soundboard[channel] = {
+                active,
+                name: data.data.name,
+                icon: data.data.imageSrc
+            };
+        }
+        else if (data.msgType == 'setSoundboardVolume')
+            this.soundscapeSettings.soundboardVolume = data.volume;
+
+        this.updateAll();
+    }
 }
 
 

src/macro.js

@@ -180,7 +180,12 @@ export class MacroControl{
             let furnaceEnabled = false;
             let furnace = game.modules.get("furnace");
             if (furnace != undefined && furnace.active && compatibleCore("0.8.1")==false) furnaceEnabled = true;
+
+            let advancedMacros = game.modules.get("advanced-macros");
+            if (advancedMacros != undefined && advancedMacros.active) furnaceEnabled = true;
+
             if (args == "" || args == " ") furnaceEnabled = false;
+
             if (furnaceEnabled == false) macro.execute({token:target});
             else {
                 let chatData = {
@@ -235,7 +240,12 @@ export class MacroControl{
                 let furnaceEnabled = false;
                 let furnace = game.modules.get("furnace");
                 if (furnace != undefined && furnace.active && compatibleCore("0.8.1")==false) furnaceEnabled = true;
+
+                let advancedMacros = game.modules.get("advanced-macros");
+                if (advancedMacros != undefined && advancedMacros.active) furnaceEnabled = true;
+
                 if (args == undefined || args[macroNumber] == undefined || args[macroNumber] == "") furnaceEnabled = false;
+                
                 if (furnaceEnabled == false) macro.execute();
                 else {
                     let chatData = {

src/misc.js

@@ -183,7 +183,8 @@ export class macroConfigForm extends FormApplication {
         let furnaceEnabled = false;
         let height = 95;
         let furnace = game.modules.get("furnace");
-        if (furnace != undefined && furnace.active && compatibleCore("0.8.1")==false) {
+        let advancedMacros = game.modules.get("advanced-macros");
+        if ((furnace != undefined && furnace.active && compatibleCore("0.8.1")==false) || (advancedMacros != undefined && advancedMacros.active)) {
             furnaceEnabled = true;
             height += 50;
         }
@@ -1056,12 +1057,23 @@ export class downloadUtility extends FormApplication {
         }
         if (this.localMSversion == undefined) this.localMSversion = 'unknown';
         
+        let minimumSdVersion;
+        let minimumMsVersion;
+        if (compatibleCore("0.8.5")) {
+            minimumSdVersion = game.modules.get("MaterialDeck").data.flags.minimumSDversion.replace('v','');
+            minimumMsVersion = game.modules.get("MaterialDeck").data.flags.minimumMSversion;
+        }
+        else {
+            minimumSdVersion = game.modules.get("MaterialDeck").data.minimumSDversion.replace('v','');
+            minimumMsVersion = game.modules.get("MaterialDeck").data.minimumMSversion;
+        }
+        
         return {
-            minimumSdVersion: game.modules.get("MaterialDeck").data.minimumSDversion.replace('v',''),
+            minimumSdVersion,
             localSdVersion: this.localSDversion,
             masterSdVersion: this.masterSDversion,
             sdDlDisable: this.masterSDversion == undefined,
-            minimumMsVersion: game.modules.get("MaterialDeck").data.minimumMSversion.replace('v',''),
+            minimumMsVersion,
             localMsVersion: this.localMSversion,
             masterMsVersion: this.masterMSversion,
             msDlDisable: this.masterMSversion == undefined,

src/othercontrols.js

@@ -54,6 +54,8 @@ export class OtherControls{
             this.updateChatMessage(settings,context,device,options);
         else if (mode == 'rollOptions')
             this.updateRollOptions(settings,context,device,options);
+        else if (mode == 'rollMode')
+            this.updateRollMode(settings,context,device,options);
     }
 
     keyPress(settings,context,device){
@@ -83,6 +85,8 @@ export class OtherControls{
             this.keyPressChatMessage(settings);
         else if (mode == 'rollOptions')
             this.keyPressRollOptions(settings);
+        else if (mode == 'rollMode')
+            this.keyPressRollMode(settings);
     }
 
     //////////////////////////////////////////////////////////////////////////////////////////////////
@@ -812,4 +816,23 @@ export class OtherControls{
             this.updateAll();
         }
     }
+
+//////////////////////////////////////////////////////////////////////////////////////////
+
+    updateRollMode(settings,context,device,options={}){
+        const background = settings.background ? settings.background : '#000000';
+        const ringOffColor = settings.offRing ? settings.offRing : '#000000';
+        const ringOnColor = settings.onRing ? settings.onRing : '#00FF00';
+        const iconSrc = "modules/MaterialDeck/img/other/d20.png";
+        const rollMode = settings.rollMode ? settings.rollMode : 'roll';
+        const ringColor = (rollMode == game.settings.get('core','rollMode')) ? ringOnColor : ringOffColor;
+        streamDeck.setTitle("",context);
+        streamDeck.setIcon(context,device,iconSrc,{background:background,ring:2,ringColor:ringColor,overlay:true});
+    }
+
+    async keyPressRollMode(settings){
+        const rollMode = settings.rollMode ? settings.rollMode : 'roll';
+        await game.settings.set('core','rollMode',rollMode);
+        this.updateAll();
+    }
 }

src/streamDeck.js

@@ -452,11 +452,16 @@ export class StreamDeck{
             }
             ctx.drawImage(img, xStart+margin, yStart+margin, renderableWidth - 2*margin, renderableHeight - 2*margin);
             if (uses != undefined && uses.heart == undefined) {
+                
                 let txt = '';
+                let noMaxUses = false;
                 if (uses.available != undefined) {
                     txt = uses.available;
                     if (uses.maximum != undefined) txt = uses.available + '/' + uses.maximum;
-                    if (uses.maximum == undefined ) uses.maximum = 1;
+                    if (uses.maximum == undefined ) {
+                        uses.maximum = 1;
+                        noMaxUses = true;
+                    }
                 }
                 ctx.beginPath();
                 ctx.lineWidth = 4;
@@ -466,7 +471,8 @@ export class StreamDeck{
                 if (green.length == 1) green = "0"+green;
                 red = red.toString(16);
                 if (red.length == 1) red = "0"+red;
-                if (uses.available == 0) ctx.strokeStyle = "#c80000";
+                if (noMaxUses) ctx.strokeStyle = "#c000000";
+                else if (uses.available == 0) ctx.strokeStyle = "#c80000";
                 else ctx.strokeStyle = "#"+red.toString(16)+green.toString(16)+"00";
                 const rect = {height:35, paddingSides:20, paddingBottom: 4}
                 ctx.rect(rect.paddingSides, 144-rect.height-rect.paddingBottom,144-2*rect.paddingSides,rect.height);

src/systems/demonlord.js

@@ -130,4 +130,8 @@ export class demonlord{
     getSpellUses(token,level,item) {
         return;
     }
+
+    rollItem(item) {
+        return item.roll()
+    }
 }

src/systems/dnd35e.js

@@ -195,4 +195,8 @@ export class dnd35e{
             maximum: item.maxCharges
         }
     }
+
+    rollItem(item) {
+        return item.roll()
+    }
 }

src/systems/dnd5e.js

@@ -198,4 +198,8 @@ export class dnd5e{
             maximum: token.actor.data.data.spells?.[`spell${level}`].max
         }
     }
+
+    rollItem(item) {
+        return item.roll()
+    }
 }

src/systems/pf2e.js

@@ -192,4 +192,8 @@ export class pf2e{
             maximum: spellbook.data.data.slots?.[`slot${level}`].max
         }
     }
+
+    rollItem(item) {
+        return item.roll()
+    }
 }

src/systems/tokenHelper.js

@@ -2,6 +2,7 @@ import {dnd5e} from "./dnd5e.js"
 import {dnd35e} from "./dnd35e.js"
 import {pf2e} from "./pf2e.js"
 import {demonlord} from "./demonlord.js";
+import {wfrp4e} from "./wfrp4e.js"
 import {compatibleCore} from "../misc.js";
 
 export class TokenHelper{
@@ -14,6 +15,7 @@ export class TokenHelper{
         if (game.system.id == 'D35E' || game.system.id == 'pf1') this.system = new dnd35e();
         else if (game.system.id == 'pf2e') this.system = new pf2e();
         else if (game.system.id == 'demonlord') this.system = new demonlord();
+        else if (game.system.id == 'wfrp4e') this.system = new wfrp4e();
         else this.system = new dnd5e();     //default to dnd5e
     }
 
@@ -184,6 +186,41 @@ export class TokenHelper{
         return this.system.getProficiency(token);
     }
 
+    /* WFRP 4E */
+    getFate(token) {
+        return this.system.getFate(token)
+    }
+
+    /* WFRP 4E */
+    getFortune(token) {
+        return this.system.getFortune(token)
+    }
+    
+    /* WFRP 4E */
+    getCriticalWounds(token) {
+        return this.system.getCriticalWounds(token)
+    }
+
+    /* WFRP 4E */
+    getCorruption(token) {
+        return this.system.getCorruption(token)
+    }
+
+    /* WFRP 4E */
+    getAdvantage(token) {
+        return this.system.getAdvantage(token)
+    }
+
+    /* WFRP 4E */
+    getResolve(token) {
+        return this.system.getResolve(token)
+    }
+
+    /* WFRP 4E */
+    getResilience(token) {
+        return this.system.getResilience(token)
+    }
+
     /**
      * Conditions
      */
@@ -238,4 +275,8 @@ export class TokenHelper{
     getSpellUses(token,level,item) {
         return this.system.getSpellUses(token,level,item);
     }
+
+    rollItem(item) {
+        return this.system.rollItem(item);
+    }
 }

src/systems/wfrp4e.js

@@ -0,0 +1,172 @@
+import {compatibleCore} from "../misc.js";
+
+export class wfrp4e {
+    constructor(){
+        
+    }
+
+    getFate(token) {
+        return token.actor.data.data.status.fate.value
+    }
+
+    getFortune(token) {
+        return token.actor.data.data.status.fortune.value
+    }
+
+
+    getWounds(token) {
+        const wounds =  token.actor.data.data.status.wounds
+        return {
+            value: wounds.value,
+            max: wounds.max
+        } 
+        
+    }
+
+    getCriticalWounds(token) {
+        const criticalWounds = token.actor.data.data.status.criticalWounds
+        return {
+            value: criticalWounds.value,
+            max: criticalWounds.max
+        } 
+    }
+
+    getCorruption(token) {
+        return token.actor.data.data.status.corruption.value
+    }
+
+    getAdvantage(token) {
+        return token.actor.data.data.status.advantage.value
+    }
+
+    getResolve(token) {
+        return token.actor.data.data.status.resolve.value
+    }
+
+    getResilience(token) {
+        return token.actor.data.data.status.resilience.value
+    }
+
+    getAbility(token, abilityName) {
+        return this.getCharacteristics(token, abilityName); 
+    }
+
+    getCharacteristics(token, characteristicName) {
+        if (characteristicName == undefined ) characteristicName = `AG`;
+        const characteristic = token.actor.data.data.characteristics[characteristicName.toLowerCase()]
+        const val = characteristic.value;
+        return (val >= 0) ? `+${val}` : val;
+    }
+
+    getFeatures(token,featureType) {
+        if (featureType == undefined) featureType = 'any';
+        const allItems = token.actor.items;
+        if (featureType == 'any') return allItems.filter(i => i.type == 'skill' || i.type == 'talent' || i.type == "career" || i.type == 'trait');
+        return allItems.filter(i => i.type == featureType);
+    }
+    getSpells(token,spellType) {
+        const allItems = token.actor.items;
+        return allItems.filter(i => i.type == 'spell')
+    }
+
+    getSpellUses(token,level,item) {
+        return;
+    }
+
+    getFeatureUses(item) {
+        return {available: `+${item.data.data.total.value}`};
+    }
+    
+    getHP(token) {
+        return this.getWounds(token);
+    }
+
+    rollItem(item) {
+        return game.wfrp4e.utility.rollItemMacro(item.name, item.type, false);
+    }
+
+    getSpeed(token) {
+        return token.actor.data.data.details.move.value;
+    }
+
+
+    async toggleCondition(token,condition) {
+        if (condition == undefined) condition = 'removeAll';
+        if (condition == 'removeAll'){
+            for( let effect of token.actor.effects)
+                await effect.delete();
+        }
+        else {
+            const effect = CONFIG.statusEffects.find(e => e.id === condition);
+            await token.toggleEffect(effect);
+        }
+        return true;
+    }
+
+    roll(token,roll,options,ability,skill,save) {
+        //console.log("roll(", token, roll, options, ability, skill, save, ")");
+        if (ability == undefined) ability = 'ag';
+        return game.wfrp4e.utility.rollItemMacro(ability, "characteristic", false);
+    }
+
+
+
+    getItems(token,itemType) {
+        if (itemType == undefined) itemType = 'any';
+        const allItems = token.actor.items;
+        if (itemType == 'any') return allItems.filter(i => i.type == 'weapon' || 
+        i.type == 'ammunition' || 
+        i.type == 'armour' || 
+        i.type == 'trapping');
+        else {
+            return allItems.filter(i => i.type == itemType);
+        }
+    }
+
+
+    getItemUses(item) {
+        console.log("getItemUses(" , item , ")")
+        if ( item.type == 'ammunition') {
+            return {available: item.data.data.quantity.value};
+        }
+        else {
+            return;
+        }
+    }
+
+    
+    /* this is all cargo-culted in and some of it could be deleted once the interface is resolved
+       to not be the superset of all possible systems 
+    */ 
+
+    getAC(token) {
+        return;
+    }
+
+    getShieldHP(token) {
+        return;
+    }
+
+    getInitiative(token) {
+        return;
+    }
+
+    toggleInitiative(token) {
+        return;
+    }
+
+
+    getConditionIcon(condition) {
+        return;
+    }
+
+    getConditionActive(token,condition) {
+        return;
+    }
+
+    getTempHP(token) {
+        return;
+    }
+
+
+}

src/token.js

@@ -94,7 +94,7 @@ export class TokenControl{
                         }
                 }
                 
-                if (stats == 'HP') {
+                if (stats == 'HP' || stats == 'Wounds') {
                     const hp = tokenHelper.getHP(token);
                     txt += hp.value + "/" + hp.max;
                     
@@ -105,6 +105,18 @@ export class TokenControl{
                             heart: "#FF0000"
                         };
                         
+                }
+                if (stats == 'CriticalWounds') { /* WFRP4e */
+                    const criticalWounds = tokenHelper.getCriticalWounds(token);
+                    txt += criticalWounds.value + "/" + criticalWounds.max;
+                    
+                    if (icon == 'stats')
+                        uses = {
+                            available: criticalWounds.value,
+                            maximum: criticalWounds.max,
+                            heart: "#FF0000"
+                        };
+                        
                 }
                 else if (stats == 'HPbox') {
                     const hp = tokenHelper.getHP(token);
@@ -135,6 +147,13 @@ export class TokenControl{
                 else if (stats == 'Save') txt += tokenHelper.getAbilitySave(token, settings.save);
                 else if (stats == 'Skill') txt += tokenHelper.getSkill(token, settings.skill);
                 else if (stats == 'Prof') txt += tokenHelper.getProficiency(token);
+                else if (stats == 'Fate') txt += tokenHelper.getFate(token) /* WFRP4e */
+                else if (stats == 'Fortune') txt += tokenHelper.getFortune(token) /* WFRP4e */
+                else if (stats == 'Corruption') txt += tokenHelper.getCorruption(token) /* WFRP4e */
+                else if (stats == 'Advantage') txt += tokenHelper.getAdvantage(token) /* WFRP4e */
+                else if (stats == 'Resolve') txt += tokenHelper.getResolve(token) /* WFRP4e */
+                else if (stats == 'Resilience') txt += tokenHelper.getResilience(token) /* WFRP4e */
+
                 
                 if (settings.onClick == 'visibility') { //toggle visibility
                     if (MODULE.getPermission('TOKEN','VISIBILITY') == false ) {
@@ -739,7 +758,9 @@ export class TokenControl{
             items = this.sortItems(items);
 
             const item = items[itemNr];
-            if (item != undefined) item.roll();
+            if (item != undefined) {
+                tokenHelper.rollItem(item);
+            }
             
         }
     }