diff --git a/module/actor.js b/module/actor.js index 88a56b21..9d9426d4 100644 --- a/module/actor.js +++ b/module/actor.js @@ -3528,7 +3528,7 @@ export class RdDActor extends RdDBaseActor { /* -------------------------------------------- */ async buildPotionGuerisonList(pointsGuerison) { const pointsGuerisonInitial = pointsGuerison; - const blessures = this.filterItems(it => it.isLegere() || it.isGrave() || it.isCritique()).sort(Misc.descending(it => it.system.gravite)) + const blessures = this.filterItems(it => it.system.gravite > 0, 'blessure').sort(Misc.descending(it => it.system.gravite)) const ids = [] const guerisonData = { list: [], pointsConsommes: 0 } for (let blessure of blessures) { @@ -3567,7 +3567,7 @@ export class RdDActor extends RdDBaseActor { } } if (!potionData.system.magique || potionData.rolled.isSuccess) { - await this.setBonusPotionSoin(potionData.system.herbeBonus); + await this.setBonusPotionSoin(potionData.system.herbebonus); } ChatMessage.create({ whisper: ChatUtility.getWhisperRecipientsAndGMs(this.name), @@ -3576,7 +3576,7 @@ export class RdDActor extends RdDBaseActor { } async setBonusPotionSoin(bonus) { - await this.update({ 'sante.bonusPotion': bonus }); + await this.update({ 'system.sante.bonusPotion': bonus }); } /* -------------------------------------------- */ @@ -3604,7 +3604,7 @@ export class RdDActor extends RdDBaseActor { } } if (!potionData.system.magique || potionData.rolled.isSuccess) { - this.bonusRepos = potionData.system.herbeBonus; + this.bonusRepos = potionData.system.herbebonus; } ChatMessage.create({ whisper: ChatUtility.getWhisperRecipientsAndGMs(this.name), diff --git a/module/rdd-timestamp.js b/module/rdd-timestamp.js index f23c4151..0a5490ed 100644 --- a/module/rdd-timestamp.js +++ b/module/rdd-timestamp.js @@ -252,7 +252,7 @@ export class RdDTimestamp { get heure() { return Math.floor(this.indexMinute / RDD_MINUTES_PAR_HEURES) } get minute() { return this.indexMinute % RDD_MINUTES_PAR_HEURES } get round() { return ROUNDS_PAR_MINUTE * (this.indexMinute - Math.floor(this.indexMinute)) } - get angleHeure() { return this.indexMinute / RDD_MINUTES_PAR_JOUR * 360 - 60 } + get angleHeure() { return this.indexMinute / RDD_MINUTES_PAR_JOUR * 360 - 45 } get angleMinute() { return this.indexMinute / RDD_MINUTES_PAR_HEURES * 360 + 45} formatDate() { diff --git a/system.json b/system.json index e1cfc4aa..2e4c1715 100644 --- a/system.json +++ b/system.json @@ -1,8 +1,8 @@ { "id": "foundryvtt-reve-de-dragon", "title": "Rêve de Dragon", - "version": "10.7.2", - "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-10.7.2.zip", + "version": "10.7.3", + "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-10.7.3.zip", "manifest": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/raw/v10/system.json", "compatibility": { "minimum": "10", diff --git a/templates/actor/blessure.hbs b/templates/actor/blessure.hbs index 16d9bc12..056ea377 100644 --- a/templates/actor/blessure.hbs +++ b/templates/actor/blessure.hbs @@ -11,7 +11,9 @@ {{#if system.premierssoins.done}} + {{#unless system.soinscomplets.done}} + {{/unless}} {{else}} {{/if}} diff --git a/templates/item-blessure-sheet.html b/templates/item-blessure-sheet.html index 83037f2b..fec18247 100644 --- a/templates/item-blessure-sheet.html +++ b/templates/item-blessure-sheet.html @@ -28,7 +28,9 @@ {{#if system.premierssoins.done}} + {{#unless system.soinscomplets.done}} + {{/unless}} {{else}}