Add new features

module/system/bol-hotbar.js

@@ -0,0 +1,87 @@
+import { BoLRoll } from "../controllers/bol-rolls.js";
+
+export class BoLHotbar {
+
+  /**
+   * Create a macro when dropping an entity on the hotbar
+   * Item      - open roll dialog for item
+   * Actor     - open actor sheet
+   * Journal   - open journal sheet
+   */
+  static init( ) {
+
+    Hooks.on("hotbarDrop", async (bar, documentData, slot) => {
+    // Create item macro if rollable item - weapon, spell, prayer, trait, or skill
+    if (documentData.type == "Item") {
+      console.log("Drop done !!!", bar, documentData, slot)
+      let item = documentData.data
+      let command = `game.bol.BoLHotbar.rollMacro("${item.name}", "${item.type}");`
+      let macro = game.macros.contents.find(m => (m.name === item.name) && (m.command === command))
+      if (!macro) {
+        macro = await Macro.create({
+          name: item.name,
+          type: "script",
+          img: item.img,
+          command: command
+        }, { displaySheet: false })
+      }
+      game.user.assignHotbarMacro(macro, slot);
+    }
+    // Create a macro to open the actor sheet of the actor dropped on the hotbar
+    else if (documentData.type == "Actor") {
+      let actor = game.actors.get(documentData.id);
+      let command = `game.actors.get("${documentData.id}").sheet.render(true)`
+      let macro = game.macros.contents.find(m => (m.name === actor.name) && (m.command === command));
+      if (!macro) {
+        macro = await Macro.create({
+          name: actor.data.name,
+          type: "script",
+          img: actor.data.img,
+          command: command
+        }, { displaySheet: false })
+        game.user.assignHotbarMacro(macro, slot);
+      }
+    }
+    // Create a macro to open the journal sheet of the journal dropped on the hotbar
+    else if (documentData.type == "JournalEntry") {
+      let journal = game.journal.get(documentData.id);
+      let command = `game.journal.get("${documentData.id}").sheet.render(true)`
+      let macro = game.macros.contents.find(m => (m.name === journal.name) && (m.command === command));
+      if (!macro) {
+        macro = await Macro.create({
+          name: journal.data.name,
+          type: "script",
+          img: "systems/bol/icons/images/icone_parchement_vierge.webp",
+          command: command
+        }, { displaySheet: false })
+        game.user.assignHotbarMacro(macro, slot);
+      }
+    }
+    return false;
+  });
+  }
+
+  /** Roll macro */
+  static rollMacro(itemName, itemType, bypassData) {
+    const speaker = ChatMessage.getSpeaker()
+    let actor
+    if (speaker.token) actor = game.actors.tokens[speaker.token]
+    if (!actor) actor = game.actors.get(speaker.actor)
+    if (!actor) {
+      return ui.notifications.warn(`Selectionnez votre personnage pour utiliser la macro`)
+    }
+
+    let item = actor.items.find(it => it.name === itemName && it.type == itemType)
+    if (!item ) {
+      return ui.notifications.warn(`Impossible de trouver l'objet de cette macro`)
+    }
+    // Trigger the item roll
+    if  (item.data.data.category === "equipment" && item.data.data.subtype === "weapon") {
+      return BoLRoll.weaponCheckWithWeapon( actor, item)
+    }
+    if  (item.data.data.category === "spell") {
+      return BoLRoll.spellCheckWithSpell( actor, item)
+    }
+  }
+
+}

module/system/bol-utility.js

@@ -32,7 +32,6 @@ export class BoLUtility {
     this.rollArmor = game.settings.get("bol", "rollArmor") // Roll armor or not
     this.useBougette = game.settings.get("bol", "useBougette") // Use optionnal bougette rules
 
-    console.log("UTIL", this)
   }
 
 
@@ -127,6 +126,17 @@ export class BoLUtility {
     }
     return undefined;
   }
+  /* -------------------------------------------- */
+  static getOtherWhisperRecipients( name) {
+    let users = []
+    for( let user of game.users) {
+      if ( !user.isGM && user.name != name) {
+        users.push( user.data._id)
+      }
+    }
+    return users
+  }
+    
   /* -------------------------------------------- */
   static getWhisperRecipientsAndGMs(name) {
     let recep1 = ChatMessage.getWhisperRecipients(name) || [];
@@ -154,9 +164,25 @@ export class BoLUtility {
     }
   }
 
+  /* -------------------------------------------- */
+  static async chatMessageHandler(message, html, data) {
+    const chatCard = html.find('.flavor-text')
+    if (chatCard.length > 0) {
+      // If the user is the message author or the actor owner, proceed
+      const actor = game.actors.get(data.message.speaker.actor)
+      console.log("FOUND 1!!! ", actor)
+      if (actor && actor.isOwner) return
+      else if (game.user.isGM || data.author.id === game.user.id) return
+  
+      const divButtons = chatCard.find('.actions-section')
+      console.log("FOUND 2!! ", divButtons)
+      divButtons.hide()
+    }
+  }
+  
   /* -------------------------------------------- */
   static async chatListeners(html) {
-
+    
     // Damage handling
     html.on("click", '.chat-damage-apply', event => {
       let rollData = BoLUtility.getLastRoll()
@@ -172,13 +198,21 @@ export class BoLUtility {
       bolRoll.rollDamage()
     });
 
+    html.on("click", '.transform-legendary-roll', event => {
+      event.preventDefault();
+      let rollData = BoLUtility.getLastRoll()
+      rollData.actor.subHeroPoints(1)
+      let r = new BoLDefaultRoll(rollData)
+      r.upgradeToLegendary()
+    })
+
     html.on("click", '.transform-heroic-roll', event => {
       event.preventDefault();
       let rollData = BoLUtility.getLastRoll()
       rollData.actor.subHeroPoints(1)
       let r = new BoLDefaultRoll(rollData)
-      r.upgradeToCritical();
-    });
+      r.upgradeToHeroic()
+    })
 
     html.on("click", '.hero-reroll', event => {
       event.preventDefault();

module/system/helpers.js

@@ -1,123 +1,129 @@
 export const registerHandlebarsHelpers = function () {
 
-    Handlebars.registerHelper('isNull', function (val) {
-        return val == null;
-    });
+  Handlebars.registerHelper('isNull', function (val) {
+    return val == null;
+  });
 
-    Handlebars.registerHelper('exists', function (val) {
-      return val != null && val != undefined;
-    });
+  Handlebars.registerHelper('exists', function (val) {
+    return val != null && val != undefined;
+  });
 
-    Handlebars.registerHelper('isEmpty', function (list) {
-        if (list) return list.length == 0;
-        else return 0;
-    });
+  Handlebars.registerHelper('isEmpty', function (list) {
+    if (list) return list.length == 0;
+    else return 0;
+  });
 
-    Handlebars.registerHelper('notEmpty', function (list) {
-        return list.length > 0;
-    });
+  Handlebars.registerHelper('notEmpty', function (list) {
+    return list.length > 0;
+  });
 
-    Handlebars.registerHelper('isNegativeOrNull', function (val) {
-        return val <= 0;
-    });
+  Handlebars.registerHelper('isNegativeOrNull', function (val) {
+    return val <= 0;
+  });
 
-    Handlebars.registerHelper('isNegative', function (val) {
-        return val < 0;
-    });
+  Handlebars.registerHelper('isNegative', function (val) {
+    return val < 0;
+  });
 
-    Handlebars.registerHelper('isPositive', function (val) {
-        return val > 0;
-    });
+  Handlebars.registerHelper('isPositive', function (val) {
+    return val > 0;
+  });
 
-    Handlebars.registerHelper('equals', function (val1, val2) {
-        return val1 == val2;
-    });
+  Handlebars.registerHelper('equals', function (val1, val2) {
+    return val1 == val2;
+  });
 
-    Handlebars.registerHelper('neq', function (val1, val2) {
-        return val1 !== val2;
-    });
+  Handlebars.registerHelper('neq', function (val1, val2) {
+    return val1 !== val2;
+  });
 
-    Handlebars.registerHelper('gt', function (val1, val2) {
-        return val1 > val2;
-    })
+  Handlebars.registerHelper('gt', function (val1, val2) {
+    return val1 > val2;
+  })
 
-    Handlebars.registerHelper('lt', function (val1, val2) {
-        return val1 < val2;
-    })
+  Handlebars.registerHelper('lt', function (val1, val2) {
+    return val1 < val2;
+  })
 
-    Handlebars.registerHelper('gte', function (val1, val2) {
-        return val1 >= val2;
-    })
+  Handlebars.registerHelper('gte', function (val1, val2) {
+    return val1 >= val2;
+  })
 
-    Handlebars.registerHelper('lte', function (val1, val2) {
-        return val1 <= val2;
-    })
-    Handlebars.registerHelper('and', function (val1, val2) {
-        return val1 && val2;
-    })
-    Handlebars.registerHelper('or', function (val1, val2) {
-        return val1 || val2;
-    })
+  Handlebars.registerHelper('lte', function (val1, val2) {
+    return val1 <= val2;
+  })
+  Handlebars.registerHelper('and', function (val1, val2) {
+    return val1 && val2;
+  })
+  Handlebars.registerHelper('or', function (val1, val2) {
+    return val1 || val2;
+  })
 
-    Handlebars.registerHelper('or3', function (val1, val2, val3) {
-        return val1 || val2 || val3;
-    })
-    
-    Handlebars.registerHelper('for', function(from, to, incr, block) {
-      var accum = '';
-      for(var i = from; i < to; i += incr)
-          accum += block.fn(i);
-      return accum;
-    })
-    
-    Handlebars.registerHelper('not', function (cond) {
-        return !cond;
-    })
-    Handlebars.registerHelper('count', function (list) {
-        return list.length;
-    })
-    Handlebars.registerHelper('isEnabled', function (configKey) {
-        return game.settings.get("bol", configKey);
-    })
-    Handlebars.registerHelper('split', function (str, separator, keep) {
-        return str.split(separator)[keep];
-    })
+  Handlebars.registerHelper('or3', function (val1, val2, val3) {
+    return val1 || val2 || val3;
+  })
 
-    // If you need to add Handlebars helpers, here are a few useful examples:
-    Handlebars.registerHelper('concat', function () {
-        var outStr = '';
-        for (var arg in arguments) {
-            if (typeof arguments[arg] != 'object') {
-                outStr += arguments[arg];
-            }
-        }
-        return outStr;
-    })
+  Handlebars.registerHelper('for', function (from, to, incr, block) {
+    var accum = '';
+    for (var i = from; i < to; i += incr)
+      accum += block.fn(i);
+    return accum;
+  })
 
-    Handlebars.registerHelper('add', function (a, b) {
-        return parseInt(a) + parseInt(b);
-    });
-    Handlebars.registerHelper('mul', function (a, b) {
-      return parseInt(a) * parseInt(b);
-    })
-    Handlebars.registerHelper('sub', function (a, b) {
-      return parseInt(a) - parseInt(b);
-    })
-    Handlebars.registerHelper('valueAtIndex', function (arr, idx) {
-        return arr[idx];
-    })
-    Handlebars.registerHelper('includesKey', function (items, type, key) {
-        // console.log(items);
-        return items.filter(i => i.type === type).map(i => i.data.key).includes(key);
-    })
-    Handlebars.registerHelper('includes', function (array, val) {
-        return array.includes(val);
-    })
-    Handlebars.registerHelper('eval', function (expr) {
-        return eval(expr);
-    })
+  Handlebars.registerHelper('not', function (cond) {
+    return !cond;
+  })
+  Handlebars.registerHelper('count', function (list) {
+    return list.length;
+  })
+  Handlebars.registerHelper('isEnabled', function (configKey) {
+    return game.settings.get("bol", configKey);
+  })
+  Handlebars.registerHelper('split', function (str, separator, keep) {
+    return str.split(separator)[keep];
+  })
+
+  // If you need to add Handlebars helpers, here are a few useful examples:
+  Handlebars.registerHelper('concat', function () {
+    var outStr = '';
+    for (var arg in arguments) {
+      if (typeof arguments[arg] != 'object') {
+        outStr += arguments[arg];
+      }
+    }
+    return outStr;
+  })
+
+  Handlebars.registerHelper('add', function (a, b) {
+    return parseInt(a) + parseInt(b);
+  });
+  Handlebars.registerHelper('mul', function (a, b) {
+    return parseInt(a) * parseInt(b);
+  })
+  Handlebars.registerHelper('sub', function (a, b) {
+    return parseInt(a) - parseInt(b);
+  })
+  Handlebars.registerHelper('valueAtIndex', function (arr, idx) {
+    return arr[idx];
+  })
+  Handlebars.registerHelper('includesKey', function (items, type, key) {
+    // console.log(items);
+    return items.filter(i => i.type === type).map(i => i.data.key).includes(key);
+  })
+  Handlebars.registerHelper('includes', function (array, val) {
+    return array.includes(val);
+  })
+  Handlebars.registerHelper('eval', function (expr) {
+    return eval(expr);
+  })
+  Handlebars.registerHelper('isOwnerOrGM', function (actor) {
+    console.log("Testing actor", actor.isOwner, game.userId)
+    if (actor.isOwner || game.isGM) {
+      return true
+    }
+    return false
+  })
 
-    
 
 
 }

module/system/hooks.js

@@ -14,7 +14,8 @@ export default function registerHooks() {
         html.find("img").attr("src", "systems/bol/ui/pause2.webp")
     }))
 
-    Hooks.on('renderChatLog', (log, html, data) => BoLUtility.chatListeners(html));
+    Hooks.on('renderChatLog', (log, html, data) => BoLUtility.chatListeners(html))
+    Hooks.on('renderChatMessage', (message, html, data) => BoLUtility.chatMessageHandler(message, html, data))
 
     /**
      * Create a macro when dropping an entity on the hotbar