Fixes from 29th of june

modules/hero6-actor-sheet.js

@@ -66,6 +66,7 @@ export class Hero6ActorSheet extends ActorSheet {
       notes5: await TextEditor.enrichHTML(this.object.system.biodata.notes5, {async: true}),
       containersTree: this.actor.containersTree,
       encCurrent: this.actor.encCurrent,
+      totalValue: this.actor.totalValue,
       options: this.options,
       owner: this.document.isOwner,
       editScore: this.options.editScore,

modules/hero6-actor.js

@@ -323,13 +323,18 @@ export class Hero6Actor extends Actor {
   buildContainerTree() {
     let equipments = duplicate(this.items.filter(item => item.type == "equipment") || []);
     let enc = 0
+    let value = 0
     for (let equip1 of equipments) {
       if (Number(equip1.system.weight) && Number(equip1.system.quantity)) {
         enc += equip1.system.weight * equip1.system.quantity
       }
+      if (Number(equip1.system.value) && Number(equip1.system.quantity)) {
+        value += equip1.system.value * equip1.system.quantity
+      }
     }
     // Store local values
     this.encCurrent = enc
+    this.totalValue = value
   }
 
   /* -------------------------------------------- */
@@ -427,7 +432,7 @@ export class Hero6Actor extends Actor {
   /* -------------------------------------------- */
   prepareCharacValues(charac) {
     charac.total = charac.value
-    charac.roll = 9 + Math.floor((charac.value) / 5)
+    charac.roll = 9 + Math.round((charac.value) / 5)
   }
   prepareCharac() {
     let characs = duplicate(this.system.characteristics)
@@ -579,6 +584,7 @@ export class Hero6Actor extends Actor {
     let rollData = this.getCommonRollData()
     rollData.mode = "damage"
     rollData.item = duplicate(item)
+    rollData.title = item.name
     rollData.diceFormula = Hero6Utility.convertRollHeroSyntax(item.system.damage)
     let myRoll = new Roll(rollData.diceFormula).roll({ async: false })
     await Hero6Utility.showDiceSoNice(myRoll, game.settings.get("core", "rollMode"))
@@ -587,9 +593,13 @@ export class Hero6Actor extends Actor {
     rollData.result = myRoll.total
     rollData.bodyValue = Hero6Utility.computeBodyValue(myRoll)
 
-    let msg = await Hero6Utility.createChatWithRollMode(rollData.alias, {
-      content: await renderTemplate(`systems/fvtt-hero-system-6/templates/chat/chat-damage-result.hbs`, rollData)
+    let msgFlavor = await renderTemplate(`systems/fvtt-hero-system-6/templates/chat/chat-damage-result.hbs`, rollData)
+    let msg = await rollData.roll.toMessage({
+      user: game.user.id,
+      rollMode: game.settings.get("core", "rollMode"),
+      flavor: msgFlavor
     })
+    rollData.roll = duplicate(rollData.roll) // Convert to object
     msg.setFlag("world", "rolldata", rollData)
     console.log("Rolldata result", rollData)
   }

modules/hero6-utility.js

@@ -41,7 +41,7 @@ export class Hero6Utility {
       return list.length > 0;
     })
     Handlebars.registerHelper('mul', function (a, b) {
-      return parseInt(a) * parseInt(b);
+      return Number(a) * Number(b);
     })
     Handlebars.registerHelper('locationLabel', function (key) {
       return __locationNames[key]
@@ -390,9 +390,12 @@ export class Hero6Utility {
     let hasHalfDice = ""
     if (hero6Formula.match("1/2d6")) {
       hero6Formula = hero6Formula.replace("1/2d6", "d6")
-      hasHalfDice = "+round(1d6)"
+      hasHalfDice = "+round(1d6/2)"
+    }
+    if (hero6Formula.match(".5")) {
+      hero6Formula = hero6Formula.replace(".5", "")
+      hasHalfDice = "+round(1d6/2)"
     }
-
     let foundryFormula = hero6Formula + hasHalfDice
     foundryFormula = foundryFormula.replace(' ', '')
     console.log("Parsed formula : ", hero6Formula, foundryFormula)