Update for module support

module/system/bol-utility.js

@@ -337,7 +337,7 @@ export class BoLUtility {
       // 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
+      if (actor?.isOwner) return
       else if (game.user.isGM || data.author.id === game.user.id) return
 
       const divButtons = chatCard.find('.actions-section')
@@ -354,7 +354,7 @@ export class BoLUtility {
   /* -------------------------------------------- */
   static requestInitRoll(actorId, combatData) {
     let actor = game.actors.get(actorId)
-    if (actor && actor.isOwner) {
+    if (actor?.isOwner) {
       ui.notifications.info(game.i18n.localize("BOL.ui.warninitiative"))
       BoLRoll.aptitudeCheck(actor, "init", undefined, combatData)
     }
@@ -447,7 +447,7 @@ export class BoLUtility {
   }
 
   /* -------------------------------------------- */
-  static async processDamageHandling(attackId, defenseMode, weaponId = -1, msgId) {
+  static async processDamageHandling(attackId, defenseMode, weaponId, msgId) {
     if (!game.user.isGM) {
       return
     }
@@ -457,7 +457,7 @@ export class BoLUtility {
 
     console.log("Damage Handling", attackId, defenseMode, weaponId)
     // Only GM process this
-    if (rollData && rollData.defenderId) {
+    if (rollData?.defenderId) {
       if (rollData.defenseDone || defenseMode == 'damage-not-applied') {
         return
       } // ?? Why ???
@@ -668,7 +668,6 @@ export class BoLUtility {
       let res = myReg.exec(damageString)
       let nbDice = parseInt(res[1])
       let postForm = 'kh' + nbDice
-      let modIndex = 3
       // Upgrade damage if needed
       if (upgradeDamage && (!res[3] || res[3] == "")) {
         res[3] = "B"  // Upgrade to bonus
@@ -680,22 +679,18 @@ export class BoLUtility {
         if (res[3] == 'M') {
           postForm = 'kl' + nbDice
           nbDice++
-          modIndex = 4
         }
         if (res[3] == 'MM') {
           postForm = 'kl' + nbDice
           nbDice += 2
-          modIndex = 4
         }
         if (res[3] == 'B') {
           postForm = 'kh' + nbDice
           nbDice++
-          modIndex = 4
         }
         if (res[3] == 'BB') {
           postForm = 'kh' + nbDice
           nbDice += 2
-          modIndex = 4
         }
       }
       formula = "(" + nbDice + "d" + res[2] + reroll + postForm + "+" + modifier + ") *" + multiplier