diff --git a/module/item.js b/module/item.js index 48dd6576..3bda723e 100644 --- a/module/item.js +++ b/module/item.js @@ -675,7 +675,7 @@ export class RdDItem extends Item { _armeChatData() { return [ `Compétence: ${this.system.competence}`, - `Dommages: ${this.system.dommages}`, + `Dommages: ${this.system.dommages} ${this.system.mortalite=='non-mortel'? '(Non mortel)':''}`, `Force minimum: ${this.system.force}`, `Resistance: ${this.system.resistance}`, ...this._inventaireTemplateChatData() diff --git a/module/rdd-combat.js b/module/rdd-combat.js index 8eec5bb5..84826d67 100644 --- a/module/rdd-combat.js +++ b/module/rdd-combat.js @@ -789,7 +789,6 @@ export class RdDCombat { let rollData = { passeArme: randomID(16), mortalite: arme?.system.mortalite, - coupsNonMortels: false, competence: competence.clone(), surprise: this.attacker.getSurprise(true), surpriseDefenseur: this.defender.getSurprise(true), diff --git a/module/rdd-roll.js b/module/rdd-roll.js index 225f03fc..4331713a 100644 --- a/module/rdd-roll.js +++ b/module/rdd-roll.js @@ -187,7 +187,7 @@ export class RdDRoll extends Dialog { console.log("RdDRollSelectDialog - Cout reve", ptreve); this.updateRollResult(html); }); - this.html.find("[name='coupsNonMortels']").change((event) => { + this.html.find("[name='mortalite']").change((event) => { this.rollData.dmg.mortalite = event.currentTarget.checked ? "non-mortel" : "mortel"; this.updateRollResult(html); }); @@ -295,8 +295,7 @@ export class RdDRoll extends Dialog { rollData.dmg = rollData.attackerRoll?.dmg ?? RdDBonus.dmg(rollData, this.actor.getBonusDegat()) rollData.caracValue = parseInt(rollData.selectedCarac.value) - rollData.mortalite = rollData.attackerRoll?.dmg.mortalite ?? rollData.dmg.mortalite ?? 'mortel'; - rollData.coupsNonMortels = (rollData.attackerRoll?.dmg.mortalite ?? rollData.dmg.mortalite) == 'non-mortel'; + rollData.mortalite = rollData.attackerRoll?.dmg.mortalite ?? rollData.dmg.mortalite ?? rollData.mortalite ?? 'mortel'; rollData.use.appelAuMoral = this.actor.isPersonnage() && RdDCarac.isActionPhysique(rollData.selectedCarac); let dmgText = Misc.toSignedString(rollData.dmg.total); @@ -319,7 +318,7 @@ export class RdDRoll extends Dialog { // Mise à jour valeurs this.html.find(".dialog-roll-title").text(this._getTitle(rollData)); - this.html.find("[name='coupsNonMortels']").prop('checked', rollData.mortalite == 'non-mortel'); + this.html.find("[name='mortalite']").prop('checked', rollData.mortalite == 'non-mortel'); this.html.find(".dmg-arme-actor").text(dmgText); this.html.find("div.placeholder-ajustements").empty().append(adjustements); this.html.find("div.placeholder-resolution").empty().append(resolutionTable) diff --git a/module/rdd-utility.js b/module/rdd-utility.js index 4bfa7e7b..703e3c87 100644 --- a/module/rdd-utility.js +++ b/module/rdd-utility.js @@ -180,24 +180,25 @@ export class RdDUtility { 'systems/foundryvtt-reve-de-dragon/templates/item-queue-sheet.html', 'systems/foundryvtt-reve-de-dragon/templates/header-item.html', // partial enums - 'systems/foundryvtt-reve-de-dragon/templates/enum-caracteristiques.html', - 'systems/foundryvtt-reve-de-dragon/templates/enum-base-competence.html', 'systems/foundryvtt-reve-de-dragon/templates/enum-aspect-tarot.html', + 'systems/foundryvtt-reve-de-dragon/templates/enum-base-competence.html', + 'systems/foundryvtt-reve-de-dragon/templates/enum-caracteristiques.html', 'systems/foundryvtt-reve-de-dragon/templates/enum-categories.html', 'systems/foundryvtt-reve-de-dragon/templates/enum-categorie-ingredient.html', 'systems/foundryvtt-reve-de-dragon/templates/enum-categorie-parade.html', 'systems/foundryvtt-reve-de-dragon/templates/enum-categorie-potion.html', + 'systems/foundryvtt-reve-de-dragon/templates/enum-categorie-queue.html', 'systems/foundryvtt-reve-de-dragon/templates/enum-categorie-vehicule.html', 'systems/foundryvtt-reve-de-dragon/templates/enum-competence.html', + 'systems/foundryvtt-reve-de-dragon/templates/enum-draconic.html', 'systems/foundryvtt-reve-de-dragon/templates/enum-heures.html', 'systems/foundryvtt-reve-de-dragon/templates/enum-initpremierround.html', + 'systems/foundryvtt-reve-de-dragon/templates/enum-mortalite.html', 'systems/foundryvtt-reve-de-dragon/templates/enum-niveau-ethylisme.html', - 'systems/foundryvtt-reve-de-dragon/templates/enum-rarete.html', - 'systems/foundryvtt-reve-de-dragon/templates/enum-categorie-queue.html', - 'systems/foundryvtt-reve-de-dragon/templates/enum-draconic.html', - 'systems/foundryvtt-reve-de-dragon/templates/enum-tmr-type.html', 'systems/foundryvtt-reve-de-dragon/templates/enum-periode.html', + 'systems/foundryvtt-reve-de-dragon/templates/enum-rarete.html', 'systems/foundryvtt-reve-de-dragon/templates/enum-tmr-effet.html', + 'systems/foundryvtt-reve-de-dragon/templates/enum-tmr-type.html', // Partials 'systems/foundryvtt-reve-de-dragon/templates/tirage/liste-resultats-recherche.hbs', 'systems/foundryvtt-reve-de-dragon/templates/time/horloge.hbs', diff --git a/template.json b/template.json index 470190bf..9b0feb1c 100644 --- a/template.json +++ b/template.json @@ -594,7 +594,8 @@ "iscombat": false, "isnaturelle": true, "ispossession": false, - "dommages": 0 + "dommages": 0, + "mortalite": "mortel" }, "empoignade": { "templates": ["description"], @@ -671,6 +672,7 @@ "resistance": 0, "categorie_parade": "", "dommages": "0", + "mortalite": "mortel", "penetration": 0, "force": "0", "competence": "", diff --git a/templates/dialog-roll-competence.html b/templates/dialog-roll-competence.html index 800d4bfc..ee2a475b 100644 --- a/templates/dialog-roll-competence.html +++ b/templates/dialog-roll-competence.html @@ -54,7 +54,7 @@ {{else}} - + {{/if}} diff --git a/templates/enum-mortalite.html b/templates/enum-mortalite.html new file mode 100644 index 00000000..66bbbf31 --- /dev/null +++ b/templates/enum-mortalite.html @@ -0,0 +1,3 @@ + + + diff --git a/templates/item-arme-sheet.html b/templates/item-arme-sheet.html index 2964af13..fa911035 100644 --- a/templates/item-arme-sheet.html +++ b/templates/item-arme-sheet.html @@ -37,6 +37,14 @@ +
+ + +
diff --git a/templates/item-competencecreature-sheet.html b/templates/item-competencecreature-sheet.html index 94c67834..e68571fa 100644 --- a/templates/item-competencecreature-sheet.html +++ b/templates/item-competencecreature-sheet.html @@ -27,6 +27,14 @@
+
+ + +
{{/if}} {{#if isparade}}