Fix naming + charset

Reviewed-on: #711

changelog.md

@@ -1,4 +1,119 @@
+# 12.0
+## 12.0.9 - Le scriptorium d'Astrobazzarh
+- ajout d'une fonction avancée pour exporter les personnages dans un format csv
+
+## 12.0.8 - La quincaillerie d'Astrobazzarh
+- le propriétaire est indiqué dans les feuilles d'équipements/compétences/...
+- Ecaille d'efficacité
+  - l'écaille d'efficacité est prise en compte même si on n'utilise pas le ciblage en combat
+  - l'écaille d'efficacité est prise en compte pour l'initiative
+- Corrections
+  - l'état général est pris en compte pour les initiatives
+  - le tooltip de l'initiative affiche correctement l'initiative
+
+## 12.0.7 - La propriété d'Astrobazzarh
+- correction des opérations faites à la création d'un Item:
+  - la durée des queues/rencontres/souffles
+  - les effets draconiques d'un souffle/queue
+  - mise à jour des points de tâche des blessures lors des soins
+- pas d'expérience sur les particulières quand aucun MJ n'est connecté
+- Le drag&drop d'un acteur depuis la liste des acteurs sur la fiche
+  d'une entité incarnée permet d'accorder le personnage
+- Les messages pour résister aux possessions/conjuration sont envoyées
+  au défenseur
+- Les messages pour résister aux empoignades sont envoyées au défenseur
+- la commande /voyage affiche maintenant le total de fatigue pour chaque voyageur
+- la commande /voyage affiche maintenant les compétences liées au terrain
+
+## 12.0.6 - Le bazar d'Astrobazzarh
+- Corrections de l'inventaire en bazar:
+  - un problème pouvait survenir en déplaçant les objets 
+    l'inventaire, qui fait qu'un conteneur se retrouve récursivement dans son
+    propre contenu, ce qui empêche d'ouvrir la feuille d'acteur.
+  - un objet non-conteneur pouvait dans certains cas avoir un pseudo contenu
+  - un objet pouvait être considéré comme contenu, sans être présent dans un
+    conteneur (et donc non affiché)
+  - vider les conteneurs supprime correctement toutes les informations liées
+    aux conteneurs/contenus
+- Les messages pour les tirages dans le compendium utilisent le "roll mode" 
+  courant pour leur visibilité
+- Fix: restaurer la compatibilité Foundry 11
+
+## 12.0.5 - Les mauvais jours d'Astrobazzarh
+- Fix: on peut de nouveau ouvrir l'édition de calendrier
+- Fix: on ne peut plus ouvrir plusieurs fenêtres de lancer de sort
+- Fix: Failed to execute 'getComputedStyle' on 'Window'
+
+## 12.0.4 - La plaie d'Astrobazzarh
+- **Support V12**
+  - Fix: les boutons d'encaissement dans le tchat fonctionnent de nouveau
+  - Fix warnings sur "Die" et AudioHelper
+
+## 12.0.3 - L'hémorragie d'Astrobazzarh
+- **Support V12**
+  - On peut de nouveau ouvrir un acteur blessé après redémarrage du monde
+  - On peut de nouveau ouvrir les Items avec une rareté par environnement
+  - Le choix de ne plus afficher les demandes de suppression est bien pris en compte
+
+## 12.0.2 - Les pluies d'Astrobazzarh
+- **Support V12**
+  - correction des actions techniques déleguées au MJ qui bloquaient les fenêtre de lancer de dés des joueurs (et plein d'autres)
+  - la fenêtre de calendrier s'ouvre correctement
+  - les dés draconiques peuvent de nouveau faire plus que 0
+  - adaptation de la fenêtre de recherche
+  - correction des comparaisons de version pour les migrations automatiques
+  - correction des roll.eveluate: l'option async est maintenant standard
+  - correction des templates liés aux selections
+  - correction de l'ajustement de luminosité de la scène selon l'heure
+  - correction des images d'effets sur les tokens
+  - correction de la vente par le tchat: seul le premier acheteur pouvait acheter
+  - correction d'erreurs intempestives 'User ... lacks permission to update ...'
+
 # 11.2
+## 11.2.21 - Le questionnement d'Akarlikarlikar
+- Une confirmation spécifique est demandée pour monter dans les terres médianes en cas de rencontre en attente
+- L'expérience en caractéristique sur les jets de chance et rêve actuels est mise dans la caractéristique correspondante
+- Les effets s'appliquent correctement sur les créatures
+- La date et l'heure (draconiques) sont affichées dans les messages du tchat
+
+## 11.2.20 - Le soulagement d'Akarlikarlikar
+- L'option "ajout de la difficulté d'attaque à l'encaissement" est affichée comme un modificateur d'encaissement
+- Les options d'encaissement alternatives fonctionnent avec la validation de l'encaissement par le gardien
+- La fenêtre d'astrologie du gardien affiche toutes les heures lues par un personnage
+- Si aucune expérience n'est gagnée, les autres effets à appliquer (comme la récupération de seuil après avoir vaincu un rêve de Dragon) s'appliquent normalement
+- Les tooltips de Foundry sont lisibles
+- On n'accorde plus les entités de cauchemar deux fois quand le gardien valide les encaissements
+- Les messages de récupération de rêve en cas de Rêve de Dragon sont clarifiés
+
+## 11.2.19 - Les hémorroïdes d'Akarlikarlikar
+- La validation des jets d'encaissement par le Gardien fonctionne de nouveau
+
+## 11.2.18 - Le bourrichon d'Akarlikarlikar
+- Les différentes listes de la feuille de personnage ont maintenant le bouton pour envoyer dans le tchat
+
+## 11.2.17 - Le cache-oeil d'Akarlikarlikar
+- Le titre des fenêtre d'objet affiche de nouveau le type traduit
+- Les tooltips des boutons edit/delete sont maintenant en Français
+- La case à cocher "Cacher les points de tâches" fonctionne de nouveau
+- Les personnages non-liés ne sont plus dans les liste de personnages joueurs pour le repos, le stress, la fatigue
+- L'utilisation de Thanatos est visible dans l'onglet Haut-Rêve pour indiquer que la prochaine queue est une ombre
+- La fenêtre des TMRs ne devrait plus afficher une zone noire au lieu de la carte.
+
+## 11.2.16 - Le Tri d'Akarlikarlikar
+- Tri alphabétique des items dans la fenêtre de création
+- Mise à jour comptage de monde
+
+## 11.2.15 - La Table d'Akarlikarlikar
+- Tirage automatique de la foce d'une rencontre (via la commande /tmrr)
+- Ajout de boutons pour ajouter des blessures "complètes" (ie avec perte d'endurance/vie)
+
+## 11.2.14 - Les petits pas d'Akarlikarlikar
+- Correction sur la gestion de la surprise
+- Ordre des messages sur les cases humides
+
+## 11.2.13 - Les cent pas d'Akarlikarlikar
+- Ajout de la commande /voyage pour gérer la fatigue de marche des voyageurs
+
 ## 11.2.12 - Le somnifère  d'Akarlikarlikar
 - Fix: les potions enchantées n'empêchent plus de finir correctement Château Dormant
 

icons/heures/.directory

@@ -0,0 +1,4 @@
+[Dolphin]
+Timestamp=2024,5,29,20,57,41.954
+Version=4
+VisibleRoles=Details_text,Details_size,Details_modificationtime,Details_creationtime,CustomizedDetails

lang/fr.json

@@ -1,55 +1,56 @@
 {
   "TYPES": {
     "Actor": { 
-      "Personnage": "Personnage",
+      "personnage": "Personnage",
-      "Creature": "Créature",
+      "creature": "Créature",
-      "Entite": "Entité de cauchemar",
+      "entite": "Entité de cauchemar",
-      "Commerce": "Commerce",
+      "commerce": "Commerce",
-      "Vehicule": "Véhicule"
+      "vehicule": "Véhicule"
     },
     "Item": {
-      "Arme": "Arme",
+      "arme": "Arme",
-      "Armure": "Armure",
+      "armure": "Armure",
-      "Blessure": "Blessure",
+      "blessure": "Blessure",
-      "Casetmr": "TMR spéciale",
+      "casetmr": "Case TMR spéciale",
-      "Chant": "Chant",
+      "chant": "Chant",
-      "Competence": "Compétence",
+      "competence": "Compétence",
-      "Competencecreature": "Compétence de créature",
+      "competencecreature": "Compétence de créature",
-      "Conteneur": "Conteneur",
+      "conteneur": "Conteneur",
-      "Danse": "Danse",
+      "danse": "Danse",
-      "Extraitpoetique": "Extrait poetique",
+      "empoignade": "Empoignade",
-      "Faune": "Faune",
+      "extraitpoetique": "Extrait poetique",
-      "Gemme": "Gemme",
+      "faune": "Faune",
-      "Herbe": "Herbe",
+      "gemme": "Gemme",
-      "Ingredient": "Ingrédient",
+      "herbe": "Herbe",
-      "Jeu": "Jeu",
+      "ingredient": "Ingrédient",
-      "Livre": "Livre",
+      "jeu": "Jeu",
-      "Maladie": "Maladie",
+      "livre": "Livre",
-      "Meditation": "Méditation",
+      "maladie": "Maladie",
-      "Monnaie": "Monnaie",
+      "meditation": "Méditation",
-      "Munition": "Munition",
+      "monnaie": "Monnaie",
-      "Musique": "Musique",
+      "munition": "Munition",
-      "Nombreastral": "Nombre astral",
+      "musique": "Musique",
-      "Nourritureboisson": "Nourriture & boisson",
+      "nombreastral": "Nombre astral",
-      "Objet": "Objet",
+      "nourritureboisson": "Nourriture & boisson",
-      "Oeuvre": "Oeuvre",
+      "objet": "Objet",
-      "Ombre": "Ombre de Thanatos",
+      "oeuvre": "Oeuvre",
-      "Plante": "Plante",
+      "ombre": "Ombre de Thanatos",
-      "Poison": "Poison",
+      "plante": "Plante",
-      "Possession": "Possession",
+      "poison": "Poison",
-      "Potion": "Potion",
+      "possession": "Possession",
-      "Queue": "Queue de Dragon",
+      "potion": "Potion",
-      "Recettealchimique": "Recette alchimique",
+      "queue": "Queue de Dragon",
-      "Recettecuisine": "Recette de cuisine",
+      "recettealchimique": "Recette alchimique",
-      "Rencontre": "Rencontre TMR",
+      "recettecuisine": "Recette de cuisine",
-      "Service": "Service",
+      "rencontre": "Rencontre TMR",
-      "Signedraconique": "Signe draconique",
+      "service": "Service",
-      "Sort": "Sort",
+      "signedraconique": "Signe draconique",
-      "Sortreserve": "Sort en réserve",
+      "sort": "Sort",
-      "Souffle": "Souffle de Dragon",
+      "sortreserve": "Sort en réserve",
-      "Tache": "Tâche",
+      "souffle": "Souffle de Dragon",
-      "Tarot": "Carte de tarot",
+      "tache": "Tâche",
-      "Tete": "Tête de Dragon"
+      "tarot": "Carte de tarot",
+      "tete": "Tête de Dragon"
     }
   },
   "EFFECT": {

module/achat-vente/chat-vente.js

@@ -0,0 +1,65 @@
+import { SYSTEM_RDD } from "../constants.js";
+import { RdDUtility } from "../rdd-utility.js";
+
+const DETAIL_VENTE = 'detailVente';
+const NB_LOTS = 'nbLotss';
+
+export class ChatVente {
+
+  static getDetailVente(chatMessageId) {
+    const chatMessage = game.messages.get(chatMessageId)
+    if (!chatMessage) {
+      return undefined;
+    }
+    const nbLots = chatMessage.getFlag(SYSTEM_RDD, NB_LOTS)
+    const detail = foundry.utils.duplicate(chatMessage.getFlag(SYSTEM_RDD, DETAIL_VENTE))
+    if (!detail.item) {
+      ui.notifications.warn("Impossible d'acheter: informations sur l'objet manquantes")
+      return undefined;
+    }
+
+    const vendeur = detail.vendeurId ? game.actors.get(detail.vendeurId) : undefined;
+    return foundry.utils.mergeObject(detail,
+      {
+        alias: vendeur?.name ?? game.user.name,
+        vendeur,
+        nbLots: nbLots,
+        chatMessageIdVente: chatMessageId
+      })
+  }
+
+  static getDetailAchatVente(chatMessageId) {
+    const acheteur = RdDUtility.getSelectedActor()
+    const detail = ChatVente.getDetailVente(chatMessageId)
+    if (!acheteur && !detail.vendeur) {
+      ui.notifications.info("Pas d'acheteur ni de vendeur, aucun changement");
+      return undefined;
+    }
+    return foundry.utils.mergeObject(detail, { acheteur })
+  }
+
+  static async diminuerQuantiteAchatVente(chatMessageId, quantite) {
+    const chatMessage = game.messages.get(chatMessageId)
+    const vente = ChatVente.getDetailVente(chatMessageId)
+    vente.nbLots = Math.max(0, vente.nbLots - quantite)
+    await chatMessage.setFlag(SYSTEM_RDD, NB_LOTS, vente.nbLots)
+
+    const html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-vente-item.html', vente);
+    chatMessage.update({ content: html });
+    chatMessage.render(true);
+  }
+
+  static async displayAchatVente(vente) {
+    const html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-vente-item.html', vente);
+    const chatMessage = await ChatMessage.create(RdDUtility.chatDataSetup(html))
+    await chatMessage.setFlag(SYSTEM_RDD, NB_LOTS, vente.nbLots)
+    await chatMessage.setFlag(SYSTEM_RDD, DETAIL_VENTE, {
+      item: vente.item,
+      properties: vente.item.getProprietes(),
+      vendeurId: vente.vendeurId,
+      tailleLot: vente.tailleLot,
+      quantiteIllimite: vente.quantiteIllimite,
+      prixLot: vente.prixLot
+    })
+  }
+}

module/achat-vente/dialog-item-achat.js

@@ -1,35 +1,13 @@
-import { Misc } from "./misc.js";
+import { Misc } from "../misc.js";
-import { RdDUtility } from "./rdd-utility.js";
+import { RdDUtility } from "../rdd-utility.js";
+import { ChatVente } from "./chat-vente.js";
 
 export class DialogItemAchat extends Dialog {
 
   static preparerAchat(chatButton) {
-    const vendeurId = chatButton.attributes['data-vendeurId']?.value;
+    return ChatVente.getDetailAchatVente(RdDUtility.findChatMessageId(chatButton))
-    const vendeur = vendeurId ? game.actors.get(vendeurId) : undefined;
-    const acheteur = RdDUtility.getSelectedActor();
-    const json = chatButton.attributes['data-jsondata']?.value;
-    if (!acheteur && !vendeur) {
-      ui.notifications.info("Pas d'acheteur ni de vendeur, aucun changement");
-      return undefined;
-    }
-    if (!json) {
-      ui.notifications.warn("Impossible d'acheter: informations sur l'objet manquantes")
-      return undefined;
-    }
-
-    return {
-      item: JSON.parse(json),
-      vendeur,
-      acheteur,
-      nbLots: parseInt(chatButton.attributes['data-quantiteNbLots']?.value),
-      tailleLot: parseInt(chatButton.attributes['data-tailleLot']?.value ?? 1),
-      prixLot: Number(chatButton.attributes['data-prixLot']?.value ?? 0),
-      quantiteIllimite: chatButton.attributes['data-quantiteIllimite']?.value == 'true',
-      chatMessageIdVente: RdDUtility.findChatMessageId(chatButton),
-    };
   }
 
-
   static async onAcheter({ item, vendeur, acheteur, tailleLot, prixLot, nbLots, quantiteIllimite, chatMessageIdVente }) {
     const venteData = {
       item,
@@ -38,17 +16,21 @@ export class DialogItemAchat extends Dialog {
       acheteur,
       tailleLot,
       quantiteIllimite,
-      quantiteNbLots: nbLots,
+      nbLots,
       choix: { seForcer: false, supprimerSiZero: true },
       prixLot,
       isVente: prixLot > 0,
       isConsommable: item.type == 'nourritureboisson' && acheteur?.isPersonnage(),
       chatMessageIdVente
-    };
+    }
+    if (venteData.vendeur?.id == venteData.acheteur?.id) {
+      ui.notifications.info("Inutile de se vendre à soi-même")
+      return
+    }
 
-    DialogItemAchat.changeNombreLots(venteData, 1);
+    DialogItemAchat.changeNombreLots(venteData, 1)
-    const html = await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/dialog-item-achat.html`, venteData);
+    const html = await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/dialog-item-achat.html`, venteData)
-    new DialogItemAchat(html, venteData).render(true);
+    new DialogItemAchat(html, venteData).render(true)
   }
 
   static changeNombreLots(venteData, nombreLots) {
@@ -116,18 +98,18 @@ export class DialogItemAchat extends Dialog {
     this.venteData.choix.seForcer = event.currentTarget.checked;
   }
 
-  setNombreLots(nombreLots) {
+  setNombreLots(nbLots) {
 
     if (!this.venteData.quantiteIllimite) {
-      if (!this.venteData.quantiteIllimite && nombreLots > this.venteData.quantiteNbLots) {
+      if (!this.venteData.quantiteIllimite && nbLots > this.venteData.nbLots) {
-        ui.notifications.warn(`Seulement ${this.venteData.quantiteNbLots} lots disponibles, vous ne pouvez pas en prendre ${nombreLots}`)
+        ui.notifications.warn(`Seulement ${this.venteData.nbLots} lots disponibles, vous ne pouvez pas en prendre ${nbLots}`)
       }
-      nombreLots = Math.min(nombreLots, this.venteData.quantiteNbLots);
+      nbLots = Math.min(nbLots, this.venteData.nbLots);
     }
 
-    DialogItemAchat.changeNombreLots(this.venteData, nombreLots);
+    DialogItemAchat.changeNombreLots(this.venteData, nbLots);
 
-    this.html.find(".nombreLots").val(nombreLots);
+    this.html.find(".nombreLots").val(nbLots);
     this.html.find(".prixTotal").text(this.venteData.prixTotal);
     this.html.find("span.total-sust").text(this.venteData.totalSust);
     this.html.find("span.total-desaltere").text(this.venteData.totalDesaltere);

module/achat-vente/dialog-item-vente.js

@@ -1,29 +1,30 @@
-import { HtmlUtility } from "./html-utility.js";
+import { HtmlUtility } from "../html-utility.js";
+import { RdDUtility } from "../rdd-utility.js";
+import { ChatVente } from "./chat-vente.js";
 
 export class DialogItemVente extends Dialog {
 
-  static async display({ item, callback, quantiteMax = undefined }) {
+  static async display({ item, quantiteMax = undefined }) {
     const quantite = quantiteMax ?? item.getQuantite() ?? 1;
-    const isOwned = item.parent;
     const venteData = {
       item: item,
       alias: item.actor?.name ?? game.user.name,
-      vendeurId: item.actor?.id,
+      vendeurId: item.actor.id,
       prixOrigine: item.calculerPrixCommercant(),
       prixUnitaire: item.calculerPrixCommercant(),
       prixLot: item.calculerPrixCommercant(),
       tailleLot: 1,
-      quantiteNbLots: quantite,
+      nbLots: quantite,
-      quantiteMaxLots: quantite,
+      maxLots: quantite,
       quantiteMax: quantite,
-      quantiteIllimite: item.isItemCommerce() ? quantiteMax == undefined : !isOwned,
+      quantiteIllimite: item.isItemCommerce() ? quantiteMax == undefined : !item.parent,
-      isOwned: isOwned,
+      isOwned:  item.parent,
-    };
+    }
     const html = await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/dialog-item-vente.html`, venteData);
-    return new DialogItemVente(venteData, html, callback).render(true);
+    return new DialogItemVente(venteData, html).render(true);
   }
 
-  constructor(venteData, html, callback) {
+  constructor(venteData, html) {
     let options = { classes: ["dialogvente"], width: 400, height: 'fit-content', 'z-index': 99999 };
 
     let conf = {
@@ -34,7 +35,6 @@ export class DialogItemVente extends Dialog {
     };
 
     super(conf, options);
-    this.callback = callback;
     this.venteData = venteData;
   }
 
@@ -43,7 +43,7 @@ export class DialogItemVente extends Dialog {
 
     this.html = html;
     this.html.find(".tailleLot").change(event => this.setTailleLot(Number(event.currentTarget.value)));
-    this.html.find(".quantiteNbLots").change(event => this.setNbLots(Number(event.currentTarget.value)));
+    this.html.find(".nbLots").change(event => this.setNbLots(Number(event.currentTarget.value)));
     this.html.find(".quantiteIllimite").change(event => this.setQuantiteIllimite(event.currentTarget.checked));
     this.html.find(".prixLot").change(event => this.setPrixLot(Number(event.currentTarget.value)));
 
@@ -52,16 +52,24 @@ export class DialogItemVente extends Dialog {
 
   async onProposer(it) {
     this.updateVente(this.getChoixVente());
-    this.callback(this.venteData);
+
+    this.venteData["properties"] = this.venteData.item.getProprietes();
+    if (this.venteData.isOwned) {
+      if (this.venteData.nbLots * this.venteData.tailleLot > this.venteData.quantiteMax) {
+        ui.notifications.warn(`Vous avez ${this.venteData.quantiteMax} ${this.venteData.item.name}, ce n'est pas suffisant pour vendre ${this.venteData.nbLots} de ${this.venteData.tailleLot}`)
+        return;
+      }
+    }
+    await ChatVente.displayAchatVente(this.venteData)
   }
 
   updateVente(update) {
-    mergeObject(this.venteData, update);
+    foundry.utils.mergeObject(this.venteData, update);
   }
 
   getChoixVente() {
     return {
-      quantiteNbLots: Number(this.html.find(".quantiteNbLots").val()),
+      nbLots: Number(this.html.find(".nbLots").val()),
       tailleLot: Number(this.html.find(".tailleLot").val()),
       quantiteIllimite: this.html.find(".quantiteIllimite").is(':checked'),
       prixLot: Number(this.html.find(".prixLot").val())
@@ -77,26 +85,26 @@ export class DialogItemVente extends Dialog {
     const maxLots = Math.floor(this.venteData.quantiteMax / tailleLot);
     this.updateVente({
       tailleLot,
-      quantiteNbLots: Math.min(maxLots, this.venteData.quantiteNbLots),
+      nbLots: Math.min(maxLots, this.venteData.nbLots),
-      quantiteMaxLots: maxLots,
+      maxLots: maxLots,
       prixLot: (tailleLot * this.venteData.prixOrigine).toFixed(2)
     });
 
     this.html.find(".prixLot").val(this.venteData.prixLot);
-    this.html.find(".quantiteNbLots").val(this.venteData.quantiteNbLots);
+    this.html.find(".nbLots").val(this.venteData.nbLots);
-    this.html.find(".quantiteNbLots").attr("max", this.venteData.quantiteMaxLots)
+    this.html.find(".nbLots").attr("max", this.venteData.maxLots)
   }
 
   setNbLots(nbLots) {
     this.updateVente({
-      quantiteNbLots: this.venteData.isOwned ? Math.max(0, Math.min(nbLots, this.venteData.quantiteMaxLots)) : nbLots
+      nbLots: this.venteData.isOwned ? Math.max(0, Math.min(nbLots, this.venteData.maxLots)) : nbLots
     })
-    this.html.find(".quantiteNbLots").val(this.venteData.quantiteNbLots);
+    this.html.find(".nbLots").val(this.venteData.nbLots);
   }
 
   setQuantiteIllimite(checked) {
     this.updateVente({ quantiteIllimite: checked })
     this.html.find(".label-quantiteIllimite").text(this.venteData.quantiteIllimite ? "Illimités" : "disponibles");
-    HtmlUtility.showControlWhen(this.html.find(".quantiteNbLots"), !this.venteData.quantiteIllimite)
+    HtmlUtility.showControlWhen(this.html.find(".nbLots"), !this.venteData.quantiteIllimite)
   }
 }

module/actor-sheet.js

@@ -16,7 +16,6 @@ import { RdDItem } from "./item.js";
 import { RdDItemBlessure } from "./item/blessure.js";
 import { RdDEmpoignade } from "./rdd-empoignade.js";
 import { RdDBaseActorSangSheet } from "./actor/base-actor-sang-sheet.js";
-import { ChatUtility } from "./chat-utility.js";
 import { RdDCoeur } from "./coeur/rdd-coeur.js";
 
 /* -------------------------------------------- */
@@ -28,28 +27,26 @@ export class RdDActorSheet extends RdDBaseActorSangSheet {
 
   /** @override */
   static get defaultOptions() {
-    return mergeObject(RdDBaseActorReveSheet.defaultOptions, {
+    return foundry.utils.mergeObject(RdDBaseActorReveSheet.defaultOptions, {
       template: "systems/foundryvtt-reve-de-dragon/templates/actor-sheet.html",
       width: 550,
       showCompNiveauBase: false,
       vueArchetype: false,
-    });
+    }, { inplace: false });
   }
 
   /* -------------------------------------------- */
   async getData() {
     let formData = await super.getData();
-    mergeObject(formData,
+    foundry.utils.mergeObject(formData, {
-      {
+      editable: this.isEditable,
-        editable: this.isEditable,
+      cssClass: this.isEditable ? "editable" : "locked",
-        cssClass: this.isEditable ? "editable" : "locked",
+      limited: this.actor.limited,
-        effects: this.actor.effects.map(e => foundry.utils.deepClone(e)),
+      owner: this.actor.isOwner,
-        limited: this.actor.limited,
+      biographie: await TextEditor.enrichHTML(this.actor.system.biographie, { async: true }),
-        owner: this.actor.isOwner,
+      notes: await TextEditor.enrichHTML(this.actor.system.notes, { async: true }),
-        biographie: await TextEditor.enrichHTML(this.actor.system.biographie, { async: true }),
+    });
-        notes: await TextEditor.enrichHTML(this.actor.system.notes, { async: true }),
+    foundry.utils.mergeObject(formData.calc, {
-      });
-    mergeObject(formData.calc, {
       surenc: this.actor.computeMalusSurEncombrement(),
       surprise: RdDBonus.find(this.actor.getSurprise(false)).descr,
       resumeBlessures: this.actor.computeResumeBlessure(this.actor.system.blessures),
@@ -80,7 +77,7 @@ export class RdDActorSheet extends RdDBaseActorSangSheet {
 
       // toujours avoir une liste d'armes (pour mettre esquive et corps à corps)
       const actor = this.actor;
-      formData.combat = duplicate(formData.armes);
+      formData.combat = foundry.utils.duplicate(formData.armes);
       RdDItemArme.computeNiveauArmes(formData.combat, formData.competences);
       formData.combat.push(RdDItemArme.mainsNues(actor));
       formData.combat.push(RdDItemArme.empoignade(actor));
@@ -213,7 +210,7 @@ export class RdDActorSheet extends RdDBaseActorSangSheet {
         const key = Number(li.data("key") ?? -1);
         await this.actor.deleteExperienceLog(0, key + 1);
       });
-        // Boutons spéciaux MJs
+      // Boutons spéciaux MJs
       this.html.find('.forcer-tmr-aleatoire').click(async event => this.actor.reinsertionAleatoire("Action MJ"))
       this.html.find('.afficher-tmr').click(async event => this.actor.changeTMRVisible())
     }
@@ -221,7 +218,7 @@ export class RdDActorSheet extends RdDBaseActorSangSheet {
     // Points de reve actuel
     this.html.find('.ptreve-actuel a').click(async event => this.actor.rollCarac('reve-actuel', true))
     this.html.find('.empoignade-label a').click(async event => RdDEmpoignade.onAttaqueEmpoignadeFromItem(RdDSheetUtility.getItem(event, this.actor)))
-    this.html.find('.arme-label a').click(async event => this.actor.rollArme(duplicate(this._getEventArmeCombat(event))))
+    this.html.find('.arme-label a').click(async event => this.actor.rollArme(foundry.utils.duplicate(this._getEventArmeCombat(event))))
 
     // Initiative pour l'arme
     this.html.find('.arme-initiative a').click(async event => {
@@ -388,7 +385,7 @@ export class RdDActorSheet extends RdDBaseActorSangSheet {
   async _onSplitItem(item, split) {
     if (split >= 1 && split < item.system.quantite) {
       await item.diminuerQuantite(split);
-      const splitItem = duplicate(item);
+      const splitItem = foundry.utils.duplicate(item);
       splitItem.system.quantite = split;
       await this.actor.createEmbeddedDocuments('Item', [splitItem])
     }

module/actor.js

@@ -32,7 +32,7 @@ import { RdDItemBlessure } from "./item/blessure.js";
 import { AppAstrologie } from "./sommeil/app-astrologie.js";
 import { RdDEmpoignade } from "./rdd-empoignade.js";
 import { ExperienceLog, XP_TOPIC } from "./actor/experience-log.js";
-import { TYPES } from "./item.js";
+import { ITEM_TYPES } from "./item.js";
 import { RdDBaseActorSang } from "./actor/base-actor-sang.js";
 import { RdDCoeur } from "./coeur/rdd-coeur.js";
 import { DialogChoixXpCarac } from "./dialog-choix-xp-carac.js";
@@ -92,38 +92,40 @@ export class RdDActor extends RdDBaseActorSang {
 
   /* -------------------------------------------- */
   canReceive(item) {
-    return ![TYPES.competencecreature, TYPES.tarot, TYPES.service].includes(item.type)
+    return ![ITEM_TYPES.competencecreature, ITEM_TYPES.tarot, ITEM_TYPES.service].includes(item.type)
+  }
+
+  isPersonnageJoueur() {
+    return this.hasPlayerOwner && this.prototypeToken.actorLink
   }
 
   isPersonnage() { return true }
   isHautRevant() { return this.system.attributs.hautrevant.value != "" }
 
   /* -------------------------------------------- */
-  getAgilite() { return Number(this.system.carac.agilite?.value ?? 0) }
+  getAgilite() { return this.system.carac.agilite?.value ?? 0 }
-  getChance() { return Number(this.system.carac.chance?.value ?? 0) }
+  getChance() { return this.system.carac.chance?.value ?? 0 }
 
-  getReveActuel() { return Misc.toInt(this.system.reve?.reve?.value ?? this.carac.reve.value) }
+  getReveActuel() { return this.system.reve?.reve?.value ?? this.carac.reve.value ?? 0 }
-  getChanceActuel() { return Misc.toInt(this.system.compteurs.chance?.value ?? 10) }
+  getChanceActuel() { return this.system.compteurs.chance?.value ?? 10 }
-  getMoralTotal() { return Number(this.system.compteurs.moral?.value ?? 0) }
+  getMoralTotal() { return this.system.compteurs.moral?.value ?? 0 }
 
   /* -------------------------------------------- */
   getEtatGeneral(options = { ethylisme: false }) {
-    const etatGeneral = Misc.toInt(this.system.compteurs.etat?.value)
+    const etatGeneral = this.system.compteurs.etat?.value ?? 0
-    if (options.ethylisme) {
+    // Pour les jets d'Ethylisme, on retire le malus d'éthylisme (p.162)
-      // Pour les jets d'Ethylisme, on retire le malus d'éthylisme (p.162)
+    const annuleMalusEthylisme = options.ethylisme ? this.malusEthylisme() : 0
-      return etatGeneral - this.malusEthylisme()
+    return etatGeneral - annuleMalusEthylisme
-    }
-    return etatGeneral
   }
 
   /* -------------------------------------------- */
   getActivePoisons() {
-    return duplicate(this.items.filter(item => item.type == 'poison' && item.system.active))
+    return foundry.utils.duplicate(this.items.filter(item => item.type == 'poison' && item.system.active))
   }
 
   /* -------------------------------------------- */
   getMalusArmure() {
-    return this.itemTypes[TYPES.armure].filter(it => it.system.equipe)
+    return this.itemTypes[ITEM_TYPES.armure].filter(it => it.system.equipe)
       .map(it => it.system.malus)
       .reduce(Misc.sum(), 0);
   }
@@ -140,8 +142,8 @@ export class RdDActor extends RdDBaseActorSang {
 
   /* -------------------------------------------- */
   getDemiReve() { return this.system.reve.tmrpos.coord }
-  getDraconicList() { return this.itemTypes[TYPES.competence].filter(it => it.system.categorie == 'draconic') }
+  getDraconicList() { return this.itemTypes[ITEM_TYPES.competence].filter(it => it.system.categorie == 'draconic') }
-  getBestDraconic() { return duplicate(this.getDraconicList().sort(Misc.descending(it => it.system.niveau)).find(it => true)) }
+  getBestDraconic() { return foundry.utils.duplicate(this.getDraconicList().sort(Misc.descending(it => it.system.niveau)).find(it => true)) }
   getDraconicOuPossession() {
     return [...this.getDraconicList().filter(it => it.system.niveau >= 0),
     super.getDraconicOuPossession()]
@@ -151,7 +153,7 @@ export class RdDActor extends RdDBaseActorSang {
 
   /* -------------------------------------------- */
   async $perteRevePotionsEnchantees() {
-    let potions = this.itemTypes[TYPES.potion]
+    let potions = this.itemTypes[ITEM_TYPES.potion]
       .filter(it => Grammar.includesLowerCaseNoAccent(it.system.categorie, 'enchanté') && !it.system.prpermanent)
 
     const potionUpdates = await Promise.all(potions.map(async it => {
@@ -343,9 +345,9 @@ export class RdDActor extends RdDBaseActorSang {
   /* -------------------------------------------- */
   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))
+    const blessures = this.filterItems(it => it.system.gravite > 0, ITEM_TYPES.blessure).sort(Misc.ascending(it => it.system.gravite))
 
-    await Promise.all(blessures.map(b => b.recuperationBlessure({
+    await Promise.all(blessures.map(async b => b.recuperationBlessure({
       actor: this,
       timestamp,
       message,
@@ -359,7 +361,7 @@ export class RdDActor extends RdDBaseActorSang {
   /* -------------------------------------------- */
   async _recupererVie(message, isMaladeEmpoisonne) {
     const tData = this.system
-    let blessures = this.filterItems(it => it.system.gravite > 0, TYPES.blessure);
+    let blessures = this.filterItems(it => it.system.gravite > 0, ITEM_TYPES.blessure);
     if (blessures.length > 0) {
       return
     }
@@ -427,7 +429,7 @@ export class RdDActor extends RdDBaseActorSang {
       let jetsReve = [];
       let dormi = await this.dormirDesHeures(jetsReve, message, heures, options);
       if (jetsReve.length > 0) {
-        message.content += `Vous récupérez ${jetsReve.map(it => it < 0 ? '(dragon)' : it).reduce(Misc.joining("+"))} Points de rêve. `;
+        message.content += `Vous récupérez ${jetsReve.map(it => it < 0 ? '0 (réveil)' : it).reduce(Misc.joining("+"))} Points de rêve. `;
       }
       if (dormi.etat == 'eveil') {
         await this.reveilReveDeDragon(message, dormi.heures);
@@ -448,7 +450,6 @@ export class RdDActor extends RdDBaseActorSang {
   }
 
   async reveilReveDeDragon(message, heures) {
-    message.content += 'Vous êtes réveillé par un Rêve de Dragon.';
     const restant = Math.max(this.system.sommeil?.heures - heures, 0)
     if (restant > 0) {
       await this.update({ 'system.sommeil': { heures: restant } });
@@ -635,7 +636,7 @@ export class RdDActor extends RdDBaseActorSang {
   /* -------------------------------------------- */
   async sortMisEnReserve(sort, draconic, coord, ptreve) {
     await this.createEmbeddedDocuments("Item", [{
-      type: TYPES.sortreserve,
+      type: ITEM_TYPES.sortreserve,
       name: sort.name,
       img: sort.img,
       system: { sortid: sort._id, draconic: (draconic?.name ?? sort.system.draconic), ptreve: ptreve, coord: coord, heurecible: 'Vaisseau' }
@@ -689,7 +690,7 @@ export class RdDActor extends RdDBaseActorSang {
     }
     let carac = this.findCaracByName(caracName);
     if (carac) {
-      carac = duplicate(carac);
+      carac = foundry.utils.duplicate(carac);
       const fromXp = Number(carac.xp);
       const fromValue = Number(carac.value);
       let toXp = fromXp;
@@ -825,7 +826,7 @@ export class RdDActor extends RdDBaseActorSang {
 
   async deleteExperienceLog(from, count) {
     if (from >= 0 && count > 0) {
-      let expLog = duplicate(this.system.experiencelog);
+      let expLog = foundry.utils.duplicate(this.system.experiencelog);
       expLog.splice(from, count);
       await this.update({ [`system.experiencelog`]: expLog });
     }
@@ -901,7 +902,7 @@ export class RdDActor extends RdDBaseActorSang {
   async ajouterRefoulement(value = 1, refouler) {
     let refoulement = this.system.reve.refoulement.value + value;
     const roll = new Roll("1d20");
-    await roll.evaluate({ async: true });
+    await roll.evaluate();
     await roll.toMessage({ flavor: `${this.name} refoule ${refouler} pour ${value} points de refoulement (total: ${refoulement})` });
     if (roll.total <= refoulement) {
       refoulement = 0;
@@ -990,25 +991,31 @@ export class RdDActor extends RdDBaseActorSang {
 
   /* -------------------------------------------- */
   buildTMRInnaccessible() {
-    const tmrInnaccessibles = this.filterItems(it => Draconique.isCaseTMR(it) &&
+    return this.items.filter(it => it.type == ITEM_TYPES.casetmr).filter(it => EffetsDraconiques.isInnaccessible(it)).map(it => it.system.coord)
-      EffetsDraconiques.isInnaccessible(it));
-    return tmrInnaccessibles.map(it => it.system.coord);
   }
 
   /* -------------------------------------------- */
-  getTMRRencontres() {
+  getRencontresTMR() {
-    return this.itemTypes['rencontre'];
+    return this.itemTypes[ITEM_TYPES.rencontre];
   }
 
   /* -------------------------------------------- */
-  async deleteTMRRencontreAtPosition() {
+  async deleteRencontreTMRAtPosition() {
-    const demiReve = this.getDemiReve()
+    const rencontreIds = this.itemTypes[ITEM_TYPES.rencontre].filter(this.filterRencontreTMRDemiReve()).map(it => it.id)
-    let rencontreIds = this.items.filter(it => it.type == 'rencontre' && it.system.coord == demiReve).map(it => it.id);
     if (rencontreIds.length > 0) {
-      await this.deleteEmbeddedDocuments('Item', rencontreIds);
+      await this.deleteEmbeddedDocuments('Item', rencontreIds)
     }
   }
 
+  getRencontreTMREnAttente() {
+    return this.itemTypes[ITEM_TYPES.rencontre].find(this.filterRencontreTMRDemiReve())
+  }
+
+  filterRencontreTMRDemiReve() {
+    const position = this.getDemiReve()
+    return it => it.system.coord == position
+  }
+
   /* -------------------------------------------- */
   async addTMRRencontre(currentRencontre) {
     const toCreate = currentRencontre.toObject();
@@ -1139,7 +1146,7 @@ export class RdDActor extends RdDBaseActorSang {
       diffNbDoses: -Number(this.system.compteurs.ethylisme.nb_doses || 0),
       finalLevel: 0,
       diffConditions: 0,
-      ajustementsForce: CONFIG.RDD.difficultesLibres,
+      ajustementsForce: CONFIG.RDD.difficultesLibres
     }
     let html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/dialog-roll-ethylisme.html', rollData);
     new RdDRollDialogEthylisme(html, rollData, this, r => this.saouler(r.forceAlcool)).render(true);
@@ -1153,11 +1160,11 @@ export class RdDActor extends RdDBaseActorSang {
     if (result) { return result }
 
     switch (item.type) {
-      case TYPES.potion: return await this.consommerPotion(item, onActionItem);
+      case ITEM_TYPES.potion: return await this.consommerPotion(item, onActionItem);
-      case TYPES.livre: return await this.actionLire(item);
+      case ITEM_TYPES.livre: return await this.actionLire(item);
-      case TYPES.conteneur: return await item.sheet.render(true);
+      case ITEM_TYPES.conteneur: return await item.sheet.render(true);
-      case TYPES.herbe: return await this.actionHerbe(item, onActionItem);
+      case ITEM_TYPES.herbe: return await this.actionHerbe(item, onActionItem);
-      case TYPES.queue: case TYPES.ombre: return await this.actionRefoulement(item);
+      case ITEM_TYPES.queue: case ITEM_TYPES.ombre: return await this.actionRefoulement(item);
     }
     return undefined
   }
@@ -1310,7 +1317,7 @@ export class RdDActor extends RdDBaseActorSang {
 
   /* -------------------------------------------- */
   async saouler(forceAlcool, alcool = undefined) {
-    let ethylisme = duplicate(this.system.compteurs.ethylisme);
+    let ethylisme = foundry.utils.duplicate(this.system.compteurs.ethylisme);
 
     const etat = this.getEtatGeneral({ ethylisme: true });
     const nbDoses = Number(this.system.compteurs.ethylisme.nb_doses || 0);
@@ -1331,7 +1338,7 @@ export class RdDActor extends RdDBaseActorSang {
     }
 
     await RdDResolutionTable.rollData(ethylismeData.jetVie);
-    this._appliquerExperienceRollData(ethylismeData.jetVie);
+    this._gererExperience(ethylismeData.jetVie);
     RollDataAjustements.calcul(ethylismeData.jetVie, this);
     if (ethylismeData.jetVie.rolled.isSuccess) {
       ethylisme.nb_doses++;
@@ -1363,7 +1370,7 @@ export class RdDActor extends RdDBaseActorSang {
           finalLevel: Number(ethylisme.value) + Number(this.system.compteurs.moral.value)
         }
         await RdDResolutionTable.rollData(ethylismeData.jetVolonte);
-        this._appliquerExperienceRollData(ethylismeData.jetVolonte);
+        this._gererExperience(ethylismeData.jetVolonte);
         RollDataAjustements.calcul(ethylismeData.jetVolonte, this);
       }
     }
@@ -1487,7 +1494,7 @@ export class RdDActor extends RdDBaseActorSang {
       const niveauSuivant = Number(carac.value) + 1;
       let xpNeeded = RdDCarac.getCaracNextXp(niveauSuivant);
       if (carac.xp >= xpNeeded) {
-        carac = duplicate(carac);
+        carac = foundry.utils.duplicate(carac);
         carac.value = niveauSuivant;
 
         let checkXp = {
@@ -1517,7 +1524,7 @@ export class RdDActor extends RdDBaseActorSang {
     if (compData && newXP > 0) {
       let xpNeeded = RdDItemCompetence.getCompetenceNextXp(compData.system.niveau + 1);
       if (newXP >= xpNeeded) {
-        let newCompData = duplicate(compData);
+        let newCompData = foundry.utils.duplicate(compData);
         newCompData.system.niveau += 1;
         newCompData.system.xp = newXP;
         let checkXp = {
@@ -1541,15 +1548,18 @@ export class RdDActor extends RdDBaseActorSang {
 
   /* -------------------------------------------- */
   async appliquerAjoutExperience(rollData, hideChatMessage = 'show') {
+    if (!Misc.firstConnectedGM()){
+      return
+    }
     hideChatMessage = hideChatMessage == 'hide' || (Misc.isRollModeHiddenToPlayer() && !game.user.isGM)
     let xpData = await this._appliquerExperience(rollData.rolled, rollData.selectedCarac.label, rollData.competence, rollData.jetResistance);
     if (xpData.length) {
       const content = await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-actor-gain-xp.html`, {
         actor: this,
         xpData
-      });
+      })
       if (hideChatMessage) {
-        ChatUtility.blindMessageToGM({ content: content });
+        ChatUtility.blindMessageToGM({ content: content })
       }
       else {
         ChatMessage.create({
@@ -1592,7 +1602,7 @@ export class RdDActor extends RdDBaseActorSang {
   computeDraconicAndSortIndex(sortList) {
     let draconicList = this.getDraconicList();
     for (let sort of sortList) {
-      let draconicsSort = this.getDraconicsSort(draconicList, sort).map(it => it.name);
+      let draconicsSort = RdDItemSort.getDraconicsSort(draconicList, sort).map(it => it.name);
       for (let index = 0; index < draconicList.length && sort.system.listIndex == undefined; index++) {
         if (draconicsSort.includes(draconicList[index].name)) {
           sort.system.listIndex = index;
@@ -1602,19 +1612,6 @@ export class RdDActor extends RdDBaseActorSang {
     return draconicList;
   }
 
-  /* -------------------------------------------- */
-  getDraconicsSort(draconicList, sort) {
-    //console.log(draconicList, bestDraconic, draconic, voie);
-    switch (Grammar.toLowerCaseNoAccent(sort.name)) {
-      case "lecture d'aura":
-      case "detection d'aura":
-        return draconicList;
-      case "annulation de magie":
-        return draconicList.filter(it => !RdDItemCompetence.isThanatos(it));
-    }
-    return [RdDItemCompetence.getVoieDraconic(draconicList, sort.system.draconic)];
-  }
-
   /* -------------------------------------------- */
   async rollUnSort(coord) {
     RdDEmpoignade.checkEmpoignadeEnCours(this)
@@ -1623,14 +1620,14 @@ export class RdDActor extends RdDBaseActorSang {
       return;
     }
     // Duplication car les pts de reve sont modifiés dans le sort
-    let sorts = duplicate(this.$filterSortList(this.itemTypes['sort'], coord));
+    let sorts = foundry.utils.duplicate(this.$filterSortList(this.itemTypes['sort'], coord));
     if (sorts.length == 0) {
       ui.notifications.info(`Aucun sort disponible en ${TMRUtility.getTMR(coord).label} !`);
       return;
     }
 
     const draconicList = this.computeDraconicAndSortIndex(sorts);
-    const reve = duplicate(this.system.carac.reve);
+    const reve = foundry.utils.duplicate(this.system.carac.reve);
 
     const dialog = await this.openRollDialog({
       name: 'lancer-un-sort',
@@ -1729,7 +1726,7 @@ export class RdDActor extends RdDBaseActorSang {
       else {
         rollData.depenseReve = 0;
         rollData.show.reveInsuffisant = true;
-        mergeObject(rollData.rolled, RdDResolutionTable.getResultat("echec"), { overwrite: true });
+        foundry.utils.mergeObject(rollData.rolled, RdDResolutionTable.getResultat("echec"), { overwrite: true });
       }
     } else {
       if (rolled.isETotal) { // Echec total !
@@ -1777,13 +1774,13 @@ export class RdDActor extends RdDBaseActorSang {
     };
     RollDataAjustements.calcul(rollData, this);
     await RdDResolutionTable.rollData(rollData);
-    this._appliquerExperienceRollData(rollData);
+    this._gererExperience(rollData);
     await RdDResolutionTable.displayRollData(rollData, this)
     return rollData.rolled;
   }
 
   /* -------------------------------------------- */
-  _appliquerExperienceRollData(rollData) {
+  _gererExperience(rollData) {
     const callback = this.createCallbackExperience();
     if (callback.condition(rollData)) {
       callback.action(rollData);
@@ -1816,7 +1813,7 @@ export class RdDActor extends RdDBaseActorSang {
   }
 
   blessuresASoigner() {
-    return (this.itemTypes[TYPES.blessure])
+    return (this.itemTypes[ITEM_TYPES.blessure])
       .filter(it => it.system.gravite > 0 && it.system.gravite <= 6)
       .filter(it => !(it.system.premierssoins.done && it.system.soinscomplets.done))
       .sort(Misc.descending(b => (b.system.premierssoins.done ? "A" : "B") + b.system.gravite))
@@ -1871,7 +1868,7 @@ export class RdDActor extends RdDBaseActorSang {
         diffConditions: 0,
         use: { libre: false, conditions: true },
         carac: {
-          [tacheData.system.carac]: duplicate(this.system.carac[tacheData.system.carac])
+          [tacheData.system.carac]: foundry.utils.duplicate(this.system.carac[tacheData.system.carac])
         }
       },
       callbackAction: r => this._tacheResult(r, options)
@@ -1882,7 +1879,7 @@ export class RdDActor extends RdDBaseActorSang {
   async _tacheResult(rollData, options) {
     // Mise à jour de la tache
     rollData.appliquerFatigue = ReglesOptionnelles.isUsing("appliquer-fatigue");
-    rollData.tache = duplicate(rollData.tache);
+    rollData.tache = foundry.utils.duplicate(rollData.tache);
     rollData.tache.system.points_de_tache_courant += rollData.rolled.ptTache;
     if (rollData.rolled.isETotal) {
       rollData.tache.system.difficulte--;
@@ -1906,21 +1903,21 @@ export class RdDActor extends RdDBaseActorSang {
   /* -------------------------------------------- */
   async _rollArt(artData, selected, oeuvre, callbackAction = r => this._resultArt(r)) {
     oeuvre.system.niveau = oeuvre.system.niveau ?? 0;
-    mergeObject(artData,
+    foundry.utils.mergeObject(artData,
       {
         oeuvre: oeuvre,
         art: oeuvre.type,
-        competence: duplicate(this.getCompetence(artData.compName ?? oeuvre.system.competence ?? artData.art)),
+        competence: foundry.utils.duplicate(this.getCompetence(artData.compName ?? oeuvre.system.competence ?? artData.art)),
         diffLibre: - oeuvre.system.niveau,
         diffConditions: 0,
         use: { libre: false, conditions: true, surenc: false },
-        selectedCarac: duplicate(this.system.carac[selected])
+        selectedCarac: foundry.utils.duplicate(this.system.carac[selected])
       },
       { overwrite: false });
     artData.competence.system.defaut_carac = selected;
     if (!artData.forceCarac) {
       artData.forceCarac = {};
-      artData.forceCarac[selected] = duplicate(this.system.carac[selected]);
+      artData.forceCarac[selected] = foundry.utils.duplicate(this.system.carac[selected]);
     }
 
     await this.openRollDialog({
@@ -1944,19 +1941,19 @@ export class RdDActor extends RdDBaseActorSang {
   /* -------------------------------------------- */
   async rollChant(id) {
     const artData = { art: 'chant', verbe: 'Chanter' };
-    const oeuvre = duplicate(this.getChant(id));
+    const oeuvre = foundry.utils.duplicate(this.getChant(id));
     await this._rollArt(artData, "ouie", oeuvre);
   }
 
   /* -------------------------------------------- */
   async rollDanse(id) {
     const artData = { art: 'danse', verbe: 'Danser', forceCarac: {} };
-    const oeuvre = duplicate(this.findItemLike(id, artData.art));
+    const oeuvre = foundry.utils.duplicate(this.findItemLike(id, artData.art));
     if (oeuvre.system.agilite) {
-      artData.forceCarac['agilite'] = duplicate(this.system.carac.agilite);
+      artData.forceCarac['agilite'] = foundry.utils.duplicate(this.system.carac.agilite);
     }
     if (oeuvre.system.apparence) {
-      artData.forceCarac['apparence'] = duplicate(this.system.carac.apparence);
+      artData.forceCarac['apparence'] = foundry.utils.duplicate(this.system.carac.apparence);
     }
     const selectedCarac = this._getCaracDanse(oeuvre);
     await this._rollArt(artData, selectedCarac, oeuvre);
@@ -2059,7 +2056,7 @@ export class RdDActor extends RdDBaseActorSang {
     const artData = {
       art: 'jeu', verbe: 'Jeu',
       use: { libre: true, conditions: true, },
-      competence: duplicate(this.getCompetence('jeu')),
+      competence: foundry.utils.duplicate(this.getCompetence('jeu')),
       forceCarac: {}
     };
     listCarac.forEach(c => artData.forceCarac[c] = this.system.carac[c]);
@@ -2070,14 +2067,14 @@ export class RdDActor extends RdDBaseActorSang {
 
   async rollOeuvre(id) {
     const artData = { art: 'oeuvre', verbe: 'Interpréter' }
-    const oeuvre = duplicate(this.findItemLike(id, artData.art))
+    const oeuvre = foundry.utils.duplicate(this.findItemLike(id, artData.art))
     await this._rollArt(artData, oeuvre.system.default_carac, oeuvre)
   }
 
   /* -------------------------------------------- */
   async rollMeditation(id) {
-    const meditation = duplicate(this.getMeditation(id));
+    const meditation = foundry.utils.duplicate(this.getMeditation(id));
-    const competence = duplicate(this.getCompetence(meditation.system.competence));
+    const competence = foundry.utils.duplicate(this.getCompetence(meditation.system.competence));
     competence.system.defaut_carac = "intellect"; // Meditation = toujours avec intellect
     let meditationData = {
       competence: competence,
@@ -2143,7 +2140,7 @@ export class RdDActor extends RdDBaseActorSang {
     }
     let draconicList = this.getDraconicList()
       .map(draconic => {
-        let draconicLecture = duplicate(draconic);
+        let draconicLecture = foundry.utils.duplicate(draconic);
         draconicLecture.system.defaut_carac = "intellect";
         return draconicLecture;
       });
@@ -2267,7 +2264,7 @@ export class RdDActor extends RdDBaseActorSang {
   async _appliquerExperience(rolled, caracName, competence, jetResistance) {
     // Pas d'XP
     if (!rolled.isPart || rolled.finalLevel >= 0) {
-      return undefined;
+      return []
     }
     if (this.checkDesirLancinant()) {
       // Cas de désir lancinant, pas d'expérience sur particulière
@@ -2275,7 +2272,7 @@ export class RdDActor extends RdDBaseActorSang {
         content: `Vous souffrez au moins d'un Désir Lancinant, vous ne pouvez pas gagner d'expérience sur une Particulière tant que le désir n'est pas assouvi`,
         whisper: ChatMessage.getWhisperRecipients(this.name)
       });
-      return undefined;
+      return []
     }
 
     let xp = Math.abs(rolled.finalLevel);
@@ -2312,7 +2309,7 @@ export class RdDActor extends RdDBaseActorSang {
   /* -------------------------------------------- */
   async _xpCarac(xpData) {
     if (xpData.xpCarac > 0) {
-      const carac = duplicate(this.system.carac)
+      const carac = foundry.utils.duplicate(this.system.carac)
       const code = RdDBaseActor._findCaracNode(carac, xpData.caracName)
       const selectedCarac = carac[code]
       if (this.isCaracMax(code)) {
@@ -2336,7 +2333,7 @@ export class RdDActor extends RdDBaseActorSang {
 
   async _xpCaracDerivee(xpData) {
     const caracs = RdDActor._getComposantsCaracDerivee(xpData.caracName)
-      .map(c => mergeObject(this.system.carac[c], { isMax: this.isCaracMax(c) }))
+      .map(c => foundry.utils.mergeObject(this.system.carac[c], { isMax: this.isCaracMax(c) }, { inplace: false }))
     switch (caracs.filter(it => !it.isMax).length) {
       case 0:
         xpData.caracRepartitionManuelle = true;
@@ -2352,6 +2349,8 @@ export class RdDActor extends RdDBaseActorSang {
 
   static _getComposantsCaracDerivee(caracName) {
     switch (Grammar.toLowerCaseNoAccent(caracName)) {
+      case 'reve-actuel': case 'reve actuel': return ['reve']
+      case 'chance-actuelle': case 'chance actuelle': return ['chance']
       case 'vie': return ['constitution']
       case 'tir': return ['vue', 'dexterite']
       case 'lancer': return ['force', 'dexterite', 'vue']
@@ -2363,26 +2362,25 @@ export class RdDActor extends RdDBaseActorSang {
 
 
   /* -------------------------------------------- */
-  async resetNombresAstraux() {
+  async deleteNombresAstraux() {
     const deletions = this.itemTypes['nombreastral'].map(it => it._id);
     await this.deleteEmbeddedDocuments("Item", deletions);
   }
 
   /* -------------------------------------------- */
-  async ajouteNombreAstral(callData) {
+  async ajouteNombreAstral(date, nbAstral, isValid) {
-    const indexDate = Number.parseInt(callData.date);
+    const indexDate = Number.parseInt(date);
     // Ajout du nombre astral
     const item = {
       name: "Nombre Astral", type: "nombreastral", system:
       {
-        value: callData.nbAstral,
+        value: nbAstral,
-        istrue: callData.isvalid,
+        istrue: isValid,
         jourindex: indexDate,
         jourlabel: RdDTimestamp.formatIndexDate(indexDate)
       }
     };
     await this.createEmbeddedDocuments("Item", [item]);
-    game.system.rdd.calendrier.notifyChangeNombresAstraux();
   }
 
   async supprimerAnciensNombresAstraux() {
@@ -2423,22 +2421,29 @@ export class RdDActor extends RdDBaseActorSang {
   /* -------------------------------------------- */
   async displayTMR(mode = "normal") {
     if (this.tmrApp) {
-      ui.notifications.warn("Vous êtes déja dans les TMR....");
+      ui.notifications.warn("Vous êtes déja dans les TMR....")
-      this.tmrApp.forceTMRDisplay();
+      this.tmrApp.forceTMRDisplay()
       return
     }
     if (mode != 'visu' && this.getEffect(STATUSES.StatusDemiReve)) {
-      ui.notifications.warn("Le joueur ou le MJ est déja dans les Terres Médianes avec ce personnage ! Visualisation uniquement");
+      ui.notifications.warn("Les personnage est déjà dans les Terres Médianes, elles s'affichent en visualisation")
       mode = "visu"; // bascule le mode en visu automatiquement
     }
-    RdDConfirm.confirmer({
+    if (mode == 'visu') {
-      bypass: mode == 'visu',
+      await this._doDisplayTMR(mode)
-      settingConfirmer: "confirmation-tmr",
+    }
-      content: `<p>Voulez vous monter dans les TMR en mode ${mode}?</p>`,
+    else {
-      title: 'Confirmer la montée dans les TMR',
+      const rencontre = this.getRencontreTMREnAttente();
-      buttonLabel: 'Monter dans les TMR',
+      const settingConfirmer = rencontre ? "confirmation-tmr-rencontre" : "confirmation-tmr";
-      onAction: async () => await this._doDisplayTMR(mode)
+      const messageRencontre = rencontre ? `<p>Vous devrez combattre ${rencontre.system.genre == 'f' ? 'la' : 'le'} ${rencontre.name} de ${rencontre.system.force} points de Rêve</p>` : '';
-    });
+      RdDConfirm.confirmer({
+        settingConfirmer: settingConfirmer,
+        content: `<p>Voulez vous monter dans les TMR en mode ${mode}?</p>` + messageRencontre,
+        title: 'Confirmer la montée dans les TMR',
+        buttonLabel: 'Monter dans les TMR',
+        onAction: async () => await this._doDisplayTMR(mode)
+      })
+    }
   }
 
   async _doDisplayTMR(mode) {
@@ -2610,13 +2615,13 @@ export class RdDActor extends RdDBaseActorSang {
 
   /* -------------------------------------------- */
   async resetItemUse() {
-    await this.unsetFlag(SYSTEM_RDD, 'itemUse');
     await this.setFlag(SYSTEM_RDD, 'itemUse', {});
   }
 
   /* -------------------------------------------- */
   async incDecItemUse(itemId, inc = 1) {
-    let itemUse = duplicate(this.getFlag(SYSTEM_RDD, 'itemUse') ?? {});
+    const currentItemUse = this.getFlag(SYSTEM_RDD, 'itemUse');
+    let itemUse = currentItemUse ? foundry.utils.duplicate(currentItemUse) : {};
     itemUse[itemId] = (itemUse[itemId] ?? 0) + inc;
     await this.setFlag(SYSTEM_RDD, 'itemUse', itemUse);
     console.log("ITEM USE INC", inc, itemUse);
@@ -2684,7 +2689,7 @@ export class RdDActor extends RdDBaseActorSang {
 
   /* -------------------------------------------- */
   static $transformSubActeurSuivant = (suivant, link) => {
-    return mergeObject(RdDBaseActor.extractActorMin(suivant), {
+    return foundry.utils.mergeObject(RdDBaseActor.extractActorMin(suivant), {
       ephemere: !suivant.prototypeToken.actorLink,
       coeur: link.coeur ?? 0,
       prochainCoeur: link.prochainCoeur ?? link.coeur ?? 0
@@ -2710,7 +2715,7 @@ export class RdDActor extends RdDBaseActorSang {
   }
 
   async setPointsCoeur(subActorId, coeurs, options = { immediat: false }) {
-    const newSuivants = duplicate(this.system.subacteurs.suivants)
+    const newSuivants = foundry.utils.duplicate(this.system.subacteurs.suivants)
     const amoureux = newSuivants.find(it => it.id == subActorId);
     if (amoureux) {
       amoureux[options.immediat ? 'coeur' : 'prochainCoeur'] = coeurs
@@ -2720,7 +2725,7 @@ export class RdDActor extends RdDBaseActorSang {
 
   /* -------------------------------------------- */
   static $transformSubActeurVehicule = (vehicle, link) => {
-    return mergeObject(RdDBaseActor.extractActorMin(vehicle), {
+    return foundry.utils.mergeObject(RdDBaseActor.extractActorMin(vehicle), {
       system: { categorie: vehicle.system.categorie, etat: vehicle.system.etat }
     })
   };
@@ -2967,9 +2972,6 @@ export class RdDActor extends RdDBaseActorSang {
     }
   }
 
-  /* -------------------------------------------- */
-  isEffectAllowed(effectId) { return true }
-
   /* -------------------------------------------- */
   async onPreUpdateItem(item, change, options, id) {
     if (item.isCompetencePersonnage() && item.system.defaut_carac && item.system.xp) {
@@ -3050,7 +3052,7 @@ export class RdDActor extends RdDBaseActorSang {
   async nouvelleIncarnation() {
     let incarnation = this.toObject();
 
-    incarnation.items = Array.from(this.items.filter(it => it.type == TYPES.competence),
+    incarnation.items = Array.from(this.items.filter(it => it.type == ITEM_TYPES.competence),
       it => {
         it = it.toObject();
         it.id = undefined;
@@ -3064,7 +3066,7 @@ export class RdDActor extends RdDBaseActorSang {
 
     incarnation.name = 'Réincarnation de ' + incarnation.name
     incarnation.system = {
-      carac: duplicate(this.system.carac),
+      carac: foundry.utils.duplicate(this.system.carac),
       heure: RdDTimestamp.defHeure(await RdDDice.rollTotal("1dh", { rollMode: "selfroll", showDice: SHOW_DICE })).key,
       age: 18,
       biographie: '',

module/actor/base-actor-reve-sheet.js

@@ -11,7 +11,7 @@ export class RdDBaseActorReveSheet extends RdDBaseActorSheet {
 
   /** @override */
   static get defaultOptions() {
-    return mergeObject(RdDBaseActorSheet.defaultOptions, {
+    return foundry.utils.mergeObject(RdDBaseActorSheet.defaultOptions, {
       width: 550
     });
   }

module/actor/base-actor-reve.js

@@ -12,7 +12,7 @@ import { ReglesOptionnelles } from "../settings/regles-optionnelles.js";
 import { RdDBaseActor } from "./base-actor.js";
 import { RdDItemCompetenceCreature } from "../item-competencecreature.js";
 import { StatusEffects } from "../settings/status-effects.js";
-import { TYPES } from "../item.js";
+import { ITEM_TYPES } from "../item.js";
 import { Targets } from "../targets.js";
 import { RdDPossession } from "../rdd-possession.js";
 import { RdDCombat } from "../rdd-combat.js";
@@ -108,14 +108,14 @@ export class RdDBaseActorReve extends RdDBaseActor {
 
   async $finDeRoundSupprimerObsoletes() {
     const obsoletes = []
-      .concat(this.itemTypes[TYPES.empoignade].filter(it => it.system.pointsemp <= 0))
+      .concat(this.itemTypes[ITEM_TYPES.empoignade].filter(it => it.system.pointsemp <= 0))
-      .concat(this.itemTypes[TYPES.possession].filter(it => it.system.compteur < -2 || it.system.compteur > 2))
+      .concat(this.itemTypes[ITEM_TYPES.possession].filter(it => it.system.compteur < -2 || it.system.compteur > 2))
       .map(it => it.id);
     await this.deleteEmbeddedDocuments('Item', obsoletes);
   }
 
   async $finDeRoundEmpoignade() {
-    const immobilisations = this.itemTypes[TYPES.empoignade].filter(it => it.system.pointsemp >= 2 && it.system.empoigneurid == this.id);
+    const immobilisations = this.itemTypes[ITEM_TYPES.empoignade].filter(it => it.system.pointsemp >= 2 && it.system.empoigneurid == this.id);
     immobilisations.forEach(emp => RdDEmpoignade.onImmobilisation(this,
       game.actors.get(emp.system.empoigneid),
       emp
@@ -151,13 +151,13 @@ export class RdDBaseActorReve extends RdDBaseActor {
   }
 
   getPossession(possessionId) {
-    return this.itemTypes[TYPES.possession].find(it => it.system.possessionid == possessionId);
+    return this.itemTypes[ITEM_TYPES.possession].find(it => it.system.possessionid == possessionId);
   }
   getPossessions() {
-    return this.itemTypes[TYPES.possession];
+    return this.itemTypes[ITEM_TYPES.possession];
   }
   getEmpoignades() {
-    return this.itemTypes[TYPES.empoignade];
+    return this.itemTypes[ITEM_TYPES.empoignade];
   }
 
   /* -------------------------------------------- */
@@ -180,7 +180,7 @@ export class RdDBaseActorReve extends RdDBaseActor {
   }
 
   /* -------------------------------------------- */
-  isEffectAllowed(effectId) { return true }
+  isEffectAllowed(effectId) { return false }
 
   getEffects(filter = e => true) {
     return this.getEmbeddedCollection("ActiveEffect").filter(filter);
@@ -286,12 +286,12 @@ export class RdDBaseActorReve extends RdDBaseActor {
 
   getCarac() {
     // TODO: le niveau d'une entité de cauchemar devrait être exclu...
-    const carac = mergeObject(duplicate(this.system.carac),
+    return foundry.utils.mergeObject(this.system.carac,
       {
         'reve-actuel': this.getCaracReveActuel(),
         'chance-actuelle': this.getCaracChanceActuelle()
-      });
+      },
-    return carac;
+      { inplace: false })
   }
 
   /* -------------------------------------------- */
@@ -318,11 +318,11 @@ export class RdDBaseActorReve extends RdDBaseActor {
   }
 
   /* -------------------------------------------- */
-  async rollCompetence(idOrName, options = { tryTarget: true }) {
+  async rollCompetence(idOrName, options = { tryTarget: true, arme: undefined }) {
     RdDEmpoignade.checkEmpoignadeEnCours(this)
     const competence = this.getCompetence(idOrName);
-    let rollData = { carac: this.system.carac, competence: competence }
+    let rollData = { carac: this.system.carac, competence: competence, arme: options.arme }
-    if (competence.type == TYPES.competencecreature) {
+    if (competence.type == ITEM_TYPES.competencecreature) {
       const arme = RdDItemCompetenceCreature.armeCreature(competence)
       if (arme && options.tryTarget && Targets.hasTargets()) {
         Targets.selectOneToken(target => {
@@ -361,7 +361,7 @@ export class RdDBaseActorReve extends RdDBaseActor {
    * @returns 
    */
   rollArme(arme, categorieArme = "competence") {
-    let compToUse = this.$getCompetenceArme(arme, categorieArme)
+    const compToUse = this.$getCompetenceArme(arme, categorieArme)
     if (!RdDItemArme.isArmeUtilisable(arme)) {
       ui.notifications.warn(`Arme inutilisable: ${arme.name} a une résistance de 0 ou moins`)
       return
@@ -375,7 +375,7 @@ export class RdDBaseActorReve extends RdDBaseActor {
         title: 'Ne pas utiliser les automatisation de combat',
         buttonLabel: "Pas d'automatisation",
         onAction: async () => {
-          this.rollCompetence(compToUse, { tryTarget: false })
+          this.rollCompetence(compToUse, { tryTarget: false, arme: arme })
         }
       });
       return
@@ -396,19 +396,7 @@ export class RdDBaseActorReve extends RdDBaseActor {
   }
 
   $getCompetenceArme(arme, competenceName) {
-    switch (arme.type) {
+    return RdDItemArme.getCompetenceArme(arme, competenceName)
-      case TYPES.competencecreature:
-        return arme.name
-      case TYPES.arme:
-        switch (competenceName) {
-          case 'competence': return arme.system.competence;
-          case 'unemain': return RdDItemArme.competence1Mains(arme);
-          case 'deuxmains': return RdDItemArme.competence2Mains(arme);
-          case 'tir': return arme.system.tir;
-          case 'lancer': return arme.system.lancer;
-        }
-    }
-    return undefined
   }
 
   verifierForceMin(item) {
@@ -425,21 +413,9 @@ export class RdDBaseActorReve extends RdDBaseActor {
     if (attacker && !await attacker.accorder(this, 'avant-encaissement')) {
       return;
     }
-    const attackerId = attacker?.id;
-    if (ReglesOptionnelles.isUsing('validation-encaissement-gr') && !game.user.isGM) {
-      RdDBaseActor.remoteActorCall({
-        tokenId: this.token?.id,
-        actorId: this.id,
-        method: 'encaisserDommages',
-        args: [rollData, show, attackerId]
-      });
-      return;
-    }
-
     const armure = await this.computeArmure(rollData);
-    if (ReglesOptionnelles.isUsing('validation-encaissement-gr')) {
+    if (ReglesOptionnelles.isUsing('validation-encaissement-gr')){
-      DialogValidationEncaissement.validerEncaissement(this, rollData, armure,
+      await this.encaisserDommagesValidationGR(rollData, armure, attacker?.id, show);
-        jet => this.$onEncaissement(jet, show, attacker));
     } 
     else {
       const jet = await RdDUtility.jetEncaissement(rollData, armure, { showDice: SHOW_DICE });
@@ -447,6 +423,21 @@ export class RdDBaseActorReve extends RdDBaseActor {
     }
   }
 
+  async encaisserDommagesValidationGR(rollData, armure, attackerId, show) {
+    if (!game.user.isGM) {
+      RdDBaseActor.remoteActorCall({
+        tokenId: this.token?.id,
+        actorId: this.id,
+        method: 'encaisserDommagesValidationGR',
+        args: [rollData, armure, attackerId, show]
+      });
+    } else {
+      const attacker = game.actors.get(attackerId);
+      DialogValidationEncaissement.validerEncaissement(this, rollData, armure,
+        jet => this.$onEncaissement(jet, show, attacker));
+    }
+  }
+
   async $onEncaissement(jet, show, attacker) {
     await this.onAppliquerJetEncaissement(jet, attacker);
     await this.$afficherEncaissement(jet, show);
@@ -455,7 +446,7 @@ export class RdDBaseActorReve extends RdDBaseActor {
   async onAppliquerJetEncaissement(encaissement, attacker) { }
 
   async $afficherEncaissement(encaissement, show) {
-    mergeObject(encaissement, {
+    foundry.utils.mergeObject(encaissement, {
       alias: this.name,
       hasPlayerOwner: this.hasPlayerOwner,
       show: show ?? {}
@@ -467,7 +458,7 @@ export class RdDBaseActorReve extends RdDBaseActor {
     });
 
     if (!encaissement.hasPlayerOwner && encaissement.endurance != 0) {
-      encaissement = duplicate(encaissement);
+      encaissement = foundry.utils.duplicate(encaissement);
       encaissement.isGM = true;
       ChatMessage.create({
         whisper: ChatMessage.getWhisperRecipients("GM"),
@@ -505,8 +496,8 @@ export class RdDBaseActorReve extends RdDBaseActor {
 
   isEntiteAccordee(attacker) { return true }
 
-  async setEntiteReveAccordee(attacker) {
+  async setEntiteReveAccordee(actor) {
-    ui.notifications.error("Impossible de s'accorder à " + this.name + ": ce n'est pas une entite de cauchemer/rêve");
+    ui.notifications.error("Impossible de s'accorder à " + this.name + ": ce n'est pas une entité incarnée");
   }
 
 }

module/actor/base-actor-sang-sheet.js

@@ -21,6 +21,11 @@ export class RdDBaseActorSangSheet extends RdDBaseActorReveSheet {
     this.html.find('.creer-blessure-grave').click(async event => RdDItemBlessure.createBlessure(this.actor, 4));
     this.html.find('.creer-blessure-critique').click(async event => RdDItemBlessure.createBlessure(this.actor, 6));
 
+    this.html.find('.subir-blessure-contusion').click(async event => RdDItemBlessure.applyFullBlessure(this.actor, 2));
+    this.html.find('.subir-blessure-legere').click(async event => RdDItemBlessure.applyFullBlessure(this.actor, 2));
+    this.html.find('.subir-blessure-grave').click(async event => RdDItemBlessure.applyFullBlessure(this.actor, 4));
+    this.html.find('.subir-blessure-critique').click(async event => RdDItemBlessure.applyFullBlessure(this.actor, 6));
+
     this.html.find('.jet-vie').click(async event => this.actor.jetDeVie())
     this.html.find('.jet-endurance').click(async event => await this.jetEndurance())
 

module/actor/base-actor-sang.js

@@ -1,7 +1,7 @@
 import { MAX_ENDURANCE_FATIGUE, RdDUtility } from "../rdd-utility.js";
 import { ReglesOptionnelles } from "../settings/regles-optionnelles.js";
 import { STATUSES } from "../settings/status-effects.js";
-import { TYPES } from "../item.js";
+import { ITEM_TYPES } from "../item.js";
 import { RdDBaseActorReve } from "./base-actor-reve.js";
 import { RdDDice } from "../rdd-dice.js";
 import { RdDItemBlessure } from "../item/blessure.js";
@@ -50,9 +50,9 @@ export class RdDBaseActorSang extends RdDBaseActorReve {
 
   isDead() { return this.system.sante.vie.value < -this.getSConst() }
 
-  nbBlessuresLegeres() { return this.itemTypes[TYPES.blessure].filter(it => it.isLegere()).length }
+  nbBlessuresLegeres() { return this.itemTypes[ITEM_TYPES.blessure].filter(it => it.isLegere()).length }
-  nbBlessuresGraves() { return this.itemTypes[TYPES.blessure].filter(it => it.isGrave()).length }
+  nbBlessuresGraves() { return this.itemTypes[ITEM_TYPES.blessure].filter(it => it.isGrave()).length }
-  nbBlessuresCritiques() { return this.itemTypes[TYPES.blessure].filter(it => it.isCritique()).length }
+  nbBlessuresCritiques() { return this.itemTypes[ITEM_TYPES.blessure].filter(it => it.isCritique()).length }
 
   /* -------------------------------------------- */
   computeResumeBlessure() {
@@ -89,12 +89,12 @@ export class RdDBaseActorSang extends RdDBaseActorReve {
   /* -------------------------------------------- */
 
   async onAppliquerJetEncaissement(encaissement, attacker) {
-    const santeOrig = duplicate(this.system.sante);
+    const santeOrig = foundry.utils.duplicate(this.system.sante);
     const blessure = await this.ajouterBlessure(encaissement, attacker); // Will update the result table
     const perteVie = await this.santeIncDec("vie", -encaissement.vie);
     const perteEndurance = await this.santeIncDec("endurance", -encaissement.endurance, blessure?.isCritique());
 
-    mergeObject(encaissement, {
+    foundry.utils.mergeObject(encaissement, {
       resteEndurance: perteEndurance.newValue,
       sonne: perteEndurance.sonne,
       jetEndurance: perteEndurance.jetEndurance,
@@ -108,7 +108,7 @@ export class RdDBaseActorSang extends RdDBaseActorReve {
     if (name == 'fatigue' && !ReglesOptionnelles.isUsing("appliquer-fatigue")) {
       return;
     }
-    const sante = duplicate(this.system.sante)
+    const sante = foundry.utils.duplicate(this.system.sante)
     let compteur = sante[name];
     if (!compteur) {
       return;
@@ -135,7 +135,7 @@ export class RdDBaseActorSang extends RdDBaseActorReve {
       result.perte = perte;
       if (perte > 1) {
         // Peut-être sonné si 2 points d'endurance perdus d'un coup
-        mergeObject(result, await this.jetEndurance(result.newValue));
+        foundry.utils.mergeObject(result, await this.jetEndurance(result.newValue));
       } else if (inc > 0) {
         await this.setSonne(false);
       }
@@ -197,7 +197,7 @@ export class RdDBaseActorSang extends RdDBaseActorReve {
   }
 
   async supprimerBlessures(filterToDelete) {
-    const toDelete = this.filterItems(filterToDelete, TYPES.blessure)
+    const toDelete = this.filterItems(filterToDelete, ITEM_TYPES.blessure)
       .map(it => it.id);
     await this.deleteEmbeddedDocuments('Item', toDelete);
   }
@@ -269,6 +269,8 @@ export class RdDBaseActorSang extends RdDBaseActorReve {
     return this.getEffect(STATUSES.StatusStunned);
   }
 
+  isEffectAllowed(effectId) { return true }
+
   /* -------------------------------------------- */
   async computeEtatGeneral() { this.system.compteurs.etat.value = this.malusVie() + this.malusFatigue() + this.malusEthylisme() }
   getEtatGeneral(options = { ethylisme: false }) { return this.system.compteurs.etat.value }

module/actor/base-actor-sheet.js

@@ -3,7 +3,7 @@ import { Misc } from "../misc.js";
 import { DialogSplitItem } from "../dialog-split-item.js";
 import { RdDSheetUtility } from "../rdd-sheet-utility.js";
 import { Monnaie } from "../item-monnaie.js";
-import { RdDItem, TYPES } from "../item.js";
+import { RdDItem, ITEM_TYPES } from "../item.js";
 import { RdDItemCompetenceCreature } from "../item-competencecreature.js";
 
 /* -------------------------------------------- */
@@ -15,12 +15,12 @@ export class RdDBaseActorSheet extends ActorSheet {
 
   /** @override */
   static get defaultOptions() {
-    return mergeObject(ActorSheet.defaultOptions, {
+    return foundry.utils.mergeObject(ActorSheet.defaultOptions, {
       classes: ["rdd", "sheet", "actor"],
       tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "carac" }],
       dragDrop: [{ dragSelector: ".item-list .item", dropSelector: undefined }],
       vueDetaillee: false
-    });
+    }, { inplace: false })
   }
 
   /* -------------------------------------------- */
@@ -37,7 +37,8 @@ export class RdDBaseActorSheet extends ActorSheet {
       system: this.actor.system,
       description: await TextEditor.enrichHTML(this.actor.system.description, { async: true }),
       notesmj: await TextEditor.enrichHTML(this.actor.system.notesmj, { async: true }),
-      options: RdDSheetUtility.mergeDocumentRights(this.options, this.actor, this.isEditable)
+      options: RdDSheetUtility.mergeDocumentRights(this.options, this.actor, this.isEditable),
+      effects: this.actor.effects
     }
 
     RdDBaseActorSheet.filterItemsPerTypeForSheet(formData, this.actor.itemTypes);
@@ -50,7 +51,7 @@ export class RdDBaseActorSheet extends ActorSheet {
     this.objetVersConteneur = RdDUtility.buildArbreDeConteneurs(formData.conteneurs, formData.inventaires);
     this._appliquerRechercheObjets(formData.conteneurs, formData.inventaires);
     formData.conteneurs = RdDUtility.conteneursRacine(formData.conteneurs);
-    formData.competences.filter(it => it.type == TYPES.competencecreature)
+    formData.competences.filter(it => it.type == ITEM_TYPES.competencecreature)
       .forEach(it => it.isdommages = RdDItemCompetenceCreature.isDommages(it))
     return formData;
   }
@@ -312,7 +313,7 @@ export class RdDBaseActorSheet extends ActorSheet {
   async _onSplitItem(item, split) {
     if (split >= 1 && split < item.system.quantite) {
       await item.diminuerQuantite(split);
-      const splitItem = duplicate(item);
+      const splitItem = foundry.utils.duplicate(item);
       splitItem.system.quantite = split;
       await this.actor.createEmbeddedDocuments('Item', [splitItem])
     }

module/actor/base-actor.js

@@ -1,14 +1,14 @@
+import { ChatVente } from "../achat-vente/chat-vente.js";
 import { ChatUtility } from "../chat-utility.js";
 import { SYSTEM_SOCKET_ID } from "../constants.js";
 import { Grammar } from "../grammar.js";
 import { Monnaie } from "../item-monnaie.js";
-import { TYPES } from "../item.js";
+import { ITEM_TYPES } from "../item.js";
 import { Misc } from "../misc.js";
 import { RdDAudio } from "../rdd-audio.js";
 import { RdDConfirm } from "../rdd-confirm.js";
 import { RdDUtility } from "../rdd-utility.js";
 import { SystemCompendiums } from "../settings/system-compendiums.js";
-import { APP_ASTROLOGIE_REFRESH } from "../sommeil/app-astrologie.js";
 
 export class RdDBaseActor extends Actor {
 
@@ -16,7 +16,7 @@ export class RdDBaseActor extends Actor {
     return Object.entries(carac)
       .filter(it => Grammar.equalsInsensitive(it[1].label, name))
       .map(it => it[0])
-      .find(it => it);
+      .find(it => it)
   }
   static $findCaracByName(carac, name) {
     const caracList = Object.entries(carac);
@@ -32,23 +32,16 @@ export class RdDBaseActor extends Actor {
   }
 
   static init() {
-    Hooks.on("preUpdateItem", (item, change, options, id) => RdDBaseActor.getParentActor(item)?.onPreUpdateItem(item, change, options, id));
+    Hooks.on("preUpdateItem", (item, change, options, id) => Misc.documentIfResponsible(item.parent)?.onPreUpdateItem(item, change, options, id))
-    Hooks.on("createItem", (item, options, id) => RdDBaseActor.getParentActor(item)?.onCreateItem(item, options, id));
+    Hooks.on("createItem", (item, options, id) => Misc.documentIfResponsible(item.parent)?.onCreateItem(item, options, id))
-    Hooks.on("deleteItem", (item, options, id) => RdDBaseActor.getParentActor(item)?.onDeleteItem(item, options, id));
+    Hooks.on("deleteItem", (item, options, id) => Misc.documentIfResponsible(item.parent)?.onDeleteItem(item, options, id))
-    Hooks.on("updateActor", (actor, change, options, actorId) => actor.onUpdateActor(change, options, actorId));
+    Hooks.on("updateActor", (actor, change, options, actorId) => Misc.documentIfResponsible(actor)?.onUpdateActor(change, options, actorId))
   }
 
   static onSocketMessage(sockmsg) {
     switch (sockmsg.msg) {
       case "msg_remote_actor_call":
         return RdDBaseActor.onRemoteActorCall(sockmsg.data, sockmsg.userId);
-      case "msg_reset_nombre_astral":
-        game.user.character.resetNombresAstraux();
-        game.system.rdd.calendrier.notifyChangeNombresAstraux();
-        return;
-      case "msg_refresh_nombre_astral":
-        Hooks.callAll(APP_ASTROLOGIE_REFRESH);
-        return;
     }
   }
 
@@ -85,11 +78,9 @@ export class RdDBaseActor extends Actor {
     return game.actors.get(actorId)
   }
 
-  static extractActorMin = (actor) => { return { id: actor?.id, type: actor?.type, name: actor?.name, img: actor?.img }; };
+  isPersonnageJoueur() { return false }
 
-  static getParentActor(document) {
+  static extractActorMin = (actor) => { return { id: actor?.id, type: actor?.type, name: actor?.name, img: actor?.img }; };
-    return document?.parent instanceof Actor ? document.parent : undefined
-  }
 
   /**
    * Cette methode surcharge Actor.create() pour ajouter si besoin des Items par défaut:
@@ -121,7 +112,7 @@ export class RdDBaseActor extends Actor {
 
   constructor(docData, context = {}) {
     if (!context.rdd?.ready) {
-      mergeObject(context, { rdd: { ready: true } });
+      foundry.utils.mergeObject(context, { rdd: { ready: true } });
       const ActorConstructor = game.system.rdd.actorClasses[docData.type];
       if (ActorConstructor) {
         if (!docData.img) {
@@ -130,6 +121,7 @@ export class RdDBaseActor extends Actor {
         return new ActorConstructor(docData, context);
       }
     }
+    context.rdd = undefined
     super(docData, context);
   }
 
@@ -240,11 +232,13 @@ export class RdDBaseActor extends Actor {
 
   /* -------------------------------------------- */
   async cleanupConteneurs() {
-    let updates = this.itemTypes['conteneur']
+    if (Misc.isOwnerPlayerOrUniqueConnectedGM(this)) {
-      .filter(c => c.system.contenu.filter(id => this.getItem(id) == undefined).length > 0)
+      let updates = this.itemTypes['conteneur']
-      .map(c => { return { _id: c._id, 'system.contenu': c.system.contenu.filter(id => this.getItem(id) != undefined) } });
+        .filter(c => c.system.contenu.filter(id => this.getItem(id) == undefined).length > 0)
-    if (updates.length > 0) {
+        .map(c => { return { _id: c._id, 'system.contenu': c.system.contenu.filter(id => this.getItem(id) != undefined) } });
-      await this.updateEmbeddedDocuments("Item", updates)
+      if (updates.length > 0) {
+        await this.updateEmbeddedDocuments("Item", updates)
+      }
     }
   }
 
@@ -366,16 +360,13 @@ export class RdDBaseActor extends Actor {
       ChatUtility.notifyUser(achat.userId, 'warn', `Vous n'avez pas assez d'argent pour payer ${Math.ceil(cout / 100)} sols !`);
       return;
     }
-    await this.decrementerVente(vendeur, itemVendu, quantite, cout);
+    await vendeur?.vendre(itemVendu, quantite, cout);
-    if (acheteur) {
+    await acheteur?.acheter(itemVendu, quantite, cout, achat)
-      await acheteur.depenserSols(cout);
+
-      const createdItemId = await acheteur.creerQuantiteItem(itemVendu, quantite);
-      await acheteur.consommerNourritureAchetee(achat, achat.vente, createdItemId);
-    }
     if (cout > 0) {
       RdDAudio.PlayContextAudio("argent");
     }
-    const chatAchatItem = duplicate(achat.vente);
+    const chatAchatItem = foundry.utils.duplicate(achat.vente);
     chatAchatItem.quantiteTotal = quantite;
     ChatMessage.create({
       user: achat.userId,
@@ -385,24 +376,26 @@ export class RdDBaseActor extends Actor {
     });
 
     if (!achat.vente.quantiteIllimite) {
-      if (achat.vente.quantiteNbLots <= achat.choix.nombreLots) {
+      if (achat.vente.nbLots <= achat.choix.nombreLots) {
         ChatUtility.removeChatMessageId(achat.chatMessageIdVente);
       }
       else if (achat.chatMessageIdVente) {
-        achat.vente.properties = itemVendu.getProprietes();
+        await ChatVente.diminuerQuantiteAchatVente(achat.chatMessageIdVente, achat.choix.nombreLots)
-        achat.vente.quantiteNbLots -= achat.choix.nombreLots;
-        achat.vente.jsondata = JSON.stringify(achat.vente.item);
-        const messageVente = game.messages.get(achat.chatMessageIdVente);
-        messageVente.update({ content: await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-vente-item.html', achat.vente) });
-        messageVente.render(true);
       }
     }
   }
 
-  async decrementerVente(vendeur, itemVendu, quantite, cout) {
+  async vendre(item, quantite, cout) {
-    if (vendeur) {
+    await this.ajouterSols(cout);
-      await vendeur.ajouterSols(cout);
+    await this.decrementerQuantiteItem(item, quantite);
-      await vendeur.decrementerQuantiteItem(itemVendu, quantite);
+  }
+
+  async acheter(item, quantite, cout, achat) {
+    await this.depenserSols(cout)
+    const createdItemId = await this.creerQuantiteItem(item, quantite)
+    if (achat.choix.consommer && item.type == 'nourritureboisson' && createdItemId != undefined) {
+      achat.choix.doses = achat.choix.nombreLots;
+      await this.consommerNourritureboisson(createdItemId, achat.choix, achat.vente.actingUserId);
     }
   }
 
@@ -415,31 +408,28 @@ export class RdDBaseActor extends Actor {
     return disponible == undefined || disponible >= quantiteDemande;
   }
 
-  async consommerNourritureAchetee(achat, vente, createdItemId) {
+  async consommerNourritureboisson(itemId, choix, userId) { }
-    if (achat.choix.consommer && vente.item.type == 'nourritureboisson' && createdItemId != undefined) {
-      achat.choix.doses = achat.choix.nombreLots;
-      await this.consommerNourritureboisson(createdItemId, achat.choix, vente.actingUserId);
-    }
-  }
-
 
   async decrementerQuantiteItem(item, quantite, options = { supprimerSiZero: true }) {
     if (item.isService()) {
       return;
     }
+    const itemId = item.id;
     let resteQuantite = (item.system.quantite ?? 1) - quantite;
     if (resteQuantite <= 0) {
       if (options.supprimerSiZero) {
         await this.deleteEmbeddedDocuments("Item", [item.id]);
       }
       else {
-        await this.updateEmbeddedDocuments("Item", [{ _id: item.id, 'system.quantite': 0 }]);
+        await this.updateEmbeddedDocuments("Item", [{ _id: itemId, 'system.quantite': 0 }]);
       }
       if (resteQuantite < 0) {
         ui.notifications.warn(`La quantité de ${item.name} était insuffisante, l'objet a donc été supprimé`)
       }
     }
     else if (resteQuantite > 0) {
+      const realItem = this.getItem(item.id)
+      realItem.update({ 'system.quantite': resteQuantite });
       await this.updateEmbeddedDocuments("Item", [{ _id: item.id, 'system.quantite': resteQuantite }]);
     }
   }
@@ -451,7 +441,7 @@ export class RdDBaseActor extends Actor {
         type: item.type,
         img: item.img,
         name: item.name,
-        system: mergeObject(item.system, { quantite: isItemEmpilable ? quantite : undefined })
+        system: foundry.utils.mergeObject(item.system, { quantite: isItemEmpilable ? quantite : undefined }, { inplace: false })
       };
       const newItems = isItemEmpilable ? [baseItem] : Array.from({ length: quantite }, (_, i) => baseItem);
       const items = await this.createEmbeddedDocuments("Item", newItems);
@@ -552,7 +542,7 @@ export class RdDBaseActor extends Actor {
     // Calculer le total actuel des contenus
     const encContenu = dest.getEncContenu();
     const newEnc = moved.getEncTotal(); // Calculer le total actuel du nouvel objet
-    const placeDisponible = Math.roundDecimals(dest.system.capacite - encContenu - newEnc, 4)
+    const placeDisponible = Misc.keepDecimals(dest.system.capacite - encContenu - newEnc, 4)
 
     // Teste si le conteneur de destination a suffisament de capacité pour recevoir le nouvel objet
     if (placeDisponible < 0) {
@@ -567,15 +557,15 @@ export class RdDBaseActor extends Actor {
   /* -------------------------------------------- */
   /** Ajoute un item dans un conteneur, sur la base de leurs ID */
   async ajouterDansConteneur(item, conteneur, onAjouterDansConteneur) {
-    if (!conteneur) {
+    if (conteneur?.isConteneur()) {
-      // TODO: afficher
-      item.estContenu = false;
-    }
-    else if (conteneur.isConteneur()) {
       item.estContenu = true;
       const nouveauContenu = [...conteneur.system.contenu, item.id];
       await conteneur.update({ 'system.contenu': nouveauContenu });
-      onAjouterDansConteneur(item.id, conteneur.id);
+      onAjouterDansConteneur(item.id, conteneur.id)
+    }
+    else {
+      item.estContenu = false;
+      await conteneur?.update({ 'system.-=contenu': undefined })
     }
   }
 
@@ -593,8 +583,13 @@ export class RdDBaseActor extends Actor {
           if (item.estContenu) {
             item.estContenu = undefined;
           }
-          if (item.type == 'conteneur' && item.system.contenu.length > 0) {
+          if (item.system.contenu != undefined) {
-            corrections.push({ _id: item.id, 'system.contenu': [] });
+            if (item.type == 'conteneur') {
+              corrections.push({ _id: item.id, 'system.contenu': [] });
+            }
+            else {
+              corrections.push({ _id: item.id, 'system.-=contenu': undefined });
+            }
           }
         }
         if (corrections.length > 0) {
@@ -629,15 +624,21 @@ export class RdDBaseActor extends Actor {
   }
 
   /* -------------------------------------------- */
-  /** Supprime un item d'un conteneur, sur la base
+  /**
-   * de leurs ID */
+   * Supprime un item d'un conteneur, sur la base de leurs ID
+   */
   async enleverDeConteneur(item, conteneur, onEnleverDeConteneur) {
-    if (conteneur?.isConteneur()) {
+    if (conteneur) {
-      item.estContenu = false;
+      if (conteneur.isConteneur()) {
-      const contenu = conteneur.system.contenu.filter(id => id != item.id);
+        const contenu = conteneur.system.contenu.filter(id => id != item.id);
-      await conteneur.update({ 'system.contenu': contenu });
+        await conteneur.update({ 'system.contenu': contenu });
-      onEnleverDeConteneur();
+        onEnleverDeConteneur();
+      }
+      else {
+        await conteneur.update({ 'system.-=contenu': undefined })
+      }
     }
+    item.estContenu = false;
   }
 
   /* -------------------------------------------- */
@@ -647,7 +648,7 @@ export class RdDBaseActor extends Actor {
     sourceActor.buildSubConteneurObjetList(itemId, itemsList); // Get itemId list
 
     const itemsDataToCreate = itemsList.map(it => sourceActor.getItem(it.id))
-      .map(it => duplicate(it))
+      .map(it => foundry.utils.duplicate(it))
       .map(it => { it.system.contenu = []; return it; });
     let newItems = await this.createEmbeddedDocuments('Item', itemsDataToCreate);
 
@@ -703,7 +704,7 @@ export class RdDBaseActor extends Actor {
 
   async actionPrincipale(item, onActionItem = async () => { }) {
     switch (item.type) {
-      case TYPES.conteneur: return await item.sheet.render(true);
+      case ITEM_TYPES.conteneur: return await item.sheet.render(true);
     }
     return undefined
   }

module/actor/commerce-sheet.js

@@ -1,4 +1,4 @@
-import { DialogItemAchat } from "../dialog-item-achat.js";
+import { DialogItemAchat } from "../achat-vente/dialog-item-achat.js";
 import { RdDItem } from "../item.js";
 import { RdDUtility } from "../rdd-utility.js";
 import { RdDBaseActorSheet } from "./base-actor-sheet.js";
@@ -11,11 +11,11 @@ export class RdDCommerceSheet extends RdDBaseActorSheet {
 
   /** @override */
   static get defaultOptions() {
-    return mergeObject(super.defaultOptions, {
+    return foundry.utils.mergeObject(super.defaultOptions, {
       template: "systems/foundryvtt-reve-de-dragon/templates/actor/commerce-actor-sheet.html",
       width: 600, height: 720,
       tabs: []
-    });
+    }, { inplace: false })
   }
   get title() {
     if (this.actor.token && this.actor.token != this.actor.prototypeToken) {
@@ -27,7 +27,7 @@ export class RdDCommerceSheet extends RdDBaseActorSheet {
   async getData() {
     const formData = await super.getData();
     if (this.actor.token && this.actor.token != this.actor.prototypeToken) {
-      mergeObject(formData,
+      foundry.utils.mergeObject(formData,
         {
           title: this.actor.token.name,
           token: {

module/actor/commerce.js

@@ -25,8 +25,7 @@ export class RdDCommerce extends RdDBaseActor {
     }
     await super.depenserSols(cout)
   }
-
+  async consommerNourritureboisson(itemId, choix, userId) { 
-  async consommerNourritureAchetee(achat, vente, createdItemId) {
     // ne pas consommer pour un commerce
   }
 

module/actor/creature-sheet.js

@@ -9,10 +9,10 @@ export class RdDCreatureSheet extends RdDBaseActorSangSheet {
 
   /** @override */
   static get defaultOptions() {
-    return mergeObject(RdDBaseActorSangSheet.defaultOptions, {
+    return foundry.utils.mergeObject(RdDBaseActorSangSheet.defaultOptions, {
       template: "systems/foundryvtt-reve-de-dragon/templates/actor-creature-sheet.html",
       width: 640, height: 720
-    });
+    }, { inplace: false })
   }
 
   /* -------------------------------------------- */

module/actor/creature.js

@@ -1,5 +1,5 @@
 import { ENTITE_INCARNE } from "../constants.js";
-import { TYPES } from "../item.js";
+import { ITEM_TYPES } from "../item.js";
 import { STATUSES } from "../settings/status-effects.js";
 import { RdDBaseActorSang } from "./base-actor-sang.js";
 
@@ -12,7 +12,7 @@ export class RdDCreature extends RdDBaseActorSang {
   isCreature() { return true }
 
   canReceive(item) {
-    return item.type == TYPES.competencecreature || item.isInventaire();
+    return item.type == ITEM_TYPES.competencecreature || item.isInventaire();
   }
 
   async remiseANeuf() {
@@ -33,31 +33,4 @@ export class RdDCreature extends RdDBaseActorSang {
     }
   }
 
-  isEffectAllowed(effectId) {
-    return [STATUSES.StatusComma].includes(effectId);
-  }
-
-  isEntiteAccordee(attacker) {
-    if (this.isEntite([ENTITE_INCARNE])) {
-      let resonnance = this.system.sante.resonnance
-      return (resonnance.actors.find(it => it == attacker.id))
-    }
-    return true
-  }
-
-  /* -------------------------------------------- */
-  async setEntiteReveAccordee(attacker) {
-    if (this.isEntite([ENTITE_INCARNE])) {
-      let resonnance = duplicate(this.system.sante.resonnance);
-      if (resonnance.actors.find(it => it == attacker.id)) {
-        // déjà accordé
-        return;
-      }
-      await this.update({ "system.sante.resonnance": [...resonnance, attacker.id] });
-    }
-    else {
-      super.setEntiteReveAccordee(attacker)
-    }
-  }
-
 }

module/actor/entite-sheet.js

@@ -6,10 +6,10 @@ export class RdDActorEntiteSheet extends RdDBaseActorReveSheet {
 
   /** @override */
   static get defaultOptions() {
-    return mergeObject(RdDBaseActorReveSheet.defaultOptions, {
+    return foundry.utils.mergeObject(RdDBaseActorReveSheet.defaultOptions, {
       template: "systems/foundryvtt-reve-de-dragon/templates/actor-entite-sheet.html",
       width: 640, height: 720,
-    });
+    }, { inplace: false })
   }
 
   async getData() {
@@ -54,6 +54,12 @@ export class RdDActorEntiteSheet extends RdDBaseActorReveSheet {
     });
   }
 
+  async _onDropActor(event, dragData) {
+    const dropActor = fromUuidSync(dragData.uuid)
+    await this.actor.setEntiteReveAccordee(dropActor)
+    super._onDropActor(event, dragData)
+  }
+
   async deleteSubActeur(actorId) {
     let newResonances = this.actor.system.sante.resonnance.actors.filter(id => id != actorId);
     await this.actor.update({ 'system.sante.resonnance.actors': newResonances }, { renderSheet: false });

module/actor/entite.js

@@ -1,5 +1,5 @@
 import { ENTITE_INCARNE, ENTITE_NONINCARNE } from "../constants.js";
-import { TYPES } from "../item.js";
+import { ITEM_TYPES } from "../item.js";
 import { Misc } from "../misc.js";
 import { RdDEncaisser } from "../rdd-roll-encaisser.js";
 import { STATUSES } from "../settings/status-effects.js";
@@ -12,7 +12,7 @@ export class RdDEntite extends RdDBaseActorReve {
   }
 
   canReceive(item) {
-    return item.type == TYPES.competencecreature
+    return item.type == ITEM_TYPES.competencecreature
   }
 
   isEntite(typeentite = []) {
@@ -29,7 +29,7 @@ export class RdDEntite extends RdDBaseActorReve {
   getChance() { return this.getReve() }
 
   getDraconicOuPossession() {
-    return this.itemTypes[TYPES.competencecreature]
+    return this.itemTypes[ITEM_TYPES.competencecreature]
       .filter(it => it.system.categorie == 'possession')
       .sort(Misc.descending(it => it.system.niveau))
       .find(it => true);
@@ -76,7 +76,7 @@ export class RdDEntite extends RdDBaseActorReve {
 
   async onAppliquerJetEncaissement(encaissement, attacker) {
     const perteEndurance = await this.santeIncDec("endurance", -encaissement.endurance);
-    mergeObject(encaissement, {
+    foundry.utils.mergeObject(encaissement, {
       resteEndurance: perteEndurance.newValue,
       endurance: perteEndurance.perte
     });
@@ -91,20 +91,16 @@ export class RdDEntite extends RdDBaseActorReve {
   }
 
   /* -------------------------------------------- */
-  async setEntiteReveAccordee(attacker) {
+  async setEntiteReveAccordee(actor) {
     if (this.isEntite([ENTITE_INCARNE])) {
-      let resonnance = duplicate(this.system.sante.resonnance);
+      if (this.system.sante.resonnance.actors.find(it => it == actor.id)) {
-      if (resonnance.actors.find(it => it == attacker.id)) {
         // déjà accordé
-        return;
+        return
       }
-      resonnance.actors.push(attacker.id);
+      await this.update({ "system.sante.resonnance.actors": [...this.system.sante.resonnance.actors, actor.id] })
-      await this.update({ "system.sante.resonnance": resonnance });
     }
     else {
-      super.setEntiteReveAccordee(attacker)
+      super.setEntiteReveAccordee(actor)
     }
   }
-
-
 }

module/actor/experience-log.js

@@ -12,7 +12,7 @@ export const XP_TOPIC = {
 export class ExperienceLog {
 
   static async add(actor, topic, from, to, raison, manuel = false) {
-    if (!actor.hasPlayerOwner || !actor.isPersonnage()) {
+    if (!actor.isPersonnageJoueur()) {
       return
     }
     if (from == to) {

module/actor/export-scriptarium/export-scriptarium.js

@@ -0,0 +1,80 @@
+import { ACTOR_TYPES } from "../../item.js"
+import { Misc } from "../../misc.js"
+import { EXPORT_CSV_SCRIPTARIUM, OptionsAvancees } from "../../settings/options-avancees.js"
+import { Mapping } from "./mapping.js"
+
+const IMG_SCRIPTARIUM = '<img class="context-menu-img" src="systems/foundryvtt-reve-de-dragon/styles/img/ui/scriptarium.svg">'
+
+export class ExportScriptarium {
+
+  static init() {
+    ExportScriptarium.INSTANCE = new ExportScriptarium()
+  }
+
+  constructor() {
+    this.mapping = Mapping.getMapping()
+    Hooks.on("getActorDirectoryFolderContext", (actorDirectory, menus) => { ExportScriptarium.INSTANCE.onActorDirectoryMenu(actorDirectory, menus) })
+    Hooks.on("getActorDirectoryEntryContext", (actorDirectory, menus) => { ExportScriptarium.INSTANCE.onActorDirectoryMenu(actorDirectory, menus) })
+  }
+
+  onActorDirectoryMenu(actorDirectory, menus) {
+    menus.push({
+      name: 'Export Personnages',
+      icon: IMG_SCRIPTARIUM,
+      condition: (target) => game.user.isGM &&
+        OptionsAvancees.isUsing(EXPORT_CSV_SCRIPTARIUM) &&
+        this.$getActors(actorDirectory, target).length > 0,
+      callback: target => this.exportActors(this.$getActors(actorDirectory, target), this.$getTargetName(actorDirectory, target))
+    })
+  }
+
+  $getTargetName(actorDirectory, target) {
+    const li = target.closest(".directory-item")
+    const folderId = li.data("folderId")
+    const actorId = li.data("documentId")
+    return actorId
+      ? game.actors.get(actorId).name
+      : actorDirectory.folders.find(it => it.id == folderId).name
+  }
+
+  $getActors(actorDirectory, target) {
+    const li = target.closest(".directory-item")
+    const folderId = li.data("folderId")
+    const actorId = li.data("documentId")
+    const actors = actorId
+      ? [game.actors.get(actorId)]
+      : folderId
+        ? actorDirectory.folders.find(it => it.id == folderId).contents
+        : []
+    return actors.filter(it => it.type == ACTOR_TYPES.personnage)
+  }
+
+  exportActors(actors, targetName) {
+    const eol = '\n'
+    const header = Misc.join(this.getHeaderLine(), ';')
+    const actorLines = actors.map(actor => Misc.join(this.getActorLine(actor), ';'))
+    const data = Misc.join([header, ...actorLines], eol)
+    const filename = `scriptarium-${targetName?.slugify()}.csv`;
+    saveDataToFile(data, "text/csv;charset=utf-8", `${filename}`);
+  }
+
+  getHeaderLine() {
+    return this.mapping.map(it => it.column)
+  }
+
+  getActorLine(actor) {
+    const context = Mapping.prepareContext(actor)
+    return this.mapping.map(it => it.getter(actor, context))
+      //.map(it => JSON.stringify(it))
+      .map(it => this.$escapeQuotes(it))
+      .map(it => it.replaceAll("\n", " ").replaceAll("\r", ""))
+  }
+
+  $escapeQuotes(it) {
+    it = '' + it
+    if (it.includes('"') || it.includes(';')) {
+      return `"${it.replaceAll('"', '\\"')}"`
+    }
+    return it
+  }
+}

module/actor/export-scriptarium/mapping.js

@@ -0,0 +1,308 @@
+import { Grammar } from "../../grammar.js"
+import { RdDItemArme } from "../../item-arme.js"
+import { RdDItemCompetence } from "../../item-competence.js"
+import { RdDItemSort } from "../../item-sort.js"
+import { ITEM_TYPES } from "../../item.js"
+import { Misc } from "../../misc.js"
+import { RdDTimestamp } from "../../time/rdd-timestamp.js"
+import { RdDBonus } from "../../rdd-bonus.js"
+
+
+const CATEGORIES_COMPETENCES = [
+  "generale",
+  "particuliere",
+  "specialisee",
+  "connaissance",
+]
+const CATEGORIES_DRACONIC = [
+  "draconic",
+]
+
+const CATEGORIES_COMBAT = [
+  "melee",
+  "tir",
+  "lancer"
+]
+
+const NIVEAU_BASE = {
+  "generale": -4,
+  "particuliere": -8,
+  "specialisee": -11,
+  "connaissance": -11,
+  "draconic": -11,
+  "melee": -6,
+  "tir": -8,
+  "lancer": -8,
+}
+
+class ColumnMappingFactory {
+  static createMappingArme(part, i) {
+    return { column: `arme-${part}-${i}`, getter: (actor, context) => Mapping.getArme(actor, context, part, i) }
+  }
+
+  static createMappingSort(part, i) {
+    return { column: `sort-${part}-${i}`, getter: (actor, context) => Mapping.getSort(actor, context, part, i) }
+  }
+}
+
+const NB_ARMES = 10
+const NB_SORTS = 20
+const TABLEAU_ARMES = [...Array(NB_ARMES).keys()]
+const TABLEAU_SORTS = [...Array(NB_SORTS).keys()]
+
+const MAPPING_BASE = [
+  { column: "ID", getter: (actor, context) => actor.id },
+  { column: "name", getter: (actor, context) => actor.name },
+  //    { column: "biographie", getter: (actor, context) => actor.system.biographie },
+  { column: "taille", getter: (actor, context) => actor.system.carac.taille.value },
+  { column: "apparence", getter: (actor, context) => actor.system.carac.apparence.value },
+  { column: "constitution", getter: (actor, context) => actor.system.carac.constitution.value },
+  { column: "force", getter: (actor, context) => actor.system.carac.force.value },
+  { column: "agilite", getter: (actor, context) => actor.system.carac.agilite.value },
+  { column: "dexterite", getter: (actor, context) => actor.system.carac.dexterite.value },
+  { column: "vue", getter: (actor, context) => actor.system.carac.vue.value },
+  { column: "ouie", getter: (actor, context) => actor.system.carac.ouie.value },
+  { column: "odoratgout", getter: (actor, context) => actor.system.carac.odoratgout.value },
+  { column: "volonte", getter: (actor, context) => actor.system.carac.volonte.value },
+  { column: "intellect", getter: (actor, context) => actor.system.carac.intellect.value },
+  { column: "empathie", getter: (actor, context) => actor.system.carac.empathie.value },
+  { column: "reve", getter: (actor, context) => actor.system.carac.reve.value },
+  { column: "chance", getter: (actor, context) => actor.system.carac.chance.value },
+  { column: "melee", getter: (actor, context) => actor.system.carac.melee.value },
+  { column: "tir", getter: (actor, context) => actor.system.carac.tir.value },
+  { column: "lancer", getter: (actor, context) => actor.system.carac.lancer.value },
+  { column: "derobee", getter: (actor, context) => actor.system.carac.derobee.value },
+  { column: "vie", getter: (actor, context) => actor.system.sante.vie.max },
+  { column: "plusdom", getter: (actor, context) => actor.system.attributs.plusdom.value },
+  { column: "protectionnaturelle", getter: (actor, context) => actor.system.attributs.protection.value },
+  { column: "endurance", getter: (actor, context) => actor.system.sante.endurance.max },
+  { column: "description", getter: (actor, context) => Mapping.getDescription(actor) },
+  { column: "armure", getter: (actor, context) => Mapping.getArmure(actor, context) },
+  { column: "protection", getter: (actor, context) => Mapping.getProtectionArmure(actor, context) },
+  { column: "malus-armure", getter: (actor, context) => Mapping.getMalusArmure(actor, context) },
+  { column: "esquive", getter: (actor, context) => Mapping.getEsquiveNiveau(context) },
+  { column: "competences", getter: (actor, context) => Mapping.getCompetences(actor, CATEGORIES_COMPETENCES) },
+  { column: "draconic", getter: (actor, context) => Mapping.getCompetences(actor, CATEGORIES_DRACONIC) },
+]
+
+const MAPPING_ARMES = TABLEAU_ARMES.map(i => ColumnMappingFactory.createMappingArme('name', i))
+  .concat(TABLEAU_ARMES.map(i => ColumnMappingFactory.createMappingArme('niveau', i)))
+  .concat(TABLEAU_ARMES.map(i => ColumnMappingFactory.createMappingArme('init', i)))
+  .concat(TABLEAU_ARMES.map(i => ColumnMappingFactory.createMappingArme('dommages', i)))
+const MAPPING_SORTS = TABLEAU_SORTS.map(i => ColumnMappingFactory.createMappingSort('voie', i))
+  .concat(TABLEAU_SORTS.map(i => ColumnMappingFactory.createMappingSort('description', i)))
+  .concat(TABLEAU_SORTS.map(i => ColumnMappingFactory.createMappingSort('bonus', i)))
+const MAPPING = MAPPING_BASE
+  .concat(MAPPING_ARMES)
+  .concat(MAPPING_SORTS)
+
+export class Mapping {
+
+  static getMapping() {
+    return MAPPING
+  }
+
+  static prepareContext(actor) {
+    return {
+      armes: Mapping.prepareArmes(actor),
+      armure: Mapping.prepareArmure(actor),
+      esquive: Mapping.prepareEsquive(actor),
+      sorts: Mapping.prepareSorts(actor)
+    }
+  }
+
+  static prepareArmes(actor) {
+    const armes = actor.items.filter(it => it.type == ITEM_TYPES.arme)
+    return armes.map(arme =>
+      [
+        arme.system.tir != "" ? Mapping.prepareArme(actor, arme, 'tir') : undefined,
+        arme.system.lancer = "" ? Mapping.prepareArme(actor, arme, 'lancer') : undefined,
+        arme.system.unemain ? Mapping.prepareArme(actor, arme, 'unemain') : undefined,
+        arme.system.deuxmains ? Mapping.prepareArme(actor, arme, 'deuxmains') : undefined,
+        !(arme.system.unemain || arme.system.deuxmains) ? Mapping.prepareArme(actor, arme, 'competence') : undefined
+      ]
+        .filter(it => it != undefined)
+    ).reduce((a, b) => a.concat(b), [])
+  }
+
+  static prepareArme(actor, arme, maniement) {
+    const nameCompArme = RdDItemArme.getCompetenceArme(arme, maniement)
+    const competence = actor.getCompetence(nameCompArme)
+    if (RdDItemCompetence.isNiveauBase(competence)) {
+      return undefined
+    }
+    const dmgArme = RdDItemArme.dommagesReels(arme, maniement)
+    const dommages = dmgArme + RdDBonus.bonusDmg(actor, maniement, dmgArme)
+    return {
+      name: arme.name,
+      niveau: Misc.toSignedString(competence.system.niveau),
+      init: Mapping.calculBaseInit(actor, competence.system.categorie) + competence.system.niveau,
+      dommages: Misc.toSignedString(dommages)
+    }
+  }
+
+  static calculBaseInit(actor, categorie) {
+    const mapping = MAPPING_BASE.find(it => it.column == categorie)
+    if (mapping) {
+      switch (categorie) {
+        case 'melee':
+        case 'tir':
+        case 'lancer':
+          const caracteristique = Number(actor.system.carac[categorie].value)
+          return Math.floor(caracteristique / 2)
+      }
+    }
+    return 0
+  }
+
+  static prepareArmure(actor) {
+    const armures = actor.itemTypes[ITEM_TYPES.armure].filter(it => it.system.equipe)
+    if (armures.length > 1) {
+      console.warn(`${actor.name} a équipé ${armures.length} armures, seule la première sera considérée`)
+    }
+    if (armures.length > 0) {
+      const armure = armures[0]
+      return {
+        name: armure.name,
+        protection: armure.system.protection,
+        malus: armure.system.malus ?? 0
+      }
+    }
+    return {
+      name: '',
+      protection: actor.system.attributs.protection.value,
+      malus: 0
+    }
+  }
+
+  static prepareEsquive(actor) {
+    const esquives = actor.getCompetences("Esquive")
+    if (esquives.length > 0) {
+      const esquive = esquives[0]
+      return {
+        name: esquive.name,
+        niveau: Misc.toSignedString(esquive.system.niveau)
+      }
+    }
+    return undefined
+  }
+
+  static prepareSorts(actor) {
+    return actor.itemTypes[ITEM_TYPES.sort].map(it => Mapping.prepareSort(it))
+  }
+
+  static prepareSort(sort) {
+    return {
+      voie: RdDItemSort.getCodeDraconic(sort),
+      description: Mapping.descriptionSort(sort),
+      bonus: Mapping.bonusCase(sort)
+    }
+  }
+
+  static descriptionSort(sort) {
+    const ptSeuil = Array(sort.system.coutseuil).map(it => '*')
+    const caseTMR = sort.system.caseTMRspeciale.length > 0 ? sort.system.caseTMRspeciale : sort.system.caseTMR
+    return `${sort.name}${ptSeuil} (${caseTMR}) R${sort.system.difficulte} r${sort.system.ptreve}`
+  }
+
+  static bonusCase(sort) {
+    const list = RdDItemSort.bonuscaseStringToList(sort.system.bonuscase).sort(Misc.descending(it => it.bonus))
+    if (list.length > 0) {
+      const bonus = list[0]
+      return `+${bonus.bonus}% en ${bonus.case}`
+    }
+    return ''
+  }
+
+  static getDescription(actor) {
+    const sexe = actor.system.sexe
+    const sexeFeminin = sexe.length > 0 && sexe.charAt(0).toLowerCase() == 'f' ? '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 age = actor.system.age ? `${actor.system.age} ans` : undefined
+    const taille = actor.system.taille
+    const poids = actor.system.poids
+    const cheveux = actor.system.cheveux ? `cheveux ${actor.system.cheveux}` : undefined
+    const yeux = actor.system.yeux ? `yeux ${actor.system.yeux}` : undefined
+    const beaute = actor.system.beaute ? `Beauté ${actor.system.beaute}` : undefined
+    const list = [race, hn, age, taille, poids, cheveux, yeux, beaute]
+    return Misc.join(list.filter(it => it), ', ')
+  }
+
+  static getArmure(actor, context) {
+    return context.armure?.name ?? ''
+  }
+
+  static getProtectionArmure(actor, context) {
+    return Number(context?.armure?.protection ?? 0) + Number(actor.system.attributs.protection.value)
+  }
+
+  static getMalusArmure(actor, context) {
+    return context?.armure?.malus ?? 0
+  }
+
+  static getEsquiveNiveau(context) {
+    if (context.esquive) {
+      const niveau = context.esquive.niveau + context.armure.malus
+      return niveau > 0 ? ('+' + niveau) : ('' + niveau)
+    }
+    return ''
+  }
+
+  static getCompetences(actor, categories) {
+    const competences = Mapping.getCompetencesCategorie(actor, categories)
+    if (competences.length == 0) {
+      return ''
+    }
+    const byCartegories = Mapping.competencesByCategoriesByNiveau(competences, categories)
+    const txtByCategories = Object.values(byCartegories)
+      .map(it => it.competencesParNiveau)
+      .map(byNiveau => {
+        const niveaux = Object.keys(byNiveau).map(it => Number(it)).sort(Misc.ascending())
+        if (niveaux.length == 0) {
+          return ''
+        }
+        const txtCategorieByNiveau = niveaux.map(niveau => {
+          const names = Misc.join(byNiveau[niveau].map(it => it.name).sort(Misc.ascending()), ', ')
+          return names + ' ' + Misc.toSignedString(niveau)
+        })
+        const txtCategorie = Misc.join(txtCategorieByNiveau, ' / ')
+        return txtCategorie
+      }).filter(it => it != '')
+
+    return Misc.join(txtByCategories, ' / ')
+  }
+
+  static competencesByCategoriesByNiveau(competences, categories) {
+    return categories.map(c => {
+      return {
+        categorie: c,
+        competencesParNiveau: Misc.classify(
+          competences.filter(comp => comp.system.categorie == c),
+          comp => comp.system.niveau)
+      }
+    })
+  }
+
+  static getArme(actor, context, part, numero) {
+    if (numero < context.armes.length) {
+      return context.armes[numero][part] ?? ''
+    }
+    return ''
+  }
+
+  static getCompetencesCategorie(actor, categories) {
+    return actor.itemTypes[ITEM_TYPES.competence]
+      .filter(it => categories.includes(it.system.categorie))
+      .filter(it => !RdDItemCompetence.isNiveauBase(it))
+  }
+
+  static getSort(actor, context, part, numero) {
+    if (numero < context.sorts.length) {
+      return context.sorts[numero][part]
+    }
+    return ''
+  }
+}
+

module/actor/vehicule-sheet.js

@@ -6,16 +6,16 @@ export class RdDActorVehiculeSheet extends RdDBaseActorSheet {
 
   /** @override */
   static get defaultOptions() {
-    return mergeObject(RdDBaseActorSheet.defaultOptions, {
+    return foundry.utils.mergeObject(RdDBaseActorSheet.defaultOptions, {
       template: "systems/foundryvtt-reve-de-dragon/templates/actor-vehicule-sheet.html",
       width: 640, height: 720,
-    });
+    }, { inplace: false })
   }
 
   /* -------------------------------------------- */
   async getData() {
     let formData = await super.getData();
-    mergeObject(formData,
+    foundry.utils.mergeObject(formData,
       {
         editable: this.isEditable,
         cssClass: this.isEditable ? "editable" : "locked",

module/chat-utility.js

@@ -1,5 +1,6 @@
 import { Misc } from "./misc.js";
 import { SYSTEM_RDD, SYSTEM_SOCKET_ID } from "./constants.js";
+import { RdDTimestamp } from "./time/rdd-timestamp.js";
 
 
 /**
@@ -131,7 +132,7 @@ export class ChatUtility {
 
   /* -------------------------------------------- */
   static blindMessageToGM(chatOptions) {
-    let chatGM = duplicate(chatOptions);
+    let chatGM = foundry.utils.duplicate(chatOptions);
     chatGM.whisper = ChatUtility.getUsers(user => user.isGM);
     chatGM.content = "Message aveugle de " + game.user.name + "<br>" + chatOptions.content;
     console.log("blindMessageToGM", chatGM);
@@ -148,14 +149,13 @@ export class ChatUtility {
   }
 
   static async setMessageData(chatMessage, key, flag) {
-    if (flag) {
+    if (flag && chatMessage.isAuthor) {
-      await chatMessage.setFlag(SYSTEM_RDD, key, JSON.stringify(flag));
+      await chatMessage.setFlag(SYSTEM_RDD, key, flag)
     }
   }
 
   static getMessageData(chatMessage, key) {
-    const json = chatMessage.getFlag(SYSTEM_RDD, key);
+    return chatMessage.getFlag(SYSTEM_RDD, key);
-    return json ? JSON.parse(json) : undefined;
   }
 
   static getChatMessage(event) {
@@ -163,4 +163,19 @@ export class ChatUtility {
     return game.messages.get(chatMessageId);
   }
 
+  static async onRenderChatMessage(chatMessage, html, data) {
+    const rddTimestamp = chatMessage.getFlag(SYSTEM_RDD, 'rdd-timestamp')
+    if (rddTimestamp) {
+      const timestamp = new RdDTimestamp(rddTimestamp);
+      const timestampData = timestamp.toCalendrier();
+      const dateHeure = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/common/date-heure.hbs', timestampData);
+      html.find('header.message-header .message-sender').after(dateHeure)
+    }
+  }
+
+  static async onCreateChatMessage(chatMessage, options, id) {
+    if (chatMessage.isAuthor) {
+      await chatMessage.setFlag(SYSTEM_RDD, 'rdd-timestamp', game.system.rdd.calendrier.getTimestamp());
+    }
+  }
 }

module/coeur/rdd-coeur.js

@@ -69,7 +69,7 @@ export class RdDCoeur {
   }
 
   static async applyCoeurChateauDormant(actor, message) {
-    const newSuivants = duplicate(actor.system.subacteurs.suivants)
+    const newSuivants = foundry.utils.duplicate(actor.system.subacteurs.suivants)
     let count = 0
     newSuivants.forEach(async link => {
       const suivant = game.actors.get(link.id)
@@ -117,8 +117,8 @@ export class RdDCoeur {
     }
     ChatUtility.removeChatMessageId(infoCoeur.chatMessageId)
 
-    infoCoeur.target.jetTendre = (await (new Roll('1d6').evaluate({ async: true }))).total
+    infoCoeur.target.jetTendre = (await (new Roll('1d6').evaluate())).total
-    infoCoeur.source.jetTendre = (await (new Roll('1d6').evaluate({ async: true }))).total
+    infoCoeur.source.jetTendre = (await (new Roll('1d6').evaluate())).total
     const diff = Math.abs(infoCoeur.source.jetTendre - infoCoeur.target.jetTendre)
     for (let amoureux of [infoCoeur.source, infoCoeur.target]) {
       const actorAmoureux = game.actors.get(amoureux.actor.id);

module/constants.js

@@ -8,3 +8,46 @@ export const SHOW_DICE = 'show';
 export const ENTITE_INCARNE = 'incarne';
 export const ENTITE_NONINCARNE = 'nonincarne';
 export const ENTITE_BLURETTE = 'blurette';
+
+export const RDD_CONFIG = {
+  niveauEthylisme : [
+    {value: "1", label: "Aucun"},
+    {value: "0", label: "Eméché (0)"},
+    {value: "-1", label: "Gris (-1)"},
+    {value: "-2", label: "Pinté (-2)"},
+    {value: "-3", label: "Pas Frais (-3)"},
+    {value: "-4", label: "Ivre (-4)"},
+    {value: "-5", label: "Bu (-5)"},
+    {value: "-6", label: "Complètement fait (-6)"},
+    {value: "-7", label: "Ivre mort (-7)"}
+  ],
+  categorieEntite: {
+    "cauchemar": "Cauchemar",
+    "reve": "Rêve"
+  },
+  typeEntite: {
+    "incarne": "Incarnée",
+    "nonincarne": "Non Incarnée",
+    "blurette": "Blurette"
+  },
+  heuresRdD : [
+    {value : "vaisseau", label: "Vaisseau", img: "modules/foundryvtt-reve-de-dragon/icons/heures/hd01.webp"},
+    {value : "sirene", label: "Sirène", img: "modules/foundryvtt-reve-de-dragon/icons/heures/hd02.webp"},
+    {value : "faucon", label: "Faucon", img: "modules/foundryvtt-reve-de-dragon/icons/heures/hd03.webp"},
+    {value : "couronne", label: "Couronne", img: "modules/foundryvtt-reve-de-dragon/icons/heures/hd04.webp"},
+    {value : "dragon", label: "Dragon", img: "modules/foundryvtt-reve-de-dragon/icons/heures/hd05.webp"},
+    {value : "epees", label: "Epées", img: "modules/foundryvtt-reve-de-dragon/icons/heures/hd06.webp"},
+    {value : "lyre", label: "Lyre", img: "modules/foundryvtt-reve-de-dragon/icons/heures/hd07.webp"},
+    {value : "serpent", label: "Serpent", img: "modules/foundryvtt-reve-de-dragon/icons/heures/hd08.webp"},
+    {value : "poissonacrobate", label: "Poisson Acrobate", img: "modules/foundryvtt-reve-de-dragon/icons/heures/hd09.webp"},
+    {value : "araignee", label: "Araignée", img: "modules/foundryvtt-reve-de-dragon/icons/heures/hd10.webp"},
+    {value : "roseau", label: "Roseau", img: "modules/foundryvtt-reve-de-dragon/icons/heures/hd11.webp"},
+    {value : "chateaudormant", label: "Chateau Dormant", img: "modules/foundryvtt-reve-de-dragon/icons/heures/hd12.webp"}    
+  ],
+  raretes: [
+    {value: "Commune", label: "Commune"},
+    {value: "Frequente", label: "Fréquente"},
+    {value: "Rare", label: "Rare"},
+    {value: "Rarissime", label: "Rarissime"}
+  ]
+}

module/dialog-choix-xp-carac.js

@@ -2,8 +2,8 @@
 export class DialogChoixXpCarac extends Dialog {
 
   static async choix(actor, xpData, caracs) {
-    caracs = caracs.map(it => mergeObject({ ajout: 0 }, it))
+    caracs = caracs.map(it => foundry.utils.mergeObject({ ajout: 0 }, it))
-    xpData = mergeObject({ reste: xpData.xpCarac }, xpData)
+    xpData = foundry.utils.mergeObject({ reste: xpData.xpCarac }, xpData)
     const dialogData = {
       title: `Choisissez la répartition d'expérience`,
       content: await renderTemplate("systems/foundryvtt-reve-de-dragon/templates/dialog-choix-xp-carac.hbs", {
@@ -24,7 +24,7 @@ export class DialogChoixXpCarac extends Dialog {
   }
 
   constructor(dialogData, dialogOptions, actor, xpData, caracs) {
-    dialogData = mergeObject(dialogData, {
+    dialogData = foundry.utils.mergeObject(dialogData, {
       default: 'appliquer',
       buttons: {
         'appliquer': { icon:'<i class="fa-solid fa-check"></i>', label: "Ajouter la répartition", callback: it => this.appliquerSelection() }

module/dialog-fabriquer-potion.js

@@ -21,7 +21,7 @@ export class DialogFabriquerPotion extends Dialog {
 
   /* -------------------------------------------- */
   static prepareData(actor, item) {
-    let potionData = duplicate(item)
+    let potionData = foundry.utils.duplicate(item)
     potionData.nbBrinsSelect = RdDUtility.buildListOptions(
       DialogFabriquerPotion.nombreBrinsMinimum(item),
       DialogFabriquerPotion.nombreBrinsOptimal(item));

module/dialog-item-consommer.js

@@ -47,7 +47,7 @@ export class DialogConsommer extends Dialog {
   /* -------------------------------------------- */
   static prepareData(actor, item) {
     let consommerData = {
-      item: duplicate(item),
+      item: foundry.utils.duplicate(item),
       cuisine: actor.getCompetence('cuisine'),
       choix: {
         doses: 1,

module/item-arme.js

@@ -1,5 +1,5 @@
 import { RdDItemCompetenceCreature } from "./item-competencecreature.js"
-import { TYPES } from "./item.js";
+import { ITEM_TYPES } from "./item.js";
 import { RdDCombatManager } from "./rdd-combat.js";
 
 const nomCategorieParade = {
@@ -20,19 +20,35 @@ const nomCategorieParade = {
 export class RdDItemArme extends Item {
 
   static isArme(item) {
-    return item.type == TYPES.arme || RdDItemCompetenceCreature.getCategorieAttaque(item);
+    return item.type == ITEM_TYPES.arme || RdDItemCompetenceCreature.getCategorieAttaque(item);
   }
 
   /* -------------------------------------------- */
   static getArme(arme) {
     switch (arme ? arme.type : '') {
-      case TYPES.arme: return arme;
+      case ITEM_TYPES.arme: return arme;
-      case TYPES.competencecreature:
+      case ITEM_TYPES.competencecreature:
         return RdDItemCompetenceCreature.armeCreature(arme);
     }
     return RdDItemArme.mainsNues();
   }
 
+  static getCompetenceArme(arme, maniement) {
+    switch (arme.type) {
+      case ITEM_TYPES.competencecreature:
+        return arme.name
+      case ITEM_TYPES.arme:
+        switch (maniement) {
+          case 'competence': return arme.system.competence;
+          case 'unemain': return RdDItemArme.competence1Mains(arme);
+          case 'deuxmains': return RdDItemArme.competence2Mains(arme);
+          case 'tir': return arme.system.tir;
+          case 'lancer': return arme.system.lancer;
+        }
+    }
+    return undefined
+  }
+
   static computeNiveauArmes(armes, competences) {
     for (const arme of armes) {
       arme.system.niveau = RdDItemArme.niveauCompetenceArme(arme, competences);
@@ -68,14 +84,14 @@ export class RdDItemArme extends Item {
       return armeData.system.categorie_parade;
     }
     // pour compatibilité avec des personnages existants
-    if (armeData.type == TYPES.competencecreature || armeData.system.categorie == 'creature') {
+    if (armeData.type == ITEM_TYPES.competencecreature || armeData.system.categorie == 'creature') {
       return armeData.system.categorie_parade || (armeData.system.isparade ? 'armes-naturelles' : '');
     }
     if (!armeData.type.match(/arme|competencecreature/)) {
       return '';
     }
     if (armeData.system.competence == undefined) {
-      return TYPES.competencecreature;
+      return ITEM_TYPES.competencecreature;
     }
     let compname = armeData.system.competence.toLowerCase();
     if (compname.match(/^(dague de jet|javelot|fouet|arc|arbalête|fronde|hache de jet|fléau)$/)) return '';
@@ -132,43 +148,46 @@ export class RdDItemArme extends Item {
     return true;
   }
 
-  /* -------------------------------------------- */
+  static dommagesReels(arme, maniement) {
-  static armeUneOuDeuxMains(armeData, aUneMain) {
+    switch (maniement) {
-    if (armeData && !armeData.system.cac) {
+      case 'tir':
-      armeData.system.unemain = armeData.system.unemain || !armeData.system.deuxmains;
+      case 'lancer':
-      const uneOuDeuxMains = armeData.system.unemain && armeData.system.deuxmains;
+      case 'competence':
-      const containsSlash = !Number.isInteger(armeData.system.dommages) && armeData.system.dommages.includes("/");
+        return Number(arme.system.dommages)
-      if (containsSlash) { // Sanity check
-        armeData = duplicate(armeData);
-
-        const tableauDegats = armeData.system.dommages.split("/");
-        if (aUneMain)
-          armeData.system.dommagesReels = Number(tableauDegats[0]);
-        else // 2 mains
-          armeData.system.dommagesReels = Number(tableauDegats[1]);
-      }
-      else {
-        armeData.system.dommagesReels = Number(armeData.system.dommages);
-      }
-
-      if (uneOuDeuxMains != containsSlash) {
-        ui.notifications.info("Les dommages de l'arme à 1/2 mains " + armeData.name + " ne sont pas corrects (ie sous la forme X/Y)");
-      }
     }
-    return armeData;
+    if (arme.system.unemain && arme.system.deuxmains) {
+      const containsSlash = !Number.isInteger(arme.system.dommages) && arme.system.dommages.includes("/")
+      if (!containsSlash) {
+        ui.notifications.info("Les dommages de l'arme à 1/2 mains " + arme.name + " ne sont pas corrects (ie sous la forme X/Y)");
+        return Number(arme.system.dommages)
+      }
+      const tableauDegats = arme.system.dommages.split("/");
+      return Number(tableauDegats[maniement == 'unemain' ? 0 : 1])
+    }
+    return Number(arme.system.dommages);
   }
-  static competence2Mains(arme) {
+
-    return arme.system.competence.replace(" 1 main", " 2 mains");
+  /* -------------------------------------------- */
+  static armeUneOuDeuxMains(arme, aUneMain) {
+    if (arme && !arme.system.cac) {
+      arme = foundry.utils.duplicate(arme);
+      arme.system.dommagesReels = RdDItemArme.dommagesReels(arme, aUneMain ? 'unemain' : 'deuxmains')
+    }
+    return arme;
   }
 
   static competence1Mains(arme) {
     return arme.system.competence.replace(" 2 mains", " 1 main");
   }
 
+  static competence2Mains(arme) {
+    return arme.system.competence.replace(" 1 main", " 2 mains");
+  }
+
   static isArmeUtilisable(arme) {
     switch (arme.type) {
-      case TYPES.arme: return arme.system.equipe && (arme.system.resistance > 0 || arme.system.portee_courte > 0)
+      case ITEM_TYPES.arme: return arme.system.equipe && (arme.system.resistance > 0 || arme.system.portee_courte > 0)
-      case TYPES.competencecreature: return true
+      case ITEM_TYPES.competencecreature: return true
     }
     return false
   }
@@ -180,11 +199,11 @@ export class RdDItemArme extends Item {
 
   static corpsACorps(actor) {
     let competence = actor?.getCompetenceCorpsACorps() ?? { system: { niveau: -6 } };
-    let melee = actor? actor.system.carac['melee'].value : 0
+    let melee = actor ? actor.system.carac['melee'].value : 0
     return {
       _id: competence?.id,
       name: 'Corps à corps',
-      type: TYPES.arme,
+      type: ITEM_TYPES.arme,
       img: 'systems/foundryvtt-reve-de-dragon/icons/competence_corps_a_corps.webp',
       system: {
         initiative: RdDCombatManager.calculInitiative(competence.system.niveau, melee),

module/item-competence.js

@@ -199,7 +199,7 @@ export class RdDItemCompetence extends Item {
     if (idOrName == undefined || idOrName == "") {
       return RdDItemCompetence.sansCompetence();
     }
-    options = mergeObject(options, { preFilter: it => it.isCompetence(), description: 'compétence' }, { overwrite: false });
+    options = foundry.utils.mergeObject(options, { preFilter: it => it.isCompetence(), description: 'compétence' }, { overwrite: false, inplace: false });
     return RdDItemCompetence.findFirstItem(list, idOrName, options);
   }
 
@@ -257,7 +257,7 @@ export class RdDItemCompetence extends Item {
 
   /* -------------------------------------------- */
   static computeResumeArchetype(competences) {
-    const computed = duplicate(limitesArchetypes);
+    const computed = foundry.utils.duplicate(limitesArchetypes);
     computed.forEach(it => { it.nombre = 0; it.reste = it.nombreMax; });
 
     competences.map(it => Math.max(0, it.system.niveau_archetype))

module/item-competencecreature.js

@@ -1,5 +1,5 @@
 
-import { TYPES } from "./item.js";
+import { ITEM_TYPES } from "./item.js";
 import { RdDCombatManager } from "./rdd-combat.js";
 
 const categories = {
@@ -33,8 +33,7 @@ export class RdDItemCompetenceCreature extends Item {
     if (categorieAttaque != undefined) {
       // si c'est un Item compétence: cloner pour ne pas modifier la compétence
       let arme = item.clone();
-      mergeObject(arme,
+      return foundry.utils.mergeObject(arme, {
-        {
           action: item.isCompetencePossession() ? 'possession' : 'attaque',
           system: {
             competence: arme.name,
@@ -48,15 +47,14 @@ export class RdDItemCompetenceCreature extends Item {
             force: 0,
             rapide: true,
           }
-        });
+        }, { inplace: false });
-      return arme;
     }
     return undefined;
   }
 
   /* -------------------------------------------- */
   static isCompetenceAttaque(item) {
-    if (item.type == TYPES.competencecreature) {
+    if (item.type == ITEM_TYPES.competencecreature) {
       switch (item.system.categorie) {
         case "melee":
         case "tir":
@@ -70,7 +68,7 @@ export class RdDItemCompetenceCreature extends Item {
   }
 
   static getCategorieAttaque(item) {
-    if (item.type == TYPES.competencecreature) {
+    if (item.type == ITEM_TYPES.competencecreature) {
       switch (item.system.categorie) {
         case "melee":
         case "tir":
@@ -84,7 +82,7 @@ export class RdDItemCompetenceCreature extends Item {
     return undefined
   }
   static isDommages(item) {
-    if (item.type == TYPES.competencecreature) {
+    if (item.type == ITEM_TYPES.competencecreature) {
       switch (item.system.categorie) {
         case "melee":
         case "tir":
@@ -96,7 +94,7 @@ export class RdDItemCompetenceCreature extends Item {
     return false
   }
   static isParade(item) {
-    if (item.type == TYPES.competencecreature) {
+    if (item.type == ITEM_TYPES.competencecreature) {
       switch (item.system.categorie) {
         case "melee":
         case "naturelle":

module/item-monnaie.js

@@ -57,7 +57,7 @@ export class Monnaie {
   }
 
   static creerDeniers(fortune) {
-    const deniers = duplicate(MONNAIE_ETAIN);
+    const deniers = foundry.utils.duplicate(MONNAIE_ETAIN);
     deniers.system.quantite = fortune;
     return deniers;
   }

module/item-sheet.js

@@ -12,7 +12,7 @@ import { SystemCompendiums } from "./settings/system-compendiums.js";
 import { Misc } from "./misc.js";
 import { RdDTimestamp } from "./time/rdd-timestamp.js";
 import { RdDItemCompetenceCreature } from "./item-competencecreature.js";
-import { TYPES } from "./item.js";
+import { ITEM_TYPES } from "./item.js";
 
 /**
  * Extend the basic ItemSheet for RdD specific items
@@ -39,12 +39,12 @@ export class RdDItemSheet extends ItemSheet {
 
   /** @override */
   static get defaultOptions() {
-    return mergeObject(super.defaultOptions, {
+    return foundry.utils.mergeObject(super.defaultOptions, {
       classes: [SYSTEM_RDD, "sheet", "item"],
       template: RdDItemSheet.defaultTemplate(RdDItemSheet.ITEM_TYPE),
       width: 550,
       height: 550
-    });
+    }, { inplace: false });
   }
 
   /* -------------------------------------------- */
@@ -53,7 +53,8 @@ export class RdDItemSheet extends ItemSheet {
   }
 
   get title() {
-    return `${Misc.typeName('Item', this.item.type)}: ${this.item.name}`;
+    const owner = (this.item.parent instanceof Actor) ? `(${this.item.parent.name})` : '';
+    return `${Misc.typeName('Item', this.item.type)}: ${this.item.name} ${owner}`;
   }
 
   /* -------------------------------------------- */
@@ -98,9 +99,9 @@ export class RdDItemSheet extends ItemSheet {
       description: await TextEditor.enrichHTML(this.item.system.description, { async: true }),
       descriptionmj: await TextEditor.enrichHTML(this.item.system.descriptionmj, { async: true }),
       isComestible: this.item.getUtilisationCuisine(),
-      options: RdDSheetUtility.mergeDocumentRights(this.options, this.item, this.isEditable)
+      options: RdDSheetUtility.mergeDocumentRights(this.options, this.item, this.isEditable),
     }
-    if (this.item.type == TYPES.competencecreature) {
+    if (this.item.type == ITEM_TYPES.competencecreature) {
       formData.isparade = RdDItemCompetenceCreature.isParade(this.item)
       formData.isdommages = RdDItemCompetenceCreature.isDommages(this.item)
     }
@@ -108,8 +109,8 @@ export class RdDItemSheet extends ItemSheet {
     const competences = await SystemCompendiums.getCompetences('personnage');
     formData.categories = this.item.getCategories()
     if (this.item.type == 'tache' || this.item.type == 'livre' || this.item.type == 'meditation' || this.item.type == 'oeuvre') {
-      formData.caracList = duplicate(game.system.model.Actor.personnage.carac)
+      formData.caracList = foundry.utils.duplicate(game.model.Actor.personnage.carac)
-      formData.caracList["reve-actuel"] = duplicate(game.system.model.Actor.personnage.reve.reve)
+      formData.caracList["reve-actuel"] = foundry.utils.duplicate(game.model.Actor.personnage.reve.reve)
       formData.competences = competences;
     }
     if (this.item.type == 'arme') {
@@ -228,7 +229,7 @@ export class RdDItemSheet extends ItemSheet {
       });
     }
 
-    const updateItemTimestamp = (path, timestamp) => this.item.update({ [path]: duplicate(timestamp) })
+    const updateItemTimestamp = (path, timestamp) => this.item.update({ [path]: foundry.utils.duplicate(timestamp) })
 
     RdDTimestamp.handleTimestampEditor(this.html, 'system.temporel.debut', updateItemTimestamp);
     RdDTimestamp.handleTimestampEditor(this.html, 'system.temporel.fin', updateItemTimestamp);

module/item-sort.js

@@ -1,9 +1,43 @@
+import { Grammar } from "./grammar.js";
+import { RdDItemCompetence } from "./item-competence.js";
+import { ITEM_TYPES } from "./item.js";
 import { Misc } from "./misc.js";
 import { TMRUtility } from "./tmr-utility.js";
 
+const VOIES_DRACONIC = [
+  { code: 'O', label: "Voie d'Oniros", short: 'Oniros' },
+  { code: 'H', label: "Voie d'Hypnos", short: 'Hypnos' },
+  { code: 'N', label: "Voie de Narcos", short: 'Narcos' },
+  { code: 'T', label: "Voie de Thanatos", short: 'Thanatos' },
+  { code: 'O/H/N/T', label: "Oniros/Hypnos/Narcos/Thanatos", short: 'Oniros/Hypnos/Narcos/Thanatos' },
+  { code: 'O/H/N', label: "Oniros/Hypnos/Narcos" }
+]
+
 /* -------------------------------------------- */
 export class RdDItemSort extends Item {
 
+  static getDraconicsSort(draconicList, sort) {
+    switch (Grammar.toLowerCaseNoAccent(sort.name)) {
+      case "lecture d'aura":
+      case "detection d'aura":
+        return draconicList;
+      case "annulation de magie":
+        return draconicList.filter(it => !RdDItemCompetence.isThanatos(it));
+    }
+    return [RdDItemCompetence.getVoieDraconic(draconicList, sort.system.draconic)];
+  }
+
+  static getCodeDraconic(sort) {
+    switch (Grammar.toLowerCaseNoAccent(sort.name)) {
+      case "lecture d'aura":
+      case "detection d'aura":
+        return 'O/H/N/T'
+      case "annulation de magie":
+        return 'O/H/N'
+    }
+    const voie = VOIES_DRACONIC.find(it => it.label.includes(sort.system.draconic))
+    return voie?.code ?? sort.system.draconic
+  }
   /* -------------------------------------------- */
   static isDifficulteVariable(sort) {
     return sort && (sort.system.difficulte.toLowerCase() == "variable");
@@ -31,9 +65,9 @@ export class RdDItemSort extends Item {
 
   /* -------------------------------------------- */
   static buildBonusCaseList(bonuscase, newCase) {
-    const list = RdDItemSort._bonuscaseStringToList(bonuscase)
+    const list = RdDItemSort.bonuscaseStringToList(bonuscase)
     if (newCase) {
-      return list.concat({ case: "Nouvelle", bonus: 0 });
+       list.push({ case: "Nouvelle", bonus: 0 })
     }
     return list;
   }
@@ -44,7 +78,7 @@ export class RdDItemSort extends Item {
   */
   static getBonusCaseList(item, newCase = false) {
     // Gestion spéciale case bonus
-    if (item.type == 'sort') {
+    if (item.type == ITEM_TYPES.sort) {
       return RdDItemSort.buildBonusCaseList(item.system.bonuscase, newCase);
     }
     return undefined;
@@ -104,8 +138,11 @@ export class RdDItemSort extends Item {
       .sort(Misc.ascending())
       .join(',');
   }
-  static _bonuscaseStringToList(bonuscase) {
+  static bonuscaseStringToList(bonuscase) {
-    return (bonuscase ?? '').split(',').map(it => {
+    if (bonuscase == undefined || bonuscase == '') {
+      return []
+    }
+    return bonuscase.split(',').map(it => {
       const b = it.split(':');
       return { case: b[0], bonus: b[1] };
     });

module/item.js

@@ -1,4 +1,4 @@
-import { DialogItemVente } from "./dialog-item-vente.js";
+import { DialogItemVente } from "./achat-vente/dialog-item-vente.js";
 import { Grammar } from "./grammar.js";
 import { Misc } from "./misc.js";
 import { RdDHerbes } from "./rdd-herbes.js";
@@ -9,7 +9,15 @@ import { RdDRaretes } from "./item/raretes.js";
 import { RdDItemCompetence } from "./item-competence.js";
 import { RdDItemCompetenceCreature } from "./item-competencecreature.js";
 
-export const TYPES = {
+export const ACTOR_TYPES = {
+  personnage: 'personnage',
+  creature: 'creature',
+  entite: 'entite',
+  commerce: 'commerce',
+  vehicule: 'vehicule'
+}
+
+export const ITEM_TYPES = {
   competence: 'competence',
   competencecreature: 'competencecreature',
   empoignade: 'empoignade',
@@ -56,33 +64,33 @@ export const TYPES = {
 }
 
 const typesInventaireMateriel = [
-  TYPES.arme,
+  ITEM_TYPES.arme,
-  TYPES.armure,
+  ITEM_TYPES.armure,
-  TYPES.conteneur,
+  ITEM_TYPES.conteneur,
-  TYPES.faune,
+  ITEM_TYPES.faune,
-  TYPES.gemme,
+  ITEM_TYPES.gemme,
-  TYPES.herbe,
+  ITEM_TYPES.herbe,
-  TYPES.plante,
+  ITEM_TYPES.plante,
-  TYPES.ingredient,
+  ITEM_TYPES.ingredient,
-  TYPES.livre,
+  ITEM_TYPES.livre,
-  TYPES.monnaie,
+  ITEM_TYPES.monnaie,
-  TYPES.munition,
+  ITEM_TYPES.munition,
-  TYPES.nourritureboisson,
+  ITEM_TYPES.nourritureboisson,
-  TYPES.objet,
+  ITEM_TYPES.objet,
-  TYPES.potion,
+  ITEM_TYPES.potion,
 ]
 const typesInventaire = {
   materiel: typesInventaireMateriel,
   all: ['service'].concat(typesInventaireMateriel),
 }
 
-const typesObjetsOeuvres = [TYPES.oeuvre, TYPES.recettecuisine, TYPES.musique, TYPES.chant, TYPES.danse, TYPES.jeu]
+const typesObjetsOeuvres = [ITEM_TYPES.oeuvre, ITEM_TYPES.recettecuisine, ITEM_TYPES.musique, ITEM_TYPES.chant, ITEM_TYPES.danse, ITEM_TYPES.jeu]
-const typesObjetsDraconiques = [TYPES.queue, TYPES.ombre, TYPES.souffle, TYPES.tete, TYPES.signedraconique, TYPES.sortreserve, TYPES.rencontre]
+const typesObjetsDraconiques = [ITEM_TYPES.queue, ITEM_TYPES.ombre, ITEM_TYPES.souffle, ITEM_TYPES.tete, ITEM_TYPES.signedraconique, ITEM_TYPES.sortreserve, ITEM_TYPES.rencontre]
-const typesObjetsConnaissance = [TYPES.meditation, TYPES.recettealchimique, TYPES.sort]
+const typesObjetsConnaissance = [ITEM_TYPES.meditation, ITEM_TYPES.recettealchimique, ITEM_TYPES.sort]
-const typesObjetsEffet = [TYPES.possession, TYPES.poison, TYPES.maladie, TYPES.blessure]
+const typesObjetsEffet = [ITEM_TYPES.possession, ITEM_TYPES.poison, ITEM_TYPES.maladie, ITEM_TYPES.blessure]
-const typesObjetsCompetence = [TYPES.competence, TYPES.competencecreature]
+const typesObjetsCompetence = [ITEM_TYPES.competence, ITEM_TYPES.competencecreature]
-const typesObjetsTemporels = [TYPES.blessure, TYPES.poison, TYPES.maladie, TYPES.queue, TYPES.ombre, TYPES.souffle, TYPES.signedraconique, TYPES.rencontre]
+const typesObjetsTemporels = [ITEM_TYPES.blessure, ITEM_TYPES.poison, ITEM_TYPES.maladie, ITEM_TYPES.queue, ITEM_TYPES.ombre, ITEM_TYPES.souffle, ITEM_TYPES.signedraconique, ITEM_TYPES.rencontre]
-const typesObjetsEquipable = [TYPES.arme, TYPES.armure, TYPES.objet];
+const typesObjetsEquipable = [ITEM_TYPES.arme, ITEM_TYPES.armure, ITEM_TYPES.objet];
 const typesEnvironnement = typesInventaireMateriel;
 const encBrin = 0.00005; // un brin = 1 décigramme = 1/10g = 1/10000kg = 1/20000 enc
 const encPepin = 0.0007; /* un pépin de gemme = 1/10 cm3 = 1/1000 l = 3.5/1000 kg = 7/2000 kg = 7/1000 enc
@@ -141,12 +149,12 @@ export class RdDItem extends Item {
   static isFieldInventaireModifiable(type, field) {
     switch (field) {
       case 'quantite':
-        if ([TYPES.conteneur].includes(type)) {
+        if ([ITEM_TYPES.conteneur].includes(type)) {
           return false;
         }
         break;
       case 'cout':
-        if ([TYPES.monnaie].includes(type)) {
+        if ([ITEM_TYPES.monnaie].includes(type)) {
           return game.user.isGM;
         }
         break;
@@ -177,7 +185,7 @@ export class RdDItem extends Item {
 
   constructor(docData, context = {}) {
     if (!context.rdd?.ready) {
-      mergeObject(context, { rdd: { ready: true } });
+      foundry.utils.mergeObject(context, { rdd: { ready: true } });
       const ItemConstructor = game.system.rdd.itemClasses[docData.type];
       if (ItemConstructor) {
         if (!docData.img) {
@@ -189,20 +197,21 @@ export class RdDItem extends Item {
     if (!docData.img) {
       docData.img = RdDItem.getDefaultImg(docData.type);
     }
+    context.rdd = undefined
     super(docData, context);
   }
 
   getUniteQuantite() {
     switch (this.type) {
-      case TYPES.monnaie: return "(Pièces)"
+      case ITEM_TYPES.monnaie: return "(Pièces)"
-      case TYPES.herbe:
+      case ITEM_TYPES.herbe:
         switch (this.system.categorie) {
           case 'Alchimie': case 'Repos': case 'Soin':
             return "(Brins)"
           case 'Cuisine': return '';
         }
         return '';
-      case TYPES.ingredient: return "(Pépins ou Brins)"
+      case ITEM_TYPES.ingredient: return "(Pépins ou Brins)"
     }
     return '';
   }
@@ -211,13 +220,13 @@ export class RdDItem extends Item {
     return typesObjetsEquipable.includes(this.type)
   }
 
-  isCompetencePersonnage() { return this.type == TYPES.competence }
+  isCompetencePersonnage() { return this.type == ITEM_TYPES.competence }
-  isCompetenceCreature() { return this.type == TYPES.competencecreature }
+  isCompetenceCreature() { return this.type == ITEM_TYPES.competencecreature }
-  isConteneur() { return this.type == TYPES.conteneur; }
+  isConteneur() { return this.type == ITEM_TYPES.conteneur; }
-  isMonnaie() { return this.type == TYPES.monnaie; }
+  isMonnaie() { return this.type == ITEM_TYPES.monnaie; }
-  isPotion() { return this.type == TYPES.potion; }
+  isPotion() { return this.type == ITEM_TYPES.potion; }
-  isNourritureBoisson() { return this.type == TYPES.nourritureboisson; }
+  isNourritureBoisson() { return this.type == ITEM_TYPES.nourritureboisson; }
-  isService() { return this.type == TYPES.service; }
+  isService() { return this.type == ITEM_TYPES.service; }
 
   isCompetence() { return typesObjetsCompetence.includes(this.type) }
   isEsquive() {
@@ -233,30 +242,30 @@ export class RdDItem extends Item {
   }
 
   isCompetenceArme() {
-    return this.isCompetence() && [ 'melee','tir', 'lancer'].includes(this.system.categorie)
+    return this.isCompetence() && ['melee', 'tir', 'lancer'].includes(this.system.categorie)
   }
 
-  isCompetencePossession() { return TYPES.competencecreature == this.type && this.system.categorie == "possession" }
+  isCompetencePossession() { return ITEM_TYPES.competencecreature == this.type && this.system.categorie == "possession" }
   isTemporel() { return typesObjetsTemporels.includes(this.type) }
   isOeuvre() { return typesObjetsOeuvres.includes(this.type) }
   isDraconique() { return RdDItem.getItemTypesDraconiques().includes(this.type) }
-  isQueueDragon() { return [TYPES.queue, TYPES.ombre].includes(this.type) }
+  isQueueDragon() { return [ITEM_TYPES.queue, ITEM_TYPES.ombre].includes(this.type) }
   isEffet() { return typesObjetsEffet.includes(this.type) }
   isConnaissance() { return typesObjetsConnaissance.includes(this.type) }
 
   isInventaire(mode = 'materiel') { return RdDItem.getItemTypesInventaire(mode).includes(this.type); }
   isBoisson() { return this.isNourritureBoisson() && this.system.boisson; }
   isAlcool() { return this.isNourritureBoisson() && this.system.boisson && this.system.alcoolise; }
-  isHerbeAPotion() { return this.type == TYPES.herbe && (this.system.categorie == 'Soin' || this.system.categorie == 'Repos'); }
+  isHerbeAPotion() { return this.type == ITEM_TYPES.herbe && (this.system.categorie == 'Soin' || this.system.categorie == 'Repos'); }
-  isBlessure() { return this.type == TYPES.blessure }
+  isBlessure() { return this.type == ITEM_TYPES.blessure }
 
   isPresentDansMilieux(milieux) {
     return this.getEnvironnements(milieux).length > 0
   }
   getCategories() {
     switch (this.type) {
-      case TYPES.competence: return RdDItemCompetence.getCategories()
+      case ITEM_TYPES.competence: return RdDItemCompetence.getCategories()
-      case TYPES.competencecreature: return RdDItemCompetenceCreature.getCategories()
+      case ITEM_TYPES.competencecreature: return RdDItemCompetenceCreature.getCategories()
     }
     return {}
   }
@@ -317,8 +326,8 @@ export class RdDItem extends Item {
       const timestampFin = await this.calculerFinPeriodeTemporel(timestampDebut);
       await actor.updateEmbeddedDocuments('Item', [{
         _id: this.id,
-        'system.temporel.debut': duplicate(timestampDebut),
+        'system.temporel.debut': foundry.utils.duplicate(timestampDebut),
-        'system.temporel.fin': duplicate(timestampFin),
+        'system.temporel.fin': foundry.utils.duplicate(timestampFin),
       }])
     }
   }
@@ -340,15 +349,15 @@ export class RdDItem extends Item {
 
   getUtilisation() {
     switch (this.type) {
-      case TYPES.potion:
+      case ITEM_TYPES.potion:
         switch (this.system.categorie) {
           case 'Alchimie': case 'AlchimieEnchante': case 'AlchimieAutre': return 'alchimie'
           case 'Cuisine': return 'cuisine'
           case 'Remede': case 'Repos': case 'ReposEnchante': case 'Soin': case 'SoinEnchante': return 'soins'
         }
         return '';
-      case TYPES.nourritureboisson: return 'cuisine';
+      case ITEM_TYPES.nourritureboisson: return 'cuisine';
-      case TYPES.herbe: case TYPES.faune: case TYPES.ingredient: case TYPES.plante:
+      case ITEM_TYPES.herbe: case ITEM_TYPES.faune: case ITEM_TYPES.ingredient: case ITEM_TYPES.plante:
         switch (this.system.categorie) {
           case 'Cuisine': return 'cuisine';
           case 'Toxique': case 'Poison': return 'poison';
@@ -363,9 +372,9 @@ export class RdDItem extends Item {
   getUtilisationCuisine() {
     if (this.getUtilisation() == 'cuisine') {
       switch (this.type) {
-        case TYPES.nourritureboisson:
+        case ITEM_TYPES.nourritureboisson:
           return 'pret';
-        case TYPES.herbe: case TYPES.faune: case TYPES.ingredient: case TYPES.plante:
+        case ITEM_TYPES.herbe: case ITEM_TYPES.faune: case ITEM_TYPES.ingredient: case ITEM_TYPES.plante:
           return 'brut';
       }
     }
@@ -373,7 +382,7 @@ export class RdDItem extends Item {
   }
 
   isCristalAlchimique() {
-    return this.type == TYPES.objet && Grammar.includesLowerCaseNoAccent(this.name, 'cristal alchimique') && this.system.quantite > 0;
+    return this.type == ITEM_TYPES.objet && Grammar.includesLowerCaseNoAccent(this.name, 'cristal alchimique') && this.system.quantite > 0;
   }
 
   isMagique() {
@@ -401,11 +410,11 @@ export class RdDItem extends Item {
 
   getEnc() {
     switch (this.type) {
-      case TYPES.service:
+      case ITEM_TYPES.service:
         return 0;
-      case TYPES.herbe:
+      case ITEM_TYPES.herbe:
         return this.getEncHerbe();
-      case TYPES.gemme:
+      case ITEM_TYPES.gemme:
         return encPepin * this.system.taille;
     }
     return Math.max(this.system.encombrement ?? 0, 0);
@@ -483,7 +492,7 @@ export class RdDItem extends Item {
 
   getActionPrincipale(options = { warnIfNot: true }) {
     switch (this.type) {
-      case TYPES.conteneur: return 'Ouvrir';
+      case ITEM_TYPES.conteneur: return 'Ouvrir';
     }
     if (this.actor?.isPersonnage()) {
       const warn = options.warnIfNot;
@@ -491,11 +500,11 @@ export class RdDItem extends Item {
         return 'Cuisiner';
       }
       switch (this.type) {
-        case TYPES.nourritureboisson: return this._actionOrWarnQuantiteZero(this.system.boisson ? 'Boire' : 'Manger', warn);
+        case ITEM_TYPES.nourritureboisson: return this._actionOrWarnQuantiteZero(this.system.boisson ? 'Boire' : 'Manger', warn);
-        case TYPES.potion: return this._actionOrWarnQuantiteZero('Consommer', warn);
+        case ITEM_TYPES.potion: return this._actionOrWarnQuantiteZero('Consommer', warn);
-        case TYPES.livre: return this._actionOrWarnQuantiteZero('Lire', warn);
+        case ITEM_TYPES.livre: return this._actionOrWarnQuantiteZero('Lire', warn);
-        case TYPES.herbe: return this.isHerbeAPotion() ? this._actionOrWarnQuantiteZero('Décoction', warn) : undefined;
+        case ITEM_TYPES.herbe: return this.isHerbeAPotion() ? this._actionOrWarnQuantiteZero('Décoction', warn) : undefined;
-        case TYPES.queue: case TYPES.ombre: return this.system.refoulement > 0 ? 'Refouler' : undefined;
+        case ITEM_TYPES.queue: case ITEM_TYPES.ombre: return this.system.refoulement > 0 ? 'Refouler' : undefined;
       }
     }
     return undefined;
@@ -538,7 +547,7 @@ export class RdDItem extends Item {
           _id: this.id,
           'system.quantite': this.system.quantite * sust,
           'system.encombrement': Misc.keepDecimals(this.system.encombrement / sust, 2),
-          'system.cout': Misc.keepDecimals(this.system.cout / sust, 2),
+          'system.cout': Math.max(0, Misc.keepDecimals(this.system.cout / sust, 2)),
           'system.sust': 1
         }])
       }
@@ -621,23 +630,7 @@ export class RdDItem extends Item {
       ui.notifications.warn(`Votre ${this.name} n'est pas vide, pas possible de le proposer`);
       return;
     }
-    await DialogItemVente.display({
+    await DialogItemVente.display({ item: this, quantiteMax })
-      item: this,
-      quantiteMax,
-      callback: async (vente) => {
-        vente["properties"] = this.getProprietes();
-        if (vente.isOwned) {
-          if (vente.quantiteNbLots * vente.tailleLot > vente.quantiteMax) {
-            ui.notifications.warn(`Vous avez ${vente.quantiteMax} ${vente.item.name}, ce n'est pas suffisant pour vendre ${vente.quantiteNbLots} de ${vente.tailleLot}`)
-            return;
-          }
-        }
-        vente.jsondata = JSON.stringify(vente.item);
-
-        let html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-vente-item.html', vente);
-        ChatMessage.create(RdDUtility.chatDataSetup(html));
-      }
-    });
   }
 
   /* -------------------------------------------- */

module/item/blessure.js

@@ -1,6 +1,7 @@
 import { RdDItem } from "../item.js";
 import { Misc } from "../misc.js";
 import { RdDTimestamp } from "../time/rdd-timestamp.js";
+import { ChatUtility } from "../chat-utility.js";
 
 const BASE_TACHE_SOIN_BLESSURE = {
   type: "tache",
@@ -14,10 +15,10 @@ const TACHES_SOIN_BLESSURE = {
 }
 
 const definitionsBlessures = [
-  { type: "contusion", gravite: 0, label: 'Contusion/éraflure', max: 100, icon: "systems/foundryvtt-reve-de-dragon/icons/sante/eraflure.webp" },
+  { type: "contusion", gravite: 0, endurance: "1d4", vie: 0, label: 'Contusion/éraflure', max: 100, icon: "systems/foundryvtt-reve-de-dragon/icons/sante/eraflure.webp" },
-  { type: "legere", gravite: 2, label: 'Légère', max: 5, icon: "systems/foundryvtt-reve-de-dragon/icons/sante/blessure.webp" },
+  { type: "legere", gravite: 2, endurance: "1d6", vie: 0, label: 'Légère', max: 5, icon: "systems/foundryvtt-reve-de-dragon/icons/sante/blessure.webp" },
-  { type: "grave", gravite: 4, label: 'Grave', max: 2, icon: "systems/foundryvtt-reve-de-dragon/icons/sante/blessure.webp" },
+  { type: "grave", gravite: 4, endurance: "2d6", vie: -2, label: 'Grave', max: 2, icon: "systems/foundryvtt-reve-de-dragon/icons/sante/blessure.webp" },
-  { type: "critique", gravite: 6, label: 'Critique', max: 1, icon: "systems/foundryvtt-reve-de-dragon/icons/sante/blessure.webp" },
+  { type: "critique", gravite: 6, endurance: "-100", vie: -4, label: 'Critique', max: 1, icon: "systems/foundryvtt-reve-de-dragon/icons/sante/blessure.webp" },
   { type: "mort", gravite: 8, label: 'Mort', max: 1, icon: "systems/foundryvtt-reve-de-dragon/icons/sante/mort.webp" }
 ]
 
@@ -38,8 +39,34 @@ export class RdDItemBlessure extends RdDItem {
       ui.notifications.warn(`Pas de tâche de soins pour une blessure ${gravite}`)
       return undefined;
     }
-    return mergeObject(duplicate(BASE_TACHE_SOIN_BLESSURE), tache)
+    return foundry.utils.mergeObject(BASE_TACHE_SOIN_BLESSURE, tache, { inplace: false })
   }
+
+  static async applyFullBlessure(actor, gravite) {
+    const definition = RdDItemBlessure.getDefinition(gravite)
+    
+    let lostEndurance = 0
+    let lostVie = 0
+    if (definition.endurance) {
+      lostEndurance = await new Roll(definition.endurance).roll().total;
+      actor.santeIncDec("endurance", -Number(lostEndurance));
+    }
+    if (definition.vie) {
+      lostVie = definition.vie
+      actor.santeIncDec("vie", definition.vie)
+    }
+    
+    await this.createBlessure(actor, gravite)
+
+    ChatMessage.create({
+      content: `Blessure ${definition.label} appliquée à ${actor.name}`+
+        `<br>Perte d'endurance : ${lostEndurance}`+
+        `<br>Perte de Vie : ${lostVie}`,
+      whisper: ChatUtility.getWhisperRecipientsAndGMs(actor.name)
+    });
+
+  }
+
   static async createBlessure(actor, gravite, localisation = '', attacker) {
     const definition = RdDItemBlessure.getDefinition(gravite)
     const blessure = {
@@ -79,12 +106,12 @@ export class RdDItemBlessure extends RdDItem {
   }
 
   async setSoinsBlessure(systemUpdate = {}) {
-    systemUpdate = mergeObject(systemUpdate, this.system, { overwrite: false }),
+    systemUpdate = foundry.utils.mergeObject(systemUpdate, this.system, { overwrite: false })
-      systemUpdate.soinscomplets.done = systemUpdate.premierssoins.done && systemUpdate.soinscomplets.done
+    systemUpdate.soinscomplets.done = systemUpdate.premierssoins.done && systemUpdate.soinscomplets.done
     await this.update({
       img: this.getImgSoins(systemUpdate.gravite, systemUpdate.soinscomplets.done),
       system: systemUpdate
-    });
+    })
   }
 
   async recuperationBlessure({ actor, timestamp, message, isMaladeEmpoisonne, blessures }) {
@@ -107,14 +134,14 @@ export class RdDItemBlessure extends RdDItem {
       if (rolled.isETotal) {
         message.content += ` -- une blessure ${label} s'infecte (temps de guérison augmenté de ${gravite} jours, perte de vie)`;
         await actor.santeIncDec("vie", -1);
-        mergeObject(update, {
+        foundry.utils.mergeObject(update, {
           system: { fin: { indexDate: timestamp.addJours(gravite).indexDate } }
         });
       }
       else {
         if (!isMaladeEmpoisonne && rolled.isSuccess && this.peutRetrograder(graviteMoindre, moindres)) {
           message.content += ` -- une blessure ${label} cicatrise`;
-          mergeObject(update, {
+          foundry.utils.mergeObject(update, {
             system: {
               gravite: graviteMoindre,
               temporel: { fin: { indexDate: timestamp.addJours(graviteMoindre).indexDate } }

module/item/maladie.js

@@ -38,7 +38,7 @@ export class RdDItemMaladie extends RdDItem {
 
       await mal.actor.updateEmbeddedDocuments('Item', [{
         _id: mal.id,
-        'system.temporel.fin': duplicate(timestampFin),
+        'system.temporel.fin': foundry.utils.duplicate(timestampFin),
       }])
     }
   }

module/item/sheet-base-inventaire.js

@@ -8,9 +8,9 @@ const TYPE_ITEMS_NATURELS = ["faune", "herbe", "plante", "ingredient"];
 export class RdDItemInventaireSheet extends RdDItemSheet {
 
   static get defaultOptions() {
-    return mergeObject(RdDItemSheet.defaultOptions, {
+    return foundry.utils.mergeObject(RdDItemSheet.defaultOptions, {
       tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "informations" }]
-    });
+    }, { inplace: false })
   }
 
   setPosition(options = {}) {
@@ -23,9 +23,10 @@ export class RdDItemInventaireSheet extends RdDItemSheet {
 
   async getData() {
     const formData = await super.getData();
-    return mergeObject(formData, {
+    foundry.utils.mergeObject(formData, {
       milieux: await game.system.rdd.environnement.autresMilieux(this.item)
-    });
+    })
+    return formData
   }
 
   activateListeners(html) {

module/item/sheet-rencontre.js

@@ -6,9 +6,9 @@ export class RdDRencontreItemSheet extends RdDItemSheet {
   static get ITEM_TYPE() { return "rencontre" };
 
   static get defaultOptions() {
-    return mergeObject(super.defaultOptions, {
+    return foundry.utils.mergeObject(super.defaultOptions, {
       tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "carac" }]
-    });
+    }, { inplace: false })
   }
 
   /* -------------------------------------------- */
@@ -24,7 +24,7 @@ export class RdDRencontreItemSheet extends RdDItemSheet {
   /* -------------------------------------------- */
   async getData() {
     const formData = await super.getData();
-    mergeObject(formData, {
+    foundry.utils.mergeObject(formData, {
       effets: {
         succes: {
           liste: RdDRencontre.getEffetsSucces(),
@@ -35,7 +35,7 @@ export class RdDRencontreItemSheet extends RdDItemSheet {
           select: RdDRencontre.mapEffets(this.item.system.echec.effets)
         }
       }
-    });
+    })
     return formData;
   }
 

module/migrations.js

@@ -2,9 +2,10 @@ import { RdDBaseActor } from "./actor/base-actor.js";
 import { LOG_HEAD, SYSTEM_RDD } from "./constants.js";
 import { Grammar } from "./grammar.js";
 import { Monnaie } from "./item-monnaie.js";
-import { RdDItem, TYPES } from "./item.js";
+import { RdDItem, ITEM_TYPES } from "./item.js";
 import { RdDTimestamp } from "./time/rdd-timestamp.js";
 import { RdDRaretes } from "./item/raretes.js";
+import { RdDCalendrier } from "./time/rdd-calendrier.js";
 
 class Migration {
   get code() { return "sample"; }
@@ -70,17 +71,17 @@ class _10_0_16_MigrationSortsReserve extends Migration {
   get version() { return "10.0.16"; }
 
   async migrate() {
-    await game.actors
+    const actors = game.actors.filter((actor) => actor.type == "personnage" && (actor.system.reve?.reserve?.list?.length ?? 0 > 0))
-      .filter((actor) => actor.type == "personnage")
+    Promise.all(actors.map(async it => await this.convertirSortsReserveActeur(it)))
-      .filter((actor) => actor.system.reve?.reserve?.list?.length ?? 0 > 0)
+  }
-      .forEach(async (actor) => {
+
-        const sortsReserve = actor.system.reve.reserve.list.map(this.conversionSortReserve);
+  async convertirSortsReserveActeur(actor) {
-        console.log(`${LOG_HEAD} Migration des sorts en réserve de ${actor.name}`, sortsReserve);
+    const sortsReserve = actor.system.reve.reserve.list.map(this.conversionSortReserve);
-        await actor.createEmbeddedDocuments("Item", sortsReserve, {
+    console.log(`${LOG_HEAD} Migration des sorts en réserve de ${actor.name}`, sortsReserve);
-          renderSheet: false,
+    await actor.createEmbeddedDocuments("Item", sortsReserve, {
-        });
+      renderSheet: false,
-        await actor.update({ 'system.reve.reserve': undefined })
+    });
-      });
+    await actor.update({ 'system.reve.reserve': undefined });
   }
 
   conversionSortReserve(it) {
@@ -189,7 +190,7 @@ class _10_2_5_ArmesTirLancer extends Migration {
   get version() { return "10.2.5"; }
 
   migrateArmeTirLancer(it) {
-    let updates = mergeObject({ _id: it.id }, this.getMapping(it).updates);
+    let updates = foundry.utils.mergeObject({ _id: it.id }, this.getMapping(it).updates);
     console.log(it.name, updates);
     return updates;
   }
@@ -364,7 +365,7 @@ class _10_4_6_ServicesEnCommerces extends Migration {
     const item = await RdDItem.getCorrespondingItem(serviceRefItem);
     const itemToCreate = {
       name: item.name, img: item.img, type: item.type,
-      system: mergeObject({ cout: serviceRefItem.system.cout, quantite: serviceRefItem.system.quantite }, item.system, { overwrite: false })
+      system: foundry.utils.mergeObject({ cout: serviceRefItem.system.cout, quantite: serviceRefItem.system.quantite }, item.system, { overwrite: false })
     };
     return itemToCreate;
   }
@@ -464,7 +465,7 @@ class _10_7_19_CategorieCompetenceCreature extends Migration {
 
   async migrate() {
     await this.applyItemsUpdates(items => items
-      .filter(it => TYPES.competencecreature == it.type)
+      .filter(it => ITEM_TYPES.competencecreature == it.type)
       .map(it => this.migrateCompetenceCreature(it))
     );
   }
@@ -501,19 +502,34 @@ class _10_7_19_PossessionsEntiteVictime extends Migration {
 
   async migrate() {
     await this.applyItemsUpdates(items => items
-      .filter(it => TYPES.possession == it.type)
+      .filter(it => ITEM_TYPES.possession == it.type)
       .map(it => this.migratePossession(it))
     );
   }
 
   migratePossession(it) {
-    return { _id: it.id,
+    return {
+      _id: it.id,
       'system.entite.actorid': it.system.possesseurid,
       'system.victime.actorid': it.system.possedeid
     }
   }
 }
 
+class _11_2_20_MigrationAstrologie extends Migration {
+  get code() { return "migration-astrologie" }
+  get version() { return "11.2.20" }
+
+  async migrate() {
+    const nombresAstraux = game.system.rdd.calendrier.getNombresAstraux()
+    nombresAstraux.forEach(na => {
+      na.lectures = na.valeursFausses
+      na.valeursFausses = undefined
+    })
+    await game.system.rdd.calendrier.setNombresAstraux(nombresAstraux)
+  }
+}
+
 export class Migrations {
   static getMigrations() {
     return [
@@ -532,6 +548,7 @@ export class Migrations {
       new _10_7_0_MigrationBlessures(),
       new _10_7_19_CategorieCompetenceCreature(),
       new _10_7_19_PossessionsEntiteVictime(),
+      new _11_2_20_MigrationAstrologie(),
     ];
   }
 
@@ -546,15 +563,18 @@ export class Migrations {
   }
 
   migrate() {
-    const currentVersion = game.settings.get(SYSTEM_RDD, "systemMigrationVersion");
+    let currentVersion = game.settings.get(SYSTEM_RDD, "systemMigrationVersion")
-    if (isNewerVersion(game.system.version, currentVersion)) {
+    if (currentVersion.startsWith("v")) {
+      currentVersion = currentVersion.substring(1)
+    }
+    if (foundry.utils.isNewerVersion(game.system.version, currentVersion)) {
       // if (true) { /* comment previous and uncomment here to test before upgrade  */
-      const migrations = Migrations.getMigrations().filter(m => isNewerVersion(m.version, currentVersion));
+      const migrations = Migrations.getMigrations().filter(m => foundry.utils.isNewerVersion(m.version, currentVersion));
       if (migrations.length > 0) {
         migrations.sort((a, b) => this.compareVersions(a, b));
         migrations.forEach(async (m) => {
           ui.notifications.info(
-            `Executing migration ${m.code}: version ${currentVersion} is lower than ${m.version}`
+            `${LOG_HEAD} Executing migration ${m.code}: version ${currentVersion} is lower than ${m.version}`
           );
           await m.migrate();
         });
@@ -562,9 +582,7 @@ export class Migrations {
           `Migrations done, version will change to ${game.system.version}`
         );
       } else {
-        console.log(
+        console.log(`${LOG_HEAD} No migration needeed, version will change to ${game.system.version}`
-          LOG_HEAD +
-          `No migration needeed, version will change to ${game.system.version}`
         );
       }
 
@@ -574,7 +592,7 @@ export class Migrations {
         game.system.version
       );
     } else {
-      console.log(LOG_HEAD + `No system version changed`);
+      console.log(`${LOG_HEAD} No system version changed`);
     }
   }
 

module/misc.js

@@ -46,7 +46,7 @@ export class Misc {
   }
 
   static typeName(type, subType) {
-    return subType ? game.i18n.localize(`TYPES.${type}.${Misc.upperFirst(subType)}`)
+    return subType ? game.i18n.localize(`TYPES.${type}.${subType}`)
       : '';
   }
 
@@ -166,15 +166,47 @@ export class Misc {
   }
 
   static firstConnectedGM() {
-    return game.users.filter(u => u.isGM && u.active).sort(Misc.ascending(u => u.id)).find(u => u.isGM && u.active);
+    if (foundry.utils.isNewerVersion(game.release.version, '12.0')) {
+      return game.users.activeGM
+    } 
+    return game.users.find(u => u.isGM && u.active);
   }
 
-  static isOwnerPlayer(actor, user = undefined) {
+  static connectedGMs() {
-    return actor.testUserPermission(user ?? game.user, CONST.DOCUMENT_PERMISSION_LEVELS.OWNER)
+    return game.users.filter(u => u.isGM && u.active);
   }
 
-  static isOwnerPlayerOrUniqueConnectedGM(actor, user = undefined) {
+  /**
-    return Misc.isOwnerPlayer(actor, user) ?? Misc.isUniqueConnectedGM();
+   * This helper method allows to get the docuument, for a single user (either first connected GM, or the owner
+   * if there is no connected GMs), or else return undefined.
+   * 
+   * This allows for example update hooks that should apply modifications to actors to be called only for one
+   * user (preventing the "User ... lacks permission to update Item" that was occuring on hooks when Item updates
+   * were triggering other changes)
+   * 
+   * @param {*} document the Document with is potentially an Actor
+   * @returns the actor if either the game.user is the first connected GM, or if the game.user is the owner
+   *  and there is no connected GM
+   */
+  static documentIfResponsible(document) {
+    if (foundry.utils.isNewerVersion(game.release.version, '12.0')) {
+      if (game.users.activeGM || (Misc.connectedGMs().length == 0 && Misc.isOwnerPlayer(document)))
+      {
+        return document
+      }
+    }
+    else if (Misc.isUniqueConnectedGM() || (Misc.connectedGMs().length == 0 && Misc.isOwnerPlayer(document))) {
+      return document
+    }
+    return undefined
+  }
+
+  static isOwnerPlayer(document) {
+    return document.testUserPermission && document.testUserPermission(game.user, CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER)
+  }
+
+  static isOwnerPlayerOrUniqueConnectedGM(actor) {
+    return Misc.isOwnerPlayer(actor) ?? Misc.isUniqueConnectedGM();
   }
 
   /**
@@ -200,7 +232,7 @@ export class Misc {
 
   /* -------------------------------------------- */
   static findFirstLike(value, elements, options = {}) {
-    options = mergeObject({
+    options = foundry.utils.mergeObject({
       mapper: it => it.name,
       preFilter: it => true,
       description: 'valeur',
@@ -225,7 +257,7 @@ export class Misc {
   }
 
   static findAllLike(value, elements, options = {}) {
-    options = mergeObject({
+    options = foundry.utils.mergeObject({
       mapper: it => it.name,
       preFilter: it => true,
       description: 'valeur',

module/rdd-audio.js

@@ -15,7 +15,7 @@ export class RdDAudio {
       if ( audioData ) {
         let audioPath = "systems/foundryvtt-reve-de-dragon/sounds/" + audioData.file;
         console.log(`foundryvtt-reve-de-dragon | Playing Sound: ${audioPath}`)
-        AudioHelper.play({ src: audioPath }, audioData.isGlobal);
+        foundry.audio.AudioHelper.play({ src: audioPath }, audioData.isGlobal);
       }
     }
   }

module/rdd-bonus.js

@@ -31,8 +31,8 @@ export class RdDBonus {
   }
 
   /* -------------------------------------------- */
-  static dmg(rollData, dmgActor, isEntiteIncarnee = false) {
+  static dmg(rollData, actor, isEntiteIncarnee = false) {
-    const dmgArme = RdDBonus._dmgArme(rollData)
+    const dmgArme = RdDBonus.dmgArme(rollData.arme)
     let dmg = {
       total: 0,
       dmgArme: dmgArme,
@@ -41,7 +41,7 @@ export class RdDBonus {
       dmgParticuliere: RdDBonus._dmgParticuliere(rollData),
       dmgSurprise: RdDBonus.dmgBonus(rollData.ajustements?.attaqueDefenseurSurpris.used),
       mortalite: RdDBonus._calculMortalite(rollData, isEntiteIncarnee),
-      dmgActor: RdDBonus._dmgPerso(dmgActor, rollData.selectedCarac?.label, dmgArme)
+      dmgActor: RdDBonus.bonusDmg(actor, rollData.selectedCarac?.label.toLowerCase(), dmgArme)
     }
     dmg.total = dmg.dmgSurprise + dmg.dmgTactique + dmg.dmgArme + dmg.dmgActor + dmg.dmgParticuliere;
     return dmg;
@@ -71,11 +71,11 @@ export class RdDBonus {
   }
 
   /* -------------------------------------------- */
-  static _dmgArme(rollData) {
+  static dmgArme(arme) {
-    if (rollData.arme) {
+    if (arme) {
-      let dmgBase = rollData.arme.system.dommagesReels ?? Number(rollData.arme.system.dommages ?? 0);
+      let dmgBase = arme.system.dommagesReels ?? Number(arme.system.dommages ?? 0);
       //Le bonus dégats magiques ne peut pas faire dépasser le bonus de l'arme (cf p.278)
-      return dmgBase + Math.min(dmgBase, rollData.arme.system.magique ? rollData.arme.system.ecaille_efficacite : 0);
+      return dmgBase + Math.min(dmgBase, arme.system.magique ? arme.system.ecaille_efficacite : 0);
     }
     return 0;
   }
@@ -86,13 +86,14 @@ export class RdDBonus {
   }
 
   /* -------------------------------------------- */
-  static _dmgPerso(dmgActor, categorie, dmgArme) {
+  static bonusDmg(actor, categorie, dmgArme) {
+    const dmgActor = actor.getBonusDegat()
     if (categorie == undefined) {
       return 0
     }
     switch (categorie) {
-      case "Tir": return 0;
+      case "tir": return 0;
-      case "Lancer": return Math.max(0, Math.min(dmgArme, dmgActor));
+      case "lancer": return Math.max(0, Math.min(dmgArme, dmgActor));
     }
     return dmgActor;
   }

module/rdd-combat.js

@@ -75,6 +75,12 @@ export class RdDCombatManager extends Combat {
       }
     }
   }
+  static calculAjustementInit(actor, arme) {
+    const efficacite = (arme?.system.magique) ? arme.system.ecaille_efficacite : 0
+    const etatGeneral = actor.getEtatGeneral() ?? 0
+    return efficacite + etatGeneral
+
+  }
 
   /************************************************************************************/
   async rollInitiative(ids, formula = undefined, messageOptions = {}) {
@@ -84,12 +90,14 @@ export class RdDCombatManager extends Combat {
     // calculate initiative
     for (let cId = 0; cId < ids.length; cId++) {
       const combatant = this.combatants.get(ids[cId]);
-      let rollFormula = formula ?? RdDCombatManager.formuleInitiative(2, 10, 0, 0);
+      const ajustement = RdDCombatManager.calculAjustementInit(combatant.actor, undefined);
+      let rollFormula = formula ?? RdDCombatManager.formuleInitiative(2, 10, 0, ajustement);
+
       if (!formula) {
         if (combatant.actor.type == 'creature' || combatant.actor.type == 'entite') {
           const competence = combatant.actor.items.find(it => RdDItemCompetenceCreature.isCompetenceAttaque(it))
           if (competence) {
-            rollFormula = RdDCombatManager.formuleInitiative(2, competence.system.carac_value, competence.system.niveau, 0);
+            rollFormula = RdDCombatManager.formuleInitiative(2, competence.system.carac_value, competence.system.niveau, etatGeneral);
           }
         } else {
           const armeCombat = combatant.actor.itemTypes['arme'].find(it => it.system.equipe)
@@ -109,8 +117,9 @@ export class RdDCombatManager extends Combat {
           if (competence && competence.system.defaut_carac) {
             const carac = combatant.actor.system.carac[competence.system.defaut_carac].value;
             const niveau = competence.system.niveau;
-            const bonusEcaille = (armeCombat?.system.magique) ? armeCombat.system.ecaille_efficacite : 0;
+
-            rollFormula = RdDCombatManager.formuleInitiative(2, carac, niveau, bonusEcaille);
+            const ajustement = RdDCombatManager.calculAjustementInit(combatant.actor, armeCombat)
+            rollFormula = RdDCombatManager.formuleInitiative(2, carac, niveau, ajustement);
           } else {
             ui.notifications.warn(`Votre arme ${armeCombat.name} n'a pas de compétence renseignée`);
           }
@@ -119,7 +128,7 @@ export class RdDCombatManager extends Combat {
       //console.log("Combatat", c);
       const roll = combatant.getInitiativeRoll(rollFormula);
       if (!roll.total) {
-        roll.evaluate({ async: false });
+        await roll.evaluate();
       }
       const total = Math.max(roll.total, 0.00);
       console.log("Compute init for", rollFormula, roll, total, combatant);
@@ -128,21 +137,17 @@ export class RdDCombatManager extends Combat {
 
       // Send a chat message
       let rollMode = messageOptions.rollMode || game.settings.get("core", "rollMode");
-      let messageData = mergeObject(
+      let messageData = foundry.utils.mergeObject({
-        {
+        speaker: {
-          speaker: {
+          scene: canvas.scene._id,
-            scene: canvas.scene._id,
+          actor: combatant.actor?._id,
-            actor: combatant.actor?._id,
+          token: combatant.token._id,
-            token: combatant.token._id,
+          alias: combatant.token.name,
-            alias: combatant.token.name,
+          sound: CONFIG.sounds.dice,
-            sound: CONFIG.sounds.dice,
-          },
-          flavor: `${combatant.token.name} a fait son jet d'Initiative (${messageOptions.initInfo})
-          <br>
-          `,
         },
-        messageOptions
+        flavor: `${combatant.token.name} a fait son jet d'Initiative (${messageOptions.initInfo})<br>`,
-      );
+      },
+        messageOptions);
       roll.toMessage(messageData, { rollMode, create: true });
 
       RdDCombatManager.processPremierRoundInit();
@@ -218,13 +223,16 @@ export class RdDCombatManager extends Combat {
 
   static $prepareAttaqueArme(infoAttaque) {
     const comp = infoAttaque.competences.find(c => c.name == infoAttaque.competence);
-    const attaque = duplicate(infoAttaque.arme);
+    const arme = infoAttaque.arme;
+    const attaque = foundry.utils.duplicate(arme);
     attaque.action = 'attaque';
     attaque.system.competence = infoAttaque.competence;
     attaque.system.dommagesReels = infoAttaque.dommagesReel;
     attaque.system.infoMain = infoAttaque.infoMain;
     attaque.system.niveau = comp.system.niveau;
-    attaque.system.initiative = RdDCombatManager.calculInitiative(comp.system.niveau, infoAttaque.carac[comp.system.defaut_carac].value);
+
+    const ajustement = (arme?.parent?.getEtatGeneral() ?? 0) + (arme?.system.magique) ? arme.system.ecaille_efficacite : 0;
+    attaque.system.initiative = RdDCombatManager.calculInitiative(comp.system.niveau, infoAttaque.carac[comp.system.defaut_carac].value, ajustement);
     return attaque;
   }
 
@@ -339,7 +347,6 @@ export class RdDCombatManager extends Combat {
       ui.notifications.warn(`Le combatant ${combatant.name} n'est pas associé à un acteur, impossible de déterminer ses actions de combat!`)
       return [];
     }
-
     let initInfo = "";
     let initOffset = 0;
     let caracForInit = 0;
@@ -374,9 +381,9 @@ export class RdDCombatManager extends Combat {
       initOffset = RdDCombatManager._baseInitOffset(compData.system.categorie, action);
     }
 
-    let malus = combatant.actor.getEtatGeneral(); // Prise en compte état général 
     // Cas des créatures et entités vs personnages
-    let rollFormula = RdDCombatManager.formuleInitiative(initOffset, caracForInit, compNiveau, malus);
+    const ajustement = RdDCombatManager.calculAjustementInit(combatant.actor, action)
+    let rollFormula = RdDCombatManager.formuleInitiative(initOffset, caracForInit, compNiveau, ajustement);
     // Garder la trace de l'arme/compétence utilisée pour l'iniative
     combatant.initiativeData = { arme: action } // pour reclasser l'init au round 0
     game.combat.rollInitiative(combatantId, rollFormula, { initInfo: initInfo });
@@ -791,7 +798,7 @@ export class RdDCombat {
   /* -------------------------------------------- */
   _prepareAttaque(competence, arme) {
     let rollData = {
-      passeArme: randomID(16),
+      passeArme: foundry.utils.randomID(16),
       mortalite: arme?.system.mortalite,
       competence: competence,
       surprise: this.attacker.getSurprise(true),
@@ -857,7 +864,7 @@ export class RdDCombat {
   async _onAttaqueNormale(attackerRoll) {
     console.log("RdDCombat.onAttaqueNormale >>>", attackerRoll);
 
-    attackerRoll.dmg = RdDBonus.dmg(attackerRoll, this.attacker.getBonusDegat(), this.defender.isEntite());
+    attackerRoll.dmg = RdDBonus.dmg(attackerRoll, this.attacker, this.defender.isEntite());
     let defenderRoll = { attackerRoll: attackerRoll, passeArme: attackerRoll.passeArme, show: {} }
     attackerRoll.show = {
       cible: this.target ? this.defender.name : 'la cible',
@@ -885,12 +892,12 @@ export class RdDCombat {
 
     this.removeChatMessageActionsPasseArme(attackerRoll.passeArme);
     if (essaisPrecedents) {
-      mergeObject(attackerRoll.essais, essaisPrecedents, { overwrite: true });
+      foundry.utils.mergeObject(attackerRoll.essais, essaisPrecedents, { overwrite: true });
     }
 
     // # utilisation esquive
     const corpsACorps = this.defender.getCompetenceCorpsACorps({ onMessage: it => console.info(it, this.defender) });
-    const esquives = duplicate(this.defender.getCompetencesEsquive())
+    const esquives = foundry.utils.duplicate(this.defender.getCompetencesEsquive())
     esquives.forEach(e => e.system.nbUsage = e?._id ? this.defender.getItemUse(e._id) : 0);
 
     const paramChatDefense = {
@@ -1282,7 +1289,7 @@ export class RdDCombat {
       attackerRoll.defenderTokenId = defenderTokenId;
 
       await this.computeRecul(defenderRoll);
-      this.defender.encaisserDommages(attackerRoll, this.attacker, defenderRoll?.show);
+      await this.defender.encaisserDommages(attackerRoll, this.attacker, defenderRoll?.show);
     }
     else { // envoi à un GM: les joueurs n'ont pas le droit de modifier les personnages qu'ils ne possèdent pas
       game.socket.emit(SYSTEM_SOCKET_ID, {
@@ -1307,6 +1314,7 @@ export class RdDCombat {
       blessuresStatus: actor.computeResumeBlessure(),
       SConst: actor.getSConst(),
       actorId: actor.id,
+      actor: actor,
       tokenId: tokenId,
       isGrave: actor.countBlessures(it => it.isGrave()) > 0,
       isCritique: actor.countBlessures(it => it.isCritique()) > 0

module/rdd-commands.js

@@ -16,6 +16,7 @@ import { RdDRollTables } from "./rdd-rolltables.js";
 import { RdDUtility } from "./rdd-utility.js";
 import { FenetreRechercheTirage } from "./tirage/fenetre-recherche-tirage.js";
 import { TMRUtility } from "./tmr-utility.js";
+import { DialogFatigueVoyage } from "./voyage/dialog-fatigue-voyage.js";
 
 const rddRollNumeric = /^(\d+)\s*([\+\-]?\d+)?\s*(s)?/;
 
@@ -76,6 +77,7 @@ export class RdDCommands {
     this.registerCommand({ path: ["/tirer", "desir"], func: (content, msg, params) => RdDRollTables.getDesirLancinant('chat'), descr: "Tire un Désir Lancinant" });
     this.registerCommand({ path: ["/tirer", "rencontre"], func: (content, msg, params) => this.getRencontreTMR(params), descr: `Détermine une rencontre dans les TMR (synonyme de "/tmrr")` });
     this.registerCommand({ path: ["/tirage"], func: (content, msg, params) => this.tirage(), descr: "Ouvre la fenêtre de recherche et tirage" });
+    this.registerCommand({ path: ["/voyage"], func: (content, msg, params) => this.voyage(msg, params), descr: "Gérer le voyage" });
 
     this.registerCommand({ path: ["/sommeil"], func: (content, msg, params) => this.sommeil(msg, params), descr: "Prépare le passage de journée pour chateau dormant" });
     this.registerCommand({ path: ["/meteo"], func: (content, msg, params) => this.getMeteo(msg, params), descr: "Propose une météo marine" });
@@ -461,14 +463,13 @@ export class RdDCommands {
 
       let motif = params.slice(1, params.length - 2);
       let name = params[params.length - 1];
+      const personnages = game.actors.filter(actor => actor.isPersonnageJoueur());
       if (name == undefined) {
-        for (let actor of game.actors) {
+        for (let actor of personnages) {
-          // TODO: ne plus stresser les entités de cauchemar!
           await actor.distribuerStress('stress', stress, motif);
         }
       } else {
-        //console.log(stressValue, nomJoueur);
+        let actor = Misc.findActor(name, personnages) ?? Misc.findPlayer(name)?.character
-        let actor = Misc.findActor(name, game.actors.filter(it => it.hasPlayerOwner)) ?? Misc.findPlayer(name)?.character
         if (actor) {
           await actor.distribuerStress('stress', stress, motif);
         }
@@ -485,10 +486,13 @@ export class RdDCommands {
   }
 
   async tirage() {
-    FenetreRechercheTirage.create();
+    FenetreRechercheTirage.create()
+  }
+  async voyage() {
+    DialogFatigueVoyage.create()
   }
   async sommeil() {
-    DialogChateauDormant.create();
+    DialogChateauDormant.create()
   }
 }
 

module/rdd-confirm.js

@@ -1,32 +1,28 @@
-import { Grammar } from "./grammar.js";
 import { ReglesOptionnelles } from "./settings/regles-optionnelles.js";
 
 export class RdDConfirm {
   /* -------------------------------------------- */
   static confirmer(options, autresActions) {
-    options.bypass = options.bypass || !(options.settingConfirmer == undefined || ReglesOptionnelles.isUsing(options.settingConfirmer));
+    if (options.settingConfirmer && !ReglesOptionnelles.isSet(options.settingConfirmer)) {
-    if (options.bypass) {
+      return options.onAction()
-      options.onAction();
     }
-    else {
+    let buttons = {
-      let buttons = {
+      "action": RdDConfirm._createButtonAction(options),
-        "action": RdDConfirm._createButtonAction(options),
+      "cancel": RdDConfirm._createButtonCancel()
-        "cancel": RdDConfirm._createButtonCancel()
+    };
-      };
+    if (options.settingConfirmer) {
-      if (options.settingConfirmer) {
+      buttons = foundry.utils.mergeObject(RdDConfirm._createButtonActionSave(options), buttons);
-        buttons = mergeObject(RdDConfirm._createButtonActionSave(options), buttons);
-      }
-      if (autresActions) {
-        buttons = mergeObject(autresActions, buttons);
-      }
-      const dialogDetails = {
-        title: options.title,
-        content: options.content,
-        default: "cancel",
-        buttons: buttons
-      };
-      new Dialog(dialogDetails, { width: 150 * Object.keys(buttons).length }).render(true);
     }
+    if (autresActions) {
+      buttons = foundry.utils.mergeObject(autresActions, buttons, { inplace: false });
+    }
+    const dialogDetails = {
+      title: options.title,
+      content: options.content,
+      default: "cancel",
+      buttons: buttons
+    };
+    new Dialog(dialogDetails, { width: 150 * Object.keys(buttons).length }).render(true);
   }
 
   static _createButtonCancel() {

module/rdd-dice.js

@@ -36,8 +36,8 @@ export class DeTMR extends Die {
     super(termData);
   }
 
-  async evaluate() {
+  async evaluate(options) {
-    super.evaluate();
+    await super.evaluate(options);
     this.explode("x=8");
     return this;
   }
@@ -73,8 +73,8 @@ export class DeDraconique extends Die {
     super(termData);
   }
 
-  async evaluate() {
+  async evaluate(options) {
-    super.evaluate();
+    await super.evaluate(options);
     this.explode("x=7");
     return this;
   }
@@ -138,7 +138,7 @@ export class RdDDice {
 
   static async roll(formula, options = { showDice: SHOW_DICE, rollMode: undefined }) {
     const roll = new Roll(RdDDice._formulaOrFake(formula, options));
-    await roll.evaluate({ async: true });
+    await roll.evaluate();
     await this.showDiceSoNice(roll, options);
     return roll;
   }
@@ -216,7 +216,7 @@ export class RdDDice {
 
   static async fakeD10(faces) {
     let roll = new Roll(`1d${faces}`);
-    await roll.evaluate({ async: true });
+    await roll.evaluate();
     return roll.total;
   }
 

module/rdd-empoignade.js

@@ -5,7 +5,7 @@ import { RdDItemCompetenceCreature } from "./item-competencecreature.js";
 import { ChatUtility } from "./chat-utility.js";
 import { STATUSES } from "./settings/status-effects.js";
 import { ReglesOptionnelles } from "./settings/regles-optionnelles.js";
-import { TYPES } from "./item.js";
+import { ITEM_TYPES } from "./item.js";
 
 /* -------------------------------------------- */
 
@@ -92,23 +92,23 @@ export class RdDEmpoignade {
 
   /* -------------------------------------------- */
   static isEmpoignadeEnCours(actor) {
-    return actor.itemTypes[TYPES.empoignade].find(it => it.system.pointsemp > 0)
+    return actor.itemTypes[ITEM_TYPES.empoignade].find(it => it.system.pointsemp > 0)
   }
 
   /* -------------------------------------------- */
   static getEmpoignadeById(actor, id) {
-    let emp = actor.itemTypes[TYPES.empoignade].find(it => it.system.empoignadeid == id)
+    let emp = actor.itemTypes[ITEM_TYPES.empoignade].find(it => it.system.empoignadeid == id)
-    return emp && duplicate(emp) || undefined;
+    return emp && foundry.utils.duplicate(emp) || undefined;
   }
 
   /* -------------------------------------------- */
   static getEmpoignade(attacker, defender) {
-    let emp = attacker.itemTypes[TYPES.empoignade].find(it =>
+    let emp = attacker.itemTypes[ITEM_TYPES.empoignade].find(it =>
       (it.system.empoigneurid == attacker.id && it.system.empoigneid == defender.id) ||
       (it.system.empoigneurid == defender.id && it.system.empoigneid == attacker.id)
     )
     if (emp) {
-      return duplicate(emp);
+      return foundry.utils.duplicate(emp);
     }
     return undefined;
   }
@@ -248,7 +248,7 @@ export class RdDEmpoignade {
     if (rollData.rolled.isPart) {
       rollData.particuliere = "finesse";
     }
-    let msg = await RdDResolutionTable.displayRollData(rollData, attacker, 'chat-empoignade-resultat.html');
+    let msg = await RdDResolutionTable.displayRollData(rollData, defender, 'chat-empoignade-resultat.html');
     RdDEmpoignade.$storeRollEmpoignade(msg, rollData);
   }
 
@@ -267,7 +267,7 @@ export class RdDEmpoignade {
       return
     }
 
-    empoignade = duplicate(empoignade)
+    empoignade = foundry.utils.duplicate(empoignade)
     let defenderRoll = {
       mode, attacker, defender, empoignade, attackerRoll,
       diffLibre: attackerRoll.diffLibre,
@@ -427,7 +427,7 @@ export class RdDEmpoignade {
       name: "Empoignade en cours de " + attacker.name + ' sur ' + defender.name,
       type: 'empoignade',
       img: "systems/foundryvtt-reve-de-dragon/icons/entites/possession2.webp",
-      system: { description: "", empoignadeid: randomID(16), compteempoigne: 0, empoigneurid: attacker.id, empoigneid: defender.id, ptsemp: 0, empoigneurname: attacker.name, empoignename: defender.name }
+      system: { description: "", empoignadeid: foundry.utils.randomID(16), compteempoigne: 0, empoigneurid: attacker.id, empoigneid: defender.id, ptsemp: 0, empoigneurname: attacker.name, empoignename: defender.name }
     },
       {
         temporary: true

module/rdd-herbes.js

@@ -6,7 +6,7 @@ import { RdDTimestamp } from "./time/rdd-timestamp.js";
 export class RdDHerbes extends Item {
 
   /* -------------------------------------------- */
-  static async initializeHerbes() {
+  static async onReady() {
     this.herbesSoins = await RdDHerbes.listCategorieHerbes('Soin');
     this.herbesRepos = await RdDHerbes.listCategorieHerbes('Repos');
   }

module/rdd-hotbar-drop.js

@@ -1,6 +1,6 @@
 import { RdDItemArme } from "./item-arme.js";
 import { RdDItemCompetenceCreature } from "./item-competencecreature.js";
-import { TYPES } from "./item.js";
+import { ITEM_TYPES } from "./item.js";
 
 export class RdDHotbar {
 
@@ -35,7 +35,7 @@ export class RdDHotbar {
 
   static async addToHotbar(item, slot) {
     switch (item?.type ?? '') {
-      case TYPES.arme:
+      case ITEM_TYPES.arme:
         {
           // Les armes peuvent avoir plusieurs usages
           if (item.system.competence != '') {
@@ -54,12 +54,12 @@ export class RdDHotbar {
           }
         }
         return
-      case TYPES.competencecreature:
+      case ITEM_TYPES.competencecreature:
         const categorie = RdDItemCompetenceCreature.getCategorieAttaque(item) ?? 'competence';
         await this.createItemMacro(item, slot, categorie)
         return
       default:
-      case TYPES.competence:
+      case ITEM_TYPES.competence:
         await this.createItemMacro(item, slot++, 'competence')
         if (item.isCorpsACorps()) {
           await this.createItemMacro(item, slot++, 'pugilat')
@@ -79,7 +79,7 @@ export class RdDHotbar {
    * Actor     - open actor sheet
    * Journal   - open journal sheet
    */
-  static initDropbar() {
+  static init() {
 
     Hooks.on('hotbarDrop', (bar, documentData, slot) => {
 
@@ -88,9 +88,9 @@ export class RdDHotbar {
         const item = fromUuidSync(documentData.uuid) ?? this.actor.items.get(documentData.uuid)
         console.log('DROP', documentData, item)
         switch (item?.type) {
-          case TYPES.arme:
+          case ITEM_TYPES.arme:
-          case TYPES.competence:
+          case ITEM_TYPES.competence:
-          case TYPES.competencecreature:
+          case ITEM_TYPES.competencecreature:
             this.addToHotbar(item, slot)
             return false
         }
@@ -116,9 +116,9 @@ export class RdDHotbar {
 
     // Trigger the item roll
     switch (item.type) {
-      case TYPES.arme:
+      case ITEM_TYPES.arme:
         return actor.rollArme(item, categorieArme);
-      case TYPES.competence:
+      case ITEM_TYPES.competence:
         if (item.isCorpsACorps()) {
           switch (categorieArme) {
             case 'pugilat':
@@ -128,7 +128,7 @@ export class RdDHotbar {
           }
         }
         return actor.rollCompetence(item);
-      case TYPES.competencecreature:
+      case ITEM_TYPES.competencecreature:
         return item.system.iscombat && !item.system.isparade
           ? actor.rollArme(item, categorieArme)
           : actor.rollCompetence(item);

module/rdd-main.js

@@ -1,69 +1,72 @@
-import { SYSTEM_RDD, SYSTEM_SOCKET_ID } from "./constants.js";
+import { SYSTEM_RDD, SYSTEM_SOCKET_ID, RDD_CONFIG } from "./constants.js"
-import { Migrations } from './migrations.js';
+import { Migrations } from './migrations.js'
 
-import { RdDUtility } from "./rdd-utility.js";
+import { RdDUtility } from "./rdd-utility.js"
-import { TMRUtility } from "./tmr-utility.js";
+import { TMRUtility } from "./tmr-utility.js"
-import { TMRRencontres } from "./tmr-rencontres.js";
+import { TMRRencontres } from "./tmr-rencontres.js"
-import { RdDCalendrier } from "./time/rdd-calendrier.js";
+import { RdDCalendrier } from "./time/rdd-calendrier.js"
-import { RdDTimestamp } from "./time/rdd-timestamp.js";
+import { RdDTimestamp } from "./time/rdd-timestamp.js"
-import { DialogChronologie } from "./dialog-chronologie.js";
+import { DialogChronologie } from "./dialog-chronologie.js"
 
-import { RdDResolutionTable } from "./rdd-resolution-table.js";
+import { RdDResolutionTable } from "./rdd-resolution-table.js"
-import { RdDTokenHud } from "./rdd-token-hud.js";
+import { RdDTokenHud } from "./rdd-token-hud.js"
-import { RdDCommands } from "./rdd-commands.js";
+import { RdDCommands } from "./rdd-commands.js"
-import { RdDCombatManager, RdDCombat } from "./rdd-combat.js";
+import { RdDCombatManager, RdDCombat } from "./rdd-combat.js"
-import { ChatUtility } from "./chat-utility.js";
+import { ChatUtility } from "./chat-utility.js"
-import { StatusEffects } from "./settings/status-effects.js";
+import { StatusEffects } from "./settings/status-effects.js"
-import { RdDCompendiumOrganiser } from "./rdd-compendium-organiser.js";
+import { RdDCompendiumOrganiser } from "./rdd-compendium-organiser.js"
-import { ReglesOptionnelles } from "./settings/regles-optionnelles.js";
+import { ReglesOptionnelles } from "./settings/regles-optionnelles.js"
 import { RdDHotbar } from "./rdd-hotbar-drop.js"
-import { EffetsDraconiques } from "./tmr/effets-draconiques.js";
+import { EffetsDraconiques } from "./tmr/effets-draconiques.js"
-import { RdDHerbes } from "./rdd-herbes.js";
+import { RdDHerbes } from "./rdd-herbes.js"
-import { RdDDice } from "./rdd-dice.js";
+import { RdDDice } from "./rdd-dice.js"
-import { RdDPossession } from "./rdd-possession.js";
+import { RdDPossession } from "./rdd-possession.js"
-import { Misc } from "./misc.js";
+import { Misc } from "./misc.js"
 
-import { SystemCompendiums } from "./settings/system-compendiums.js";
+import { SystemCompendiums } from "./settings/system-compendiums.js"
-import { Environnement } from "./environnement.js";
+import { Environnement } from "./environnement.js"
 
-import { RdDActor } from "./actor.js";
+import { RdDActor } from "./actor.js"
-import { RdDBaseActor } from "./actor/base-actor.js";
+import { RdDBaseActor } from "./actor/base-actor.js"
-import { RdDCommerce } from "./actor/commerce.js";
+import { RdDCommerce } from "./actor/commerce.js"
-import { RdDEntite } from "./actor/entite.js";
+import { RdDEntite } from "./actor/entite.js"
-import { RdDVehicule } from "./actor/vehicule.js";
+import { RdDVehicule } from "./actor/vehicule.js"
-import { RdDActorSheet } from "./actor-sheet.js";
+import { RdDActorSheet } from "./actor-sheet.js"
-import { RdDCommerceSheet } from "./actor/commerce-sheet.js";
+import { RdDCommerceSheet } from "./actor/commerce-sheet.js"
-import { RdDCreatureSheet } from "./actor/creature-sheet.js";
+import { RdDCreatureSheet } from "./actor/creature-sheet.js"
-import { RdDActorEntiteSheet } from "./actor/entite-sheet.js";
+import { RdDActorEntiteSheet } from "./actor/entite-sheet.js"
-import { RdDActorVehiculeSheet } from "./actor/vehicule-sheet.js";
+import { RdDActorVehiculeSheet } from "./actor/vehicule-sheet.js"
 
-import { RdDItem } from "./item.js";
+import { RdDItem } from "./item.js"
-import { RdDItemBlessure } from "./item/blessure.js";
+import { RdDItemBlessure } from "./item/blessure.js"
-import { RdDItemService } from "./item/service.js";
+import { RdDItemService } from "./item/service.js"
-import { RdDItemMaladie } from "./item/maladie.js";
+import { RdDItemMaladie } from "./item/maladie.js"
-import { RdDItemPoison } from "./item/poison.js";
+import { RdDItemPoison } from "./item/poison.js"
-import { RdDItemSigneDraconique } from "./item/signedraconique.js";
+import { RdDItemSigneDraconique } from "./item/signedraconique.js"
-import { RdDItemQueue } from "./item/queue.js";
+import { RdDItemQueue } from "./item/queue.js"
-import { RdDItemOmbre } from "./item/ombre.js";
+import { RdDItemOmbre } from "./item/ombre.js"
-import { RdDItemSouffle } from "./item/souffle.js";
+import { RdDItemSouffle } from "./item/souffle.js"
-import { RdDRencontre } from "./item/rencontre.js";
+import { RdDRencontre } from "./item/rencontre.js"
 
-import { RdDItemSheet } from "./item-sheet.js";
+import { RdDItemSheet } from "./item-sheet.js"
-import { RdDBlessureItemSheet } from "./item/sheet-blessure.js";
+import { RdDBlessureItemSheet } from "./item/sheet-blessure.js"
-import { RdDServiceItemSheet } from "./item/sheet-service.js";
+import { RdDServiceItemSheet } from "./item/sheet-service.js"
-import { RdDRencontreItemSheet } from "./item/sheet-rencontre.js";
+import { RdDRencontreItemSheet } from "./item/sheet-rencontre.js"
-import { RdDHerbeItemSheet } from "./item/sheet-herbe.js";
+import { RdDHerbeItemSheet } from "./item/sheet-herbe.js"
-import { RdDPlanteItemSheet } from "./item/sheet-plante.js";
+import { RdDPlanteItemSheet } from "./item/sheet-plante.js"
-import { RdDIngredientItemSheet } from "./item/sheet-ingredient.js";
+import { RdDIngredientItemSheet } from "./item/sheet-ingredient.js"
-import { RdDFauneItemSheet } from "./item/sheet-faune.js";
+import { RdDFauneItemSheet } from "./item/sheet-faune.js"
-import { RdDConteneurItemSheet } from "./item/sheet-conteneur.js";
+import { RdDConteneurItemSheet } from "./item/sheet-conteneur.js"
-import { RdDSigneDraconiqueItemSheet } from "./item/sheet-signedraconique.js";
+import { RdDSigneDraconiqueItemSheet } from "./item/sheet-signedraconique.js"
-import { RdDItemInventaireSheet } from "./item/sheet-base-inventaire.js";
+import { RdDItemInventaireSheet } from "./item/sheet-base-inventaire.js"
-import { AppAstrologie } from "./sommeil/app-astrologie.js";
+import { AppAstrologie } from "./sommeil/app-astrologie.js"
-import { RdDItemArmure } from "./item/armure.js";
+import { RdDItemArmure } from "./item/armure.js"
-import { AutoAdjustDarkness as AutoAdjustDarkness } from "./time/auto-adjust-darkness.js";
+import { AutoAdjustDarkness as AutoAdjustDarkness } from "./time/auto-adjust-darkness.js"
-import { RdDCreature } from "./actor/creature.js";
+import { RdDCreature } from "./actor/creature.js"
-import { RdDTMRDialog } from "./rdd-tmr-dialog.js";
+import { RdDTMRDialog } from "./rdd-tmr-dialog.js"
+//import { RdDActorExportSheet } from "./actor/actor-export-sheet.js"
+import { OptionsAvancees } from "./settings/options-avancees.js"
+import { ExportScriptarium } from "./actor/export-scriptarium/export-scriptarium.js"
 
 /**
  * RdD system
@@ -80,8 +83,9 @@ export class SystemReveDeDragon {
   }
 
   constructor() {
-    this.RdDUtility = RdDUtility;
+    this.config = RDD_CONFIG
-    this.RdDHotbar = RdDHotbar;
+    this.RdDUtility = RdDUtility
+    this.RdDHotbar = RdDHotbar
     this.itemClasses = {
       armure: RdDItemArmure,
       blessure: RdDItemBlessure,
@@ -107,42 +111,42 @@ export class SystemReveDeDragon {
   /*  Foundry VTT Initialization                  */
   /* -------------------------------------------- */
   async onInit() {
-    game.system.rdd = this;
+    game.system.rdd = this
-    this.AppAstrologie = AppAstrologie;
+    this.AppAstrologie = AppAstrologie
 
 
-    console.log(`Initializing Reve de Dragon System`);
+    console.log(`Initializing Reve de Dragon System`)
 
     // preload handlebars templates
-    RdDUtility.preloadHandlebarsTemplates();
+    RdDUtility.preloadHandlebarsTemplates()
 
     /* -------------------------------------------- */
-    this.initSystemSettings();
+    this.initSystemSettings()
 
     /* -------------------------------------------- */
     // Set an initiative formula for the system 
     CONFIG.Combat.initiative = {
       formula: "1+(1d6/10)",
       decimals: 2
-    };
+    }
 
     /* -------------------------------------------- */
     game.socket.on(SYSTEM_SOCKET_ID, async (sockmsg) => {
-      console.log(">>>>> MSG RECV", sockmsg);
+      console.log(">>>>> MSG RECV", sockmsg)
       try {
-        RdDUtility.onSocketMessage(sockmsg);
+        RdDUtility.onSocketMessage(sockmsg)
-        RdDCombat.onSocketMessage(sockmsg);
+        RdDCombat.onSocketMessage(sockmsg)
-        ChatUtility.onSocketMessage(sockmsg);
+        ChatUtility.onSocketMessage(sockmsg)
-        RdDBaseActor.onSocketMessage(sockmsg);
+        RdDBaseActor.onSocketMessage(sockmsg)
       } catch (e) {
         console.error('game.socket.on(SYSTEM_SOCKET_ID) Exception: ', sockmsg, ' => ', e)
       }
-    });
+    })
 
     /* -------------------------------------------- */
     // Define custom Entity classes
-    CONFIG.Actor.documentClass = RdDBaseActor;
+    CONFIG.Actor.documentClass = RdDBaseActor
-    CONFIG.Item.documentClass = RdDItem;
+    CONFIG.Item.documentClass = RdDItem
     CONFIG.RDD = {
       resolutionTable: RdDResolutionTable.resolutionTable,
       carac_array: RdDUtility.getCaracArray(),
@@ -152,30 +156,31 @@ export class SystemReveDeDragon {
 
     /* -------------------------------------------- */
     // Register sheet application classes
-    Actors.unregisterSheet("core", ActorSheet);
+    Actors.unregisterSheet("core", ActorSheet)
-    Actors.registerSheet(SYSTEM_RDD, RdDCommerceSheet, { types: ["commerce"], makeDefault: true });
+    Actors.registerSheet(SYSTEM_RDD, RdDCommerceSheet, { types: ["commerce"], makeDefault: true })
-    Actors.registerSheet(SYSTEM_RDD, RdDActorSheet, { types: ["personnage"], makeDefault: true });
+    //Actors.registerSheet(SYSTEM_RDD, RdDActorExportSheet, { types: ["personnage"], makeDefault: false })
-    Actors.registerSheet(SYSTEM_RDD, RdDCreatureSheet, { types: ["creature"], makeDefault: true });
+    Actors.registerSheet(SYSTEM_RDD, RdDActorSheet, { types: ["personnage"], makeDefault: true })
-    Actors.registerSheet(SYSTEM_RDD, RdDActorVehiculeSheet, { types: ["vehicule"], makeDefault: true });
+    Actors.registerSheet(SYSTEM_RDD, RdDCreatureSheet, { types: ["creature"], makeDefault: true })
-    Actors.registerSheet(SYSTEM_RDD, RdDActorEntiteSheet, { types: ["entite"], makeDefault: true });
+    Actors.registerSheet(SYSTEM_RDD, RdDActorVehiculeSheet, { types: ["vehicule"], makeDefault: true })
-    Items.unregisterSheet("core", ItemSheet);
+    Actors.registerSheet(SYSTEM_RDD, RdDActorEntiteSheet, { types: ["entite"], makeDefault: true })
+    Items.unregisterSheet("core", ItemSheet)
 
-    RdDItemSheet.register(RdDSigneDraconiqueItemSheet);
+    RdDItemSheet.register(RdDSigneDraconiqueItemSheet)
-    RdDItemSheet.register(RdDRencontreItemSheet);
+    RdDItemSheet.register(RdDRencontreItemSheet)
-    RdDItemSheet.register(RdDConteneurItemSheet);
+    RdDItemSheet.register(RdDConteneurItemSheet)
-    RdDItemSheet.register(RdDHerbeItemSheet);
+    RdDItemSheet.register(RdDHerbeItemSheet)
-    RdDItemSheet.register(RdDFauneItemSheet);
+    RdDItemSheet.register(RdDFauneItemSheet)
-    RdDItemSheet.register(RdDPlanteItemSheet);
+    RdDItemSheet.register(RdDPlanteItemSheet)
-    RdDItemSheet.register(RdDIngredientItemSheet);
+    RdDItemSheet.register(RdDIngredientItemSheet)
-    RdDItemSheet.register(RdDServiceItemSheet);
+    RdDItemSheet.register(RdDServiceItemSheet)
-    RdDItemSheet.register(RdDBlessureItemSheet);
+    RdDItemSheet.register(RdDBlessureItemSheet)
 
     Items.registerSheet(SYSTEM_RDD, RdDItemInventaireSheet, {
       types: [
         "objet", "arme", "armure", "livre", "potion", "munition",
         "monnaie", "nourritureboisson", "gemme",
       ], makeDefault: true
-    });
+    })
     Items.registerSheet(SYSTEM_RDD, RdDItemSheet, {
       types: [
         "competence", "competencecreature",
@@ -184,31 +189,32 @@ export class SystemReveDeDragon {
         "nombreastral", "tache", "maladie", "poison", "possession",
         "tarot", "extraitpoetique", "empoignade"
       ], makeDefault: true
-    });
+    })
-    CONFIG.Combat.documentClass = RdDCombatManager;
+    CONFIG.Combat.documentClass = RdDCombatManager
 
     // préparation des différents modules
-    AutoAdjustDarkness.init();
+    AutoAdjustDarkness.init()
-    RdDTimestamp.init();
+    RdDTimestamp.init()
-    RdDCalendrier.init();
+    RdDCalendrier.init()
-    SystemCompendiums.init();
+    SystemCompendiums.init()
-    DialogChronologie.init();
+    DialogChronologie.init()
-    ReglesOptionnelles.init();
+    ReglesOptionnelles.init()
-    RdDUtility.init();
+    OptionsAvancees.init()
-    RdDDice.init();
+    RdDUtility.init()
-    RdDCommands.init();
+    RdDDice.init()
-    RdDCombatManager.init();
+    RdDCommands.init()
-    RdDTokenHud.init();
+    RdDCombatManager.init()
-    RdDBaseActor.init();
+    RdDTokenHud.init()
-    RdDCompendiumOrganiser.init();
+    RdDBaseActor.init()
+    RdDCompendiumOrganiser.init()
     EffetsDraconiques.init()
-    TMRUtility.init();
+    TMRUtility.init()
     await RdDTMRDialog.init()
-    RdDHotbar.initDropbar();
+    RdDHotbar.init()
-    RdDPossession.init();
+    RdDPossession.init()
-    TMRRencontres.init();
+    TMRRencontres.init()
-    Environnement.init();
+    Environnement.init()
-
+    ExportScriptarium.init()
   }
 
   initSystemSettings() {
@@ -224,7 +230,7 @@ export class SystemReveDeDragon {
         "avant-encaissement": "Avant l'encaissement",
       },
       default: "avant-encaissement"
-    });
+    })
 
     /* -------------------------------------------- */
     game.settings.register(SYSTEM_RDD, "supprimer-dialogues-combat-chat", {
@@ -234,7 +240,7 @@ export class SystemReveDeDragon {
       config: true,
       default: true,
       type: Boolean
-    });
+    })
 
     /* -------------------------------------------- */
     game.settings.register(SYSTEM_RDD, "activer-sons-audio", {
@@ -244,7 +250,8 @@ export class SystemReveDeDragon {
       config: true,
       default: true,
       type: Boolean
-    });
+    })
+
     /* -------------------------------------------- */
     game.settings.register(SYSTEM_RDD, "appliquer-famine-soif", {
       name: "Notifier de la famine et la soif pour",
@@ -258,7 +265,7 @@ export class SystemReveDeDragon {
         "famine-soif": "la famine et la soif",
       },
       default: "aucun"
-    });
+    })
   }
 
   async onReady() {
@@ -266,71 +273,47 @@ export class SystemReveDeDragon {
     /* -------------------------------------------- */
     /*  Foundry VTT Initialization                  */
     /* -------------------------------------------- */
-    // CSS patch for v9
+    game.system.rdd.calendrier = new RdDCalendrier()
-    if (game.version) {
-      let sidebar = document.getElementById("sidebar");
-      sidebar.style.width = "min-content";
-    }
-    game.system.rdd.calendrier = new RdDCalendrier();
     if (Misc.isUniqueConnectedGM()) {
-      new Migrations().migrate();
+      new Migrations().migrate()
-      this.messageDeBienvenue();
+      this.messageDeBienvenue()
-      this.registerUsageCount(SYSTEM_RDD);
+      import("https://www.uberwald.me/fvtt_appcount/count-class-ready.js").then(moduleCounter => {
+        console.log("ClassCounter loaded", moduleCounter)
+        moduleCounter.ClassCounter.registerUsageCount()
+      }).catch(err =>
+        console.log("No stats available, giving up.")
+      )
     }
 
-    StatusEffects.onReady();
+    StatusEffects.onReady()
-    RdDHerbes.initializeHerbes();
+    RdDHerbes.onReady()
-    RdDDice.onReady();
+    RdDDice.onReady()
     /* -------------------------------------------- */
     /* Affiche/Init le calendrier */
-    game.system.rdd.calendrier.display();
+    game.system.rdd.calendrier.display()
     // Avertissement si joueur sans personnage
     if (!game.user.isGM && game.user.character == undefined) {
-      ui.notifications.info("Attention ! Vous n'êtes connecté à aucun personnage !");
+      ui.notifications.info("Attention ! Vous n'êtes connecté à aucun personnage !")
       ChatMessage.create({
         content: "<b>ATTENTION</b> Le joueur " + game.user.name + " n'est connecté à aucun personnage !",
         user: game.user.id
-      });
+      })
     }
   }
 
   /* -------------------------------------------- */
   messageDeBienvenue() {
     if (game.user.isGM) {
-      ChatUtility.removeChatMessageContaining('<div id="message-bienvenue-rdd">');
+      ChatUtility.removeChatMessageContaining('<div id="message-bienvenue-rdd">')
       ChatMessage.create({
         user: game.user.id,
         content: `<div id="message-bienvenue-rdd"><span class="rdd-roll-part">Bienvenue dans le Rêve des Dragons !</span>
       <br>Vous trouverez quelques informations pour démarrer dans ce document : @Compendium[foundryvtt-reve-de-dragon.rappel-des-regles.7uGrUHGdPu0EmIu2]{Documentation MJ/Joueurs}
       <br>La commande <code>/aide</code> dans le chat permet de voir les commandes spécifiques à Rêve de Dragon.</div>
-      ` });
+      ` })
     }
   }
-
-  /* -------------------------------------------- */
-  // Register world usage statistics
-  async registerUsageCount(registerKey) {
-    if (game.user.isGM) {
-      game.settings.register("world", "world-key", {
-        name: "Unique world key",
-        scope: "world",
-        config: false,
-        default: "NONE",
-        type: String
-      });
-
-      let worldKey = game.settings.get("world", "world-key")
-      if (worldKey == undefined || worldKey == "") {
-        worldKey = randomID(32)
-        game.settings.set("world", "world-key", worldKey)
-      }
-      let regURL = `https://www.uberwald.me/fvtt_appcount/count.php?name="${registerKey}"&worldKey="${worldKey}"&version="${game.release.generation}.${game.release.build}"&system="${game.system.id}"&systemversion="${game.system.version}"`
-      $.ajax(regURL)
-      /* -------------------------------------------- */
-    }
-  }
-
 }
 
-SystemReveDeDragon.start();
+SystemReveDeDragon.start()
 

module/rdd-meteo.js

@@ -56,7 +56,7 @@ const temperatures = [
 export class RdDMeteo {
   static async getForce() {
     const roll = new Roll(`1dr`);
-    await roll.evaluate({ async: true });
+    await roll.evaluate();
     return roll.total;
   }
 
@@ -67,14 +67,14 @@ export class RdDMeteo {
   static async getTemperature() {
     const degre = await RdDMeteo.getForce();
     const rollChaudFroid = new Roll('1d2');
-    await rollChaudFroid.evaluate({ async: true });
+    await rollChaudFroid.evaluate();
     const chaudFroid = rollChaudFroid.total == 1;
     return chaudFroid.total ? degre : -degre;
   }
 
   static async getDirection(direction) {
     const roll = new Roll(`1d16`);
-    await roll.evaluate({ async: true });
+    await roll.evaluate();
     switch (roll.total % 16) {
       case 0: return 'Nord';
       case 1: return 'Nord Nord Est';

module/rdd-possession.js

@@ -3,7 +3,7 @@ import { RdDResolutionTable } from "./rdd-resolution-table.js";
 import { RdDRoll } from "./rdd-roll.js";
 import { RdDItemCompetenceCreature } from "./item-competencecreature.js";
 import { Targets } from "./targets.js";
-import { TYPES } from "./item.js";
+import { ITEM_TYPES } from "./item.js";
 
 /* -------------------------------------------- */
 /* On part du principe qu'une entité démarre tjs 
@@ -20,11 +20,11 @@ export class RdDPossession {
 
   /* -------------------------------------------- */
   static searchPossessionFromEntite(attacker, defender) {
-    let poss = attacker.items.find(poss => poss.type == TYPES.possession && poss.system.victime.actorid == defender.id);
+    let poss = attacker.items.find(poss => poss.type == ITEM_TYPES.possession && poss.system.victime.actorid == defender.id);
     if (!poss) {
-      poss = defender.items.find(poss => poss.type == TYPES.possession && poss.system.victime.actorid == defender.id);
+      poss = defender.items.find(poss => poss.type == ITEM_TYPES.possession && poss.system.victime.actorid == defender.id);
     }
-    return poss && duplicate(poss) || undefined;
+    return poss && foundry.utils.duplicate(poss) || undefined;
   }
 
   /* -------------------------------------------- */
@@ -52,7 +52,7 @@ export class RdDPossession {
 
   /* -------------------------------------------- */
   static async onConjurerPossession(attacker, possession) {
-    possession = duplicate(possession);
+    possession = foundry.utils.duplicate(possession);
     RdDPossession.$updateEtatPossession(possession)
 
     const defender = game.actors.get(possession.system.entite.actorid);
@@ -80,7 +80,7 @@ export class RdDPossession {
       ui.notifications.warn("Une erreur s'est produite : Aucune possession trouvée !!")
       return
     }
-    possession = duplicate(possession)
+    possession = foundry.utils.duplicate(possession)
     // Update for draconic roll
     let rollData = {
       mode: "defense",
@@ -131,7 +131,7 @@ export class RdDPossession {
     }
     const possession = (rollData.isECNIDefender ? rollData.attacker : rollData.defender).getPossession(rollData.possession.system.possessionid)
     RdDPossession.storePossessionAttaque(possession, rollData)
-    await RdDResolutionTable.displayRollData(rollData, rollData.attacker, 'chat-resultat-possession.html');
+    await RdDResolutionTable.displayRollData(rollData, rollData.defender, 'chat-resultat-possession.html');
   }
 
   /* -------------------------------------------- */
@@ -171,7 +171,7 @@ export class RdDPossession {
     rollData.possession = possession
     RdDPossession.$updateEtatPossession(rollData.possession)
 
-    await RdDResolutionTable.displayRollData(rollData, rollData.defender, 'chat-resultat-possession.html')
+    await RdDResolutionTable.displayRollData(rollData, rollData.attacker, 'chat-resultat-possession.html')
     if (rollData.possession.isPosseder || rollData.possession.isConjurer) {
       // conjuration
       victime.deleteEmbeddedDocuments("Item", [rollData.possession._id])
@@ -230,7 +230,7 @@ export class RdDPossession {
       system: {
         description: "", typepossession: attacker.name,
         possede: false,
-        possessionid: randomID(16),
+        possessionid: foundry.utils.randomID(16),
         entite: { actorid: attacker.id },
         victime: { actorid: defender.id },
         compteur: 0

module/rdd-resolution-table.js

@@ -97,7 +97,7 @@ export class RdDResolutionTable {
   }
 
   static actorChatName(actor) {
-    return actor?.userName ?? game.user.name;
+    return actor?.name ?? game.user.name;
   }
 
   /* -------------------------------------------- */
@@ -114,7 +114,7 @@ export class RdDResolutionTable {
 
   /* -------------------------------------------- */
   static async roll(caracValue, finalLevel, rollData = {}) {
-    let chances = duplicate(this.computeChances(caracValue, finalLevel));
+    let chances = foundry.utils.duplicate(this.computeChances(caracValue, finalLevel));
     this._updateChancesWithBonus(chances, rollData.bonus, finalLevel);
     this._updateChancesFactor(chances, rollData.diviseurSignificative);
     chances.showDice = rollData.showDice;
@@ -158,7 +158,7 @@ export class RdDResolutionTable {
   static _updateChancesFactor(chances, diviseur) {
     if (chances.level > -11 && diviseur && diviseur > 1) {
       let newScore = Math.floor(chances.score / diviseur);
-      mergeObject(chances, this._computeCell(undefined, newScore), { overwrite: true });
+      foundry.utils.mergeObject(chances, this._computeCell(undefined, newScore), { overwrite: true });
     }
   }
 
@@ -166,27 +166,27 @@ export class RdDResolutionTable {
   static _updateChancesWithBonus(chances, bonus, finalLevel) {
     if (bonus && finalLevel > -11) {
       let newScore = Number(chances.score) + bonus;
-      mergeObject(chances, this._computeCell(undefined, newScore), { overwrite: true });
+      foundry.utils.mergeObject(chances, this._computeCell(undefined, newScore), { overwrite: true });
     }
   }
 
   /* -------------------------------------------- */
   static significativeRequise(chances) {
     chances.roll = Math.floor(chances.score / 2);
-    mergeObject(chances, reussites.find(x => x.code == 'sign'), { overwrite: true });
+    foundry.utils.mergeObject(chances, reussites.find(x => x.code == 'sign'), { overwrite: true });
   }
 
   /* -------------------------------------------- */
   static succesRequis(chances) {
     chances.roll = chances.score;
-    mergeObject(chances, reussites.find(x => x.code == 'norm'), { overwrite: true });
+    foundry.utils.mergeObject(chances, reussites.find(x => x.code == 'norm'), { overwrite: true });
   }
 
   /* -------------------------------------------- */
   static async rollChances(chances, diviseur, forceDiceResult = -1) {
     chances.forceDiceResult = forceDiceResult <= 0 || forceDiceResult > 100 ? undefined : { total: forceDiceResult };
     chances.roll = await RdDDice.rollTotal("1d100", chances);
-    mergeObject(chances, this.computeReussite(chances, chances.roll, diviseur), { overwrite: true });
+    foundry.utils.mergeObject(chances, this.computeReussite(chances, chances.roll, diviseur), { overwrite: true });
     return chances;
   }
 

module/rdd-roll-resolution-table.js

@@ -38,7 +38,7 @@ export class RdDRollResolutionTable extends Dialog {
       diffLibre: 0,
       use: { conditions:true, libre:true }
     }
-    mergeObject(rollData, defRollData, { overwrite: false });
+    foundry.utils.mergeObject(rollData, defRollData, { overwrite: false });
     for (let i = 1; i < 21; i++) {
       const key = `${i}`;
       rollData.carac[key] = { type: "number", value: i, label: key }

module/rdd-roll.js

@@ -65,7 +65,7 @@ export class RdDRoll extends Dialog {
       defaultRollData.carac["reve-actuel"] = actor.system.reve.reve
     }
 
-    mergeObject(rollData, defaultRollData, { recursive: true, overwrite: false });
+    foundry.utils.mergeObject(rollData, defaultRollData, { recursive: true, overwrite: false });
     if (rollData.forceCarac) {
       rollData.carac = rollData.forceCarac;
     }
@@ -307,7 +307,7 @@ export class RdDRoll extends Dialog {
   async updateRollResult(html) {
     const rollData = this.rollData;
 
-    rollData.dmg = rollData.attackerRoll?.dmg ?? RdDBonus.dmg(rollData, this.actor.getBonusDegat())
+    rollData.dmg = rollData.attackerRoll?.dmg ?? RdDBonus.dmg(rollData, this.actor)
     rollData.caracValue = parseInt(rollData.selectedCarac.value)
     rollData.dmg.mortalite = rollData.dmg.mortalite ?? 'mortel';
     rollData.use.appelAuMoral = this.actor.isPersonnage() && RdDCarac.isActionPhysique(rollData.selectedCarac);

module/rdd-sheet-utility.js

@@ -16,7 +16,7 @@ export class RdDSheetUtility {
       isObserver: userRightLevel >= CONST.DOCUMENT_OWNERSHIP_LEVELS.OBSERVER,
       isOwner: userRightLevel >= CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER
     }
-    mergeObject(options, newOptions);
+    foundry.utils.mergeObject(options, newOptions);
     return options;
   }
 
@@ -76,7 +76,7 @@ export class RdDSheetUtility {
   static async _onSplitItem(item, split, actor) {
     if (split >= 1 && split < item.system.quantite) {
       await item.diminuerQuantite(split);
-      const splitItem = duplicate(item);
+      const splitItem = foundry.utils.duplicate(item);
       // todo: ajouter dans le même conteneur?
       splitItem.system.quantite = split;
       await actor.createEmbeddedDocuments('Item', [splitItem])

module/rdd-tmr-dialog.js

@@ -16,7 +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";
+import { ITEM_TYPES } from "./item.js";
 import { Misc } from "./misc.js";
 
 const TMR_DISPLAY_SIZE = {
@@ -44,16 +44,15 @@ export class RdDTMRDialog extends Dialog {
       type: Number,
       range: TMR_DISPLAY_SIZE.range
     })
-    await PixiTMR.init()
   }
 
   static async create(actor, tmrData) {
+    await PixiTMR.init()
     let html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/dialog-tmr.html', tmrData);
-
     if (tmrData.mode != 'visu' && !game.user.isGM) {
       ChatMessage.create({ content: actor.name + " est monté dans les TMR en mode : " + tmrData.mode, whisper: ChatMessage.getWhisperRecipients("GM") });
     }
-    return new RdDTMRDialog(html, actor, tmrData);
+    return new RdDTMRDialog(html, actor, tmrData)
   }
 
   /* -------------------------------------------- */
@@ -71,7 +70,7 @@ export class RdDTMRDialog extends Dialog {
       'z-index': 40
     }
     super(dialogConf, dialogOptions);
-    this.tmrdata = duplicate(tmrData);
+    this.tmrdata = foundry.utils.duplicate(tmrData);
     this.actor = actor;
     this.actor.tmrApp = this; // reference this app in the actor structure
     this.viewOnly = tmrData.mode == "visu"
@@ -130,7 +129,7 @@ export class RdDTMRDialog extends Dialog {
     this.html.find('form.tmr-dialog *').click(event => this.subdialog?.bringToTop());
 
     // Roll Sort
-    this.html.find('.lancer-sort').click(event => this.actor.rollUnSort(this._getCoordActor()));
+    this.html.find('.lancer-sort').click(event => this.lancerUnSort());
     this.html.find('.lire-signe-draconique').click(event => this.actor.rollLireSigneDraconique(this._getCoordActor()));
 
     this.html.find('img.tmr-move').click(event => this.deplacementTMR(this.html.find(event.currentTarget)?.data('move')));
@@ -143,6 +142,13 @@ export class RdDTMRDialog extends Dialog {
     this.updateValuesDisplay();
   }
 
+  lancerUnSort() {
+    if (this.subdialog) {
+      return this.forceTMRContinueAction();
+    }
+    return this.actor.rollUnSort(this._getCoordActor());
+  }
+
   async onDeplacement() {
     await this.manageRencontre(TMRUtility.getTMR(this._getCoordActor()));
   }
@@ -165,23 +171,25 @@ export class RdDTMRDialog extends Dialog {
   async forceTMRDisplay() {
     if (this.rendered) {
       this.bringToTop()
-      if (this.subdialog?.bringToTop) {
+      this.bringSubDialogToTop();
-        this.subdialog.bringToTop();
+    }
-      }
+  }
+
+  bringSubDialogToTop() {
+    if (this.subdialog?.bringToTop && this.subdialog?.element[0]) {
+      this.subdialog.bringToTop();
     }
   }
 
   async restoreTMRAfterAction() {
     this.subdialog = undefined
-    await this.maximize();
+    await this.maximize()
-    this.bringToTop();
+    this.bringToTop()
   }
 
   forceTMRContinueAction() {
     ui.notifications.warn('Vous devez finir votre action avant de continuer dans les TMR');
-    if (this.subdialog?.bringToTop) {
+    this.bringSubDialogToTop();
-      this.subdialog.bringToTop();
-    }
     return;
   }
 
@@ -200,11 +208,11 @@ export class RdDTMRDialog extends Dialog {
   }
 
   get sortsReserve() {
-    return this.actor.itemTypes[TYPES.sortreserve];
+    return this.actor.itemTypes[ITEM_TYPES.sortreserve];
   }
 
   getSortsReserve(coord) {
-    return this.actor.itemTypes[TYPES.sortreserve].filter(// Reserve sur une case fleuve ou normale
+    return this.actor.itemTypes[ITEM_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
@@ -213,7 +221,7 @@ export class RdDTMRDialog extends Dialog {
 
   /* -------------------------------------------- */
   loadRencontres() {
-    this.rencontresExistantes = this.actor.getTMRRencontres();
+    this.rencontresExistantes = this.actor.getRencontresTMR();
   }
 
   /* -------------------------------------------- */
@@ -262,7 +270,7 @@ export class RdDTMRDialog extends Dialog {
   }
 
   _getTokensSortsReserve() {
-    const sortsReserve = this.actor.itemTypes[TYPES.sortreserve];
+    const sortsReserve = this.actor.itemTypes[ITEM_TYPES.sortreserve];
     return Misc.concat(sortsReserve.map(sortReserve =>
       EffetsDraconiques.sortReserve.tokens(this.pixiTMR, sortReserve, () => sortReserve.system.coord)))
   }
@@ -298,11 +306,10 @@ export class RdDTMRDialog extends Dialog {
 
   /* -------------------------------------------- */
   async updateValuesDisplay() {
-    if (!this.rendered) {
+    if (this.viewOnly || !this.rendered) {
       return;
     }
     const coord = this._getCoordActor();
-
     HtmlUtility.showControlWhen(this.html.find(".lire-signe-draconique"), this.actor.isResonanceSigneDraconique(coord));
 
     let ptsreve = document.getElementById("tmr-pointsreve-value");
@@ -384,7 +391,7 @@ export class RdDTMRDialog extends Dialog {
   async refouler() {
     console.log("-> refouler", this.currentRencontre);
     await this.actor.ajouterRefoulement(this.currentRencontre.system.refoulement, `${this.currentRencontre.system.genre == 'f' ? 'une' : 'un'} ${this.currentRencontre.name}`);
-    await this.actor.deleteTMRRencontreAtPosition(); // Remove the stored rencontre if necessary
+    await this.actor.deleteRencontreTMRAtPosition()
     this.updateTokens();
     this.updateValuesDisplay();
     this.nettoyerRencontre();
@@ -394,7 +401,7 @@ export class RdDTMRDialog extends Dialog {
   async ignorerRencontre() {
     console.log("-> ignorer", this.currentRencontre);
     this._tellToGM(this.actor.name + " a ignoré: " + this.currentRencontre.name);
-    await this.actor.deleteTMRRencontreAtPosition(); // Remove the stored rencontre if necessary
+    await this.actor.deleteRencontreTMRAtPosition()
     this.updateTokens();
     this.updateValuesDisplay();
     this.nettoyerRencontre();
@@ -409,7 +416,7 @@ export class RdDTMRDialog extends Dialog {
 
   /* -------------------------------------------- */
   $marquerCasesTMR(listCoordTMR) {
-    this.currentRencontre.locList = duplicate(listCoordTMR); // And track of allowed location
+    this.currentRencontre.locList = foundry.utils.duplicate(listCoordTMR); // And track of allowed location
     this.currentRencontre.graphics = listCoordTMR.map(coordTMR => this.pixiTMR.addMarkTMR(coordTMR))
   }
 
@@ -448,7 +455,7 @@ export class RdDTMRDialog extends Dialog {
   async maitriserRencontre() {
     console.log("-> maitriser", this.currentRencontre);
 
-    await this.actor.deleteTMRRencontreAtPosition();
+    await this.actor.deleteRencontreTMRAtPosition()
     this.updateTokens();
 
     let rencontreData = {
@@ -538,7 +545,7 @@ export class RdDTMRDialog extends Dialog {
   /* -------------------------------------------- */
   _rollPresentCite(rencData) {
     let rolled = RdDResolutionTable.computeChances(rencData.reve, 0);
-    mergeObject(rolled, { caracValue: rencData.reve, finalLevel: 0, roll: rolled.score });
+    foundry.utils.mergeObject(rolled, { caracValue: rencData.reve, finalLevel: 0, roll: rolled.score });
     RdDResolutionTable.succesRequis(rolled);
     return rolled;
   }
@@ -681,7 +688,7 @@ export class RdDTMRDialog extends Dialog {
     if (this.isCaseHumide(tmr)) {
       let rollData = {
         actor: this.actor,
-        competence: duplicate(this.actor.getBestDraconic()),
+        competence: foundry.utils.duplicate(this.actor.getBestDraconic()),
         tmr: tmr,
         canClose: false,
         diffLibre: -7,
@@ -700,7 +707,6 @@ export class RdDTMRDialog extends Dialog {
   }
 
   async _resultatMaitriseCaseHumide(rollData) {
-    await this.souffleSiEchecTotal(rollData);
     if (rollData.rolled.isSuccess && rollData.double) {
       rollData.previous = { rolled: rollData.rolled, ajustements: rollData.ajustements };
       rollData.double = undefined;
@@ -715,6 +721,7 @@ export class RdDTMRDialog extends Dialog {
     if (rollData.rolled.isEchec) {
       await this.close();
     }
+    await this.souffleSiEchecTotal(rollData);
   }
 
   /* -------------------------------------------- */
@@ -806,7 +813,7 @@ export class RdDTMRDialog extends Dialog {
   async _conquerir(tmr, options) {
     let rollData = {
       actor: this.actor,
-      competence: duplicate(this.actor.getBestDraconic()),
+      competence: foundry.utils.duplicate(this.actor.getBestDraconic()),
       tmr: tmr,
       canClose: options.canClose ?? false,
       diffLibre: options.difficulte ?? -7,

module/rdd-utility.js

@@ -4,7 +4,7 @@ import { RdDCombat } from "./rdd-combat.js";
 import { Misc } from "./misc.js";
 import { Grammar } from "./grammar.js";
 import { TMRUtility } from "./tmr-utility.js";
-import { DialogItemAchat } from "./dialog-item-achat.js";
+import { DialogItemAchat } from "./achat-vente/dialog-item-achat.js";
 import { ReglesOptionnelles } from "./settings/regles-optionnelles.js";
 import { RdDDice } from "./rdd-dice.js";
 import { RdDItem } from "./item.js";
@@ -18,6 +18,8 @@ import { RdDRaretes } from "./item/raretes.js";
 import { RdDEmpoignade } from "./rdd-empoignade.js";
 import { ExperienceLog } from "./actor/experience-log.js";
 import { RdDCoeur } from "./coeur/rdd-coeur.js";
+import { APP_ASTROLOGIE_REFRESH } from "./sommeil/app-astrologie.js";
+import { RDD_CONFIG } from "./constants.js";
 
 /* -------------------------------------------- */
 // This table starts at 0 -> niveau -10
@@ -31,7 +33,7 @@ function _buildAllSegmentsFatigue(max) {
   const cycle = [5, 2, 4, 1, 3, 0];
   const fatigue = [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]];
   for (let i = 0; i <= max; i++) {
-    const ligneFatigue = duplicate(fatigue[i]);
+    const ligneFatigue = foundry.utils.duplicate(fatigue[i]);
     const caseIncrementee = cycle[i % 6];
     ligneFatigue[caseIncrementee]++;
     ligneFatigue[caseIncrementee + 6]++;
@@ -45,7 +47,7 @@ function _buildAllSegmentsFatigue(max) {
 function _cumulSegmentsFatigue(matrix) {
   let cumulMatrix = [];
   for (let line of matrix) {
-    let cumul = duplicate(line);
+    let cumul = foundry.utils.duplicate(line);
 
     for (let i = 1; i < 12; i++) {
       cumul[i] += cumul[i - 1];
@@ -63,12 +65,6 @@ const cumulFatigueMatrix = _cumulSegmentsFatigue(fatigueMatrix);
 const fatigueMalus = [0, 0, 0, -1, -1, -1, -2, -3, -4, -5, -6, -7]; // Provides the malus for each segment of fatigue
 const fatigueLineSize = [3, 6, 7, 8, 9, 10, 11, 12];
 const fatigueLineMalus = [0, -1, -2, -3, -4, -5, -6, -7];
-const fatigueMarche = {
-  "aise": { "4": 1, "6": 2, "8": 3, "10": 4, "12": 6 },
-  "malaise": { "4": 2, "6": 3, "8": 4, "10": 6 },
-  "difficile": { "4": 3, "6": 4, "8": 6 },
-  "tresdifficile": { "4": 4, "6": 6 }
-}
 
 /* -------------------------------------------- */
 const nomEthylisme = ["Emeché", "Gris", "Pinté", "Pas frais", "Ivre", "Bu", "Complètement fait", "Ivre mort"];
@@ -104,8 +100,9 @@ export class RdDUtility {
   static afficheContenu = {}
   /* -------------------------------------------- */
   static async init() {
-    Hooks.on("renderChatMessage", async (app, html, msg) => RdDUtility.onRenderChatMessage(app, html, msg));
+    Hooks.on("renderChatMessage", async (app, html, msg) => await ChatUtility.onRenderChatMessage(app, html, msg))
-    Hooks.on('renderChatLog', (log, html, chatLog) => RdDUtility.chatListeners(html));
+    Hooks.on("createChatMessage", async (chatMessage, options, id) => await ChatUtility.onCreateChatMessage(chatMessage, options, id))
+    Hooks.on('renderChatLog', (log, html, chatLog) => RdDUtility.chatListeners(html))
   }
 
   /* -------------------------------------------- */
@@ -208,7 +205,10 @@ export class RdDUtility {
       'systems/foundryvtt-reve-de-dragon/templates/coeur/afficher-coeur.hbs',
       'systems/foundryvtt-reve-de-dragon/templates/tirage/liste-resultats-recherche.hbs',
       'systems/foundryvtt-reve-de-dragon/templates/time/horloge.hbs',
+      'systems/foundryvtt-reve-de-dragon/templates/voyage/fatigue-actor.hbs',
+      'systems/foundryvtt-reve-de-dragon/templates/voyage/option-vitesse-fatigue.hbs',
       'systems/foundryvtt-reve-de-dragon/templates/common/timestamp.hbs',
+      'systems/foundryvtt-reve-de-dragon/templates/common/date-heure.hbs',
       'systems/foundryvtt-reve-de-dragon/templates/common/periodicite.hbs',
       'systems/foundryvtt-reve-de-dragon/templates/common/enum-duree.hbs',
       'systems/foundryvtt-reve-de-dragon/templates/common/compendium-link.hbs',
@@ -263,8 +263,6 @@ export class RdDUtility {
     ];
 
     Handlebars.registerHelper('either', (a, b) => a ?? b);
-    Handlebars.registerHelper('computeResolutionScore', (row, col) => RdDResolutionTable.computePercentage(row, col));
-    Handlebars.registerHelper('computeResolutionChances', (row, col) => RdDResolutionTable.computeChances(row, col));
     Handlebars.registerHelper('upperFirst', str => Misc.upperFirst(str ?? 'Null'));
     Handlebars.registerHelper('lowerFirst', str => Misc.lowerFirst(str ?? 'Null'));
     Handlebars.registerHelper('upper', str => str?.toUpperCase() ?? '');
@@ -273,6 +271,10 @@ export class RdDUtility {
     Handlebars.registerHelper('apostrophe', (article, str) => Grammar.apostrophe(article, str));
     Handlebars.registerHelper('un', str => Grammar.articleIndetermine(str));
     Handlebars.registerHelper('accord', (genre, ...args) => Grammar.accord(genre, args));
+
+    Handlebars.registerHelper('RDD_CONFIG', path => RDD_CONFIG[path])
+    Handlebars.registerHelper('computeResolutionScore', (row, col) => RdDResolutionTable.computePercentage(row, col));
+    Handlebars.registerHelper('computeResolutionChances', (row, col) => RdDResolutionTable.computeChances(row, col));
     Handlebars.registerHelper('buildLigneInventaire', (item, options) => { return new Handlebars.SafeString(RdDUtility.buildLigneInventaire(item, options)); });
     Handlebars.registerHelper('buildInventaireConteneur', (actorId, itemId, options) => { return new Handlebars.SafeString(RdDUtility.buildInventaireConteneur(actorId, itemId, options)); });
     Handlebars.registerHelper('buildContenuConteneur', (item, options) => { return new Handlebars.SafeString(RdDUtility.buildContenuConteneur(item, options)); });
@@ -288,6 +290,7 @@ export class RdDUtility {
     Handlebars.registerHelper('timestamp-formulesDuree', () => RdDTimestamp.formulesDuree());
     Handlebars.registerHelper('timestamp-formulesPeriode', () => RdDTimestamp.formulesPeriode());
 
+    Handlebars.registerHelper('array-includes', (array, value) => array.includes(value));
     Handlebars.registerHelper('min', (...args) => Math.min(...args.slice(0, -1)));
     Handlebars.registerHelper('regle-optionnelle', (option) => ReglesOptionnelles.isUsing(option));
     Handlebars.registerHelper('trier', list => list.sort((a, b) => a.name.localeCompare(b.name)));
@@ -300,6 +303,14 @@ export class RdDUtility {
     Handlebars.registerHelper('plusMoins', diff => (diff > 0 ? '+' : '') + Math.round(diff))
     Handlebars.registerHelper('experienceLog-topic', topic => ExperienceLog.labelTopic(topic));
 
+    // Handle v12 removal of this helper
+    Handlebars.registerHelper('select', function (selected, options) {
+      const escapedValue = RegExp.escape(Handlebars.escapeExpression(selected));
+      const rgx = new RegExp(' value=[\"\']' + escapedValue + '[\"\']');
+      const html = options.fn(this);
+      return html.replace(rgx, "$& selected");
+    });
+
     return loadTemplates(templatePaths);
   }
 
@@ -347,13 +358,15 @@ export class RdDUtility {
     let objetVersConteneur = {};
     // Attribution des objets aux conteneurs
     for (let conteneur of conteneurs) {
-      conteneur.subItems = [];
+      if (conteneur.isConteneur()) {
-      for (let id of conteneur.system.contenu ?? []) {
+        conteneur.subItems = [];
-        let objet = inventaires.find(objet => (id == objet._id));
+        for (let id of conteneur.system.contenu ?? []) {
-        if (objet) {
+          let objet = inventaires.find(objet => (id == objet._id));
-          objet.estContenu = true; // Permet de filtrer ce qui est porté dans le template
+          if (objet) {
-          objetVersConteneur[id] = conteneur._id;
+            objet.estContenu = true;
-          conteneur.subItems.push(objet);
+            objetVersConteneur[id] = conteneur._id;
+            conteneur.subItems.push(objet);
+          }
         }
       }
     }
@@ -552,49 +565,54 @@ export class RdDUtility {
 
   /* -------------------------------------------- */
   static async jetEncaissement(rollData, armure, options = { showDice: HIDE_DICE }) {
-    let formula = "2d10";
+    const diff = Math.abs(rollData.diffLibre);
+    let formula = RdDUtility.formuleEncaissement(diff, options)
+    const roll = await RdDDice.roll(formula, options);
 
-    // Chaque dé fait au minmum la difficulté libre
+    RdDUtility.remplaceDeMinParDifficulte(roll, diff, options);
-    if (ReglesOptionnelles.isUsing('degat-minimum-malus-libre')) {
-      if (rollData.diffLibre < 0) {
-        let valeurMin = Math.abs(rollData.diffLibre);
-        formula += "min" + valeurMin;
-      }
-    }
-    // Chaque dé fait au minmum la difficulté libre
-    if (ReglesOptionnelles.isUsing('degat-ajout-malus-libre')) {
-      if (rollData.diffLibre < 0) {
-        let valeurMin = Math.abs(rollData.diffLibre);
-        formula += "+" + valeurMin;
-      }
-    }
-
-    let roll = await RdDDice.roll(formula, options);
-
-    // 1 dé fait au minmum la difficulté libre
-    if (ReglesOptionnelles.isUsing('degat-minimum-malus-libre-simple')) {
-      if (rollData.diffLibre < 0) {
-        let valeurMin = Math.abs(rollData.diffLibre);
-        if (roll.terms[0].results[0].result < valeurMin) {
-          roll.terms[0].results[0].result = valeurMin;
-        } else if (roll.terms[0].results[1].result < valeurMin) {
-          roll.terms[0].results[1].result = valeurMin;
-        }
-        roll._total = roll.terms[0].results[0].result + roll.terms[0].results[1].result;
-      }
-    }
 
     return await RdDUtility.prepareEncaissement(rollData, roll, armure);
   }
 
+  static remplaceDeMinParDifficulte(roll, diff, options) {
+    if (!ReglesOptionnelles.isUsing('degat-minimum-malus-libre-simple')) {
+      return
+    }
+    // 1 dé fait au minmum la difficulté libre
+    const total = options.forceDiceResult?.total;
+    if (total) {
+      const reste = Math.max(total - diff, 1)
+      roll.terms[0].number = reste + diff
+    }
+    else {
+      if (roll.terms[0].results[0].result < diff) {
+        roll.terms[0].results[0].result = diff;
+      } else if (roll.terms[0].results[1].result < diff) {
+        roll.terms[0].results[1].result = diff;
+      }
+      roll._total = roll.terms[0].results[0].result + roll.terms[0].results[1].result;
+    }
+  }
+
+  static formuleEncaissement(diff, options) {
+    // Chaque dé fait au minimum la difficulté libre
+    if (ReglesOptionnelles.isUsing('degat-minimum-malus-libre')) {
+      return `2d10min${diff}`
+    }
+    return '2d10'
+  }
+
   /* -------------------------------------------- */
   static async prepareEncaissement(rollData, roll, armure) {
-    const jetTotal = roll.total + rollData.dmg.total - armure;
+    // La difficulté d'ataque s'ajoute aux dégâts
-    let encaissement = RdDUtility._selectEncaissement(jetTotal, rollData.dmg.mortalite);
+    const bonusDegatsDiffLibre = ReglesOptionnelles.isUsing('degat-ajout-malus-libre') ? Math.abs(rollData.diffLibre ?? 0) : 0
-    let over20 = Math.max(jetTotal - 20, 0);
+    const jetTotal = roll.total + rollData.dmg.total - armure + bonusDegatsDiffLibre
+    const encaissement = RdDUtility._selectEncaissement(jetTotal, rollData.dmg.mortalite);
+    const over20 = Math.max(jetTotal - 20, 0);
     encaissement.dmg = rollData.dmg;
     encaissement.dmg.loc = rollData.dmg.loc ?? await RdDUtility.getLocalisation(this.type);
     encaissement.dmg.loc.label = encaissement.dmg.loc.label ?? 'Corps;';
+    encaissement.dmg.bonusDegatsDiffLibre = bonusDegatsDiffLibre
     encaissement.roll = roll;
     encaissement.armure = armure;
     encaissement.penetration = rollData.arme?.system.penetration ?? 0;
@@ -610,34 +628,28 @@ export class RdDUtility {
     for (let encaissement of table) {
       if ((encaissement.minimum === undefined || encaissement.minimum <= degats)
         && (encaissement.maximum === undefined || degats <= encaissement.maximum)) {
-        return duplicate(encaissement);
+        return foundry.utils.duplicate(encaissement);
       }
     }
-    return duplicate(table[0]);
+    return foundry.utils.duplicate(table[0]);
   }
 
   /* -------------------------------------------- */
   static async _evaluatePerte(formula, over20) {
     let perte = new Roll(formula, { over20: over20 });
-    await perte.evaluate({ async: true });
+    await perte.evaluate();
     return perte.total;
   }
 
-  /* -------------------------------------------- */
-  static async responseNombreAstral(callData) {
-    let actor = game.actors.get(callData.id);
-    actor.ajouteNombreAstral(callData);
-  }
-
   /* -------------------------------------------- */
   static onSocketMessage(sockmsg) {
     switch (sockmsg.msg) {
       case "msg_gm_chat_message":
         return ChatUtility.handleGMChatMessage(sockmsg.data);
+      case "msg_app_astrologie_refresh":
+        return Hooks.callAll(APP_ASTROLOGIE_REFRESH);
       case "msg_request_nombre_astral":
         return game.system.rdd.calendrier.requestNombreAstral(sockmsg.data);
-      case "msg_response_nombre_astral":
-        return RdDUtility.responseNombreAstral(sockmsg.data);
       case "msg_tmr_move":
         let actor = game.actors.get(sockmsg.data.actorId);
         if (actor.isOwner || game.user.isGM) {
@@ -757,7 +769,7 @@ export class RdDUtility {
   /* -------------------------------------------- */
   static createMonnaie(name, cout, img = "", enc = 0.01) {
     let piece = {
-      name: name, type: 'monnaie', img: img, _id: randomID(16),
+      name: name, type: 'monnaie', img: img, _id: foundry.utils.randomID(16),
       dasystemta: {
         quantite: 0,
         cout: cout,
@@ -893,10 +905,4 @@ export class RdDUtility {
     }
   }
 
-  /*-------------------------------------------- */
-  static async onRenderChatMessage(app, html, msg) {
-    // TODO 
-    //console.log(app, html, msg);
-  }
-
 }

module/rolldata-ajustements.js

@@ -111,7 +111,7 @@ export const referenceAjustements = {
     isVisible: (rollData, actor) => rollData.arme?.system.magique && Number(rollData.arme?.system.ecaille_efficacite) > 0,
     isUsed: (rollData, actor) => rollData.arme?.system.magique && Number(rollData.arme?.system.ecaille_efficacite) > 0,
     getLabel: (rollData, actor) => "Ecaille d'Efficacité: ",
-    getValue: (rollData, actor) => Math.max(Number(rollData.arme?.system.ecaille_efficacite), 0),
+    getValue: (rollData, actor) => rollData.arme?.system.magique ? Math.max(Number(rollData.arme?.system.ecaille_efficacite), 0) : 0,
   },
   finesse: {
     isUsed: (rollData, actor) => RdDBonus.isDefenseAttaqueFinesse(rollData),
@@ -166,7 +166,7 @@ export class RollDataAjustements {
   /* -------------------------------------------- */
   static calcul(rollData, actor) {
     // s'assurer de la correction des infos rollData
-    mergeObject(rollData, { ajustements: {}, use: {} }, { overwrite: false })
+    foundry.utils.mergeObject(rollData, { ajustements: {}, use: {} }, { overwrite: false })
 
     for (var key in referenceAjustements) {
       const reference = referenceAjustements[key];

module/settings/options-avancees.js

@@ -0,0 +1,91 @@
+import { SYSTEM_RDD } from "../constants.js"
+import { Misc } from "../misc.js"
+
+export const EXPORT_CSV_SCRIPTARIUM = 'export-csv-scriptarium'
+
+const OPTIONS_AVANCEES = [
+  { group: 'Menus', name: EXPORT_CSV_SCRIPTARIUM, descr: "Proposer le menu d'export csv Scriptarium (raffraichissement requis)" },
+]
+
+export class OptionsAvancees extends FormApplication {
+  static init() {
+    for (const regle of OPTIONS_AVANCEES) {
+      const name = regle.name
+      const id = OptionsAvancees._getId(name)
+      game.settings.register(SYSTEM_RDD, id, { name: id, scope: regle.scope ?? "world", config: false, default: regle.default == undefined ? true : regle.default, type: Boolean })
+    }
+
+    game.settings.registerMenu(SYSTEM_RDD, "rdd-options-avancees", {
+      name: "Configurer les options avancées",
+      label: "Options avancées",
+      hint: "Ouvre la fenêtre de configuration des options avancées",
+      icon: "fas fa-bars",
+      type: OptionsAvancees
+    })
+  }
+
+  constructor(...args) {
+    super(...args)
+  }
+
+  static _getId(name) {
+    return `rdd-advanced-${name}`
+  }
+
+  static get defaultOptions() {
+    return foundry.utils.mergeObject(super.defaultOptions, {
+      id: "options-avancees",
+      template: "systems/foundryvtt-reve-de-dragon/templates/settings/options-avancees.hbs",
+      height: 650,
+      width: 550,
+      minimizable: false,
+      closeOnSubmit: true,
+      title: "Options avancées"
+    }, { inplace: false })
+  }
+
+  getData() {
+    let formData = super.getData()
+    const regles = OPTIONS_AVANCEES.filter(it => game.user.isGM || it.scope == "client")
+      .map(it => {
+        it = foundry.utils.duplicate(it)
+        it.id = OptionsAvancees._getId(it.name)
+        it.active = OptionsAvancees.isSet(it.name)
+        return it
+      })
+    formData.regles = regles
+    formData.groups = Misc.classify(regles, it => it.group)
+    return formData
+  }
+
+  static getSettingKey(name){
+    return `${SYSTEM_RDD}.${this._getId(name)}`
+  }
+
+  static isUsing(name) {
+    return OptionsAvancees.isSet(name)
+  }
+
+  static isSet(name) {
+    return game.settings.get(SYSTEM_RDD, OptionsAvancees._getId(name))
+  }
+
+  static set(name, value) {
+    return game.settings.set(SYSTEM_RDD, OptionsAvancees._getId(name), value ? true : false)
+  }
+
+  activateListeners(html) {
+    html.find(".select-option").click((event) => {
+      if (event.currentTarget.attributes.name) {
+        let id = event.currentTarget.attributes.name.value
+        let isChecked = event.currentTarget.checked
+        game.settings.set(SYSTEM_RDD, id, isChecked)
+      }
+    })
+  }
+
+  async _updateObject(event, formData) {
+    this.close()
+  }
+}
+

module/settings/regles-optionnelles.js

@@ -26,6 +26,7 @@ const listeReglesOptionnelles = [
   
   { group: 'Confirmations', name: 'confirmer-combat-sans-cible',         descr: "Confirmer avant une attaque sans cible", scope: "client"},
   { group: 'Confirmations', name: 'confirmation-tmr',                    descr: "Confirmer pour monter dans les TMR", scope: "client"},
+  { group: 'Confirmations', name: 'confirmation-tmr-rencontre',          descr: "Confirmer pour monter dans les TMR avec rencontre en attente", scope: "client"},
   { group: 'Confirmations', name: 'confirmation-refouler',               descr: "Confirmer avant de refouler", scope: "client"},
   { group: 'Confirmations', name: 'confirmation-vider',                  descr: "Confirmer pour vider l'équipement", scope: "client"},
   { group: 'Confirmations', name: 'confirmation-supprimer-lien-acteur',  descr: "Confirmer pour détacher un animal/suivant/véhicule", scope: "client"},
@@ -70,23 +71,21 @@ export class ReglesOptionnelles extends FormApplication {
   }
 
   static get defaultOptions() {
-    const options = super.defaultOptions;
+    return foundry.utils.mergeObject(super.defaultOptions, {
-    mergeObject(options, {
       id: "regles-optionnelles",
-      template: "systems/foundryvtt-reve-de-dragon/templates/settings/regles-optionnelles.html",
+      template: "systems/foundryvtt-reve-de-dragon/templates/settings/regles-optionnelles.hbs",
       height: 650,
       width: 550,
       minimizable: false,
       closeOnSubmit: true,
       title: "Règles optionnelles"
-    });
+    }, { inplace: false })
-    return options;
   }
 
   getData() {
     let formData = super.getData();
     const regles = listeReglesOptionnelles.filter(it => game.user.isGM || it.scope == "client").map(it => {
-      it = duplicate(it);
+      it = foundry.utils.duplicate(it);
       it.id = ReglesOptionnelles._getIdRegle(it.name);
       it.active = ReglesOptionnelles.isSet(it.name);
       return it;

module/settings/status-effects.js

@@ -18,8 +18,8 @@ const rddStatusEffects = [
   { rdd: true, id: STATUSES.StatusStunned, label: 'EFFECT.StatusStunned', icon: 'icons/svg/stoned.svg', "duration.rounds": 1 },
   { rdd: true, id: STATUSES.StatusBleeding, label: 'EFFECT.StatusBleeding', icon: 'icons/svg/blood.svg' },
   { rdd: true, id: STATUSES.StatusProne, label: 'EFFECT.StatusProne', icon: 'icons/svg/falling.svg' },
-  { rdd: true, id: STATUSES.StatusGrappling, tint: '#33cc33', label: 'EFFECT.StatusGrappling', icon: 'systems/foundryvtt-reve-de-dragon/icons/empoignade.svg' },
+  { rdd: true, id: STATUSES.StatusGrappling, tint: '#33cc33', label: 'EFFECT.StatusGrappling', icon: 'systems/foundryvtt-reve-de-dragon/icons/empoignade.webp' },
-  { rdd: true, id: STATUSES.StatusGrappled, tint: '#ff9900', label: 'EFFECT.StatusGrappled', icon: 'systems/foundryvtt-reve-de-dragon/icons/empoignade.svg' },
+  { rdd: true, id: STATUSES.StatusGrappled, tint: '#ff9900', label: 'EFFECT.StatusGrappled', icon: 'systems/foundryvtt-reve-de-dragon/icons/empoignade.webp' },
   { rdd: true, id: STATUSES.StatusRestrained, label: 'EFFECT.StatusRestrained', icon: 'icons/svg/net.svg' },
   { rdd: true, id: STATUSES.StatusUnconscious, label: 'EFFECT.StatusUnconscious', icon: 'icons/svg/unconscious.svg' },
   { rdd: true, id: STATUSES.StatusBlind, label: 'EFFECT.StatusBlind', icon: 'icons/svg/blind.svg' },
@@ -65,12 +65,12 @@ export class StatusEffects extends FormApplication {
 
   static valeurSurprise(effect, isCombat) {
     if (statusSurpriseTotale.intersects(effect.statuses)) {
-      return 2;
+      return 2
     }
     if (statusDemiSurprise.intersects(effect.statuses)) {
       return 1
     }
-    if (isCombat && effect.statuses.includes(STATUSES.StatusDemiReve)) {
+    if (isCombat && effect.statuses.find(e => e == STATUSES.StatusDemiReve)) {
       return 1
     }
     return 0
@@ -94,7 +94,7 @@ export class StatusEffects extends FormApplication {
   static prepareActiveEffect(effectId) {
     let status = rddStatusEffects.find(it => it.id == effectId)
     if (status) {
-      status = duplicate(status)
+      status = foundry.utils.duplicate(status)
       status.statuses = [effectId]
     }
     return status;
@@ -110,7 +110,7 @@ export class StatusEffects extends FormApplication {
 
   static get defaultOptions() {
     const options = super.defaultOptions;
-    mergeObject(options, {
+    foundry.utils.mergeObject(options, {
       id: "status-effects",
       template: "systems/foundryvtt-reve-de-dragon/templates/settings/status-effects.html",
       height: 800,
@@ -125,7 +125,7 @@ export class StatusEffects extends FormApplication {
   getData() {
     const used = StatusEffects._getUseStatusEffects();
     let formData = super.getData();
-    formData.effects = duplicate(CONFIG.RDD.allEffects);
+    formData.effects = foundry.utils.duplicate(CONFIG.RDD.allEffects);
     formData.effects.forEach(it => it.active = used.includes(it.id))
     return formData;
   }

module/settings/system-compendiums.js

@@ -1,3 +1,4 @@
+import { ChatUtility } from "../chat-utility.js";
 import { HIDE_DICE, SYSTEM_RDD } from "../constants.js";
 import { RdDItem } from "../item.js";
 import { Misc } from "../misc.js";
@@ -27,7 +28,7 @@ export class SystemCompendiums extends FormApplication {
   static init() {
     Object.keys(CONFIGURABLE_COMPENDIUMS).forEach(compendium => {
       const definition = CONFIGURABLE_COMPENDIUMS[compendium];
-      mergeObject(definition, {
+      foundry.utils.mergeObject(definition, {
         compendium: compendium,
         default: SystemCompendiums._getDefaultCompendium(compendium),
         setting: SystemCompendiums._getSettingCompendium(compendium)
@@ -138,7 +139,7 @@ export class SystemCompendiums extends FormApplication {
 
   static get defaultOptions() {
     const options = super.defaultOptions;
-    mergeObject(options, {
+    foundry.utils.mergeObject(options, {
       id: "system-compendiums",
       template: "systems/foundryvtt-reve-de-dragon/templates/settings/system-compendiums.html",
       height: 'fit-content',
@@ -152,7 +153,7 @@ export class SystemCompendiums extends FormApplication {
 
   getData() {
     const systemCompendiums = Object.values(CONFIGURABLE_COMPENDIUMS)
-      .map(it => mergeObject(it, { value: SystemCompendiums.getCompendium(it.compendium) }));
+      .map(it => foundry.utils.mergeObject(it, { value: SystemCompendiums.getCompendium(it.compendium) }, { inplace: false }))
     const availableCompendiums = game.packs.map(pack => {
       return {
         name: pack.collection,
@@ -160,10 +161,10 @@ export class SystemCompendiums extends FormApplication {
         type: pack.metadata.type
       }
     });
-    return mergeObject(super.getData(), {
+    return foundry.utils.mergeObject(super.getData(), {
       systemCompendiums: systemCompendiums,
       availableCompendiums: availableCompendiums
-    });
+    }, { inplace: false })
   }
 
   activateListeners(html) {
@@ -290,7 +291,7 @@ export class CompendiumTableHelpers {
       sound: CONFIG.sounds.dice,
       content: flavorContent
     };
-    ChatMessage.create(messageData, { rollMode: "gmroll" });
+    await ChatUtility.createChatWithRollMode(game.user.id, messageData)
   }
 
   /* -------------------------------------------- */
@@ -306,7 +307,7 @@ export class CompendiumTableHelpers {
       whisper: game.user.id,
       content: flavorContent
     };
-    ChatMessage.create(messageData, { rollMode: "gmroll" });
+    await ChatUtility.createChatWithRollMode(game.user.id, messageData)
   }
 
 }

module/sommeil/app-astrologie.js

@@ -17,7 +17,7 @@ export class AppAstrologie extends Application {
 
 
   static get defaultOptions() {
-    return mergeObject(super.defaultOptions, {
+    return foundry.utils.mergeObject(super.defaultOptions, {
       template: "systems/foundryvtt-reve-de-dragon/templates/sommeil/app-astrologie.hbs",
       title: "Astrologie",
       width: 'fit-content',
@@ -25,19 +25,18 @@ export class AppAstrologie extends Application {
       classes: ['calendar-astrologie'],
       popOut: true,
       resizable: false
-    });
+    }, { inplace: false })
   }
 
   constructor(actor, options = {}) {
     super(options);
     this.actor = actor;
-    this.hookReference = Hooks.on(APP_ASTROLOGIE_REFRESH, () => this.refreshAstrologie());
   }
 
   getData(options) {
     this.appData = super.getData(options)
     const calendrier = game.system.rdd.calendrier;
-    mergeObject(this.appData, {
+    foundry.utils.mergeObject(this.appData, {
       isGM: game.user.isGM,
       isActor: this.actor != undefined,
       calendrier: calendrier.getTimestamp().toCalendrier(),
@@ -50,7 +49,7 @@ export class AppAstrologie extends Application {
         signeNaissance: RdDTimestamp.definition(0)
       }
     })
-    return this.appData;
+    return this.appData
   }
 
   getActorAstrologie() {
@@ -85,9 +84,10 @@ export class AppAstrologie extends Application {
       const nbAstral = calendrier.getNombreAstral()
       const heures = RdDTimestamp.heures();
       return {
-        ajustementsActors: game.actors.filter(it => it.isPersonnage() && it.hasPlayerOwner)
+        ajustementsActors: game.actors.filter(actor => actor.isPersonnageJoueur())
           .map(actor => this.getAjustementActor(actor, nbAstral, heures)),
-        nombresAstraux: calendrier.getNombresAstraux().map(na => this.getDetailNombreAstral(na))
+        nombresAstraux: game.system.rdd.calendrier.getNombresAstraux()
+          .map(na => this.getDetailNombreAstral(na))
       }
     }
     return {}
@@ -104,22 +104,25 @@ export class AppAstrologie extends Application {
   }
 
   getDetailNombreAstral(nombreAstral) {
-    const detail = duplicate(nombreAstral);
+    const detail = foundry.utils.duplicate(nombreAstral);
     const timestamp = new RdDTimestamp({ indexDate: nombreAstral.index });
     detail.date = { mois: timestamp.mois, jour: timestamp.jour + 1 };
-    detail.valeursFausses.forEach(fausse => fausse.actorName = game.actors.get(fausse.actorId).name ?? "Inconnu");
+    detail.lectures.forEach(lecture => lecture.actorName = game.actors.get(lecture.actorId).name ?? "Inconnu");
     return detail;
   }
 
   /* -------------------------------------------- */
   activateListeners(html) {
+    if (!this.hookReference){
+      this.hookReference = Hooks.on(APP_ASTROLOGIE_REFRESH, () => this.refreshAstrologie());
+    }
     super.activateListeners(html);
     this.html = html;
     this.html.find('select[name="signe-astral"]').change(event => {
-      this.selectNombreAstral(this.html.find('select[name="signe-astral"]').val());
+      this.selectNombreAstral(event.currentTarget.value);
     })
     this.html.find('select[name="signe-naissance"]').change(event => {
-      this.selectHeureNaissance(this.html.find('select[name="signe-naissance"]').val());
+      this.selectHeureNaissance(event.currentTarget.value);
     })
     this.html.find('td.nombre-astral').click(event => {
       this.selectNombreAstral(Number.parseInt(event.currentTarget.attributes['data-nombre-astral'].value) - 1);
@@ -145,8 +148,7 @@ export class AppAstrologie extends Application {
 
   /* -------------------------------------------- */
   async onRebuild() {
-    game.system.rdd.calendrier.resetNombresAstraux();
+    await game.system.rdd.calendrier.resetNombresAstraux();
-
     await game.system.rdd.calendrier.rebuildNombresAstraux();
   }
 
@@ -195,6 +197,8 @@ export class AppAstrologie extends Application {
   }
 
   refreshAstrologie() {
+    this.count = (this.count ?? 0)+1
+    console.log(`Refreshing ${this.count}`);
     this.render(true)
   }
 

module/sommeil/dialog-chateau-dormant.js

@@ -3,10 +3,8 @@ export class DialogChateauDormant extends Dialog {
 
   static async create() {
     const date = game.system.rdd.calendrier.dateCourante();
-    const actors = game.actors.filter(actor => actor.hasPlayerOwner && actor.isPersonnage());
-
     const dialogData = {
-      actors: actors,
+      actors: game.actors.filter(actor => actor.isPersonnageJoueur()),
       date: date,
       motifStress: `Nuit du ${date}`,
       finChateauDormant: game.system.rdd.calendrier.getTimestampFinChateauDormant()

module/sommeil/dialog-repos.js

@@ -21,7 +21,7 @@ export class DialogRepos extends Dialog {
   }
 
   constructor(html, actor) {
-    let options = { classes: ["DialogCreateSigneDraconiqueActorsActors"], width: 400, height: 'fit-content', 'z-index': 99999 };
+    let options = { classes: ["dialog-repos"], width: 400, height: 'fit-content', 'z-index': 99999 };
     let conf = {
       title: "Se reposer",
       content: html,

module/sommeil/dialog-stress.js

@@ -6,7 +6,7 @@ export class DialogStress extends Dialog {
       motif: "Motif",
       stress: 10,
       immediat: false,
-      actors: game.actors.filter(actor => actor.hasPlayerOwner && actor.isPersonnage())
+      actors: game.actors.filter(actor => actor.isPersonnageJoueur())
         .map(actor => ({
             id: actor.id,
             name: actor.name,

module/time/auto-adjust-darkness.js

@@ -17,7 +17,7 @@ export class AutoAdjustDarkness {
   static async adjust(darkness) {
     if (AutoAdjustDarkness.isAuto()) {
       const scene = game.scenes.viewed;
-      if (scene?.globalLight && scene?.tokenVision) {
+      if (scene?.environment?.globalLight?.enabled && scene?.tokenVision) {
         await scene.update({ darkness });
       }
     }

module/time/rdd-calendrier-editor.js

@@ -61,7 +61,7 @@ export class RdDCalendrierEditor extends Dialog {
 
   /* -------------------------------------------- */
   updateData(calendrierData) {
-    this.calendrierData = duplicate(calendrierData);
+    this.calendrierData = foundry.utils.duplicate(calendrierData);
   }
 
 }

module/time/rdd-calendrier.js

@@ -1,7 +1,6 @@
 import { MAX_NOMBRE_ASTRAL, RdDTimestamp, WORLD_TIMESTAMP_SETTING } from "./rdd-timestamp.js";
 import { RdDCalendrierEditor } from "./rdd-calendrier-editor.js";
 import { RdDResolutionTable } from "../rdd-resolution-table.js";
-import { RdDUtility } from "../rdd-utility.js";
 import { RdDDice } from "../rdd-dice.js";
 import { Misc } from "../misc.js";
 import { DialogChronologie } from "../dialog-chronologie.js";
@@ -35,7 +34,7 @@ export class RdDCalendrier extends Application {
   }
 
   static get defaultOptions() {
-    return mergeObject(super.defaultOptions, {
+    return foundry.utils.mergeObject(super.defaultOptions, {
       title: "Calendrier",
       template: TEMPLATE_CALENDRIER,
       classes: ["calendar"],
@@ -43,7 +42,7 @@ export class RdDCalendrier extends Application {
       resizable: false,
       width: 'fit-content',
       height: 'fit-content',
-    });
+    }, { inplace: false })
   }
 
   constructor() {
@@ -51,7 +50,6 @@ export class RdDCalendrier extends Application {
     this.timestamp = RdDTimestamp.getWorldTime();
     if (Misc.isUniqueConnectedGM()) { // Uniquement si GM
       RdDTimestamp.setWorldTime(this.timestamp);
-      this.nombresAstraux = this.getNombresAstraux();
       this.rebuildNombresAstraux(); // Ensure always up-to-date
     }
     Hooks.on('updateSetting', async (setting, update, options, id) => this.onUpdateSetting(setting, update, options, id));
@@ -108,7 +106,10 @@ export class RdDCalendrier extends Application {
       this.timestamp = RdDTimestamp.getWorldTime();
       this.positionAiguilles()
       this.render(false);
-      Hooks.callAll(APP_ASTROLOGIE_REFRESH);
+      Hooks.callAll(APP_ASTROLOGIE_REFRESH)
+    }
+    if (setting.key == SYSTEM_RDD + '.' + "liste-nombre-astral") {
+      Hooks.callAll(APP_ASTROLOGIE_REFRESH)
     }
   }
 
@@ -120,10 +121,10 @@ export class RdDCalendrier extends Application {
 
   /* -------------------------------------------- */
   fillCalendrierData(formData = {}) {
-    mergeObject(formData, this.timestamp.toCalendrier());
+    foundry.utils.mergeObject(formData, this.timestamp.toCalendrier());
-    formData.isGM = game.user.isGM;
+    formData.isGM = game.user.isGM
     formData.heures = RdDTimestamp.definitions()
-    formData.horlogeAnalogique = this.horlogeAnalogique;
+    formData.horlogeAnalogique = this.horlogeAnalogique
     formData.autoDarkness = AutoAdjustDarkness.isAuto()
     return formData;
   }
@@ -167,7 +168,11 @@ export class RdDCalendrier extends Application {
 
   /* -------------------------------------------- */
   getNombresAstraux() {
-    return game.settings.get(SYSTEM_RDD, "liste-nombre-astral") ?? [];
+    return game.settings.get(SYSTEM_RDD, "liste-nombre-astral") ?? []
+  }
+
+  async setNombresAstraux(nombresAstraux) {
+    await game.settings.set(SYSTEM_RDD, "liste-nombre-astral", nombresAstraux)
   }
 
   /* -------------------------------------------- */
@@ -225,20 +230,15 @@ export class RdDCalendrier extends Application {
     const nombreAstral = await RdDDice.rollTotal("1dh", { showDice: HIDE_DICE, rollMode: "selfroll" });
     return {
       nombreAstral: nombreAstral,
-      valeursFausses: [],
+      lectures: [],
       index: indexDate
     }
   }
 
   /* -------------------------------------------- */
-  resetNombresAstraux() {
+  async resetNombresAstraux() {
-    this.nombresAstraux = [];
+    await Promise.all(game.actors.filter(it => it.type == "personnage").map(async it => await it.deleteNombresAstraux()))
-    game.settings.set(SYSTEM_RDD, "liste-nombre-astral", []);
+    await this.setNombresAstraux([])
-
-    game.socket.emit(SYSTEM_SOCKET_ID, {
-      msg: "msg_reset_nombre_astral",
-      data: {}
-    });
   }
 
   /**
@@ -251,39 +251,30 @@ export class RdDCalendrier extends Application {
     if (indexDate == undefined) {
       indexDate = this.timestamp.indexDate;
     }
-    this.nombresAstraux = this.getNombresAstraux();
+    const nombresAstraux = this.getNombresAstraux()
-    let astralData = this.nombresAstraux.find((nombreAstral, i) => nombreAstral.index == indexDate);
+    let astralData = nombresAstraux.find(it => it.index == indexDate);
     return astralData?.nombreAstral ?? 0;
   }
 
   /* -------------------------------------------- */
   async rebuildNombresAstraux() {
     if (Misc.isUniqueConnectedGM()) {
-      let newList = [];
+      const nombresAstraux = this.getNombresAstraux()
+      let newNombresAstraux = [];
       for (let i = 0; i < MAX_NOMBRE_ASTRAL; i++) {
         let dayIndex = this.timestamp.indexDate + i;
-        let na = this.nombresAstraux.find(n => n.index == dayIndex);
+        let na = nombresAstraux.find(it => it.index == dayIndex);
         if (na) {
-          newList[i] = na;
+          newNombresAstraux[i] = na;
         } else {
-          newList[i] = await this.ajouterNombreAstral(dayIndex);
+          newNombresAstraux[i] = await this.ajouterNombreAstral(dayIndex);
         }
       }
-      this.nombresAstraux = newList;
-      game.settings.set(SYSTEM_RDD, "liste-nombre-astral", newList);
       game.actors.filter(it => it.isPersonnage()).forEach(actor => actor.supprimerAnciensNombresAstraux());
-      this.notifyChangeNombresAstraux();
+      await this.setNombresAstraux(newNombresAstraux);
     }
   }
 
-  notifyChangeNombresAstraux() {
-    Hooks.callAll(APP_ASTROLOGIE_REFRESH);
-    game.socket.emit(SYSTEM_SOCKET_ID, {
-      msg: "msg_refresh_nombre_astral",
-      data: {}
-    });
-  }
-
   /* -------------------------------------------- */
   async setNewTimestamp(newTimestamp) {
     const oldTimestamp = this.timestamp;
@@ -373,25 +364,22 @@ export class RdDCalendrier extends Application {
         request.nbAstral = await RdDDice.rollTotal("1dhr" + request.nbAstral, {
           rollMode: "selfroll", showDice: HIDE_DICE
         });
-        // Mise à jour des nombres astraux du joueur
-        this.addNbAstralIncorect(request.id, request.date, request.nbAstral);
-      }
-
-      if (Misc.getActiveUser(request.userId)?.isGM) {
-        RdDUtility.responseNombreAstral(request);
-      } else {
-        game.socket.emit(SYSTEM_SOCKET_ID, {
-          msg: "msg_response_nombre_astral",
-          data: request
-        });
       }
+      // Mise à jour des nombres astraux du joueur
+      await this.addNbAstralJoueur(actor, request.date, request.nbAstral, request.isValid)
+      Hooks.callAll(APP_ASTROLOGIE_REFRESH)
+      game.socket.emit(SYSTEM_SOCKET_ID, { msg: "msg_app_astrologie_refresh", data: {} })
     }
   }
 
-  addNbAstralIncorect(actorId, date, nbAstral) {
+  async addNbAstralJoueur(actor, date, nbAstral, isValid) {
-    const astralData = this.nombresAstraux.find((nombreAstral, i) => nombreAstral.index == date);
+    const nombresAstraux = this.getNombresAstraux()
-    astralData.valeursFausses.push({ actorId: actorId, nombreAstral: nbAstral });
+    const astralData = nombresAstraux.find(it => it.index == date)
-    game.settings.set(SYSTEM_RDD, "liste-nombre-astral", this.nombresAstraux);
+    if (astralData) {
+      astralData.lectures.push({ actorId: actor.id, nombreAstral: nbAstral });
+      await this.setNombresAstraux(nombresAstraux);
+      await actor.ajouteNombreAstral(date, nbAstral, isValid);
+    }
   }
 
   /* -------------------------------------------- */

module/time/rdd-timestamp.js

@@ -15,18 +15,18 @@ export const RDD_MINUTES_PAR_JOUR = 1440; //RDD_HEURES_PAR_JOUR * RDD_MINUTES_PA
 const ROUNDS_PAR_MINUTE = 10;
 
 const DEFINITION_HEURES = [
-  { key: "vaisseau", label: "Vaisseau", lettreFont: 'v', saison: "Printemps", darkness: 0.9 },
+  { key: "vaisseau", article: "du ", label: "Vaisseau", lettreFont: 'v', saison: "Printemps", darkness: 0.9 },
-  { key: "sirene", label: "Sirène", lettreFont: 'i', saison: "Printemps", darkness: 0.1 },
+  { key: "sirene", article: "de la ", label: "Sirène", lettreFont: 'i', saison: "Printemps", darkness: 0.1 },
-  { key: "faucon", label: "Faucon", lettreFont: 'f', saison: "Printemps", darkness: 0 },
+  { key: "faucon", article: "du ", label: "Faucon", lettreFont: 'f', saison: "Printemps", darkness: 0 },
-  { key: "couronne", label: "Couronne", lettreFont: '', saison: "Eté", darkness: 0 },
+  { key: "couronne", article: "de la ", label: "Couronne", lettreFont: '', saison: "Eté", darkness: 0 },
-  { key: "dragon", label: "Dragon", lettreFont: 'd', saison: "Eté", darkness: 0 },
+  { key: "dragon", article: "du ", label: "Dragon", lettreFont: 'd', saison: "Eté", darkness: 0 },
-  { key: "epees", label: "Epées", lettreFont: 'e', saison: "Eté", darkness: 0 },
+  { key: "epees", article: "des ", label: "Epées", lettreFont: 'e', saison: "Eté", darkness: 0 },
-  { key: "lyre", label: "Lyre", lettreFont: 'l', saison: "Automne", darkness: 0.1 },
+  { key: "lyre", article: "de la ", label: "Lyre", lettreFont: 'l', saison: "Automne", darkness: 0.1 },
-  { key: "serpent", label: "Serpent", lettreFont: 's', saison: "Automne", darkness: 0.9 },
+  { key: "serpent", article: "du ", label: "Serpent", lettreFont: 's', saison: "Automne", darkness: 0.9 },
-  { key: "poissonacrobate", label: "Poisson Acrobate", lettreFont: 'p', saison: "Automne", darkness: 1 },
+  { key: "poissonacrobate", article: "du ", label: "Poisson Acrobate", lettreFont: 'p', saison: "Automne", darkness: 1 },
-  { key: "araignee", label: "Araignée", lettreFont: 'a', saison: "Hiver", darkness: 1 },
+  { key: "araignee", article: "de l'", label: "Araignée", lettreFont: 'a', saison: "Hiver", darkness: 1 },
-  { key: "roseau", label: "Roseau", lettreFont: 'r', saison: "Hiver", darkness: 1 },
+  { key: "roseau", article: "du ", label: "Roseau", lettreFont: 'r', saison: "Hiver", darkness: 1 },
-  { key: "chateaudormant", label: "Château Dormant", lettreFont: 'c', saison: "Hiver", darkness: 1 },
+  { key: "chateaudormant", article: "du ", label: "Château Dormant", lettreFont: 'c', saison: "Hiver", darkness: 1 },
 ]
 
 const FORMULES_DUREE = [
@@ -64,6 +64,7 @@ export class RdDTimestamp {
       DEFINITION_HEURES[i].hh = RdDTimestamp.hh(i);
       DEFINITION_HEURES[i].icon = RdDTimestamp.iconeHeure(i);
       DEFINITION_HEURES[i].webp = DEFINITION_HEURES[i].icon.replace(".svg", ".webp");
+      DEFINITION_HEURES[i].avecArticle = DEFINITION_HEURES[i].article + DEFINITION_HEURES[i].label
     }
   }
 
@@ -202,7 +203,7 @@ export class RdDTimestamp {
   }
 
   static setWorldTime(timestamp) {
-    game.settings.set(SYSTEM_RDD, WORLD_TIMESTAMP_SETTING, duplicate(timestamp));
+    game.settings.set(SYSTEM_RDD, WORLD_TIMESTAMP_SETTING, foundry.utils.duplicate(timestamp));
   }
 
   /** construit un RdDTimestamp à partir de l'année/mois/jour/heure?/minute? */
@@ -231,6 +232,7 @@ export class RdDTimestamp {
 
   get annee() { return Math.floor(this.indexDate / RDD_JOURS_PAR_AN) }
   get mois() { return Math.floor(Misc.modulo(this.indexDate, RDD_JOURS_PAR_AN) / RDD_JOURS_PAR_MOIS) }
+  get nomMois() { return Math.floor(Misc.modulo(this.indexDate, RDD_JOURS_PAR_AN) / RDD_JOURS_PAR_MOIS) }
   get jour() { return Misc.modulo(Misc.modulo(this.indexDate, RDD_JOURS_PAR_AN), RDD_JOURS_PAR_MOIS) }
   get heure() { return Math.floor(this.indexMinute / RDD_MINUTES_PAR_HEURES) }
   get minute() { return Misc.modulo(this.indexMinute, RDD_MINUTES_PAR_HEURES) }
@@ -240,7 +242,7 @@ export class RdDTimestamp {
 
   get darkness() {
     const darknessDebut = 100 * RdDTimestamp.definition(this.heure).darkness
-    const darknessFin =  100 * RdDTimestamp.definition(this.heure + 1).darkness
+    const darknessFin = 100 * RdDTimestamp.definition(this.heure + 1).darkness
     const darknessMinute = Math.round((darknessFin - darknessDebut) * this.minute / RDD_MINUTES_PAR_HEURES);
     return (darknessDebut + darknessMinute) / 100
   }

module/tirage/fenetre-recherche-tirage.js

@@ -117,7 +117,7 @@ function $loadFilters(parameters) {
 
 export class FenetreRechercheTirage extends Application {
   static get defaultOptions() {
-    return mergeObject(super.defaultOptions, {
+    return foundry.utils.mergeObject(super.defaultOptions, {
       template: "systems/foundryvtt-reve-de-dragon/templates/tirage/fenetre-recherche-tirage.hbs",
       title: `Recherches et tirages`,
       width: 600,
@@ -125,7 +125,7 @@ export class FenetreRechercheTirage extends Application {
       popOut: true,
       dragDrop: [{ dragSelector: "a.content-link" }],
       resizable: true
-    });
+    }, { inplace: false })
   }
 
   static async create() {
@@ -133,7 +133,7 @@ export class FenetreRechercheTirage extends Application {
     const parameters = {
       milieux: milieux,
       filterMilieux: $filterMilieux(milieux),
-      filterGroups: duplicate(FILTER_GROUPS).filter(it => it.group),
+      filterGroups: foundry.utils.duplicate(FILTER_GROUPS).filter(it => it.group),
     }
     const options = {}
     $loadFilters(parameters);
@@ -147,7 +147,7 @@ export class FenetreRechercheTirage extends Application {
   }
 
   async getData() {
-    return mergeObject(await super.getData(), this.parameters)
+    return foundry.utils.mergeObject(await super.getData(), this.parameters)
   }
 
   _canDragStart() { return true; }
@@ -294,7 +294,7 @@ class FenetreRechercheConfiguration extends Dialog {
   static async create() {
     const configuration = {
       compendiums: game.packs.filter(it => it.metadata.type == 'Item').map(it => it.metadata)
-        .map(it => mergeObject({ selected: game.system.rdd.environnement.compendiums.includes(it.id) }, it))
+        .map(it => foundry.utils.mergeObject({ selected: game.system.rdd.environnement.compendiums.includes(it.id) }, it))
     }
     const html = await renderTemplate("systems/foundryvtt-reve-de-dragon/templates/tirage/fenetre-recherche-configuration.hbs", configuration);
     new FenetreRechercheConfiguration(html).render(true);

module/tmr-rencontres.js

@@ -39,6 +39,8 @@ export class TMRRencontres {
     const frequence = it => it.system.frequence[codeTerrain];
     const row = await this.table.getRandom(frequence, filtreMauvaise, forcedRoll);
     if (row) {
+      console.log("DORM", row);
+      //row.document.system.computedForce = new Roll(row.document.system.formula).roll({async: false}).total; 
       await CompendiumTableHelpers.tableRowToChatMessage(row);
     }
 

module/tmr/draconique.js

@@ -1,4 +1,4 @@
-import { TYPES } from "../item.js";
+import { ITEM_TYPES } from "../item.js";
 import { TMRUtility } from "../tmr-utility.js";
 import { PixiTMR } from "./pixi-tmr.js";
 
@@ -12,10 +12,10 @@ export class Draconique {
   static init() {
   }
 
-  static isCaseTMR(item) { return item.type == TYPES.casetmr; }
+  static isCaseTMR(item) { return item.type == ITEM_TYPES.casetmr; }
   static isQueueDragon(item) { return item.isQueueDragon(); }
-  static isSouffleDragon(item) { return item.type == TYPES.souffle; }
+  static isSouffleDragon(item) { return item.type == ITEM_TYPES.souffle; }
-  static isTeteDragon(item) { return item.type == TYPES.tete; }
+  static isTeteDragon(item) { return item.type == ITEM_TYPES.tete; }
   static isQueueSouffle(item) { return Draconique.isQueueDragon(item) || Draconique.isSouffleDragon(item); }
 
   static register(draconique, code = undefined) {

module/tmr/effets-draconiques.js

@@ -18,7 +18,7 @@ import { Periple } from "./periple.js";
 import { UrgenceDraconique } from "./urgence-draconique.js";
 import { Grammar } from "../grammar.js";
 import { AugmentationSeuil } from "./augmentation-seuil.js";
-import { TYPES } from "../item.js";
+import { ITEM_TYPES } from "../item.js";
 
 export class EffetsDraconiques {
   static carteTmr = new CarteTmr();
@@ -122,11 +122,11 @@ export class EffetsDraconiques {
   }
 
   static tetesDragon(actor, name) {
-    return actor.itemTypes[TYPES.tete].filter(it => Grammar.includesLowerCaseNoAccent(it.name, name));
+    return actor.itemTypes[ITEM_TYPES.tete].filter(it => Grammar.includesLowerCaseNoAccent(it.name, name));
   }
 
   static soufflesDragon(actor, name) {
-    return actor.itemTypes[TYPES.souffle].filter(it => Grammar.includesLowerCaseNoAccent(it.name, name));
+    return actor.itemTypes[ITEM_TYPES.souffle].filter(it => Grammar.includesLowerCaseNoAccent(it.name, name));
   }
 
   static queuesDragon(actor, name) {
@@ -134,7 +134,7 @@ export class EffetsDraconiques {
   }
 
   static queuesSoufflesDragon(actor, name) {
-    return actor.filterItems(it => [TYPES.queue, TYPES.ombre, TYPES.souffle].includes(it.type) && Grammar.includesLowerCaseNoAccent(it.name, name));
+    return actor.filterItems(it => [ITEM_TYPES.queue, ITEM_TYPES.ombre, ITEM_TYPES.souffle].includes(it.type) && Grammar.includesLowerCaseNoAccent(it.name, name));
   }
 
   static countAugmentationSeuil(actor) {

module/tmr/effets-rencontres.js

@@ -107,7 +107,7 @@ export class EffetsRencontre {
   }
 
   static rdd_part_tete = async (dialog, context) => {
-    mergeObject(context, {
+    foundry.utils.mergeObject(context, {
       tete: context.rolled.isPart,
       poesie: await Poetique.getExtrait()
     })
@@ -118,7 +118,7 @@ export class EffetsRencontre {
   }
 
   static rdd_echec_queue = async (dialog, context) => {
-    mergeObject(context, {
+    foundry.utils.mergeObject(context, {
       queues: [await context.actor.ajouterQueue()],
       poesie: await Poetique.getExtrait()
     })

module/tmr/pixi-tmr.js

@@ -1,4 +1,3 @@
-import { SYSTEM_RDD } from "../constants.js";
 import { Misc } from "../misc.js";
 import { TMRConstants, tmrTokenZIndex } from "../tmr-constants.js";
 import { TMRUtility } from "../tmr-utility.js";
@@ -14,12 +13,12 @@ export class PixiTMR {
   static register(name, img) {
     PixiTMR.textures[name] = img;
   }
+
   static async init() {
     await Promise.all(
       Object.values(PixiTMR.textures)
-        .filter(img => img != undefined)
+        .filter(img => img != undefined && !PIXI.utils.TextureCache[img])
-        .map(async img => PIXI.Sprite.from(await PIXI.Assets.load(img)))
+        .map(async img => PIXI.Sprite.from(await PIXI.Assets.load(img))))
-    )
   }
 
   constructor(tmrDialog, displaySize) {
@@ -106,8 +105,9 @@ export class PixiTMR {
 
   sprite(code, options = {}) {
     let img = PixiTMR.getImgFromCode(code)
-    const texture = PIXI.utils.TextureCache[img]
+    let texture = PIXI.utils.TextureCache[img]
     if (!texture) {
+      // TODO: charger la texture
       console.error("Texture manquante", code, PIXI.utils.TextureCache)
       return;
     }

module/tmr/rencontre.js

@@ -16,7 +16,7 @@ export class Rencontre extends Draconique {
     return pixiTMR.sprite(this.code(), {
       zIndex: tmrTokenZIndex.rencontre,
       decallage: pixiTMR.sizes.decallage(0, 0),
-      taille: () => pixiTMR.sizes.twoThird,
+      taille: () => pixiTMR.sizes.full,
     })
   }
 }

module/tmr/urgence-draconique.js

@@ -5,7 +5,7 @@ import { RdDRollTables } from "../rdd-rolltables.js";
 import { TMRUtility } from "../tmr-utility.js";
 import { tmrTokenZIndex } from "../tmr-constants.js";
 import { Draconique } from "./draconique.js";
-import { TYPES } from "../item.js";
+import { ITEM_TYPES } from "../item.js";
 import { TMRAnimations } from "./animation.js";
 
 export class UrgenceDraconique extends Draconique {
@@ -14,7 +14,7 @@ export class UrgenceDraconique extends Draconique {
   match(item) { return Draconique.isQueueDragon(item) && Grammar.toLowerCaseNoAccent(item.name).includes('urgence draconique'); }
   manualMessage() { return false }
   async onActorCreateOwned(actor, queue) {
-    const coordSortsReserve = actor.itemTypes[TYPES.sortreserve].map(it => it.system.coord) ?? [];
+    const coordSortsReserve = actor.itemTypes[ITEM_TYPES.sortreserve].map(it => it.system.coord) ?? [];
     if (coordSortsReserve.length == 0) {
       // La queue se transforme en idée fixe
       const ideeFixe = await RdDRollTables.getIdeeFixe();

module/voyage/dialog-fatigue-voyage.js

@@ -0,0 +1,220 @@
+import { ITEM_TYPES } from "../item.js"
+import { RdDItemCompetence } from "../item-competence.js"
+import { ChatUtility } from "../chat-utility.js"
+import { Misc } from "../misc.js"
+
+const CODES_COMPETENCES_VOYAGE = ['Extérieur', 'Forêt', 'Montagne', 'Marais', 'Glace', 'Equitation']
+const TABLEAU_FATIGUE_MARCHE = [
+  {
+    code: "aise", label: "Aisé", description: "Route ou chemin",
+    survies: ['Extérieur', 'Equitation'],
+    vitesses: [{ vitesse: 4, fatigue: 1 }, { vitesse: 6, fatigue: 2 }, { vitesse: 8, fatigue: 3 }, { vitesse: 10, fatigue: 4 }, { vitesse: 12, fatigue: 6 }],
+  },
+  {
+    code: "malaise", label: "Malaisé", description: "Hors piste (herbes et buissons)",
+    survies: ['Extérieur', 'Equitation'],
+    vitesses: [{ vitesse: 4, fatigue: 2 }, { vitesse: 6, fatigue: 3 }, { vitesse: 8, fatigue: 4 }, { vitesse: 10, fatigue: 6 }],
+  },
+  {
+    code: "difficile", label: "Difficile", description: "Hors piste (collines, forêt)",
+    survies: ['Extérieur', 'Forêt', 'Glace', 'Equitation'],
+    vitesses: [{ vitesse: 4, fatigue: 3 }, { vitesse: 6, fatigue: 4 }, { vitesse: 8, fatigue: 6 }],
+  },
+  {
+    code: "tresdifficile", label: "Très difficile", description: "Hors piste (montagne, jungle, marais)",
+    survies: ['Forêt', 'Montagne', 'Marais', 'Glace'],
+    vitesses: [{ vitesse: 4, fatigue: 4 }, { vitesse: 6, fatigue: 6 }],
+  },
+]
+
+export class DialogFatigueVoyage extends Dialog {
+  static dialog = undefined
+  static async create() {
+    if (!game.user.isGM) {
+      return
+    }
+    if (!DialogFatigueVoyage.dialog) {
+      const parameters = {
+        tableauFatigueMarche: TABLEAU_FATIGUE_MARCHE,
+        playerActors: game.actors.filter(actor => actor.isPersonnageJoueur())
+          .map(actor => DialogFatigueVoyage.prepareActorParameters(actor)),
+        nombreHeures: 1,
+      }
+      DialogFatigueVoyage.setModeDeplacement(parameters, undefined, undefined)
+
+      const html = await renderTemplate("systems/foundryvtt-reve-de-dragon/templates/voyage/dialog-fatigue-voyage.hbs", parameters);
+      DialogFatigueVoyage.dialog = new DialogFatigueVoyage(html, parameters);
+    }
+    DialogFatigueVoyage.dialog.render(true);
+  }
+
+  static setModeDeplacement(parameters, code, vitesse) {
+    const ligneFatigueMarche = TABLEAU_FATIGUE_MARCHE.find(it => it.code == code) ?? TABLEAU_FATIGUE_MARCHE[0]
+    const rythme = ligneFatigueMarche.vitesses.find(it => it.vitesse == vitesse) ?? ligneFatigueMarche.vitesses[0]
+    parameters.typeTerrain = ligneFatigueMarche
+    parameters.vitesseDeplacement = rythme.vitesse
+    parameters.fatigueHoraire = rythme.fatigue
+    parameters.playerActors.forEach(voyageur =>
+      DialogFatigueVoyage.selectSurvie(voyageur, parameters.typeTerrain.code)
+    )
+  }
+
+  static prepareActorParameters(actor) {
+    const actorParameters = {
+      id: actor.id,
+      actor: actor,
+      selected: true,
+      ajustementFatigue: 0,
+      survies: {}
+    }
+    const competencesVoyage = {}
+    CODES_COMPETENCES_VOYAGE.forEach(codeSurvie => {
+      competencesVoyage[codeSurvie] = RdDItemCompetence.findCompetence(actor.itemTypes[ITEM_TYPES.competence], codeSurvie, { onMessage: () => { } })
+    })
+    TABLEAU_FATIGUE_MARCHE.forEach(terrain => {
+      actorParameters.survies[terrain.code] = Misc.join(
+        terrain.survies.map(survie => {
+          const niveau = competencesVoyage[survie]?.system.niveau
+          return `${survie}: ${niveau}`
+        }),
+        ', ')
+    })
+    return actorParameters
+  }
+
+  static selectSurvie(actorParameters, code) {
+    actorParameters.survieCourante = actorParameters.survies[code]
+  }
+
+  constructor(html, parameters) {
+    const options = {
+      classes: ["dialog-fatigue-voyage"],
+      width: 600,
+      height: 'fit-content',
+      'max-height': 900,
+      'z-index': 99999
+    }
+    const conf = {
+      title: "Fatigue de voyage",
+      content: html,
+      buttons: {}
+    }
+    super(conf, options);
+    this.parameters = parameters
+    this.controls = {}
+  }
+
+  activateListeners(html) {
+    if (this.html == undefined) {
+      html.find('select[name="code-terrain"]').trigger("focus")
+    }
+    this.html = html;
+    super.activateListeners(html);
+
+    this.html.find('select[name="code-terrain"]').change(event => this.changeParameters())
+    this.html.find('select[name="vitesse-deplacement"]').change(event => this.changeParameters())
+    this.html.find('input[name="nombre-heures"]').change(event => this.changeParameters())
+    this.html.find('.list-item input[name="ajustement-fatigue"]').change(event => this.changeParameters())
+    this.html.find('button[name="appliquer-fatigue"]').click(event => this.appliquerFatigue())
+  }
+
+  changeParameters() {
+    this.changeTerrain(this.html.find('select[name="code-terrain"]').val())
+    this.changeVitesse(this.html.find('select[name="vitesse-deplacement"]').val())
+    this.changeNombreHeures(this.html.find('input[name="nombre-heures"]').val())
+    this.setFatigue()
+  }
+
+  async changeTerrain(codeTerrain) {
+    if (this.parameters.typeTerrain.code != codeTerrain) {
+      const selectVitesseDeplacement = this.html.find('select[name="vitesse-deplacement"]')
+      const vitesse = selectVitesseDeplacement.val()
+      selectVitesseDeplacement.empty()
+
+      DialogFatigueVoyage.setModeDeplacement(this.parameters, codeTerrain, vitesse)
+      this.parameters.typeTerrain.vitesses.forEach(async rythme => {
+        selectVitesseDeplacement.append(await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/voyage/option-vitesse-fatigue.hbs', rythme))
+      })
+      selectVitesseDeplacement.val(this.parameters.vitesseDeplacement).change()
+
+      Promise.all(this.getActorRows()
+        .map(async row => row.find('label.voyage-liste-survies').text(this.$extractActorParameters(row).survieCourante)
+        ))
+    }
+  }
+
+  async changeVitesse(vitesse) {
+    if (this.parameters.vitesseDeplacement != vitesse) {
+      DialogFatigueVoyage.setModeDeplacement(this.parameters, this.parameters.typeTerrain.code, vitesse)
+    }
+  }
+
+  async changeNombreHeures(nombreHeures) {
+    this.parameters.nombreHeures = parseInt(nombreHeures)
+  }
+
+  async setFatigue() {
+    const baseFatigue = this.parameters.nombreHeures * this.parameters.fatigueHoraire
+    this.html.find('input[name="base-fatigue"]').val(baseFatigue)
+    this.updateActorTotalFatigue(baseFatigue)
+  }
+
+  async updateActorTotalFatigue(baseFatigue) {
+    Promise.all(this.getActorRows()
+      .map(async row => {
+        const actor = this.$extractActorParameters(row)
+        row.find('input[name="total-fatigue"]').val(actor.ajustement + baseFatigue)
+      }))
+  }
+
+  async appliquerFatigue() {
+    const fatigueBase = parseInt(this.html.find('input[name="base-fatigue"]').val() ?? 0)
+    this.getActorRows()
+      .map(row => this.$extractActorParameters(row))
+      .filter(it => it.selected)
+      .forEach(async it => {
+        const perteFatigue = fatigueBase + it.ajustement
+        ChatMessage.create({
+          whisper: ChatUtility.getWhisperRecipientsAndGMs(it.actor.name),
+          content: await renderTemplate(
+            'systems/foundryvtt-reve-de-dragon/templates/voyage/chat-fatigue_voyage.hbs',
+            foundry.utils.mergeObject(it,
+              {
+                parameters: this.parameters,
+                fatigueBase: fatigueBase,
+                perteFatigue: perteFatigue,
+                isVoyage: fatigueBase == this.parameters.nombreHeures * this.parameters.fatigueHoraire
+              }, { inplace: false })
+          ),
+        })
+        await it.actor.santeIncDec("fatigue", perteFatigue)
+      })
+  }
+
+  getActorRows() {
+    return jQuery.map(
+      this.html.find('div.fatigue-actors-list li.list-item'),
+      it => this.html.find(it))
+  }
+
+
+  $extractActorParameters(actorRow) {
+    const actorId = actorRow.data('actor-id')
+    const actorParameters = this.parameters.playerActors.find(it => it.id == actorId)
+    const actor = game.actors.get(actorId)
+    if (!actor) {
+      ui.notifications.warn(`Acteur ${it.actorId} introuvable`)
+      return {}
+    }
+    actorParameters.ajustement = parseInt(actorRow.find('input[name="ajustement-fatigue"]').val() ?? 0)
+    actorParameters.selected = actor && actorRow.find('input[name="selectionner-acteur"]').is(':checked')
+    return actorParameters
+  }
+
+  async close() {
+    DialogFatigueVoyage.dialog = undefined
+    await super.close()
+  }
+
+
+}

styles/simple.css

@@ -92,6 +92,8 @@
   --background-custom-button-hover: linear-gradient(to bottom, rgb(128, 0, 0) 5%, rgb(62, 1, 1) 100%);
   --background-control-selected: linear-gradient(to bottom, hsla(0, 100%, 25%, 0.5) 5%, hsla(0, 100%, 12%, 0.5) 100%);
   --background-tooltip: hsla(60, 12%, 85%, 0.95);
+  --color-tooltip:hsla(282, 47%, 33%, 0.9);
+  --color-tooltip-faint:hsla(282, 47%, 66%, 0.5);
   --background-error:hsla(16, 100%, 50%, 0.8);
   --color-profile-border: hsla(0, 0%, 80%, 0.05);
 }
@@ -433,6 +435,7 @@ table {border: 1px solid #7a7971;}
 }
 .flex-shrink {
   flex: 'flex-shrink' ;
+  flex-shrink: 2;
 }
 :is(.flex-grow, .flex-grow-3) {
   flex-grow: 3;
@@ -440,7 +443,19 @@ table {border: 1px solid #7a7971;}
 .flex-grow-2 {
   flex-grow: 2;
 }
+.flex-grow-1 {
+  flex-grow: 1;
+}
+.flex-grow-0-5 {
+  flex-grow: 0.5;
+}
+.voyage-liste-survies {
+  max-width: 12rem;
+}
 /* Styles limited to foundryvtt-reve-de-dragon sheets */
+.texte-dans-liste {
+  text-align: left;
+}
 .equipement-nom {
   flex-grow : 4;
   margin: 0;
@@ -557,6 +572,15 @@ input:is(.blessure-premiers_soins, .blessure-soins_complets) {
   border: none;
   padding: 0.1rem;
 }
+.context-menu-img {
+  max-width: 2rem;
+  max-height: 1rem;
+  flex-grow: 0;
+  margin: 0.2rem 0.3rem 0 0;
+  vertical-align: middle;
+  border: none;
+  padding: 0rem;
+}
 
 .button-img {
   vertical-align: baseline;
@@ -1168,7 +1192,7 @@ ul.chat-list li:nth-child(odd) {
   border-radius: 0.25rem;
   padding: 0.1rem;
   flex: 1 1 1.5rem;
-  display: flex !important;
+  display: flex;
   align-items: center !important;
 }
 
@@ -1309,10 +1333,7 @@ div.competence-column div.categorie-competence{
   margin-right: 0.2rem;
   margin-left: 0.2rem;
 }
-.blessures-title { 
+.item-label { 
-  font-weight: bold;
-}
-.alchimie-title { 
   font-weight: bold;
 }
 .pointsreve-value {
@@ -1362,7 +1383,7 @@ table.table-nombres-astraux tr:hover {
   flex-direction: column;
   position: absolute;
   top: 4.6rem;
-  right: 3.5rem;
+  left: -19rem;
 }
 .token-hud-ext.soins {
   flex-direction: column;
@@ -1515,6 +1536,11 @@ div.control-icon.token-hud-icon {
   font-size: 1rem;
 }
 
+.chat-message header.message-header .heure-rdd {
+  font-size: 0.7rem;
+  flex-grow: 3;
+}
+
 .chat-message.whisper {
   background: rgba(220,220,210,0.75);
   border: 2px solid #545469;
@@ -1933,7 +1959,7 @@ div.calendar-timestamp-edit select.calendar-signe-heure {
   padding: 3px;
 }
 
-aside#tooltip{
+aside#tooltip {
   background: var(--background-tooltip);
   color: var(--color-text-dark-primary);
   font-size: 1rem;
@@ -1941,6 +1967,15 @@ aside#tooltip{
   padding: 0.4rem;
 }
 
+aside#tooltip span.reference {
+  color: var(--color-tooltip);
+  border: 1px solid var(--color-tooltip-faint);
+}
+
+aside#tooltip .toolclip p.faint {
+  color: var(--color-tooltip-faint);
+}
+
 .tooltip :is(.ttt-xp,.ttt-levelup) {
   width: 250px;
   background: var(--background-tooltip) !important;

system.json

@@ -1,13 +1,13 @@
 {
   "id": "foundryvtt-reve-de-dragon",
   "title": "Rêve de Dragon",
-  "version": "11.2.12",
+  "version": "12.0.10",
-  "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-11.2.12.zip",
+  "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-12.0.10.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": {
     "minimum": "11",
-    "verified": "11"
+    "verified": "12"
   },
   "description": "Rêve de Dragon RPG for FoundryVTT",
   "authors": [
@@ -528,8 +528,10 @@
     }
   ],
   "socket": true,
-  "gridDistance": 1,
+  "grid": {
-  "gridUnits": "m",
+    "distance": 1,
+    "units": "m"
+  },
   "primaryTokenAttribute": "sante.vie",
   "secondaryTokenAttribute": "sante.endurance",
   "media": [

template.json

@@ -21,6 +21,7 @@
         "race": "Humain",
         "yeux": "",
         "cheveux": "",
+        "taille": "",
         "poids": "",
         "heure": "",
         "sexe": "",
@@ -525,15 +526,11 @@
   },
   "Item": {
     "types": [
-        "competence", "competencecreature",
+        "arme", "armure", "blessure", "casetmr", "chant", "competence", "competencecreature", "conteneur", "danse", 
-        "recettealchimique", "musique", "chant", "danse", "jeu", "recettecuisine", "oeuvre",
+        "empoignade", "extraitpoetique", "faune", "gemme", "herbe", "ingredient", "jeu", "livre", "maladie", "meditation",
-        "objet", "arme", "armure", "conteneur", "herbe", "plante", "ingredient", "faune", "livre", "potion", "munition",
+        "monnaie", "munition", "musique", "nombreastral", "nourritureboisson", "objet", "oeuvre", "ombre", "plante", "possession", 
-        "monnaie", "nourritureboisson", "gemme",
+        "poison", "potion", "queue", "recettealchimique", "recettecuisine", "rencontre", 
-        "service",
+        "service" ,"signedraconique", "sort", "sortreserve", "souffle", "tarot", "tache", "tete" ],
-        "meditation", "rencontre", "queue", "ombre", "souffle", "tete", "casetmr", "signedraconique", "sort", "sortreserve",
-        "nombreastral", "tache", "blessure", "maladie", "poison", "possession",
-        "tarot", "extraitpoetique", "empoignade"
-    ],
     "templates": {
       "description": {
         "description": "",

templates/actor/alchimie.html

@@ -3,10 +3,12 @@
 <ul class="item-list alterne-list">
   {{#each (trier recettesAlchimiques) as |recette id|}}
   <li class="item flexrow list-item" data-item-id="{{recette._id}}"><span class="competence-title recette-label item-edit"><a>{{recette.name}}</a></span>
-    <div class="item-controls flex-shrink">
+    <div class="item-controls">
-      <a class="item-edit" data-tooltip="Edit Item"><i class="fas fa-edit"></i></a>
+      <a class="item-edit" data-tooltip="Modifier"><i class="fas fa-edit"></i></a>
-      <a class="item-delete" data-tooltip="Delete Item"><i class="fas fa-trash"></i></a>
+      <a class="item-delete" data-tooltip="Supprimer"><i class="fas fa-trash"></i></a>
-    </div>
+      &nbsp;
+      <a class="item-montrer" data-tooltip="Montrer"><i class="fas fa-comment"></i></a>
+  </div>
   </li>
   {{/each}}
 </ul>

templates/actor/blessure.hbs

@@ -36,6 +36,7 @@
   <span class="item-controls">
     <a class="item-edit" data-tooltip="Editer"><i class="fas fa-edit"></i></a>
     <a class="item-delete" data-tooltip="Supprimer"><i class="fas fa-trash"></i></a>
+    &nbsp;
     <a class="item-montrer" data-tooltip="Montrer"><i class="fas fa-comment"></i></a>
   </span>
 </li>

templates/actor/blessures.html

@@ -1,8 +1,14 @@
-<h4>blessures</h4>
+<h4>Blessures</h4>
 <div>
-  <a class="chat-card-button creer-blessure-legere" data-tooltip="Ajouter une blessure légère"><i class="fas fa-plus-circle"></i> légère</a>
+  <a class="chat-card-button creer-blessure-legere" data-tooltip="Ajouter une légère"><i class="fas fa-plus-circle"></i> légère</a>
-  <a class="chat-card-button creer-blessure-grave" data-tooltip="Ajouter une blessure grave"><i class="fas fa-plus-circle"></i> grave</a>
+  <a class="chat-card-button creer-blessure-grave" data-tooltip="Ajouter une grave"><i class="fas fa-plus-circle"></i> grave</a>
-  <a class="chat-card-button creer-blessure-critique" data-tooltip="Ajouter une blessure critque"><i class="fas fa-plus-circle"></i> critique</a>
+  <a class="chat-card-button creer-blessure-critique" data-tooltip="Ajouter une critique"><i class="fas fa-plus-circle"></i> critique</a>
+</div>
+<div>
+  <a class="chat-card-button subir-blessure-contusion" data-tooltip="Subir une contusion (avec perte d'Endurance)"><i class="fas fa-swords"></i> contusion</a>
+  <a class="chat-card-button subir-blessure-legere" data-tooltip="Subir une légère (avec perte d'Endurance)"><i class="fas fa-swords"></i> légère</a>
+  <a class="chat-card-button subir-blessure-grave" data-tooltip="Subir une grave (avec perte d'Endurance/Vie)"><i class="fas fa-swords"></i> grave</a>
+  <a class="chat-card-button subir-blessure-critique" data-tooltip="Subir une critique (avec perte d'Endurance/Vie)"><i class="fas fa-swords"></i> critique</a>
 </div>
 
 <ul class="item-list alterne-list">

templates/actor/carac-derivee.html

@@ -55,9 +55,7 @@
   <li class="caracteristique flexrow list-item"  data-tooltip="Niveau d'éthylisme">
     <label class="derivee-label" for="system.compteurs.ethylisme.value">{{system.compteurs.ethylisme.label}}</label>
     <select class="derivee-value" name="system.compteurs.ethylisme.value" data-dtype="Number">
-      {{#select system.compteurs.ethylisme.value}}
+      {{selectOptions (RDD_CONFIG 'niveauEthylisme')  selected=system.compteurs.ethylisme.value valueAttr="value" nameAttr="value" labelAttr="label"}} 
-      {{>"systems/foundryvtt-reve-de-dragon/templates/enum-niveau-ethylisme.html"}}
-      {{/select}}
     </select>  
   </li>  
 

templates/actor/carac-entitee.html

@@ -2,20 +2,13 @@
   <li class="caracteristique flexrow list-item">
     <span class="carac-label" name="catEntite">Catégorie : </span>
     <select name="system.definition.categorieentite" value="{{system.definition.categorieentite}}" data-dtype="String" {{#unless @root.options.vueDetaillee}}disabled{{/unless}}>
-      {{#select system.definition.categorieentite}}
+      {{selectOptions (RDD_CONFIG 'categorieEntite') selected=system.definition.categorieentite}}
-      <option value="cauchemar">Cauchemar</option>
-      <option value="reve">Rêve</option>
-      {{/select}}
     </select>
   </li>
   <li class="caracteristique flexrow list-item">
     <span class="carac-label" name="typeEntite">Type d'entité : </span>
     <select name="system.definition.typeentite" value="{{system.definition.typeentite}}" data-dtype="String" {{#unless @root.options.vueDetaillee}}disabled{{/unless}}>
-      {{#select system.definition.typeentite}}
+      {{selectOptions (RDD_CONFIG 'typeEntite') selected=system.definition.typeentite}}
-      <option value="incarne">Incarnée</option>
-      <option value="nonincarne">Non Incarnée</option>
-      <option value="blurette">Blurette</option>
-      {{/select}}
     </select>
   </li>
   {{#each system.attributs as |attr key|}}

templates/actor/chirurgie.html

@@ -12,9 +12,11 @@
       <img class="sheet-competence-img" src="{{tache.img}}"/>
       <span class="competence-title tache-label"><a>{{tache.name}}
         ({{tache.system.points_de_tache_courant}}/{{tache.system.points_de_tache}})</a></span>
-      <div class="item-controls flex-shrink">
+      <div class="item-controls">
-        <a class="item-edit" data-tooltip="Edit Item"><i class="fas fa-edit"></i></a>
+        <a class="item-edit" data-tooltip="Modifier"><i class="fas fa-edit"></i></a>
-        <a class="item-delete" data-tooltip="Delete Item"><i class="fas fa-trash"></i></a>
+        <a class="item-delete" data-tooltip="Supprimer"><i class="fas fa-trash"></i></a>
+        &nbsp;
+        <a class="item-montrer" data-tooltip="Montrer"><i class="fas fa-comment"></i></a>
       </div>
     </li>
     {{/if}}

templates/actor/combat.html

@@ -25,7 +25,7 @@
     <span class="competence-value">{{plusMoins arme.system.niveau}}</span>
     <span class="competence-value">{{plusMoins arme.system.dommagesReels}}</span>
     <span class="competence-value"></span>
-    <span class="initiative-value arme-initiative"><a data-tooltip="{{arme.name}}: initiative {{plusMoins arme.system.initiative}}">{{arme.system.initiative}}</a></span>
+    <span class="initiative-value arme-initiative"><a data-tooltip="{{arme.name}}: initiative {{arme.system.initiative}}">{{arme.system.initiative}}</a></span>
   </li>
   {{/each}}
   {{#each esquives as |esq key|}}
@@ -64,8 +64,8 @@
     </span>
     <span class="competence-value">{{emp.system.pointsemp}}</span>
     <div class="item-controls">
-      <a class="item-edit" data-tooltip="Edit Item"><i class="fas fa-edit"></i></a>
+      <a class="item-edit" data-tooltip="Modifier"><i class="fas fa-edit"></i></a>
-      <a class="item-delete" data-tooltip="Delete Item"><i class="fas fa-trash"></i></a>
+      <a class="item-delete" data-tooltip="Supprimer"><i class="fas fa-trash"></i></a>
     </div>
   </li>
   {{/each}}

templates/actor/comp-creature.html

@@ -23,8 +23,8 @@
       />
     {{#if @root.options.vueDetaillee}}
     <div class="item-controls">
-      <a class="item-edit" data-tooltip="Edit Item"><i class="fas fa-edit"></i></a>
+      <a class="item-edit" data-tooltip="Modifier"><i class="fas fa-edit"></i></a>
-      <a class="item-delete" data-tooltip="Delete Item"><i class="fas fa-trash"></i></a>
+      <a class="item-delete" data-tooltip="Supprimer"><i class="fas fa-trash"></i></a>
     </div>
     {{/if}}
   </li>

templates/actor/comp-possession.html

@@ -6,8 +6,8 @@
       <img class="sheet-competence-img" src="{{possession.img}}" data-tooltip="{{possession.name}}"/>
       <span class="competence-label">{{possession.name}}</span>
       <div class="item-controls">
-        <a class="item-edit" data-tooltip="Edit Item"><i class="fas fa-edit"></i></a>
+        <a class="item-edit" data-tooltip="Modifier"><i class="fas fa-edit"></i></a>
-        <a class="item-delete" data-tooltip="Delete Item"><i class="fas fa-trash"></i></a>
+        <a class="item-delete" data-tooltip="Supprimer"><i class="fas fa-trash"></i></a>
       </div>
     </li>
     {{/each}}

templates/actor/competence.html

@@ -48,7 +48,9 @@
       {{#if @root.options.isGM}}
       <a class="item-delete" data-tooltip="Supprimer"><i class="fas fa-trash"></i></a>
       {{/if}}
-    </div>
+      &nbsp;
+      <a class="item-montrer" data-tooltip="Montrer"><i class="fas fa-comment"></i></a>
+  </div>
     {{/if}}
   </li>
 {{/unless}}

templates/actor/dragon-queue.html

@@ -8,7 +8,8 @@
     <a>{{queue.name}}</a>
   </span>
   <div class="item-controls">
-    <a class="item-delete" data-tooltip="Delete Item"><i class="fas fa-trash"></i></a>
+    <a class="item-delete" data-tooltip="Supprimer"><i class="fas fa-trash"></i></a>
+    <a class="item-montrer" data-tooltip="Montrer"><i class="fas fa-comment"></i></a>
     {{#if queue.system.refoulement}}
     <a class="item-action">Refouler</a>
     {{/if}}

templates/actor/dragon-souffles.html

@@ -5,8 +5,9 @@
   <li class="item flexrow" data-attribute={{key}} data-item-id="{{souffle._id}}" data-tooltip="Souffle: {{souffle.name}}">
     <img class="sheet-competence-img" src="{{souffle.img}}"/>
     <span class="item-edit flex-grow"><a>{{souffle.name}}</a></span>
-    <div class="item-controls flex-shrink">
+    <div class="item-controls">
-      <a class="item-delete" data-tooltip="Delete Item"><i class="fas fa-trash"></i></a>
+      <a class="item-delete" data-tooltip="Supprimer"><i class="fas fa-trash"></i></a>
+      <a class="item-montrer" data-tooltip="Montrer"><i class="fas fa-comment"></i></a>
     </div>
   </li>
   {{/each}}