Fix bougette sur PNJ/Creatures

lang/fr.json

@@ -182,6 +182,7 @@
   "BOL.ui.armornoformula": "L'armure {protect.name} n'a pas de formule pour la protection !",
   "BOL.ui.selectactor": "Selectionnez votre personnage pour utiliser la macro",
   "BOL.ui.itemnotfound": "Impossible de trouver l'objet de cette macro",
+  "BOL.ui.noinit": "Pas d'initiative trouvée, veuillez en enregistrer une.",
   
   "BOL.featureCategory.origins": "Origines",
   "BOL.featureCategory.races": "Races",

module/actor/actor-sheet.js

@@ -148,7 +148,7 @@ export class BoLActorSheet extends ActorSheet {
     formData.options = this.options
     formData.owner = this.document.isOwner
     formData.editScore = this.options.editScore
-    formData.useBougette = BoLUtility.getUseBougette()    
+    formData.useBougette = (this.actor.type == "character" && BoLUtility.getUseBougette()) || false    
     formData.bougette = this.actor.getBougette()
     formData.charType = this.actor.getCharType()
     formData.villainy = this.actor.getVillainy()    

module/actor/actor.js

@@ -40,26 +40,35 @@ export class BoLActor extends Actor {
 
   /* -------------------------------------------- */
   getBougette() {
+    if ( this.type == "character") {
       let b = duplicate(this.system.bougette)
       b.label = game.i18n.localize( game.bol.config.bougetteState[String(this.system.bougette.value)] )
       b.diceImg = "icons/dice/" + game.bol.config.bougetteDice[String(this.system.bougette.value)] + "black.svg"    
       return b
     }
+    return undefined
+  }
+
   /* -------------------------------------------- */
   async rollBougette() {
-    //ui.notifications.info("Roll bougette done !")
+    if ( this.type == "character") {
       let attribute = duplicate(this.system.attributes.vigor)
       let rollData = BoLRoll.getCommonRollData(this, "bougette", attribute, undefined )
       rollData.formula = game.bol.config.bougetteDice[String(this.system.bougette.value)]
       let r = new BoLDefaultRoll(rollData)
       r.roll()
     }
+  }
+
   /* -------------------------------------------- */
   decBougette() {
+    if ( this.type == "character") {
       let bougette =  duplicate(this.system.bougette)
       bougette.value = Math.max( Number(bougette.value) - 1, 0)
       this.update( { 'system.bougette': bougette } )
     }
+  }
+  
   /* -------------------------------------------- */
   updateResourcesData() {
     if (this.type == 'character') {
@@ -648,16 +657,22 @@ export class BoLActor extends Actor {
   }
 
   /*-------------------------------------------- */
-  registerInit(rollData) {
+  async registerInit(rollData) {
     rollData.actor = undefined // Cleanup if present
-    this.setFlag("world", "last-initiative", rollData)
+    await this.setFlag("world", "last-initiative", rollData)
   }
 
   /*-------------------------------------------- */
-  getInitiativeRank() {
-    let rollData = this.getFlag("world", "last-initiative")    
-    let fvttInit = 5
+  getInitiativeRank(rollData = undefined) {
+    if (!rollData) { 
+      rollData = this.getFlag("world", "last-initiative")    
+    }
+    let fvttInit = 4 // Pietaille par defaut
     if (this.type == 'character' ) {
+      fvttInit = 5
+      if (!rollData) {
+        fvttInit = -1
+      } else {
         if (rollData.isLegendary) {
           fvttInit = 10
         } else if (rollData.isCritical) {
@@ -667,15 +682,14 @@ export class BoLActor extends Actor {
         } 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
   }
   

module/controllers/bol-rolls.js

@@ -571,7 +571,7 @@ export class BoLDefaultRoll {
     
     if (this.rollData.registerInit) {
       actor.registerInit(this.rollData)
-      this.rollData.initiativeRank = actor.getInitiativeRank()
+      this.rollData.initiativeRank = actor.getInitiativeRank(this.rollData)
     }
     if (this.rollData.isSuccess && this.rollData.mode == "spell") { // PP cost management
       this.rollData.remainingPP = actor.spendPowerPoint(this.rollData.ppCost + this.rollData.ppCostArmor)

module/system/bol-combat.js

@@ -20,7 +20,7 @@ export class BoLCombatManager extends Combat {
     console.log(`${game.system.title} | Combat.rollInitiative()`, ids, formula, messageOptions);
     // Structure input data
     ids = typeof ids === "string" ? [ids] : ids;
-    const currentId = this.combatant.id;
+    //const currentId = this.combatant.id;
 
     // calculate initiative
     for (let cId = 0; cId < ids.length; cId++) {

system.json

@@ -14,7 +14,7 @@
   ],
   "url": "https://www.uberwald.me/gitea/public/bol",
   "license": "LICENSE.txt",
-  "version": "10.4.7",
+  "version": "10.4.12",
   "compatibility": {
     "minimum": "10",
     "verified": "10",
@@ -203,7 +203,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.4.7.zip",
+  "download": "https://www.uberwald.me/gitea/public/bol/archive/bol-v10.4.12.zip",
   "background": "systems/images/map_lemurie.webp",
   "gridDistance": 1.5,
   "gridUnits": "m",