Fenêtres Roll V2

Maintenant disponibles pour:
- méditation
- tâches
- soins

module/actor/base-actor-reve.js

@@ -11,7 +11,7 @@ import { ITEM_TYPES } from "../constants.js";
 import { StatusEffects, STATUSES } from "../settings/status-effects.js";
 import { Targets } from "../targets.js";
 import { RdDConfirm } from "../rdd-confirm.js";
-import { RdDCarac } from "../rdd-carac.js";
+import { CARACS, RdDCarac } from "../rdd-carac.js";
 import { RdDRollResult } from "../rdd-roll-result.js";
 
 import { RdDItemArme } from "../item/arme.js";
@@ -28,6 +28,7 @@ import { MappingCreatureArme } from "../item/mapping-creature-arme.mjs";
 import RollDialog from "../roll/roll-dialog.mjs";
 import { ATTAQUE_ROLL_TYPES, DEFAULT_ROLL_TYPES, DIFF, ROLL_TYPE_ATTAQUE, ROLL_TYPE_COMP, ROLL_TYPE_JEU, ROLL_TYPE_MEDITATION, ROLL_TYPE_OEUVRE, ROLL_TYPE_TACHE } from "../roll/roll-constants.mjs";
 import { OptionsAvancees, ROLL_DIALOG_V2 } from "../settings/options-avancees.js";
+import { PART_COMP } from "../roll/roll-part-comp.mjs";
 
 /**
  * Classe de base pour les acteurs disposant de rêve (donc, pas des objets)
@@ -380,9 +381,22 @@ export class RdDBaseActorReve extends RdDBaseActor {
   }
   /* -------------------------------------------- */
   async rollCarac(caracName, options = {}) {
-    if (Grammar.equalsInsensitive(caracName, 'taille')) {
+    if (Grammar.equalsInsensitive(caracName, CARACS.TAILLE)) {
       return
     }
+    if (OptionsAvancees.isUsing(ROLL_DIALOG_V2)) {
+      const rollData = {
+        ids: { actorId: this.id },
+        type: { allowed: [PART_COMP], current: PART_COMP },
+        selected: {
+          carac: { key: caracName },
+          comp: options.resistance ? { key: undefined, forced: true } : undefined
+        }
+      }
+      RollDialog.create(rollData, options)
+      return
+    }
+
     foundry.utils.mergeObject(options, { resistance: false, diff: 0 }, { overwrite: false })
     RdDEmpoignade.checkEmpoignadeEnCours(this)
     let selectedCarac = this.getCaracByName(caracName)

module/actor/base-actor-sang.js

@@ -161,7 +161,7 @@ export class RdDBaseActorSang extends RdDBaseActorReve {
     if (ReglesOptionnelles.isUsing("appliquer-fatigue") && sante.fatigue && fatigue > 0) {
       sante.fatigue.value = Math.max(sante.fatigue.value + fatigue, this.getFatigueMin());
     }
-    await this.update({ "system.sante": sante })
+    await this.update({ "system.sante": sante }, { render: true })
     if (this.isDead()) {
       await this.setEffect(STATUSES.StatusComma, true);
     }

module/actor/base-actor.js

@@ -46,6 +46,7 @@ export class RdDBaseActor extends Actor {
   }
 
   static init() {
+    Handlebars.registerHelper('actor-isFeminin', actor => actor.isFeminin())
     Hooks.on("preUpdateItem", (item, change, options, id) => Misc.documentIfResponsible(item.parent)?.onPreUpdateItem(item, change, options, id))
     Hooks.on("createItem", (item, options, id) => Misc.documentIfResponsible(item.parent)?.onCreateItem(item, options, id))
     Hooks.on("updateItem", (item, options, id) => Misc.documentIfResponsible(item.parent)?.onUpdateItem(item, options, id))
@@ -220,6 +221,7 @@ export class RdDBaseActor extends Actor {
   isHautRevant() { return false }
   isVehicule() { return false }
   isPersonnage() { return false }
+  isFeminin() { return false }
   getItem(id, type = undefined) {
     const item = this.items.get(id);
     if (type == undefined || (item?.type == type)) {
@@ -254,7 +256,7 @@ export class RdDBaseActor extends Actor {
     }
   }
 
-  async onUpdateItem(item, options, id){
+  async onUpdateItem(item, options, id) {
     switch (item.type) {
       case ITEM_TYPES.blessure:
         await this.changeBleedingState()
@@ -801,6 +803,6 @@ export class RdDBaseActor extends Actor {
   listActionsCombat() {
     const possessions = this.listActionsPossessions()
     return possessions.length > 0 ? possessions : this.listActions({})
-    
+
   }
 }

module/actor/export-scriptarium/mapping.js

@@ -274,11 +274,10 @@ export class Mapping {
   }
 
   static getDescription(actor) {
-    const sexe = actor.system.sexe
-    const sexeFeminin = sexe.length > 0 && sexe.charAt(0).toLowerCase() == 'f' ? 'Née' : 'Né'
+    const naissance = actor.isFeminin() ? 'née' : 'né'
     const race = ['', 'humain'].includes(Grammar.toLowerCaseNoAccent(actor.system.race)) ? '' : (actor.system.race + ' ')
     const heure = actor.system.heure
-    const hn = `${sexeFeminin} à l'heure ${RdDTimestamp.definition(heure).avecArticle}`
+    const hn = `${naissance} à l'heure ${RdDTimestamp.definition(heure).avecArticle}`
     const age = (actor.system.age && actor.system.age >0) ? `${actor.system.age} ans` : undefined
     const taille = actor.system.taille
     const poids = actor.system.poids