fix: tailles du Phong et du Behemathon

- Phong : petité créature et non grande
- Behemathon : monstrueuse créature et non grande

.gitea/workflows/main.yml

@@ -0,0 +1,54 @@
+name: Release Creation
+
+on: 
+  release:
+    types: [published]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - run: echo "💡 The ${{ gitea.repository }} repository will cloned to the runner."
+    
+    #- uses: actions/checkout@v3
+    - uses: RouxAntoine/checkout@v3.5.4
+      with:
+        ref: 'v10'
+
+    # get part of the tag after the `v`
+    - name: Extract tag version number
+      id: get_version
+      uses: battila7/get-version-action@v2
+
+    # Substitute the Manifest and Download URLs in the module.json
+    - name: Substitute Manifest and Download Links For Versioned Ones
+      id: sub_manifest_link_version
+      uses: microsoft/variable-substitution@v1
+      with:
+        files: 'system.json'
+      env:
+        version: ${{steps.get_version.outputs.version-without-v}}
+        url: https://www.uberwald.me/gitea/public/bol
+        manifest: https://www.uberwald.me/gitea/public/bol/releases/latest/system.json
+        download: https://www.uberwald.me/gitea/public/bol/releases/download/${{github.event.release.tag_name}}/bol.zip
+    
+    # Create a zip file with all files required by the module to add to the release
+    - run: |
+         apt update -y
+         apt install -y zip
+
+    - run: zip -r ./bol.zip system.json template.json README.md LICENSE assets/ css/ fonts/ images/ lang/ module/ packs/ styles/ templates/ ui/
+    
+    - name: setup go
+      uses: https://github.com/actions/setup-go@v4
+      with:
+        go-version: '>=1.20.1'
+    
+    - name: Use Go Action  
+      id: use-go-action
+      uses: https://gitea.com/actions/release-action@main
+      with:
+        files: |-
+          ./bol.zip
+          system.json
+        api_key: '${{secrets.RELEASE_TOKEN_UBERWALD}}'

.gitignore

@@ -1 +1,14 @@
-.history/
+.vscode/settings.json
+.idea
+.history
+todo.md
+/.vscode
+/ignored/
+/node_modules/
+/jsconfig.json
+/package.json
+/package-lock.json
+/packs/*/
+/packs/*/CURRENT
+/packs/*/LOG
+/packs/*/LOCK

changelog.md

@@ -1,3 +1,7 @@
+# v11.0.8
+
+ - Correction sur les malus de bouclier (blocage)
+ - Corrrection sur le malus d'init des boucliers qui était mal affiché dans la fiche d'item
 # v10.4.0
 
  - Ajout de la gestion d'effets

css/bol.css

@@ -1044,9 +1044,18 @@ body.system-bol img#logo {
   justify-content: flex-start;
   flex-direction: column;
   position: absolute;
-  top: 2.75rem;
+  /*transform: translate(0, -30%);*/
+  top: -4rem;
+  max-width: 250px;
   left: 4rem;
 }
+.tokenhudext.right2 {
+  justify-content: flex-start;
+  flex-direction: column;
+  position: absolute;
+  top: -4rem;
+  left: 12rem;
+}
 .control-icon.tokenhudicon {
   width: fit-content;
   height: fit-content;
@@ -1063,7 +1072,7 @@ body.system-bol img#logo {
   z-index: 2;
 }
 .bol-hud-menu label {
-  font-size: 0.75rem;
+  font-size: 0.6rem;
 }
 .bol-margin-tb-2 {
   margin-top: 2px;

lang/de.json

@@ -355,6 +355,16 @@
   "BOL.vehicleCategory.boat" : "Schiff",
   "BOL.vehicleCategory.other" : "Anderes",
 
+  "BOL.ui.astrologerPoints": "Points d'Astrologie",
+  "BOL.ui.astrologerPointsLabel": "Points d'Astrologie actuels",
+  "BOL.ui.ishoroscopemajor": "Horoscope Majeur (ie de groupe) ?",
+  "BOL.ui.answer": "Réponse", 
+  "BOL.ui.horoscopefavorable": "Favorable (1dB)",
+  "BOL.ui.horoscopeunfavorable": "Défavorable (1dM)",
+  "BOL.ui.horoscopes": "Horoscopes",
+  "BOL.ui.horoscopesBonus": "Horoscopes (Bonus)",
+  "BOL.ui.horoscopesMalus": "Horoscopes (Malus)",
+  "BOL.ui.groupHoroscope": "Horoscrope de Groupe de ",
 
   "BOL.range.PointBlank": "Direkt",
   "BOL.range.Short": "Kurz",

lang/en.json

@@ -35,6 +35,17 @@
   "BOL.ui.tab.spellalchemy": "Spells & Alchemy",
   "BOL.ui.tab.astrologer": "Astrologer",
 
+  "BOL.ui.astrologerPoints": "Points d'Astrologie",
+  "BOL.ui.astrologerPointsLabel": "Points d'Astrologie actuels",
+  "BOL.ui.ishoroscopemajor": "Horoscope Majeur (ie de groupe) ?",
+  "BOL.ui.answer": "Réponse", 
+  "BOL.ui.horoscopefavorable": "Favorable (1dB)",
+  "BOL.ui.horoscopeunfavorable": "Défavorable (1dM)",
+  "BOL.ui.horoscopes": "Horoscopes",
+  "BOL.ui.horoscopesBonus": "Horoscopes (Bonus)",
+  "BOL.ui.horoscopesMalus": "Horoscopes (Malus)",
+  "BOL.ui.groupHoroscope": "Horoscrope de Groupe de ",
+
   "BOL.ui.properties": "Properties",
   "BOL.ui.description": "Description",
   "BOL.ui.actions": "Actions",
@@ -155,7 +166,7 @@
   "BOL.ui.attackValue": "Attack Value",
   "BOL.ui.weaponbonus": "Cette arme bénéficie déja d'un Dé de Bonus (Arme Favorite prise en compte, par exemple)",
   "BOL.ui.initMalus": "Init malus",
-  "BOL.ui.ispecial": "Spécial ?",
+  "BOL.ui.isspecial": "Spécial ?",
 
   "BOL.featureCategory.origins": "Origins",
   "BOL.featureCategory.races": "Races",

lang/fr.json

@@ -218,7 +218,7 @@
   "BOL.ui.itemnotfound": "Impossible de trouver l'objet de cette macro",
   "BOL.ui.noinit": "Pas d'initiative trouvée, veuillez en enregistrer une.",
   "BOL.ui.warninitiative": "Votre initiative n'est pas disponible. Effectuez un jet d'Initiative pour ce combat.",
-  "BOL.ui.ispecial": "Spéciale ?",
+  "BOL.ui.isspecial": "Spéciale ?",
   
   "BOL.featureCategory.origins": "Origines",
   "BOL.featureCategory.races": "Races",

module/actor/actor.js

@@ -1,6 +1,5 @@
-import { BoLDefaultRoll } from "../controllers/bol-rolls.js";
+import { BoLDefaultRoll, BoLRoll } from "../controllers/bol-rolls.js";
 import { BoLUtility } from "../system/bol-utility.js";
-import { BoLRoll } from "../controllers/bol-rolls.js";
 
 /**
  * Extend the base Actor entity by defining a custom roll data structure which is ideal for the Simple system.
@@ -22,6 +21,18 @@ export class BoLActor extends Actor {
     super.prepareData()
   }
 
+  /* -------------------------------------------- */
+  async _preCreate(data, options, user) {
+    await super._preCreate(data, options, user);
+
+    // Configure prototype token settings
+    const prototypeToken = {};
+    if (this.type === "character") Object.assign(prototypeToken, {
+      sight: { enabled: true }, actorLink: true, disposition: CONST.TOKEN_DISPOSITIONS.FRIENDLY
+    });
+    this.updateSource({ prototypeToken });
+  }
+
   /* -------------------------------------------- */
   isHeroAdversary() {
     if (this.type === 'character') {
@@ -50,7 +61,7 @@ export class BoLActor extends Actor {
   }
   /* -------------------------------------------- */
   getInitiativeMalus() {
-    if ( this.type === 'encounter' && (this.chartype == "adversary" || this.chartype == "tough")) {
+    if (this.type === 'encounter' && (this.chartype == "adversary" || this.chartype == "tough")) {
       return this.system.aptitudes.init.value
     }
     return 0
@@ -92,12 +103,12 @@ export class BoLActor extends Actor {
       let newVitality = 10 + this.system.attributes.vigor.value + this.system.resources.hp.bonus
       if (this.system.resources.hp.max != newVitality) {
         let actor = this
-        setTimeout( function() { actor.update({ 'system.resources.hp.max': newVitality }) }, 800 )
+        setTimeout(function () { actor.update({ 'system.resources.hp.max': newVitality }) }, 800)
       }
       let newPower = 10 + this.system.attributes.mind.value + this.system.resources.power.bonus
       if (this.system.resources.power.max != newPower) {
         let actor = this
-        setTimeout( function() { actor.update({ 'system.resources.power.max': newPower }) }, 800 )
+        setTimeout(function () { actor.update({ 'system.resources.power.max': newPower }) }, 800)
       }
     }
   }
@@ -110,7 +121,7 @@ export class BoLActor extends Actor {
       super.prepareDerivedData()
       if (this.id) {
         this.updateResourcesData()
-        this.manageHealthState()  
+        this.manageHealthState()
       }
     }
   }
@@ -119,16 +130,16 @@ export class BoLActor extends Actor {
   get details() {
     return this.system.details
   }
-  addEffectModifiers( myList, dataPath) {
+  addEffectModifiers(myList, dataPath) {
     for (let attr of myList) {
       attr.numModifier = 0
       attr.diceModifier = ""
-      let effects = this.items.filter( i => i.type === "feature" && i.system.subtype === "boleffect" && i.system.properties.identifier == dataPath+attr.key)
+      let effects = this.items.filter(i => i.type === "feature" && i.system.subtype === "boleffect" && i.system.properties.identifier == dataPath + attr.key)
       for (let effect of effects) {
-        if ( Number(effect.system.properties.modifier)) {
+        if (Number(effect.system.properties.modifier)) {
           attr.numModifier += Number(effect.system.properties.modifier)
         } else {
-          attr.diceModifier += "+"+effect.system.properties.modifier
+          attr.diceModifier += "+" + effect.system.properties.modifier
         }
       }
     }
@@ -512,16 +523,16 @@ export class BoLActor extends Actor {
     }
     if (rollData.horoscopeType == "major") {
       let actorHoroscope = this
-      if(rollData.targetId) {
+      if (rollData.targetId) {
         let token = game.scenes.current.tokens.get(rollData.targetId)
-        actorHoroscope = token.actor  
+        actorHoroscope = token.actor
       }
       if (rollData.isSuccess) {
         actorHoroscope.addHeroPoints(1)
       } else {
         actorHoroscope.subHeroPoints(1)
       }
-      rollData.horoscopeName = actorHoroscope.name 
+      rollData.horoscopeName = actorHoroscope.name
     }
     if (rollData.horoscopeType == "majorgroup") {
       let rID = randomID(16)
@@ -596,16 +607,18 @@ export class BoLActor extends Actor {
 
   /*-------------------------------------------- */
   heroReroll() {
-    if (this.type == 'character') {
+    if (this.type == 'character' || this.system.villainy == 'adversary') {
       return this.system.resources.hero.value > 0;
-    } else {
-      if (this.system.villainy == 'adversary') {
-        return this.system.resources.hero.value > 0;
-      }
     }
     return false
   }
-
+  /*-------------------------------------------- */
+  getHeroPoints() {
+    if (this.type == 'character' || this.system.villainy == 'adversary') {
+      return this.system.resources.hero.value
+    }
+    return 0
+  }
   /*-------------------------------------------- */
   getResourcesFromType() {
     let resources = {};
@@ -753,7 +766,7 @@ export class BoLActor extends Actor {
 
   /*-------------------------------------------- */
   buildListeActions() {
-    return this.melee.concat(this.ranged).concat(this.natural)
+    return this.melee.concat(this.ranged).concat(this.natural).concat(this.fightoptions)
   }
 
   /*-------------------------------------------- */
@@ -831,7 +844,7 @@ export class BoLActor extends Actor {
     let msg = await ChatMessage.create({
       alias: this.name,
       whisper: BoLUtility.getWhisperRecipientsAndGMs(this.name),
-      content: game.i18n.format( "BOL.chat.inforecup", {name: this.name, recupHP: recupHP} )
+      content: game.i18n.format("BOL.chat.inforecup", { name: this.name, recupHP: recupHP })
     })
   }
 
@@ -849,12 +862,12 @@ export class BoLActor extends Actor {
   }
   /*-------------------------------------------- */
   checkNumeric(myObject) {
-    if ( myObject) {
+    if (myObject) {
       for (let key in myObject) {
-        if ( myObject[key].value === null ) {
+        if (myObject[key].value === null) {
           myObject[key].value = 0
         }
-        if ( myObject[key].value === NaN ) {
+        if (myObject[key].value === NaN) {
           myObject[key].value = 0
         }
       }
@@ -882,7 +895,7 @@ export class BoLActor extends Actor {
       fvttInit = 5
       if (!rollData) {
         if (isCombat) {
-          if (game.user.isGM ) {
+          if (game.user.isGM) {
             if (this.hasPlayerOwner) {
               game.socket.emit("system.bol", { name: "msg_request_init_roll", data: { actorId: this.id, combatData } })
             } else {
@@ -938,7 +951,7 @@ export class BoLActor extends Actor {
   /*-------------------------------------------- */
   incDecResources(target, value) {
     let newValue = this.system.resources[target].value + value
-    this.update({ [`system.resources.${target}.value`]: newValue })    
+    this.update({ [`system.resources.${target}.value`]: newValue })
   }
   /*-------------------------------------------- */
   async sufferDamage(damage) {

module/controllers/bol-rolls.js

@@ -160,7 +160,7 @@ export class BoLRoll {
 
     // Manage specific case
     let fightOption = actor.getActiveFightOption()
-    if (fightOption && fightOption.system.fightoptiontype == "fulldefense") {
+    if (fightOption && fightOption.system.properties.fightoptiontype == "fulldefense") {
       ui.notifications.warn(`{{actor.name}} est en Défense Totale ! Il ne peut pas attaquer ce round.`)
       return
     }
@@ -424,6 +424,7 @@ export class BoLRoll {
       } else {
         this.rollData.shieldMalus = 0
       }
+      this.updateTotalDice()
     })
 
     html.find('#career').change((event) => {
@@ -490,12 +491,13 @@ export class BoLRoll {
       if (defender) { // If target is selected
         rollData.defence = defender.defenseValue
         rollData.armorMalus = defender.armorMalusValue
+        rollData.defenderHeroPoints = defender.getHeroPoints() 
         rollData.shieldBlock = 'none'
         let shields = defender.shields
+        //console.log("Defender stats", defender)
         for (let shield of shields) {
           rollData.shieldBlock = (shield.system.properties.blocking.blockingAll) ? 'blockall' : 'blockone';
           rollData.shieldAttackMalus = (shield.system.properties.blocking.malus) ? shield.system.properties.blocking.malus : 1;
-          rollData.applyShieldMalus = false
         }
       }
     }
@@ -528,11 +530,6 @@ export class BoLRoll {
     rollData.nbFlaws = 0
     rollData.nbDice = 0
     rollData.isHeroAdversary = actor.isHeroAdversary()
-    if (rollData.shieldBlock == 'blockall') {
-      rollData.shieldMalus = rollData.shieldAttackMalus;
-    } else {
-      rollData.shieldMalus = 0
-    }
     rollData.careerBonus = rollData.careerBonus ?? 0
     rollData.modRanged = rollData.modRanged ?? 0
     rollData.mod = rollData.mod ?? 0
@@ -545,6 +542,12 @@ export class BoLRoll {
     this.preProcessFightOption(rollData)
     this.updateArmorMalus(rollData)
     this.updatePPCost(rollData)
+    // Prepare blocking case
+    if (rollData.shieldBlock == 'blockall') {
+      rollData.shieldMalus = rollData.shieldAttackMalus;
+    } else {
+      rollData.shieldMalus = 0
+    }
     // Save
     this.rollData = rollData
     console.log("ROLLDATA", rollData)
@@ -571,24 +574,21 @@ export class BoLRoll {
               ui.notifications.warn("Pas assez de Points de Pouvoir !")
               return
             }
-            //console.log("ROLLMALUS", rollData)
-
             rollData.registerInit = (rollData.aptitude && rollData.aptitude.key == 'init') ? $('#register-init').is(":checked") : false;
 
             const isMalus = (rollData.bmDice < 0)
-            //rollData.nbDice += (rollData.attackBonusDice) ? 1 : 0
 
             let rollbase = rollData.attrValue + rollData.aptValue
-            if (rollData.weapon && rollData.weapon.system.properties.onlymodifier) {
+            if (rollData.weapon?.system.properties.onlymodifier) {
               rollbase = 0
             }
-
             let diceData = BoLUtility.getDiceData()
             let malusInit = rollData.combatData?.malusInit || 0 
             const modifiers = rollbase + rollData.careerBonus + rollData.mod + rollData.weaponModifier - rollData.defence - rollData.modArmorMalus + rollData.shieldMalus + rollData.attackModifier + rollData.appliedArmorMalus + rollData.effectModifier - malusInit
             const formula = (isMalus) ? rollData.nbDice + "d" + diceData.diceFormula + "kl2 + " + modifiers : rollData.nbDice + "d" + diceData.diceFormula + "kh2 + " + modifiers
             rollData.formula = formula
             rollData.modifiers = modifiers
+            console.log("Rolldata before", rollData)
 
             let r = new BoLDefaultRoll(rollData);
             r.roll();

module/item/item-sheet.js

@@ -27,23 +27,23 @@ export class BoLItemSheet extends ItemSheet {
     data.category = itemData.system.category
     data.isGM = game.user.isGM;
     data.itemProperties = this.item.itemProperties;
-    data.description = await TextEditor.enrichHTML(this.object.system.description, {async: true})
+    data.description = await TextEditor.enrichHTML(this.object.system.description, { async: true })
 
     // Dynamic default data fix/adapt
     if (itemData.type == "item") {
       if (!itemData.system.category) {
         itemData.system.category = "equipment"
       }
-      if ( itemData.system.category == "equipment" && itemData.system.properties.equipable) {
+      if (itemData.system.category == "equipment" && itemData.system.properties.equipable) {
         if (!itemData.system.properties.slot) {
           itemData.system.properties.slot = "-"
         }
       }
       if (itemData.system.category == 'spell') {
-        if(!itemData.system.properties.mandatoryconditions) {
+        if (!itemData.system.properties.mandatoryconditions) {
           itemData.system.properties.mandatoryconditions = []
         }
-        if(!itemData.system.properties.optionnalconditions) {
+        if (!itemData.system.properties.optionnalconditions) {
           itemData.system.properties.optionnalconditions = []
         }
         for (let i = 0; i < 4; i++) {
@@ -64,7 +64,27 @@ export class BoLItemSheet extends ItemSheet {
   }
 
   /* -------------------------------------------- */
+  _getHeaderButtons() {
+    let buttons = super._getHeaderButtons();
+    buttons.unshift({
+      class: "post",
+      icon: "fas fa-comment",
+      onclick: ev => this.postItem()
+    });
+    return buttons
+  }
 
+  /* -------------------------------------------- */
+  postItem() {
+    let chatData = duplicate(this.item)
+    if (this.actor) {
+      chatData.actor = { id: this.actor.id };
+    }
+    BoLUtility.postItem(chatData);
+  }
+
+
+  /* -------------------------------------------- */
   /** @override */
   setPosition(options = {}) {
     const position = super.setPosition(options);

module/system/bol-action-hud.js

@@ -1,5 +1,6 @@
 /* -------------------------------------------- */
 import { BoLRoll } from "../controllers/bol-rolls.js";
+import { BoLUtility } from "../system/bol-utility.js";
 
 /* -------------------------------------------- */
 export class BoLTokenHud {
@@ -30,10 +31,17 @@ export class BoLTokenHud {
       (event) => {
         let actionIndex = Number(event.currentTarget.attributes['data-action-index'].value)
         let action = hudData.actionsList[actionIndex]
-        const weapon = actor.items.get( action._id )
-        BoLRoll.weaponCheckWithWeapon(hudData.actor, duplicate(weapon))
-        //console.log("Clicked", action)
-      } )
+        const actionItem = actor.items.get(action._id)
+        if (actionItem.system.subtype == "weapon") {
+          BoLRoll.weaponCheckWithWeapon(hudData.actor, duplicate(actionItem))
+        } else if (actionItem.system.subtype == "fightoption") {
+          let chatData = duplicate(actionItem)
+          if (actionItem.actor) {
+            chatData.actor = { id: actionItem.actor._id };
+          }
+          BoLUtility.postItem(chatData);
+        }
+      })
 
     const controlIconTarget = html.find('.control-icon[data-action=target]');
     // att+apt+career
@@ -41,18 +49,18 @@ export class BoLTokenHud {
       (event) => {
         let rollIndex = Number(event.currentTarget.attributes['data-roll-index'].value)
         let roll = hudData.rollsList[rollIndex]
-        if ( roll.type == "aptitude") {
-          BoLRoll.aptitudeCheck(actor, roll.key ) 
-        } else if ( roll.type == "attribute") {
-          BoLRoll.attributeCheck(actor, roll.key ) 
+        if (roll.type == "aptitude") {
+          BoLRoll.aptitudeCheck(actor, roll.key)
+        } else if (roll.type == "attribute") {
+          BoLRoll.attributeCheck(actor, roll.key)
         }
       })
   }
 
   /* -------------------------------------------- */
   static async addTokenHudExtensions(app, html, tokenId) {
-    const controlIconCombat  = html.find('.control-icon[data-action=combat]')
-    if (controlIconCombat.length>0 ) {
+    const controlIconCombat = html.find('.control-icon[data-action=combat]')
+    if (controlIconCombat.length > 0) {
       BoLTokenHud.addExtensionHud(app, html, tokenId);
     }
   }
@@ -61,9 +69,9 @@ export class BoLTokenHud {
   static async _configureSubMenu(insertionPoint, template, hudData, onMenuItem) {
     const hud = $(await renderTemplate(template, hudData))
     const list = hud.find('div.bol-hud-list')
-    
+
     BoLTokenHud._toggleHudListActive(hud, list);
-    
+
     hud.find('img.bol-hud-togglebutton').click(event => BoLTokenHud._toggleHudListActive(hud, list));
     list.find('.bol-hud-menu').click(onMenuItem);
 

module/system/bol-utility.js

@@ -2,7 +2,7 @@ import { BoLRoll, BoLDefaultRoll } from "../controllers/bol-rolls.js";
 
 // Spell circle to min PP cost
 const __circle2minpp = { 0: 0, 1: 2, 2: 6, 3: 11 }
-const __validDices = {"6": 1, "8": 1, "10": 1, "12": 1}
+const __validDices = { "6": 1, "8": 1, "10": 1, "12": 1 }
 export class BoLUtility {
 
 
@@ -41,8 +41,8 @@ export class BoLUtility {
       config: true,
       default: "6",
       type: String,
-      choices: {  "6": "2d6", "8":"2d8", "10":"2d10", "12":"2d12", "20":"2d20"},
-      onChange: value => { 
+      choices: { "6": "2d6", "8": "2d8", "10": "2d10", "12": "2d12", "20": "2d20" },
+      onChange: value => {
         BoLUtility.setDiceFormula(value)
       }
     })
@@ -58,7 +58,7 @@ export class BoLUtility {
         step: 1
       },
       type: Number,
-      onChange: value => { 
+      onChange: value => {
         BoLUtility.setSuccessValue(value)
       }
     })
@@ -74,7 +74,7 @@ export class BoLUtility {
         step: 1
       },
       type: Number,
-      onChange: value => { 
+      onChange: value => {
         BoLUtility.setCriticalSuccessValue(value)
       }
     })
@@ -90,7 +90,7 @@ export class BoLUtility {
         step: 1
       },
       type: Number,
-      onChange: value => { 
+      onChange: value => {
         BoLUtility.setCriticalFailureValue(value)
       }
     })
@@ -153,12 +153,12 @@ export class BoLUtility {
   }
   static getDiceData() {
     let df = this.diceFormula
-    if ( !__validDices[String(this.diceFormula)]) {
+    if (!__validDices[String(this.diceFormula)]) {
       df = "6"
     }
     return {
       diceFormula: df,
-      successValue : this.successValue,
+      successValue: this.successValue,
       criticalSuccessValue: this.criticalSuccessValue,
       criticalFailureValue: this.criticalFailureValue
     }
@@ -199,6 +199,44 @@ export class BoLUtility {
     CONFIG.statusEffects = duplicate(game.bol.config.statusEffects)
   }
 
+  /* -------------------------------------------- */
+  static chatDataSetup(content, modeOverride, isRoll = false, forceWhisper) {
+    let chatData = {
+      user: game.user.id,
+      rollMode: modeOverride || game.settings.get("core", "rollMode"),
+      content: content
+    };
+
+    if (["gmroll", "blindroll"].includes(chatData.rollMode)) chatData["whisper"] = ChatMessage.getWhisperRecipients("GM").map(u => u.id);
+    if (chatData.rollMode === "blindroll") chatData["blind"] = true;
+    else if (chatData.rollMode === "selfroll") chatData["whisper"] = [game.user];
+
+    if (forceWhisper) { // Final force !
+      chatData["speaker"] = ChatMessage.getSpeaker();
+      chatData["whisper"] = ChatMessage.getWhisperRecipients(forceWhisper);
+    }
+
+    return chatData;
+  }
+
+  /* -------------------------------------------- */
+  static postItem(chatData) {
+    // Don't post any image for the item (which would leave a large gap) if the default image is used
+    if (chatData.img.includes("/blank.png")) {
+      chatData.img = null;
+    }
+    // JSON object for easy creation
+    chatData.jsondata = JSON.stringify(
+      {
+        compendium: "postedItem",
+        payload: chatData,
+      });
+
+    renderTemplate('systems/bol/templates/item/post-item.hbs', chatData).then(html => {
+      let chatOptions = BoLUtility.chatDataSetup(html);
+      ChatMessage.create(chatOptions, "selfroll")
+    });
+  }
   /* -------------------------------------------- */
   static createDirectOptionList(min, max) {
     let options = {};
@@ -314,11 +352,11 @@ export class BoLUtility {
     return message.getFlag("world", "bol-roll-data")
   }
   /* -------------------------------------------- */
-  static requestInitRoll(actorId, combatData ) {
-    let actor = game.actors.get( actorId )
+  static requestInitRoll(actorId, combatData) {
+    let actor = game.actors.get(actorId)
     if (actor && actor.isOwner) {
       ui.notifications.info(game.i18n.localize("BOL.ui.warninitiative"))
-      BoLRoll.aptitudeCheck(actor, "init", undefined, combatData) 
+      BoLRoll.aptitudeCheck(actor, "init", undefined, combatData)
     }
   }
 
@@ -390,7 +428,7 @@ export class BoLUtility {
     })
 
     html.on("click", '.recup-vitalite', event => {
-      event.preventDefault()      
+      event.preventDefault()
       let actorId = event.currentTarget.attributes['data-actor-id'].value
       let recupHP = event.currentTarget.attributes['data-recup-hp'].value
       let actor = game.actors.get(actorId)
@@ -422,7 +460,7 @@ export class BoLUtility {
       rollData.defenseMode = defenseMode
       let token = game.scenes.current.tokens.get(rollData.targetId)
       let defender = token.actor
-      
+
       if (defenseMode == 'damage-with-armor') {
         let armorFormula = defender.getArmorFormula()
         rollData.rollArmor = new Roll(armorFormula)
@@ -573,6 +611,7 @@ export class BoLUtility {
         attackId: rollData.id,
         attacker: rollData.attacker,
         defender: defender,
+        defenderHeroPoints:defender.getHeroPoints(), 
         defenderWeapons: defenderWeapons,
         damageTotal: rollData.damageTotal,
         damagesIgnoresArmor: rollData.damagesIgnoresArmor,
@@ -591,7 +630,7 @@ export class BoLUtility {
       $(`#${sockmsg.data.id}`).hide() // Hide the options roll buttons
     }
     if (sockmsg.name == "msg_request_init_roll") {
-      this.requestInitRoll( sockmsg.data.actorId, sockmsg.data.combatData)
+      this.requestInitRoll(sockmsg.data.actorId, sockmsg.data.combatData)
     }
     if (sockmsg.name == "msg_damage_handling") {
       BoLUtility.processDamageHandling(sockmsg.data.attackId, sockmsg.data.defenseMode, sockmsg.data.weaponId, sockmsg.data.msgId)
@@ -620,7 +659,7 @@ export class BoLUtility {
 
     let formula = damageString
     if (damageString.includes("d") || damageString.includes("D")) {
-      var myReg = new RegExp('(\\d+)[dD]([\\d]+)([MB]*)?([\\+\\d]*)?', 'g')
+      let myReg = new RegExp('(\\d+)[dD]([\\d]+)([MB]*)?([\\+\\d]*)?', 'g')
       let res = myReg.exec(damageString)
       let nbDice = parseInt(res[1])
       let postForm = 'kh' + nbDice

packs/fightoptions.db

@@ -11,6 +11,7 @@
 {"name":"Le Coup du Soldat (Désarmer)","type":"feature","img":"icons/skills/melee/weapons-crossed-poleaxes-white.webp","effects":[],"flags":{"core":{"sourceId":"Item.lyMbLMPnFk0oXaSr"}},"system":{"category":null,"subtype":"fightoption","description":"<p>Vous ne pouvez utiliser que des armes l&eacute;g&egrave;res ou moyennes. Vous visez l&rsquo;arme de votre adversaire<br>pour la faire tomber.</p>\n<p>Vous portez une attaque sur l&rsquo;arme, avec pour malus l&rsquo;Agilit&eacute;+M&ecirc;l&eacute;e de votre adversaire. En cas de r&eacute;ussite, l&rsquo;arme vis&eacute;e tombe au sol &agrave; 1d6-2 m&egrave;tres de votre opposant.</p>","properties":{"ismalusdice":false,"isbonusdice":false,"fightoptiontype":"other","isspecial":false,"activated":false},"rank":0,"fightoptiontype":"twoweapons"},"_stats":{"systemId":"bol","systemVersion":"11.0.0","coreVersion":"10.291","createdTime":1687456310231,"modifiedTime":1687457942165,"lastModifiedBy":"kQghu0tL1dft5xLu"},"_id":"EN3xW64gAAj6GxZs","folder":null,"sort":0,"ownership":{"default":0,"kQghu0tL1dft5xLu":3}}
 {"name":"La Main d’Afyra (Se Reposer)","type":"feature","img":"icons/skills/melee/weapons-crossed-poleaxes-white.webp","effects":[],"flags":{"core":{"sourceId":"Item.lyMbLMPnFk0oXaSr"}},"system":{"category":null,"subtype":"fightoption","description":"<p>Vous restez au contact de votre adversaire, mais vous vous concentrez sur vous-m&ecirc;me. Vous<br>ne pouvez pas attaquer ce round.</p>\n<p>Si vous r&eacute;ussissez un jet de Vigueur, vous r&eacute;cup&eacute;rez 2 Points de Vitalit&eacute;, 4 sur un succ&egrave;s H&eacute;ro&iuml;que. Ces points ne peuvent &ecirc;tre r&eacute;cup&eacute;r&eacute;s que si ils ont &eacute;t&eacute; perdus lors du combat en cours.</p>","properties":{"ismalusdice":false,"isbonusdice":false,"fightoptiontype":"other","isspecial":false,"activated":false},"rank":0,"fightoptiontype":"twoweapons"},"_stats":{"systemId":"bol","systemVersion":"11.0.0","coreVersion":"10.291","createdTime":1687456310231,"modifiedTime":1687457942166,"lastModifiedBy":"kQghu0tL1dft5xLu"},"_id":"EvADUhFjuz7G7ts9","folder":null,"sort":0,"ownership":{"default":0,"kQghu0tL1dft5xLu":3}}
 {"name":"Le Doigt de Karyzon (Tir x2)","type":"feature","img":"icons/skills/melee/weapons-crossed-poleaxes-white.webp","effects":[],"flags":{"core":{"sourceId":"Item.lyMbLMPnFk0oXaSr"}},"system":{"category":null,"subtype":"fightoption","description":"<p>Vous encha&icirc;nez 2 tirs au lieu d&rsquo;un, sans pr&eacute;cision. Uniquement avec armes de jet et arcs.</p>\n<p>Vous tirez (ou lancer) tr&egrave;s rapidement, sans pr&eacute;cision, sur la m&ecirc;me cible. Chaque tir/lancer souffre d&rsquo;un malus de -2.</p>","properties":{"ismalusdice":false,"isbonusdice":false,"fightoptiontype":"other","isspecial":false,"activated":false},"rank":0,"fightoptiontype":"twoweapons"},"_stats":{"systemId":"bol","systemVersion":"11.0.0","coreVersion":"10.291","createdTime":1687456310231,"modifiedTime":1687457965168,"lastModifiedBy":"kQghu0tL1dft5xLu"},"folder":null,"sort":0,"ownership":{"default":0,"kQghu0tL1dft5xLu":3},"_id":"FMJGgMYdXztCBTtc"}
+{"name":"La Rage du Barbare (Posture Offensive)","type":"feature","img":"icons/skills/melee/weapons-crossed-poleaxes-white.webp","effects":[],"flags":{"core":{"sourceId":"Item.BF7F5WvL1pbWVHNq"}},"system":{"category":null,"subtype":"fightoption","description":"<p>Vous vous concentrez sur l&rsquo;attaque, au d&eacute;triment&nbsp;de votre d&eacute;fense. Cette option vous conf&egrave;re un bonus de +1 au jet d&rsquo;attaque, mais vous subissez un malus de -1 en d&eacute;fense.</p>","properties":{"ismalusdice":false,"isbonusdice":false,"fightoptiontype":"attack","activated":false},"rank":0,"fightoptiontype":"attack"},"ownership":{"default":0,"kQghu0tL1dft5xLu":3},"_stats":{"systemId":"bol","systemVersion":"11.0.2","coreVersion":"10.291","createdTime":1687456310231,"modifiedTime":1687467695919,"lastModifiedBy":"kQghu0tL1dft5xLu"},"folder":null,"sort":0,"_id":"MMcnWBowztvbmXgN"}
 {"name":"La Passe de l’Assassin (Avantage)","type":"feature","img":"icons/skills/melee/weapons-crossed-poleaxes-white.webp","effects":[],"flags":{"core":{"sourceId":"Item.lyMbLMPnFk0oXaSr"}},"system":{"category":null,"subtype":"fightoption","description":"<p>Vous vous placez de mani&egrave;re &agrave; obtenir &nbsp;une &nbsp;position &nbsp;plus avantageuse pour portez vos attaques.</p>\n<p>En plus de votre attaque normale, vous devez r&eacute;ussir un jet de R&eacute;action (Esprit+Initiative). Sur une<br>r&eacute;ussite, vous b&eacute;n&eacute;ficiez d&rsquo;un d&eacute; bonus pour votre prochaine attaque. Si vous renoncez &agrave; votre attaque, vous b&eacute;n&eacute;ficiez d&rsquo;un bonus de +2 pour le jet de R&eacute;action. Sur un &eacute;chec, c&rsquo;est votre adversaire qui b&eacute;n&eacute;ficie d&rsquo;un d&eacute; bonus pour sa prochaine attaque.</p>","properties":{"ismalusdice":false,"isbonusdice":false,"fightoptiontype":"other","isspecial":false,"activated":false},"rank":0,"fightoptiontype":"twoweapons"},"_stats":{"systemId":"bol","systemVersion":"11.0.0","coreVersion":"10.291","createdTime":1687456310231,"modifiedTime":1687457942165,"lastModifiedBy":"kQghu0tL1dft5xLu"},"_id":"PCa0SQruR9VZUbPh","folder":null,"sort":0,"ownership":{"default":0,"kQghu0tL1dft5xLu":3}}
 {"name":"La Folie de Dyr (Occuper)","type":"feature","img":"icons/skills/melee/weapons-crossed-poleaxes-white.webp","effects":[],"flags":{"core":{"sourceId":"Item.lyMbLMPnFk0oXaSr"}},"system":{"category":null,"subtype":"fightoption","description":"<p>Vous faites tournoyer votre arme dans tout les sens, pour faire reculer votre adversaire.</p>\n<p>Votre attaque re&ccedil;oit un malus suppl&eacute;mentaire de -1 et n&rsquo;occasionne pas de d&eacute;g&acirc;ts. En cas<br>de succ&egrave;s, votre adversaire ne peut pas attaquer ce round. Uniquement sur des adversaires au maximum de de taille sup&eacute;rieure d&rsquo;un cran &agrave; la v&ocirc;tre.</p>","properties":{"ismalusdice":false,"isbonusdice":false,"fightoptiontype":"other","isspecial":false,"activated":false},"rank":0,"fightoptiontype":"twoweapons"},"_stats":{"systemId":"bol","systemVersion":"11.0.0","coreVersion":"10.291","createdTime":1687456310231,"modifiedTime":1687457942168,"lastModifiedBy":"kQghu0tL1dft5xLu"},"_id":"PENp7jlG0DirTQeo","folder":null,"sort":0,"ownership":{"default":0,"kQghu0tL1dft5xLu":3}}
 {"name":"Le Dit de Iondal (Moquer)","type":"feature","img":"icons/skills/melee/weapons-crossed-poleaxes-white.webp","effects":[],"flags":{"core":{"sourceId":"Item.lyMbLMPnFk0oXaSr"}},"system":{"category":null,"subtype":"fightoption","description":"<p>Vous moquez votre adversaire avec une phrase bien sentie.</p>\n<p>Si vous r&eacute;ussissez un test d&rsquo;Esprit+Carri&egrave;re appropri&eacute;e, avec l&rsquo;Esprit de votre cible en malus, elle<br>subit un malus de -2 en d&eacute;fense pour le reste du round.</p>","properties":{"ismalusdice":false,"isbonusdice":false,"fightoptiontype":"other","isspecial":false,"activated":false},"rank":0,"fightoptiontype":"twoweapons"},"_stats":{"systemId":"bol","systemVersion":"11.0.0","coreVersion":"10.291","createdTime":1687456310231,"modifiedTime":1687457942166,"lastModifiedBy":"kQghu0tL1dft5xLu"},"_id":"VSOjm28jhFhyWk6b","folder":null,"sort":0,"ownership":{"default":0,"kQghu0tL1dft5xLu":3}}

system.json

@@ -1,7 +1,7 @@
 {
   "id": "bol",
   "title": "Barbarians of Lemuria",
-  "description": "The Barbarians of Lemuria system for FoundryVTT!",
+  "description": "The Barbarians of Lemuria system for FoundryVTT !",
   "authors": [
     {
       "name": "LeRatierBretonnien",
@@ -14,10 +14,9 @@
   ],
   "url": "https://www.uberwald.me/gitea/public/bol",
   "license": "LICENSE.txt",
-  "version": "11.0.3",
+  "version": "11.0.14",
   "compatibility": {
     "minimum": "10",
-    "maximum": "11",
     "verified": "11"
   },
   "esmodules": [
@@ -203,7 +202,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-v11.0.3.zip",
+  "download": "https://www.uberwald.me/gitea/public/bol/archive/bol-v11.0.14.zip",
   "background": "systems/bol/ui/page_accueil.webp",
   "gridDistance": 1.5,
   "gridUnits": "m",

templates/chat/rolls/defense-request-card.hbs

@@ -8,14 +8,12 @@
 <button class="damage-handling" data-defense-mode="damage-with-armor" data-attack-id="{{attackId}}">{{localize "BOL.chat.witharmor"}}</button>
 <button class="damage-handling" data-defense-mode="damage-without-armor" data-attack--id="{{attackId}}">{{localize "BOL.chat.withoutarmor"}}</button>
 
-{{#if isHeroAdversary}}
-  {{#if (gt defender.system.resources.hero.value 0)}}
-    <button class="damage-handling" data-defense-mode="hero-reduce-damage" data-attack-id="{{attackId}}">{{localize "BOL.chat.shakeoff"}}</button>
+{{#if (gt defenderHeroPoints 0)}}
+  <button class="damage-handling" data-defense-mode="hero-reduce-damage" data-attack-id="{{attackId}}">{{localize "BOL.chat.shakeoff"}}</button>
 
-    {{#each defenderWeapons as |weapon idx|}}
-    <button class="damage-handling" data-defense-mode="hero-in-extremis" data-attack-id="{{@root.attackId}}" data-weapon-id="{{weapon._id}}">{{localize "BOL.chat.splinteredshield" name=weapon.name}}</button>
-    {{/each}}
-  {{/if}}
+  {{#each defenderWeapons as |weapon idx|}}
+  <button class="damage-handling" data-defense-mode="hero-in-extremis" data-attack-id="{{@root.attackId}}" data-weapon-id="{{weapon._id}}">{{localize "BOL.chat.splinteredshield" name=weapon.name}}</button>
+  {{/each}}
 {{/if}}
 
 <button class="damage-handling" data-defense-mode="damage-not-applied" data-attack-id="{{attackId}}">{{localize "BOL.chat.nodamage"}}</button>

templates/item/parts/properties/feature/fightoption-properties.hbs

@@ -1,23 +1,25 @@
 <h3 class="form-header">{{localize "BOL.ui.fightOption"}}</h3>
 
 <div class="form-group">
-    <label class="property-label">{{localize "BOL.ui.fightOptionType"}}</label>
-    <div class="form-fields">
-        <select name="system.properties.fightoptiontype" data-dtype="String">
-            {{#select item.system.properties.fightoptiontype}}
-                {{#each config.fightOptionTypes as |item id|}}
-                    <option value="{{id}}">{{localize item}}</option>
-                {{/each}}
-            {{/select}}
-        </select>
-    </div>
+  <label class="property-label">{{localize "BOL.ui.fightOptionType"}}</label>
+  <div class="form-fields">
+    <select name="system.properties.fightoptiontype" data-dtype="String">
+      {{#select item.system.properties.fightoptiontype}}
+      {{#each config.fightOptionTypes as |item id|}}
+      <option value="{{id}}">{{localize item}}</option>
+      {{/each}}
+      {{/select}}
+    </select>
+  </div>
+</div>
+<div class="property flexrow">
+  <label class="property-label">{{localize "BOL.ui.activated"}}</label>
+  <input class="field-value" type="checkbox" name="system.properties.activated" {{checked
+    item.system.properties.activated}}>
 </div>
-  <div class="property flexrow">
-    <label class="property-label">{{localize "BOL.ui.activated"}}</label>
-    <input class="field-value" type="checkbox" name="system.properties.activated" {{checked item.system.properties.activated}}>
-  </div>
 
-  <div class="property flexrow">
-    <label class="property-label">{{localize "BOL.ui.ispecial"}}</label>
-    <input class="field-value" type="checkbox" name="system.properties.isspecial" {{checked item.system.properties.ispecial}}>
-  </div>
+<div class="property flexrow">
+  <label class="property-label">{{localize "BOL.ui.isspecial"}}</label>
+  <input class="field-value" type="checkbox" name="system.properties.isspecial" {{checked
+    item.system.properties.isspecial}}>
+</div>

templates/item/parts/properties/item/protection-properties.hbs

@@ -76,7 +76,7 @@
 <div class="form-group">
     <label class="property-label">{{localize "BOL.itemModifiers.init"}}</label>
     <div class="form-fields">
-        <input class="field-value" type="text" name="system.properties.modifiers.init" value="{{item.system.properties.modifiers.c}}" data-dtype="Number"/>
+        <input class="field-value" type="text" name="system.properties.modifiers.init" value="{{item.system.properties.modifiers.init}}" data-dtype="Number"/>
     </div>
 </div>
 <div class="form-group">

templates/item/post-item.hbs

@@ -0,0 +1,8 @@
+<div class="post-item" data-transfer="{{transfer}}">
+  <h3><b>{{name}}</b></h3>
+  {{#if img}}
+  <img class="chat-icon" src="{{img}}" title="{{name}}" />
+  {{/if}}
+    <h4><b>Description : </b></h4>
+  <p class="card-content">{{{system.description}}}</p>
+</div>

templates/token/hud-actor-actions.hbs

@@ -2,9 +2,20 @@
   <img class="bol-hud-togglebutton" src="icons/svg/sword.svg" width="36" height="36" title="Action" />
   <div class="bol-hud-list tokenhudext right">
     {{#each actionsList as |action key|}}
+    {{#if (eq system.subtype "weapon")}}
     <div class="control-icon tokenhudicon bol-hud-menu" data-action-index="{{key}}" title="{{action.name}}">
       <label>{{action.name}}</label>
     </div>
+    {{/if}}
     {{/each}}
   </div>
-</div>
+  <div class="bol-hud-list tokenhudext right2">
+    {{#each actionsList as |action key|}}
+    {{#if (eq system.subtype "fightoption")}}
+    <div class="control-icon tokenhudicon bol-hud-menu" data-action-index="{{key}}" title="{{action.name}}">
+      <label>{{action.name}}</label>
+    </div>
+    {{/if}}
+    {{/each}}
+  </div>
+</div>