From 306d7c2150fd9c164087332f66df6f3745296c25 Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Sun, 12 Nov 2023 19:52:57 +0100 Subject: [PATCH 1/3] =?UTF-8?q?Fix:=20d=C3=A9lai=20de=20gu=C3=A9rison=20ap?= =?UTF-8?q?r=C3=A8s=20r=C3=A9trogradation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Lorsqu'une blessure critique/grave rétrograde naturellement, le délai avant le jet de récupération suivant est correctement augmenté. --- changelog.md | 4 +++- module/item/blessure.js | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/changelog.md b/changelog.md index bc7888ec..115544fb 100644 --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,8 @@ # v11.0 -## v11.1.5 - Les dissections de Werther de Zloth +## v11.1.6 - Les dissections de Werther de Zloth - Fix: on peut de nouveau donner des compétences aux créatures +- Fix: le délai de guérison d'une blessure rétrogradée est correctement appliqué +- Fix: l'encaissement à valider par le MJ fonctionne de nouveau ## v11.1.5 - Werther de Zloth l'Onirique - Fixes: diff --git a/module/item/blessure.js b/module/item/blessure.js index 0b1076ba..8747157e 100644 --- a/module/item/blessure.js +++ b/module/item/blessure.js @@ -115,7 +115,10 @@ export class RdDItemBlessure extends RdDItem { if (!isMaladeEmpoisonne && rolled.isSuccess && this.peutRetrograder(graviteMoindre, moindres)) { message.content += ` -- une blessure ${label} cicatrise`; mergeObject(update, { - system: { gravite: graviteMoindre, fin: { indexDate: timestamp.addJours(graviteMoindre).indexDate } } + system: { + gravite: graviteMoindre, + temporel: { fin: { indexDate: timestamp.addJours(graviteMoindre).indexDate } } + } }); } else { -- 2.35.3 From 511ee5f241711896ae8a9a388d5cd6e1d3db30f5 Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Sun, 12 Nov 2023 21:03:41 +0100 Subject: [PATCH 2/3] =?UTF-8?q?Fix:=20encaissement=20joueur=20=C3=A0=20val?= =?UTF-8?q?ider=20par=20MJ?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- module/actor.js | 6 +++--- module/actor/base-actor-reve.js | 2 +- module/rdd-tmr-dialog.js | 7 ++++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/module/actor.js b/module/actor.js index 2e839390..53556495 100644 --- a/module/actor.js +++ b/module/actor.js @@ -256,7 +256,7 @@ export class RdDActor extends RdDBaseActorSang { const isMaladeEmpoisonne = maladiesPoisons.length > 0; this._messageRecuperationMaladiePoisons(maladiesPoisons, message); - await this._recuperationBlessures(message, isMaladeEmpoisonne); + await this._recupererBlessures(message, isMaladeEmpoisonne); await this._recupererVie(message, isMaladeEmpoisonne); } @@ -367,7 +367,7 @@ export class RdDActor extends RdDBaseActorSang { } /* -------------------------------------------- */ - async _recuperationBlessures(message, isMaladeEmpoisonne) { + async _recupererBlessures(message, isMaladeEmpoisonne) { const timestamp = game.system.rdd.calendrier.getTimestamp() const blessures = this.filterItems(it => it.system.gravite > 0, TYPES.blessure).sort(Misc.ascending(it => it.system.gravite)) @@ -661,7 +661,7 @@ export class RdDActor extends RdDBaseActorSang { /* -------------------------------------------- */ async sortMisEnReserve(sort, draconic, coord, ptreve) { await this.createEmbeddedDocuments("Item", [{ - type: 'sortreserve', + type: TYPES.sortreserve, name: sort.name, img: sort.img, system: { sortid: sort._id, draconic: (draconic?.name ?? sort.system.draconic), ptreve: ptreve, coord: coord, heurecible: 'Vaisseau' } diff --git a/module/actor/base-actor-reve.js b/module/actor/base-actor-reve.js index 3b1ee283..5395161d 100644 --- a/module/actor/base-actor-reve.js +++ b/module/actor/base-actor-reve.js @@ -427,7 +427,7 @@ export class RdDBaseActorReve extends RdDBaseActor { RdDBaseActor.remoteActorCall({ tokenId: this.token?.id, actorId: this.id, - method: 'appliquerEncaissement', + method: 'encaisserDommages', args: [rollData, show, attackerId] }); return; diff --git a/module/rdd-tmr-dialog.js b/module/rdd-tmr-dialog.js index 1080f6f5..4bec890c 100644 --- a/module/rdd-tmr-dialog.js +++ b/module/rdd-tmr-dialog.js @@ -16,6 +16,7 @@ import { RdDDice } from "./rdd-dice.js"; import { STATUSES } from "./settings/status-effects.js"; import { RdDRencontre } from "./item/rencontre.js"; import { RdDTimestamp } from "./time/rdd-timestamp.js"; +import { TYPES } from "./item.js"; /* -------------------------------------------- */ @@ -110,11 +111,11 @@ export class RdDTMRDialog extends Dialog { } get sortsReserve() { - return this.actor.itemTypes['sortreserve']; + return this.actor.itemTypes[TYPES.sortreserve]; } getSortsReserve(coord) { - return this.actor.itemTypes['sortreserve'].filter(// Reserve sur une case fleuve ou normale + return this.actor.itemTypes[TYPES.sortreserve].filter(// Reserve sur une case fleuve ou normale TMRUtility.getTMR(coord).type == 'fleuve' ? it => TMRUtility.getTMR(it.system.coord).type == 'fleuve' : it => it.system.coord == coord @@ -166,7 +167,7 @@ export class RdDTMRDialog extends Dialog { return this.rencontresExistantes.map(it => this._tokenRencontre(it)); } _getTokensSortsReserve() { - return this.actor.itemTypes['sortreserve'].map(it => this._tokenSortEnReserve(it)); + return this.actor.itemTypes[TYPES.sortreserve].map(it => this._tokenSortEnReserve(it)); } /* -------------------------------------------- */ -- 2.35.3 From 09986115b8bda27893e31b6d802bd795cb46fded Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Sun, 12 Nov 2023 21:18:52 +0100 Subject: [PATCH 3/3] Version 11.1.6 --- system.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system.json b/system.json index 46c85d6e..59c30ff1 100644 --- a/system.json +++ b/system.json @@ -1,8 +1,8 @@ { "id": "foundryvtt-reve-de-dragon", "title": "Rêve de Dragon", - "version": "11.1.5", - "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-11.1.5.zip", + "version": "11.1.6", + "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-11.1.6.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": { -- 2.35.3