From 5d1cb2abecf349e3a101f4b8fec061f9e72f78d4 Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Sun, 27 Dec 2020 22:21:08 +0100 Subject: [PATCH 1/5] =?UTF-8?q?Boutons=20cr=C3=A9atures/entit=C3=A9s=20#69?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I0aeded39e99551dbe09dc988e04c1de185c1dc70 --- module/actor-entite-sheet.js | 5 +---- module/actor-humanoide-sheet.js | 20 ++++++++++++++++---- module/actor-sheet.js | 2 +- module/actor.js | 17 +++++++++++++---- templates/actor-humanoide-sheet.html | 10 +++++++++- 5 files changed, 40 insertions(+), 14 deletions(-) diff --git a/module/actor-entite-sheet.js b/module/actor-entite-sheet.js index 789a2bb9..ea5a1e23 100644 --- a/module/actor-entite-sheet.js +++ b/module/actor-entite-sheet.js @@ -1,11 +1,9 @@ - /** * Extend the basic ActorSheet with some very simple modifications * @extends {ActorSheet} */ import { HtmlUtility } from "./html-utility.js"; -import { RdDUtility } from "./rdd-utility.js"; /* -------------------------------------------- */ export class RdDActorEntiteSheet extends ActorSheet { @@ -55,7 +53,7 @@ export class RdDActorEntiteSheet extends ActorSheet { /** @override */ activateListeners(html) { super.activateListeners(html); - + HtmlUtility._showControlWhen($(".gm-only"), game.user.isGM); // Everything below here is only needed if the sheet is editable @@ -119,7 +117,6 @@ export class RdDActorEntiteSheet extends ActorSheet { this.actor.remiseANeuf(); } }); - } diff --git a/module/actor-humanoide-sheet.js b/module/actor-humanoide-sheet.js index aee867bd..3a9c9679 100644 --- a/module/actor-humanoide-sheet.js +++ b/module/actor-humanoide-sheet.js @@ -1,12 +1,12 @@ - /** * Extend the basic ActorSheet with some very simple modifications * @extends {ActorSheet} - */ + */ +import { HtmlUtility } from "./html-utility.js"; import { RdDUtility } from "./rdd-utility.js"; -/* -------------------------------------------- */ +/* -------------------------------------------- */ export class RdDActorHumanoideSheet extends ActorSheet { /** @override */ @@ -64,7 +64,9 @@ export class RdDActorHumanoideSheet extends ActorSheet { /** @override */ activateListeners(html) { super.activateListeners(html); - + + HtmlUtility._showControlWhen($(".gm-only"), game.user.isGM); + // Everything below here is only needed if the sheet is editable if (!this.options.editable) return; @@ -147,6 +149,16 @@ export class RdDActorHumanoideSheet extends ActorSheet { this.actor.santeIncDec("endurance", -1); this.render(true); }); + + html.find('#encaisser-direct').click(ev => { + this.actor.encaisser() + }); + + html.find('#remise-a-neuf').click(ev => { + if (game.user.isGM) { + this.actor.remiseANeuf(); + } + }); } diff --git a/module/actor-sheet.js b/module/actor-sheet.js index 2d758c19..2c8d182c 100644 --- a/module/actor-sheet.js +++ b/module/actor-sheet.js @@ -130,7 +130,7 @@ export class RdDActorSheet extends ActorSheet { return data; } - + /* -------------------------------------------- */ async _onDrop(event) { await RdDUtility.processItemDropEvent(this, event); diff --git a/module/actor.js b/module/actor.js index e2a7dfda..80c7fe3e 100644 --- a/module/actor.js +++ b/module/actor.js @@ -309,7 +309,11 @@ export class RdDActor extends Actor { whisper: ChatUtility.getWhisperRecipientsAndGMs( this.name ), content : "Remise à neuf de " + this.name }; - if (!this.isEntiteCauchemar()) { + if (this.isEntiteCauchemar()) { + await this.santeIncDec("endurance", this.data.data.sante.endurance.max - this.data.data.sante.endurance.value); + } + else { + if (this.data.data.blessures){ const blessures = duplicate(this.data.data.blessures); for (let listeBlessures of [blessures.legeres.liste, blessures.graves.liste, blessures.critiques.liste]) { @@ -322,9 +326,7 @@ export class RdDActor extends Actor { await this.update({ "data.compteurs.ethylisme.value": 0 }); await this.update({ "data.compteurs.ethylisme.nb_doses": 0 }); await this.santeIncDec("vie", this.data.data.sante.vie.max - this.data.data.sante.vie.value); - } - await this.santeIncDec("endurance", this.data.data.sante.endurance.max - this.data.data.sante.endurance.value); - if (!this.isEntiteCauchemar()) { + await this.santeIncDec("endurance", this.data.data.sante.endurance.max - this.data.data.sante.endurance.value); if (this.data.data.sante.fatigue){ let fatigue = duplicate(this.data.data.sante.fatigue) fatigue.value = 0; @@ -1760,6 +1762,13 @@ export class RdDActor extends Actor { new RdDEncaisser(html, this ).render(true); } + /* -------------------------------------------- */ + async encaisser( ) { + let data = { ajustementsEncaissement: RdDUtility.getAjustementsEncaissement() }; + let html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/dialog-roll-encaisser.html', data ); + new RdDEncaisser(html, this).render(true); + } + /* -------------------------------------------- */ async encaisserDommages( attackerRoll, attacker = undefined ) { if (attacker && !await attacker.accorder(this, 'avant-encaissement')) { diff --git a/templates/actor-humanoide-sheet.html b/templates/actor-humanoide-sheet.html index 137f9936..40e946cc 100644 --- a/templates/actor-humanoide-sheet.html +++ b/templates/actor-humanoide-sheet.html @@ -4,7 +4,15 @@
-

+
+

+
+
+
+ Encaisser des dommages + Remise à neuf +
+
{{data.blessures.resume}} From 499adea83d447050821c8fd13e2761e5a72b700c Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Sun, 27 Dec 2020 22:33:11 +0100 Subject: [PATCH 2/5] Pas d'xp en taille MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit alignement des carac dérivées Change-Id: Ic2537bf3b0a194d91f2b6a001c7e744719ad5623 --- templates/actor-sheet.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html index 50a17741..9a4f230e 100644 --- a/templates/actor-sheet.html +++ b/templates/actor-sheet.html @@ -109,9 +109,14 @@ {{/if}} {{#if carac.derivee}} +
{{/if}}
- -     + + + +
{{>"systems/foundryvtt-reve-de-dragon/templates/dialog-roll-surenc.html"}} diff --git a/templates/dialog-roll-carac.html b/templates/dialog-roll-carac.html index bfaac5c0..10c4c40a 100644 --- a/templates/dialog-roll-carac.html +++ b/templates/dialog-roll-carac.html @@ -20,11 +20,11 @@
{{>"systems/foundryvtt-reve-de-dragon/templates/dialog-roll-surenc.html"}} -
- -
-
-     +
+ + + +
diff --git a/templates/dialog-roll-sort.html b/templates/dialog-roll-sort.html index 947e00b1..f539dac2 100644 --- a/templates/dialog-roll-sort.html +++ b/templates/dialog-roll-sort.html @@ -1,8 +1,6 @@
-

-
- +
@@ -59,11 +57,11 @@
-
- -
-
-     +
+ + + +
From 1df89ef3f0dfc61bd7e4367c660bd252f2e50f61 Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Mon, 28 Dec 2020 02:33:37 +0100 Subject: [PATCH 5/5] Fix: toujours afficher les ajustements #81 --- module/rdd-roll.js | 1 - templates/dialog-roll-carac.html | 2 +- templates/dialog-roll-sort.html | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/module/rdd-roll.js b/module/rdd-roll.js index 46cbed5d..a05deb7e 100644 --- a/module/rdd-roll.js +++ b/module/rdd-roll.js @@ -119,7 +119,6 @@ export class RdDRoll extends Dialog { HtmlUtility._showControlWhen($(".diffMoral"), rollData.selectedCarac == actor.data.data.carac.volonte); - HtmlUtility._showControlWhen($("#ajustements"), (!dialog._isIgnoreEtatGeneral(rollData)) || dialog._isAjustementAstrologique(rollData)); HtmlUtility._showControlWhen($("#etat-general"), !dialog._isIgnoreEtatGeneral(rollData)); HtmlUtility._showControlWhen($("#ajust-astrologique"), dialog._isAjustementAstrologique(rollData)); diff --git a/templates/dialog-roll-carac.html b/templates/dialog-roll-carac.html index 10c4c40a..c7955bfb 100644 --- a/templates/dialog-roll-carac.html +++ b/templates/dialog-roll-carac.html @@ -20,7 +20,7 @@
{{>"systems/foundryvtt-reve-de-dragon/templates/dialog-roll-surenc.html"}} -
+
diff --git a/templates/dialog-roll-sort.html b/templates/dialog-roll-sort.html index f539dac2..6a4061a7 100644 --- a/templates/dialog-roll-sort.html +++ b/templates/dialog-roll-sort.html @@ -57,7 +57,7 @@
-
+