diff --git a/module/actor.js b/module/actor.js index ff80ba4a..0869d6d1 100644 --- a/module/actor.js +++ b/module/actor.js @@ -263,13 +263,17 @@ export class RdDActor extends Actor { /* -------------------------------------------- */ _calculBonusDommages(carac, arme, isForce=false) { - const dmgArme = parseInt(arme.data.dommages) + (isForce)? 5 : 0; + if ( arme.name.toLowerCase() == "esquive") return 0; // Specific case management + let dmgArme = 0; const dmgPerso = parseInt(this.data.data.attributs.plusdom.value); - if (carac.label == "Tir") { - return dmgArme; - } - if (carac.label == "Lancer") { - return dmgArme + Math.min(dmgArme, dmgPerso); + if ( arme.data.dommages ) { + dmgArme = parseInt(arme.data.dommages) + (isForce)? 5 : 0; + if (carac.label == "Tir") { + return dmgArme; + } + if (carac.label == "Lancer") { + return dmgArme + Math.min(dmgArme, dmgPerso); + } } return dmgArme + dmgPerso; } diff --git a/styles/simple.css b/styles/simple.css index 1cd87925..4b5bb013 100644 --- a/styles/simple.css +++ b/styles/simple.css @@ -499,6 +499,7 @@ section.sheet-body:after, section.sheet-body div:after { font-weight: bold; flex-grow: 0; } +.arme-label, .competence-label, .description-label { flex-grow: 2; diff --git a/system.json b/system.json index 31b8a95f..1baa7d67 100644 --- a/system.json +++ b/system.json @@ -2,7 +2,7 @@ "name": "foundryvtt-reve-de-dragon", "title": "Rêve de Dragon", "description": "Rêve de Dragon RPG for FoundryVTT", - "version": "0.9.89", + "version": "0.9.90", "minimumCoreVersion": "0.7.5", "compatibleCoreVersion": "0.7.6", "templateVersion": 48, diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html index 2765b7cd..76906f3a 100644 --- a/templates/actor-sheet.html +++ b/templates/actor-sheet.html @@ -320,7 +320,7 @@ {{#each data.combat as |arme key|}}