Enhance initiative + fix combat

module/actor/actor.js

@@ -648,15 +648,37 @@ export class BoLActor extends Actor {
   }
 
   /*-------------------------------------------- */
-  registerInit(initScore, isCritical, isFumble) {
-    this.update({ 'system.combat.lastinit': initScore, 'system.combat.iscritical': isCritical, 'system.combat.isfumble': isFumble })
+  registerInit(rollData) {
+    rollData.actor = undefined // Cleanup if present
+    this.setFlag("world", "last-initiative", rollData)
   }
 
   /*-------------------------------------------- */
-  getLastInitData() {
-    return this.system.combat
+  getInitiativeRank() {
+    let rollData = this.getFlag("world", "last-initiative")    
+    let fvttInit = 5
+    if (this.type == 'character') {
+      if (rollData.isLegendary) {
+        fvttInit = 10
+      } else if (rollData.isCritical) {
+        fvttInit = 9
+      } else if (rollData.isSuccess ) {
+        fvttInit = 8
+      } else if (rollData.isFumble) {
+        fvttInit = 3
+      }
+    } else {
+      fvttInit = 4 // Pietaille par defautco
+      if ( this.getCharType() == 'adversary') {
+        fvttInit = 7
+      } 
+      if ( this.getCharType() == 'tough') {
+        fvttInit = 6
+      }       
+    }
+    return fvttInit
   }
-
+  
   /*-------------------------------------------- */
   async subHeroPoints(nb) {
     let newHeroP = this.system.resources.hero.value - nb;