From 9a7b01a98567810afc0a52c857bac074aa1f02cf Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Sat, 5 Jun 2021 01:53:30 +0200 Subject: [PATCH] =?UTF-8?q?Fix:=20suppression=20conqu=C3=AAte=20automatiqu?= =?UTF-8?q?e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- module/actor.js | 2 +- module/tmr/conquete.js | 2 +- templates/actor-sheet.html | 15 ++++++++------- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/module/actor.js b/module/actor.js index 5d425962..69b91f68 100644 --- a/module/actor.js +++ b/module/actor.js @@ -4079,7 +4079,7 @@ export class RdDActor extends Actor { if (Misc.isElectedUser()) { let draconique = Draconique.all().find(it => it.isCase(item)); if (draconique) { - draconique.onActorDeleteCaseTmr(this, item) + draconique.onActorDeleteCaseTmr(this, Misc.data(item)) } } } diff --git a/module/tmr/conquete.js b/module/tmr/conquete.js index b8c0ac53..0773aa93 100644 --- a/module/tmr/conquete.js +++ b/module/tmr/conquete.js @@ -32,7 +32,7 @@ export class Conquete extends Draconique { async _creerConquete(actor, queue) { let existants = actor.data.items.filter(it => this.isCase(it)).map(it => Misc.data(it).data.coord); let possibles = TMRUtility.filterTMR(tmr => !TMRUtility.isCaseHumide(tmr) && !existants.includes(tmr.coord)); - let conquete =await RdDDice.rollOneOf(possibles); + let conquete = await RdDDice.rollOneOf(possibles); await this.createCaseTmr(actor, 'ConquĂȘte: ' + conquete.label, conquete, queue.id); } diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html index 629ea8f7..baad0b8f 100644 --- a/templates/actor-sheet.html +++ b/templates/actor-sheet.html @@ -437,11 +437,11 @@ {{data.reve.refoulement.value}} {{/if}} - - - -
- {{#if data.attributs.hautrevant.value}} + + + +
+ {{#if data.attributs.hautrevant.value}} {{#if options.isGM}}

Signes draconiques

+

{{/if}}