v10 init fix

module/actor/actor-sheet.js

@@ -140,7 +140,7 @@ export class BoLActorSheet extends ActorSheet {
     formData.ammos = this.actor.ammos
     formData.misc = this.actor.misc
     formData.combat = this.actor.buildCombat()
-    formData.combatCreature = this.actor.buildCombatCreature()
+    //formData.combatCreature = this.actor.buildCombatCreature()
     formData.features = this.actor.buildFeatures()
     formData.isGM = game.user.isGM
     formData.options = this.options

module/actor/actor.js

@@ -479,6 +479,15 @@ export class BoLActor extends Actor {
         "options": false,
         "items": this.melee
       },
+      "natural": {
+        "label": "BOL.combatCategory.natural",
+        "weapon": true,
+        "protection": false,
+        "blocking": false,
+        "ranged": false,
+        "options": false,
+        "items": this.natural
+      },
       "ranged": {
         "label": "BOL.combatCategory.ranged",
         "weapon": true,
@@ -518,28 +527,6 @@ export class BoLActor extends Actor {
     }
   }
 
-  buildCombatCreature() {
-    return {
-      "natural": {
-        "label": "BOL.combatCategory.natural",
-        "weapon": true,
-        "protection": false,
-        "blocking": false,
-        "ranged": false,
-        "options": false,
-        "items": this.natural
-      },
-      "protections": {
-        "label": "BOL.combatCategory.protections",
-        "weapon": false,
-        "protection": true,
-        "blocking": false,
-        "ranged": false,
-        "options": false,
-        "items": this.protections
-      },
-    }
-  }
 
   /*-------------------------------------------- */
   buildRollList() {

module/system/bol-combat.js

@@ -15,7 +15,7 @@ export class BoLCombatManager extends Combat {
 
   /************************************************************************************/
   async rollInitiative(ids, formula = undefined, messageOptions = {}) {
-    console.log(`${game.data.system.data.title} | Combat.rollInitiative()`, ids, formula, messageOptions);
+    console.log(`${game.system.title} | Combat.rollInitiative()`, ids, formula, messageOptions);
     // Structure input data
     ids = typeof ids === "string" ? [ids] : ids;
     const currentId = this.combatant._id;
@@ -24,6 +24,7 @@ export class BoLCombatManager extends Combat {
     for (let cId = 0; cId < ids.length; cId++) {
       const combatant = this.combatants.get(ids[cId]);
       let fvttInit = 5
+      //console.log("TYPE", combatant.actor.type)
       if (combatant.actor.type == 'character') {
         let initData = combatant.actor.getLastInitData()
         console.log("Init data !!!", initData)
@@ -37,11 +38,12 @@ export class BoLCombatManager extends Combat {
           fvttInit = 3
         }
       } else {
-        fvttInit = 4 // Pietaille par defaut
+        fvttInit = 4 // Pietaille par defautco
-        if ( combatant.actor.getSubtype == 'adversary') {
+        //console.log("ACTOR", combatant.actor.getCharType())
+        if ( combatant.actor.getCharType() == 'adversary') {
           fvttInit = 7
         } 
-        if ( combatant.actor.getSubtype == 'tough') {
+        if ( combatant.actor.getCharType() == 'tough') {
           fvttInit = 6
         } 
       }

system.json

@@ -14,7 +14,7 @@
   ],
   "url": "https://www.uberwald.me/gitea/public/bol",
   "license": "LICENSE.txt",
-  "version": "10.0.6",
+  "version": "10.1.2",
   "compatibility": {
     "minimum": "10"
   },
@@ -192,7 +192,7 @@
   ],
   "socket": true,
   "manifest": "https://www.uberwald.me/gitea/public/bol/raw/v10/system.json",
-  "download": "https://www.uberwald.me/gitea/public/bol/archive/bol-v10.0.6.zip",
+  "download": "https://www.uberwald.me/gitea/public/bol/archive/bol-v10.1.2.zip",
   "background": "systems/images/map_lemurie.webp",
   "gridDistance": 1.5,
   "gridUnits": "m",

templates/dialogs/weapon-roll-dialog.hbs

@@ -8,7 +8,7 @@
         </div>
     </header>
 
-    {{#if weapon.data.data.properties.onlymodifier}}
+    {{#if weapon.system.properties.onlymodifier}}
     {{else}}
       {{> "systems/bol/templates/dialogs/attribute-roll-part.hbs"}}
       {{> "systems/bol/templates/dialogs/aptitude-roll-part.hbs"}}