From cfbfad27bde0a5400a1fb0cf1a31d6349059bf9f Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Fri, 21 Apr 2023 22:28:51 +0200 Subject: [PATCH] cleanup Empoignade --- module/actor-sheet.js | 2 +- module/rdd-empoignade.js | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/module/actor-sheet.js b/module/actor-sheet.js index 66ff36a1..d19ef734 100644 --- a/module/actor-sheet.js +++ b/module/actor-sheet.js @@ -84,7 +84,7 @@ export class RdDActorSheet extends RdDBaseActorSheet { RdDItemArme.ajoutCorpsACorps(formData.combat, formData.competences, formData.system.carac); formData.esquives = this.actor.getCompetences("Esquive"); formData.combat = RdDCombatManager.listActionsArmes(formData.combat, formData.competences, formData.system.carac); - formData.empoignades = this.actor.getEmpoignades("Esquive"); + formData.empoignades = this.actor.getEmpoignades(); this.armesList = formData.combat; diff --git a/module/rdd-empoignade.js b/module/rdd-empoignade.js index e7e1dd8d..56094841 100644 --- a/module/rdd-empoignade.js +++ b/module/rdd-empoignade.js @@ -1,10 +1,9 @@ /* -------------------------------------------- */ -import { RdDCombat } from "./rdd-combat.js"; import { RdDResolutionTable } from "./rdd-resolution-table.js"; import { RdDRoll } from "./rdd-roll.js"; import { RdDItemCompetenceCreature } from "./item-competencecreature.js"; import { ChatUtility } from "./chat-utility.js"; -import { STATUSES, StatusEffects } from "./settings/status-effects.js"; +import { STATUSES } from "./settings/status-effects.js"; /* -------------------------------------------- */ @@ -268,16 +267,16 @@ export class RdDEmpoignade { console.log("Perte d'endurance :!!!", perteMode) let endValue = defender.system.sante.endurance.value if (perteMode == "end0") { - await defender.santeIncDec("endurance", -defender.system.sante.endurance.value); + await defender.santeIncDec("endurance", -endValue); } if (perteMode == "end1") { - await defender.santeIncDec("endurance", -(defender.system.sante.endurance.value - 1)); + await defender.santeIncDec("endurance", -(endValue - 1)); } if (perteMode == "endmoitie") { - await defender.santeIncDec("endurance", -Math.floor(defender.system.sante.endurance.value / 2)); + await defender.santeIncDec("endurance", -Math.floor(endValue / 2)); } if (perteMode == "endquart") { - await defender.santeIncDec("endurance", -(3 * Math.floor(defender.system.sante.endurance.value / 4))); + await defender.santeIncDec("endurance", -(3 * Math.floor(endValue / 4))); } let msg = await RdDResolutionTable.displayRollData(rollData, attacker, 'chat-empoignade-perte-endurance.html'); ChatUtility.setMessageData(msg, "empoignade-roll-data", rollData) @@ -304,7 +303,8 @@ export class RdDEmpoignade { /* -------------------------------------------- */ static async createEmpoignade(attacker, defender) { return await Item.create({ - name: "Empoignade en cours de " + attacker.name + ' sur ' + defender.name, type: 'empoignade', + name: "Empoignade en cours de " + attacker.name + ' sur ' + defender.name, + type: 'empoignade', img: "systems/foundryvtt-reve-de-dragon/icons/entites/possession2.webp", system: { description: "", empoignadeid: randomID(16), compteempoigne: 0, empoigneurid: attacker.id, empoigneid: defender.id, ptsemp: 0, empoigneurname: attacker.name, empoignename: defender.name } },