From 7c1a3267f20e38531562a072d9744169b2bf261a Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Wed, 30 Jun 2021 01:02:01 +0200 Subject: [PATCH] reformat --- module/actor.js | 7 ++----- module/rdd-combat.js | 6 +++--- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/module/actor.js b/module/actor.js index 0dbda8a0..7a15d903 100644 --- a/module/actor.js +++ b/module/actor.js @@ -2155,10 +2155,7 @@ export class RdDActor extends Actor { async appliquerAjoutExperience(rollData, display) { if (!this.isPersonnage()) return; let xpData = await this._appliquerExperience(rollData.rolled, rollData.selectedCarac.label, rollData.competence); - if (!xpData) { - return; - } - if (display) { + if (xpData && display) { let message = { whisher: ChatUtility.getWhisperRecipientsAndGMs(this.name), content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-actor-gain-xp.html`, xpData) @@ -2168,7 +2165,7 @@ export class RdDActor extends Actor { } /* -------------------------------------------- */ - async _appliquerAppelMoral(rollData, display = true) { + async _appliquerAppelMoral(rollData) { if (!this.isPersonnage()) return; if (!rollData.useMoral) return; if (rollData.rolled.isEchec || diff --git a/module/rdd-combat.js b/module/rdd-combat.js index c317a5ce..3105ade7 100644 --- a/module/rdd-combat.js +++ b/module/rdd-combat.js @@ -727,7 +727,7 @@ export class RdDCombat { if (!await this.accorderEntite('avant-attaque')) { return; } - if (arme.data.cac =='empoignade' && this.attacker.isCombatTouche()){ + if (arme.data.cac == 'empoignade' && this.attacker.isCombatTouche()) { ChatMessage.create({ alias: this.attacker.name, whisper: ChatUtility.getWhisperRecipientsAndGMs(this.attacker.name), @@ -736,7 +736,7 @@ export class RdDCombat { competence: competence }) }); - return; + return; } let rollData = this._prepareAttaque(competence, arme); @@ -963,7 +963,7 @@ export class RdDCombat { console.log("RdDCombat._onEchecTotal >>>", rollData); const arme = rollData.arme; - const avecArme = !['', 'sans-armes', 'armes-naturelles'].includes( arme?.data.categorie_parade ?? ''); + const avecArme = !['', 'sans-armes', 'armes-naturelles'].includes(arme?.data.categorie_parade ?? ''); const action = (rollData.attackerRoll ? (arme ? "la parade" : "l'esquive") : "l'attaque"); ChatUtility.createChatWithRollMode(this.defender.name, { content: `Maladresse à ${action}! ` + await RdDRollTables.getMaladresse({ arme: avecArme })