From aa367657cabd7c9e85d5c14fd0727429cabf17fb Mon Sep 17 00:00:00 2001 From: sladecraven Date: Tue, 15 Feb 2022 21:00:29 +0100 Subject: [PATCH] Ajout langues et revue equipement --- module/controllers/bol-rolls.js | 6 +++--- system.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/controllers/bol-rolls.js b/module/controllers/bol-rolls.js index 4fecb48..2fe2e8f 100644 --- a/module/controllers/bol-rolls.js +++ b/module/controllers/bol-rolls.js @@ -225,9 +225,9 @@ export class BoLRoll { rollData.career = (!careers || careers.length == 0) ? 0 : Math.max(...careers.map(i => parseInt(i))); rollData.registerInit = (rollData.aptKey == 'init') ? $('#register-init').is(":checked") : false; - let shieldMalus = 0; + let shieldMalus = 0 if (rollData.mode == "weapon") { - const applyShieldMalus = html.find('#applyShieldMalus').val() || false; + const applyShieldMalus = html.find('#applyShieldMalus').val() || false if (applyShieldMalus || rollData.shieldBlock == 'blockall') { shieldMalus = rollData.shieldAttackMalus; } @@ -240,7 +240,7 @@ export class BoLRoll { const attrValue = (rollData.attrKey) && eval(`rollData.actor.data.data.attributes.${rollData.attrKey}.value`) || 0; const aptValue = (rollData.aptKey) && eval(`rollData.actor.data.data.aptitudes.${rollData.aptKey}.value`) || 0 - const modifiers = rollData.careerBonus + rollData.weaponModifier + parseInt(attrValue) + parseInt(aptValue) + parseInt(rollData.mod) + parseInt(rollData.career) - rollData.defence - shieldMalus; + const modifiers = rollData.careerBonus + rollData.weaponModifier + parseInt(attrValue) + parseInt(aptValue) + parseInt(rollData.mod) + parseInt(rollData.career) - rollData.defence + shieldMalus; const formula = (isMalus) ? dicePool + "d6kl2 + " + modifiers : dicePool + "d6kh2 + " + modifiers; rollData.formula = formula; rollData.modifiers = modifiers diff --git a/system.json b/system.json index 9542260..b75963b 100644 --- a/system.json +++ b/system.json @@ -7,7 +7,7 @@ "url": "https://github.com/ZigmundKreud/bol", "license": "LICENSE.txt", "flags": {}, - "version": "1.0.3", + "version": "1.0.4", "templateVersion": 18, "minimumCoreVersion": "0.8.6", "compatibleCoreVersion": "9",