This commit is contained in:
CDeenen
2021-03-11 02:28:26 +01:00
parent 7d4fd1e8b1
commit cc9bcf4770
14 changed files with 491 additions and 92 deletions

View File

@@ -32,6 +32,7 @@ export class MacroControl{
let name = "";
let src = "";
let macroId = undefined;
let uses = undefined;
if (mode == 'macroBoard') { //Macro board
if ((MODULE.getPermission('MACRO','MACROBOARD') == false )) {
@@ -83,19 +84,12 @@ export class MacroControl{
if (macro != undefined) {
if (displayName) name = macro.name;
if (displayIcon) src = macro.img;
if (MODULE.hotbarUses && displayUses) {
const uses = await this.getUses(macro);
if (uses != null){
name += '\n(' + uses.available;
if (uses.maximum != undefined) name += '/' + uses.maximum;
name += ')';
}
}
if (MODULE.hotbarUses && displayUses) uses = await this.getUses(macro);
}
}
streamDeck.setIcon(context,src,background,ring,ringColor);
streamDeck.setIcon(context,src,{background:background,ring:ring,ringColor:ringColor,uses:uses});
streamDeck.setTitle(name,context);
}
@@ -144,20 +138,14 @@ export class MacroControl{
}
}
let macro = undefined;
let uses = undefined;
if (macroId != undefined) macro = game.macros._source.find(p => p._id == macroId);
if (macro != undefined && macro != null) {
if (displayName) name += macro.name;
if (displayIcon) src += macro.img;
if (MODULE.hotbarUses && displayUses) {
const uses = await this.getUses(macro);
if (uses != null){
name += '\n(' + uses.available;
if (uses.maximum != undefined) name += '/' + uses.maximum;
name += ')';
}
}
if (MODULE.hotbarUses && displayUses) uses = await this.getUses(macro);
}
streamDeck.setIcon(context,src,background);
streamDeck.setIcon(context,src,{background:background,uses:uses});
streamDeck.setTitle(name,context);
}
}