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

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",

module/actor/actor.js

@@ -21,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') {
@@ -49,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
@@ -91,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)
       }
     }
   }
@@ -109,7 +121,7 @@ export class BoLActor extends Actor {
       super.prepareDerivedData()
       if (this.id) {
         this.updateResourcesData()
-        this.manageHealthState()  
+        this.manageHealthState()
       }
     }
   }
@@ -118,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
         }
       }
     }
@@ -511,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)
@@ -595,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 = {};
@@ -830,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 })
     })
   }
 
@@ -848,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
         }
       }
@@ -881,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 {
@@ -937,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

@@ -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/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,
@@ -658,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

system.json

@@ -14,10 +14,9 @@
   ],
   "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": [
@@ -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.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,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/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">