changelog.md

@@ -1,79 +1,4 @@
 # 11.2
-## 11.2.22 - Le futur d'Akarlikarlikar
-- correction de la vente par le tchat: seul le premier acheteur pouvait acheter
-
-### Support V12
-- adaptation fenêtre de recherche
-
-## 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
-
-## 11.2.11 - Le miroir d'Akarlikarlikar
-- Changement des images de compétence de créatures morsure/pinces pour être dans le thème
-- Suppression de la bordure autour des portraits d'acteurs, remplacés par un légèr éclaircissement du fond
-- Fix: le refoulement ajoute correctement un souffle et revient à 0 en cas d'échec
-
-## 11.2.10 - Les expériences d'Akarlikarlikar
-- En cas d'expérience des caractéristiques dérivées,
-  - si plusieurs caractéristiques pourraient recevoir l'expérience, une fenêtre demande au joueur
-  - si une seule caractéristique peut recevoir de l'expérience, c'est attribué automatiquement
-- Si la force est au maximum pour la taille personnage, on ne peut plus gagner d'expérience
-
-## 11.2.9 - La barbe d'Akarlikarlikar
-- Amélioration des textes de tooltips
-- Les tooltips sont plus dans le thème de couleur du système Rêve de Dragon 
-- Ajouts d'icones pour les attaque/initiative/soins dans les raccourcis sur les tokens (HUD)
-- Ajout d'une icône et transformation en bouton du lien pour accéder à l'astrologie et aux chiffres astraux
-- Suppression de message de log inutile sur chaque point de coeur
-- On peut désactiver l'ajustement astrologique sur les jets de chance (pour des jts de chances non liés à une heure)- Fix: suppression de quelques cas d'erreur lors de l'ouverture des TMR
-- Fix: suppression du warning de depréciation effects flags.core.statusId
-- Les sorts en réserve en fleuve sont indiqués sur toutes les cases fleuve
-- Changement de l'icône d'état d'empoignade pour suivre les couleurs des autres icônes d'état
-
 ## 11.2.8 - L'éclairage d'Akarlikarlikar
 - l'ajustement de la lumière jour/nuit s'étale sur moins de temps (vaisseau et Lyre)
 - les nouveaux tooltips ne masquent plus l'information d'expérience

icons/heures/.directory

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

icons/tmr/sort-reserve-humide.svg

@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 512 512"
-   style="height: 256px; width: 256px;"
-   version="1.1"
-   id="svg24"
-   sodipodi:docname="sort-reserve-humide3.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-  <metadata
-     id="metadata30">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs28" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2794"
-     inkscape:window-height="1756"
-     id="namedview26"
-     showgrid="false"
-     inkscape:zoom="2.8786993"
-     inkscape:cx="323.66586"
-     inkscape:cy="227.70764"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg24" />
-  <g
-     id="g881"
-     transform="translate(2.1482304,2.80716)">
-    <path
-       d="m 243.94189,104.37921 -82.23331,178.13543 82.23331,27.44784 z"
-       class=""
-       fill="#f4e3d7"
-       fill-opacity="1"
-       id="path2"
-       style="stroke-width:1.10232" />
-    <path
-       d="m 263.7837,104.37921 v 205.58327 l 82.23331,-27.44784 z"
-       class=""
-       fill="#f4e3d7"
-       fill-opacity="1"
-       id="path4"
-       style="stroke-width:1.10232" />
-    <path
-       d="M 168.21228,221.005 18.274279,239.7445 141.75653,278.32581 Z"
-       class=""
-       fill="#f4e3d7"
-       fill-opacity="1"
-       id="path6"
-       style="stroke-width:1.10232" />
-    <path
-       d="M 339.51331,221.005 365.96906,278.32581 489.5395,239.7445 Z"
-       class=""
-       fill="#f4e3d7"
-       fill-opacity="1"
-       id="path8"
-       style="stroke-width:1.10232" />
-    <path
-       d="M -0.24475089,254.73609 114.97007,398.80973 230.27308,326.7178 Z"
-       class=""
-       fill="#f4e3d7"
-       fill-opacity="1"
-       id="path10"
-       style="stroke-width:1.10232" />
-    <path
-       d="M 507.94829,254.73609 277.45251,326.7178 392.75552,398.80973 Z"
-       class=""
-       fill="#f4e3d7"
-       fill-opacity="1"
-       id="path12"
-       style="stroke-width:1.10232" />
-    <path
-       d="M 253.8628,335.42615 147.37837,402.00647 H 360.34722 Z"
-       class=""
-       fill="#f4e3d7"
-       fill-opacity="1"
-       id="path14"
-       style="stroke-width:1.10232" />
-  </g>
-</svg>

lang/fr.json

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

module/achat-vente/chat-vente.js

@@ -1,70 +0,0 @@
-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 setDetailAchatVente(chatMessage, vente) {
-    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
-    })
-  }
-
-  static async diminuerQuantite(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(venteData) {
-    const html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-vente-item.html', venteData);
-    const chatMessage = await ChatMessage.create(RdDUtility.chatDataSetup(html))
-    await ChatVente.setDetailAchatVente(chatMessage, venteData)
-  }
-}

module/actor-sheet.js

@@ -16,6 +16,7 @@ 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";
 
 /* -------------------------------------------- */
@@ -27,26 +28,28 @@ export class RdDActorSheet extends RdDBaseActorSangSheet {
 
   /** @override */
   static get defaultOptions() {
-    return foundry.utils.mergeObject(RdDBaseActorReveSheet.defaultOptions, {
+    return 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();
-    foundry.utils.mergeObject(formData, {
-      editable: this.isEditable,
-      cssClass: this.isEditable ? "editable" : "locked",
-      limited: this.actor.limited,
-      owner: this.actor.isOwner,
-      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,
+      {
+        editable: this.isEditable,
+        cssClass: this.isEditable ? "editable" : "locked",
+        effects: this.actor.effects.map(e => foundry.utils.deepClone(e)),
+        limited: this.actor.limited,
+        owner: this.actor.isOwner,
+        biographie: await TextEditor.enrichHTML(this.actor.system.biographie, { async: true }),
+        notes: await TextEditor.enrichHTML(this.actor.system.notes, { async: true }),
+      });
+    mergeObject(formData.calc, {
       surenc: this.actor.computeMalusSurEncombrement(),
       surprise: RdDBonus.find(this.actor.getSurprise(false)).descr,
       resumeBlessures: this.actor.computeResumeBlessure(this.actor.system.blessures),
@@ -77,7 +80,7 @@ export class RdDActorSheet extends RdDBaseActorSangSheet {
 
       // toujours avoir une liste d'armes (pour mettre esquive et corps à corps)
       const actor = this.actor;
-      formData.combat = foundry.utils.duplicate(formData.armes);
+      formData.combat = duplicate(formData.armes);
       RdDItemArme.computeNiveauArmes(formData.combat, formData.competences);
       formData.combat.push(RdDItemArme.mainsNues(actor));
       formData.combat.push(RdDItemArme.empoignade(actor));
@@ -210,7 +213,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())
     }
@@ -218,7 +221,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(foundry.utils.duplicate(this._getEventArmeCombat(event))))
+    this.html.find('.arme-label a').click(async event => this.actor.rollArme(duplicate(this._getEventArmeCombat(event))))
 
     // Initiative pour l'arme
     this.html.find('.arme-initiative a').click(async event => {
@@ -385,7 +388,7 @@ export class RdDActorSheet extends RdDBaseActorSangSheet {
   async _onSplitItem(item, split) {
     if (split >= 1 && split < item.system.quantite) {
       await item.diminuerQuantite(split);
-      const splitItem = foundry.utils.duplicate(item);
+      const splitItem = duplicate(item);
       splitItem.system.quantite = split;
       await this.actor.createEmbeddedDocuments('Item', [splitItem])
     }

module/actor.js

@@ -35,7 +35,6 @@ import { ExperienceLog, XP_TOPIC } from "./actor/experience-log.js";
 import { 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";
 
 export const MAINS_DIRECTRICES = ['Droitier', 'Gaucher', 'Ambidextre']
 
@@ -57,20 +56,21 @@ export class RdDActor extends RdDBaseActorSang {
 
   /* -------------------------------------------- */
   $computeCaracDerivee() {
-
     this.system.carac.force.value = Math.min(this.system.carac.force.value, parseInt(this.system.carac.taille.value) + 4);
-    this.system.carac.melee.value = Math.floor((parseInt(this.system.carac.force.value) + parseInt(this.system.carac.agilite.value)) / 2);
-    this.system.carac.tir.value = Math.floor((parseInt(this.system.carac.vue.value) + parseInt(this.system.carac.dexterite.value)) / 2);
-    this.system.carac.lancer.value = Math.floor((parseInt(this.system.carac.tir.value) + parseInt(this.system.carac.force.value)) / 2);
-    this.system.carac.derobee.value = Math.floor(parseInt(((21 - this.system.carac.taille.value)) + parseInt(this.system.carac.agilite.value)) / 2);
 
+    this.system.carac.derobee.value = Math.floor(parseInt(((21 - this.system.carac.taille.value)) + parseInt(this.system.carac.agilite.value)) / 2);
     let bonusDomKey = Math.floor((parseInt(this.system.carac.force.value) + parseInt(this.system.carac.taille.value)) / 2);
     let tailleData = RdDCarac.getCaracDerivee(bonusDomKey);
     this.system.attributs.plusdom.value = tailleData.plusdom;
-    this.system.attributs.encombrement.value = (parseInt(this.system.carac.force.value) + parseInt(this.system.carac.taille.value)) / 2;
 
     this.system.attributs.sconst.value = RdDCarac.calculSConst(this.system.carac.constitution.value);
     this.system.attributs.sust.value = RdDCarac.getCaracDerivee(this.system.carac.taille.value).sust;
+
+    this.system.attributs.encombrement.value = (parseInt(this.system.carac.force.value) + parseInt(this.system.carac.taille.value)) / 2;
+    this.system.carac.melee.value = Math.floor((parseInt(this.system.carac.force.value) + parseInt(this.system.carac.agilite.value)) / 2);
+    this.system.carac.tir.value = Math.floor((parseInt(this.system.carac.vue.value) + parseInt(this.system.carac.dexterite.value)) / 2);
+    this.system.carac.lancer.value = Math.floor((parseInt(this.system.carac.tir.value) + parseInt(this.system.carac.force.value)) / 2);
+
     this.system.sante.vie.max = Math.ceil((parseInt(this.system.carac.taille.value) + parseInt(this.system.carac.constitution.value)) / 2);
 
     this.system.sante.vie.value = Math.min(this.system.sante.vie.value, this.system.sante.vie.max)
@@ -95,32 +95,30 @@ export class RdDActor extends RdDBaseActorSang {
     return ![TYPES.competencecreature, TYPES.tarot, TYPES.service].includes(item.type)
   }
 
-  isPersonnageJoueur() {
-    return this.hasPlayerOwner && this.prototypeToken.actorLink
-  }
-
   isPersonnage() { return true }
   isHautRevant() { return this.system.attributs.hautrevant.value != "" }
 
   /* -------------------------------------------- */
-  getAgilite() { return this.system.carac.agilite?.value ?? 0 }
-  getChance() { return this.system.carac.chance?.value ?? 0 }
+  getAgilite() { return Number(this.system.carac.agilite?.value ?? 0) }
+  getChance() { return Number(this.system.carac.chance?.value ?? 0) }
 
-  getReveActuel() { return this.system.reve?.reve?.value ?? this.carac.reve.value ?? 0 }
-  getChanceActuel() { return this.system.compteurs.chance?.value ?? 10 }
-  getMoralTotal() { return this.system.compteurs.moral?.value ?? 0 }
+  getReveActuel() { return Misc.toInt(this.system.reve?.reve?.value ?? this.carac.reve.value) }
+  getChanceActuel() { return Misc.toInt(this.system.compteurs.chance?.value ?? 10) }
+  getMoralTotal() { return Number(this.system.compteurs.moral?.value ?? 0) }
 
   /* -------------------------------------------- */
   getEtatGeneral(options = { ethylisme: false }) {
-    const etatGeneral = this.system.compteurs.etat?.value ?? 0
-    // Pour les jets d'Ethylisme, on retire le malus d'éthylisme (p.162)
-    const annuleMalusEthylisme = options.ethylisme ? this.malusEthylisme() : 0
-    return etatGeneral - annuleMalusEthylisme
+    const etatGeneral = Misc.toInt(this.system.compteurs.etat?.value)
+    if (options.ethylisme) {
+      // Pour les jets d'Ethylisme, on retire le malus d'éthylisme (p.162)
+      return etatGeneral - this.malusEthylisme()
+    }
+    return etatGeneral
   }
 
   /* -------------------------------------------- */
   getActivePoisons() {
-    return foundry.utils.duplicate(this.items.filter(item => item.type == 'poison' && item.system.active))
+    return duplicate(this.items.filter(item => item.type == 'poison' && item.system.active))
   }
 
   /* -------------------------------------------- */
@@ -143,7 +141,7 @@ export class RdDActor extends RdDBaseActorSang {
   /* -------------------------------------------- */
   getDemiReve() { return this.system.reve.tmrpos.coord }
   getDraconicList() { return this.itemTypes[TYPES.competence].filter(it => it.system.categorie == 'draconic') }
-  getBestDraconic() { return foundry.utils.duplicate(this.getDraconicList().sort(Misc.descending(it => it.system.niveau)).find(it => true)) }
+  getBestDraconic() { return 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()]
@@ -154,26 +152,23 @@ export class RdDActor extends RdDBaseActorSang {
   /* -------------------------------------------- */
   async $perteRevePotionsEnchantees() {
     let potions = this.itemTypes[TYPES.potion]
-      .filter(it => Grammar.includesLowerCaseNoAccent(it.system.categorie, 'enchanté') && !it.system.prpermanent)
+      .filter(it => it.system.categorie.toLowerCase().includes('enchant') && !potion.system.prpermanent)
 
-    const potionUpdates = await Promise.all(potions.map(async it => {
-      const nouveauReve = Math.max(it.system.pr - 1, 0)
+    const potionUpdates = await Promise.all(potions.map(async potion => {
+      console.log(potion)
+      let nouveauReve = (potion.system.pr > 0) ? potion.system.pr - 1 : 0;
+      const message = await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-potionenchantee-chateaudormant.html`, {
+        pr: nouveauReve,
+        alias: this.name,
+        potionName: potion.name,
+        potionImg: potion.img
+      })
       ChatMessage.create({
         whisper: ChatUtility.getWhisperRecipientsAndGMs(this.name),
-        content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-potionenchantee-chateaudormant.html`, {
-          pr: nouveauReve,
-          alias: this.name,
-          potionName: it.name,
-          potionImg: it.img
-        })
-      })
-      return {
-        _id: it._id,
-        'system.pr': nouveauReve,
-        'system.quantite': nouveauReve > 0 ? it.system.quantite : 0
-      }
+        content: message
+      });
+      return { _id: potion._id, 'system.pr': nouveauReve };
     }))
-
     await this.updateEmbeddedDocuments('Item', potionUpdates);
   }
 
@@ -347,7 +342,7 @@ export class RdDActor extends RdDBaseActorSang {
     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))
 
-    await Promise.all(blessures.map(async b => b.recuperationBlessure({
+    await Promise.all(blessures.map(b => b.recuperationBlessure({
       actor: this,
       timestamp,
       message,
@@ -404,7 +399,7 @@ export class RdDActor extends RdDBaseActorSang {
       content: 'Remise à neuf de ' + this.name
     });
     await this.supprimerBlessures(it => true);
-    await this.removeEffects(e => e.id != STATUSES.StatusDemiReve);
+    await this.removeEffects(e => e.flags.core.statusId !== STATUSES.StatusDemiReve);
     const updates = {
       'system.sante.endurance.value': this.system.sante.endurance.max,
       'system.sante.vie.value': this.system.sante.vie.max,
@@ -429,7 +424,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 ? '0 (réveil)' : it).reduce(Misc.joining("+"))} Points de rêve. `;
+        message.content += `Vous récupérez ${jetsReve.map(it => it < 0 ? '(dragon)' : it).reduce(Misc.joining("+"))} Points de rêve. `;
       }
       if (dormi.etat == 'eveil') {
         await this.reveilReveDeDragon(message, dormi.heures);
@@ -450,6 +445,7 @@ 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 } });
@@ -663,7 +659,7 @@ export class RdDActor extends RdDBaseActorSang {
         this.setPointsDeChance(to);
       }
     }
-    let selectedCarac = this.findCaracByName(caracName);
+    let selectedCarac = RdDBaseActor._findCaracByName(this.system.carac, caracName);
     const from = selectedCarac.value
     await this.update({ [`system.carac.${caracName}.value`]: to });
     await ExperienceLog.add(this, XP_TOPIC.CARAC, from, to, caracName);
@@ -674,7 +670,7 @@ export class RdDActor extends RdDBaseActorSang {
     if (caracName == 'Taille') {
       return;
     }
-    let selectedCarac = this.findCaracByName(caracName);
+    let selectedCarac = RdDBaseActor._findCaracByName(this.system.carac, caracName);
     if (!selectedCarac.derivee) {
       const from = Number(selectedCarac.xp);
       await this.update({ [`system.carac.${caracName}.xp`]: to });
@@ -688,9 +684,9 @@ export class RdDActor extends RdDBaseActorSang {
     if (caracName == 'Taille') {
       return;
     }
-    let carac = this.findCaracByName(caracName);
+    let carac = RdDBaseActor._findCaracByName(this.system.carac, caracName);
     if (carac) {
-      carac = foundry.utils.duplicate(carac);
+      carac = duplicate(carac);
       const fromXp = Number(carac.xp);
       const fromValue = Number(carac.value);
       let toXp = fromXp;
@@ -826,7 +822,7 @@ export class RdDActor extends RdDBaseActorSang {
 
   async deleteExperienceLog(from, count) {
     if (from >= 0 && count > 0) {
-      let expLog = foundry.utils.duplicate(this.system.experiencelog);
+      let expLog = duplicate(this.system.experiencelog);
       expLog.splice(from, count);
       await this.update({ [`system.experiencelog`]: expLog });
     }
@@ -900,9 +896,9 @@ export class RdDActor extends RdDBaseActorSang {
 
   /* -------------------------------------------- */
   async ajouterRefoulement(value = 1, refouler) {
-    let refoulement = this.system.reve.refoulement.value + value;
+    const refoulement = this.system.reve.refoulement.value + value;
     const roll = new Roll("1d20");
-    await roll.evaluate();
+    await roll.evaluate({ async: true });
     await roll.toMessage({ flavor: `${this.name} refoule ${refouler} pour ${value} points de refoulement (total: ${refoulement})` });
     if (roll.total <= refoulement) {
       refoulement = 0;
@@ -991,33 +987,25 @@ export class RdDActor extends RdDBaseActorSang {
 
   /* -------------------------------------------- */
   buildTMRInnaccessible() {
-    return this.items[TYPES.casetmr]
-      .filter(it => EffetsDraconiques.isInnaccessible(it))
-      .map(it => it.system.coord)
+    const tmrInnaccessibles = this.filterItems(it => Draconique.isCaseTMR(it) &&
+      EffetsDraconiques.isInnaccessible(it));
+    return tmrInnaccessibles.map(it => it.system.coord);
   }
 
   /* -------------------------------------------- */
-  getRencontresTMR() {
-    return this.itemTypes[TYPES.rencontre];
+  getTMRRencontres() {
+    return this.itemTypes['rencontre'];
   }
 
   /* -------------------------------------------- */
-  async deleteRencontreTMRAtPosition() {
-    const rencontreIds = this.itemTypes[TYPES.rencontre].filter(this.filterRencontreTMRDemiReve()).map(it => it.id)
+  async deleteTMRRencontreAtPosition() {
+    const demiReve = this.getDemiReve()
+    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[TYPES.rencontre].find(this.filterRencontreTMRDemiReve())
-  }
-
-  filterRencontreTMRDemiReve() {
-    const position = this.getDemiReve()
-    return it => it.system.coord == position
-  }
-
   /* -------------------------------------------- */
   async addTMRRencontre(currentRencontre) {
     const toCreate = currentRencontre.toObject();
@@ -1149,7 +1137,6 @@ export class RdDActor extends RdDBaseActorSang {
       finalLevel: 0,
       diffConditions: 0,
       ajustementsForce: CONFIG.RDD.difficultesLibres,
-      config: game.system.rdd.config
     }
     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);
@@ -1179,8 +1166,8 @@ export class RdDActor extends RdDBaseActorSang {
           title: "Nourriture brute",
           content: `Que faire de votre ${item.name}`,
           buttons: {
-            'cuisiner': { icon: '<i class="fa-solid fa-utensils"></i>', label: 'Cuisiner', callback: async () => await this.preparerNourriture(item) },
-            'manger': { icon: '<i class="fa-solid fa-drumstick-bite"></i>', label: 'Manger cru', callback: async () => await this.mangerNourriture(item, onActionItem) }
+            'cuisiner': { icon: '<i class="fas fa-check"></i>', label: 'Cuisiner', callback: async () => await this.preparerNourriture(item) },
+            'manger': { icon: '<i class="fas fa-check"></i>', label: 'Manger cru', callback: async () => await this.mangerNourriture(item, onActionItem) }
           }
         });
         return utilisation.render(true);
@@ -1320,7 +1307,7 @@ export class RdDActor extends RdDBaseActorSang {
 
   /* -------------------------------------------- */
   async saouler(forceAlcool, alcool = undefined) {
-    let ethylisme = foundry.utils.duplicate(this.system.compteurs.ethylisme);
+    let ethylisme = duplicate(this.system.compteurs.ethylisme);
 
     const etat = this.getEtatGeneral({ ethylisme: true });
     const nbDoses = Number(this.system.compteurs.ethylisme.nb_doses || 0);
@@ -1341,7 +1328,7 @@ export class RdDActor extends RdDBaseActorSang {
     }
 
     await RdDResolutionTable.rollData(ethylismeData.jetVie);
-    this._gererExperience(ethylismeData.jetVie);
+    this._appliquerExperienceRollData(ethylismeData.jetVie);
     RollDataAjustements.calcul(ethylismeData.jetVie, this);
     if (ethylismeData.jetVie.rolled.isSuccess) {
       ethylisme.nb_doses++;
@@ -1373,7 +1360,7 @@ export class RdDActor extends RdDBaseActorSang {
           finalLevel: Number(ethylisme.value) + Number(this.system.compteurs.moral.value)
         }
         await RdDResolutionTable.rollData(ethylismeData.jetVolonte);
-        this._gererExperience(ethylismeData.jetVolonte);
+        this._appliquerExperienceRollData(ethylismeData.jetVolonte);
         RollDataAjustements.calcul(ethylismeData.jetVolonte, this);
       }
     }
@@ -1485,19 +1472,13 @@ export class RdDActor extends RdDBaseActorSang {
   }
 
   /* -------------------------------------------- */
-  isCaracMax(code) {
-    if (code == 'force' && parseInt(this.system.carac.force.value) >= parseInt(this.system.carac.taille.value) + 4) {
-      return true;
-    }
-    return false
-  }
   async checkCaracXP(caracName, display = true) {
-    let carac = this.findCaracByName(caracName);
+    let carac = RdDBaseActor._findCaracByName(this.system.carac, caracName);
     if (carac && carac.xp > 0) {
       const niveauSuivant = Number(carac.value) + 1;
       let xpNeeded = RdDCarac.getCaracNextXp(niveauSuivant);
       if (carac.xp >= xpNeeded) {
-        carac = foundry.utils.duplicate(carac);
+        carac = duplicate(carac);
         carac.value = niveauSuivant;
 
         let checkXp = {
@@ -1527,7 +1508,7 @@ export class RdDActor extends RdDBaseActorSang {
     if (compData && newXP > 0) {
       let xpNeeded = RdDItemCompetence.getCompetenceNextXp(compData.system.niveau + 1);
       if (newXP >= xpNeeded) {
-        let newCompData = foundry.utils.duplicate(compData);
+        let newCompData = duplicate(compData);
         newCompData.system.niveau += 1;
         newCompData.system.xp = newXP;
         let checkXp = {
@@ -1553,11 +1534,8 @@ export class RdDActor extends RdDBaseActorSang {
   async appliquerAjoutExperience(rollData, hideChatMessage = 'show') {
     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 (xpData) {
+      const content = await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-actor-gain-xp.html`, xpData);
       if (hideChatMessage) {
         ChatUtility.blindMessageToGM({ content: content });
       }
@@ -1633,14 +1611,14 @@ export class RdDActor extends RdDBaseActorSang {
       return;
     }
     // Duplication car les pts de reve sont modifiés dans le sort
-    let sorts = foundry.utils.duplicate(this.$filterSortList(this.itemTypes['sort'], coord));
+    let sorts = 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 = foundry.utils.duplicate(this.system.carac.reve);
+    const reve = duplicate(this.system.carac.reve);
 
     const dialog = await this.openRollDialog({
       name: 'lancer-un-sort',
@@ -1720,7 +1698,7 @@ export class RdDActor extends RdDBaseActorSang {
     if (rollData.competence.name.includes('Thanatos')) { // Si Thanatos
       await this.update({ "system.reve.reve.thanatosused": true });
     }
-    let reveActuel = parseInt(this.system.reve.reve.value)
+    let reveActuel = this.system.reve.reve.value;
     if (rolled.isSuccess) { // Réussite du sort !
       if (rolled.isPart) {
         rollData.depenseReve = Math.max(Math.floor(rollData.depenseReve / 2), 1);
@@ -1739,7 +1717,7 @@ export class RdDActor extends RdDBaseActorSang {
       else {
         rollData.depenseReve = 0;
         rollData.show.reveInsuffisant = true;
-        foundry.utils.mergeObject(rollData.rolled, RdDResolutionTable.getResultat("echec"), { overwrite: true });
+        mergeObject(rollData.rolled, RdDResolutionTable.getResultat("echec"), { overwrite: true });
       }
     } else {
       if (rolled.isETotal) { // Echec total !
@@ -1787,13 +1765,13 @@ export class RdDActor extends RdDBaseActorSang {
     };
     RollDataAjustements.calcul(rollData, this);
     await RdDResolutionTable.rollData(rollData);
-    this._gererExperience(rollData);
+    this._appliquerExperienceRollData(rollData);
     await RdDResolutionTable.displayRollData(rollData, this)
     return rollData.rolled;
   }
 
   /* -------------------------------------------- */
-  _gererExperience(rollData) {
+  _appliquerExperienceRollData(rollData) {
     const callback = this.createCallbackExperience();
     if (callback.condition(rollData)) {
       callback.action(rollData);
@@ -1826,10 +1804,7 @@ export class RdDActor extends RdDBaseActorSang {
   }
 
   blessuresASoigner() {
-    return (this.itemTypes[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))
+    return this.filterItems(it => it.system.gravite > 0 && it.system.gravite <= 6 && !(it.system.premierssoins.done && it.system.soinscomplets.done), 'blessure')
   }
 
   async getTacheBlessure(blesse, blessure) {
@@ -1881,7 +1856,7 @@ export class RdDActor extends RdDBaseActorSang {
         diffConditions: 0,
         use: { libre: false, conditions: true },
         carac: {
-          [tacheData.system.carac]: foundry.utils.duplicate(this.system.carac[tacheData.system.carac])
+          [tacheData.system.carac]: duplicate(this.system.carac[tacheData.system.carac])
         }
       },
       callbackAction: r => this._tacheResult(r, options)
@@ -1892,7 +1867,7 @@ export class RdDActor extends RdDBaseActorSang {
   async _tacheResult(rollData, options) {
     // Mise à jour de la tache
     rollData.appliquerFatigue = ReglesOptionnelles.isUsing("appliquer-fatigue");
-    rollData.tache = foundry.utils.duplicate(rollData.tache);
+    rollData.tache = duplicate(rollData.tache);
     rollData.tache.system.points_de_tache_courant += rollData.rolled.ptTache;
     if (rollData.rolled.isETotal) {
       rollData.tache.system.difficulte--;
@@ -1916,21 +1891,21 @@ export class RdDActor extends RdDBaseActorSang {
   /* -------------------------------------------- */
   async _rollArt(artData, selected, oeuvre, callbackAction = r => this._resultArt(r)) {
     oeuvre.system.niveau = oeuvre.system.niveau ?? 0;
-    foundry.utils.mergeObject(artData,
+    mergeObject(artData,
       {
         oeuvre: oeuvre,
         art: oeuvre.type,
-        competence: foundry.utils.duplicate(this.getCompetence(artData.compName ?? oeuvre.system.competence ?? artData.art)),
+        competence: duplicate(this.getCompetence(artData.compName ?? oeuvre.system.competence ?? artData.art)),
         diffLibre: - oeuvre.system.niveau,
         diffConditions: 0,
         use: { libre: false, conditions: true, surenc: false },
-        selectedCarac: foundry.utils.duplicate(this.system.carac[selected])
+        selectedCarac: duplicate(this.system.carac[selected])
       },
       { overwrite: false });
     artData.competence.system.defaut_carac = selected;
     if (!artData.forceCarac) {
       artData.forceCarac = {};
-      artData.forceCarac[selected] = foundry.utils.duplicate(this.system.carac[selected]);
+      artData.forceCarac[selected] = duplicate(this.system.carac[selected]);
     }
 
     await this.openRollDialog({
@@ -1954,19 +1929,19 @@ export class RdDActor extends RdDBaseActorSang {
   /* -------------------------------------------- */
   async rollChant(id) {
     const artData = { art: 'chant', verbe: 'Chanter' };
-    const oeuvre = foundry.utils.duplicate(this.getChant(id));
+    const oeuvre = duplicate(this.getChant(id));
     await this._rollArt(artData, "ouie", oeuvre);
   }
 
   /* -------------------------------------------- */
   async rollDanse(id) {
     const artData = { art: 'danse', verbe: 'Danser', forceCarac: {} };
-    const oeuvre = foundry.utils.duplicate(this.findItemLike(id, artData.art));
+    const oeuvre = duplicate(this.findItemLike(id, artData.art));
     if (oeuvre.system.agilite) {
-      artData.forceCarac['agilite'] = foundry.utils.duplicate(this.system.carac.agilite);
+      artData.forceCarac['agilite'] = duplicate(this.system.carac.agilite);
     }
     if (oeuvre.system.apparence) {
-      artData.forceCarac['apparence'] = foundry.utils.duplicate(this.system.carac.apparence);
+      artData.forceCarac['apparence'] = duplicate(this.system.carac.apparence);
     }
     const selectedCarac = this._getCaracDanse(oeuvre);
     await this._rollArt(artData, selectedCarac, oeuvre);
@@ -2069,7 +2044,7 @@ export class RdDActor extends RdDBaseActorSang {
     const artData = {
       art: 'jeu', verbe: 'Jeu',
       use: { libre: true, conditions: true, },
-      competence: foundry.utils.duplicate(this.getCompetence('jeu')),
+      competence: duplicate(this.getCompetence('jeu')),
       forceCarac: {}
     };
     listCarac.forEach(c => artData.forceCarac[c] = this.system.carac[c]);
@@ -2080,14 +2055,14 @@ export class RdDActor extends RdDBaseActorSang {
 
   async rollOeuvre(id) {
     const artData = { art: 'oeuvre', verbe: 'Interpréter' }
-    const oeuvre = foundry.utils.duplicate(this.findItemLike(id, artData.art))
+    const oeuvre = duplicate(this.findItemLike(id, artData.art))
     await this._rollArt(artData, oeuvre.system.default_carac, oeuvre)
   }
 
   /* -------------------------------------------- */
   async rollMeditation(id) {
-    const meditation = foundry.utils.duplicate(this.getMeditation(id));
-    const competence = foundry.utils.duplicate(this.getCompetence(meditation.system.competence));
+    const meditation = duplicate(this.getMeditation(id));
+    const competence = duplicate(this.getCompetence(meditation.system.competence));
     competence.system.defaut_carac = "intellect"; // Meditation = toujours avec intellect
     let meditationData = {
       competence: competence,
@@ -2153,7 +2128,7 @@ export class RdDActor extends RdDBaseActorSang {
     }
     let draconicList = this.getDraconicList()
       .map(draconic => {
-        let draconicLecture = foundry.utils.duplicate(draconic);
+        let draconicLecture = duplicate(draconic);
         draconicLecture.system.defaut_carac = "intellect";
         return draconicLecture;
       });
@@ -2277,7 +2252,7 @@ export class RdDActor extends RdDBaseActorSang {
   async _appliquerExperience(rolled, caracName, competence, jetResistance) {
     // Pas d'XP
     if (!rolled.isPart || rolled.finalLevel >= 0) {
-      return []
+      return undefined;
     }
     if (this.checkDesirLancinant()) {
       // Cas de désir lancinant, pas d'expérience sur particulière
@@ -2285,9 +2260,11 @@ 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 []
+      return undefined;
     }
-
+    if (caracName == 'Vie') caracName = 'constitution';
+    if (caracName == 'derobee') caracName = 'agilite';
+    if (caracName == 'reve-actuel') caracName = 'reve';
     let xp = Math.abs(rolled.finalLevel);
     // impair: arrondi inférieur en carac
     let xpCarac = competence ? Math.floor(xp / 2) : Math.max(Math.floor(xp / 2), 1);
@@ -2300,10 +2277,11 @@ export class RdDActor extends RdDBaseActorSang {
       // max 1 xp sur jets de résistance
       xpCarac = Math.min(1, xpCarac);
     }
-    return [
-      ...(await this._xpCompetence({ competence, xpCompetence })),
-      ...(await this._xpCarac({ caracName, xpCarac }))
-    ];
+    let xpData = { alias: this.name, caracName, xpCarac, competence, xpCompetence };
+
+    await this._xpCompetence(xpData);
+    await this._xpCarac(xpData);
+    return xpData;
   }
 
   /* -------------------------------------------- */
@@ -2311,89 +2289,52 @@ export class RdDActor extends RdDBaseActorSang {
     if (xpData.competence) {
       const from = Number(xpData.competence.system.xp);
       const to = from + xpData.xpCompetence;
-      await this.updateEmbeddedDocuments('Item', [{ _id: xpData.competence._id, 'system.xp': to }]);
+      let update = { _id: xpData.competence._id, 'system.xp': to };
+      await this.updateEmbeddedDocuments('Item', [update]);
       xpData.checkComp = await this.checkCompetenceXP(xpData.competence.name, undefined, false);
       await ExperienceLog.add(this, XP_TOPIC.XP, from, to, xpData.competence.name);
-      return [xpData]
     }
-    return []
   }
 
   /* -------------------------------------------- */
   async _xpCarac(xpData) {
     if (xpData.xpCarac > 0) {
-      const carac = foundry.utils.duplicate(this.system.carac)
-      const code = RdDBaseActor._findCaracNode(carac, xpData.caracName)
-      const selectedCarac = carac[code]
-      if (this.isCaracMax(code)) {
-        ui.notifications.info(`Pas d'expérience: la caractéristique '${selectedCarac.label}' est déjà au maximum pour ${this.name}`)
-        return []
-      }
-      if (selectedCarac && !selectedCarac.derivee) {
-        const from = Number(selectedCarac.xp)
-        const to = from + xpData.xpCarac
-        selectedCarac.xp = to
-        await this.update({ "system.carac": carac })
-        xpData.checkCarac = await this.checkCaracXP(selectedCarac.label, false)
-        await ExperienceLog.add(this, XP_TOPIC.XPCARAC, from, to, xpData.caracName)
-        return [xpData]
+      let carac = duplicate(this.system.carac);
+      let selectedCarac = RdDBaseActor._findCaracByName(carac, xpData.caracName);
+      if (!selectedCarac.derivee) {
+        const from = Number(selectedCarac.xp);
+        const to = from + xpData.xpCarac;
+        selectedCarac.xp = to;
+        await this.update({ "system.carac": carac });
+        xpData.checkCarac = await this.checkCaracXP(selectedCarac.label, false);
+        await ExperienceLog.add(this, XP_TOPIC.XPCARAC, from, to, xpData.caracName);
       } else {
-        return await this._xpCaracDerivee(xpData)
+        xpData.caracRepartitionManuelle = true;
       }
     }
-    return []
   }
 
-  async _xpCaracDerivee(xpData) {
-    const caracs = RdDActor._getComposantsCaracDerivee(xpData.caracName)
-      .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;
-        return [xpData]
-      case 1:
-        xpData.caracName = caracs.find(it => !it.isMax).label
-        return this._xpCarac(xpData)
-      default:
-        await DialogChoixXpCarac.choix(this, xpData, caracs)
-        return []
-    }
-  }
-
-  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']
-      case 'melee': return ['force', 'agilite']
-      case 'derobee': return ['agilite']
-    }
-    return []
-  }
-
-
   /* -------------------------------------------- */
-  async deleteNombresAstraux() {
+  async resetNombresAstraux() {
     const deletions = this.itemTypes['nombreastral'].map(it => it._id);
     await this.deleteEmbeddedDocuments("Item", deletions);
   }
 
   /* -------------------------------------------- */
-  async ajouteNombreAstral(date, nbAstral, isValid) {
-    const indexDate = Number.parseInt(date);
+  async ajouteNombreAstral(callData) {
+    const indexDate = Number.parseInt(callData.date);
     // Ajout du nombre astral
     const item = {
       name: "Nombre Astral", type: "nombreastral", system:
       {
-        value: nbAstral,
-        istrue: isValid,
+        value: callData.nbAstral,
+        istrue: callData.isvalid,
         jourindex: indexDate,
         jourlabel: RdDTimestamp.formatIndexDate(indexDate)
       }
     };
     await this.createEmbeddedDocuments("Item", [item]);
+    game.system.rdd.calendrier.notifyChangeNombresAstraux();
   }
 
   async supprimerAnciensNombresAstraux() {
@@ -2434,29 +2375,22 @@ export class RdDActor extends RdDBaseActorSang {
   /* -------------------------------------------- */
   async displayTMR(mode = "normal") {
     if (this.tmrApp) {
-      ui.notifications.warn("Vous êtes déja dans les TMR....")
-      this.tmrApp.forceTMRDisplay()
+      ui.notifications.warn("Vous êtes déja dans les TMR....");
+      this.tmrApp.forceTMRDisplay();
       return
     }
     if (mode != 'visu' && this.getEffect(STATUSES.StatusDemiReve)) {
-      ui.notifications.warn("Les personnage est déjà dans les Terres Médianes, elles s'affichent en visualisation")
+      ui.notifications.warn("Le joueur ou le MJ est déja dans les Terres Médianes avec ce personnage ! Visualisation uniquement");
       mode = "visu"; // bascule le mode en visu automatiquement
     }
-    if (mode == 'visu') {
-      await this._doDisplayTMR(mode)
-    }
-    else {
-      const rencontre = this.getRencontreTMREnAttente();
-      const settingConfirmer = rencontre ? "confirmation-tmr-rencontre" : "confirmation-tmr";
-      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)
-      })
-    }
+    RdDConfirm.confirmer({
+      bypass: mode == 'visu',
+      settingConfirmer: "confirmation-tmr",
+      content: `<p>Voulez vous monter dans les TMR en mode ${mode}?</p>`,
+      title: 'Confirmer la montée dans les TMR',
+      buttonLabel: 'Monter dans les TMR',
+      onAction: async () => await this._doDisplayTMR(mode)
+    });
   }
 
   async _doDisplayTMR(mode) {
@@ -2481,7 +2415,7 @@ export class RdDActor extends RdDBaseActorSang {
       draconic: this.getDraconicList(),
       sort: this.itemTypes['sort'],
       signes: this.itemTypes['signedraconique'],
-      caracReve: parseInt(this.system.carac.reve.value),
+      caracReve: this.system.carac.reve.value,
       pointsReve: this.getReveActuel(),
       isRapide: isRapide,
       isGM: game.user.isGM,
@@ -2572,7 +2506,7 @@ export class RdDActor extends RdDBaseActorSang {
 
   /* -------------------------------------------- */
   verifierForceMin(item) {
-    if (item.type == 'arme' && item.system.force > parseInt(this.system.carac.force.value)) {
+    if (item.type == 'arme' && item.system.force > this.system.carac.force.value) {
       ChatMessage.create({
         content: `<strong>${this.name} s'est équipé(e) de l'arme ${item.name}, mais n'a pas une force suffisante pour l'utiliser normalement </strong>
                   (${item.system.force} nécessaire pour une Force de ${this.system.carac.force.value})`
@@ -2634,7 +2568,7 @@ export class RdDActor extends RdDBaseActorSang {
 
   /* -------------------------------------------- */
   async incDecItemUse(itemId, inc = 1) {
-    let itemUse = foundry.utils.duplicate(this.getFlag(SYSTEM_RDD, 'itemUse') ?? {});
+    let itemUse = duplicate(this.getFlag(SYSTEM_RDD, 'itemUse') ?? {});
     itemUse[itemId] = (itemUse[itemId] ?? 0) + inc;
     await this.setFlag(SYSTEM_RDD, 'itemUse', itemUse);
     console.log("ITEM USE INC", inc, itemUse);
@@ -2702,7 +2636,7 @@ export class RdDActor extends RdDBaseActorSang {
 
   /* -------------------------------------------- */
   static $transformSubActeurSuivant = (suivant, link) => {
-    return foundry.utils.mergeObject(RdDBaseActor.extractActorMin(suivant), {
+    return mergeObject(RdDBaseActor.extractActorMin(suivant), {
       ephemere: !suivant.prototypeToken.actorLink,
       coeur: link.coeur ?? 0,
       prochainCoeur: link.prochainCoeur ?? link.coeur ?? 0
@@ -2728,7 +2662,7 @@ export class RdDActor extends RdDBaseActorSang {
   }
 
   async setPointsCoeur(subActorId, coeurs, options = { immediat: false }) {
-    const newSuivants = foundry.utils.duplicate(this.system.subacteurs.suivants)
+    const newSuivants = duplicate(this.system.subacteurs.suivants)
     const amoureux = newSuivants.find(it => it.id == subActorId);
     if (amoureux) {
       amoureux[options.immediat ? 'coeur' : 'prochainCoeur'] = coeurs
@@ -2738,7 +2672,7 @@ export class RdDActor extends RdDBaseActorSang {
 
   /* -------------------------------------------- */
   static $transformSubActeurVehicule = (vehicle, link) => {
-    return foundry.utils.mergeObject(RdDBaseActor.extractActorMin(vehicle), {
+    return mergeObject(RdDBaseActor.extractActorMin(vehicle), {
       system: { categorie: vehicle.system.categorie, etat: vehicle.system.etat }
     })
   };
@@ -2985,6 +2919,11 @@ export class RdDActor extends RdDBaseActorSang {
     }
   }
 
+  /* -------------------------------------------- */
+  isEffectAllowed(statusId) {
+    return true
+  }
+
   /* -------------------------------------------- */
   async onPreUpdateItem(item, change, options, id) {
     if (item.isCompetencePersonnage() && item.system.defaut_carac && item.system.xp) {
@@ -3079,7 +3018,7 @@ export class RdDActor extends RdDBaseActorSang {
 
     incarnation.name = 'Réincarnation de ' + incarnation.name
     incarnation.system = {
-      carac: foundry.utils.duplicate(this.system.carac),
+      carac: 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 foundry.utils.mergeObject(RdDBaseActorSheet.defaultOptions, {
+    return mergeObject(RdDBaseActorSheet.defaultOptions, {
       width: 550
     });
   }

module/actor/base-actor-reve.js

@@ -180,32 +180,32 @@ export class RdDBaseActorReve extends RdDBaseActor {
   }
 
   /* -------------------------------------------- */
-  isEffectAllowed(effectId) { return false }
+  isEffectAllowed(statusId) { return true }
 
   getEffects(filter = e => true) {
     return this.getEmbeddedCollection("ActiveEffect").filter(filter);
   }
 
-  getEffect(effectId) {
-    return this.getEmbeddedCollection("ActiveEffect").find(it => it.statuses?.has(effectId));
+  getEffect(statusId) {
+    return this.getEmbeddedCollection("ActiveEffect").find(it => it.flags?.core?.statusId == statusId);
   }
-  
-  async setEffect(effectId, status) {
-    if (this.isEffectAllowed(effectId)) {
-      const effect = this.getEffect(effectId);
+
+  async setEffect(statusId, status) {
+    if (this.isEffectAllowed(statusId)) {
+      const effect = this.getEffect(statusId);
       if (!status && effect) {
         await this.deleteEmbeddedDocuments('ActiveEffect', [effect.id]);
       }
       if (status && !effect) {
-        await this.createEmbeddedDocuments("ActiveEffect", [StatusEffects.prepareActiveEffect(effectId)]);
+        await this.createEmbeddedDocuments("ActiveEffect", [StatusEffects.status(statusId)]);
       }
     }
   }
-  
-  async removeEffect(id) {
-    const effect = this.getEmbeddedCollection("ActiveEffect").find(it => it.id == id);
+
+  async removeEffect(statusId) {
+    const effect = this.getEffect(statusId);
     if (effect) {
-      await this.deleteEmbeddedDocuments('ActiveEffect', [id]);
+      await this.deleteEmbeddedDocuments('ActiveEffect', [effect.id]);
     }
   }
 
@@ -286,12 +286,12 @@ export class RdDBaseActorReve extends RdDBaseActor {
 
   getCarac() {
     // TODO: le niveau d'une entité de cauchemar devrait être exclu...
-    return foundry.utils.mergeObject(this.system.carac,
+    const carac = mergeObject(duplicate(this.system.carac),
       {
         'reve-actuel': this.getCaracReveActuel(),
         'chance-actuelle': this.getCaracChanceActuelle()
-      },
-      { inplace: false })
+      });
+    return carac;
   }
 
   /* -------------------------------------------- */
@@ -425,29 +425,26 @@ export class RdDBaseActorReve extends RdDBaseActor {
     if (attacker && !await attacker.accorder(this, 'avant-encaissement')) {
       return;
     }
-    const armure = await this.computeArmure(rollData);
-    if (ReglesOptionnelles.isUsing('validation-encaissement-gr')){
-      await this.encaisserDommagesValidationGR(rollData, armure, attacker?.id, show);
-    } 
-    else {
-      const jet = await RdDUtility.jetEncaissement(rollData, armure, { showDice: SHOW_DICE });
-      await this.$onEncaissement(jet, show, attacker);
-    }
-  }
-
-  async encaisserDommagesValidationGR(rollData, armure, attackerId, show) {
-    if (!game.user.isGM) {
+    const attackerId = attacker?.id;
+    if (ReglesOptionnelles.isUsing('validation-encaissement-gr') && !game.user.isGM) {
       RdDBaseActor.remoteActorCall({
         tokenId: this.token?.id,
         actorId: this.id,
-        method: 'encaisserDommagesValidationGR',
-        args: [rollData, armure, attackerId, show]
+        method: 'encaisserDommages',
+        args: [rollData, show, attackerId]
       });
-    } else {
-      const attacker = game.actors.get(attackerId);
+      return;
+    }
+
+    const armure = await this.computeArmure(rollData);
+    if (ReglesOptionnelles.isUsing('validation-encaissement-gr')) {
       DialogValidationEncaissement.validerEncaissement(this, rollData, armure,
         jet => this.$onEncaissement(jet, show, attacker));
     }
+    else {
+      const jet = await RdDUtility.jetEncaissement(rollData, armure, { showDice: SHOW_DICE });
+      await this.$onEncaissement(jet, show, attacker);
+    }
   }
 
   async $onEncaissement(jet, show, attacker) {
@@ -458,7 +455,7 @@ export class RdDBaseActorReve extends RdDBaseActor {
   async onAppliquerJetEncaissement(encaissement, attacker) { }
 
   async $afficherEncaissement(encaissement, show) {
-    foundry.utils.mergeObject(encaissement, {
+    mergeObject(encaissement, {
       alias: this.name,
       hasPlayerOwner: this.hasPlayerOwner,
       show: show ?? {}
@@ -470,7 +467,7 @@ export class RdDBaseActorReve extends RdDBaseActor {
     });
 
     if (!encaissement.hasPlayerOwner && encaissement.endurance != 0) {
-      encaissement = foundry.utils.duplicate(encaissement);
+      encaissement = duplicate(encaissement);
       encaissement.isGM = true;
       ChatMessage.create({
         whisper: ChatMessage.getWhisperRecipients("GM"),

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

@@ -21,11 +21,6 @@ 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

@@ -89,12 +89,12 @@ export class RdDBaseActorSang extends RdDBaseActorReve {
   /* -------------------------------------------- */
 
   async onAppliquerJetEncaissement(encaissement, attacker) {
-    const santeOrig = foundry.utils.duplicate(this.system.sante);
+    const santeOrig = 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());
 
-    foundry.utils.mergeObject(encaissement, {
+    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 = foundry.utils.duplicate(this.system.sante)
+    const sante = 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
-        foundry.utils.mergeObject(result, await this.jetEndurance(result.newValue));
+        mergeObject(result, await this.jetEndurance(result.newValue));
       } else if (inc > 0) {
         await this.setSonne(false);
       }
@@ -269,8 +269,6 @@ 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

@@ -15,12 +15,12 @@ export class RdDBaseActorSheet extends ActorSheet {
 
   /** @override */
   static get defaultOptions() {
-    return foundry.utils.mergeObject(ActorSheet.defaultOptions, {
+    return 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,9 +37,7 @@ 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),
-      effects: this.actor.effects,
-      config: game.system.rdd.config
+      options: RdDSheetUtility.mergeDocumentRights(this.options, this.actor, this.isEditable)
     }
 
     RdDBaseActorSheet.filterItemsPerTypeForSheet(formData, this.actor.itemTypes);
@@ -314,7 +312,7 @@ export class RdDBaseActorSheet extends ActorSheet {
   async _onSplitItem(item, split) {
     if (split >= 1 && split < item.system.quantite) {
       await item.diminuerQuantite(split);
-      const splitItem = foundry.utils.duplicate(item);
+      const splitItem = duplicate(item);
       splitItem.system.quantite = split;
       await this.actor.createEmbeddedDocuments('Item', [splitItem])
     }

module/actor/base-actor.js

@@ -1,4 +1,3 @@
-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";
@@ -9,16 +8,19 @@ 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 {
+  /* -------------------------------------------- */
+  static _findCaracByName(carac, name) {
+    name = Grammar.toLowerCaseNoAccent(name);
+    switch (name) {
+      case 'reve-actuel': case 'reve actuel':
+        return carac.reve;
+      case 'chance-actuelle': case 'chance actuelle':
+        return carac.chance;
+    }
 
-  static _findCaracNode(carac, name) {
-    return Object.entries(carac)
-      .filter(it => Grammar.equalsInsensitive(it[1].label, name))
-      .map(it => it[0])
-      .find(it => it)
-  }
-  static $findCaracByName(carac, name) {
     const caracList = Object.entries(carac);
     let entry = Misc.findFirstLike(name, caracList, { mapper: it => it[0], description: 'caractéristique' });
     if (!entry || entry.length == 0) {
@@ -42,6 +44,13 @@ export class RdDBaseActor extends Actor {
     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;
     }
   }
 
@@ -78,8 +87,6 @@ export class RdDBaseActor extends Actor {
     return game.actors.get(actorId)
   }
 
-  isPersonnageJoueur() { return false }
-
   static extractActorMin = (actor) => { return { id: actor?.id, type: actor?.type, name: actor?.name, img: actor?.img }; };
 
   static getParentActor(document) {
@@ -116,7 +123,7 @@ export class RdDBaseActor extends Actor {
 
   constructor(docData, context = {}) {
     if (!context.rdd?.ready) {
-      foundry.utils.mergeObject(context, { rdd: { ready: true } });
+      mergeObject(context, { rdd: { ready: true } });
       const ActorConstructor = game.system.rdd.actorClasses[docData.type];
       if (ActorConstructor) {
         if (!docData.img) {
@@ -128,21 +135,6 @@ export class RdDBaseActor extends Actor {
     super(docData, context);
   }
 
-  findCaracByName(name) {
-    name = Grammar.toLowerCaseNoAccent(name)
-    switch (name) {
-      case 'reve-actuel': case 'reve actuel':
-        return this.system.carac.reve
-      case 'chance-actuelle': case 'chance actuelle':
-        return this.system.carac.chance
-      case 'vie':
-        return this.system.sante.vie
-    }
-
-    const carac = this.system.carac;
-    return RdDBaseActor.$findCaracByName(carac, name);
-  }
-
   getCaracByName(name) {
     switch (Grammar.toLowerCaseNoAccent(name)) {
       case 'reve-actuel': case 'reve actuel':
@@ -150,7 +142,7 @@ export class RdDBaseActor extends Actor {
       case 'chance-actuelle': case 'chance-actuelle':
         return this.getCaracChanceActuelle();
     }
-    return this.findCaracByName(name);
+    return RdDBaseActor._findCaracByName(this.system.carac, name);
   }
 
   /* -------------------------------------------- */
@@ -195,7 +187,7 @@ export class RdDBaseActor extends Actor {
   }
 
   listeSuivants(filter = suivant => true) { return [] }
-  listeSuivants(filter = suivant => true) { return [] }
+  listeSuivants(filter = suivant =>true) { return [] }
   listItems(type = undefined) { return (type ? this.itemTypes[type] : this.items); }
   filterItems(filter, type = undefined) { return (type ? this.itemTypes[type] : this.items)?.filter(filter) ?? []; }
   findItemLike(idOrName, type) {
@@ -361,13 +353,16 @@ 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 vendeur?.vendre(itemVendu, quantite, cout);
-    await acheteur?.acheter(itemVendu, quantite, cout, achat)
-
+    await this.decrementerVente(vendeur, itemVendu, quantite, cout);
+    if (acheteur) {
+      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 = foundry.utils.duplicate(achat.vente);
+    const chatAchatItem = duplicate(achat.vente);
     chatAchatItem.quantiteTotal = quantite;
     ChatMessage.create({
       user: achat.userId,
@@ -377,26 +372,24 @@ export class RdDBaseActor extends Actor {
     });
 
     if (!achat.vente.quantiteIllimite) {
-      if (achat.vente.nbLots <= achat.choix.nombreLots) {
+      if (achat.vente.quantiteNbLots <= achat.choix.nombreLots) {
         ChatUtility.removeChatMessageId(achat.chatMessageIdVente);
       }
       else if (achat.chatMessageIdVente) {
-        await ChatVente.diminuerQuantite(achat.chatMessageIdVente, achat.choix.nombreLots)
+        achat.vente.properties = itemVendu.getProprietes();
+        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 vendre(item, quantite, cout) {
-    await this.ajouterSols(cout);
-    await this.decrementerQuantiteItem(item, 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);
+  async decrementerVente(vendeur, itemVendu, quantite, cout) {
+    if (vendeur) {
+      await vendeur.ajouterSols(cout);
+      await vendeur.decrementerQuantiteItem(itemVendu, quantite);
     }
   }
 
@@ -409,28 +402,31 @@ export class RdDBaseActor extends Actor {
     return disponible == undefined || disponible >= quantiteDemande;
   }
 
-  async consommerNourritureboisson(itemId, choix, userId) { }
+  async consommerNourritureAchetee(achat, vente, createdItemId) {
+    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: itemId, 'system.quantite': 0 }]);
+        await this.updateEmbeddedDocuments("Item", [{ _id: item.id, '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 }]);
     }
   }
@@ -442,7 +438,7 @@ export class RdDBaseActor extends Actor {
         type: item.type,
         img: item.img,
         name: item.name,
-        system: foundry.utils.mergeObject(item.system, { quantite: isItemEmpilable ? quantite : undefined }, { inplace: false })
+        system: mergeObject(item.system, { quantite: isItemEmpilable ? quantite : undefined })
       };
       const newItems = isItemEmpilable ? [baseItem] : Array.from({ length: quantite }, (_, i) => baseItem);
       const items = await this.createEmbeddedDocuments("Item", newItems);
@@ -638,7 +634,7 @@ export class RdDBaseActor extends Actor {
     sourceActor.buildSubConteneurObjetList(itemId, itemsList); // Get itemId list
 
     const itemsDataToCreate = itemsList.map(it => sourceActor.getItem(it.id))
-      .map(it => foundry.utils.duplicate(it))
+      .map(it => duplicate(it))
       .map(it => { it.system.contenu = []; return it; });
     let newItems = await this.createEmbeddedDocuments('Item', itemsDataToCreate);
 

module/actor/commerce-sheet.js

@@ -1,4 +1,4 @@
-import { DialogItemAchat } from "../achat-vente/dialog-item-achat.js";
+import { DialogItemAchat } from "../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 foundry.utils.mergeObject(super.defaultOptions, {
+    return 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) {
-      foundry.utils.mergeObject(formData,
+      mergeObject(formData,
         {
           title: this.actor.token.name,
           token: {

module/actor/commerce.js

@@ -25,7 +25,8 @@ 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 foundry.utils.mergeObject(RdDBaseActorSangSheet.defaultOptions, {
+    return mergeObject(RdDBaseActorSangSheet.defaultOptions, {
       template: "systems/foundryvtt-reve-de-dragon/templates/actor-creature-sheet.html",
       width: 640, height: 720
-    }, { inplace: false })
+    });
   }
 
   /* -------------------------------------------- */

module/actor/creature.js

@@ -33,6 +33,10 @@ export class RdDCreature extends RdDBaseActorSang {
     }
   }
 
+  isEffectAllowed(statusId) {
+    return [STATUSES.StatusComma].includes(statusId);
+  }
+
   isEntiteAccordee(attacker) {
     if (this.isEntite([ENTITE_INCARNE])) {
       let resonnance = this.system.sante.resonnance
@@ -44,7 +48,7 @@ export class RdDCreature extends RdDBaseActorSang {
   /* -------------------------------------------- */
   async setEntiteReveAccordee(attacker) {
     if (this.isEntite([ENTITE_INCARNE])) {
-      let resonnance = foundry.utils.duplicate(this.system.sante.resonnance);
+      let resonnance = duplicate(this.system.sante.resonnance);
       if (resonnance.actors.find(it => it == attacker.id)) {
         // déjà accordé
         return;

module/actor/entite-sheet.js

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

module/actor/entite.js

@@ -70,13 +70,13 @@ export class RdDEntite extends RdDBaseActorReve {
     await RdDEncaisser.encaisser(this) 
   }
 
-  isEffectAllowed(effectId) {
-    return [STATUSES.StatusComma].includes(effectId);
+  isEffectAllowed(statusId) {
+    return [STATUSES.StatusComma].includes(statusId);
   }
 
   async onAppliquerJetEncaissement(encaissement, attacker) {
     const perteEndurance = await this.santeIncDec("endurance", -encaissement.endurance);
-    foundry.utils.mergeObject(encaissement, {
+    mergeObject(encaissement, {
       resteEndurance: perteEndurance.newValue,
       endurance: perteEndurance.perte
     });
@@ -93,7 +93,7 @@ export class RdDEntite extends RdDBaseActorReve {
   /* -------------------------------------------- */
   async setEntiteReveAccordee(attacker) {
     if (this.isEntite([ENTITE_INCARNE])) {
-      let resonnance = foundry.utils.duplicate(this.system.sante.resonnance);
+      let resonnance = duplicate(this.system.sante.resonnance);
       if (resonnance.actors.find(it => it == attacker.id)) {
         // déjà accordé
         return;

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.isPersonnageJoueur()) {
+    if (!actor.hasPlayerOwner || !actor.isPersonnage()) {
       return
     }
     if (from == to) {

module/actor/vehicule-sheet.js

@@ -6,16 +6,16 @@ export class RdDActorVehiculeSheet extends RdDBaseActorSheet {
 
   /** @override */
   static get defaultOptions() {
-    return foundry.utils.mergeObject(RdDBaseActorSheet.defaultOptions, {
+    return 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();
-    foundry.utils.mergeObject(formData,
+    mergeObject(formData,
       {
         editable: this.isEditable,
         cssClass: this.isEditable ? "editable" : "locked",

module/chat-utility.js

@@ -1,6 +1,5 @@
 import { Misc } from "./misc.js";
 import { SYSTEM_RDD, SYSTEM_SOCKET_ID } from "./constants.js";
-import { RdDTimestamp } from "./time/rdd-timestamp.js";
 
 
 /**
@@ -132,7 +131,7 @@ export class ChatUtility {
 
   /* -------------------------------------------- */
   static blindMessageToGM(chatOptions) {
-    let chatGM = foundry.utils.duplicate(chatOptions);
+    let chatGM = duplicate(chatOptions);
     chatGM.whisper = ChatUtility.getUsers(user => user.isGM);
     chatGM.content = "Message aveugle de " + game.user.name + "<br>" + chatOptions.content;
     console.log("blindMessageToGM", chatGM);
@@ -164,17 +163,4 @@ 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) {
-    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 = foundry.utils.duplicate(actor.system.subacteurs.suivants)
+    const newSuivants = 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())).total
-    infoCoeur.source.jetTendre = (await (new Roll('1d6').evaluate())).total
+    infoCoeur.target.jetTendre = (await (new Roll('1d6').evaluate({ async: true }))).total
+    infoCoeur.source.jetTendre = (await (new Roll('1d6').evaluate({ async: true }))).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,46 +8,3 @@ 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

@@ -1,84 +0,0 @@
-
-export class DialogChoixXpCarac extends Dialog {
-
-  static async choix(actor, xpData, caracs) {
-    caracs = caracs.map(it => foundry.utils.mergeObject({ ajout: 0 }, it))
-    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", {
-        actor,
-        caracDerivee: actor.findCaracByName(xpData.caracName),
-        xpData,
-        caracs
-      }),
-    }
-
-    const dialogOptions = {
-      classes: ["rdd-dialog-select"],
-      width: 400,
-      height: 'fit-content',
-      'z-index': 99999
-    }
-    new DialogChoixXpCarac(dialogData, dialogOptions, actor, xpData, caracs).render(true)
-  }
-
-  constructor(dialogData, dialogOptions, actor, xpData, caracs) {
-    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() }
-      }
-    })
-    super(dialogData, dialogOptions)
-    this.actor = actor
-    this.xpData = xpData
-    this.caracs = caracs
-  }
-
-  activateListeners(html) {
-    //TODO
-    super.activateListeners(html)
-    this.html = html
-    this.html.find("li.xpCarac-option .xpCarac-moins").click(event =>
-      this.ajouterXp(event, -1)
-    )
-    this.html.find("li.xpCarac-option .xpCarac-plus").click(event =>
-      this.ajouterXp(event, 1)
-    )
-  }
-
-  async ajouterXp(event, delta) {
-    const liCarac = this.html.find(event.currentTarget)?.parents("li.xpCarac-option")
-    const label = liCarac?.data("carac-label")
-    const carac = this.caracs.find(c => c.label == label)
-    if (carac.ajout + delta < 0) {
-      ui.notifications.warn(`Impossible de diminuer les points à répartir en ${carac.label} en dessous de 0`)
-      return
-    }
-    if (this.xpData.reste - delta < 0) {
-      ui.notifications.warn(`Il ne reste plus de points à répartir en ${carac.label}`)
-      return
-    }
-    carac.ajout += delta
-    this.xpData.reste -= delta
-    liCarac.find("input.xpCarac-view-ajout").val(carac.ajout)
-    this.html.find("input.xpCarac-reste").val(this.xpData.reste)
-  }
-
-  async appliquerSelection() {
-    if (this.xpData.reste > 0) {
-      ui.notifications.warn(`Il vous reste ${this.xpData.reste} points à répartir`)
-      return
-    }
-    this.caracs.filter(c => c.ajout > 0).forEach(c => {
-      const xpData = { caracName: c.label, xpCarac: c.ajout }
-      this.actor._xpCarac(xpData)
-    })
-    await super.close()
-  }
-
-  async close() { }
-
-  _getHeaderButtons() { return [] }
-}

module/dialog-fabriquer-potion.js

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

module/dialog-item-achat.js

@@ -1,13 +1,35 @@
-import { Misc } from "../misc.js";
-import { RdDUtility } from "../rdd-utility.js";
-import { ChatVente } from "./chat-vente.js";
+import { Misc } from "./misc.js";
+import { RdDUtility } from "./rdd-utility.js";
 
 export class DialogItemAchat extends Dialog {
 
   static preparerAchat(chatButton) {
-    return ChatVente.getDetailAchatVente(RdDUtility.findChatMessageId(chatButton))
+    const vendeurId = chatButton.attributes['data-vendeurId']?.value;
+    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,
@@ -16,21 +38,17 @@ export class DialogItemAchat extends Dialog {
       acheteur,
       tailleLot,
       quantiteIllimite,
-      nbLots,
+      quantiteNbLots: 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)
-    const html = await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/dialog-item-achat.html`, venteData)
-    new DialogItemAchat(html, venteData).render(true)
+    DialogItemAchat.changeNombreLots(venteData, 1);
+    const html = await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/dialog-item-achat.html`, venteData);
+    new DialogItemAchat(html, venteData).render(true);
   }
 
   static changeNombreLots(venteData, nombreLots) {
@@ -98,18 +116,18 @@ export class DialogItemAchat extends Dialog {
     this.venteData.choix.seForcer = event.currentTarget.checked;
   }
 
-  setNombreLots(nbLots) {
+  setNombreLots(nombreLots) {
 
     if (!this.venteData.quantiteIllimite) {
-      if (!this.venteData.quantiteIllimite && nbLots > this.venteData.nbLots) {
-        ui.notifications.warn(`Seulement ${this.venteData.nbLots} lots disponibles, vous ne pouvez pas en prendre ${nbLots}`)
+      if (!this.venteData.quantiteIllimite && nombreLots > this.venteData.quantiteNbLots) {
+        ui.notifications.warn(`Seulement ${this.venteData.quantiteNbLots} lots disponibles, vous ne pouvez pas en prendre ${nombreLots}`)
       }
-      nbLots = Math.min(nbLots, this.venteData.nbLots);
+      nombreLots = Math.min(nombreLots, this.venteData.quantiteNbLots);
     }
 
-    DialogItemAchat.changeNombreLots(this.venteData, nbLots);
+    DialogItemAchat.changeNombreLots(this.venteData, nombreLots);
 
-    this.html.find(".nombreLots").val(nbLots);
+    this.html.find(".nombreLots").val(nombreLots);
     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/dialog-item-consommer.js

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

module/dialog-item-vente.js

@@ -1,30 +1,29 @@
-import { HtmlUtility } from "../html-utility.js";
-import { RdDUtility } from "../rdd-utility.js";
-import { ChatVente } from "./chat-vente.js";
+import { HtmlUtility } from "./html-utility.js";
 
 export class DialogItemVente extends Dialog {
 
-  static async display({ item, quantiteMax = undefined }) {
+  static async display({ item, callback, 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,
-      nbLots: quantite,
-      maxLots: quantite,
+      quantiteNbLots: quantite,
+      quantiteMaxLots: quantite,
       quantiteMax: quantite,
-      quantiteIllimite: item.isItemCommerce() ? quantiteMax == undefined : !item.parent,
-      isOwned:  item.parent,
-    }
+      quantiteIllimite: item.isItemCommerce() ? quantiteMax == undefined : !isOwned,
+      isOwned: isOwned,
+    };
     const html = await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/dialog-item-vente.html`, venteData);
-    return new DialogItemVente(venteData, html).render(true);
+    return new DialogItemVente(venteData, html, callback).render(true);
   }
 
-  constructor(venteData, html) {
+  constructor(venteData, html, callback) {
     let options = { classes: ["dialogvente"], width: 400, height: 'fit-content', 'z-index': 99999 };
 
     let conf = {
@@ -35,6 +34,7 @@ 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(".nbLots").change(event => this.setNbLots(Number(event.currentTarget.value)));
+    this.html.find(".quantiteNbLots").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,24 +52,16 @@ export class DialogItemVente extends Dialog {
 
   async onProposer(it) {
     this.updateVente(this.getChoixVente());
-
-    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)
+    this.callback(this.venteData);
   }
 
   updateVente(update) {
-    foundry.utils.mergeObject(this.venteData, update);
+    mergeObject(this.venteData, update);
   }
 
   getChoixVente() {
     return {
-      nbLots: Number(this.html.find(".nbLots").val()),
+      quantiteNbLots: Number(this.html.find(".quantiteNbLots").val()),
       tailleLot: Number(this.html.find(".tailleLot").val()),
       quantiteIllimite: this.html.find(".quantiteIllimite").is(':checked'),
       prixLot: Number(this.html.find(".prixLot").val())
@@ -85,26 +77,26 @@ export class DialogItemVente extends Dialog {
     const maxLots = Math.floor(this.venteData.quantiteMax / tailleLot);
     this.updateVente({
       tailleLot,
-      nbLots: Math.min(maxLots, this.venteData.nbLots),
-      maxLots: maxLots,
+      quantiteNbLots: Math.min(maxLots, this.venteData.quantiteNbLots),
+      quantiteMaxLots: maxLots,
       prixLot: (tailleLot * this.venteData.prixOrigine).toFixed(2)
     });
 
     this.html.find(".prixLot").val(this.venteData.prixLot);
-    this.html.find(".nbLots").val(this.venteData.nbLots);
-    this.html.find(".nbLots").attr("max", this.venteData.maxLots)
+    this.html.find(".quantiteNbLots").val(this.venteData.quantiteNbLots);
+    this.html.find(".quantiteNbLots").attr("max", this.venteData.quantiteMaxLots)
   }
 
   setNbLots(nbLots) {
     this.updateVente({
-      nbLots: this.venteData.isOwned ? Math.max(0, Math.min(nbLots, this.venteData.maxLots)) : nbLots
+      quantiteNbLots: this.venteData.isOwned ? Math.max(0, Math.min(nbLots, this.venteData.quantiteMaxLots)) : nbLots
     })
-    this.html.find(".nbLots").val(this.venteData.nbLots);
+    this.html.find(".quantiteNbLots").val(this.venteData.quantiteNbLots);
   }
 
   setQuantiteIllimite(checked) {
     this.updateVente({ quantiteIllimite: checked })
     this.html.find(".label-quantiteIllimite").text(this.venteData.quantiteIllimite ? "Illimités" : "disponibles");
-    HtmlUtility.showControlWhen(this.html.find(".nbLots"), !this.venteData.quantiteIllimite)
+    HtmlUtility.showControlWhen(this.html.find(".quantiteNbLots"), !this.venteData.quantiteIllimite)
   }
 }

module/item-arme.js

@@ -139,7 +139,7 @@ export class RdDItemArme extends Item {
       const uneOuDeuxMains = armeData.system.unemain && armeData.system.deuxmains;
       const containsSlash = !Number.isInteger(armeData.system.dommages) && armeData.system.dommages.includes("/");
       if (containsSlash) { // Sanity check
-        armeData = foundry.utils.duplicate(armeData);
+        armeData = duplicate(armeData);
 
         const tableauDegats = armeData.system.dommages.split("/");
         if (aUneMain)

module/item-competence.js

@@ -199,7 +199,7 @@ export class RdDItemCompetence extends Item {
     if (idOrName == undefined || idOrName == "") {
       return RdDItemCompetence.sansCompetence();
     }
-    options = foundry.utils.mergeObject(options, { preFilter: it => it.isCompetence(), description: 'compétence' }, { overwrite: false, inplace: false });
+    options = mergeObject(options, { preFilter: it => it.isCompetence(), description: 'compétence' }, { overwrite: false });
     return RdDItemCompetence.findFirstItem(list, idOrName, options);
   }
 
@@ -257,7 +257,7 @@ export class RdDItemCompetence extends Item {
 
   /* -------------------------------------------- */
   static computeResumeArchetype(competences) {
-    const computed = foundry.utils.duplicate(limitesArchetypes);
+    const computed = 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

@@ -33,7 +33,8 @@ 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();
-      return foundry.utils.mergeObject(arme, {
+      mergeObject(arme,
+        {
           action: item.isCompetencePossession() ? 'possession' : 'attaque',
           system: {
             competence: arme.name,
@@ -47,7 +48,8 @@ export class RdDItemCompetenceCreature extends Item {
             force: 0,
             rapide: true,
           }
-        }, { inplace: false });
+        });
+      return arme;
     }
     return undefined;
   }

module/item-monnaie.js

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

module/item-sheet.js

@@ -39,12 +39,12 @@ export class RdDItemSheet extends ItemSheet {
 
   /** @override */
   static get defaultOptions() {
-    return foundry.utils.mergeObject(super.defaultOptions, {
+    return mergeObject(super.defaultOptions, {
       classes: [SYSTEM_RDD, "sheet", "item"],
       template: RdDItemSheet.defaultTemplate(RdDItemSheet.ITEM_TYPE),
       width: 550,
       height: 550
-    }, { inplace: false });
+    });
   }
 
   /* -------------------------------------------- */
@@ -108,8 +108,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 = foundry.utils.duplicate(game.system.model.Actor.personnage.carac)
-      formData.caracList["reve-actuel"] = foundry.utils.duplicate(game.system.model.Actor.personnage.reve.reve)
+      formData.caracList = duplicate(game.system.model.Actor.personnage.carac)
+      formData.caracList["reve-actuel"] = duplicate(game.system.model.Actor.personnage.reve.reve)
       formData.competences = competences;
     }
     if (this.item.type == 'arme') {
@@ -228,7 +228,7 @@ export class RdDItemSheet extends ItemSheet {
       });
     }
 
-    const updateItemTimestamp = (path, timestamp) => this.item.update({ [path]: foundry.utils.duplicate(timestamp) })
+    const updateItemTimestamp = (path, timestamp) => this.item.update({ [path]: duplicate(timestamp) })
 
     RdDTimestamp.handleTimestampEditor(this.html, 'system.temporel.debut', updateItemTimestamp);
     RdDTimestamp.handleTimestampEditor(this.html, 'system.temporel.fin', updateItemTimestamp);

module/item.js

@@ -1,4 +1,4 @@
-import { DialogItemVente } from "./achat-vente/dialog-item-vente.js";
+import { DialogItemVente } from "./dialog-item-vente.js";
 import { Grammar } from "./grammar.js";
 import { Misc } from "./misc.js";
 import { RdDHerbes } from "./rdd-herbes.js";
@@ -177,7 +177,7 @@ export class RdDItem extends Item {
 
   constructor(docData, context = {}) {
     if (!context.rdd?.ready) {
-      foundry.utils.mergeObject(context, { rdd: { ready: true } });
+      mergeObject(context, { rdd: { ready: true } });
       const ItemConstructor = game.system.rdd.itemClasses[docData.type];
       if (ItemConstructor) {
         if (!docData.img) {
@@ -233,7 +233,7 @@ 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" }
@@ -317,8 +317,8 @@ export class RdDItem extends Item {
       const timestampFin = await this.calculerFinPeriodeTemporel(timestampDebut);
       await actor.updateEmbeddedDocuments('Item', [{
         _id: this.id,
-        'system.temporel.debut': foundry.utils.duplicate(timestampDebut),
-        'system.temporel.fin': foundry.utils.duplicate(timestampFin),
+        'system.temporel.debut': duplicate(timestampDebut),
+        'system.temporel.fin': duplicate(timestampFin),
       }])
     }
   }
@@ -538,7 +538,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': Math.max(0, Misc.keepDecimals(this.system.cout / sust, 2)),
+          'system.cout': Misc.keepDecimals(this.system.cout / sust, 2),
           'system.sust': 1
         }])
       }
@@ -621,7 +621,23 @@ export class RdDItem extends Item {
       ui.notifications.warn(`Votre ${this.name} n'est pas vide, pas possible de le proposer`);
       return;
     }
-    await DialogItemVente.display({ item: this, quantiteMax })
+    await DialogItemVente.display({
+      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,7 +1,6 @@
 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",
@@ -15,10 +14,10 @@ const TACHES_SOIN_BLESSURE = {
 }
 
 const definitionsBlessures = [
-  { 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, endurance: "1d6", vie: 0, label: 'Légère', max: 5, 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, endurance: "-100", vie: -4, label: 'Critique', max: 1, icon: "systems/foundryvtt-reve-de-dragon/icons/sante/blessure.webp" },
+  { type: "contusion", gravite: 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: "grave", gravite: 4, 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: "mort", gravite: 8, label: 'Mort', max: 1, icon: "systems/foundryvtt-reve-de-dragon/icons/sante/mort.webp" }
 ]
 
@@ -39,34 +38,8 @@ export class RdDItemBlessure extends RdDItem {
       ui.notifications.warn(`Pas de tâche de soins pour une blessure ${gravite}`)
       return undefined;
     }
-    return foundry.utils.mergeObject(BASE_TACHE_SOIN_BLESSURE, tache, { inplace: false })
+    return mergeObject(duplicate(BASE_TACHE_SOIN_BLESSURE), tache)
   }
-
-  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 = {
@@ -106,12 +79,12 @@ export class RdDItemBlessure extends RdDItem {
   }
 
   async setSoinsBlessure(systemUpdate = {}) {
-    systemUpdate = foundry.utils.mergeObject(systemUpdate, this.system, { overwrite: false })
-    systemUpdate.soinscomplets.done = systemUpdate.premierssoins.done && systemUpdate.soinscomplets.done
+    systemUpdate = mergeObject(systemUpdate, this.system, { overwrite: false }),
+      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 }) {
@@ -134,14 +107,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);
-        foundry.utils.mergeObject(update, {
+        mergeObject(update, {
           system: { fin: { indexDate: timestamp.addJours(gravite).indexDate } }
         });
       }
       else {
         if (!isMaladeEmpoisonne && rolled.isSuccess && this.peutRetrograder(graviteMoindre, moindres)) {
           message.content += ` -- une blessure ${label} cicatrise`;
-          foundry.utils.mergeObject(update, {
+          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': foundry.utils.duplicate(timestampFin),
+        'system.temporel.fin': 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 foundry.utils.mergeObject(RdDItemSheet.defaultOptions, {
+    return mergeObject(RdDItemSheet.defaultOptions, {
       tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "informations" }]
-    }, { inplace: false })
+    });
   }
 
   setPosition(options = {}) {
@@ -23,10 +23,9 @@ export class RdDItemInventaireSheet extends RdDItemSheet {
 
   async getData() {
     const formData = await super.getData();
-    foundry.utils.mergeObject(formData, {
+    return 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 foundry.utils.mergeObject(super.defaultOptions, {
+    return 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();
-    foundry.utils.mergeObject(formData, {
+    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

@@ -5,7 +5,6 @@ import { Monnaie } from "./item-monnaie.js";
 import { RdDItem, 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"; }
@@ -71,17 +70,17 @@ class _10_0_16_MigrationSortsReserve extends Migration {
   get version() { return "10.0.16"; }
 
   async migrate() {
-    const actors = game.actors.filter((actor) => actor.type == "personnage" && (actor.system.reve?.reserve?.list?.length ?? 0 > 0))
-    Promise.all(actors.map(async it => await this.convertirSortsReserveActeur(it)))
-  }
-
-  async convertirSortsReserveActeur(actor) {
-    const sortsReserve = actor.system.reve.reserve.list.map(this.conversionSortReserve);
-    console.log(`${LOG_HEAD} Migration des sorts en réserve de ${actor.name}`, sortsReserve);
-    await actor.createEmbeddedDocuments("Item", sortsReserve, {
-      renderSheet: false,
-    });
-    await actor.update({ 'system.reve.reserve': undefined });
+    await game.actors
+      .filter((actor) => actor.type == "personnage")
+      .filter((actor) => actor.system.reve?.reserve?.list?.length ?? 0 > 0)
+      .forEach(async (actor) => {
+        const sortsReserve = actor.system.reve.reserve.list.map(this.conversionSortReserve);
+        console.log(`${LOG_HEAD} Migration des sorts en réserve de ${actor.name}`, sortsReserve);
+        await actor.createEmbeddedDocuments("Item", sortsReserve, {
+          renderSheet: false,
+        });
+        await actor.update({ 'system.reve.reserve': undefined })
+      });
   }
 
   conversionSortReserve(it) {
@@ -190,7 +189,7 @@ class _10_2_5_ArmesTirLancer extends Migration {
   get version() { return "10.2.5"; }
 
   migrateArmeTirLancer(it) {
-    let updates = foundry.utils.mergeObject({ _id: it.id }, this.getMapping(it).updates);
+    let updates = mergeObject({ _id: it.id }, this.getMapping(it).updates);
     console.log(it.name, updates);
     return updates;
   }
@@ -365,7 +364,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: foundry.utils.mergeObject({ cout: serviceRefItem.system.cout, quantite: serviceRefItem.system.quantite }, item.system, { overwrite: false })
+      system: mergeObject({ cout: serviceRefItem.system.cout, quantite: serviceRefItem.system.quantite }, item.system, { overwrite: false })
     };
     return itemToCreate;
   }
@@ -508,28 +507,13 @@ class _10_7_19_PossessionsEntiteVictime extends Migration {
   }
 
   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 [
@@ -548,7 +532,6 @@ export class Migrations {
       new _10_7_0_MigrationBlessures(),
       new _10_7_19_CategorieCompetenceCreature(),
       new _10_7_19_PossessionsEntiteVictime(),
-      new _11_2_20_MigrationAstrologie(),
     ];
   }
 
@@ -563,10 +546,7 @@ export class Migrations {
   }
 
   migrate() {
-    let currentVersion = game.settings.get(SYSTEM_RDD, "systemMigrationVersion")
-    if (currentVersion.startsWith("v")) {
-      currentVersion = currentVersion.substring(1)
-    }
+    const currentVersion = game.settings.get(SYSTEM_RDD, "systemMigrationVersion");
     if (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));
@@ -574,7 +554,7 @@ export class Migrations {
         migrations.sort((a, b) => this.compareVersions(a, b));
         migrations.forEach(async (m) => {
           ui.notifications.info(
-            `${LOG_HEAD} Executing migration ${m.code}: version ${currentVersion} is lower than ${m.version}`
+            `Executing migration ${m.code}: version ${currentVersion} is lower than ${m.version}`
           );
           await m.migrate();
         });
@@ -582,7 +562,9 @@ export class Migrations {
           `Migrations done, version will change to ${game.system.version}`
         );
       } else {
-        console.log(`${LOG_HEAD} No migration needeed, version will change to ${game.system.version}`
+        console.log(
+          LOG_HEAD +
+          `No migration needeed, version will change to ${game.system.version}`
         );
       }
 
@@ -592,7 +574,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}.${subType}`)
+    return subType ? game.i18n.localize(`TYPES.${type}.${Misc.upperFirst(subType)}`)
       : '';
   }
 
@@ -200,7 +200,7 @@ export class Misc {
 
   /* -------------------------------------------- */
   static findFirstLike(value, elements, options = {}) {
-    options = foundry.utils.mergeObject({
+    options = mergeObject({
       mapper: it => it.name,
       preFilter: it => true,
       description: 'valeur',
@@ -225,7 +225,7 @@ export class Misc {
   }
 
   static findAllLike(value, elements, options = {}) {
-    options = foundry.utils.mergeObject({
+    options = mergeObject({
       mapper: it => it.name,
       preFilter: it => true,
       description: 'valeur',

module/rdd-bonus.js

@@ -19,6 +19,10 @@ export class RdDBonus {
   }
 
 
+  static isAjustementAstrologique(rollData) {
+    return RdDCarac.isChance(rollData.selectedCarac) ||
+      rollData.selectedSort?.system.isrituel;
+  }
   /* -------------------------------------------- */
   static isDefenseAttaqueFinesse(rollData) {
     if (rollData.isEmpoignade && rollData.rolled?.isPart) {

module/rdd-combat.js

@@ -119,7 +119,7 @@ export class RdDCombatManager extends Combat {
       //console.log("Combatat", c);
       const roll = combatant.getInitiativeRoll(rollFormula);
       if (!roll.total) {
-        await roll.evaluate();
+        roll.evaluate({ async: false });
       }
       const total = Math.max(roll.total, 0.00);
       console.log("Compute init for", rollFormula, roll, total, combatant);
@@ -128,17 +128,21 @@ export class RdDCombatManager extends Combat {
 
       // Send a chat message
       let rollMode = messageOptions.rollMode || game.settings.get("core", "rollMode");
-      let messageData = foundry.utils.mergeObject({
-        speaker: {
-          scene: canvas.scene._id,
-          actor: combatant.actor?._id,
-          token: combatant.token._id,
-          alias: combatant.token.name,
-          sound: CONFIG.sounds.dice,
+      let messageData = mergeObject(
+        {
+          speaker: {
+            scene: canvas.scene._id,
+            actor: combatant.actor?._id,
+            token: combatant.token._id,
+            alias: combatant.token.name,
+            sound: CONFIG.sounds.dice,
+          },
+          flavor: `${combatant.token.name} a fait son jet d'Initiative (${messageOptions.initInfo})
+          <br>
+          `,
         },
-        flavor: `${combatant.token.name} a fait son jet d'Initiative (${messageOptions.initInfo})<br>`,
-      },
-        messageOptions);
+        messageOptions
+      );
       roll.toMessage(messageData, { rollMode, create: true });
 
       RdDCombatManager.processPremierRoundInit();
@@ -214,7 +218,7 @@ export class RdDCombatManager extends Combat {
 
   static $prepareAttaqueArme(infoAttaque) {
     const comp = infoAttaque.competences.find(c => c.name == infoAttaque.competence);
-    const attaque = foundry.utils.duplicate(infoAttaque.arme);
+    const attaque = duplicate(infoAttaque.arme);
     attaque.action = 'attaque';
     attaque.system.competence = infoAttaque.competence;
     attaque.system.dommagesReels = infoAttaque.dommagesReel;
@@ -324,8 +328,8 @@ export class RdDCombatManager extends Combat {
       }
     }
     options = [
-      { name: "Incrémenter initiative", condition: true, icon: '<i class="fa-solid fa-plus"></i>', callback: target => { RdDCombatManager.incDecInit(target.data('combatant-id'), +0.01); } },
-      { name: "Décrémenter initiative", condition: true, icon: '<i class="fa-solid fa-minus"></i>', callback: target => { RdDCombatManager.incDecInit(target.data('combatant-id'), -0.01); } }
+      { name: "Incrémenter initiative", condition: true, icon: '<i class="fas fa-plus"></i>', callback: target => { RdDCombatManager.incDecInit(target.data('combatant-id'), +0.01); } },
+      { name: "Décrémenter initiative", condition: true, icon: '<i class="fas fa-minus"></i>', callback: target => { RdDCombatManager.incDecInit(target.data('combatant-id'), -0.01); } }
     ].concat(options);
   }
   /* -------------------------------------------- */
@@ -881,12 +885,12 @@ export class RdDCombat {
 
     this.removeChatMessageActionsPasseArme(attackerRoll.passeArme);
     if (essaisPrecedents) {
-      foundry.utils.mergeObject(attackerRoll.essais, essaisPrecedents, { overwrite: true });
+      mergeObject(attackerRoll.essais, essaisPrecedents, { overwrite: true });
     }
 
     // # utilisation esquive
     const corpsACorps = this.defender.getCompetenceCorpsACorps({ onMessage: it => console.info(it, this.defender) });
-    const esquives = foundry.utils.duplicate(this.defender.getCompetencesEsquive())
+    const esquives = duplicate(this.defender.getCompetencesEsquive())
     esquives.forEach(e => e.system.nbUsage = e?._id ? this.defender.getItemUse(e._id) : 0);
 
     const paramChatDefense = {
@@ -1278,7 +1282,7 @@ export class RdDCombat {
       attackerRoll.defenderTokenId = defenderTokenId;
 
       await this.computeRecul(defenderRoll);
-      await this.defender.encaisserDommages(attackerRoll, this.attacker, defenderRoll?.show);
+      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, {
@@ -1303,7 +1307,6 @@ 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,7 +16,6 @@ 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)?/;
 
@@ -77,7 +76,6 @@ 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" });
@@ -300,7 +298,7 @@ export class RdDCommands {
   async getRencontreTMR(params) {
     if (params.length == 1 || params.length == 2) {
       return game.system.rdd.rencontresTMR.rollRencontre(params[0], params[1])
-    }    
+    }
     return false;
   }
 
@@ -463,13 +461,14 @@ 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 personnages) {
+        for (let actor of game.actors) {
+          // TODO: ne plus stresser les entités de cauchemar!
           await actor.distribuerStress('stress', stress, motif);
         }
       } else {
-        let actor = Misc.findActor(name, personnages) ?? Misc.findPlayer(name)?.character
+        //console.log(stressValue, nomJoueur);
+        let actor = Misc.findActor(name, game.actors.filter(it => it.hasPlayerOwner)) ?? Misc.findPlayer(name)?.character
         if (actor) {
           await actor.distribuerStress('stress', stress, motif);
         }
@@ -486,13 +485,10 @@ export class RdDCommands {
   }
 
   async tirage() {
-    FenetreRechercheTirage.create()
-  }
-  async voyage() {
-    DialogFatigueVoyage.create()
+    FenetreRechercheTirage.create();
   }
   async sommeil() {
-    DialogChateauDormant.create()
+    DialogChateauDormant.create();
   }
 }
 

module/rdd-confirm.js

@@ -4,23 +4,29 @@ import { ReglesOptionnelles } from "./settings/regles-optionnelles.js";
 export class RdDConfirm {
   /* -------------------------------------------- */
   static confirmer(options, autresActions) {
-    let buttons = {
-      "action": RdDConfirm._createButtonAction(options),
-      "cancel": RdDConfirm._createButtonCancel()
-    };
-    if (options.settingConfirmer) {
-      buttons = foundry.utils.mergeObject(RdDConfirm._createButtonActionSave(options), buttons);
+    options.bypass = options.bypass || !(options.settingConfirmer == undefined || ReglesOptionnelles.isUsing(options.settingConfirmer));
+    if (options.bypass) {
+      options.onAction();
     }
-    if (autresActions) {
-      buttons = foundry.utils.mergeObject(autresActions, buttons, { inplace: false });
+    else {
+      let buttons = {
+        "action": RdDConfirm._createButtonAction(options),
+        "cancel": RdDConfirm._createButtonCancel()
+      };
+      if (options.settingConfirmer) {
+        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);
     }
-    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

@@ -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();
+    await roll.evaluate({ async: true });
     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();
+    await roll.evaluate({ async: true });
     return roll.total;
   }
 

module/rdd-empoignade.js

@@ -98,7 +98,7 @@ export class RdDEmpoignade {
   /* -------------------------------------------- */
   static getEmpoignadeById(actor, id) {
     let emp = actor.itemTypes[TYPES.empoignade].find(it => it.system.empoignadeid == id)
-    return emp && foundry.utils.duplicate(emp) || undefined;
+    return emp && duplicate(emp) || undefined;
   }
 
   /* -------------------------------------------- */
@@ -108,7 +108,7 @@ export class RdDEmpoignade {
       (it.system.empoigneurid == defender.id && it.system.empoigneid == attacker.id)
     )
     if (emp) {
-      return foundry.utils.duplicate(emp);
+      return duplicate(emp);
     }
     return undefined;
   }
@@ -267,7 +267,7 @@ export class RdDEmpoignade {
       return
     }
 
-    empoignade = foundry.utils.duplicate(empoignade)
+    empoignade = duplicate(empoignade)
     let defenderRoll = {
       mode, attacker, defender, empoignade, attackerRoll,
       diffLibre: attackerRoll.diffLibre,

module/rdd-main.js

@@ -1,4 +1,4 @@
-import { SYSTEM_RDD, SYSTEM_SOCKET_ID, RDD_CONFIG } from "./constants.js";
+import { SYSTEM_RDD, SYSTEM_SOCKET_ID } from "./constants.js";
 import { Migrations } from './migrations.js';
 
 import { RdDUtility } from "./rdd-utility.js";
@@ -108,8 +108,7 @@ export class SystemReveDeDragon {
   /* -------------------------------------------- */
   async onInit() {
     game.system.rdd = this;
-    game.system.rdd.config = RDD_CONFIG; 
-    this.AppAstrologie = AppAstrologie;    
+    this.AppAstrologie = AppAstrologie;
 
 
     console.log(`Initializing Reve de Dragon System`);
@@ -267,16 +266,16 @@ export class SystemReveDeDragon {
     /* -------------------------------------------- */
     /*  Foundry VTT Initialization                  */
     /* -------------------------------------------- */
+    // CSS patch for v9
+    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();
       this.messageDeBienvenue();
-      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.")
-      )    
+      this.registerUsageCount(SYSTEM_RDD);
     }
 
     StatusEffects.onReady();
@@ -307,6 +306,30 @@ export class SystemReveDeDragon {
       ` });
     }
   }
+
+  /* -------------------------------------------- */
+  // 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();

module/rdd-meteo.js

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

module/rdd-possession.js

@@ -24,7 +24,7 @@ export class RdDPossession {
     if (!poss) {
       poss = defender.items.find(poss => poss.type == TYPES.possession && poss.system.victime.actorid == defender.id);
     }
-    return poss && foundry.utils.duplicate(poss) || undefined;
+    return poss && duplicate(poss) || undefined;
   }
 
   /* -------------------------------------------- */
@@ -52,7 +52,7 @@ export class RdDPossession {
 
   /* -------------------------------------------- */
   static async onConjurerPossession(attacker, possession) {
-    possession = foundry.utils.duplicate(possession);
+    possession = 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 = foundry.utils.duplicate(possession)
+    possession = duplicate(possession)
     // Update for draconic roll
     let rollData = {
       mode: "defense",

module/rdd-resolution-table.js

@@ -114,7 +114,7 @@ export class RdDResolutionTable {
 
   /* -------------------------------------------- */
   static async roll(caracValue, finalLevel, rollData = {}) {
-    let chances = foundry.utils.duplicate(this.computeChances(caracValue, finalLevel));
+    let chances = 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);
-      foundry.utils.mergeObject(chances, this._computeCell(undefined, newScore), { overwrite: true });
+      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;
-      foundry.utils.mergeObject(chances, this._computeCell(undefined, newScore), { overwrite: true });
+      mergeObject(chances, this._computeCell(undefined, newScore), { overwrite: true });
     }
   }
 
   /* -------------------------------------------- */
   static significativeRequise(chances) {
     chances.roll = Math.floor(chances.score / 2);
-    foundry.utils.mergeObject(chances, reussites.find(x => x.code == 'sign'), { overwrite: true });
+    mergeObject(chances, reussites.find(x => x.code == 'sign'), { overwrite: true });
   }
 
   /* -------------------------------------------- */
   static succesRequis(chances) {
     chances.roll = chances.score;
-    foundry.utils.mergeObject(chances, reussites.find(x => x.code == 'norm'), { overwrite: true });
+    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);
-    foundry.utils.mergeObject(chances, this.computeReussite(chances, chances.roll, diviseur), { overwrite: true });
+    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 }
     }
-    foundry.utils.mergeObject(rollData, defRollData, { overwrite: false });
+    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

@@ -44,7 +44,6 @@ export class RdDRoll extends Dialog {
       diffLibre: rollData.competence?.system.default_diffLibre ?? 0,
       perteMoralEchec: false, /* Pour l'affichage dans le chat */
       use: {
-        astrologique: true,
         moral: false, /* Est-ce que le joueur demande d'utiliser le moral ? Utile si le joueur change plusieurs fois de carac associée. */
         libre: true,
         coeur: undefined,
@@ -65,7 +64,7 @@ export class RdDRoll extends Dialog {
       defaultRollData.carac["reve-actuel"] = actor.system.reve.reve
     }
 
-    foundry.utils.mergeObject(rollData, defaultRollData, { recursive: true, overwrite: false });
+    mergeObject(rollData, defaultRollData, { recursive: true, overwrite: false });
     if (rollData.forceCarac) {
       rollData.carac = rollData.forceCarac;
     }
@@ -215,10 +214,6 @@ export class RdDRoll extends Dialog {
       this.rollData[attribute] = event.currentTarget.checked;
       this.updateRollResult(html);
     });
-    this.html.find('input.use-astrologique').change((event) => {
-      this.rollData.use.astrologique = event.currentTarget.checked;
-      this.updateRollResult(html);
-    });
     this.html.find('input.use-encTotal').change((event) => {
       this.rollData.use.encTotal = event.currentTarget.checked;
       this.updateRollResult(html);
@@ -319,7 +314,6 @@ export class RdDRoll extends Dialog {
 
     HtmlUtility.showControlWhen(this.html.find(".use-encTotal"), rollData.ajustements.encTotal.visible && RdDCarac.isAgiliteOuDerobee(rollData.selectedCarac));
     HtmlUtility.showControlWhen(this.html.find(".use-surenc"), rollData.ajustements.surenc.visible && RdDCarac.isActionPhysique(rollData.selectedCarac));
-    HtmlUtility.showControlWhen(this.html.find(".use-astrologique"), rollData.ajustements.astrologique.visible);
     HtmlUtility.showControlWhen(this.html.find(".utilisation-moral"), rollData.use.appelAuMoral);
     HtmlUtility.showControlWhen(this.html.find(".divAppelAuMoral"), rollData.use.appelAuMoral);
     HtmlUtility.showControlWhen(this.html.find(".utilisation-coeur"), rollData.ajustements.coeur.visible);

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
     }
-    foundry.utils.mergeObject(options, newOptions);
+    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 = foundry.utils.duplicate(item);
+      const splitItem = duplicate(item);
       // todo: ajouter dans le même conteneur?
       splitItem.system.quantite = split;
       await actor.createEmbeddedDocuments('Item', [splitItem])

module/rdd-tmr-dialog.js

@@ -17,7 +17,6 @@ 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 { Misc } from "./misc.js";
 
 const TMR_DISPLAY_SIZE = {
   code: 'tmr-display-size',
@@ -44,15 +43,16 @@ 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);
   }
 
   /* -------------------------------------------- */
@@ -70,7 +70,7 @@ export class RdDTMRDialog extends Dialog {
       'z-index': 40
     }
     super(dialogConf, dialogOptions);
-    this.tmrdata = foundry.utils.duplicate(tmrData);
+    this.tmrdata = duplicate(tmrData);
     this.actor = actor;
     this.actor.tmrApp = this; // reference this app in the actor structure
     this.viewOnly = tmrData.mode == "visu"
@@ -141,7 +141,7 @@ export class RdDTMRDialog extends Dialog {
     // Le reste...
     this.updateValuesDisplay();
   }
-
+  
   async onDeplacement() {
     await this.manageRencontre(TMRUtility.getTMR(this._getCoordActor()));
   }
@@ -162,11 +162,9 @@ export class RdDTMRDialog extends Dialog {
   }
 
   async forceTMRDisplay() {
-    if (this.rendered) {
-      this.bringToTop()
-      if (this.subdialog?.bringToTop) {
-        this.subdialog.bringToTop();
-      }
+    this.bringToTop()
+    if (this.subdialog?.bringToTop) {
+      this.subdialog.bringToTop();
     }
   }
 
@@ -212,7 +210,7 @@ export class RdDTMRDialog extends Dialog {
 
   /* -------------------------------------------- */
   loadRencontres() {
-    this.rencontresExistantes = this.actor.getRencontresTMR();
+    this.rencontresExistantes = this.actor.getTMRRencontres();
   }
 
   /* -------------------------------------------- */
@@ -249,21 +247,26 @@ export class RdDTMRDialog extends Dialog {
 
   /* -------------------------------------------- */
   _getTokensCasesTmr() {
-    return Misc.concat(this.casesSpeciales.map(caseSpeciale =>
-      Draconique.get(caseSpeciale.system.specific)?.token(this.pixiTMR, caseSpeciale, () => caseSpeciale.system.coord)
-    ))
+    return this.casesSpeciales.map(c => this._tokenCaseSpeciale(c)).filter(token => token);
   }
-
   _getTokensRencontres() {
-    return Misc.concat(this.rencontresExistantes.map(rencontre =>
-      EffetsDraconiques.rencontre.tokens(this.pixiTMR, rencontre, () => rencontre.system.coord)
-    ))
+    return this.rencontresExistantes.map(it => this._tokenRencontre(it));
+  }
+  _getTokensSortsReserve() {
+    return this.actor.itemTypes[TYPES.sortreserve].map(it => this._tokenSortEnReserve(it));
   }
 
-  _getTokensSortsReserve() {
-    const sortsReserve = this.actor.itemTypes[TYPES.sortreserve];
-    return Misc.concat(sortsReserve.map(sortReserve =>
-      EffetsDraconiques.sortReserve.tokens(this.pixiTMR, sortReserve, () => sortReserve.system.coord)))
+  /* -------------------------------------------- */
+  _tokenRencontre(rencontre) {
+    return EffetsDraconiques.rencontre.token(this.pixiTMR, rencontre, () => rencontre.system.coord);
+  }
+  _tokenCaseSpeciale(casetmr) {
+    const caseData = casetmr;
+    const draconique = Draconique.get(caseData.system.specific);
+    return draconique?.token(this.pixiTMR, caseData, () => caseData.system.coord);
+  }
+  _tokenSortEnReserve(sortReserve) {
+    return EffetsDraconiques.sortReserve.token(this.pixiTMR, sortReserve, () => sortReserve.system.coord);
   }
 
   _tokenDemiReve() {
@@ -297,12 +300,13 @@ export class RdDTMRDialog extends Dialog {
 
   /* -------------------------------------------- */
   async updateValuesDisplay() {
-    if (this.viewOnly || !this.rendered) {
+    if (!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");
     ptsreve.innerHTML = this.actor.system.reve.reve.value;
 
@@ -338,7 +342,7 @@ export class RdDTMRDialog extends Dialog {
         this._tellToGM(this.actor.name + " a quitté les terres médianes");
       }
       await this.actor.santeIncDec((ReglesOptionnelles.isUsing("appliquer-fatigue") ? "fatigue" : "endurance"),
-        this.cumulFatigue)
+      this.cumulFatigue)
     }
     await super.close();
     this.pixiTMR.close()
@@ -382,7 +386,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.deleteRencontreTMRAtPosition()
+    await this.actor.deleteTMRRencontreAtPosition(); // Remove the stored rencontre if necessary
     this.updateTokens();
     this.updateValuesDisplay();
     this.nettoyerRencontre();
@@ -392,7 +396,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.deleteRencontreTMRAtPosition()
+    await this.actor.deleteTMRRencontreAtPosition(); // Remove the stored rencontre if necessary
     this.updateTokens();
     this.updateValuesDisplay();
     this.nettoyerRencontre();
@@ -407,7 +411,7 @@ export class RdDTMRDialog extends Dialog {
 
   /* -------------------------------------------- */
   $marquerCasesTMR(listCoordTMR) {
-    this.currentRencontre.locList = foundry.utils.duplicate(listCoordTMR); // And track of allowed location
+    this.currentRencontre.locList = duplicate(listCoordTMR); // And track of allowed location
     this.currentRencontre.graphics = listCoordTMR.map(coordTMR => this.pixiTMR.addMarkTMR(coordTMR))
   }
 
@@ -446,7 +450,7 @@ export class RdDTMRDialog extends Dialog {
   async maitriserRencontre() {
     console.log("-> maitriser", this.currentRencontre);
 
-    await this.actor.deleteRencontreTMRAtPosition()
+    await this.actor.deleteTMRRencontreAtPosition();
     this.updateTokens();
 
     let rencontreData = {
@@ -536,7 +540,7 @@ export class RdDTMRDialog extends Dialog {
   /* -------------------------------------------- */
   _rollPresentCite(rencData) {
     let rolled = RdDResolutionTable.computeChances(rencData.reve, 0);
-    foundry.utils.mergeObject(rolled, { caracValue: rencData.reve, finalLevel: 0, roll: rolled.score });
+    mergeObject(rolled, { caracValue: rencData.reve, finalLevel: 0, roll: rolled.score });
     RdDResolutionTable.succesRequis(rolled);
     return rolled;
   }
@@ -577,7 +581,7 @@ export class RdDTMRDialog extends Dialog {
     }
     this.descenteTMR = false;
     this.currentRencontre = undefined;
-    if (await this._presentCite(tmr)) {
+    if (this._presentCite(tmr)) {
       return;
     }
     this.currentRencontre = await this._jetDeRencontre(tmr);
@@ -588,7 +592,7 @@ export class RdDTMRDialog extends Dialog {
       }
       else {
         const dialog = new RdDTMRRencontreDialog(this.actor, this.currentRencontre, tmr);
-        await dialog.render(true);
+        dialog.render(true);
         this.setTMRPendingAction(dialog);
       }
     }
@@ -598,11 +602,11 @@ export class RdDTMRDialog extends Dialog {
   }
 
   /* -------------------------------------------- */
-  async _presentCite(tmr) {
+  _presentCite(tmr) {
     const presentCite = this.casesSpeciales.find(c => EffetsDraconiques.presentCites.isCase(c, tmr.coord));
     if (presentCite) {
       const caseData = presentCite;
-      const dialog = await EffetsDraconiques.presentCites.choisirUnPresent(caseData, present => {
+      const dialog = EffetsDraconiques.presentCites.choisirUnPresent(caseData, present => {
         this._utiliserPresentCite(presentCite, present, tmr)
         this.restoreTMRAfterAction();
       });
@@ -679,7 +683,7 @@ export class RdDTMRDialog extends Dialog {
     if (this.isCaseHumide(tmr)) {
       let rollData = {
         actor: this.actor,
-        competence: foundry.utils.duplicate(this.actor.getBestDraconic()),
+        competence: duplicate(this.actor.getBestDraconic()),
         tmr: tmr,
         canClose: false,
         diffLibre: -7,
@@ -698,6 +702,7 @@ 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;
@@ -712,7 +717,6 @@ export class RdDTMRDialog extends Dialog {
     if (rollData.rolled.isEchec) {
       await this.close();
     }
-    await this.souffleSiEchecTotal(rollData);
   }
 
   /* -------------------------------------------- */
@@ -804,7 +808,7 @@ export class RdDTMRDialog extends Dialog {
   async _conquerir(tmr, options) {
     let rollData = {
       actor: this.actor,
-      competence: foundry.utils.duplicate(this.actor.getBestDraconic()),
+      competence: duplicate(this.actor.getBestDraconic()),
       tmr: tmr,
       canClose: options.canClose ?? false,
       diffLibre: options.difficulte ?? -7,
@@ -1122,9 +1126,6 @@ export class RdDTMRDialog extends Dialog {
 
   /* -------------------------------------------- */
   _trackToken(token) {
-    if (!token) {
-      return
-    }
     if (this.demiReve === token && this.isDemiReveCache()) {
       return;
     }

module/rdd-token-hud.js

@@ -90,6 +90,7 @@ export class RdDTokenHud {
     if (target?.actor) {
       const hudSoins = { blessures: target.actor.blessuresASoigner() ?? [] };
       if (hudSoins.blessures.length > 0) {
+        // soins
         const controlIconTarget = html.find('.control-icon[data-action=combat]');
         await RdDTokenHud._configureSubMenu(controlIconTarget,
           'systems/foundryvtt-reve-de-dragon/templates/hud-actor-soins.hbs',

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 "./achat-vente/dialog-item-achat.js";
+import { DialogItemAchat } from "./dialog-item-achat.js";
 import { ReglesOptionnelles } from "./settings/regles-optionnelles.js";
 import { RdDDice } from "./rdd-dice.js";
 import { RdDItem } from "./item.js";
@@ -18,7 +18,6 @@ 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";
 
 /* -------------------------------------------- */
 // This table starts at 0 -> niveau -10
@@ -32,7 +31,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 = foundry.utils.duplicate(fatigue[i]);
+    const ligneFatigue = duplicate(fatigue[i]);
     const caseIncrementee = cycle[i % 6];
     ligneFatigue[caseIncrementee]++;
     ligneFatigue[caseIncrementee + 6]++;
@@ -46,7 +45,7 @@ function _buildAllSegmentsFatigue(max) {
 function _cumulSegmentsFatigue(matrix) {
   let cumulMatrix = [];
   for (let line of matrix) {
-    let cumul = foundry.utils.duplicate(line);
+    let cumul = duplicate(line);
 
     for (let i = 1; i < 12; i++) {
       cumul[i] += cumul[i - 1];
@@ -64,6 +63,12 @@ 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"];
@@ -99,9 +104,8 @@ export class RdDUtility {
   static afficheContenu = {}
   /* -------------------------------------------- */
   static async init() {
-    Hooks.on("renderChatMessage", async (app, html, msg) => await ChatUtility.onRenderChatMessage(app, html, msg))
-    Hooks.on("createChatMessage", async (chatMessage, options, id) => await ChatUtility.onCreateChatMessage(chatMessage, options, id))
-    Hooks.on('renderChatLog', (log, html, chatLog) => RdDUtility.chatListeners(html))
+    Hooks.on("renderChatMessage", async (app, html, msg) => RdDUtility.onRenderChatMessage(app, html, msg));
+    Hooks.on('renderChatLog', (log, html, chatLog) => RdDUtility.chatListeners(html));
   }
 
   /* -------------------------------------------- */
@@ -204,26 +208,22 @@ 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',
       'systems/foundryvtt-reve-de-dragon/templates/partial-description-overflow.html',
       'systems/foundryvtt-reve-de-dragon/templates/partial-description-sort.html',
       'systems/foundryvtt-reve-de-dragon/templates/partial-roll-ajustements.html',
-      'systems/foundryvtt-reve-de-dragon/templates/partial-roll-astrologique.hbs',
-      'systems/foundryvtt-reve-de-dragon/templates/partial-roll-coeur.hbs',
-      'systems/foundryvtt-reve-de-dragon/templates/partial-roll-competences.html',
       'systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffLibre.html',
       'systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffFixe.html',
       'systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html',
-      'systems/foundryvtt-reve-de-dragon/templates/partial-roll-enctotal.html',
-      'systems/foundryvtt-reve-de-dragon/templates/partial-roll-forcer.html',
-      'systems/foundryvtt-reve-de-dragon/templates/partial-roll-moral.html',
       'systems/foundryvtt-reve-de-dragon/templates/partial-roll-surenc.html',
+      'systems/foundryvtt-reve-de-dragon/templates/partial-roll-enctotal.html',
+      'systems/foundryvtt-reve-de-dragon/templates/partial-roll-moral.html',
+      'systems/foundryvtt-reve-de-dragon/templates/partial-roll-coeur.hbs',
+      'systems/foundryvtt-reve-de-dragon/templates/partial-roll-forcer.html',
+      'systems/foundryvtt-reve-de-dragon/templates/partial-roll-competences.html',
       'systems/foundryvtt-reve-de-dragon/templates/partial-select-carac.html',
       'systems/foundryvtt-reve-de-dragon/templates/partial-item-hautrevant.html',
       'systems/foundryvtt-reve-de-dragon/templates/partial-item-frequence.html',
@@ -287,7 +287,6 @@ 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,14 +299,6 @@ 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);
   }
 
@@ -560,54 +551,49 @@ export class RdDUtility {
 
   /* -------------------------------------------- */
   static async jetEncaissement(rollData, armure, options = { showDice: HIDE_DICE }) {
-    const diff = Math.abs(rollData.diffLibre);
-    let formula = RdDUtility.formuleEncaissement(diff, options)
-    const roll = await RdDDice.roll(formula, options);
+    let formula = "2d10";
 
-    RdDUtility.remplaceDeMinParDifficulte(roll, diff, options);
+    // Chaque dé fait au minmum la difficulté libre
+    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) {
-    // La difficulté d'ataque s'ajoute aux dégâts
-    const bonusDegatsDiffLibre = ReglesOptionnelles.isUsing('degat-ajout-malus-libre') ? Math.abs(rollData.diffLibre ?? 0) : 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);
+    const jetTotal = roll.total + rollData.dmg.total - armure;
+    let encaissement = RdDUtility._selectEncaissement(jetTotal, rollData.dmg.mortalite);
+    let 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;
@@ -623,28 +609,34 @@ export class RdDUtility {
     for (let encaissement of table) {
       if ((encaissement.minimum === undefined || encaissement.minimum <= degats)
         && (encaissement.maximum === undefined || degats <= encaissement.maximum)) {
-        return foundry.utils.duplicate(encaissement);
+        return duplicate(encaissement);
       }
     }
-    return foundry.utils.duplicate(table[0]);
+    return duplicate(table[0]);
   }
 
   /* -------------------------------------------- */
   static async _evaluatePerte(formula, over20) {
     let perte = new Roll(formula, { over20: over20 });
-    await perte.evaluate();
+    await perte.evaluate({ async: true });
     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) {
@@ -900,4 +892,10 @@ export class RdDUtility {
     }
   }
 
+  /*-------------------------------------------- */
+  static async onRenderChatMessage(app, html, msg) {
+    // TODO 
+    //console.log(app, html, msg);
+  }
+
 }

module/rolldata-ajustements.js

@@ -74,17 +74,6 @@ export const referenceAjustements = {
     getLabel: (rollData, actor) => 'Sur-encombrement',
     getValue: (rollData, actor) => actor.computeMalusSurEncombrement()
   },
-  rituel: {
-    isUsed: (rollData, actor) => actor.isPersonnage() && ReglesOptionnelles.isUsing("astrologie") && rollData.selectedSort?.system.isrituel,
-    getLabel: (rollData, actor) => 'Astrologique',
-    getValue: (rollData, actor) => actor.ajustementAstrologique()
-  },
-  astrologique: {
-    isVisible: (rollData, actor) => actor.isPersonnage() && ReglesOptionnelles.isUsing("astrologie") && RdDCarac.isChance(rollData.selectedCarac),
-    isUsed: (rollData, actor) =>  RdDCarac.isChance(rollData.selectedCarac) && rollData.use.astrologique,
-    getLabel: (rollData, actor) => 'Astrologique',
-    getValue: (rollData, actor) => actor.ajustementAstrologique()
-  },
   moral: {
     isVisible: (rollData, actor) => actor.isPersonnage() && RdDCarac.isActionPhysique(rollData.selectedCarac) && rollData.use?.moral,
     isUsed: (rollData, actor) => rollData.use.moral,
@@ -95,13 +84,18 @@ export const referenceAjustements = {
     isVisible: (rollData, actor) => actor.isPersonnage() && RdDCarac.isVolonte(rollData.selectedCarac),
     isUsed: (rollData, actor) => rollData.use.coeur != undefined,
     getLabel: (rollData, actor) => 'Ajustement de cœur',
-    getValue: (rollData, actor) => -2 * (rollData.use.coeur?.coeur ?? 0)
+    getValue: (rollData, actor) => -2 * (rollData.use?.coeur?.coeur ?? 0)
   },
   moralTotal: {
     isUsed: (rollData, actor) => RdDCarac.isVolonte(rollData.selectedCarac),
     getLabel: (rollData, actor) => 'Moral',
     getValue: (rollData, actor) => actor.getMoralTotal()
   },
+  astrologique: {
+    isUsed: (rollData, actor) => ReglesOptionnelles.isUsing("astrologie") && RdDBonus.isAjustementAstrologique(rollData),
+    getLabel: (rollData, actor) => 'Astrologique',
+    getValue: (rollData, actor) => actor.ajustementAstrologique()
+  },
   facteurSign: {
     isUsed: (rollData, actor) => rollData.diviseurSignificative > 1,
     getLabel: (rollData, actor) => Misc.getFractionHtml(rollData.diviseurSignificative),
@@ -166,7 +160,7 @@ export class RollDataAjustements {
   /* -------------------------------------------- */
   static calcul(rollData, actor) {
     // s'assurer de la correction des infos rollData
-    foundry.utils.mergeObject(rollData, { ajustements: {}, use: {} }, { overwrite: false })
+    mergeObject(rollData, { ajustements: {}, use: {} }, { overwrite: false })
 
     for (var key in referenceAjustements) {
       const reference = referenceAjustements[key];
@@ -199,5 +193,4 @@ export class RollDataAjustements {
       RdDCarac.isChance(selectedCarac) ||
       (RdDCarac.isReve(selectedCarac) && !rollData.competence);
   }
-
 }

module/settings/regles-optionnelles.js

@@ -26,7 +26,6 @@ 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"},
@@ -71,7 +70,8 @@ export class ReglesOptionnelles extends FormApplication {
   }
 
   static get defaultOptions() {
-    return foundry.utils.mergeObject(super.defaultOptions, {
+    const options = super.defaultOptions;
+    mergeObject(options, {
       id: "regles-optionnelles",
       template: "systems/foundryvtt-reve-de-dragon/templates/settings/regles-optionnelles.html",
       height: 650,
@@ -79,13 +79,14 @@ export class ReglesOptionnelles extends FormApplication {
       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 = foundry.utils.duplicate(it);
+      it = duplicate(it);
       it.id = ReglesOptionnelles._getIdRegle(it.name);
       it.active = ReglesOptionnelles.isSet(it.name);
       return it;

module/settings/status-effects.js

@@ -1,13 +1,13 @@
 import { SYSTEM_RDD } from "../constants.js";
 
 export const STATUSES = {
-  StatusStunned: 'stun',
+  StatusStunned : 'stun',
   StatusBleeding: 'bleeding',
   StatusProne: 'prone',
   StatusGrappling: 'grappling',
   StatusGrappled: 'grappled',
   StatusRestrained: 'restrain',
-  StatusUnconscious: 'unconscious',
+  StatusUnconscious: 'unconscious', 
   StatusBlind: 'blind',
   StatusComma: 'comma',
   StatusDead: 'dead',
@@ -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.webp' },
-  { rdd: true, id: STATUSES.StatusGrappled, tint: '#ff9900', label: 'EFFECT.StatusGrappled', icon: 'systems/foundryvtt-reve-de-dragon/icons/empoignade.webp' },
+  { rdd: true, id: STATUSES.StatusGrappling, tint: '#33cc33', label: 'EFFECT.StatusGrappling', icon: 'systems/foundryvtt-reve-de-dragon/icons/competence_corps_a_corps.webp' },
+  { rdd: true, id: STATUSES.StatusGrappled, tint: '#ff9900', label: 'EFFECT.StatusGrappled', icon: 'systems/foundryvtt-reve-de-dragon/icons/competence_corps_a_corps.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' },
@@ -29,16 +29,13 @@ const rddStatusEffects = [
 ];
 const demiReveStatusEffect = rddStatusEffects.find(it => it.id == STATUSES.StatusDemiReve);
 
-const statusDemiSurprise = new Set([STATUSES.StatusStunned, STATUSES.StatusProne, STATUSES.StatusRestrained])
-const statusSurpriseTotale = new Set([STATUSES.StatusUnconscious, STATUSES.StatusBlind, STATUSES.StatusComma])
+const statusDemiSurprise = [STATUSES.StatusStunned, STATUSES.StatusProne, STATUSES.StatusRestrained];
+const statusSurpriseTotale = [STATUSES.StatusUnconscious, STATUSES.StatusBlind, STATUSES.StatusComma];
 
 export class StatusEffects extends FormApplication {
   static onReady() {
-    const rddEffectIds = rddStatusEffects.map(it => it.id);
-    rddStatusEffects.forEach(it => {
-      it.statuses = new Set()
-      it.statuses.add(it.id)
-    })
+    const rddStatusIds = rddStatusEffects.map(it => it.id);
+    rddStatusEffects.forEach(it => it.flags = { core: { statusId: it.id } });
     const defaultStatusEffectIds = CONFIG.statusEffects.map(it => it.id);
     game.settings.register(SYSTEM_RDD, "use-status-effects", {
       name: "use-status-effects",
@@ -57,47 +54,37 @@ export class StatusEffects extends FormApplication {
       restricted: true
     });
 
-    CONFIG.RDD.allEffects = rddStatusEffects.concat(CONFIG.statusEffects.filter(it => !rddEffectIds.includes(it.id)));
+    CONFIG.RDD.allEffects = rddStatusEffects.concat(CONFIG.statusEffects.filter(it => !rddStatusIds.includes(it.id)));
 
     StatusEffects._setUseStatusEffects(StatusEffects._getUseStatusEffects());
     console.log('statusEffects', CONFIG.statusEffects);
   }
 
   static valeurSurprise(effect, isCombat) {
-    if (statusSurpriseTotale.intersects(effect.statuses)) {
-      return 2
+    // const id = StatusEffects.statusId(effect);
+    if (statusSurpriseTotale.includes(effect.flags?.core?.statusId)) {
+      return 2;
     }
-    if (statusDemiSurprise.intersects(effect.statuses)) {
-      return 1
-    }
-    if (isCombat && effect.statuses.find(e => e == STATUSES.StatusDemiReve)) {
-      return 1
-    }
-    return 0
+    return statusDemiSurprise.includes(effect.flags?.core?.statusId) || (isCombat && effect.flags?.core?.statusId == STATUSES.StatusDemiReve) ? 1 : 0;
   }
 
   static _getUseStatusEffects() {
-    return game.settings.get(SYSTEM_RDD, "use-status-effects")?.split(',') ?? [];
+     return game.settings.get(SYSTEM_RDD, "use-status-effects")?.split(',') ?? [];
   }
 
-  static _setUseStatusEffects(effectIds) {
+  static _setUseStatusEffects(statusIds) {
     if (game.user.isGM) {
-      game.settings.set(SYSTEM_RDD, "use-status-effects", effectIds.join());
+      game.settings.set(SYSTEM_RDD, "use-status-effects", statusIds.join());
     }
 
     for (let effect of CONFIG.RDD.allEffects) {
-      effect.active = effect.rdd || effectIds.includes(effect.id);
+      effect.active = effect.rdd || statusIds.includes(effect.flags?.core?.statusId);
     }
     CONFIG.statusEffects = CONFIG.RDD.allEffects.filter(it => it.active);
   }
 
-  static prepareActiveEffect(effectId) {
-    let status = rddStatusEffects.find(it => it.id == effectId)
-    if (status) {
-      status = foundry.utils.duplicate(status)
-      status.statuses = [effectId]
-    }
-    return status;
+  static status(statusId) {
+    return rddStatusEffects.find(it => it.flags?.core?.statusId == statusId);
   }
 
   static demiReve() {
@@ -110,7 +97,7 @@ export class StatusEffects extends FormApplication {
 
   static get defaultOptions() {
     const options = super.defaultOptions;
-    foundry.utils.mergeObject(options, {
+    mergeObject(options, {
       id: "status-effects",
       template: "systems/foundryvtt-reve-de-dragon/templates/settings/status-effects.html",
       height: 800,
@@ -125,7 +112,7 @@ export class StatusEffects extends FormApplication {
   getData() {
     const used = StatusEffects._getUseStatusEffects();
     let formData = super.getData();
-    formData.effects = foundry.utils.duplicate(CONFIG.RDD.allEffects);
+    formData.effects = duplicate(CONFIG.RDD.allEffects);
     formData.effects.forEach(it => it.active = used.includes(it.id))
     return formData;
   }

module/settings/system-compendiums.js

@@ -27,7 +27,7 @@ export class SystemCompendiums extends FormApplication {
   static init() {
     Object.keys(CONFIGURABLE_COMPENDIUMS).forEach(compendium => {
       const definition = CONFIGURABLE_COMPENDIUMS[compendium];
-      foundry.utils.mergeObject(definition, {
+      mergeObject(definition, {
         compendium: compendium,
         default: SystemCompendiums._getDefaultCompendium(compendium),
         setting: SystemCompendiums._getSettingCompendium(compendium)
@@ -138,7 +138,7 @@ export class SystemCompendiums extends FormApplication {
 
   static get defaultOptions() {
     const options = super.defaultOptions;
-    foundry.utils.mergeObject(options, {
+    mergeObject(options, {
       id: "system-compendiums",
       template: "systems/foundryvtt-reve-de-dragon/templates/settings/system-compendiums.html",
       height: 'fit-content',
@@ -152,7 +152,7 @@ export class SystemCompendiums extends FormApplication {
 
   getData() {
     const systemCompendiums = Object.values(CONFIGURABLE_COMPENDIUMS)
-      .map(it => foundry.utils.mergeObject(it, { value: SystemCompendiums.getCompendium(it.compendium) }, { inplace: false }))
+      .map(it => mergeObject(it, { value: SystemCompendiums.getCompendium(it.compendium) }));
     const availableCompendiums = game.packs.map(pack => {
       return {
         name: pack.collection,
@@ -160,10 +160,10 @@ export class SystemCompendiums extends FormApplication {
         type: pack.metadata.type
       }
     });
-    return foundry.utils.mergeObject(super.getData(), {
+    return mergeObject(super.getData(), {
       systemCompendiums: systemCompendiums,
       availableCompendiums: availableCompendiums
-    }, { inplace: false })
+    });
   }
 
   activateListeners(html) {

module/sommeil/app-astrologie.js

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

module/time/rdd-calendrier-editor.js

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

module/time/rdd-calendrier.js

@@ -35,7 +35,7 @@ export class RdDCalendrier extends Application {
   }
 
   static get defaultOptions() {
-    return foundry.utils.mergeObject(super.defaultOptions, {
+    return mergeObject(super.defaultOptions, {
       title: "Calendrier",
       template: TEMPLATE_CALENDRIER,
       classes: ["calendar"],
@@ -43,7 +43,7 @@ export class RdDCalendrier extends Application {
       resizable: false,
       width: 'fit-content',
       height: 'fit-content',
-    }, { inplace: false })
+    });
   }
 
   constructor() {
@@ -51,6 +51,7 @@ 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));
@@ -107,10 +108,7 @@ export class RdDCalendrier extends Application {
       this.timestamp = RdDTimestamp.getWorldTime();
       this.positionAiguilles()
       this.render(false);
-      Hooks.callAll(APP_ASTROLOGIE_REFRESH)
-    }
-    if (setting.key == SYSTEM_RDD + '.' + "liste-nombre-astral") {
-      Hooks.callAll(APP_ASTROLOGIE_REFRESH)
+      Hooks.callAll(APP_ASTROLOGIE_REFRESH);
     }
   }
 
@@ -122,7 +120,7 @@ export class RdDCalendrier extends Application {
 
   /* -------------------------------------------- */
   fillCalendrierData(formData = {}) {
-    foundry.utils.mergeObject(formData, this.timestamp.toCalendrier());
+    mergeObject(formData, this.timestamp.toCalendrier());
     formData.isGM = game.user.isGM;
     formData.heures = RdDTimestamp.definitions()
     formData.horlogeAnalogique = this.horlogeAnalogique;
@@ -169,11 +167,7 @@ export class RdDCalendrier extends Application {
 
   /* -------------------------------------------- */
   getNombresAstraux() {
-    return game.settings.get(SYSTEM_RDD, "liste-nombre-astral") ?? []
-  }
-
-  async setNombresAstraux(nombresAstraux) {
-    await game.settings.set(SYSTEM_RDD, "liste-nombre-astral", nombresAstraux)
+    return game.settings.get(SYSTEM_RDD, "liste-nombre-astral") ?? [];
   }
 
   /* -------------------------------------------- */
@@ -231,15 +225,20 @@ export class RdDCalendrier extends Application {
     const nombreAstral = await RdDDice.rollTotal("1dh", { showDice: HIDE_DICE, rollMode: "selfroll" });
     return {
       nombreAstral: nombreAstral,
-      lectures: [],
+      valeursFausses: [],
       index: indexDate
     }
   }
 
   /* -------------------------------------------- */
-  async resetNombresAstraux() {
-    await Promise.all(game.actors.filter(it => it.type == "personnage").map(async it => await it.deleteNombresAstraux()))
-    await this.setNombresAstraux([])
+  resetNombresAstraux() {
+    this.nombresAstraux = [];
+    game.settings.set(SYSTEM_RDD, "liste-nombre-astral", []);
+
+    game.socket.emit(SYSTEM_SOCKET_ID, {
+      msg: "msg_reset_nombre_astral",
+      data: {}
+    });
   }
 
   /**
@@ -252,30 +251,39 @@ export class RdDCalendrier extends Application {
     if (indexDate == undefined) {
       indexDate = this.timestamp.indexDate;
     }
-    const nombresAstraux = this.getNombresAstraux()
-    let astralData = nombresAstraux.find(it => it.index == indexDate);
+    this.nombresAstraux = this.getNombresAstraux();
+    let astralData = this.nombresAstraux.find((nombreAstral, i) => nombreAstral.index == indexDate);
     return astralData?.nombreAstral ?? 0;
   }
 
   /* -------------------------------------------- */
   async rebuildNombresAstraux() {
     if (Misc.isUniqueConnectedGM()) {
-      const nombresAstraux = this.getNombresAstraux()
-      let newNombresAstraux = [];
+      let newList = [];
       for (let i = 0; i < MAX_NOMBRE_ASTRAL; i++) {
         let dayIndex = this.timestamp.indexDate + i;
-        let na = nombresAstraux.find(it => it.index == dayIndex);
+        let na = this.nombresAstraux.find(n => n.index == dayIndex);
         if (na) {
-          newNombresAstraux[i] = na;
+          newList[i] = na;
         } else {
-          newNombresAstraux[i] = await this.ajouterNombreAstral(dayIndex);
+          newList[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());
-      await this.setNombresAstraux(newNombresAstraux);
+      this.notifyChangeNombresAstraux();
     }
   }
 
+  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;
@@ -365,22 +373,25 @@ 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: {} })
     }
   }
-  
-  async addNbAstralJoueur(actor, date, nbAstral, isValid) {
-    const nombresAstraux = this.getNombresAstraux()
-    const astralData = nombresAstraux.find(it => it.index == date)
-    if (astralData) {
-      astralData.lectures.push({ actorId: actor.id, nombreAstral: nbAstral });
-      await this.setNombresAstraux(nombresAstraux);
-      await actor.ajouteNombreAstral(date, nbAstral, isValid);
-    }
+
+  addNbAstralIncorect(actorId, date, nbAstral) {
+    const astralData = this.nombresAstraux.find((nombreAstral, i) => nombreAstral.index == date);
+    astralData.valeursFausses.push({ actorId: actorId, nombreAstral: nbAstral });
+    game.settings.set(SYSTEM_RDD, "liste-nombre-astral", this.nombresAstraux);
   }
 
   /* -------------------------------------------- */

module/time/rdd-timestamp.js

@@ -202,7 +202,7 @@ export class RdDTimestamp {
   }
 
   static setWorldTime(timestamp) {
-    game.settings.set(SYSTEM_RDD, WORLD_TIMESTAMP_SETTING, foundry.utils.duplicate(timestamp));
+    game.settings.set(SYSTEM_RDD, WORLD_TIMESTAMP_SETTING, duplicate(timestamp));
   }
 
   /** construit un RdDTimestamp à partir de l'année/mois/jour/heure?/minute? */
@@ -231,7 +231,6 @@ 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) }

module/tirage/fenetre-recherche-tirage.js

@@ -117,7 +117,7 @@ function $loadFilters(parameters) {
 
 export class FenetreRechercheTirage extends Application {
   static get defaultOptions() {
-    return foundry.utils.mergeObject(super.defaultOptions, {
+    return 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: foundry.utils.duplicate(FILTER_GROUPS).filter(it => it.group),
+      filterGroups: duplicate(FILTER_GROUPS).filter(it => it.group),
     }
     const options = {}
     $loadFilters(parameters);
@@ -147,7 +147,7 @@ export class FenetreRechercheTirage extends Application {
   }
 
   async getData() {
-    return foundry.utils.mergeObject(await super.getData(), this.parameters)
+    return 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 => foundry.utils.mergeObject({ selected: game.system.rdd.environnement.compendiums.includes(it.id) }, it))
+        .map(it => 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,8 +39,6 @@ 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

@@ -18,8 +18,8 @@ export class Draconique {
   static isTeteDragon(item) { return item.type == TYPES.tete; }
   static isQueueSouffle(item) { return Draconique.isQueueDragon(item) || Draconique.isSouffleDragon(item); }
 
-  static register(draconique, code = undefined) {
-    registeredEffects[code ?? draconique.code()] = draconique;
+  static register(draconique) {
+    registeredEffects[draconique.code()] = draconique;
     if (draconique.img()) {
       PixiTMR.register(draconique.code(), draconique.img())
     }
@@ -90,15 +90,6 @@ export class Draconique {
   */
   token(pixiTMR, linkData, coordTMR, type = undefined) {
     const tooltip = this.tooltip(linkData);
-    return this._createToken(pixiTMR, linkData, coordTMR, type, tooltip);
-  }
-  
-  tokens(pixiTMR, linkData, coordTMR, type = undefined) {
-    const tooltip = this.tooltip(linkData);
-    return [this._createToken(pixiTMR, linkData, coordTMR, type, tooltip)];
-  }
-
-  _createToken(pixiTMR, linkData, coordTMR, type, tooltip) {
     const token = {
       sprite: this.createSprite(pixiTMR),
       coordTMR: coordTMR,

module/tmr/effets-draconiques.js

@@ -6,7 +6,7 @@ import { ReserveExtensible } from "./reserve-extensible.js";
 import { DemiReve } from "./demi-reve.js";
 import { TrouNoir } from "./trou-noir.js";
 import { Rencontre } from "./rencontre.js";
-import { SortReserve, SortReserveHumide } from "./sort-reserve.js";
+import { SortReserve } from "./sort-reserve.js";
 import { CarteTmr } from "./carte-tmr.js";
 import { PontImpraticable } from "./pont-impraticable.js";
 import { Draconique } from "./draconique.js";
@@ -26,7 +26,6 @@ export class EffetsDraconiques {
   static demiReve = new DemiReve();
   static rencontre = new Rencontre();
   static sortReserve = new SortReserve();
-  static sortReserveHumide = new SortReserveHumide();
   static debordement = new Debordement();
   static presentCites = new PresentCites();
   static fermetureCites = new FermetureCites();
@@ -50,7 +49,6 @@ export class EffetsDraconiques {
     Draconique.register(EffetsDraconiques.demiReve);
     Draconique.register(EffetsDraconiques.rencontre);
     Draconique.register(EffetsDraconiques.sortReserve);
-    Draconique.register(EffetsDraconiques.sortReserveHumide);
     Draconique.register(EffetsDraconiques.debordement);
     Draconique.register(EffetsDraconiques.fermetureCites);
     Draconique.register(EffetsDraconiques.queteEaux);

module/tmr/effets-rencontres.js

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

module/tmr/pixi-tmr.js

@@ -1,3 +1,4 @@
+import { SYSTEM_RDD } from "../constants.js";
 import { Misc } from "../misc.js";
 import { TMRConstants, tmrTokenZIndex } from "../tmr-constants.js";
 import { TMRUtility } from "../tmr-utility.js";
@@ -13,12 +14,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 && !PIXI.utils.TextureCache[img])
-        .map(async img => PIXI.Sprite.from(await PIXI.Assets.load(img))))
+        .filter(img => img != undefined)
+        .map(async img => PIXI.Sprite.from(await PIXI.Assets.load(img)))
+    )
   }
 
   constructor(tmrDialog, displaySize) {
@@ -57,7 +58,7 @@ export class PixiTMR {
     this.sizes = new TMRConstants({ size: displaySize })
     const appSize = PixiTMR.computeTMRSize(this.sizes)
     this.pixiApp.renderer.resize(appSize.width, appSize.height)
-    this.tooltipStyle.fontSize = Math.max(this.sizes.size / 3, 16)
+    this.tooltipStyle.fontSize = Math.max(this.sizes.size / 4, 16)
   }
 
   get view() {
@@ -105,9 +106,8 @@ export class PixiTMR {
 
   sprite(code, options = {}) {
     let img = PixiTMR.getImgFromCode(code)
-    let texture = PIXI.utils.TextureCache[img]
+    const texture = PIXI.utils.TextureCache[img]
     if (!texture) {
-      // TODO: charger la texture
       console.error("Texture manquante", code, PIXI.utils.TextureCache)
       return;
     }
@@ -199,7 +199,7 @@ export class PixiTMR {
   setTooltipPosition(event) {
     const oddq = this.sizes.computeEventOddq(event);
 
-    this.tooltip.x = oddq.x + (oddq.col > 7 ? -2.5 * this.sizes.full : this.sizes.quarter);
+    this.tooltip.x = oddq.x + (oddq.col > 7 ? -3 * this.sizes.full : this.sizes.quarter);
     this.tooltip.y = oddq.y + (oddq.row > 10 ? -this.sizes.size : 0);
   }
 

module/tmr/present-cites.js

@@ -49,7 +49,7 @@ export class PresentCites extends Draconique {
       content: `La ${this.tmrLabel(casetmr)} vous offre un présent, faites votre choix`,
       buttons: buttons
     });
-    await dialog.render(true);
+    dialog.render(true);
     return dialog
   }
 

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.full,
+      taille: () => pixiTMR.sizes.twoThird,
     })
   }
 }

module/tmr/sort-reserve.js

@@ -1,7 +1,5 @@
 import { tmrTokenZIndex } from "../tmr-constants.js";
-import { TMRUtility } from "../tmr-utility.js";
 import { Draconique } from "./draconique.js";
-import { EffetsDraconiques } from "./effets-draconiques.js";
 
 export class SortReserve extends Draconique {
 
@@ -21,19 +19,4 @@ export class SortReserve extends Draconique {
       taille: () => pixiTMR.sizes.third,
     });
   }
-
-  tokens(pixiTMR, linkData, coordTMR, type = undefined) {
-    if (TMRUtility.getTMR(coordTMR()).type == 'fleuve') {
-      const tooltip = this.tooltip(linkData)
-      const fleuves = TMRUtility.getListTMR('fleuve')
-      return fleuves.map(f => EffetsDraconiques.sortReserveHumide._createToken(pixiTMR, linkData, () => f.coord, type?? this.code(), tooltip))
-    }
-    return super.tokens(pixiTMR, linkData, coordTMR, type)
-  }
-}
-
-export class SortReserveHumide extends SortReserve {
-  code() { return 'sortreservehumide' }
-  tooltip(sort) { return `${sort.name} en fleuve, r${sort.system.ptreve}` }
-  img() { return 'systems/foundryvtt-reve-de-dragon/icons/tmr/sort-reserve-humide.svg' }
 }

module/voyage/dialog-fatigue-voyage.js

@@ -1,182 +0,0 @@
-import { TYPES } from "../item.js"
-import { RdDItemCompetence } from "../item-competence.js"
-import { ChatUtility } from "../chat-utility.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.prepareActor(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
-  }
-
-  static prepareActor(actor) {
-    const competencesVoyage = {}
-    CODES_COMPETENCES_VOYAGE.forEach(codeSurvie =>
-      competencesVoyage[codeSurvie] = RdDItemCompetence.findCompetence(actor.itemTypes[TYPES.competence], codeSurvie, { onMessage: () => { } })
-    )
-    return {
-      actor: actor,
-      selected: true,
-      ajustementFatigue: 0,
-      competencesVoyage: competencesVoyage
-    }
-  }
-
-
-  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('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()
-    }
-  }
-
-  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() {
-    this.html.find('input[name="base-fatigue"]').val(this.parameters.nombreHeures * this.parameters.fatigueHoraire)
-  }
-
-  async appliquerFatigue() {
-    const fatigueBase = parseInt(this.html.find('input[name="base-fatigue"]').val() ?? 0)
-    const actors = jQuery.map(
-      this.html.find('div.fatigue-actors-list li.list-item'),
-      it => this.$extractActor(this.html.find(it))
-    )
-    actors.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)
-      })
-  }
-
-  $extractActor(actorRow) {
-    const actor = game.actors.get(actorRow.data('actor-id'))
-    if (!actor) {
-      ui.notifications.warn(`Acteur ${it.actorId} introuvable`)
-    }
-    return {
-      actor: actor,
-      ajustement: parseInt(actorRow.find('input[name="ajustement-fatigue"]').val() ?? 0),
-      selected: actor && actorRow.find('input[name="selectionner-acteur"]').is(':checked')
-    }
-  }
-
-  async close() {
-    DialogFatigueVoyage.dialog = undefined
-    await super.close()
-  }
-
-
-}

styles/simple.css

@@ -92,10 +92,7 @@
   --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);
 }
 
 /*@import url("https://fonts.googleapis.com/css2?family=Martel:wght@400;800&family=Roboto:wght@300;400;500&display=swap");*/
@@ -198,10 +195,11 @@ i:is(.fas, .far, .fa-solid, .fa-regular, .fa-sharp ) {
   flex: 0 0 110px;
   height: 110px;
   width: 110px;
-  padding: 0.2rem;
+  margin-right: 0.5rem;
+  object-fit: scale-down;
+  object-position: 50% 0;
+  margin: 0.1rem;
   object-fit: contain;
-  background-color: var(--color-profile-border);
-  border: 1px solid var(--color-profile-border);
 }
 
 .system-foundryvtt-reve-de-dragon .rdd-item-sheet-tarot img.profile-img {
@@ -435,7 +433,6 @@ table {border: 1px solid #7a7971;}
 }
 .flex-shrink {
   flex: 'flex-shrink' ;
-  flex-shrink: 2;
 }
 :is(.flex-grow, .flex-grow-3) {
   flex-grow: 3;
@@ -443,19 +440,7 @@ 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;
@@ -803,10 +788,6 @@ input:is(.blessure-premiers_soins, .blessure-soins_complets) {
 .rdd-roll-dialog div.dialog-content input {
   font-size: 1rem;
 }
-.rdd-roll-dialog div.dialog-content input[type="checkbox"]{
-  width: 1rem;
-  vertical-align: sub;
-}
 .rdd-roll-part {
   align-items: center;
   border-radius: 6px; padding: 3px;
@@ -978,6 +959,12 @@ section.sheet-body {
   padding: 0.25rem 0.5rem;
 }
 
+.sheet header.sheet-header :is(.profile-img, .profile-img-token) {
+  object-fit: scale-down;
+  object-position: 50% 0;
+  margin: 0.5rem 0 0.5rem  0.5rem;
+  padding: 0;
+}
 .sheet header.sheet-header h1 {
   flex: 3;
 }
@@ -1183,7 +1170,7 @@ ul.chat-list li:nth-child(odd) {
   border-radius: 0.25rem;
   padding: 0.1rem;
   flex: 1 1 1.5rem;
-  display: flex;
+  display: flex !important;
   align-items: center !important;
 }
 
@@ -1324,7 +1311,10 @@ div.competence-column div.categorie-competence{
   margin-right: 0.2rem;
   margin-left: 0.2rem;
 }
-.item-label { 
+.blessures-title { 
+  font-weight: bold;
+}
+.alchimie-title { 
   font-weight: bold;
 }
 .pointsreve-value {
@@ -1373,37 +1363,43 @@ table.table-nombres-astraux tr:hover {
   justify-content: flex-start;
   flex-direction: column;
   position: absolute;
-  top: 4.6rem;
-  right: 3.5rem;
+  top: 2.75rem;
+  right: 4rem;
 }
 .token-hud-ext.soins {
+  justify-content: flex-start;
   flex-direction: column;
   position: absolute;
-  top: 14.7rem;
-  left: -6rem;
-  max-width: 8rem;
-  line-height: 1rem;
+  top: 13.2rem;
+  left: -5rem;
+  max-width: 8.5rem
 }
 
 .token-hud-ext.right {
+  justify-content: flex-start;
   flex-direction: column;
   position: absolute;
-  top: 4.6rem;
-  left: 3.5rem;
+  top: 2.75rem;
+  left: 4rem;
 }
-div.control-icon.token-hud-icon {
-  width: 9rem;
+.control-icon.token-hud-icon {
+  width: fit-content;
   height: fit-content;
-  border-radius: 0.3rem;
   min-width: 6rem;
   flex-basis: auto;
   padding: 0;
-  line-height: 0.95rem;
+  line-height: 1rem;
   margin: 0.2rem;
 }
+.control-icon.token-hud-icon.right {
+  margin-left: 8px;
+}
 .rdd-hud-menu label {
   font-size: 0.8rem;
 }
+#token-hud .status-effects.active{
+  z-index: 2;
+}
 /* ======================================== */
 .item-checkbox {
   height: 25px;
@@ -1527,11 +1523,6 @@ 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;
@@ -1950,23 +1941,6 @@ div.calendar-timestamp-edit select.calendar-signe-heure {
   padding: 3px;
 }
 
-aside#tooltip {
-  background: var(--background-tooltip);
-  color: var(--color-text-dark-primary);
-  font-size: 1rem;
-  border-radius: 0.2rem;
-  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,8 +1,8 @@
 {
   "id": "foundryvtt-reve-de-dragon",
   "title": "Rêve de Dragon",
-  "version": "11.2.21",
-  "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-11.2.21.zip",
+  "version": "11.2.8",
+  "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-11.2.8.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": {
@@ -528,10 +528,8 @@
     }
   ],
   "socket": true,
-  "grid": {
-    "distance": 1,
-    "units": "m"
-  },
+  "gridDistance": 1,
+  "gridUnits": "m",
   "primaryTokenAttribute": "sante.vie",
   "secondaryTokenAttribute": "sante.endurance",
   "media": [

template.json

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

templates/actor-sheet.html

@@ -70,13 +70,9 @@
             {{#if options.vueDetaillee}}
                 
               {{#if @root.options.vueArchetype}}
-              <a class="competence-archetype toggle-archetype chat-card-button-pushed" data-tooltip="Retour à la vue détaillée des compétences">
-                <i class="fa-solid fa-up-right-from-square"></i>Incarnation
-              </a>
+              <a class="competence-archetype toggle-archetype chat-card-button-pushed"><i class="fa-solid fa-up-right-from-square"></i>Incarnation</a>
               {{else}}
-              <a class="competence-archetype toggle-archetype chat-card-button" data-tooltip="Gestion de l'archétype et de la réincarnation">
-                <i class="fa-solid fa-people-line"></i>Archétype
-              </a>
+              <a class="competence-archetype toggle-archetype chat-card-button"><i class="fa-solid fa-people-line"></i>Archétype</a>
               {{/if}}
             {{/if}}
           </span>

templates/actor-vehicule-sheet.html

@@ -12,19 +12,19 @@
               <ul>
                 <li data-attribute="resistance" class="flexrow">
                   <span class="carac-label">Résistance</span>
-                  <a class="resistance-moins"><i class="fa-solid fa-square-minus"></i></a>
+                  <a class="resistance-moins"><i class="fas fa-minus-square"></i></a>
                   <input type="text" name="system.etat.resistance.value" value="{{system.etat.resistance.value}}" data-dtype="Number" />
                   /
                   <input type="text" name="system.etat.resistance.max" value="{{system.etat.resistance.max}}" data-dtype="Number" {{#unless @root.options.vueDetaillee}}disabled{{/unless}} />
-                  <a class="resistance-plus"><i class="fa-solid fa-square-plus"></i></a>
+                  <a class="resistance-plus"><i class="fas fa-plus-square"></i></a>
                 </li>
                 <li data-attribute="structure" class="flexrow">
                   <span class="carac-label">Structure</span>
-                  <a class="structure-moins"><i class="fa-solid fa-square-minus"></i></a>
+                  <a class="structure-moins"><i class="fas fa-minus-square"></i></a>
                   <input type="text" name="system.etat.structure.value" value="{{system.etat.structure.value}}" data-dtype="Number" />
                   /
                   <input type="text" name="system.etat.structure.max" value="{{system.etat.structure.max}}" data-dtype="Number" {{#unless @root.options.vueDetaillee}}disabled{{/unless}} />
-                  <a class="structure-plus"><i class="fa-solid fa-square-plus"></i></a>
+                  <a class="structure-plus"><i class="fas fa-plus-square"></i></a>
                 </li>
               </ul>
             </div>

templates/actor/alchimie.html

@@ -3,12 +3,10 @@
 <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">
-      <a class="item-edit" data-tooltip="Modifier"><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>
-  </div>
+    <div class="item-controls flex-shrink">
+      <a class="item-edit" data-tooltip="Edit Item"><i class="fas fa-edit"></i></a>
+      <a class="item-delete" data-tooltip="Delete Item"><i class="fas fa-trash"></i></a>
+    </div>
   </li>
   {{/each}}
 </ul>

templates/actor/archetype.hbs

@@ -2,8 +2,7 @@
   <ul class="item-list">
     {{#if @root.options.isGM}}
     <li>
-    <a class="nouvelle-incarnation chat-card-button" data-tooltip="Création d'une nouvelle incarnation de l'archétype">
-      <i class="fa-solid fa-person-circle-plus"></i> Nouvelle incarnation</a>
+    <a class="nouvelle-incarnation chat-card-button"><i class="fa-solid fa-person-circle-plus"></i> Nouvelle incarnation</a>
     </li>
     {{/if}}
     <li><hr></li>

templates/actor/astrologie.html

@@ -1,7 +1,2 @@
 <h3>Astrologie</h3>
-<span class="astrologie-label chat-card-button">
-  <a name="jet-astrologie">
-    <i class="fa-solid fa-moon-over-sun"></i>
-    Astrologie: Nombres Astraux
-  </a>
-</span>
+<span class="astrologie-label"><a name="jet-astrologie">Astrologie : Nombres Astraux</a></span>

templates/actor/blessure.hbs

@@ -36,7 +36,6 @@
   <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,14 +1,8 @@
-<h4>Blessures</h4>
+<h4>blessures</h4>
 <div>
-  <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 grave"><i class="fas fa-plus-circle"></i> grave</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>
+  <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-grave" data-tooltip="Ajouter une blessure 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>
 </div>
 
 <ul class="item-list alterne-list">

templates/actor/carac-derivee.html

@@ -55,7 +55,9 @@
   <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">
-      {{selectOptions @root.config.niveauEthylisme selected=system.compteurs.ethylisme.value valueAttr="value" nameAttr="value" labelAttr="label"}} 
+      {{#select system.compteurs.ethylisme.value}}
+      {{>"systems/foundryvtt-reve-de-dragon/templates/enum-niveau-ethylisme.html"}}
+      {{/select}}
     </select>  
   </li>  
 

templates/actor/carac-entitee.html

@@ -2,13 +2,20 @@
   <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}}>
-      {{selectOptions @root.config.categorieEntite selected=system.definition.categorieentite}}
+      {{#select 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}}>
-      {{selectOptions @root.config.typeEntite selected=system.definition.typeentite}}
+      {{#select 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,11 +12,9 @@
       <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">
-        <a class="item-edit" data-tooltip="Modifier"><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>
+      <div class="item-controls flex-shrink">
+        <a class="item-edit" data-tooltip="Edit Item"><i class="fas fa-edit"></i></a>
+        <a class="item-delete" data-tooltip="Delete Item"><i class="fas fa-trash"></i></a>
       </div>
     </li>
     {{/if}}

templates/actor/combat.html

@@ -64,8 +64,8 @@
     </span>
     <span class="competence-value">{{emp.system.pointsemp}}</span>
     <div class="item-controls">
-      <a class="item-edit" data-tooltip="Modifier"><i class="fas fa-edit"></i></a>
-      <a class="item-delete" data-tooltip="Supprimer"><i class="fas fa-trash"></i></a>
+      <a class="item-edit" data-tooltip="Edit Item"><i class="fas fa-edit"></i></a>
+      <a class="item-delete" data-tooltip="Delete Item"><i class="fas fa-trash"></i></a>
     </div>
   </li>
   {{/each}}

templates/actor/commerce-inventaire-item.html

@@ -17,13 +17,13 @@
   <span class="equipement-detail-buttons flexrow">
     {{#unless (or (eq item.type 'service') (and (eq item.type 'conteneur') (not vide)))}}
       {{#if options.isOwner}}
-      <a class="item-quantite-moins"><i class="fa-solid fa-square-minus"></i></a>
+      <a class="item-quantite-moins"><i class="fas fa-minus-square"></i></a>
       {{/if}}
       <input {{#unless options.isOwner}}disabled{{/unless}} type="number" data-dtype="Number" 
         class="item-quantite number-x3" name="items[{{item._id}}].system.quantite"
         value="{{item.system.quantite}}" />
       {{#if options.isOwner}}
-      <a class="item-quantite-plus"><i class="fa-solid fa-square-plus"></i></a>
+      <a class="item-quantite-plus"><i class="fas fa-plus-square"></i></a>
       {{/if}}
     {{/unless}}
   </span>

templates/actor/comp-creature.html

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

templates/actor/competence.html

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

templates/actor/dragon-queue.html

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