Corrections sur encaissement

.gitea/workflows/main.yml

@@ -13,7 +13,7 @@ jobs:
     #- uses: actions/checkout@v3
     - uses: RouxAntoine/checkout@v3.5.4
       with:
-        ref: 'master'
+        ref: 'v10'
 
     # get part of the tag after the `v`
     - name: Extract tag version number
@@ -29,7 +29,7 @@ jobs:
       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/module.json
+        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
@@ -37,7 +37,7 @@ jobs:
          apt update -y
          apt install -y zip
 
-    - run: zip -r ./fvtt-ecryme.zip system.json template.json README.md LICENSE.txt fonts/ images/ lang/ modules/ packs/ styles/ templates/ translated/
+    - 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
@@ -49,6 +49,6 @@ jobs:
       uses: https://gitea.com/actions/release-action@main
       with:
         files: |-
-          ./fvtt-ecryme.zip
+          ./bol.zip
           system.json
         api_key: '${{secrets.RELEASE_TOKEN_UBERWALD}}'

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

module/actor/actor.js

@@ -607,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 = {};

module/controllers/bol-rolls.js

@@ -491,6 +491,7 @@ 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)
@@ -578,7 +579,7 @@ export class BoLRoll {
             const isMalus = (rollData.bmDice < 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()

module/system/bol-utility.js

@@ -611,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,

system.json

@@ -14,10 +14,10 @@
   ],
   "url": "https://www.uberwald.me/gitea/public/bol",
   "license": "LICENSE.txt",
-  "version": "11.0.7",
+  "version": "11.0.14",
   "compatibility": {
     "minimum": "10",
-    "maximum": "11"
+    "verified": "11"
   },
   "esmodules": [
     "module/bol.js"
@@ -202,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.7.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,15 +8,13 @@
 <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)}}
+{{#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}}
-{{/if}}
 
 <button class="damage-handling" data-defense-mode="damage-not-applied" data-attack-id="{{attackId}}">{{localize "BOL.chat.nodamage"}}</button>