asc/MaterialDeck
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v1.0.1

Browse Source
This commit is contained in:
CDeenen
2020-11-26 02:59:36 +01:00
parent 7bd2084209
commit 1370544f03
4 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/macro.js
View File

@@ -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,'macroSettings').args[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 = {

2
src/streamDeck.js
View File

@@ -135,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;
@@ -183,6 +184,7 @@ export class StreamDeck{
}
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) {