diff --git a/module/actor.js b/module/actor.js index a71567ad..ef23d288 100644 --- a/module/actor.js +++ b/module/actor.js @@ -22,6 +22,7 @@ import { RdDPossession } from "./rdd-possession.js"; import { ACTOR_TYPES, renderTemplate, SHOW_DICE, SYSTEM_RDD, SYSTEM_SOCKET_ID } from "./constants.js"; import { RdDConfirm } from "./rdd-confirm.js"; import { DialogRepos } from "./sommeil/dialog-repos.js"; +import { DialogNouveauRepos } from "./sommeil/dialog-nouveau-repos.js"; import { RdDBaseActor } from "./actor/base-actor.js"; import { RdDTimestamp } from "./time/rdd-timestamp.js"; import { AppAstrologie } from "./sommeil/app-astrologie.js"; @@ -296,7 +297,11 @@ export class RdDActor extends RdDBaseActorSang { } async repos() { - await DialogRepos.create(this); + if (ReglesOptionnelles.isUsing("nouveau-mode-repos")) { + await DialogNouveauRepos.create(this); + } else { + await DialogRepos.create(this); + } } /* -------------------------------------------- */ @@ -674,9 +679,10 @@ export class RdDActor extends RdDBaseActorSang { let totalSust = 0, totalEau = 0 let foundAny = false + if (restantSust <= 0 && restantEau <= 0) return + for (const item of this.items) { if (item.type !== 'nourritureboisson') continue - if (restantSust <= 0 && restantEau <= 0) break const qty = item.system.quantite if (!qty || qty <= 0) continue