Fixes from 29th of june

modules/hero6-actor.js

@@ -612,12 +612,15 @@ export class Hero6Actor extends Actor {
     let myRoll = new Roll(rollData.diceFormula).roll({ async: false })
     await Hero6Utility.showDiceSoNice(myRoll, game.settings.get("core", "rollMode"))
 
-    rollData.roll = duplicate(myRoll)
     rollData.bodyValue = Hero6Utility.computeBodyValue(myRoll)
     rollData.result = myRoll.total
+    rollData.roll = duplicate(myRoll)
 
-    let msg = await Hero6Utility.createChatWithRollMode(rollData.alias, {
-      content: await renderTemplate(`systems/fvtt-hero-system-6/templates/chat/chat-lift-dice-result.hbs`, rollData)
+    let msgFlavor = await renderTemplate(`systems/fvtt-hero-system-6/templates/chat/chat-lift-dice-result.hbs`, rollData)
+    let msg = await myRoll.toMessage({
+      user: game.user.id,
+      rollMode: game.settings.get("core", "rollMode"),
+      flavor: msgFlavor
     })
     msg.setFlag("world", "rolldata", rollData)
     console.log("Rolldata result", rollData)

modules/hero6-combat.js

@@ -5,7 +5,7 @@ export class Hero6CombatTracker extends CombatTracker {
 
   /* -------------------------------------------- */
   static get defaultOptions() {
-    var path = "systems/fvtt-hero-system-6/templates/apps/combat-tracker.hbs";
+    let path = "systems/fvtt-hero-system-6/templates/apps/combat-tracker.hbs";
     return foundry.utils.mergeObject(super.defaultOptions, {
       template: path,
     });
@@ -21,6 +21,7 @@ export class Hero6Combat extends Combat {
   }
   /* -------------------------------------------- */
   static pushMenuOptions(html, options) {
+    console.log(">>>>>>>>>>>>>>>>>>>>>>>< MENU OPTIONS!!!!!")
     let newOpt
     for (let i = 0; i < options.length; i++) {
       let option = options[i];
@@ -62,7 +63,7 @@ export class Hero6Combat extends Combat {
   constructor(data, context) {
     super(data, context);
 
-    this.turnNumber = 1;
+    this.turnNumber = 0;
     this.segmentNumber = 12;
   }
 
@@ -104,13 +105,13 @@ export class Hero6Combat extends Combat {
 
     let turnData = this.getFlag("world", "hero6-turn-data")
     if (!turnData) {
-      turnData = { turnNumber: 1, segmentNumber: 12 }
+      turnData = { turnNumber: 0, segmentNumber: 12 }
       this.setFlag("world", "hero6-turn-data", turnData)
     }
     turnData = duplicate(turnData)
-    turnData.segmentNumber -= 1
-    if (turnData.segmentNumber <= 0) {
-      turnData.segmentNumber = 12
+    turnData.segmentNumber += 1
+    if (turnData.segmentNumber > 12) {
+      turnData.segmentNumber = 1
       turnData.turnNumber++
     }
     this.setFlag("world", "hero6-turn-data", turnData)

modules/hero6-main.js

@@ -96,6 +96,8 @@ Hooks.once("ready", function () {
   welcomeMessage();
   Hero6Utility.ready()
   Hero6Commands.ready()
+  Hero6Combat.init()
+  
 })
 
 /* -------------------------------------------- */

modules/hero6-utility.js

@@ -388,18 +388,22 @@ export class Hero6Utility {
     // Ensure we have no space at all
     //hero6Formula = hero6Formula.replace(/\s/g, '')
     let hasHalfDice = ""
-    if (hero6Formula.match("1/2d6")) {
-      hero6Formula = hero6Formula.replace("1/2d6", "d6")
-      hasHalfDice = "+round(1d6/2)"
+    let newFormula = hero6Formula
+
+    let form1 = hero6Formula.match(/\s*(\d*)\s*1\/2d6/)
+    if ( form1 ) { 
+      let nbDice = form1[1] || 0
+      newFormula = nbDice+"d6+round(1d6/2)"
     }
-    if (hero6Formula.match(".5")) {
-      hero6Formula = hero6Formula.replace(".5", "")
-      hasHalfDice = "+round(1d6/2)"
+
+    let form3 = hero6Formula.match(/\s*(\d*)\.5d6/)
+    if ( form3 ) {
+      let nbDice = form3[1] || 0
+      newFormula = nbDice+"d6+round(1d6/2)"
     }
-    let foundryFormula = hero6Formula + hasHalfDice
-    foundryFormula = foundryFormula.replace(' ', '')
-    console.log("Parsed formula : ", hero6Formula, foundryFormula)
-    return foundryFormula
+
+    console.log("Parsed formula : ", hero6Formula, newFormula)
+    return newFormula
   }
 
   /* -------------- ----------------------------- */