First actor sheet

modules/hero6-utility.js

@@ -24,7 +24,10 @@ export class Hero6Utility {
       return array.includes(val);
     })
     Handlebars.registerHelper('upper', function (text) {
-      return text.toUpperCase();
+      if (text) { 
+        return text.toUpperCase();
+      }
+      return text
     })
     Handlebars.registerHelper('lower', function (text) {
       return text.toLowerCase()
@@ -150,7 +153,7 @@ export class Hero6Utility {
     const templatePaths = [
       'systems/fvtt-hero-system-6/templates/partials/editor-notes-gm.hbs',
       'systems/fvtt-hero-system-6/templates/partials/partial-roll-select.hbs',
-      'systems/fvtt-hero-system-6/templates/partials/partial-actor-ability-block.hbs',
+      'systems/fvtt-hero-system-6/templates/partials/partial-actor-characteristic-block.hbs',
       'systems/fvtt-hero-system-6/templates/partials/partial-actor-status.hbs',
       'systems/fvtt-hero-system-6/templates/partials/partial-options-abilities.hbs',
       'systems/fvtt-hero-system-6/templates/partials/partial-item-nav.hbs',
@@ -293,93 +296,10 @@ export class Hero6Utility {
     let actor = game.actors.get(rollData.actorId)
 
     // ability/save/size => 0
-    let diceFormula
-    let startFormula = "0d6cs>=5[blue]"
-    if (rollData.ability) {
-      startFormula = String(rollData.ability.value) + "d6cs>=5[blue]"
-    }
-    if (rollData.save) {
-      startFormula = String(rollData.save.value) + "d6cs>=5[blue]"
-    }
-    if (rollData.sizeDice) {
-      let nb = rollData.sizeDice.nb + rollData.distanceBonusDice + this.getDiceFromCover(rollData.hasCover) + this.getDiceFromSituational(rollData.situational)
-      startFormula = String(nb) + String(rollData.sizeDice.dice) + "cs>=5[blue]"
-    }
-    diceFormula = startFormula
-
-    // skill => 2
-    // feat => 4
-    // bonus => 6
-    if (rollData.skill) {
-      let level = rollData.skill.system.level
-      if (rollData.skill.system.issl2) {
-        rollData.hasSLBonus = true
-        level += 2
-        if (level > 7) { level = 7 }
-      }
-      rollData.skill.system.skilldice = __skillLevel2Dice[level]
-      diceFormula += "+" + String(rollData.skill.system.skilldice) + "cs>=5[black]"
-
-      if (rollData.skill.system.skilltype == "complex" && rollData.skill.system.level == 0) {
-        rollData.complexSkillDisadvantage = true
-        rollData.rollAdvantage = "roll-disadvantage"
-      }
-
-      if (rollData.skill.system.isfeatdie) {
-        rollData.hasFeatDie = true
-        diceFormula += "+ 1d10cs>=5[hero6-purple]"
-      } else {
-        diceFormula += `+ 0d10cs>=5[hero6-purple]`
-      }
-      if (rollData.skill.system.bonusdice != "none") {
-        rollData.hasBonusDice = rollData.skill.system.bonusdice
-        diceFormula += `+ ${rollData.hasBonusDice}cs>=5[black]`
-      } else {
-        diceFormula += `+ 0d6cs>=5[black]`
-      }
-    } else {
-      diceFormula += `+ 0d8cs=>5 + 0d10cs>=5 + 0d6cs>=5`
-    }
-
-    // advantage => 8
-    let advFormula = "+ 0d8cs>=5"
-    if (rollData.advantage == "advantage1" || rollData.forceAdvantage) {
-      advFormula = "+ 1d8cs>=5[hero6-darkgreen]"
-    }
-    if (rollData.advantage == "advantage2") {
-      advFormula = "+ 2d8cs>=5[hero6-darkgreen]"
-    }
-    diceFormula += advFormula
-
-    // disadvantage => 10
-    let disFormula = "- 0d8cs>=5"
-    if (rollData.disadvantage == "disadvantage1" || rollData.forceDisadvantage) {
-      disFormula = "- 1d8cs>=5[red]"
-    }
-    if (rollData.disadvantage == "disadvantage2") {
-      disFormula = "- 2d8cs>=5[red]"
-    }
-    diceFormula += disFormula
-
-    // armor => 12
-    let skillArmorPenalty = 0
-    for (let armor of rollData.armors) {
-      if (armor.system.equipped) {
-        skillArmorPenalty += armor.system.skillpenalty
-      }
-    }
-    if (rollData.skill && rollData.skill.system.armorpenalty && skillArmorPenalty > 0) {
-      rollData.skillArmorPenalty = skillArmorPenalty
-      diceFormula += `- ${skillArmorPenalty}d8cs>=5`
-    } else {
-      diceFormula += `- 0d8cs>=5`
-    }
-
-    // shield => 14
-    if (rollData.useshield && rollData.shield) {
-      diceFormula += "+ 1" + String(rollData.shield.system.shielddie) + "cs>=5[yellow]"
-    } else {
-      diceFormula += " + 0d6cs>=5"
+    let diceFormula = "3d6+" + rollData.bonusMalus
+    let target = 10
+    if (rollData.charac) {
+      target = rollData.charac.roll
     }
 
     // Performs roll
@@ -389,74 +309,27 @@ export class Hero6Utility {
       myRoll = new Roll(diceFormula).roll({ async: false })
       await this.showDiceSoNice(myRoll, game.settings.get("core", "rollMode"))
     }
-    rollData.rollOrder = 0
     rollData.roll = myRoll
-    rollData.nbSuccess = myRoll.total
-
-    if (rollData.rollAdvantage == "none" && rollData.forceRollAdvantage) {
-      rollData.rollAdvantage = "roll-advantage"
+    rollData.target = target
+    rollData.diceFormula = diceFormula
+    rollData.result = myRoll.total
+    rollData.isSuccess = false
+    if (rollData.result <= target) {
+      rollData.isSuccess = true
     }
-    if (rollData.rollAdvantage == "none" && rollData.forceRollDisadvantage) {
-      rollData.rollAdvantage = "roll-disadvantage"
+    if ( myRoll.terms[0].total == 3) { // Always a success
+      rollData.isSuccess = true
     }
-    if (rollData.rollAdvantage != "none") {
-
-      rollData.rollOrder = 1
-      rollData.rollType = (rollData.rollAdvantage == "roll-advantage") ? "Advantage" : "Disadvantage"
-      this.createChatWithRollMode(rollData.alias, {
-        content: await renderTemplate(`systems/fvtt-hero-system-6/templates/chat-generic-result.hbs`, rollData)
-      })
-
-      rollData.rollOrder = 2
-      let myRoll2 = new Roll(diceFormula).roll({ async: false })
-      await this.showDiceSoNice(myRoll2, game.settings.get("core", "rollMode"))
-
-      rollData.roll = myRoll2 // Tmp switch to display the proper results
-      rollData.nbSuccess = myRoll2.total
-      this.createChatWithRollMode(rollData.alias, {
-        content: await renderTemplate(`systems/fvtt-hero-system-6/templates/chat-generic-result.hbs`, rollData)
-      })
-      rollData.roll = myRoll // Revert the tmp switch
-      rollData.nbSuccess = myRoll.total
-
-      if (rollData.rollAdvantage == "roll-advantage") {
-        if (myRoll2.total > rollData.nbSuccess) {
-          hasChanged = true
-          rollData.roll = myRoll2
-          rollData.nbSuccess = myRoll2.total
-        }
-      } else {
-        if (myRoll2.total < rollData.nbSuccess) {
-          rollData.roll = myRoll2
-          rollData.nbSuccess = myRoll2.total
-        }
-      }
-      rollData.rollOrder = 3
-    }
-    rollData.nbSuccess = Math.max(0, rollData.nbSuccess)
-
-    rollData.isFirstRollAdvantage = false
-    // Manage exp
-    if (rollData.skill && rollData.skill.system.level > 0) {
-      let nbSkillSuccess = rollData.roll.terms[2].total
-      if (nbSkillSuccess == 0 || nbSkillSuccess == rollData.skill.system.level) {
-        actor.incrementSkillExp(rollData.skill.id, 1)
-      }
+    if ( myRoll.terms[0].total == 18) { // Always a failure
+      rollData.isSuccess = false
     }
 
-    this.saveRollData(rollData)
-    actor.lastRoll = rollData
-
-    this.createChatWithRollMode(rollData.alias, {
-      content: await renderTemplate(`systems/fvtt-hero-system-6/templates/chat-generic-result.hbs`, rollData)
+    let msg = await this.createChatWithRollMode(rollData.alias, {
+      content: await renderTemplate(`systems/fvtt-hero-system-6/templates/chat/chat-generic-result.hbs`, rollData)
     })
+    msg.setFlag("world", "rolldata", rollData)
     console.log("Rolldata result", rollData)
 
-    // Message response
-    this.displayDefenseMessage(rollData)
-
-    // Manage defense result
-    this.processAttackDefense(rollData)
   }
 
   /* -------------------------------------------- */
@@ -532,7 +405,7 @@ export class Hero6Utility {
   }
 
   /* -------------------------------------------- */
-  static createChatMessage(name, rollMode, chatOptions) {
+  static async createChatMessage(name, rollMode, chatOptions) {
     switch (rollMode) {
       case "blindroll": // GM only
         if (!game.user.isGM) {
@@ -550,7 +423,7 @@ export class Hero6Utility {
         break;
     }
     chatOptions.alias = chatOptions.alias || name;
-    ChatMessage.create(chatOptions);
+    return await ChatMessage.create(chatOptions);
   }
 
   /* -------------------------------------------- */
@@ -558,7 +431,7 @@ export class Hero6Utility {
     let rollData = {
       rollId: randomID(16),
       rollMode: game.settings.get("core", "rollMode"),
-      advantage: "none"
+      bonusMalus: 0
     }
     Hero6Utility.updateWithTarget(rollData)
     return rollData
@@ -573,8 +446,8 @@ export class Hero6Utility {
   }
 
   /* -------------------------------------------- */
-  static createChatWithRollMode(name, chatOptions) {
-    this.createChatMessage(name, game.settings.get("core", "rollMode"), chatOptions)
+  static async createChatWithRollMode(name, chatOptions) {
+    return await this.createChatMessage(name, game.settings.get("core", "rollMode"), chatOptions)
   }
 
   /* -------------------------------------------- */