Fix bougette sur PNJ/Creatures

lang/fr.json

@@ -182,7 +182,8 @@
   "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",
   "BOL.featureCategory.careers": "Carrières",
@@ -477,6 +478,7 @@
   "BOL.chat.rollbougette": "Jet de Bougette",
   "BOL.chat.bougettesuccess": "Votre bougette reste inchangée !",
   "BOL.chat.bougettefailure": "Vous avez trop dépensé, votre bougette s'est réduite...",
+  "BOL.chat.initiative": "Rang d'intiative (10 à 1)",
 
   "BOL.dialog.soeasy": "Inmanquable (+4)",
   "BOL.dialog.veryeasy": "Trés Facile (+2)",

module/actor/actor-sheet.js

@@ -141,13 +141,14 @@ export class BoLActorSheet extends ActorSheet {
     formData.ammos = this.actor.ammos
     formData.misc = this.actor.misc
     formData.combat = this.actor.buildCombat()
+    formData.initiativeRank = this.actor.getInitiativeRank()
     //formData.combatCreature = this.actor.buildCombatCreature()
     formData.features = this.actor.buildFeatures()
     formData.isGM = game.user.isGM
     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() {
-    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
+    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 !")
-    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()
+    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() {
-    let bougette =  duplicate(this.system.bougette)
-    bougette.value = Math.max( Number(bougette.value) - 1, 0)
-    this.update( { 'system.bougette': bougette } )
+    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,15 +657,42 @@ export class BoLActor extends Actor {
   }
 
   /*-------------------------------------------- */
-  registerInit(initScore, isCritical, isFumble) {
-    this.update({ 'system.combat.lastinit': initScore, 'system.combat.iscritical': isCritical, 'system.combat.isfumble': isFumble })
+  async registerInit(rollData) {
+    rollData.actor = undefined // Cleanup if present
+    await this.setFlag("world", "last-initiative", rollData)
   }
 
   /*-------------------------------------------- */
-  getLastInitData() {
-    return this.system.combat
+  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) {
+          fvttInit = 9
+        } else if (rollData.isSuccess ) {
+          fvttInit = 8
+        } else if (rollData.isFumble) {
+          fvttInit = 3
+        }  
+      }
+    }
+    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;

module/bol.js

@@ -41,7 +41,7 @@ Hooks.once('init', async function () {
    */
   CONFIG.Combat.initiative = {
     formula: "2d6+@attributes.mind.value+@aptitudes.init.value",
-    decimals: 3
+    decimals: 2
   };
   
   // Define custom Entity classes

module/controllers/bol-rolls.js

@@ -548,7 +548,7 @@ export class BoLDefaultRoll {
   async roll() {
 
     const r = new Roll(this.rollData.formula)
-    // console.log("Roll formula", this.rollData.formula)
+    //console.log("Roll formula", this.rollData.formula)
     await r.roll({ "async": false })
     const activeDice = r.terms[0].results.filter(r => r.active)
     const diceTotal = activeDice.map(r => r.result).reduce((a, b) => a + b)
@@ -570,7 +570,8 @@ export class BoLDefaultRoll {
     }
     
     if (this.rollData.registerInit) {
-      actor.registerInit(r.total, this.rollData.isCritical, this.rollData.isFumble)
+      actor.registerInit(this.rollData)
+      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

@@ -10,6 +10,8 @@ Init order =
   3 - Echec critique
 */
 
+import { BoLUtility } from "../system/bol-utility.js";
+
 
 export class BoLCombatManager extends Combat {
 
@@ -18,35 +20,12 @@ 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++) {
-      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)
-        if (initData.isLegendary) {
-          fvttInit = 10
-        } else if (initData.isCritical) {
-          fvttInit = 9
-        } else if (initData.lastinit >= 9) {
-          fvttInit = 8
-        } else if (initData.isFumble) {
-          fvttInit = 3
-        }
-      } else {
-        fvttInit = 4 // Pietaille par defautco
-        //console.log("ACTOR", combatant.actor.getCharType())
-        if ( combatant.actor.getCharType() == 'adversary') {
-          fvttInit = 7
-        } 
-        if ( combatant.actor.getCharType() == 'tough') {
-          fvttInit = 6
-        } 
-      }
+      const combatant = this.combatants.get(ids[cId])
+      let fvttInit = combatant.actor.getInitiativeRank()
       fvttInit += (cId / 100)
       await this.updateEmbeddedDocuments("Combatant", [{ _id: ids[cId], initiative: fvttInit }]);
     }

module/system/bol-utility.js

@@ -178,7 +178,7 @@ export class BoLUtility {
   static getOtherWhisperRecipients(name) {
     let users = []
     for (let user of game.users) {
-      if (!user.isGM && user.name != name) {
+      if ( !user.isGM && user.name != name) {
         users.push(user.id)
       }
     }

system.json

@@ -14,7 +14,7 @@
   ],
   "url": "https://www.uberwald.me/gitea/public/bol",
   "license": "LICENSE.txt",
-  "version": "10.4.6",
+  "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.6.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",

templates/actor/parts/tabs/actor-equipment.hbs

@@ -1,34 +1,34 @@
 <!--ARMES-->
 <button class="create_item">Créer un Equipement</button>
 
-{{#if useBougette}}
-<ol class="items-list">
-  <li class="item flexrow item-header">
-    <div class="item-name flex4 left">{{localize "BOL.ui.moneyTitle"}}</div>
-    <div class="item-name flex4 left">&nbsp;</div>
-  </li>
-  <li class="item flexrow" data-item-id="{{item._id}}">
-    <h4 class="item-name flex4 left">
-      <div class="item-image"><img src="icons/containers/bags/coinpouch-simple-leather-brown.webp" title="{{localize "BOL.ui.money"}}" /></div>
-      {{localize "BOL.ui.money"}}
-    </h4>
-    <div class="item-image">
-      <a class="bougette-roll rollable" data-roll-type="bougette"><i class="darkgreen fas fa-dice"></i></a>
-    </div>
-    {{#if isGM}}
-    <select class="field-value" name="system.bougette.value" data-dtype="String">
-      {{#select bougette.value}}
-        {{#each config.bougetteState as |value id|}}
-        <option value="{{id}}">{{localize value}}</option>
-        {{/each}}
-      {{/select}}
-    </select>
-    {{else}}
-      <label class="">{{localize bougette.label}}</label></a>
-    {{/if}}
-  </li>
-</ol>
-{{/if}}
+  {{#if useBougette}}
+  <ol class="items-list">
+    <li class="item flexrow item-header">
+      <div class="item-name flex4 left">{{localize "BOL.ui.moneyTitle"}}</div>
+      <div class="item-name flex4 left">&nbsp;</div>
+    </li>  
+    <li class="item flexrow" data-item-id="{{item._id}}">
+      <h4 class="item-name flex4 left">
+        <div class="item-image"><img src="icons/containers/bags/coinpouch-simple-leather-brown.webp" title="{{localize "BOL.ui.money"}}" /></div>
+        {{localize "BOL.ui.money"}}
+      </h4>
+      <div class="item-image">
+        <a class="bougette-roll rollable" data-roll-type="bougette"><i class="darkgreen fas fa-dice"></i></a>
+      </div>
+      {{#if isGM}}
+      <select class="field-value" name="system.bougette.value" data-dtype="String">
+        {{#select bougette.value}}
+          {{#each config.bougetteState as |value id|}}
+          <option value="{{id}}">{{localize value}}</option>
+          {{/each}}
+        {{/select}}
+      </select>
+      {{else}}
+        <label class="">{{localize bougette.label}}</label></a>
+      {{/if}}
+    </li>
+  </ol>
+  {{/if}}
 
 <ol class="items-list">
   <li class="item flexrow item-header">

templates/chat/rolls/default-roll-card.hbs

@@ -34,6 +34,12 @@
   </div>
   {{/if}}
 
+  {{#if initiativeRank}}
+  <div>
+    {{localize "BOL.chat.initiative"}}: {{initiativeRank}}
+  </div>
+  {{/if}}
+
   {{#if (eq mode "bougette")}}
   <div>
     {{localize "BOL.chat.rollbougette"}} :