From 42ad4c5b26b77871026be76e5efbe89468662543 Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Tue, 24 Oct 2023 22:16:29 +0200 Subject: [PATCH 1/5] =?UTF-8?q?Fix=20Restauration=20TMR=20si=20minimis?= =?UTF-8?q?=C3=A9e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Lors d'une action dans les TMRs, si la fenêtre est minimisée, on la réaffiche --- module/rdd-tmr-dialog.js | 1 + module/rdd-tmr-rencontre-dialog.js | 2 +- templates/dialog-tmr.html | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/module/rdd-tmr-dialog.js b/module/rdd-tmr-dialog.js index 415f8574..37561dbb 100644 --- a/module/rdd-tmr-dialog.js +++ b/module/rdd-tmr-dialog.js @@ -83,6 +83,7 @@ export class RdDTMRDialog extends Dialog { } async restoreTMRAfterAction() { this.subdialog = undefined + await this.maximize(); this.bringToTop(); } diff --git a/module/rdd-tmr-rencontre-dialog.js b/module/rdd-tmr-rencontre-dialog.js index 97c4dc2d..495d0b10 100644 --- a/module/rdd-tmr-rencontre-dialog.js +++ b/module/rdd-tmr-rencontre-dialog.js @@ -46,7 +46,7 @@ export class RdDTMRRencontreDialog extends Dialog { } else { ui.notifications.info("Vous devez résoudre la rencontre."); - this.actor.tmrApp.forceTMRContinueAction(); + return this.actor.tmrApp.forceTMRContinueAction(); } } else { diff --git a/templates/dialog-tmr.html b/templates/dialog-tmr.html index 3c170609..6ca5ed09 100644 --- a/templates/dialog-tmr.html +++ b/templates/dialog-tmr.html @@ -1,4 +1,5 @@
+
@@ -52,6 +53,5 @@
-
From 41ab593059025335ea96f882af2950ae3c4e07b3 Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Tue, 24 Oct 2023 22:24:54 +0200 Subject: [PATCH 2/5] Fix: fabrication de potion depuis l'herbe La fabrication ne marchait plus --- module/item-sheet.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/item-sheet.js b/module/item-sheet.js index e8864c86..a85ba8a4 100644 --- a/module/item-sheet.js +++ b/module/item-sheet.js @@ -195,7 +195,7 @@ export class RdDItemSheet extends ItemSheet { this.html.find('.creer-tache-livre').click((event) => this._getEventActor(event).creerTacheDepuisLivre(this.item)); this.html.find('.consommer-potion').click((event) => this._getEventActor(event).consommerPotion(this.item, this.getActionRenderItem())); - this.html.find('.creer-potion-base').click((event) => this._getEventActor(event).dialogFabriquerPotion(this.item)); + this.html.find('.creer-potion-base').click((event) => this._getEventActor(event).actionHerbe(this.item)); this.html.find('.alchimie-tache a').click((event) => { let actor = this._getEventActor(event); From e089bdf9c8b150358969b01df02fdeb532ccf6da Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Tue, 24 Oct 2023 22:32:49 +0200 Subject: [PATCH 3/5] Surencombrement seulement sur actions physiques CF p70 --- module/rdd-roll.js | 2 -- module/rolldata-ajustements.js | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/module/rdd-roll.js b/module/rdd-roll.js index 6a65684e..5925d076 100644 --- a/module/rdd-roll.js +++ b/module/rdd-roll.js @@ -50,8 +50,6 @@ export class RdDRoll extends Dialog { encTotal: true }, isMalusEncombrementTotal: RdDItemCompetence.isMalusEncombrementTotal(rollData.competence), - malusArmureValue: actor.getMalusArmure(), - surencMalusValue: actor.computeMalusSurEncombrement(), encTotal: actor.getEncTotal(), ajustementAstrologique: actor.ajustementAstrologique(), surprise: actor.getSurprise(false), diff --git a/module/rolldata-ajustements.js b/module/rolldata-ajustements.js index 4d313a72..5eab750d 100644 --- a/module/rolldata-ajustements.js +++ b/module/rolldata-ajustements.js @@ -69,8 +69,8 @@ export const referenceAjustements = { getValue: (rollData, actor) => -actor.getEncTotal() }, surenc: { - isVisible: (rollData, actor) => actor.isSurenc(), - isUsed: (rollData, actor) => rollData.use?.surenc, + isVisible: (rollData, actor) => RdDCarac.isActionPhysique(rollData.selectedCarac) && actor.isSurenc(), + isUsed: (rollData, actor) => rollData.use?.surenc && RdDCarac.isActionPhysique(rollData.selectedCarac), getLabel: (rollData, actor) => 'Sur-encombrement', getValue: (rollData, actor) => actor.computeMalusSurEncombrement() }, From 54158ee10de7ca925241a543ca0c12c57a96e50a Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Tue, 24 Oct 2023 22:44:51 +0200 Subject: [PATCH 4/5] Fix disparition du tooltip dans les TMR MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Passage den eventMode static permet de ne pas faire disparaître le tooltip. --- module/tmr/pixi-tmr.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/tmr/pixi-tmr.js b/module/tmr/pixi-tmr.js index 9dfe79c2..213dabf8 100644 --- a/module/tmr/pixi-tmr.js +++ b/module/tmr/pixi-tmr.js @@ -81,7 +81,7 @@ export class PixiTMR { sprite.tooltip = new PIXI.Text('', tooltipStyle); sprite.tooltip.zIndex = tmrTokenZIndex.tooltip; sprite.isOver = false; - sprite.eventMode = 'dynamic'; // PIXI 7 To be checked + sprite.eventMode = 'static'; sprite .on('pointermove', event => this.onPointerMove(event, sprite, computeTooltip)) .on('pointerdown', event => this.onClickBackground(event)) From d1b73e76585faf8ee6a2cc3e7f55beb02e9a38d3 Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Tue, 24 Oct 2023 22:51:45 +0200 Subject: [PATCH 5/5] Version 11.0.27 --- changelog.md | 6 ++++++ system.json | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changelog.md b/changelog.md index cda96642..f299d1f8 100644 --- a/changelog.md +++ b/changelog.md @@ -1,4 +1,10 @@ # v11.0 +## v11.0.27 - Khrachtchoum le méticuleux +- le tooltip dans les TMR reste visible si on ne bouge pas la souris +- le surencombrement n'affecte QUE les actions physiques +- on peut de nouveau fabriquer une potion depuis la fenêtre d'édition de l'herbe +- si les TMR sont minimisées alors qu'une action est requise, elles sont bien réaffichées lorsque l'action est faite + ## v11.0.26 - le crépuscule de Khrachtchoum - gestion correcte des TMRs - les TMRs ne sont jamais minimisées (par le système) quand le haut-rêvant est en demi-rêve diff --git a/system.json b/system.json index 202f21da..69dc87f9 100644 --- a/system.json +++ b/system.json @@ -1,8 +1,8 @@ { "id": "foundryvtt-reve-de-dragon", "title": "Rêve de Dragon", - "version": "11.0.26", - "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-11.0.26.zip", + "version": "11.0.27", + "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-11.0.27.zip", "manifest": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/raw/v11/system.json", "changelog": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/raw/branch/v11/changelog.md", "compatibility": {