Merge pull request 'v11' (#677) from VincentVk/foundryvtt-reve-de-dragon:v11 into v11

Reviewed-on: public/foundryvtt-reve-de-dragon#677

.gitignore

@@ -1,5 +1,14 @@
 .vscode/settings.json
 .idea
+.history
 todo.md
 /.vscode
 /ignored/
+/node_modules/
+/jsconfig.json
+/package.json
+/package-lock.json
+/packs/*/
+/packs/*/CURRENT
+/packs/*/LOG
+/packs/*/LOCK

changelog.md

@@ -1,10 +1,137 @@
-==================================================================
+# v11.0
-v0.9.2 - 05/09/2020
+## v11.1.1 - Les fumebols de Werther de Zloth
+- Fix: on peut de nouveau afficher les vues détaillées
+- Fix: on peut ouvrir les sacs et contenants portés par les véhicules et créatures
+- Fix: cuisiner du gibier prend maintenant bien les proportaions en compte
 
-Erreur de calcul sur points de vie
+## v11.1.0 - Les choix de Werther de Zloth
-Gestion différente des compétences "troncs"
+- Les options suivantes peuvent être désactivées:
+  - La transformation de stress à Château Dormant
+  - La récuperation de chance à Château Dormant
+  - La récupération d'éthylisme
+  - La récupération de rêve (y compris fleurs de rêve et Rêves de Dragon: la rencontre a lieu, mais ne donne pas de rêve)
+  - Le jet de moral de Château Dormant
+- Séparation des véhicules dans leur propre acteur
+- Séparation des entités dans leur propre acteur
+- Séparation des créatures dans leur propre acteur
+- La fenêtre de signes draconiques ne sélectionne plus tout les haut-rêvants par défaut
+- Un nouveau personnage a automatiquement son token relié
+- corrections de bugs
+  - si on n'utilise pas les règles de fatigues, un reflet de rêve pouvait garder le Haut-rêvant dans les TMRs pour toujours
+  - certaines macros ne marchaient pas pour les créatures/entités/véhicules/commerces
+  - en cas de charge, les particulières sont toujours en force (p125)
 
-==================================================================
+## v11.0.28 - les fractures de Khrachtchoum
-v0.9.1 - 03/09/2020
+- La gravité de la blessure est affichée dans le résumé de l'encaissement
+- Lors du changement d'acteur pendant le round
+  - le message annonçant le joueur dont c'est le tour ne contient plus d'informations de santé
+  - un message avec les informations de santé est envoyé au Gardienn et au propriétaire du token.acteur
+  - le jet de vie est bien fait par le token si besoin
+  - seul les propriétaires peuvent faire les jets de vie 
+- Amélioration de la fenêtre de jets
+  - le type de dégâts pour les attaques est toujours affiché
+  - le moral est indiqué avant l'icone d'appel au moral
+
+## v11.0.27 - Khrachtchoum le méticuleux
+- le tooltip dans les TMR reste visible si on ne bouge pas la souris
+- le surencombrement n'affecte QUE les actions physiques
+- on peut de nouveau fabriquer une potion depuis la fenêtre d'édition de l'herbe
+- si les TMR sont minimisées alors qu'une action est requise, elles sont bien réaffichées lorsque l'action est faite
+
+## v11.0.26 - le crépuscule de Khrachtchoum
+- gestion correcte des TMRs
+  - les TMRs ne sont jamais minimisées (par le système) quand le haut-rêvant est en demi-rêve
+  - lorsqu'une fenêtre liée aux demi-rêve est affichée, cliquer sur les TMRs n'a pas d'effet
+  - les lancers de sorts et lectures de signes sont affichées en premier plan
+  - Les effets qui ouvrent une fenêtre sont bien affichés en premier plan
+  - en cas de rencontre suivie de maîtrises/conquêtes, les fenêtres s'enchaînent
+- Le drag&drop vers la barre de macro est corrigé
+  - pour les créatures, possibilités d'avoir les attaques ou autres compétences
+  - pour les personnages, les macros sont créées:
+    - pour les compétences
+    - pour le corps à corps, trois macros sont créées: compétence, pugilat, empoignade
+    - pour les armes
+      - deux macros sont créées pour les armes à 1/2 mains
+      - deux macros sont créées pour les armes de mélée et lancer
+      - 4 macros si votre arbalête se lance, tire, et se manie à 1 ou 2 mains...
+- les jets de compétences d'attaque des créatures fonctionnent de nouveau
+
+## v11.0.25 - la vision du rêve de Khrachtchoum
+- Les TMRs restent affichées tant que le Haut-rêvant est en demi-rêve
+
+## v11.0.24 - les couleurs de Khrachtchoum
+- nouvelle carte des TMRs
+
+## v11.0.23 - la lumière de Khrachtchoum
+- ajustement automatique de la luminosité selon l'heure pour les scènes:
+   - avec une vision des tokens (sinon: ce n'est pas une scène de carte pour tokens)
+   - avec illumination globale (correspondant à une illumination extérieure)
+   - quand lampe "allumée" dans la fenêtre du calendrier
+
+## v11.0.22 - les automatismes de Khrachtchoum le Problémeux
+- Macro pour attaquer avec les compétences de créatures
+
+## v11.0.20
+- Macro pour attaquer avec les armes des personnages
+
+## v11.0.17
+- Fix: les actions de commerce ne s'appliquait pas bien aux personnages des tokens non liés
+
+## v11.0.15 - L'apprentissage de Khrachtchoum
+- Fix: l'expérience ne s'appliquait plus sur certaines réussites particulières (régression depuis la 11.0.7)
+
+## v11.0.14 - Les pincettes de Khrachtchoum le Problémeux
+- Correction du calcul de la place restante lors de l'ajout dans un conteneur
+
+## v11.0.13 - La multiplication de l'eau de Khrachtchoum le Problémeux
+- Correction de la vente depuis un commerce ayant des quantités illimitées
+
+## v11.0.12 - Les poids de la mesure de Khrachtchoum le Problémeux
+- Correction des malus de surencombrement
+- Le malus armure est correctement affiché dans l'onglet des caractéristiques
+- Correction d'orthographe et amélioration des messages des oeuvres d'art
+
+## v11.0.11 - Les bleus de Khrachtchoum le Problémeux
+- si le gardien configure le sommeil, les joueurs sont notifiés que chateau dormant vient de passer
+- possibilité de créer des armes et des compétences de créatures non-mortelles.
+
+## v11.0.10 - Les Songes de Khrachtchoum le Problémeux
+- on peut de nouveau se déplacer dans les TMRs d'un clic sur la case à atteindre
+- Lire un livre depuis l'inventaire permet de nouveau de faire un jet de la tâche
+  créée au lieu de créer toujours une nouvelle tâche
+- La sélection des TMR pour la création de signes draconiques ne cause plus d'erreurs
+- la récupération d'endurance en cas d'insomnie est limitée à la moitié
+- le résultat du sommeil lors d'un rêve de dragon à la première heure s'affiche normalement
+- lorsque le gardien gère la durée des nuits, en cas de rêve de dragon,
+  les heures dormies sont déduites des heures restant à dormir
+
+## v11.0.9 - Les Souvenirs de Khrachtchoum le Problémeux
+- mode de saisie de l'archétype en vue détaillée
+- création  une nouvelle incarnation depuis l'archétype
+- réorganisation de la fenêtre de sélection des règles optionnelles
+- correction de l'affichage du type dans les fenêtres d'objets
+
+## v11.0.8 - la poigne de Sémolosse
+- lien vers le changelog
+- organisation des compendiums du système
+- correction de l'empoignade
+  - les items d'empoignade sont ajoutés par le MJ quand nécessaire
+  - seul le joueur propriétaire du personnage peut effectuer ses choix et actions d'empoignade
+  - les caractéristiques du défenseur sont utilisées pour la défense
+  - la difficulté d'attaque est imposée au défenseur
+  - les attaques particulières sont en finesse (p133)
+  - on peut entraîner au sol dès 2 points d'empoignade
+  - les actions liée à l'immobilisation sont proposées en fin de round
+
+# v11.0.7
+
+- les créatures ont maintenant le droit d'avoir des compétences de tir, lancer, mêlée, armes naturelles, parade.
+- les créatures armées utilisent la bonne phase d'initiative
+- correction des possessions
+  - la difficulté de la défense est imposée par l'attaque
+  - une attaque particulière de possession est en finesse
+  - le rêve actuel des personnages est bien utilisé
+- correction des achats par le MJ sans acteur sélectionné
+
+Cf branche v10 pour l'historique des versions 10
 
-Initial official release

lang/fr.json

@@ -1,50 +1,56 @@
 {
-  "ACTOR": {
+  "TYPES": {
-    "TypePersonnage": "Personnage",
+    "Actor": { 
-    "TypeCreature": "Créature",
+      "Personnage": "Personnage",
-    "TypeEntite": "Entité de cauchemar",
+      "Creature": "Créature",
-    "TypeVehicule": "Véhicule"
+      "Entite": "Entité de cauchemar",
+      "Commerce": "Commerce",
+      "Vehicule": "Véhicule"
     },
-  "ITEM": {
+    "Item": {
-    "TypeObjet": "Objet",
+      "Arme": "Arme",
-    "TypeGemme": "Gemme",
+      "Armure": "Armure",
-    "TypeCompetence": "Compétence",
+      "Blessure": "Blessure",
-    "TypeCompetencecreature": "Compétence de créature",
+      "Casetmr": "TMR spéciale",
-    "TypeMaladie": "Maladie",
+      "Chant": "Chant",
-    "TypePoison": "Poison",
+      "Competence": "Compétence",
-    "TypeNombreastral": "Nombre astral",
+      "Competencecreature": "Compétence de créature",
-    "TypeTarot": "Carte de tarot",
+      "Conteneur": "Conteneur",
-    "TypeCasetmr": "TMR spéciale",
+      "Danse": "Danse",
-    "TypeRencontre": "Rencontre TMR",
+      "Extraitpoetique": "Extrait poetique",
-    "TypeMunition": "Munition",
+      "Faune": "Faune",
-    "TypeMonnaie": "Monnaie",
+      "Gemme": "Gemme",
-    "TypeHerbe": "Herbe ou plante",
+      "Herbe": "Herbe",
-    "TypeIngredient": "Ingrédient",
+      "Ingredient": "Ingrédient",
-    "TypeFaune": "Faune",
+      "Jeu": "Jeu",
-    "TypeLivre": "Livre",
+      "Livre": "Livre",
-    "TypePotion": "Potion",
+      "Maladie": "Maladie",
-    "TypeArme": "Arme",
+      "Meditation": "Méditation",
-    "TypeArmure": "Armure",
+      "Monnaie": "Monnaie",
-    "TypeConteneur": "Conteneur",
+      "Munition": "Munition",
-    "TypeNourritureboisson": "Nourriture & boisson",
+      "Musique": "Musique",
-    "TypeChant": "Chant",
+      "Nombreastral": "Nombre astral",
-    "TypeDanse": "Danse",
+      "Nourritureboisson": "Nourriture & boisson",
-    "TypeMusique": "Musique",
+      "Objet": "Objet",
-    "TypeOeuvre": "Oeuvre",
+      "Oeuvre": "Oeuvre",
-    "TypeTache": "Tâche",
+      "Ombre": "Ombre de Thanatos",
-    "TypeJeu": "Jeu",
+      "Plante": "Plante",
-    "TypeRecettealchimique": "Recette alchimique",
+      "Poison": "Poison",
-    "TypeRecettecuisine": "Recette de cuisine",
+      "Possession": "Possession",
-    "TypeSort": "Sort",
+      "Potion": "Potion",
-    "TypeMeditation": "Méditation",
+      "Queue": "Queue de Dragon",
-    "TypeSignedraconique": "Signe draconique",
+      "Recettealchimique": "Recette alchimique",
-    "TypeQueue": "Queue de Dragon",
+      "Recettecuisine": "Recette de cuisine",
-    "TypeOmbre": "Ombre de Thanatos",
+      "Rencontre": "Rencontre TMR",
-    "TypeSouffle": "Souffle de Dragon",
+      "Service": "Service",
-    "TypeTete": "Tête de Dragon",
+      "Signedraconique": "Signe draconique",
-    "TypePossession": "Possession",
+      "Sort": "Sort",
-    "TypeSortreserve": "Sort en réserve",
+      "Sortreserve": "Sort en réserve",
-    "TypeExtraitpoetique": "Extrait poetique"
+      "Souffle": "Souffle de Dragon",
+      "Tache": "Tâche",
+      "Tarot": "Carte de tarot",
+      "Tete": "Tête de Dragon"
+    }
   },
   "EFFECT": {
     "StatusStunned": "Sonné",

module/actor-entite-sheet.js

@@ -1,40 +0,0 @@
-import { RdDActorSheet } from "./actor-sheet.js";
-
-export class RdDActorEntiteSheet extends RdDActorSheet {
-
-  /** @override */
-	static get defaultOptions() {
-	  return mergeObject(super.defaultOptions, {
-  	  classes: ["rdd", "sheet", "actor"],
-  	  template: "systems/foundryvtt-reve-de-dragon/templates/actor-entite-sheet.html",
-      width: 640,
-      height: 720,
-      tabs: [{navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "carac"}],
-      dragDrop: [{dragSelector: ".item-list .item", dropSelector: undefined}]
-    });
-  }
-
-  /* -------------------------------------------- */
-  /** @override */
-	activateListeners(html) {
-    super.activateListeners(html);
-
-    // Everything below here is only needed if the sheet is editable
-    if (!this.options.editable) return;
-
-    // On competence change
-    this.html.find('.creature-carac').change(async event => {
-        let compName = event.currentTarget.attributes.compname.value;
-        this.actor.updateCreatureCompetence( compName, "carac_value", parseInt(event.target.value) );
-      } );    
-    this.html.find('.creature-niveau').change(async event => {
-        let compName = event.currentTarget.attributes.compname.value;
-        this.actor.updateCreatureCompetence( compName, "niveau", parseInt(event.target.value) );
-      } );    
-      this.html.find('.creature-dommages').change(async event => {
-        let compName = event.currentTarget.attributes.compname.value;
-        this.actor.updateCreatureCompetence( compName, "dommages", parseInt(event.target.value) );
-      } );    
-  }
-
-}

module/actor-sheet.js

@@ -7,79 +7,68 @@ import { Misc } from "./misc.js";
 import { RdDCombatManager } from "./rdd-combat.js";
 import { RdDCarac } from "./rdd-carac.js";
 import { DialogSplitItem } from "./dialog-split-item.js";
-import { ReglesOptionelles } from "./settings/regles-optionelles.js";
+import { ReglesOptionnelles } from "./settings/regles-optionnelles.js";
-import { DialogRepos } from "./dialog-repos.js";
 import { RdDSheetUtility } from "./rdd-sheet-utility.js";
 import { STATUSES } from "./settings/status-effects.js";
+import { MAINS_DIRECTRICES } from "./actor.js";
+import { RdDBaseActorReveSheet } from "./actor/base-actor-reve-sheet.js";
+import { RdDItem } from "./item.js";
+import { RdDItemBlessure } from "./item/blessure.js";
+import { RdDEmpoignade } from "./rdd-empoignade.js";
+import { ChatUtility } from "./chat-utility.js";
 
 /* -------------------------------------------- */
 /**
  * Extend the basic ActorSheet with some very simple modifications
  * @extends {ActorSheet}
  */
-export class RdDActorSheet extends ActorSheet {
+export class RdDActorSheet extends RdDBaseActorReveSheet {
 
   /** @override */
   static get defaultOptions() {
-    RdDUtility.initAfficheContenu();
+    return mergeObject(RdDBaseActorReveSheet.defaultOptions, {
-    return mergeObject(super.defaultOptions, {
-      classes: ["rdd", "sheet", "actor"],
       template: "systems/foundryvtt-reve-de-dragon/templates/actor-sheet.html",
       width: 550,
-      tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "carac" }],
-      dragDrop: [{ dragSelector: ".item-list .item", dropSelector: undefined }],
       showCompNiveauBase: false,
-      vueDetaillee: false
+      vueArchetype: false,
     });
   }
 
   /* -------------------------------------------- */
   async getData() {
-    this.timerRecherche = undefined;
+    let formData = await super.getData();
-    this.actor.computeEtatGeneral();
+    mergeObject(formData,
-
+      {
-    let formData = {
-      title: this.title,
-      id: this.actor.id,
-      type: this.actor.type,
-      img: this.actor.img,
-      name: this.actor.name,
         editable: this.isEditable,
         cssClass: this.isEditable ? "editable" : "locked",
-      system: foundry.utils.deepClone(this.actor.system),
         effects: this.actor.effects.map(e => foundry.utils.deepClone(e)),
         limited: this.actor.limited,
-      options: this.options,
         owner: this.actor.isOwner,
-      description: await TextEditor.enrichHTML(this.object.system.description, {async: true}),
+        biographie: await TextEditor.enrichHTML(this.actor.system.biographie, { async: true }),
-      biographie: await TextEditor.enrichHTML(this.object.system.biographie, {async: true}),
+        notes: await TextEditor.enrichHTML(this.actor.system.notes, { async: true }),
-      notes: await TextEditor.enrichHTML(this.object.system.notes, {async: true}),
+      });
-      notesmj: await TextEditor.enrichHTML(this.object.system.notesmj, {async: true}),
+    mergeObject(formData.calc, {
-      calc: {
+      surenc: this.actor.computeMalusSurEncombrement(),
-        encTotal: await this.actor.computeEncombrementTotalEtMalusArmure(),
-        prixTotalEquipement: this.actor.computePrixTotalEquipement(),
       surprise: RdDBonus.find(this.actor.getSurprise(false)).descr,
       resumeBlessures: this.actor.computeResumeBlessure(this.actor.system.blessures),
       caracTotal: RdDCarac.computeTotal(this.actor.system.carac, this.actor.system.beaute),
-        surEncombrementMessage: this.actor.getMessageSurEncombrement(),
+      surEncombrementMessage: this.actor.isSurenc() ? "Sur-Encombrement!" : "",
-      },
+      malusArmure: this.actor.getMalusArmure()
-    }
+    })
-    formData.options.isGM =  game.user.isGM;
 
-    RdDUtility.filterItemsPerTypeForSheet(formData, this.actor.itemTypes);
+    this.timerRecherche = undefined;
-    this.objetVersConteneur = RdDUtility.buildArbreDeConteneurs(formData.conteneurs, formData.objets);
-    formData.conteneurs = RdDUtility.conteneursRacine(formData.conteneurs);
 
     if (formData.type == 'personnage') {
+      formData.options.mainsDirectrices = MAINS_DIRECTRICES;
       formData.byCateg = Misc.classify(formData.competences, it => it.system.categorie)
       formData.calc.comptageArchetype = RdDItemCompetence.computeResumeArchetype(formData.competences);
-      formData.calc.competenceXPTotal= RdDItemCompetence.computeTotalXP(formData.competences);
+      formData.calc.competenceXPTotal = RdDItemCompetence.computeTotalXP(formData.competences);
-      formData.calc.fatigue= RdDUtility.calculFatigueHtml(formData.system.sante.fatigue.value, formData.system.sante.endurance.max);
+      formData.calc.fatigue = RdDUtility.calculFatigueHtml(formData.system.sante.fatigue.value, formData.system.sante.endurance.max);
 
       formData.competences.forEach(item => {
-        item.system.isVisible = this.options.recherche
+        item.system.isHidden = this.options.recherche
-        ? RdDItemCompetence.nomContientTexte(item, this.options.recherche.text)
+          ? !item.isNomLike(this.options.recherche.text)
-        : (!this.options.showCompNiveauBase || !RdDItemCompetence.isNiveauBase(item));
+          : (this.options.showCompNiveauBase && RdDItemCompetence.isNiveauBase(item));
         RdDItemCompetence.levelUp(item, formData.system.compteurs.experience.value);
       });
 
@@ -88,11 +77,15 @@ export class RdDActorSheet extends ActorSheet {
       });
 
       // toujours avoir une liste d'armes (pour mettre esquive et corps à corps)
-      formData.combat = duplicate(formData.armes ?? []);
+      const actor = this.actor;
+      formData.combat = duplicate(formData.armes);
       RdDItemArme.computeNiveauArmes(formData.combat, formData.competences);
-      RdDItemArme.ajoutCorpsACorps(formData.combat, formData.competences, formData.system.carac);
+      formData.combat.push(RdDItemArme.mainsNues(actor));
+      formData.combat.push(RdDItemArme.empoignade(actor));
+
       formData.esquives = this.actor.getCompetences("Esquive");
       formData.combat = RdDCombatManager.listActionsArmes(formData.combat, formData.competences, formData.system.carac);
+      formData.empoignades = this.actor.getEmpoignades();
 
       this.armesList = formData.combat;
 
@@ -118,31 +111,38 @@ export class RdDActorSheet extends ActorSheet {
     return formData;
   }
 
-  /* -------------------------------------------- */  /** @override */
+  /* -------------------------------------------- */
+  /** @override */
   activateListeners(html) {
     super.activateListeners(html);
-    this.html = html;
 
-    HtmlUtility._showControlWhen(this.html.find(".appliquerFatigue"), ReglesOptionelles.isUsing("appliquer-fatigue"));
+    HtmlUtility.showControlWhen(this.html.find(".appliquerFatigue"), ReglesOptionnelles.isUsing("appliquer-fatigue"));
 
     // Everything below here is only needed if the sheet is editable
     if (!this.options.editable) return;
 
-    this.html.find('.item-split').click(async event => {
+    this.html.find('.sheet-possession-attack').click(async event => {
-      const item = RdDSheetUtility.getItem(event, this.actor);
+      const poss = RdDSheetUtility.getItem(event, this.actor)
-      RdDSheetUtility.splitItem(item, this.actor);
+      this.actor.conjurerPossession(poss)
+    })
+
+    this.html.find('.subacteur-label a').click(async event => {
+      let actorId = RdDSheetUtility.getEventItemData(event, 'actor-id');
+      let actor = game.actors.get(actorId);
+      if (actor) {
+        actor.sheet.render(true);
+      }
     });
-    this.html.find('.item-edit').click(async event => RdDSheetUtility.getItem(event, this.actor)?.sheet.render(true))
-    this.html.find('.item-delete').click(async event => RdDUtility.confirmerSuppressionItem(this, RdDSheetUtility.getItem(event, this.actor)));
-    this.html.find('.item-vendre').click(async event => RdDSheetUtility.getItem(event, this.actor)?.proposerVente());
-    this.html.find('.item-montrer').click(async event => RdDSheetUtility.getItem(event, this.actor)?.postItem());
-    this.html.find('.item-action').click(async event => RdDSheetUtility.getItem(event, this.actor)?.actionPrincipale(this.actor));
     this.html.find('.subacteur-delete').click(async event => {
       const li = RdDSheetUtility.getEventElement(event);
       const actorId = li.data("actor-id");
       if (actorId) {
         const subActor = game.actors.get(actorId);
-        RdDUtility.confirmerSuppressionSubacteur(this, subActor, li);
+        RdDUtility.confirmerSuppressionSubacteur(this, subActor, li, () => {
+          console.log('Delete : ', subActor.id);
+          this.actor.removeSubacteur(subActor.id);
+          RdDUtility.slideOnDelete(this, li);
+        });
       }
     });
     this.html.find('.experiencelog-delete').click(async event => {
@@ -155,54 +155,39 @@ export class RdDActorSheet extends ActorSheet {
       const key = Number(li.data("key") ?? -1);
       await this.actor.deleteExperienceLog(0, key + 1);
     });
-    this.html.find('.encaisser-direct').click(async event => {
+    this.html.find("input.derivee-value[name='system.compteurs.stress.value']").change(async event => {
-      this.actor.encaisser();
+      this.actor.updateCompteurValue("stress", parseInt(event.target.value));
-    })
-    this.html.find('.sheet-possession-attack').click(async event => {
-      const poss = RdDSheetUtility.getItem(event, this.actor)
-      this.actor.conjurerPossession(poss)
-    })
-    this.html.find('.remise-a-neuf').click(async event => {
-      if (game.user.isGM) {
-        this.actor.remiseANeuf();
-      }
     });
+    this.html.find("input.derivee-value[name='system.compteurs.experience.value']").change(async event => {
+      this.actor.updateCompteurValue("experience", parseInt(event.target.value));
+    });
+
     this.html.find('.creer-tache').click(async event => {
       this.createEmptyTache();
     });
-    this.html.find('.creer-un-objet').click(async event => {
+    this.html.find('.creer-tache-blessure-legere').click(async event => RdDItemBlessure.createTacheSoinBlessure(this.actor, 2));
-      RdDUtility.selectObjetType(this);
+    this.html.find('.creer-tache-blessure-grave').click(async event => RdDItemBlessure.createTacheSoinBlessure(this.actor, 4));
-    });
+    this.html.find('.creer-tache-blessure-critique').click(async event => RdDItemBlessure.createTacheSoinBlessure(this.actor, 6));
-    this.html.find('.creer-une-oeuvre').click(async event => {
+    this.html.find('.creer-blessure-legere').click(async event => RdDItemBlessure.createBlessure(this.actor, 2));
-      RdDUtility.selectTypeOeuvre(this);
+    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('.nettoyer-conteneurs').click(async event => {
+    this.html.find('.creer-une-oeuvre').click(async event => this.selectTypeOeuvreToCreate());
-      this.actor.nettoyerConteneurs();
-    });
 
-    // Blessure control
+    this.html.find('.blessure-premierssoins-done').change(async event => {
-    this.html.find('.blessure-control').click(async event => {
+      const blessure = this.getBlessure(event);
-      const tr = this.html.find(event.currentTarget).parents(".item");
+      await blessure?.setSoinsBlessure({ premierssoins: { done: event.currentTarget.checked } });
-      let btype = tr.data("blessure-type");
-      let index = tr.data('blessure-index');
-      let active = this.html.find(event.currentTarget).data('blessure-active');
-      //console.log(btype, index, active);
-      await this.actor.manageBlessureFromSheet(btype, index, active);
     });
-
+    this.html.find('.blessure-soinscomplets-done').change(async event => {
-    // Blessure data
+      const blessure = this.getBlessure(event);
-    this.html.find('.blessure-soins').change(async event => {
+      await blessure?.setSoinsBlessure({ soinscomplets: { done: event.currentTarget.checked } })
-      const tr = this.html.find(event.currentTarget).parents(".item");
+    });
-      let btype = tr.data('blessure-type');
+    this.html.find('.blessure-premierssoins-bonus').change(async event => {
-      let index = tr.data('blessure-index');
+      const blessure = this.getBlessure(event);
-      let psoins = tr.find('.blessure-premiers_soins').val();
+      await blessure?.setSoinsBlessure({ premierssoins: { bonus: Number(event.currentTarget.value) } })
-      let pcomplets = tr.find('.blessure-soins_complets').val();
+    });
-      let jours = tr.find('.blessure-jours').val();
+    this.html.find('.blessure-soinscomplets-bonus').change(async event => {
-      let loc = tr.find('.blessure-localisation').val();
+      const blessure = this.getBlessure(event);
-      let psdone = tr.find('.blessure-psdone:checked').val();
+      await blessure?.setSoinsBlessure({ soinscomplets: { bonus: Number(event.currentTarget.value) } })
-      let scdone = tr.find('.blessure-scdone:checked').val();
-      console.log(btype, index, psoins, pcomplets, jours, loc, psdone, scdone);
-      await this.actor.setDataBlessureFromSheet(btype, index, psoins, pcomplets, jours, loc, psdone, scdone);
     });
 
     // Equip Inventory Item
@@ -211,11 +196,6 @@ export class RdDActorSheet extends ActorSheet {
     });
 
     // Roll Carac
-    this.html.find('.carac-label a').click(async event => {
-      let caracName = event.currentTarget.attributes.name.value;
-      this.actor.rollCarac(caracName.toLowerCase());
-    });
-
     this.html.find('.chance-actuelle').click(async event => {
       this.actor.rollCarac('chance-actuelle');
     });
@@ -224,14 +204,10 @@ export class RdDActorSheet extends ActorSheet {
       this.actor.rollAppelChance();
     });
 
+    // Roll Skill
     this.html.find('[name="jet-astrologie"]').click(async event => {
       this.actor.astrologieNombresAstraux();
     });
-
-    // Roll Skill
-    this.html.find('a.competence-label').click(async event => {
-      this.actor.rollCompetence(RdDSheetUtility.getItemId(event));
-    });
     this.html.find('.tache-label a').click(async event => {
       this.actor.rollTache(RdDSheetUtility.getItemId(event));
     });
@@ -256,13 +232,6 @@ export class RdDActorSheet extends ActorSheet {
     this.html.find('.recettecuisine-label a').click(async event => {
       this.actor.rollRecetteCuisine(RdDSheetUtility.getItemId(event));
     });
-    this.html.find('.subacteur-label a').click(async event => {
-      let actorId = RdDSheetUtility.getEventItemData(event, 'actor-id');
-      let actor = game.actors.get(actorId);
-      if (actor) {
-        actor.sheet.render(true);
-      }
-    });
 
     // Boutons spéciaux MJs
     this.html.find('.forcer-tmr-aleatoire').click(async event => {
@@ -274,9 +243,14 @@ export class RdDActorSheet extends ActorSheet {
 
     // Points de reve actuel
     this.html.find('.ptreve-actuel a').click(async event => {
-      this.actor.rollCarac('reve-actuel');
+      this.actor.rollCarac('reve-actuel', true);
     });
 
+    // Suite empoignade
+    this.html.find('.empoignade-label a').click(async event => {
+      let emp = RdDSheetUtility.getItem(event, this.actor)
+      RdDEmpoignade.onAttaqueEmpoignadeFromItem(emp)
+    });
     // Roll Weapon1
     this.html.find('.arme-label a').click(async event => {
       let arme = this._getEventArmeCombat(event);
@@ -292,39 +266,12 @@ export class RdDActorSheet extends ActorSheet {
         ui.notifications.info("Impossible de lancer l'initiative sans être dans un combat.");
       }
     });
-    // Display TMR, visualisation
+    // Display TMR
-    this.html.find('.visu-tmr').click(async event => {
+    this.html.find('.visu-tmr').click(async event => { this.actor.displayTMR("visu") })
-      this.actor.displayTMR("visu");
+    this.html.find('.monte-tmr').click(async event => { this.actor.displayTMR("normal") })
-    });
+    this.html.find('.monte-tmr-rapide').click(async event => { this.actor.displayTMR("rapide") })
 
-    // Display TMR, normal
+    this.html.find('.repos').click(async event => { await this.actor.repos() })
-    this.html.find('.monte-tmr').click(async event => {
-      this.actor.displayTMR("normal");
-    });
-
-    // Display TMR, fast 
-    this.html.find('.monte-tmr-rapide').click(async event => {
-      this.actor.displayTMR("rapide");
-    });
-
-    this.html.find('.repos').click(async event => {
-      await DialogRepos.create(this.actor);
-    });
-    this.html.find('.delete-active-effect').click(async event => {
-      if (game.user.isGM) {
-        let effect = this.html.find(event.currentTarget).parents(".active-effect").data('effect');
-        this.actor.removeEffect(effect);
-      }
-    });
-    this.html.find('.enlever-tous-effets').click(async event => {
-      if (game.user.isGM) {
-        await this.actor.removeEffects();
-      }
-    });
-    this.html.find('.conteneur-name a').click(async event => {
-      RdDUtility.toggleAfficheContenu(RdDSheetUtility.getItemId(event));
-      this.render(true);
-    });
     this.html.find('.carac-xp-augmenter').click(async event => {
       let caracName = event.currentTarget.name.replace("augmenter.", "");
       this.actor.updateCaracXPAuto(caracName);
@@ -338,70 +285,39 @@ export class RdDActorSheet extends ActorSheet {
 
     if (this.options.vueDetaillee) {
       // On carac change
-      this.html.find('.carac-value').change(async event => {
-        let caracName = event.currentTarget.name.replace(".value", "").replace("system.carac.", "");
-        this.actor.updateCarac(caracName, parseInt(event.target.value));
-      });
       this.html.find('input.carac-xp').change(async event => {
         let caracName = event.currentTarget.name.replace(".xp", "").replace("system.carac.", "");
         this.actor.updateCaracXP(caracName, parseInt(event.target.value));
       });
-      // On competence change
-      this.html.find('.competence-value').change(async event => {
-        let compName = event.currentTarget.attributes.compname.value;
-        //console.log("Competence changed :", compName);
-        this.actor.updateCompetence(compName, parseInt(event.target.value));
-      });
       // On competence xp change
       this.html.find('input.competence-xp').change(async event => {
         let compName = event.currentTarget.attributes.compname.value;
         this.actor.updateCompetenceXP(compName, parseInt(event.target.value));
       });
-      // On competence xp change
       this.html.find('input.competence-xp-sort').change(async event => {
         let compName = event.currentTarget.attributes.compname.value;
         this.actor.updateCompetenceXPSort(compName, parseInt(event.target.value));
       });
+
+      this.html.find('.toggle-archetype').click(async event => {
+        this.options.vueArchetype = !this.options.vueArchetype;
+        this.render(true);
+      });
       // On competence archetype change
       this.html.find('.competence-archetype').change(async event => {
         let compName = event.currentTarget.attributes.compname.value;
         this.actor.updateCompetenceArchetype(compName, parseInt(event.target.value));
       });
     }
+    this.html.find('.nouvelle-incarnation').click(async event => {
+      this.actor.nouvelleIncarnation();
+    });
 
     this.html.find('.show-hide-competences').click(async event => {
       this.options.showCompNiveauBase = !this.options.showCompNiveauBase;
       this.render(true);
     });
 
-    this.html.find('.recherche')
-      .each((index, field) => {
-        if (this.options.recherche) {
-          field.focus();
-          field.setSelectionRange(this.options.recherche.start, this.options.recherche.end);
-        }
-      })
-      .keyup(async event => {
-        const nouvelleRecherche = this._optionRecherche(event.currentTarget);
-        if (this.options.recherche?.text != nouvelleRecherche?.text){
-          this.options.recherche = nouvelleRecherche;
-          if (this.timerRecherche) {
-            clearTimeout(this.timerRecherche);
-          }
-          this.timerRecherche = setTimeout(() => {
-            this.timerRecherche = undefined;
-            this.render(true);
-          }, 500);
-        }
-      })
-      .change(async event =>
-        this.options.recherche = this._optionRecherche(event.currentTarget)
-      );
-    this.html.find('.vue-detaillee').click(async event => {
-      this.options.vueDetaillee = !this.options.vueDetaillee;
-      this.render(true);
-    });
-
     // On pts de reve change
     this.html.find('.pointsreve-value').change(async event => {
       let reveValue = event.currentTarget.value;
@@ -414,19 +330,7 @@ export class RdDActorSheet extends ActorSheet {
       this.actor.setPointsDeSeuil(event.currentTarget.value);
     });
 
-    this.html.find('#attribut-protection-edit').change(async event => {
-      this.actor.updateAttributeValue(event.currentTarget.attributes.name.value, parseInt(event.target.value));
-    });
 
-    // On stress change
-    this.html.find('.compteur-edit').change(async event => {
-      let fieldName = event.currentTarget.attributes.name.value;
-      this.actor.updateCompteurValue(fieldName, parseInt(event.target.value));
-    });
-
-    this.html.find('#ethylisme').change(async event => {
-      this.actor.setEthylisme(parseInt(event.target.value));
-    });
     this.html.find('.stress-test').click(async event => {
       this.actor.transformerStress();
     });
@@ -447,14 +351,7 @@ export class RdDActorSheet extends ActorSheet {
       this.actor.jetVie();
     });
     this.html.find('.jet-endurance').click(async event => {
-      this.actor.jetEndurance();
+      await this.jetEndurance();
-    });
-
-    this.html.find('.monnaie-plus').click(async event => {
-      this.actor.monnaieIncDec(RdDSheetUtility.getItemId(event), 1);
-    });
-    this.html.find('.monnaie-moins').click(async event => {
-      this.actor.monnaieIncDec(RdDSheetUtility.getItemId(event), -1);
     });
 
     this.html.find('.vie-plus').click(async event => {
@@ -463,12 +360,6 @@ export class RdDActorSheet extends ActorSheet {
     this.html.find('.vie-moins').click(async event => {
       this.actor.santeIncDec("vie", -1);
     });
-    this.html.find('.endurance-plus').click(async event => {
-      this.actor.santeIncDec("endurance", 1);
-    });
-    this.html.find('.endurance-moins').click(async event => {
-      this.actor.santeIncDec("endurance", -1);
-    });
     this.html.find('.ptreve-actuel-plus').click(async event => {
       this.actor.reveActuelIncDec(1);
     });
@@ -483,6 +374,22 @@ export class RdDActorSheet extends ActorSheet {
     });
   }
 
+  async jetEndurance() {
+    const endurance = this.actor.getEnduranceActuelle()
+    const result = await this.actor.jetEndurance(endurance);
+    ChatMessage.create({
+      content: `Jet d'Endurance : ${result.jetEndurance} / ${endurance}
+        <br>${this.actor.name} a ${result.sonne ? 'échoué' : 'réussi'} son Jet d'Endurance ${result.sonne ? 'et devient Sonné' : ''}`,
+      whisper: ChatUtility.getWhisperRecipientsAndGMs(this.actor.name)
+    });
+  }
+
+  getBlessure(event) {
+    const itemId = this.html.find(event.currentTarget).parents(".item-blessure").data('item-id');
+    const blessure = this.actor.getItem(itemId, 'blessure');
+    return blessure;
+  }
+
   isCompetenceAffichable(competence) {
     return !this.options.showCompNiveauBase || !RdDItemCompetence.isNiveauBase(competence);
   }
@@ -495,36 +402,30 @@ export class RdDActorSheet extends ActorSheet {
   }
 
   /* -------------------------------------------- */
-  async _onDropItem(event, dragData) {
+  async selectTypeOeuvreToCreate() {
-    const destItemId = this.html.find(event.target)?.closest('.item').attr('data-item-id')
+    let types = RdDItem.getTypesOeuvres();
-    const dropParams = RdDSheetUtility.prepareItemDropParameters(destItemId, this.actor, dragData, this.objetVersConteneur)
+    let content = `<span class="competence-label">Selectionnez le type d'oeuvre</span><select class="item-type">`;
-    if (dropParams) {
+    for (let typeName of types) {
-      const callSuper = await this.actor.processDropItem(dropParams)
+      content += `<option value="${typeName}">${Misc.typeName('Item', typeName)}</option>`
-      if (callSuper) {
+    }
-        await super._onDropItem(event, dragData)
+    content += '</select>';
+    let dialog = new Dialog({
+      title: "Créer une oeuvre",
+      content: content,
+      buttons: {
+        create: {
+          icon: '<i class="fas fa-check"></i>',
+          label: "Créer l'oeuvre",
+          callback: () => this.actor.createItem($(".item-type").val())
         }
       }
-  }
+    });
-
+    dialog.render(true);
-  /* -------------------------------------------- */
-  async createItem(name, type) {
-    await this.actor.createEmbeddedDocuments('Item', [{ name: name, type: type }], { renderSheet: true });
   }
 
   /* -------------------------------------------- */
   async createEmptyTache() {
-    await this.createItem('Nouvelle tache', 'tache');
+    await this.actor.createItem('tache', 'Nouvelle tache');
-  }
-
-  _optionRecherche(target) {
-    if (!target.value?.length){
-      return undefined;
-    }
-    return {
-      text: target.value,
-      start: target.selectionStart,
-      end: target.selectionEnd,
-    };
   }
 
   _getEventArmeCombat(event) {
@@ -546,7 +447,7 @@ export class RdDActorSheet extends ActorSheet {
     const sheetTabs = this.element.find(".sheet-tabs");
     const sheetBody = this.element.find(".sheet-body");
     let bodyHeight = position.height - sheetHeader[0].clientHeight;
-    if (sheetTabs.length>0) {
+    if (sheetTabs.length > 0) {
       bodyHeight -= sheetTabs[0].clientHeight;
     }
     sheetBody.css("height", bodyHeight);

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

@@ -0,0 +1,64 @@
+import { RdDSheetUtility } from "../rdd-sheet-utility.js";
+import { RdDBaseActorSheet } from "./base-actor-sheet.js";
+
+/* -------------------------------------------- */
+/**
+ * Extend the basic ActorSheet with some very simple modifications
+ * @extends {ActorSheet}
+ */
+export class RdDBaseActorReveSheet extends RdDBaseActorSheet {
+
+  /** @override */
+  static get defaultOptions() {
+    return mergeObject(RdDBaseActorSheet.defaultOptions, {
+      width: 550
+    });
+  }
+
+  /* -------------------------------------------- */
+  /** @override */
+  activateListeners(html) {
+    super.activateListeners(html);
+
+    // Everything below here is only needed if the sheet is editable
+    if (!this.options.editable) return;
+
+    this.html.find('.encaisser-direct').click(async event => {
+      this.actor.encaisser();
+    })
+    this.html.find('.remise-a-neuf').click(async event => {
+      if (game.user.isGM) {
+        this.actor.remiseANeuf();
+      }
+    });
+
+    this.html.find('.carac-label a').click(async event => {
+      let caracName = event.currentTarget.attributes.name.value;
+      this.actor.rollCarac(caracName.toLowerCase());
+    });
+
+    this.html.find('a.competence-label').click(async event => {
+      this.actor.rollCompetence(RdDSheetUtility.getItemId(event));
+    });
+
+    this.html.find('.delete-active-effect').click(async event => {
+      if (game.user.isGM) {
+        let effect = this.html.find(event.currentTarget).parents(".active-effect").data('effect');
+        this.actor.removeEffect(effect);
+      }
+    });
+    this.html.find('.enlever-tous-effets').click(async event => {
+      if (game.user.isGM) {
+        await this.actor.removeEffects();
+      }
+    });
+
+    this.html.find('.endurance-plus').click(async event => {
+      this.actor.santeIncDec("endurance", 1);
+    });
+    this.html.find('.endurance-moins').click(async event => {
+      this.actor.santeIncDec("endurance", -1);
+    });
+  }
+
+}

module/actor/base-actor-reve.js

@@ -0,0 +1,509 @@
+import { ChatUtility } from "../chat-utility.js";
+import { DialogValidationEncaissement } from "../dialog-validation-encaissement.js";
+import { Grammar } from "../grammar.js";
+import { RdDItemCompetence } from "../item-competence.js";
+import { Misc } from "../misc.js";
+import { RdDEmpoignade } from "../rdd-empoignade.js";
+import { RdDResolutionTable } from "../rdd-resolution-table.js";
+import { RdDEncaisser } from "../rdd-roll-encaisser.js";
+import { RdDRoll } from "../rdd-roll.js";
+import { RdDUtility } from "../rdd-utility.js";
+import { ReglesOptionnelles } from "../settings/regles-optionnelles.js";
+import { RdDBaseActor } from "./base-actor.js";
+import { RdDItemCompetenceCreature } from "../item-competencecreature.js";
+import { StatusEffects } from "../settings/status-effects.js";
+import { TYPES } from "../item.js";
+import { Targets } from "../targets.js";
+import { RdDPossession } from "../rdd-possession.js";
+import { RdDCombat } from "../rdd-combat.js";
+import { RdDConfirm } from "../rdd-confirm.js";
+import { ENTITE_INCARNE, SYSTEM_RDD } from "../constants.js";
+import { RdDItemArme } from "../item-arme.js";
+
+const POSSESSION_SANS_DRACONIC = {
+  img: 'systems/foundryvtt-reve-de-dragon/icons/entites/possession.webp',
+  name: 'Sans draconic',
+  system: {
+    niveau: 0,
+    defaut_carac: "reve-actuel",
+  }
+};
+
+/**
+ * Classe de base pour les acteurs disposant de rêve (donc, pas des objets)
+ * - Entités de rêve
+ * - Créatures de "sang": créatures et humanoides
+ */
+export class RdDBaseActorReve extends RdDBaseActor {
+
+  getCaracChanceActuelle() {
+    return {
+      label: 'Chance actuelle',
+      value: this.getChanceActuel(),
+      type: "number"
+    };
+  }
+
+  getCaracReveActuel() {
+    return {
+      label: 'Rêve actuel',
+      value: this.getReveActuel(),
+      type: "number"
+    };
+  }
+
+  getReveActuel() { return this.getReve() }
+  getChanceActuel() { return this.getChance() }
+
+  getReve() { return Number(this.system.carac.reve?.value ?? 0) }
+  getForce() { return this.getReve() }
+  getTaille() { return Number(this.system.carac.taille?.value ?? 0) }
+  getAgilite() { return this.getForce() }
+  getChance() { return this.getReve() }
+  getMoralTotal() { return 0 }
+  getBonusDegat() { return Number(this.system.attributs?.plusdom?.value ?? 0) }
+  getProtectionNaturelle() { return Number(this.system.attributs?.protection?.value ?? 0) }
+  getSConst() { return 0 }
+
+  /* -------------------------------------------- */
+  getEncombrementMax() { return 0 }
+  isSurenc() { return false }
+  computeMalusSurEncombrement() { return 0 }
+
+  ajustementAstrologique() { return 0 }
+  getMalusArmure() { return 0 }
+
+  getEnduranceActuelle() {
+    return Number(this.system.sante?.endurance?.value ?? 0);
+  }
+  async jetEndurance(resteEndurance = undefined) { return { jetEndurance: 0, sonne: false } }
+  isDead() { return false }
+  blessuresASoigner() { return [] }
+  getEtatGeneral(options = { ethylisme: false }) { return 0 }
+
+  async computeArmure(attackerRoll) { return this.getProtectionNaturelle() }
+  async remiseANeuf() { }
+  async appliquerAjoutExperience(rollData, hideChatMessage = 'show') { }
+
+  async santeIncDec(name, inc, isCritique = false) { }
+
+  async finDeRound(options = { terminer: false }) {
+    await this.$finDeRoundSuppressionEffetsTermines(options);
+    await this.finDeRoundBlessures();
+    await this.$finDeRoundSupprimerObsoletes();
+    await this.$finDeRoundEmpoignade();
+  }
+
+  async $finDeRoundSuppressionEffetsTermines(options) {
+    for (let effect of this.getEffects()) {
+      if (effect.duration.type !== 'none' && (effect.duration.remaining <= 0 || options.terminer)) {
+        await effect.delete();
+        ChatMessage.create({ content: `${this.name} n'est plus ${Misc.lowerFirst(game.i18n.localize(effect.system.label))} !` });
+      }
+    }
+  }
+
+  async finDeRoundBlessures() {
+  }
+
+  async $finDeRoundSupprimerObsoletes() {
+    const obsoletes = []
+      .concat(this.itemTypes[TYPES.empoignade].filter(it => it.system.pointsemp <= 0))
+      .concat(this.itemTypes[TYPES.possession].filter(it => it.system.compteur < -2 || it.system.compteur > 2))
+      .map(it => it.id);
+    await this.deleteEmbeddedDocuments('Item', obsoletes);
+  }
+
+  async $finDeRoundEmpoignade() {
+    const immobilisations = this.itemTypes[TYPES.empoignade].filter(it => it.system.pointsemp >= 2 && it.system.empoigneurid == this.id);
+    immobilisations.forEach(emp => RdDEmpoignade.onImmobilisation(this,
+      game.actors.get(emp.system.empoigneid),
+      emp
+    ))
+  }
+
+  async setSonne(sonne = true) { }
+
+  /* -------------------------------------------- */
+  getCompetence(idOrName, options = {}) {
+    if (idOrName instanceof Item) {
+      return idOrName.isCompetence() ? idOrName : undefined
+    }
+    return RdDItemCompetence.findCompetence(this.items, idOrName, options)
+  }
+  getCompetences(name) {
+    return RdDItemCompetence.findCompetences(this.items, name)
+  }
+  getCompetenceCorpsACorps(options = {}) {
+    return this.getCompetence("Corps à corps", options)
+  }
+  getCompetencesEsquive() {
+    return this.getCompetences("esquive")
+  }
+
+  getArmeParade(armeParadeId) {
+    const item = armeParadeId ? this.getEmbeddedDocument('Item', armeParadeId) : undefined;
+    return RdDItemArme.getArme(item);
+  }
+
+  getDraconicOuPossession() {
+    return POSSESSION_SANS_DRACONIC
+  }
+
+  getPossession(possessionId) {
+    return this.itemTypes[TYPES.possession].find(it => it.system.possessionid == possessionId);
+  }
+  getPossessions() {
+    return this.itemTypes[TYPES.possession];
+  }
+  getEmpoignades() {
+    return this.itemTypes[TYPES.empoignade];
+  }
+
+  /* -------------------------------------------- */
+  async updateCreatureCompetence(idOrName, fieldName, value) {
+    let competence = this.getCompetence(idOrName);
+    if (competence) {
+      function getFieldPath(fieldName) {
+        switch (fieldName) {
+          case "niveau": return 'system.niveau';
+          case "dommages": return 'system.dommages';
+          case "carac_value": return 'system.carac_value';
+        }
+        return undefined
+      }
+      const path = getFieldPath(fieldName);
+      if (path) {
+        await this.updateEmbeddedDocuments('Item', [{ _id: competence.id, [path]: value }]); // updates one EmbeddedEntity
+      }
+    }
+  }
+
+  /* -------------------------------------------- */
+  isEffectAllowed(statusId) { return true }
+
+  getEffects(filter = e => true) {
+    return this.getEmbeddedCollection("ActiveEffect").filter(filter);
+  }
+
+  getEffect(statusId) {
+    return this.getEmbeddedCollection("ActiveEffect").find(it => it.flags?.core?.statusId == statusId);
+  }
+
+  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.status(statusId)]);
+      }
+    }
+  }
+
+  async removeEffect(statusId) {
+    const effect = this.getEffect(statusId);
+    if (effect) {
+      await this.deleteEmbeddedDocuments('ActiveEffect', [effect.id]);
+    }
+  }
+
+  async removeEffects(filter = e => true) {
+    if (game.user.isGM) {
+      const ids = this.getEffects(filter).map(it => it.id);
+      await this.deleteEmbeddedDocuments('ActiveEffect', ids);
+    }
+  }
+
+  /* -------------------------------------------- */
+  getSurprise(isCombat = undefined) {
+    let niveauSurprise = this.getEffects()
+      .map(effect => StatusEffects.valeurSurprise(effect, isCombat))
+      .reduce(Misc.sum(), 0);
+    if (niveauSurprise > 1) {
+      return 'totale';
+    }
+    if (niveauSurprise == 1) {
+      return 'demi';
+    }
+    return '';
+  }
+
+  /* -------------------------------------------- */
+  async computeEtatGeneral() {
+    // Par défaut, on ne calcule pas d'état général, seuls les personnages/créatures sont affectés
+    this.system.compteurs.etat.value = 0;
+  }
+
+  /* -------------------------------------------- */
+  async openRollDialog({ name, label, template, rollData, callbackAction }) {
+    const dialog = await RdDRoll.create(this, rollData,
+      { html: template, close: async html => await this._onCloseRollDialog(html) },
+      {
+        name: name,
+        label: label,
+        callbacks: [
+          this.createCallbackExperience(),
+          this.createCallbackAppelAuMoral(),
+          { action: callbackAction }
+        ]
+      });
+    dialog.render(true);
+    return dialog
+  }
+
+  createEmptyCallback() {
+    return {
+      condition: r => false,
+      action: r => { }
+    };
+  }
+  createCallbackExperience() { return this.createEmptyCallback(); }
+  createCallbackAppelAuMoral() { return this.createEmptyCallback(); }
+  async _onCloseRollDialog(html) { }
+
+  /* -------------------------------------------- */
+  async roll() {
+    RdDEmpoignade.checkEmpoignadeEnCours(this)
+
+    const carac = this.getCarac()
+    const selectedCaracName = ['apparence', 'perception', 'force', 'reve'].find(it => carac[it] != undefined)
+
+    await this.openRollDialog({
+      name: `jet-${this.id}`,
+      label: `Jet de ${this.name}`,
+      template: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll.html',
+      rollData: {
+        carac: carac,
+        selectedCarac: carac[selectedCaracName],
+        selectedCaracName: selectedCaracName,
+        competences: this.itemTypes['competence']
+      },
+      callbackAction: r => this.$onRollCaracResult(r)
+    });
+  }
+
+  getCarac() {
+    // TODO: le niveau d'une entité de cauchemar devrait être exclu...
+    const carac = mergeObject(duplicate(this.system.carac),
+    {
+      'reve-actuel': this.getCaracReveActuel(),
+      'chance-actuelle': this.getCaracChanceActuelle()
+    });
+    return carac;
+  }
+
+  /* -------------------------------------------- */
+  async rollCarac(caracName, jetResistance = undefined) {
+    RdDEmpoignade.checkEmpoignadeEnCours(this)
+    let selectedCarac = this.getCaracByName(caracName)
+    await this.openRollDialog({
+      name: 'jet-' + caracName,
+      label: 'Jet ' + Grammar.apostrophe('de', selectedCarac.label),
+      template: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-carac.html',
+      rollData: {
+        selectedCarac: selectedCarac,
+        competences: this.itemTypes['competence'],
+        jetResistance: jetResistance ? caracName : undefined
+      },
+      callbackAction: r => this.$onRollCaracResult(r)
+    });
+  }
+
+  /* -------------------------------------------- */
+  async $onRollCaracResult(rollData) {
+    // Final chat message
+    await RdDResolutionTable.displayRollData(rollData, this, 'chat-resultat-general.html');
+  }
+
+  /* -------------------------------------------- */
+  async rollCompetence(idOrName, options = { tryTarget: true }) {
+    RdDEmpoignade.checkEmpoignadeEnCours(this)
+    const competence = this.getCompetence(idOrName);
+    let rollData = { carac: this.system.carac, competence: competence }
+    if (competence.type == TYPES.competencecreature) {
+      const arme = RdDItemCompetenceCreature.armeCreature(competence)
+      if (arme && options.tryTarget && Targets.hasTargets()) {
+        Targets.selectOneToken(target => {
+          if (arme.action == "possession") {
+            RdDPossession.onAttaquePossession(target, this, competence)
+          }
+          else {
+            RdDCombat.rddCombatTarget(target, this).attaque(competence, arme)
+          }
+        });
+        return;
+      }
+      // Transformer la competence de créature
+      RdDItemCompetenceCreature.setRollDataCreature(rollData)
+    }
+
+    await this.openRollDialog({
+      name: 'jet-competence',
+      label: 'Jet ' + Grammar.apostrophe('de', competence.name),
+      template: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-competence.html',
+      rollData: rollData,
+      callbackAction: r => this.$onRollCompetence(r, options)
+    });
+  }
+
+  async $onRollCompetence(rollData, options) {
+    await RdDResolutionTable.displayRollData(rollData, this, 'chat-resultat-competence.html')
+    if (options?.onRollAutomate) {
+      options.onRollAutomate(rollData);
+    }
+  }
+
+  /** --------------------------------------------
+   * @param {*} arme item d'arme/compétence de créature
+   * @param {*} categorieArme catégorie d'attaque à utiliser: competence (== melee), lancer, tir; naturelle, possession
+   * @returns 
+   */
+  rollArme(arme, categorieArme = "competence") {
+    let compToUse = this.$getCompetenceArme(arme, categorieArme)
+    if (!Targets.hasTargets()) {
+      RdDConfirm.confirmer({
+        settingConfirmer: "confirmer-combat-sans-cible",
+        content: `<p>Voulez vous faire un jet de ${compToUse} sans choisir de cible valide?
+                  <br>Tous les jets de combats devront être gérés à la main
+                  </p>`,
+        title: 'Ne pas utiliser les automatisation de combat',
+        buttonLabel: "Pas d'automatisation",
+        onAction: async () => {
+          this.rollCompetence(compToUse, { tryTarget: false })
+        }
+      });
+      return;
+    }
+
+    Targets.selectOneToken(target => {
+      if (Targets.isTargetEntite(target)) {
+        ui.notifications.warn(`Vous ne pouvez pas attaquer une entité non incarnée avec votre ${arme.name}!!!!`);
+        return;
+      }
+
+      const competence = this.getCompetence(compToUse)
+      //console.log("RollArme", competence, arme)
+      if (competence.isCompetencePossession()) {
+        return RdDPossession.onAttaquePossession(target, this, competence);
+      }
+      RdDCombat.rddCombatTarget(target, this).attaque(competence, arme);
+    })
+  }
+
+  $getCompetenceArme(arme, competenceName) {
+    switch (arme.type) {
+      case TYPES.competencecreature:
+        return arme.name
+      case TYPES.arme:
+        switch (competenceName) {
+          case 'competence': return arme.system.competence;
+          case 'unemain': return RdDItemArme.competence1Mains(arme);
+          case 'deuxmains': return RdDItemArme.competence2Mains(arme);
+          case 'tir': return arme.system.tir;
+          case 'lancer': return arme.system.lancer;
+        }
+    }
+    return undefined
+  }
+
+  verifierForceMin(item) {
+  }
+  /* -------------------------------------------- */
+  async resetItemUse() { }
+  async incDecItemUse(itemId, inc = 1) { }
+  getItemUse(itemId) { return 0; }
+
+  /* -------------------------------------------- */
+  async encaisser() { await RdDEncaisser.encaisser(this) }
+
+  async encaisserDommages(rollData, attacker = undefined, show = undefined) {
+    if (attacker && !await attacker.accorder(this, 'avant-encaissement')) {
+      return;
+    }
+    const attackerId = attacker?.id;
+    if (ReglesOptionnelles.isUsing('validation-encaissement-gr') && !game.user.isGM) {
+      RdDBaseActor.remoteActorCall({
+        tokenId: this.token?.id,
+        actorId: this.id,
+        method: 'appliquerEncaissement',
+        args: [rollData, show, 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) {
+    await this.onAppliquerJetEncaissement(jet, attacker);
+    await this.$afficherEncaissement(jet, show);
+  }
+
+  async onAppliquerJetEncaissement(encaissement, attacker) { }
+
+  async $afficherEncaissement(encaissement, show) {
+    mergeObject(encaissement, {
+      alias: this.name,
+      hasPlayerOwner: this.hasPlayerOwner,
+      show: show ?? {}
+    });
+
+    await ChatUtility.createChatWithRollMode(this.name, {
+      roll: encaissement.roll,
+      content: await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-resultat-encaissement.html', encaissement)
+    });
+
+    if (!encaissement.hasPlayerOwner && encaissement.endurance != 0) {
+      encaissement = duplicate(encaissement);
+      encaissement.isGM = true;
+      ChatMessage.create({
+        whisper: ChatMessage.getWhisperRecipients("GM"),
+        content: await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-resultat-encaissement.html', encaissement)
+      });
+    }
+  }
+
+  /* -------------------------------------------- */
+  async accorder(entite, when = 'avant-encaissement') {
+    if (when != game.settings.get(SYSTEM_RDD, "accorder-entite-cauchemar")
+      || entite == undefined
+      || !entite.isEntite([ENTITE_INCARNE])
+      || entite.isEntiteAccordee(this)) {
+      return true;
+    }
+    const rolled = await RdDResolutionTable.roll(this.getReveActuel(), - Number(entite.system.carac.niveau.value));
+    const rollData = {
+      alias: this.name,
+      rolled: rolled,
+      entite: entite.name,
+      selectedCarac: this.system.carac.reve
+    };
+
+    if (rolled.isSuccess) {
+      await entite.setEntiteReveAccordee(this);
+    }
+
+    await RdDResolutionTable.displayRollData(rollData, this, 'chat-resultat-accorder-cauchemar.html');
+    if (rolled.isPart) {
+      await this.appliquerAjoutExperience(rollData, true);
+    }
+    return rolled.isSuccess;
+  }
+
+  isEntiteAccordee(attacker) { return true }
+
+  async setEntiteReveAccordee(attacker) {
+    ui.notifications.error("Impossible de s'accorder à " + this.name + ": ce n'est pas une entite de cauchemer/rêve");
+  }
+
+}

module/actor/base-actor-sang.js

@@ -0,0 +1,275 @@
+import { MAX_ENDURANCE_FATIGUE, RdDUtility } from "../rdd-utility.js";
+import { ReglesOptionnelles } from "../settings/regles-optionnelles.js";
+import { STATUSES } from "../settings/status-effects.js";
+import { TYPES } from "../item.js";
+import { RdDBaseActorReve } from "./base-actor-reve.js";
+import { RdDDice } from "../rdd-dice.js";
+import { RdDItemBlessure } from "../item/blessure.js";
+
+/**
+ * Classe de base pour les acteurs qui peuvent subir des blessures
+ * - créatures
+ * - humanoides
+ */
+export class RdDBaseActorSang extends RdDBaseActorReve {
+
+
+  getForce() { return Number(this.system.carac.force?.value ?? 0) }
+
+  getBonusDegat() { return Number(this.system.attributs?.plusdom?.value ?? 0) }
+  getProtectionNaturelle() { return Number(this.system.attributs?.protection?.value ?? 0) }
+  getSConst() { return 0 }
+
+  getEnduranceMax() {
+    return Math.max(1, Math.min(this.system.sante.endurance.max, MAX_ENDURANCE_FATIGUE));
+  }
+
+  getFatigueActuelle() {
+    if (ReglesOptionnelles.isUsing("appliquer-fatigue")) {
+      return Math.max(0, Math.min(this.getFatigueMax(), this.system.sante.fatigue?.value));
+    }
+    return 0;
+  }
+
+  getFatigueRestante() {
+    return this.getFatigueMax() - this.getFatigueActuelle();
+  }
+
+  getFatigueMin() {
+    return this.system.sante.endurance.max - this.system.sante.endurance.value;
+  }
+
+  getFatigueMax() { return this.getEnduranceMax() * 2 }
+
+  malusFatigue() {
+    if (ReglesOptionnelles.isUsing("appliquer-fatigue")) {
+      return RdDUtility.calculMalusFatigue(this.getFatigueActuelle(), this.getEnduranceMax())
+    }
+    return 0;
+  }
+
+  /* -------------------------------------------- */
+  getEncombrementMax() { return Number(this.system.attributs?.encombrement?.value ?? 0) }
+  isSurenc() { return this.computeMalusSurEncombrement() < 0 }
+
+  computeMalusSurEncombrement() {
+    return Math.min(0, Math.floor(this.getEncombrementMax() - this.encTotal));
+  }
+
+  isDead() {
+    return this.system.sante.vie.value < -this.getSConst()
+  }
+
+  /* -------------------------------------------- */
+  computeResumeBlessure() {
+    const blessures = this.filterItems(it => it.system.gravite > 0, 'blessure')
+
+    const nbLegeres = blessures.filter(it => it.isLegere()).length;
+    const nbGraves = blessures.filter(it => it.isGrave()).length;
+    const nbCritiques = blessures.filter(it => it.isCritique()).length;
+
+    if (nbLegeres + nbGraves + nbCritiques == 0) {
+      return "Aucune blessure";
+    }
+    let resume = "Blessures:";
+    if (nbLegeres > 0) {
+      resume += " " + nbLegeres + " légère" + (nbLegeres > 1 ? "s" : "");
+    }
+    if (nbGraves > 0) {
+      if (nbLegeres > 0)
+        resume += ",";
+      resume += " " + nbGraves + " grave" + (nbGraves > 1 ? "s" : "");
+    }
+    if (nbCritiques > 0) {
+      if (nbGraves > 0 || nbLegeres > 0)
+        resume += ",";
+      resume += " une CRITIQUE !";
+    }
+    return resume;
+  }
+
+  blessuresASoigner() { return [] }
+  getEtatGeneral(options = { ethylisme: false }) { return 0 }
+
+  async computeArmure(attackerRoll) { return this.getProtectionNaturelle() }
+  async remiseANeuf() { }
+  async appliquerAjoutExperience(rollData, hideChatMessage = 'show') { }
+
+  /* -------------------------------------------- */
+
+  async onAppliquerJetEncaissement(encaissement, attacker) {
+    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());
+
+    mergeObject(encaissement, {
+      resteEndurance: perteEndurance.newValue,
+      sonne: perteEndurance.sonne,
+      jetEndurance: perteEndurance.jetEndurance,
+      endurance: perteEndurance.perte,
+      vie: santeOrig.vie.value - perteVie.newValue,
+      blessure: blessure
+    });
+  }
+  /* -------------------------------------------- */
+  async santeIncDec(name, inc, isCritique = false) {
+    if (name == 'fatigue' && !ReglesOptionnelles.isUsing("appliquer-fatigue")) {
+      return;
+    }
+    const sante = duplicate(this.system.sante)
+    let compteur = sante[name];
+    if (!compteur) {
+      return;
+    }
+    let result = {
+      sonne: false,
+    };
+
+    let minValue = name == "vie" ? -this.getSConst() - 1 : 0;
+
+    result.newValue = Math.max(minValue, Math.min(compteur.value + inc, compteur.max));
+    //console.log("New value ", inc, minValue, result.newValue);
+    let fatigue = 0;
+    if (name == "endurance") {
+      if (result.newValue == 0 && inc < 0 && !isCritique) { // perte endurance et endurance devient 0 (sauf critique) -> -1 vie
+        sante.vie.value--;
+        result.perteVie = true;
+      }
+      result.newValue = Math.max(0, result.newValue);
+      if (inc > 0) { // le max d'endurance s'applique seulement à la récupération
+        result.newValue = Math.min(result.newValue, this._computeEnduranceMax())
+      }
+      const perte = compteur.value - result.newValue;
+      result.perte = perte;
+      if (perte > 1) {
+        // Peut-être sonné si 2 points d'endurance perdus d'un coup
+        mergeObject(result, await this.jetEndurance(result.newValue));
+      } else if (inc > 0) {
+        await this.setSonne(false);
+      }
+      if (sante.fatigue && inc < 0) { // Each endurance lost -> fatigue lost
+        fatigue = perte;
+      }
+    }
+    compteur.value = result.newValue;
+    // If endurance lost, then the same amount of fatigue cannot be recovered
+    if (ReglesOptionnelles.isUsing("appliquer-fatigue") && sante.fatigue && fatigue > 0) {
+      sante.fatigue.value = Math.max(sante.fatigue.value + fatigue, this.getFatigueMin());
+    }
+    await this.update({ "system.sante": sante })
+    if (this.isDead()) {
+      await this.setEffect(STATUSES.StatusComma, true);
+    }
+    return result
+  }
+
+  /* -------------------------------------------- */
+
+  /* -------------------------------------------- */
+  async ajouterBlessure(encaissement, attacker = undefined) {
+    if (encaissement.gravite < 0) return;
+    if (encaissement.gravite > 0) {
+      while (this.countBlessures(it => it.system.gravite == encaissement.gravite) >= RdDItemBlessure.maxBlessures(encaissement.gravite) && encaissement.gravite <= 6) {
+        // Aggravation
+        encaissement.gravite += 2
+        if (encaissement.gravite > 2) {
+          encaissement.vie += 2;
+        }
+      }
+    }
+    const endActuelle = this.getEnduranceActuelle();
+    const blessure = await RdDItemBlessure.createBlessure(this, encaissement.gravite, encaissement.dmg.loc.label, attacker);
+    if (blessure.isCritique()) {
+      encaissement.endurance = endActuelle;
+    }
+
+    if (blessure.isMort()) {
+      this.setEffect(STATUSES.StatusComma, true);
+      encaissement.mort = true;
+      ChatMessage.create({
+        content: `<img class="chat-icon" src="icons/svg/skull.svg" alt="charge" />
+        <strong>${this.name} vient de succomber à une seconde blessure critique ! Que les Dragons gardent son Archétype en paix !</strong>`
+      });
+    }
+    return blessure;
+  }
+
+  async supprimerBlessures(filterToDelete) {
+    const toDelete = this.filterItems(filterToDelete, TYPES.blessure)
+      .map(it => it.id);
+    await this.deleteEmbeddedDocuments('Item', toDelete);
+  }
+
+  countBlessures(filter = it => !it.isContusion()) {
+    return this.filterItems(filter, 'blessure').length
+  }
+
+  /* -------------------------------------------- */
+  async jetVie() {
+    let roll = await RdDDice.roll("1d20");
+    let msgText = "Jet de Vie : " + roll.total + " / " + this.system.sante.vie.value + "<br>";
+    if (roll.total <= this.system.sante.vie.value) {
+      msgText += "Jet réussi, pas de perte de point de vie (prochain jet dans 1 round pour 1 critique, SC minutes pour une grave)";
+      if (roll.total == 1) {
+        msgText += "La durée entre 2 jets de vie est multipliée par 20 (20 rounds pour une critique, SCx20 minutes pour une grave)";
+      }
+    } else {
+      msgText += "Jet échoué, vous perdez 1 point de vie";
+      await this.santeIncDec("vie", -1);
+      if (roll.total == 20) {
+        msgText += "Votre personnage est mort !!!!!";
+      }
+    }
+    const message = {
+      content: msgText,
+      whisper: ChatMessage.getWhisperRecipients(this.name)
+    };
+    ChatMessage.create(message);
+  }
+
+  /* -------------------------------------------- */
+  async jetEndurance(resteEndurance = undefined) {
+    const jetEndurance = (await RdDDice.roll("1d20")).total;
+    const sonne = jetEndurance == 20 || jetEndurance > (resteEndurance ?? this.system.sante.endurance.value)
+    if (sonne) {
+      await this.setSonne();
+    }
+    return { jetEndurance, sonne }
+  }
+
+
+  async finDeRoundBlessures() {
+    const nbGraves = this.filterItems(it => it.isGrave(), 'blessure').length;
+    if (nbGraves > 0) {
+      // Gestion blessure graves : -1 pt endurance par blessure grave
+      await this.santeIncDec("endurance", -nbGraves);
+    }
+  }
+
+  async setSonne(sonne = true) {
+    if (!game.combat && sonne) {
+      ui.notifications.info(`${this.name} est hors combat, il ne reste donc pas sonné`);
+      return;
+    }
+    await this.setEffect(STATUSES.StatusStunned, sonne);
+  }
+
+  getSonne() {
+    return this.getEffect(STATUSES.StatusStunned);
+  }
+
+  /* -------------------------------------------- */
+  async computeEtatGeneral() {
+    this.system.compteurs.etat.value = this.malusVie() + this.malusFatigue() + this.malusEthylisme();
+  }
+
+  malusVie() {
+    return Math.min(this.system.sante.vie.value - this.system.sante.vie.max, 0);
+  }
+
+  malusEthylisme() { return 0 }
+  malusFatigue() { return 0 }
+
+
+}

module/actor/base-actor-sheet.js

@@ -0,0 +1,325 @@
+import { RdDUtility } from "../rdd-utility.js";
+import { Misc } from "../misc.js";
+import { DialogSplitItem } from "../dialog-split-item.js";
+import { RdDSheetUtility } from "../rdd-sheet-utility.js";
+import { Monnaie } from "../item-monnaie.js";
+import { RdDItem, TYPES } from "../item.js";
+import { RdDItemCompetenceCreature } from "../item-competencecreature.js";
+
+/* -------------------------------------------- */
+/**
+ * Extend the basic ActorSheet with some very simple modifications
+ * @extends {ActorSheet}
+ */
+export class RdDBaseActorSheet extends ActorSheet {
+
+  /** @override */
+  static get defaultOptions() {
+    RdDUtility.initAfficheContenu();
+    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
+    });
+  }
+
+  /* -------------------------------------------- */
+  async getData() {
+    Monnaie.validerMonnaies(this.actor.itemTypes['monnaie']);
+
+    this.actor.computeEtatGeneral();
+    let formData = {
+      title: this.title,
+      id: this.actor.id,
+      type: this.actor.type,
+      img: this.actor.img,
+      name: this.actor.name,
+      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)
+    }
+
+    RdDBaseActorSheet.filterItemsPerTypeForSheet(formData, this.actor.itemTypes);
+    formData.calc = {
+      fortune: Monnaie.toSolsDeniers(this.actor.getFortune()),
+      prixTotalEquipement: this.actor.computePrixTotalEquipement(),
+      encTotal: await this.actor.computeEncTotal(),
+    }
+
+    this.objetVersConteneur = RdDUtility.buildArbreDeConteneurs(formData.conteneurs, formData.inventaires);
+    this._appliquerRechercheObjets(formData.conteneurs, formData.inventaires);
+    formData.conteneurs = RdDUtility.conteneursRacine(formData.conteneurs);
+    formData.competences.filter(it => it.type == TYPES.competencecreature)
+      .forEach(it => it.isdommages = RdDItemCompetenceCreature.isDommages(it))
+    return formData;
+  }
+
+  _appliquerRechercheObjets(conteneurs, inventaires) {
+    if (this.options.recherche?.text) {
+      const recherche = this.options.recherche;
+      const allVisible = inventaires.filter(it => it.isNomTypeLike(recherche.text)).map(it => it.id);
+      let addVisible = conteneurs.filter(it => it.isNomTypeLike(recherche.text)).map(it => it.id)
+      do {
+        allVisible.push(...addVisible)
+        const parentsIds = conteneurs.filter(it => it.system.contenu.find(id => allVisible.includes(id))).map(it => it.id)
+        addVisible = parentsIds.filter(id => !allVisible.includes(id))
+      }
+      while (addVisible.length > 0)
+      inventaires.forEach(it => it.system.isHidden = !allVisible.includes(it.id))
+      conteneurs.forEach(it => it.system.isHidden = !allVisible.includes(it.id))
+    }
+    else {
+      inventaires.forEach(it => it.system.isHidden = false)
+      conteneurs.forEach(it => it.system.isHidden = false)
+    }
+  }
+
+  /* -------------------------------------------- */
+  static filterItemsPerTypeForSheet(formData, itemTypes) {
+    formData.blessures = Misc.arrayOrEmpty(itemTypes['blessure']);
+    formData.recettescuisine = Misc.arrayOrEmpty(itemTypes['recettecuisine']);
+    formData.recettesAlchimiques = Misc.arrayOrEmpty(itemTypes['recettealchimique']);
+    formData.maladies = Misc.arrayOrEmpty(itemTypes['maladie']);
+    formData.poisons = Misc.arrayOrEmpty(itemTypes['poison']);
+    formData.possessions = Misc.arrayOrEmpty(itemTypes['possession']);
+    formData.maladiesPoisons = formData.maladies.concat(formData.poisons);
+    formData.competences = (itemTypes['competence'] ?? []).concat(itemTypes['competencecreature'] ?? []);
+    formData.sortsReserve = Misc.arrayOrEmpty(itemTypes['sortreserve']);
+
+    formData.sorts = Misc.arrayOrEmpty(itemTypes['sort']);
+    formData.rencontres = Misc.arrayOrEmpty(itemTypes['rencontre']);
+    formData.casestmr = Misc.arrayOrEmpty(itemTypes['casetmr']);
+    formData.signesdraconiques = Misc.arrayOrEmpty(itemTypes['signedraconique']);
+    formData.queues = Misc.arrayOrEmpty(itemTypes['queue']);
+    formData.souffles = Misc.arrayOrEmpty(itemTypes['souffle']);
+    formData.ombres = Misc.arrayOrEmpty(itemTypes['ombre']);
+    formData.tetes = Misc.arrayOrEmpty(itemTypes['tete']);
+    formData.taches = Misc.arrayOrEmpty(itemTypes['tache']);
+    formData.meditations = Misc.arrayOrEmpty(itemTypes['meditation']);
+    formData.chants = Misc.arrayOrEmpty(itemTypes['chant']);
+    formData.danses = Misc.arrayOrEmpty(itemTypes['danse']);
+    formData.musiques = Misc.arrayOrEmpty(itemTypes['musique']);
+    formData.oeuvres = Misc.arrayOrEmpty(itemTypes['oeuvre']);
+    formData.jeux = Misc.arrayOrEmpty(itemTypes['jeu']);
+
+    formData.services = Misc.arrayOrEmpty(itemTypes['service']);
+    formData.conteneurs = Misc.arrayOrEmpty(itemTypes['conteneur']);
+    formData.materiel = Misc.arrayOrEmpty(itemTypes['objet']);
+    formData.armes = Misc.arrayOrEmpty(itemTypes['arme']);
+    formData.armures = Misc.arrayOrEmpty(itemTypes['armure']);
+    formData.munitions = Misc.arrayOrEmpty(itemTypes['munition']);
+    formData.livres = Misc.arrayOrEmpty(itemTypes['livre']);
+    formData.potions = Misc.arrayOrEmpty(itemTypes['potion']);
+    formData.plantes = Misc.arrayOrEmpty(itemTypes['plante']);
+    formData.ingredients = Misc.arrayOrEmpty(itemTypes['ingredient']);
+    formData.faunes = Misc.arrayOrEmpty(itemTypes['faune']);
+    formData.herbes = Misc.arrayOrEmpty(itemTypes['herbe']);
+    formData.nourritureboissons = Misc.arrayOrEmpty(itemTypes['nourritureboisson']);
+    formData.gemmes = Misc.arrayOrEmpty(itemTypes['gemme']);
+    formData.monnaies = Misc.arrayOrEmpty(itemTypes['monnaie']).sort(Monnaie.triValeurEntiere());
+    formData.objets = Misc.arrayOrEmpty(itemTypes['objet'])
+
+    formData.inventaires = RdDItem.getItemTypesInventaire('all')
+      .map(t => Misc.arrayOrEmpty(itemTypes[t]))
+      .reduce((a, b) => a.concat(b), [])
+      .sort(Misc.ascending(it => it.name));
+  }
+
+  /* -------------------------------------------- */  /** @override */
+  activateListeners(html) {
+    super.activateListeners(html);
+    this.html = html;
+
+    if (!this.options.editable) return;
+
+    this.html.find('.item-action').click(async event => {
+      const item = RdDSheetUtility.getItem(event, this.actor);
+      item?.actionPrincipale(this.actor, async () => this.render())
+    });
+
+    this.html.find('.conteneur-name a').click(async event => {
+      RdDUtility.toggleAfficheContenu(this.getItemId(event));
+      this.render(true);
+    });
+    this.html.find('.item-edit').click(async event => this.getItem(event)?.sheet.render(true))
+    this.html.find('.item-montrer').click(async event => this.getItem(event)?.postItemToChat());
+    this.html.find('.actor-montrer').click(async event => this.actor.postActorToChat());
+    this.html.find('.recherche')
+      .each((index, field) => {
+        this._rechercheSelectArea(field);
+      })
+      .keyup(async event => this._rechercherKeyup(event))
+      .change(async event => this._rechercherKeyup(event));
+    this.html.find('.recherche').prop("disabled", false);
+    // Everything below here is only needed if the sheet is editable
+    if (!this.options.editable) return;
+
+    this.html.find('.item-split').click(async event => {
+      const item = this.getItem(event);
+      RdDSheetUtility.splitItem(item, this.actor);
+    });
+    this.html.find('.item-quantite-plus').click(async event => this.actor.itemQuantiteIncDec(this.getItemId(event), 1));
+    this.html.find('.item-quantite-moins').click(async event => this.actor.itemQuantiteIncDec(this.getItemId(event), -1));
+    this.html.find('.item-delete').click(async event => RdDUtility.confirmActorItemDelete(this, this.getItem(event)));
+    this.html.find('.item-vendre').click(async event => this.vendre(this.getItem(event)));
+
+    this.html.find('.creer-un-objet').click(async event => {
+      this.selectObjetTypeToCreate();
+    });
+    this.html.find('.nettoyer-conteneurs').click(async event => {
+      this.actor.nettoyerConteneurs();
+    });
+
+    this.html.find('.vue-detaillee').click(async event => {
+      this.options.vueDetaillee = !this.options.vueDetaillee;
+      this.render(true);
+    });
+
+    if (this.options.vueDetaillee) {
+      // On carac change
+      this.html.find('.carac-value').change(async event => {
+        let caracName = event.currentTarget.name.replace(".value", "").replace("system.carac.", "");
+        this.actor.updateCarac(caracName, parseInt(event.target.value));
+      });
+      // On competence change
+      this.html.find('.competence-value').change(async event => {
+        let compName = event.currentTarget.attributes.compname.value;
+        //console.log("Competence changed :", compName);
+        this.actor.updateCompetence(compName, parseInt(event.target.value));
+      });
+    }
+
+  }
+
+  _rechercherKeyup(event) {
+    const currentTarget = event.currentTarget;
+    const nouvelleRecherche = this._optionRecherche(currentTarget);
+    if (this.options.recherche?.text != nouvelleRecherche?.text) {
+      this.options.recherche = nouvelleRecherche;
+      if (this.timerRecherche) {
+        clearTimeout(this.timerRecherche);
+      }
+      this.timerRecherche = setTimeout(() => {
+        this.timerRecherche = undefined;
+        this.render(true);
+      }, 500);
+    }
+  }
+
+  _rechercheSelectArea(field) {
+    if (this.options.recherche) {
+      field.focus();
+      field.setSelectionRange(this.options.recherche.start, this.options.recherche.end);
+    }
+  }
+
+  getItemId(event) {
+    return RdDSheetUtility.getItemId(event);
+  }
+
+  getItem(event) {
+    return RdDSheetUtility.getItem(event, this.actor);
+  }
+
+  _optionRecherche(target) {
+    if (!target.value?.length) {
+      return undefined;
+    }
+    return {
+      text: target.value,
+      start: target.selectionStart,
+      end: target.selectionEnd,
+    };
+  }
+  /* -------------------------------------------- */
+  _getHeaderButtons() {
+    let buttons = super._getHeaderButtons();
+    buttons.unshift({
+      class: "montrer",
+      icon: "fas fa-comment",
+      onclick: ev => this.actor.postActorToChat()
+    });
+    return buttons
+  }
+
+  /* -------------------------------------------- */
+  async _onDropItem(event, dragData) {
+    const destItemId = this.html.find(event.target)?.closest('.item').attr('data-item-id')
+    const dropParams = await RdDSheetUtility.prepareItemDropParameters(destItemId, this.actor, dragData, this.objetVersConteneur)
+    if (dropParams) {
+      const callSuper = await this.actor.processDropItem(dropParams)
+      if (callSuper) {
+        await super._onDropItem(event, dragData)
+      }
+    }
+  }
+
+  /* -------------------------------------------- */
+  async selectObjetTypeToCreate() {
+    let types = this.getTypesInventaire().sort(Misc.ascending(type => Misc.typeName('Item', type)));
+    let content = `<span class="competence-label">Selectionnez le type d'équipement</span><select class="item-type">`;
+    for (let typeName of types) {
+      content += `<option value="${typeName}">${Misc.typeName('Item', typeName)}</option>`
+    }
+    content += '</select>';
+    let d = new Dialog({
+      title: "Créer un équipement",
+      content: content,
+      buttons: {
+        create: {
+          icon: '<i class="fas fa-check"></i>',
+          label: "Créer l'objet",
+          callback: () => this.actor.createItem($(".item-type").val())
+        }
+      }
+    });
+    d.render(true);
+  }
+
+  getTypesInventaire() {
+    return RdDItem.getItemTypesInventaire();
+  }
+
+  /** @override */
+  setPosition(options = {}) {
+    const position = super.setPosition(options);
+    const sheetHeader = this.element.find(".sheet-header");
+    const sheetTabs = this.element.find(".sheet-tabs");
+    const sheetBody = this.element.find(".sheet-body");
+    let bodyHeight = position.height - sheetHeader[0].clientHeight;
+    if (sheetTabs.length > 0) {
+      bodyHeight -= sheetTabs[0].clientHeight;
+    }
+    sheetBody.css("height", bodyHeight);
+    return position;
+  }
+
+
+  /* -------------------------------------------- */
+  /** @override */
+  _updateObject(event, formData) {
+    // Update the Actor
+    return this.actor.update(formData);
+  }
+
+  async splitItem(item) {
+    const dialog = await DialogSplitItem.create(item, (item, split) => this._onSplitItem(item, split));
+    dialog.render(true);
+  }
+
+  async _onSplitItem(item, split) {
+    if (split >= 1 && split < item.system.quantite) {
+      await item.diminuerQuantite(split);
+      const splitItem = duplicate(item);
+      splitItem.system.quantite = split;
+      await this.actor.createEmbeddedDocuments('Item', [splitItem])
+    }
+  }
+
+  vendre(item) {
+    item?.proposerVente(this.actor.getQuantiteDisponible(item));
+  }
+
+}

module/actor/base-actor.js

@@ -0,0 +1,699 @@
+import { ChatUtility } from "../chat-utility.js";
+import { SYSTEM_SOCKET_ID } from "../constants.js";
+import { Grammar } from "../grammar.js";
+import { Monnaie } from "../item-monnaie.js";
+import { TYPES } from "../item.js";
+import { Misc } from "../misc.js";
+import { RdDAudio } from "../rdd-audio.js";
+import { RdDConfirm } from "../rdd-confirm.js";
+import { RdDUtility } from "../rdd-utility.js";
+import { SystemCompendiums } from "../settings/system-compendiums.js";
+import { APP_ASTROLOGIE_REFRESH } from "../sommeil/app-astrologie.js";
+
+export class RdDBaseActor extends Actor {
+  /* -------------------------------------------- */
+  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;
+    }
+
+    const caracList = Object.entries(carac);
+    let entry = Misc.findFirstLike(name, caracList, { mapper: it => it[0], description: 'caractéristique' });
+    if (!entry || entry.length == 0) {
+      entry = Misc.findFirstLike(name, caracList, { mapper: it => it[1].label, description: 'caractéristique' });
+    }
+    return entry && entry.length > 0 ? carac[entry[0]] : undefined;
+  }
+
+  getCaracByName(name) {
+    switch (Grammar.toLowerCaseNoAccent(name)) {
+      case 'reve-actuel': case 'reve actuel':
+        return this.getCaracReveActuel();
+      case 'chance-actuelle': case 'chance-actuelle':
+        return this.getCaracChanceActuelle();
+    }
+    return RdDBaseActor._findCaracByName(this.system.carac, name);
+  }
+
+  static getDefaultImg(itemType) {
+    return game.system.rdd.actorClasses[itemType]?.defaultIcon ?? defaultItemImg[itemType];
+  }
+
+  /* -------------------------------------------- */
+  static init() {
+    Hooks.on("preUpdateItem", (item, change, options, id) => RdDBaseActor.getParentActor(item)?.onPreUpdateItem(item, change, options, id));
+    Hooks.on("createItem", (item, options, id) => RdDBaseActor.getParentActor(item)?.onCreateItem(item, options, id));
+    Hooks.on("deleteItem", (item, options, id) => RdDBaseActor.getParentActor(item)?.onDeleteItem(item, options, id));
+    Hooks.on("updateActor", (actor, change, options, actorId) => actor.onUpdateActor(change, options, actorId));
+  }
+
+  static onSocketMessage(sockmsg) {
+    switch (sockmsg.msg) {
+      case "msg_remote_actor_call":
+        return RdDBaseActor.onRemoteActorCall(sockmsg.data, sockmsg.userId);
+      case "msg_reset_nombre_astral":
+        game.user.character.resetNombresAstraux();
+        game.system.rdd.calendrier.notifyChangeNombresAstraux();
+        return;
+      case "msg_refresh_nombre_astral":
+        Hooks.callAll(APP_ASTROLOGIE_REFRESH);
+        return;
+    }
+  }
+
+  static remoteActorCall(callData, userId = undefined) {
+    userId = userId ?? Misc.firstConnectedGMId();
+    if (userId == game.user.id) {
+      RdDBaseActor.onRemoteActorCall(callData, userId);
+      return false;
+    }
+    else {
+      game.socket.emit(SYSTEM_SOCKET_ID, { msg: "msg_remote_actor_call", data: callData, userId: userId });
+      return true;
+    }
+  }
+
+  static onRemoteActorCall(callData, userId) {
+    if (userId == game.user.id) {
+      let actor = game.actors.get(callData?.actorId);
+      if (callData.tokenId) {
+        let token = canvas.tokens.placeables.find(t => t.id == callData.tokenId)
+        if (token) {
+          actor = token.actor
+        }
+      }
+      if (Misc.isOwnerPlayerOrUniqueConnectedGM(actor)) { // Seul le joueur choisi effectue l'appel: le joueur courant si propriétaire de l'actor, ou le MJ sinon
+        const args = callData.args;
+        console.info(`RdDBaseActor.onRemoteActorCall: pour l'Actor ${callData.actorId}, appel de RdDBaseActor.${callData.method}(`, ...args, ')');
+        actor[callData.method](...args);
+      }
+    }
+  }
+
+  static getParentActor(document) {
+    return document?.parent instanceof Actor ? document.parent : undefined
+  }
+
+  /**
+   * Cet methode surcharge Actor.create() pour ajouter si besoin des Items par défaut:
+   * compétences et monnaies.
+  *
+  * @param {Object} actorData template d'acteur auquel ajouter des informations.
+  * @param {Object} options   optionspour customiser la création
+  */
+  static async create(actorData, options) {
+    // import depuis un compendium
+    if (actorData instanceof Array) {
+      return super.create(actorData, options);
+    }
+    // Création d'un acteur avec des items (uniquement en cas de duplication): pas besoin d'ajouter d'items
+    if (actorData.items) {
+      return await super.create(actorData, options);
+    }
+    actorData.items = [];
+    if (actorData.type == "personnage") {
+      const competences = await SystemCompendiums.getCompetences(actorData.type);
+      actorData.items = actorData.items.concat(competences.map(i => i.toObject()))
+        .concat(Monnaie.monnaiesStandard());
+    }
+    else if (actorData.type == "commerce") {
+      actorData.items = actorData.items.concat(Monnaie.monnaiesStandard());
+    }
+    return super.create(actorData, options);
+  }
+
+  constructor(docData, context = {}) {
+    if (!context.rdd?.ready) {
+      mergeObject(context, { rdd: { ready: true } });
+      const ActorConstructor = game.system.rdd.actorClasses[docData.type];
+      if (ActorConstructor) {
+        if (!docData.img) {
+          docData.img = ActorConstructor.defaultIcon;
+        }
+        return new ActorConstructor(docData, context);
+      }
+    }
+    super(docData, context);
+  }
+
+  /* -------------------------------------------- */
+  async _preCreate(data, options, user) {
+    await super._preCreate(data, options, user);
+
+    // Configure prototype token settings
+    const prototypeToken = {};
+    if (this.type === "personnage") Object.assign(prototypeToken, {
+      sight: { enabled: true }, actorLink: true, disposition: CONST.TOKEN_DISPOSITIONS.FRIENDLY
+    });
+    this.updateSource({ prototypeToken });
+  }
+
+  /* -------------------------------------------- */
+  prepareData() {
+    super.prepareData()
+    this.prepareActorData()
+    this.cleanupConteneurs()
+    this.computeEtatGeneral()
+    this.computeEncTotal()
+  }
+
+  async prepareActorData() { }
+  async computeEtatGeneral() { }
+  /* -------------------------------------------- */
+  findPlayer() {
+    return game.users.players.find(player => player.active && player.character?.id == this.id);
+  }
+
+  isCreatureEntite() { return this.isCreature() || this.isEntite() }
+  isCreature() { return false }
+  isEntite(typeentite = []) { return false }
+  isVehicule() { return false }
+  isPersonnage() { return false }
+  getItem(id, type = undefined) {
+    const item = this.items.get(id);
+    if (type == undefined || (item?.type == type)) {
+      return item;
+    }
+    return undefined;
+  }
+
+  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) {
+    return this.getItem(idOrName, type)
+      ?? Misc.findFirstLike(idOrName, this.listItems(type), { description: Misc.typeName('Item', type) });
+  }
+
+  getMonnaie(id) { return this.findItemLike(id, 'monnaie'); }
+  getEncombrementMax() { return 0 }
+
+  /* -------------------------------------------- */
+  async onPreUpdateItem(item, change, options, id) { }
+
+  async onCreateItem(item, options, id) { }
+
+  async onDeleteItem(item, options, id) { }
+
+  async onUpdateActor(update, options, actorId) { }
+
+  async onTimeChanging(oldTimestamp, newTimestamp) {
+    this.items.filter(it => it.isFinPeriode(oldTimestamp, newTimestamp))
+      .forEach(async it => await it.onFinPeriodeTemporel(oldTimestamp, newTimestamp))
+  }
+
+  async creerObjetParMJ(object) {
+    if (!Misc.isUniqueConnectedGM()) {
+      RdDBaseActor.remoteActorCall({
+        tokenId: this.token?.id,
+        actorId: this.id,
+        method: 'creerObjetParMJ',
+        args: [object]
+      });
+      return;
+    }
+    await this.createEmbeddedDocuments('Item', [object])
+  }
+
+  /* -------------------------------------------- */
+  async cleanupConteneurs() {
+    let updates = this.itemTypes['conteneur']
+      .filter(c => c.system.contenu.filter(id => this.getItem(id) == undefined).length > 0)
+      .map(c => { return { _id: c._id, 'system.contenu': c.system.contenu.filter(id => this.getItem(id) != undefined) } });
+    if (updates.length > 0) {
+      await this.updateEmbeddedDocuments("Item", updates)
+    }
+  }
+
+  /* -------------------------------------------- */
+  getFortune() {
+    return Monnaie.getFortune(this.itemTypes['monnaie']);
+  }
+
+  /* -------------------------------------------- */
+  async itemQuantiteIncDec(id, value) {
+    let item = this.getItem(id);
+    if (item && item.isInventaire()) {
+      const quantite = Math.max(0, item.system.quantite + value);
+      await this.updateEmbeddedDocuments('Item', [{ _id: item.id, 'system.quantite': quantite }]);
+    }
+  }
+
+  computePrixTotalEquipement() {
+    return this.items.filter(it => it.isInventaire())
+      .filter(it => !it.isMonnaie())
+      .map(it => it.valeurTotale())
+      .reduce(Misc.sum(), 0);
+  }
+
+  async payerSols(depense) {
+    depense = Number(depense);
+    if (depense == 0) {
+      return;
+    }
+    let fortune = this.getFortune();
+    console.log("payer", game.user.character, depense, fortune);
+    let msg = "";
+    if (fortune >= depense) {
+      await Monnaie.optimiserFortune(this, fortune - depense);
+      msg = `Vous avez payé <strong>${depense} Sols</strong>, qui ont été soustraits de votre argent.`;
+      RdDAudio.PlayContextAudio("argent"); // Petit son
+    } else {
+      msg = "Vous n'avez pas assez d'argent pour payer cette somme !";
+    }
+
+    let message = {
+      whisper: ChatUtility.getWhisperRecipientsAndGMs(this.name),
+      content: msg
+    };
+    ChatMessage.create(message);
+  }
+
+  async depenserSols(sols) {
+    let reste = this.getFortune() - Number(sols);
+    if (reste >= 0) {
+      await Monnaie.optimiserFortune(this, reste);
+    }
+    return reste;
+  }
+
+  async ajouterSols(sols, fromActorId = undefined) {
+    sols = Number(sols);
+    if (sols == 0) {
+      return;
+    }
+    if (sols < 0) {
+      ui.notifications.error(`Impossible d'ajouter un gain de ${sols} <0`);
+      return;
+    }
+    if (fromActorId && !game.user.isGM) {
+      RdDBaseActor.remoteActorCall({
+        userId: Misc.connectedGMOrUser(),
+        tokenId: this.token?.id,
+        actorId: this.id,
+        method: 'ajouterSols', args: [sols, fromActorId]
+      });
+    }
+    else {
+      const fromActor = game.actors.get(fromActorId)
+      await Monnaie.optimiserFortune(this, sols + this.getFortune());
+
+      RdDAudio.PlayContextAudio("argent"); // Petit son
+      ChatMessage.create({
+        whisper: ChatUtility.getWhisperRecipientsAndGMs(this.name),
+        content: `Vous avez reçu <strong>${sols} Sols</strong> ${fromActor ? " de " + fromActor.name : ''}, qui ont été ajoutés à votre argent.`
+      });
+    }
+  }
+
+  /* -------------------------------------------- */
+
+  getQuantiteDisponible(item) {
+    return item?.isService() ? undefined : item?.getQuantite();
+  }
+
+  /* -------------------------------------------- */
+  async achatVente(achat) {
+    if (achat.vendeurId == achat.acheteurId) {
+      ui.notifications.info("Inutile de se vendre à soi-même");
+      return;
+    }
+    if (!Misc.isUniqueConnectedGM()) {
+      RdDBaseActor.remoteActorCall({
+        actorId: achat.vendeurId ?? achat.acheteurId,
+        method: 'achatVente',
+        args: [achat]
+      });
+      return;
+    }
+    const cout = Number(achat.prixTotal ?? 0);
+    const vendeur = achat.vendeurId ? game.actors.get(achat.vendeurId) : undefined;
+    const acheteur = achat.acheteurId ? game.actors.get(achat.acheteurId) : undefined;
+    const quantite = (achat.choix.nombreLots ?? 1) * (achat.vente.tailleLot);
+    const itemVendu = vendeur?.getItem(achat.vente.item._id) ?? game.items.get(achat.vente.item._id);
+    if (!itemVendu) {
+      ChatUtility.notifyUser(achat.userId, 'warn', vendeur ? `Le vendeur n'a pas plus de ${achat.vente.item.name} !` : `Impossible de retrouver: ${achat.vente.item.name} !`);
+      return;
+    }
+    if (vendeur && !vendeur.verifierQuantite(itemVendu, quantite)) {
+      ChatUtility.notifyUser(achat.userId, 'warn', `Le vendeur n'a pas assez de ${itemVendu.name} !`);
+      return
+    }
+    if (acheteur && !acheteur.verifierFortune(cout)) {
+      ChatUtility.notifyUser(achat.userId, 'warn', `Vous n'avez pas assez d'argent pour payer ${Math.ceil(cout / 100)} sols !`);
+      return;
+    }
+    await this.decrementerVente(vendeur, itemVendu, quantite, cout);
+    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 = duplicate(achat.vente);
+    chatAchatItem.quantiteTotal = quantite;
+    ChatMessage.create({
+      user: achat.userId,
+      speaker: { alias: (acheteur ?? vendeur).name },
+      whisper: ChatUtility.getWhisperRecipientsAndGMs(this.name),
+      content: await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-achat-item.html', chatAchatItem)
+    });
+
+    if (!achat.vente.quantiteIllimite) {
+      if (achat.vente.quantiteNbLots <= achat.choix.nombreLots) {
+        ChatUtility.removeChatMessageId(achat.chatMessageIdVente);
+      }
+      else if (achat.chatMessageIdVente) {
+        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 decrementerVente(vendeur, itemVendu, quantite, cout) {
+    if (vendeur) {
+      await vendeur.ajouterSols(cout);
+      await vendeur.decrementerQuantiteItem(itemVendu, quantite);
+    }
+  }
+
+  verifierFortune(cout) {
+    return this.getFortune() >= cout;
+  }
+
+  verifierQuantite(item, quantiteDemande) {
+    const disponible = this.getQuantiteDisponible(item);
+    return disponible == undefined || disponible >= quantiteDemande;
+  }
+
+  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;
+    }
+    let resteQuantite = (item.system.quantite ?? 1) - quantite;
+    if (resteQuantite <= 0) {
+      if (options.supprimerSiZero) {
+        await this.deleteEmbeddedDocuments("Item", [item.id]);
+      }
+      else {
+        await this.updateEmbeddedDocuments("Item", [{ _id: item.id, 'system.quantite': 0 }]);
+      }
+      if (resteQuantite < 0) {
+        ui.notifications.warn(`La quantité de ${item.name} était insuffisante, l'objet a donc été supprimé`)
+      }
+    }
+    else if (resteQuantite > 0) {
+      await this.updateEmbeddedDocuments("Item", [{ _id: item.id, 'system.quantite': resteQuantite }]);
+    }
+  }
+
+  async creerQuantiteItem(item, quantite) {
+    if (this.canReceive(item)) {
+      const isItemEmpilable = "quantite" in item.system;
+      const baseItem = {
+        type: item.type,
+        img: item.img,
+        name: item.name,
+        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);
+      return items.length > 0 ? items[0].id : undefined;
+    }
+  }
+
+  /* -------------------------------------------- */
+  async computeEncTotal() {
+    if (!this.pack) {
+      this.encTotal = this.items.map(it => it.getEncTotal()).reduce(Misc.sum(), 0);
+      return this.encTotal;
+    }
+    return 0;
+  }
+
+  getEncTotal() {
+    return Math.floor(this.encTotal ?? 0);
+  }
+
+  async createItem(type, name = undefined) {
+    if (!name) {
+      name = 'Nouveau ' + Misc.typeName('Item', type);
+    }
+    await this.createEmbeddedDocuments('Item', [{ name: name, type: type }], { renderSheet: true });
+  }
+
+  canReceive(item) {
+    return false;
+  }
+
+  async processDropItem(params) {
+    const targetActorId = this.id;
+    const sourceActorId = params.sourceActorId;
+    const itemId = params.itemId;
+    const destId = params.destId;
+    const srcId = params.srcId;
+    if (sourceActorId && sourceActorId != targetActorId) {
+      console.log("Moving objects", sourceActorId, targetActorId, itemId);
+      this.moveItemsBetweenActors(itemId, sourceActorId);
+      return false;
+    }
+    let result = true;
+    const item = this.getItem(itemId);
+    if (item?.isInventaire('all') && sourceActorId == targetActorId) {
+      // rangement
+      if (srcId != destId && itemId != destId) { // déplacement de l'objet
+        const src = this.getItem(srcId);
+        const dest = this.getItem(destId);
+        const cible = this.getContenantOrParent(dest);
+        const [empilable, message] = item.isInventaireEmpilable(dest);
+        if (empilable) {
+          await dest.empiler(item)
+          result = false;
+        }
+        // changer de conteneur
+        else if (!cible || this.conteneurPeutContenir(cible, item)) {
+          await this.enleverDeConteneur(item, src, params.onEnleverConteneur);
+          await this.ajouterDansConteneur(item, cible, params.onAjouterDansConteneur);
+          if (message && !dest.isConteneur()) {
+            ui.notifications.info(cible
+              ? `${message}<br>${item.name} a été déplacé dans: ${cible.name}`
+              : `${message}<br>${item.name} a été sorti du conteneur`);
+          }
+        }
+      }
+    }
+    await this.computeEncTotal();
+    return result;
+  }
+
+  getContenantOrParent(dest) {
+    if (!dest || dest.isConteneur()) {
+      return dest;
+    }
+    return this.getContenant(dest);
+  }
+
+  getContenant(item) {
+    return this.itemTypes['conteneur'].find(it => it.system.contenu.includes(item.id));
+  }
+
+
+  /* -------------------------------------------- */
+  conteneurPeutContenir(dest, moved) {
+    if (!dest) {
+      return true;
+    }
+    if (!dest.isConteneur()) {
+      return false;
+    }
+    if (moved.isConteneurContenu(dest)) {
+      ui.notifications.warn(`Impossible de déplacer un conteneur parent (${moved.name}) dans un de ses contenus ${dest.name} !`);
+      return false;
+    }
+
+    // Calculer le total actuel des contenus
+    const encContenu = dest.getEncContenu();
+    const newEnc = moved.getEncTotal(); // Calculer le total actuel du nouvel objet
+    const placeDisponible = Math.roundDecimals(dest.system.capacite - encContenu - newEnc, 4)
+
+    // Teste si le conteneur de destination a suffisament de capacité pour recevoir le nouvel objet
+    if (placeDisponible < 0) {
+      ui.notifications.warn(
+        `Le conteneur ${dest.name} a une capacité de ${dest.system.capacite}, et contient déjà ${encContenu}.
+        Impossible d'y ranger: ${moved.name} d'encombrement ${newEnc}!`);
+      return false;
+    }
+    return true;
+  }
+
+  /* -------------------------------------------- */
+  /** Ajoute un item dans un conteneur, sur la base
+   * de leurs ID */
+  async ajouterDansConteneur(item, conteneur, onAjouterDansConteneur) {
+    if (!conteneur) {
+      // TODO: afficher
+      item.estContenu = false;
+    }
+    else if (conteneur.isConteneur()) {
+      item.estContenu = true;
+      await this.updateEmbeddedDocuments('Item', [{
+        _id: conteneur.id,
+        'system.contenu': [...conteneur.system.contenu, item.id]
+      }]);
+      onAjouterDansConteneur(item.id, conteneur.id);
+    }
+  }
+
+  /* -------------------------------------------- */
+  /** Fonction de remise à plat de l'équipement (ie vide les champs 'contenu') */
+  async nettoyerConteneurs() {
+    RdDConfirm.confirmer({
+      settingConfirmer: "confirmation-vider",
+      content: `<p>Etes vous certain de vouloir vider tous les conteneurs ?</p>`,
+      title: 'Vider les conteneurs',
+      buttonLabel: 'Vider',
+      onAction: async () => {
+        const corrections = [];
+        for (let item of this.items) {
+          if (item.estContenu) {
+            item.estContenu = undefined;
+          }
+          if (item.type == 'conteneur' && item.system.contenu.length > 0) {
+            corrections.push({ _id: item.id, 'system.contenu': [] });
+          }
+        }
+        if (corrections.length > 0) {
+          await this.updateEmbeddedDocuments('Item', corrections);
+        }
+      }
+    });
+  }
+
+  /* -------------------------------------------- */
+  buildSubConteneurObjetList(conteneurId, deleteList) {
+    let conteneur = this.getItem(conteneurId);
+    if (conteneur?.type == 'conteneur') { // Si c'est un conteneur
+      for (let subId of conteneur.system.contenu) {
+        let subObj = this.getItem(subId);
+        if (subObj) {
+          if (subObj.type == 'conteneur') {
+            this.buildSubConteneurObjetList(subId, deleteList);
+          }
+          deleteList.push({ id: subId, conteneurId: conteneurId });
+        }
+      }
+    }
+  }
+
+  /* -------------------------------------------- */
+  async deleteAllConteneur(itemId, options) {
+    let list = [];
+    list.push({ id: itemId, conteneurId: undefined }); // Init list
+    this.buildSubConteneurObjetList(itemId, list);
+    await this.deleteEmbeddedDocuments('Item', list.map(it => it.id), options);
+  }
+
+  /* -------------------------------------------- */
+  /** Supprime un item d'un conteneur, sur la base
+   * de leurs ID */
+  async enleverDeConteneur(item, conteneur, onEnleverDeConteneur) {
+    if (conteneur?.isConteneur()) {
+      item.estContenu = false;
+      await this.updateEmbeddedDocuments('Item', [{
+        _id: conteneur.id,
+        'system.contenu': conteneur.system.contenu.filter(id => id != item.id)
+      }]);
+      onEnleverDeConteneur();
+    }
+  }
+
+  /* -------------------------------------------- */
+  async moveItemsBetweenActors(itemId, sourceActorId) {
+    let itemsList = []
+    let sourceActor = game.actors.get(sourceActorId);
+    itemsList.push({ id: itemId, conteneurId: undefined }); // Init list
+    sourceActor.buildSubConteneurObjetList(itemId, itemsList); // Get itemId list
+
+    const itemsDataToCreate = itemsList.map(it => sourceActor.getItem(it.id))
+      .map(it => duplicate(it))
+      .map(it => { it.system.contenu = []; return it; });
+    let newItems = await this.createEmbeddedDocuments('Item', itemsDataToCreate);
+
+    let itemMap = this._buildMapOldNewId(itemsList, newItems);
+
+    for (let item of itemsList) { // Second boucle pour traiter la remise en conteneurs
+      // gestion conteneur/contenu
+      if (item.conteneurId) { // l'Objet était dans un conteneur
+        let newConteneurId = itemMap[item.conteneurId]; // Get conteneur
+        let newConteneur = this.getItem(newConteneurId);
+
+        let newItemId = itemMap[item.id]; // Get newItem
+
+        console.log('New conteneur filling!', newConteneur, newItemId, item);
+        let contenu = duplicate(newConteneur.system.contenu);
+        contenu.push(newItemId);
+        await this.updateEmbeddedDocuments('Item', [{ _id: newConteneurId, 'system.contenu': contenu }]);
+      }
+    }
+    for (let item of itemsList) {
+      await sourceActor.deleteEmbeddedDocuments('Item', [item.id]);
+    }
+  }
+
+  _buildMapOldNewId(itemsList, newItems) {
+    let itemMap = {};
+    for (let i = 0; i < itemsList.length; i++) {
+      itemMap[itemsList[i].id] = newItems[i].id; // Pour garder le lien ancien / nouveau
+    }
+    return itemMap;
+  }
+
+  /* -------------------------------------------- */
+  async postActorToChat(modeOverride) {
+    let chatData = {
+      doctype: 'Actor',
+      id: this.id,
+      type: this.type,
+      img: this.img,
+      pack: this.pack,
+      name: this.name,
+      system: { description: this.system.description }
+    }
+    renderTemplate('systems/foundryvtt-reve-de-dragon/templates/post-actor.html', chatData)
+      .then(html => ChatMessage.create(RdDUtility.chatDataSetup(html, modeOverride)));
+  }
+
+  actionImpossible(action) {
+    ui.notifications.info(`${this.name} ne peut pas faire cette action: ${action}`)
+
+  }
+  async roll() { this.actionImpossible("jet de caractéristiques") }
+  async jetEthylisme() { this.actionImpossible("jet d'éthylisme") }
+  async rollAppelChance() { this.actionImpossible("appel à la chance") }
+  async jetDeMoral() { this.actionImpossible("jet de moral") }
+
+  async actionPrincipale(item, onActionItem = async () => { }) { 
+    switch (item.type) {
+      case TYPES.conteneur: return await item.sheet.render(true);
+    }
+    return undefined
+  }
+
+}

module/actor/commerce-sheet.js

@@ -0,0 +1,90 @@
+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";
+
+/**
+ * Extend the basic ActorSheet with some very simple modifications
+ * @extends {ActorSheet}
+ */
+export class RdDCommerceSheet extends RdDBaseActorSheet {
+
+  /** @override */
+  static get defaultOptions() {
+    return mergeObject(super.defaultOptions, {
+      template: "systems/foundryvtt-reve-de-dragon/templates/actor/commerce-actor-sheet.html",
+      width: 600, height: 720,
+      tabs: []
+    });
+  }
+  get title() {
+    if (this.actor.token && this.actor.token != this.actor.prototypeToken) {
+      return this.actor.token.name;
+    }
+    return super.title
+  }
+
+  async getData() {
+    const formData = await super.getData();
+    if (this.actor.token && this.actor.token != this.actor.prototypeToken) {
+      mergeObject(formData,
+        {
+          title: this.actor.token.name,
+          token: {
+            img: this.actor.token.texture.src
+          }
+        },
+        { overwrite: true });
+
+    }
+    return formData;
+  }
+  /* -------------------------------------------- */
+  /** @override */
+  activateListeners(html) {
+    super.activateListeners(html);
+
+    this.html.find('a.item-acheter').click(async event => await this.vente(this.getItem(event)));
+
+    if (!this.options.editable) return;
+
+    this.html.find('a.item-quantite-moins').click(async event => await this.getItem(event)?.quantiteIncDec(-1, { supprimerSiZero: false }));
+    this.html.find('a.item-quantite-plus').click(async event => await this.getItem(event)?.quantiteIncDec(1));
+    this.html.find('input.item-quantite').change(async event => {
+      const newQuantite = Math.max(0, Number.parseInt(this.html.find(event.currentTarget).val()));
+      await this.getItem(event)?.update({ "system.quantite": newQuantite });
+    })
+    this.html.find('input.item-cout').change(async event => {
+      const newCout = Math.max(0, Number(this.html.find(event.currentTarget).val()));
+      await this.getItem(event)?.update({ "system.cout": newCout });
+    })
+  }
+
+  getTypesInventaire() {
+    return RdDItem.getItemTypesInventaire('all');
+  }
+
+
+  async vente(item) {
+    const acheteur = RdDUtility.getSelectedActor();
+    if (!acheteur) {
+      ui.notifications.warn(`Pas d'acheteur sélectionné`);
+      return;
+    }
+    const disponible = this.actor.getQuantiteDisponible(item)
+    if (disponible == 0) {
+      ui.notifications.warn(`${this.name} n'a plus de ${item.name} en vente`);
+      return;
+    }
+
+    await DialogItemAchat.onAcheter({
+      item,
+      vendeur: this.actor,
+      acheteur,
+      quantiteIllimite: disponible == undefined,
+      nbLots: disponible ?? 1,
+      tailleLot: 1,
+      prixLot: item.calculerPrixCommercant()
+    });
+  }
+}

module/actor/commerce.js

@@ -0,0 +1,44 @@
+import { Misc } from "../misc.js";
+import { RdDBaseActor } from "./base-actor.js";
+
+export class RdDCommerce extends RdDBaseActor {
+
+  static get defaultIcon() {
+    return "systems/foundryvtt-reve-de-dragon/icons/services/commerce.webp";
+  }
+
+  canReceive(item) {
+    return item.isInventaire('all');
+  }
+
+  getQuantiteDisponible(item) {
+    return (this.system.illimite || item?.isService()) ? undefined : item.getQuantite();
+  }
+
+  verifierFortune(cout) {
+    return this.system.illimite || super.verifierFortune(cout);
+  }
+
+  async depenserSols(cout) {
+    if (this.system.illimite) {
+      return
+    }
+    await super.depenserSols(cout)
+  }
+
+  async consommerNourritureAchetee(achat, vente, createdItemId) {
+    // ne pas consommer pour un commerce
+  }
+
+  async decrementerQuantiteItem(item, quantite) {
+    if (this.system.illimite) {
+      return;
+    }
+    await super.decrementerQuantiteItem(item, quantite, { supprimerSiZero: false });
+  }
+
+  calculerPrix(item) {
+    const pourcentage = this.system.pourcentage ?? 100;
+    return Misc.keepDecimals(Math.ceil(item.system.cout * pourcentage) / 100, 2);
+  }
+}

module/actor/creature-sheet.js

@@ -1,20 +1,16 @@
-import { RdDActorSheet } from "./actor-sheet.js";
+import { RdDBaseActorReveSheet } from "./base-actor-reve-sheet.js";
 
 /**
  * Extend the basic ActorSheet with some very simple modifications
  * @extends {ActorSheet}
  */
-export class RdDActorCreatureSheet extends RdDActorSheet {
+export class RdDCreatureSheet extends RdDBaseActorReveSheet {
 
   /** @override */
   static get defaultOptions() {
-    return mergeObject(super.defaultOptions, {
+    return mergeObject(RdDBaseActorReveSheet.defaultOptions, {
-      classes: ["rdd", "sheet", "actor"],
       template: "systems/foundryvtt-reve-de-dragon/templates/actor-creature-sheet.html",
-      width: 640,
+      width: 640, height: 720
-      height: 720,
-      tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "carac" }],
-      dragDrop: [{ dragSelector: ".item-list .item", dropSelector: undefined }]
     });
   }
 
@@ -40,11 +36,4 @@ export class RdDActorCreatureSheet extends RdDActorSheet {
       this.actor.updateCreatureCompetence(compName, "dommages", parseInt(event.target.value));
     });
   }
-
-  /* -------------------------------------------- */
-  /** @override */
-  _updateObject(event, formData) {
-    // Update the Actor
-    return this.object.update(formData);
-  }
 }

module/actor/creature.js

@@ -0,0 +1,65 @@
+import { ENTITE_INCARNE } from "../constants.js";
+import { STATUSES } from "../settings/status-effects.js";
+import { RdDBaseActorSang } from "./base-actor-sang.js";
+
+export class RdDCreature extends RdDBaseActorSang {
+
+  static get defaultIcon() {
+    return "systems/foundryvtt-reve-de-dragon/icons/creatures/bramart.svg";
+  }
+
+  isCreature() { return true }
+
+  canReceive(item) {
+    return item.type == TYPES.competencecreature || item.isInventaire();
+  }
+
+  async remiseANeuf() {
+    await this.removeEffects(e => true);
+    await this.supprimerBlessures(it => true);
+    const updates = {
+      'system.sante.endurance.value': this.system.sante.endurance.max,
+      'system.sante.vie.value': this.system.sante.vie.max,
+      'system.sante.fatigue.value': 0
+    };
+    await this.update(updates);
+  }
+
+  async finDeRoundBlessures() {
+    const nbGraves = this.filterItems(it => it.isGrave(), 'blessure').length;
+    if (nbGraves > 0) {
+      // Gestion blessure graves : -1 pt endurance par blessure grave
+      await this.santeIncDec("endurance", -nbGraves);
+    }
+  }
+
+  isEffectAllowed(statusId) {
+    return [STATUSES.StatusComma].includes(statusId);
+  }
+
+  isEntiteAccordee(attacker) {
+    if (this.isEntite([ENTITE_INCARNE])) {
+      let resonnance = this.system.sante.resonnance
+      return (resonnance.actors.find(it => it == attacker.id))
+    }
+    return true
+  }
+
+  /* -------------------------------------------- */
+  async setEntiteReveAccordee(attacker) {
+    if (this.isEntite([ENTITE_INCARNE])) {
+      let resonnance = duplicate(this.system.sante.resonnance);
+      if (resonnance.actors.find(it => it == attacker.id)) {
+        // déjà accordé
+        return;
+      }
+      resonnance.actors.push(attacker.id);
+      await this.update({ "system.sante.resonnance": resonnance });
+    }
+    else {
+      super.setEntiteReveAccordee(attacker)
+    }
+  }
+
+
+}

module/actor/entite-sheet.js

@@ -0,0 +1,62 @@
+import { RdDBaseActorReveSheet } from "./base-actor-reve-sheet.js";
+import { RdDSheetUtility } from "../rdd-sheet-utility.js";
+import { RdDUtility } from "../rdd-utility.js";
+
+export class RdDActorEntiteSheet extends RdDBaseActorReveSheet {
+
+  /** @override */
+  static get defaultOptions() {
+    return mergeObject(RdDBaseActorReveSheet.defaultOptions, {
+      template: "systems/foundryvtt-reve-de-dragon/templates/actor-entite-sheet.html",
+      width: 640, height: 720,
+    });
+  }
+
+  async getData() {
+    let formData = await super.getData();
+    formData.resonances = this.actor.system.sante.resonnance.actors.map(actorId => game.actors.get(actorId))
+      .map(actor => { return { id: actor.id, name: actor.name, img: actor.img } })
+    return formData
+  }
+
+  /* -------------------------------------------- */
+  /** @override */
+  activateListeners(html) {
+    super.activateListeners(html);
+
+    // Everything below here is only needed if the sheet is editable
+    if (!this.options.editable) return;
+
+    // On competence change
+    this.html.find('.creature-carac').change(async event => {
+      let compName = event.currentTarget.attributes.compname.value;
+      this.actor.updateCreatureCompetence(compName, "carac_value", parseInt(event.target.value));
+    });
+    this.html.find('.creature-niveau').change(async event => {
+      let compName = event.currentTarget.attributes.compname.value;
+      this.actor.updateCreatureCompetence(compName, "niveau", parseInt(event.target.value));
+    });
+    this.html.find('.creature-dommages').change(async event => {
+      let compName = event.currentTarget.attributes.compname.value;
+      this.actor.updateCreatureCompetence(compName, "dommages", parseInt(event.target.value));
+    });
+    this.html.find('.resonance-delete').click(async event => {
+      const li = RdDSheetUtility.getEventElement(event);
+      const actorId = li.data("actor-id");
+      if (actorId) {
+        const actorResonance = game.actors.get(actorId);
+        RdDUtility.confirmerSuppressionSubacteur(this, actorResonance, li, () => {
+          console.log('Delete : ', actorId);
+          this.removeSubacteur(actorId);
+          RdDUtility.slideOnDelete(this, li);
+        });
+      }
+    });
+  }
+
+  async removeSubacteur(actorId) {
+    let newResonances = this.actor.system.sante.resonnance.actors.filter(id => id != actorId);
+    await this.actor.update({ 'system.sante.resonnance.actors': newResonances }, { renderSheet: false });
+  }
+
+}

module/actor/entite.js

@@ -0,0 +1,110 @@
+import { ENTITE_INCARNE, ENTITE_NONINCARNE } from "../constants.js";
+import { TYPES } from "../item.js";
+import { Misc } from "../misc.js";
+import { RdDEncaisser } from "../rdd-roll-encaisser.js";
+import { STATUSES } from "../settings/status-effects.js";
+import { RdDBaseActorReve } from "./base-actor-reve.js";
+
+export class RdDEntite extends RdDBaseActorReve {
+
+  static get defaultIcon() {
+    return "systems/foundryvtt-reve-de-dragon/icons/entites/darquoine.webp";
+  }
+
+  canReceive(item) {
+    return item.type == TYPES.competencecreature
+  }
+
+  isEntite(typeentite = []) {
+    return (typeentite.length == 0 || typeentite.includes(this.system.definition.typeentite));
+  }
+  isNonIncarnee() { return this.isEntite([ENTITE_NONINCARNE]) }
+
+  getReveActuel() {
+    return Misc.toInt(this.system.carac.reve?.value)
+  }
+
+  getForce() { return this.getReve() }
+  getAgilite() { return this.getReve() }
+  getChance() { return this.getReve() }
+
+  getDraconicOuPossession() {
+    return this.itemTypes[TYPES.competencecreature]
+      .filter(it => it.system.categorie == 'possession')
+      .sort(Misc.descending(it => it.system.niveau))
+      .find(it => true);
+  }
+
+  async remiseANeuf() {
+    await this.removeEffects(e => true);
+    if (!this.isNonIncarnee()) {
+      await this.update({
+        'system.sante.endurance.value': this.system.sante.endurance.max
+      });
+    }
+  }
+
+  isDead() {
+    return this.isNonIncarnee() ? false : this.system.sante.endurance.value <= 0
+  }
+
+  async santeIncDec(name, inc, isCritique = false) {
+    if (name == 'endurance' && !this.isNonIncarnee()) {
+      const oldValue = this.system.sante.endurance.value;
+      const endurance = Math.max(0,
+        Math.min(oldValue + inc,
+          this.system.sante.endurance.max));
+      await this.update({ "system.sante.endurance.value": endurance })
+      await this.setEffect(STATUSES.StatusComma, endurance <= 0);
+      return {
+        perte: oldValue - endurance,
+        newValue: endurance
+      }
+    }
+    return {}
+  }
+  async encaisser() {
+    if (this.isNonIncarnee()) {
+      return
+    }
+    await RdDEncaisser.encaisser(this) 
+  }
+
+  isEffectAllowed(statusId) {
+    return [STATUSES.StatusComma].includes(statusId);
+  }
+
+  async onAppliquerJetEncaissement(encaissement, attacker) {
+    const perteEndurance = await this.santeIncDec("endurance", -encaissement.endurance);
+    mergeObject(encaissement, {
+      resteEndurance: perteEndurance.newValue,
+      endurance: perteEndurance.perte
+    });
+  }
+
+  isEntiteAccordee(attacker) {
+    if (this.isEntite([ENTITE_INCARNE])) {
+      let resonnance = this.system.sante.resonnance
+      return (resonnance.actors.find(it => it == attacker.id))
+    }
+    return true
+  }
+
+  /* -------------------------------------------- */
+  async setEntiteReveAccordee(attacker) {
+    if (this.isEntite([ENTITE_INCARNE])) {
+      let resonnance = duplicate(this.system.sante.resonnance);
+      if (resonnance.actors.find(it => it == attacker.id)) {
+        // déjà accordé
+        return;
+      }
+      resonnance.actors.push(attacker.id);
+      await this.update({ "system.sante.resonnance": resonnance });
+    }
+    else {
+      super.setEntiteReveAccordee(attacker)
+    }
+  }
+
+
+}

module/actor/experience-log.js

@@ -0,0 +1,39 @@
+
+export const XP_TOPIC = {
+  XP: { code: 'xp', label: 'xp' },
+  XPSORT: { code: 'xpsort', label: 'xp sort' },
+  NIVEAU: { code: 'niveau', label: 'Niveau' },
+  XPCARAC: { code: 'xpcarac', label: 'xp carac' },
+  CARAC: { code: 'carac', label: 'Carac' },
+  STRESS: { code: 'stress', label: 'Stress' },
+  TRANSFORM: { code: 'xps', label: 'Transformé' },
+}
+
+export class ExperienceLog {
+
+  static async add(actor, topic, from, to, raison, manuel = false) {
+    if (!actor.hasPlayerOwner || !actor.isPersonnage()) {
+      return
+    }
+    if (from == to) {
+      return
+    }
+    const newXpLog = {
+      mode: topic?.code ?? topic,
+      raison: (manuel ? '(manuel) ' : '') + raison,
+      from: from,
+      to: to,
+      valeur: to - from,
+      daterdd: game.system.rdd.calendrier.dateCourante(),
+      datereel: game.system.rdd.calendrier.dateReel().replace('T', ' ')
+    };
+    console.log('ExperienceLog.add', newXpLog)
+    const newExperienceLog = (actor.system.experiencelog ?? []).concat([newXpLog]);
+    await actor.update({ [`system.experiencelog`]: newExperienceLog });
+  }
+
+  static labelTopic(topic) {
+    const xpt = Object.values(XP_TOPIC).find(it => it.code == topic);
+    return xpt?.label ?? xpt?.code ?? topic;
+  }
+}

module/actor/vehicule-sheet.js

@@ -1,23 +1,35 @@
-import { RdDUtility } from "./rdd-utility.js";
+import { RdDUtility } from "../rdd-utility.js";
-import { RdDActorSheet } from "./actor-sheet.js";
+import { RdDBaseActorSheet } from "./base-actor-sheet.js";
 
 /* -------------------------------------------- */
-export class RdDActorVehiculeSheet extends RdDActorSheet {
+export class RdDActorVehiculeSheet extends RdDBaseActorSheet {
 
   /** @override */
   static get defaultOptions() {
     RdDUtility.initAfficheContenu();
 
-    return mergeObject(super.defaultOptions, {
+    return mergeObject(RdDBaseActorSheet.defaultOptions, {
-      classes: ["rdd", "sheet", "actor"],
       template: "systems/foundryvtt-reve-de-dragon/templates/actor-vehicule-sheet.html",
-      width: 640,
+      width: 640, height: 720,
-      height: 720,
-      tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "carac" }],
-      dragDrop: [{ dragSelector: ".item-list .item", dropSelector: undefined }]
     });
   }
 
+  /* -------------------------------------------- */
+  async getData() {
+    let formData = await super.getData();
+    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,
+      });
+
+    this.timerRecherche = undefined;
+    return formData;
+  }
+
   activateListeners(html) {
     super.activateListeners(html);
     if (!this.options.editable) return;

module/actor/vehicule.js

@@ -0,0 +1,28 @@
+import { RdDBaseActor } from "./base-actor.js";
+
+export class RdDVehicule extends RdDBaseActor {
+
+  static get defaultIcon() {
+    return "systems/foundryvtt-reve-de-dragon/icons/vehicules/charette.webp";
+  }
+  isVehicule() { return true }
+
+  canReceive(item) {
+    return item.isInventaire();
+  }
+
+  getEncombrementMax() {
+    return this.system.capacite_encombrement;
+  }
+
+  async vehicleIncDec(name, inc) {
+    if (!['resistance', 'structure'].includes(name)) {
+      return
+    }
+    const newValue = this.system.etat[name].value + inc;
+    if (0 <= newValue && newValue <= this.system.etat[name].max) {
+      await this.update({ [`system.etat.${name}.value`]: newValue })
+    }
+  }
+
+}

module/chat-utility.js

@@ -78,11 +78,7 @@ export class ChatUtility {
 
   /* -------------------------------------------- */
   static async createChatWithRollMode(name, chatOptions) {
-    return await ChatUtility.createChatMessage(name, game.settings.get("core", "rollMode"), chatOptions);
+    let rollMode = game.settings.get("core", "rollMode")
-  }
-
-  /* -------------------------------------------- */
-  static async createChatMessage(name, rollMode, chatOptions) {
     switch (rollMode) {
       case "blindroll": // GM only
         if (!game.user.isGM) {

module/dialog-chronologie.js

@@ -1,5 +1,7 @@
 import { SYSTEM_RDD } from "./constants.js";
 import { Grammar } from "./grammar.js";
+import { HtmlUtility } from "./html-utility.js";
+import { RdDTimestamp } from "./time/rdd-timestamp.js";
 
 
 const LATEST_USED_JOURNAL_ID = "chronologie-dernier-journal";
@@ -16,62 +18,75 @@ export class DialogChronologie extends Dialog {
     });
   }
   static async create() {
-    const dateRdD = game.system.rdd.calendrier.getCalendrier();
     const dialogData = {
       auteur: game.user.name,
       isGM: game.user.isGM,
       information: "",
       journalId: game.settings.get(SYSTEM_RDD, LATEST_USED_JOURNAL_ID),
       journaux: game.journal.filter(it => it.testUserPermission(game.user, CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER)),
-      dateRdD: dateRdD,
+      timestamp: game.system.rdd.calendrier.timestamp,
-      jourRdD: dateRdD.jour +1,
+      dateReel: game.system.rdd.calendrier.dateReel()
-      heureRdD: game.system.rdd.calendrier.getCurrentHeure(),
-      dateReel: DialogChronologie.getCurrentDateTime()
     };
     const html = await renderTemplate("systems/foundryvtt-reve-de-dragon/templates/dialog-chronologie.html", dialogData);
-    const dialog = new DialogChronologie(html);
+    const dialog = new DialogChronologie(html, dialogData);
     dialog.render(true);
   }
 
-  constructor(html) {
+  constructor(html, dialogData) {
     const options = {
       classes: ["DialogChronologie"],
       width: 500,
       height: 'fit-content',
       'z-index': 99999
     };
+    const timeData = dialogData.timestamp.toCalendrier()
     const conf = {
-      title: "Chronologie",
+      title: `Chronologie - ${timeData.jourDuMois} ${timeData.mois.label} - Heure  ${timeData.heure.label}`,
       content: html,
       buttons: {
-        ajout: { label: "Ajouter", callback: it => this.ajouter() },
       }
     };
     super(conf, options);
-  }
+    this.dialogData = dialogData;
-
-  static getCurrentDateTime() {
-    return new Date().toLocaleString("sv-SE", {
-      year: "numeric",
-      month: "2-digit",
-      day: "2-digit",
-      hour: "2-digit",
-      minute: "2-digit"
-    }).replace(" ", "T");
   }
 
   activateListeners(html) {
-    super.activateListeners(html);
     this.html = html;
+    super.activateListeners(html);
+    const journalPrecedent = game.journal.get(this.dialogData.journalId);
+    this.showChronologiePreset(!(journalPrecedent?.canUserModify(game.user)))
+
+    this.html.find("a.chronologie-preset-show").click(event => this.showChronologiePreset(true));
+    this.html.find("a.chronologie-preset-hide").click(event => this.showChronologiePreset(false));
+    this.html.find("button.chronologie-ajouter").click(event => this.ajouter());
+  }
+
+  showChronologiePreset(showPreset) {
+    HtmlUtility.showControlWhen(this.html.find(".chronologie-preset-show"), !showPreset);
+    HtmlUtility.showControlWhen(this.html.find(".chronologie-preset-hide"), showPreset);
+    HtmlUtility.showControlWhen(this.html.find(".chronologie-preset"), showPreset);
   }
 
   async ajouter() {
     await this.forceValidation();
     const { journalId, journalEntry } = this.findJournal();
-    // ajouter à la page ou créer une page
+    if (journalEntry?.canUserModify(game.user)) {
-    this.addContentToJournal(journalEntry, await this.prepareChronologieEntry());
+      const journalParameters = this.extractJournalParameters();
 
+      const jour = journalParameters.dateRdD.jour;
+      const mois = journalParameters.dateRdD.mois.label;
+      const annee = journalParameters.dateRdD.annee;
+      const section = `${jour} ${mois} ${annee}`
+      const content = await this.prepareChronologieEntry(journalParameters);
+      // ajouter à la page ou créer une page
+      this.addContentToJournal(journalEntry, section, content);
       this.storeLatestUsedJournalEntry(journalId);
+      this.close();
+    }
+    else {
+      const journal = this.html.find("form.rdddialogchrono select[name='journalId']").val();
+      ui.notifications.warn(`Le journal ${journal} n'est pas accessible`);
+    }
   }
 
   async forceValidation() {
@@ -84,8 +99,8 @@ export class DialogChronologie extends Dialog {
     return { journalId, journalEntry };
   }
 
-  async prepareChronologieEntry() {
+  async prepareChronologieEntry(journalParameters) {
-    return await renderTemplate("systems/foundryvtt-reve-de-dragon/templates/chronologie-entry.html", this.extractJournalParameters());
+    return await renderTemplate("systems/foundryvtt-reve-de-dragon/templates/chronologie-entry.html", journalParameters);
   }
 
   extractJournalParameters() {
@@ -93,28 +108,29 @@ export class DialogChronologie extends Dialog {
       auteur: this.html.find("form.rdddialogchrono :input[name='auteur']").val(),
       information: this.html.find("form.rdddialogchrono :input[name='information']").val(),
       dateRdD: {
-        jour: this.html.find("form.rdddialogchrono :input[name='jourRdD']").val(),
+        jour: this.html.find("form.rdddialogchrono :input[name='chronologie.jourDuMois']").val(),
-        moisRdD: this.html.find("form.rdddialogchrono :input[name='dateRdD.moisRdD.key']").val(),
+        mois: RdDTimestamp.definition(this.html.find("form.rdddialogchrono :input[name='chronologie.mois']").val()),
-        annee: this.html.find("form.rdddialogchrono :input[name='dateRdD.annee']").val()
+        annee: this.html.find("form.rdddialogchrono :input[name='chronologie.annee']").val(),
+        heure: RdDTimestamp.definition(this.html.find("form.rdddialogchrono :input[name='chronologie.heure']").val()),
+        minute: this.html.find("form.rdddialogchrono :input[name='chronologie.minute']").val(),
       },
-      heureRdD: this.html.find("form.rdddialogchrono :input[name='heureRdD']").val(),
       dateReel: this.html.find("form.rdddialogchrono :input[name='dateReel']").val().replace('T', ' ')
     }
   }
 
-  addContentToJournal(journalEntry, content) {
+  addContentToJournal(journalEntry, section, content) {
-    let page = journalEntry.pages.find(p => p.type == 'text' && Grammar.equalsInsensitive(p.name, 'Chronologie'));
+    let page = journalEntry.pages.find(p => p.type == 'text' && Grammar.equalsInsensitive(p.name, section));
     if (page) {
-      page.update({ 'text.content': content + '\n' + page.text.content });
+      page.update({ 'text.content': page.text.content + '\n' + content });
     }
     else {
-      journalEntry.createEmbeddedDocuments('JournalEntryPage', [this.newPageChronologie(content)]);
+      journalEntry.createEmbeddedDocuments('JournalEntryPage', [this.newPageChronologie(section, content)]);
     }
   }
 
-  newPageChronologie(content) {
+  newPageChronologie(section, content) {
     return new JournalEntryPage({
-      name: 'Chronologie',
+      name: section,
       type: 'text',
       title: { show: true, level: 1 },
       text: { content: content, format: 1 }

module/dialog-create-signedraconique.js

@@ -1,6 +1,6 @@
 import { ChatUtility } from "./chat-utility.js";
 import { HtmlUtility } from "./html-utility.js";
-import { RdDItemSigneDraconique } from "./item-signedraconique.js";
+import { RdDItemSigneDraconique } from "./item/signedraconique.js";
 import { TMRUtility } from "./tmr-utility.js";
 
 export class DialogCreateSigneDraconique extends Dialog {
@@ -14,7 +14,7 @@ export class DialogCreateSigneDraconique extends Dialog {
         .map(actor => ({
           id: actor.id,
           name: actor.name,
-          selected: true
+          selected: false
         }))
     };
 
@@ -98,7 +98,7 @@ export class DialogCreateSigneDraconique extends Dialog {
 
   async setEphemere(ephemere) {
     this.dialogData.signe.system.ephemere = ephemere;
-    HtmlUtility._showControlWhen(this.html.find(".signe-system-duree"), ephemere);
+    HtmlUtility.showControlWhen(this.html.find(".signe-system-duree"), ephemere);
   }
 
   async onSelectActor(event) {
@@ -111,7 +111,7 @@ export class DialogCreateSigneDraconique extends Dialog {
 
   onSelectTmr(event) {
     const tmrName = this.html.find(event.currentTarget)?.data("tmr-name");
-    const onTmr = this.tmrs.find(it => it.name == tmrName);
+    const onTmr = this.dialogData.tmrs.find(it => it.name == tmrName);
     if (onTmr){
       onTmr.selected = event.currentTarget.checked;
     }

module/dialog-fabriquer-potion.js

@@ -5,7 +5,7 @@ import { RdDUtility } from "./rdd-utility.js";
 export class DialogFabriquerPotion extends Dialog {
 
   /* -------------------------------------------- */
-  static async create(actor, item, dialogConfig) {
+  static async create(actor, item, onActionItem) {
     const min = DialogFabriquerPotion.nombreBrinsMinimum(item);
     if (item.system.quantite < min) {
       ui.notifications.warn(`Vous avez ${item.system.quantite} brins de ${item.name}, il en faut au moins ${min} pour faire une potion!`);
@@ -13,12 +13,10 @@ export class DialogFabriquerPotion extends Dialog {
     }
     let potionData = DialogFabriquerPotion.prepareData(actor, item);
 
-    const html = await renderTemplate(dialogConfig.html, potionData);
+    const html = await renderTemplate( 'systems/foundryvtt-reve-de-dragon/templates/dialog-fabriquer-potion-base.html', potionData);
 
     let options = { classes: ["dialogfabriquerpotion"], width: 600, height: 160, 'z-index': 99999 };
-    mergeObject(options, dialogConfig.options ?? {}, { overwrite: true })
+    new DialogFabriquerPotion(actor, potionData, onActionItem, html, options).render(true);
-
-    new DialogFabriquerPotion(actor, potionData, html, options).render(true);
   }
 
   /* -------------------------------------------- */
@@ -34,14 +32,14 @@ export class DialogFabriquerPotion extends Dialog {
   }
 
   /* -------------------------------------------- */
-  constructor(actor, potionData, html, options) {
+  constructor(actor, potionData, onActionItem, html, options) {
     const conf = {
       title: `Fabriquer une potion de ${potionData.system.categorie}`,
       content: html,
       default: 'fabriquer',
       buttons: {
         'fabriquer': {
-          label: potionData.buttonName, callback: it => this.onFabriquer(html)
+          label: potionData.buttonName, callback: it => this.onFabriquer()
         }
       }
     };
@@ -50,6 +48,7 @@ export class DialogFabriquerPotion extends Dialog {
 
     this.actor = actor;
     this.potionData = potionData;
+    this.onActionItem = onActionItem;
   }
 
   /* -------------------------------------------- */
@@ -64,10 +63,11 @@ export class DialogFabriquerPotion extends Dialog {
   }
 
   /* -------------------------------------------- */
-  async onFabriquer(html) {
+  async onFabriquer() {
     await this.html.find("[name='nbBrins']").change();
-    this.actor.fabriquerPotion(this.potionData);
+    await this.actor.fabriquerPotion(this.potionData);
     this.close();
+    await this.onActionItem()
   }
 
   static nombreBrinsMinimum(herbeData) {

module/dialog-item-achat.js

@@ -1,14 +1,13 @@
-
+import { Misc } from "./misc.js";
-import { Monnaie } from "./item-monnaie.js";
 import { RdDUtility } from "./rdd-utility.js";
 
 export class DialogItemAchat extends Dialog {
 
-  static venteData(button) {
+  static preparerAchat(chatButton) {
-    const vendeurId = button.attributes['data-vendeurId']?.value;
+    const vendeurId = chatButton.attributes['data-vendeurId']?.value;
     const vendeur = vendeurId ? game.actors.get(vendeurId) : undefined;
     const acheteur = RdDUtility.getSelectedActor();
-    const json = button.attributes['data-jsondata']?.value;
+    const json = chatButton.attributes['data-jsondata']?.value;
     if (!acheteur && !vendeur) {
       ui.notifications.info("Pas d'acheteur ni de vendeur, aucun changement");
       return undefined;
@@ -18,46 +17,66 @@ export class DialogItemAchat extends Dialog {
       return undefined;
     }
 
-    const prixLot = Number(button.attributes['data-prixLot']?.value ?? 0);
     return {
-      item: json ? JSON.parse(json) : undefined,
+      item: JSON.parse(json),
-      actingUserId: game.user.id,
+      vendeur,
-      vendeurId: vendeurId,
+      acheteur,
-      vendeur: vendeur,
+      nbLots: parseInt(chatButton.attributes['data-quantiteNbLots']?.value),
-      acheteur: acheteur,
+      tailleLot: parseInt(chatButton.attributes['data-tailleLot']?.value ?? 1),
-      tailleLot: parseInt(button.attributes['data-tailleLot']?.value ?? 1),
+      prixLot: Number(chatButton.attributes['data-prixLot']?.value ?? 0),
-      quantiteIllimite: button.attributes['data-quantiteIllimite']?.value == 'true',
+      quantiteIllimite: chatButton.attributes['data-quantiteIllimite']?.value == 'true',
-      quantiteNbLots: parseInt(button.attributes['data-quantiteNbLots']?.value),
+      chatMessageIdVente: RdDUtility.findChatMessageId(chatButton),
-      choix: {
-        nombreLots: 1,
-        seForcer: false,
-        supprimerSiZero: true
-      },
-      prixLot: prixLot,
-      prixTotal: prixLot,
-      isVente: prixLot > 0,
-      chatMessageIdVente: RdDUtility.findChatMessageId(button)
     };
   }
 
-  static async onAcheter(venteData) {
+
+  static async onAcheter({ item, vendeur, acheteur, tailleLot, prixLot, nbLots, quantiteIllimite, chatMessageIdVente }) {
+    const venteData = {
+      item,
+      actingUserId: game.user.id,
+      vendeur,
+      acheteur,
+      tailleLot,
+      quantiteIllimite,
+      quantiteNbLots: nbLots,
+      choix: { seForcer: false, supprimerSiZero: true },
+      prixLot,
+      isVente: prixLot > 0,
+      isConsommable: item.type == 'nourritureboisson' && acheteur?.isPersonnage(),
+      chatMessageIdVente
+    };
+
+    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) {
+    venteData.choix.nombreLots = nombreLots;
+    venteData.prixTotal = (nombreLots * venteData.prixLot).toFixed(2);
+    if (venteData.isConsommable) {
+      const doses = nombreLots * venteData.tailleLot;
+      venteData.totalSust = Misc.keepDecimals(doses * (venteData.item.system.sust ?? 0), 2);
+      venteData.totalDesaltere = venteData.item.system.boisson
+        ? Misc.keepDecimals(doses * (venteData.item.system.desaltere ?? 0), 2)
+        : 0;
+    }
+  }
+
   constructor(html, venteData) {
-    const isConsommable = venteData.item.type == 'nourritureboisson' && venteData.acheteur?.isPersonnage();
     let options = { classes: ["dialogachat"], width: 400, height: 'fit-content', 'z-index': 99999 };
 
     const actionAchat = venteData.prixLot > 0 ? "Acheter" : "Prendre";
     const buttons = {};
-    if (isConsommable) {
+    if (venteData.isConsommable) {
       buttons["consommer"] = { label: venteData.item.system.boisson ? "Boire" : "Manger", callback: it => this.onAchatConsommer() }
     }
     buttons[actionAchat] = { label: actionAchat, callback: it => { this.onAchat(); } };
     buttons["decliner"] = { label: "Décliner", callback: it => { } };
+    const acheteur = venteData.acheteur?.name ?? 'Un acheteur';
+    const vendeur = venteData.vendeur?.name ?? 'Un vendeur';
     let conf = {
-      title: venteData.acheteur ? venteData.acheteur.name + " - " + actionAchat : actionAchat,
+      title: `${acheteur} - ${actionAchat} à ${vendeur}`,
       content: html,
       default: actionAchat,
       buttons: buttons
@@ -98,13 +117,21 @@ export class DialogItemAchat extends Dialog {
   }
 
   setNombreLots(nombreLots) {
-    if (nombreLots > this.venteData.quantiteNbLots) {
+
+    if (!this.venteData.quantiteIllimite) {
+      if (!this.venteData.quantiteIllimite && nombreLots > this.venteData.quantiteNbLots) {
         ui.notifications.warn(`Seulement ${this.venteData.quantiteNbLots} lots disponibles, vous ne pouvez pas en prendre ${nombreLots}`)
       }
-    this.venteData.choix.nombreLots = Math.min(nombreLots, this.venteData.quantiteNbLots);
+      nombreLots = Math.min(nombreLots, this.venteData.quantiteNbLots);
-    this.venteData.prixTotal = (nombreLots * this.venteData.prixLot).toFixed(2);
-    this.html.find(".nombreLots").val(this.venteData.choix.nombreLots);
-    this.html.find(".prixTotal").text(this.venteData.prixTotal);
     }
 
+    DialogItemAchat.changeNombreLots(this.venteData, nombreLots);
+
+    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-vente.js

@@ -2,21 +2,22 @@ import { HtmlUtility } from "./html-utility.js";
 
 export class DialogItemVente extends Dialog {
 
-  static async display(item, callback) {
+  static async display({ item, callback, quantiteMax = undefined }) {
-    const quantite = item.isConteneur() ? 1 : item.system.quantite;
+    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,
-      prixOrigine: item.system.cout,
+      prixOrigine: item.calculerPrixCommercant(),
-      prixUnitaire: item.system.cout,
+      prixUnitaire: item.calculerPrixCommercant(),
-      prixLot: item.system.cout,
+      prixLot: item.calculerPrixCommercant(),
       tailleLot: 1,
       quantiteNbLots: quantite,
       quantiteMaxLots: quantite,
-      quantiteMax: quantite ,
+      quantiteMax: quantite,
-      quantiteIllimite: !item.isOwned,
+      quantiteIllimite: item.isItemCommerce() ? quantiteMax == undefined : !isOwned,
-      isOwned: item.isOwned,
+      isOwned: isOwned,
     };
     const html = await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/dialog-item-vente.html`, venteData);
     return new DialogItemVente(venteData, html, callback).render(true);
@@ -39,55 +40,63 @@ export class DialogItemVente extends Dialog {
 
   activateListeners(html) {
     super.activateListeners(html);
-    this.html = html;
-    HtmlUtility._showControlWhen(this.html.find(".quantiteNbLots"), !this.venteData.quantiteIllimite)
 
+    this.html = html;
     this.html.find(".tailleLot").change(event => this.setTailleLot(Number(event.currentTarget.value)));
     this.html.find(".quantiteNbLots").change(event => this.setNbLots(Number(event.currentTarget.value)));
     this.html.find(".quantiteIllimite").change(event => this.setQuantiteIllimite(event.currentTarget.checked));
     this.html.find(".prixLot").change(event => this.setPrixLot(Number(event.currentTarget.value)));
+
+    this.setQuantiteIllimite(this.venteData.quantiteIllimite);
   }
 
   async onProposer(it) {
-    await this.html.find(".tailleLot").change();
+    this.updateVente(this.getChoixVente());
-    await this.html.find(".quantiteNbLots").change();
-    await this.html.find(".quantiteIllimite").change();
-    await this.html.find(".prixLot").change();
     this.callback(this.venteData);
   }
 
+  updateVente(update) {
+    mergeObject(this.venteData, update);
+  }
+
+  getChoixVente() {
+    return {
+      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())
+    };
+  }
+
   /* -------------------------------------------- */
   setPrixLot(prixLot) {
     this.venteData.prixLot = prixLot;
   }
 
   setTailleLot(tailleLot) {
-    // recalculer le prix du lot
+    const maxLots = Math.floor(this.venteData.quantiteMax / tailleLot);
-    if (tailleLot != this.venteData.tailleLot) {
+    this.updateVente({
-      this.venteData.prixLot = (tailleLot * this.venteData.prixOrigine).toFixed(2);
+      tailleLot,
+      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.venteData.tailleLot = tailleLot;
-    if (this.venteData.isOwned) {
-      // recalculer le nombre de lots max
-      this.venteData.quantiteMaxLots = Math.floor(this.venteData.quantiteMax / tailleLot);
-      this.venteData.quantiteNbLots = Math.min(this.venteData.quantiteMaxLots, this.venteData.quantiteNbLots);
     this.html.find(".quantiteNbLots").val(this.venteData.quantiteNbLots);
     this.html.find(".quantiteNbLots").attr("max", this.venteData.quantiteMaxLots)
   }
-  }
 
   setNbLots(nbLots) {
-    if (this.venteData.isOwned) {
+    this.updateVente({
-      nbLots = Math.max(0, Math.min(nbLots, this.venteData.quantiteMaxLots));
+      quantiteNbLots: this.venteData.isOwned ? Math.max(0, Math.min(nbLots, this.venteData.quantiteMaxLots)) : nbLots
-    }
+    })
-    this.venteData.quantiteNbLots = nbLots;
     this.html.find(".quantiteNbLots").val(this.venteData.quantiteNbLots);
   }
 
   setQuantiteIllimite(checked) {
-    this.venteData.quantiteIllimite = checked;
+    this.updateVente({ quantiteIllimite: checked })
     this.html.find(".label-quantiteIllimite").text(this.venteData.quantiteIllimite ? "Illimités" : "disponibles");
-    HtmlUtility._showControlWhen(this.html.find(".quantiteNbLots"), !this.venteData.quantiteIllimite)
+    HtmlUtility.showControlWhen(this.html.find(".quantiteNbLots"), !this.venteData.quantiteIllimite)
   }
 }

module/dialog-repos.js

@@ -1,57 +0,0 @@
-import { Misc } from "./misc.js";
-
-export class DialogRepos extends Dialog {
-
-  static async create(actor) {
-    const html = await renderTemplate("systems/foundryvtt-reve-de-dragon/templates/dialog-repos.html", actor);
-    const dialog = new DialogRepos(html, actor);
-    dialog.render(true);
-  }
-
-  constructor(html, actor) {
-    let options = { classes: ["DialogCreateSigneDraconiqueActorsActors"], width: 400, height: 'fit-content', 'z-index': 99999 };
-    let conf = {
-      title: "Se reposer",
-      content: html,
-      default: "repos",
-      buttons: {
-        "repos": { label: "Se reposer", callback: async it => { this.repos(); } }
-      }
-    };
-    super(conf, options);
-    this.actor = actor;
-  }
-  activateListeners(html) {
-    super.activateListeners(html);
-    this.html = html;
-  }
-  /* -------------------------------------------- */
-
-  async repos() {
-    await this.html.find("[name='nb-heures']").change();
-    await this.html.find("[name='nb-jours']").change();
-    const selection = await this.html.find("[name='repos']:checked").val();
-    const nbHeures = Number.parseInt(await this.html.find("[name='nb-heures']").val());
-    const nbJours = Number.parseInt(await this.html.find("[name='nb-jours']").val());
-    switch (selection) {
-      case "sieste": {
-        await this.actor.dormir(nbHeures);
-        return;
-      }
-      case "nuit": {
-        let heuresDormies = await this.actor.dormir(nbHeures);
-        if (heuresDormies == nbHeures) {
-          await this.actor.dormirChateauDormant();
-        }
-        return;
-      }
-      case "chateau-dormant":
-        await this.actor.dormirChateauDormant();
-        return;
-      case "gris-reve": {
-        await this.actor.grisReve(nbJours);
-        return;
-      }
-    }
-  }
-}

module/dialog-validation-encaissement.js

@@ -7,23 +7,22 @@ import { RdDUtility } from "./rdd-utility.js";
  */
 export class DialogValidationEncaissement extends Dialog {
 
-  static async validerEncaissement(actor, rollData, armure, show, onEncaisser) {
+  static async validerEncaissement(actor, rollData, armure, onEncaisser) {
     let encaissement = await RdDUtility.jetEncaissement(rollData, armure, { showDice: HIDE_DICE });
     const html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/dialog-validation-encaissement.html', {
       actor: actor,
       rollData: rollData,
-      encaissement: encaissement,
+      encaissement: encaissement
-      show: show
     });
-    const dialog = new DialogValidationEncaissement(html, actor, rollData, armure, encaissement, show, onEncaisser);
+    const dialog = new DialogValidationEncaissement(html, actor, rollData, armure, encaissement, onEncaisser);
     dialog.render(true);
   }
 
   /* -------------------------------------------- */
-  constructor(html, actor, rollData, armure, encaissement, show, onEncaisser) {
+  constructor(html, actor, rollData, armure, encaissement, onEncaisser) {
     // Common conf
     let buttons = {
-      "valider": { label: "Valider", callback: html => this.validerEncaissement() },
+      "valider": { label: "Valider", callback: html => this.onValider() },
       "annuler": { label: "Annuler", callback: html => { } },
     };
 
@@ -47,7 +46,6 @@ export class DialogValidationEncaissement extends Dialog {
     this.rollData = rollData;
     this.armure = armure;
     this.encaissement = encaissement;
-    this.show = show;
     this.onEncaisser = onEncaisser;
     this.forceDiceResult = {total: encaissement.roll.result };
   }
@@ -64,8 +62,8 @@ export class DialogValidationEncaissement extends Dialog {
     });
   }
 
-  async validerEncaissement() {
+  async onValider() {
     this.encaissement = await RdDUtility.jetEncaissement(this.rollData, this.armure, { showDice: SHOW_DICE, forceDiceResult: this.forceDiceResult});
-    this.onEncaisser(this.encaissement, this.show)
+    this.onEncaisser(this.encaissement)
   }
 }

module/environnement.js

@@ -1,223 +1,78 @@
 import { SYSTEM_RDD } from "./constants.js";
 import { Grammar } from "./grammar.js";
 import { Misc } from "./misc.js";
-import { CompendiumTableHelpers, CompendiumTable } from "./settings/system-compendiums.js";
+import { CompendiumTableHelpers, CompendiumTable, SystemCompendiums } from "./settings/system-compendiums.js";
 
-const RARETES = [
-  { name: 'Commune', frequence: 54, min: 27, max: 108 },
-  { name: 'Frequente', frequence: 18, min: 9, max: 36 },
-  { name: 'Rare', frequence: 6, min: 3, max: 12 },
-  { name: 'Rarissime', frequence: 2, min: 1, max: 4 }]
-const DEFAULT_RARETE = 1;
 
-const SETTINGS_LISTE_MILIEUX = "liste-milieux";
+const COMPENDIUMS_RECHERCHE = 'compendiums-recherche';
-const MILIEUX = [
-  "Collines",
-  "Cours d'eau",
-  "Déserts",
-  "Forêts",
-  "Marais",
-  "Maritimes",
-  "Montagnes",
-  "Plaines",
-  "Sous-sols"
-]
-const ITEM_ENVIRONNEMENT_TYPES = [
-  'herbe', 'ingredient', 'faune'
-]
 
 export class Environnement {
-
   static init() {
-    game.settings.register(SYSTEM_RDD, SETTINGS_LISTE_MILIEUX, {
+    game.settings.register(SYSTEM_RDD, COMPENDIUMS_RECHERCHE, {
-      name: "Liste des milieux proposés",
+      name: COMPENDIUMS_RECHERCHE,
-      hint: "Liste des milieux proposés pour la faune&flore, séparés par des virgules",
+      default: [
+        SystemCompendiums.getCompendium('faune-flore-mineraux'),
+        SystemCompendiums.getCompendium('meditations-et-ecrits'),
+        SystemCompendiums.getCompendium('equipement')
+      ],
       scope: "world",
-      config: true,
+      config: false,
-      default: MILIEUX.reduce(Misc.joining(',')),
+      type: Object
-      type: String
     });
+
     game.system.rdd.environnement = new Environnement();
+    Hooks.once('ready', () => game.system.rdd.environnement.onReady());
   }
 
   constructor() {
-    this.table = new CompendiumTable('faune-flore-mineraux', 'Item', ITEM_ENVIRONNEMENT_TYPES)
+    this.compendiums = [];
+    this.compendiumTables = [];
+    this.mapMilieux = {}
   }
 
-  static getRarete(name = undefined) {
+  async onReady() {
-    return RARETES.find(it => it.name == name) ?? RARETES[DEFAULT_RARETE];
+    await this.$prepareCompendiums()
-  }
-
-  static getFrequenceRarete(rarete, field = undefined) {
-    const selected = this.getRarete(rarete);
-    return selected[field];
   }
 
   async milieux() {
-    return Object.values(await this.mapMilieux());
+    return Object.values(this.mapMilieux);
   }
 
-  async mapMilieux() {
+  async saveCompendiums(compendiumIds) {
-    const compendiumItems = await this.getElements(it => 1, it => ITEM_ENVIRONNEMENT_TYPES.includes(it.type));
+    game.settings.set(SYSTEM_RDD, COMPENDIUMS_RECHERCHE, compendiumIds);
-    return Misc.indexLowercase(this.getMilieuxSettings().concat(Environnement.listMilieux(compendiumItems)));
+    await this.$prepareCompendiums();
   }
 
-  static listMilieux(items) {
+  async $prepareCompendiums() {
-    return Misc.concat(items.map(it => Environnement.$itemToMilieux(it).filter(m => m)));
+    this.compendiums = game.settings.get(SYSTEM_RDD, COMPENDIUMS_RECHERCHE).filter(c => SystemCompendiums.getPack(c));
+
+    this.compendiumTables = this.compendiums.map(it => new CompendiumTable(it, 'Item'));
+    const compendiumItems = await this.getElements(it => 1, it => it.isInventaire());
+    const fromCompendiums = Misc.concat(compendiumItems.map(it => it.getMilieux().filter(m => m)));
+    this.mapMilieux = Misc.indexLowercase(fromCompendiums);
   }
 
   async autresMilieux(item) {
-    const mapMilieux = await this.mapMilieux();
+    const milieuxExistants = item.getMilieux().map(it => Grammar.toLowerCaseNoAccent(it));
-    const milieuxExistants = Environnement.$itemToMilieux(item).map(it => Grammar.toLowerCaseNoAccent(it));
+    return Object.keys(this.mapMilieux)
-    return Object.keys(mapMilieux)
       .filter(it => !milieuxExistants.includes(it))
-      .map(it => mapMilieux[it]);
+      .map(it => this.mapMilieux[it]);
   }
 
-  static $itemToMilieux(item) {
-    return item.system.environnement.map(env => env.milieu);
-  }
-
-  getMilieuxSettings() {
-    return game.settings.get(SYSTEM_RDD, SETTINGS_LISTE_MILIEUX).split(',').map(it => it.trim()).filter(it => it != '');
-  }
-
-  async findEnvironnementsLike(search) {
-    const milieux = await this.mapMilieux();
-    const searchLower = Grammar.toLowerCaseNoAccent(search);
-    const keys = Object.keys(milieux).filter(it => it.includes(searchLower));
-    if (keys.length > 1) {
-      const milieuExact = milieux[searchLower];
-      if (milieuExact) {
-        return [milieuExact];
-      }
-    }
-    return keys.map(k => milieux[k]);
-  }
-
-  async searchToChatMessage(milieux, typeName) {
-    const table = await this.buildEnvironnementTable(milieux);
-    await CompendiumTableHelpers.tableToChatMessage(table, 'Item', ITEM_ENVIRONNEMENT_TYPES, typeName);
-    return true
-  }
-
-  async getRandom(milieux, typeName) {
-    const table = await this.buildEnvironnementTable(milieux);
-    return await CompendiumTableHelpers.getRandom(table, 'Item', ITEM_ENVIRONNEMENT_TYPES, undefined, typeName);
-  }
-
-  async buildEnvironnementTable(milieux) {
-    const filterMilieux = item => item.system?.environnement.filter(env => milieux.includes(env.milieu));
-    const itemRareteEnMilieu = item => {
-      const raretes = filterMilieux(item);
-      const frequenceMax = Math.max(raretes.map(env => env.frequence));
-      return raretes.find(env => env.frequence == frequenceMax);
-    }
-    const itemFrequenceEnMilieu = item => itemRareteEnMilieu(item)?.frequence ?? 0;
-    const isPresentEnMilieu = item => itemFrequenceEnMilieu(item) > 0;
-    return await this.table.buildTable(itemFrequenceEnMilieu, isPresentEnMilieu);
-  }
-
-
   async getElements(itemFrequence, filter) {
-    return await this.table.getContent(itemFrequence, filter);
+    const compendiumsElement = await Promise.all(
+      this.compendiumTables.map(async compTable => await compTable.getContent(itemFrequence, filter))
+    );
+    const elements = compendiumsElement.reduce((a, b) => a.concat(b));
+    elements.sort(Misc.ascending(it => it.name))
+    return elements;
+  }
+
+  async buildTable(itemFrequence, filter = it => true) {
+    if (!itemFrequence) {
+      itemFrequence = it => it.getFrequence()
+    }
+    const elements = await this.getElements(itemFrequence, filter);;
+    return CompendiumTableHelpers.buildTable(elements, itemFrequence);
   }
 }
-
-export class EnvironmentSheetHelper {
-
-  static defaultOptions(defaultOptions) {
-    return mergeObject(defaultOptions, {
-      tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "informations" }]
-    });
-  }
-
-  static setPosition(sheet, superPosition) {
-    const position = superPosition;
-    const sheetHeader = sheet.element.find(".sheet-header");
-    const sheetBody = sheet.element.find(".sheet-body");
-    sheetBody.css("height", position.height - sheetHeader[0].clientHeight)
-    return position;
-  }
-
-  /* -------------------------------------------- */
-  static async getData(sheet, formData) {
-    return mergeObject(formData, {
-      milieux: await game.system.rdd.environnement.autresMilieux(sheet.item)
-    });
-  }
-
-  static activateListeners(sheet) {
-    if (!sheet.options.editable) return;
-
-    sheet.html.find("input.input-selection-milieu").keypress(event => {
-      if (event.keyCode == '13') {
-        EnvironmentSheetHelper.onAddMilieu(sheet, event);
-      }
-      event.stopPropagation();
-    })
-    sheet.html.find("a.milieu-add").click(event => EnvironmentSheetHelper.onAddMilieu(sheet, event));
-    sheet.html.find("div.environnement-milieu a.milieu-delete").click(event => EnvironmentSheetHelper.onDeleteMilieu(sheet, event));
-    sheet.html.find("div.environnement-milieu select.environnement-rarete").change(event => EnvironmentSheetHelper.onChange(sheet, event,
-      updated => EnvironmentSheetHelper.$changeRarete(sheet, event, updated)));
-    sheet.html.find("div.environnement-milieu input[name='environnement-frequence']").change(event => EnvironmentSheetHelper.onChange(sheet, event,
-      updated => EnvironmentSheetHelper.$changeFrequence(sheet, event, updated)));
-  }
-
-  static $changeFrequence(sheet, event, updated) {
-    updated.frequence = Number(sheet.html.find(event.currentTarget).val());
-  }
-
-  static $changeRarete(sheet, event, updated) {
-    const name = sheet.html.find(event.currentTarget).val();
-    const rarete = Environnement.getRarete(name);
-    updated.rarete = rarete.name;
-    updated.frequence = rarete.frequence;
-    // updated.frequence = Math.min(
-    //   Math.max(rarete.min, updated.frequence ?? rarete.frequence),
-    //   rarete.max);
-  }
-
-  static async onAddMilieu(sheet, event) {
-    const milieu = sheet.html.find('input.input-selection-milieu').val();
-    if (!milieu) {
-      ui.notifications.warn(`Choisissez le milieu dans lequel se trouve le/la ${sheet.item.name}`);
-      return
-    }
-    const list = sheet.item.system.environnement;
-    const exists = list.find(it => it.milieu == milieu);
-    if (exists) {
-      ui.notifications.warn(`${sheet.item.name} a déjà une rareté ${exists.rarete} en ${milieu} (fréquence: ${exists.frequence})`);
-      return
-    }
-    const rarete = Environnement.getRarete();
-    const newList = [...list, { milieu, rarete: rarete.name, frequence: rarete.frequence }].sort(Misc.ascending(it => it.milieu))
-    await sheet.item.update({ 'system.environnement': newList })
-  }
-
-  static async onDeleteMilieu(sheet, event) {
-    const milieu = EnvironmentSheetHelper.$getEventMilieu(sheet, event);
-    if (milieu != undefined) {
-      const newList = sheet.item.system.environnement.filter(it => it.milieu != milieu)
-        .sort(Misc.ascending(it => it.milieu));
-      await sheet.item.update({ 'system.environnement': newList });
-    }
-  }
-
-  static async onChange(sheet, event, doMutation) {
-    const list = sheet.item.system.environnement;
-    const milieu = EnvironmentSheetHelper.$getEventMilieu(sheet, event);
-    const updated = list.find(it => it.milieu == milieu);
-    if (updated) {
-      doMutation(updated);
-      const newList = [...list.filter(it => it.milieu != milieu), updated]
-        .sort(Misc.ascending(it => it.milieu));
-      await sheet.item.update({ 'system.environnement': newList });
-    }
-  }
-
-  static $getEventMilieu(sheet, event) {
-    return sheet.html.find(event.currentTarget)?.parents("div.environnement-milieu").data("milieu");
-  }
-
-}

module/html-utility.js

@@ -1,5 +1,5 @@
 export class HtmlUtility{
-  static _showControlWhen(jQuerySelector, condition) {
+  static showControlWhen(jQuerySelector, condition) {
     if (condition) {
       jQuerySelector.show();
     }

module/item-arme.js

@@ -1,5 +1,5 @@
 import { RdDItemCompetenceCreature } from "./item-competencecreature.js"
-import { Misc } from "./misc.js";
+import { TYPES } from "./item.js";
 import { RdDCombatManager } from "./rdd-combat.js";
 
 const nomCategorieParade = {
@@ -20,15 +20,15 @@ const nomCategorieParade = {
 export class RdDItemArme extends Item {
 
   static isArme(item) {
-    return (item.type == 'competencecreature' && item.system.iscombat) || item.type == 'arme';
+    return item.type == TYPES.arme || RdDItemCompetenceCreature.getCategorieAttaque(item);
   }
 
   /* -------------------------------------------- */
   static getArme(arme) {
     switch (arme ? arme.type : '') {
-      case 'arme': return arme;
+      case TYPES.arme: return arme;
-      case 'competencecreature':
+      case TYPES.competencecreature:
-        return RdDItemCompetenceCreature.armeNaturelle(arme);
+        return RdDItemCompetenceCreature.armeCreature(arme);
     }
     return RdDItemArme.mainsNues();
   }
@@ -68,14 +68,14 @@ export class RdDItemArme extends Item {
       return armeData.system.categorie_parade;
     }
     // pour compatibilité avec des personnages existants
-    if (armeData.type == 'competencecreature' || armeData.system.categorie == 'creature') {
+    if (armeData.type == TYPES.competencecreature || armeData.system.categorie == 'creature') {
       return armeData.system.categorie_parade || (armeData.system.isparade ? 'armes-naturelles' : '');
     }
     if (!armeData.type.match(/arme|competencecreature/)) {
       return '';
     }
     if (armeData.system.competence == undefined) {
-      return 'competencecreature';
+      return TYPES.competencecreature;
     }
     let compname = armeData.system.competence.toLowerCase();
     if (compname.match(/^(dague de jet|javelot|fouet|arc|arbalête|fronde|hache de jet|fléau)$/)) return '';
@@ -157,23 +157,33 @@ export class RdDItemArme extends Item {
     }
     return armeData;
   }
+  static competence2Mains(arme) {
+    return arme.system.competence.replace(" 1 main", " 2 mains");
+  }
+
+  static competence1Mains(arme) {
+    return arme.system.competence.replace(" 2 mains", " 1 main");
+  }
 
   static isArmeUtilisable(arme) {
     return arme.type == 'arme' && arme.system.equipe && (arme.system.resistance > 0 || arme.system.portee_courte > 0);
   }
 
-  static ajoutCorpsACorps(armes, competences, carac) {
+  static ajoutCorpsACorps(armes, actor) {
-    let corpsACorps = competences.find(it => it.name == 'Corps à corps') ?? { system: { niveau: -6 } };
+    armes.push(RdDItemArme.mainsNues(actor));
-    let init = RdDCombatManager.calculInitiative(corpsACorps.system.niveau, carac['melee'].value);
+    armes.push(RdDItemArme.empoignade(actor));
-    armes.push(RdDItemArme.mainsNues({ niveau: corpsACorps.system.niveau, initiative: init }));
-    //armes.push(RdDItemArme.empoignade({ niveau: corpsACorps.system.niveau, initiative: init }));
   }
 
-  static corpsACorps(mainsNuesActor) {
+  static corpsACorps(actor) {
-    const corpsACorps = {
+    let competence = actor?.getCompetenceCorpsACorps() ?? { system: { niveau: -6 } };
+    let melee = actor? actor.system.carac['melee'].value : 0
+    return {
+      _id: competence?.id,
       name: 'Corps à corps',
+      type: TYPES.arme,
       img: 'systems/foundryvtt-reve-de-dragon/icons/competence_corps_a_corps.webp',
       system: {
+        initiative: RdDCombatManager.calculInitiative(competence.system.niveau, melee),
         equipe: true,
         rapide: true,
         force: 0,
@@ -181,23 +191,22 @@ export class RdDItemArme extends Item {
         dommagesReels: 0,
         mortalite: 'non-mortel',
         competence: 'Corps à corps',
+        deuxmains: true,
         categorie_parade: 'sans-armes'
       }
-    };
+    }
-    mergeObject(corpsACorps.system, mainsNuesActor ?? {}, { overwrite: false });
-    return corpsACorps;
   }
 
-  static mainsNues(mainsNuesActor) {
+  static mainsNues(actor) {
-    const mainsNues = RdDItemArme.corpsACorps(mainsNuesActor)
+    const mainsNues = RdDItemArme.corpsACorps(actor)
     mainsNues.name = 'Mains nues'
     mainsNues.system.cac = 'pugilat'
     mainsNues.system.baseInit = 4
     return mainsNues;
   }
 
-  static empoignade(mainsNuesActor) {
+  static empoignade(actor) {
-    const empoignade = RdDItemArme.corpsACorps(mainsNuesActor)
+    const empoignade = RdDItemArme.corpsACorps(actor)
     empoignade.name = 'Empoignade'
     empoignade.system.cac = 'empoignade'
     empoignade.system.baseInit = 3

module/item-competence.js

@@ -8,22 +8,22 @@ const xp_par_niveau = [5, 5, 5, 10, 10, 10, 10, 15, 15, 15, 15, 20, 20, 20, 20,
 const niveau_max = xp_par_niveau.length - 10;
 /* -------------------------------------------- */
 const limitesArchetypes = [
-  { "niveau": 0, "nombreMax": 100, "reste": 100 },
+  { niveau: 0, nombreMax: 100 },
-  { "niveau": 1, "nombreMax": 10, "reste": 10 },
+  { niveau: 1, nombreMax: 10 },
-  { "niveau": 2, "nombreMax": 9, "reste": 9 },
+  { niveau: 2, nombreMax: 9 },
-  { "niveau": 3, "nombreMax": 8, "reste": 8 },
+  { niveau: 3, nombreMax: 8 },
-  { "niveau": 4, "nombreMax": 7, "reste": 7 },
+  { niveau: 4, nombreMax: 7 },
-  { "niveau": 5, "nombreMax": 6, "reste": 6 },
+  { niveau: 5, nombreMax: 6 },
-  { "niveau": 6, "nombreMax": 5, "reste": 5 },
+  { niveau: 6, nombreMax: 5 },
-  { "niveau": 7, "nombreMax": 4, "reste": 4 },
+  { niveau: 7, nombreMax: 4 },
-  { "niveau": 8, "nombreMax": 3, "reste": 3 },
+  { niveau: 8, nombreMax: 3 },
-  { "niveau": 9, "nombreMax": 2, "reste": 2 },
+  { niveau: 9, nombreMax: 2 },
-  { "niveau": 10, "nombreMax": 1, "reste": 1 },
+  { niveau: 10, nombreMax: 1 },
-  { "niveau": 11, "nombreMax": 1, "reste": 1 }
+  { niveau: 11, nombreMax: 1 },
 ];
 
 /* -------------------------------------------- */
-const categorieCompetences = {
+const categoriesCompetences = {
   "generale": { base: -4, label: "Générales" },
   "particuliere": { base: -8, label: "Particulières" },
   "specialisee": { base: -11, label: "Spécialisées" },
@@ -49,16 +49,16 @@ const competence_xp_cumul = _buildCumulXP();
 
 export class RdDItemCompetence extends Item {
   /* -------------------------------------------- */
-  static getCategorieCompetences() {
+  static getCategories() {
-    return categorieCompetences;
+    return categoriesCompetences;
-  }
-  /* -------------------------------------------- */
-  static getNiveauBase(category) {
-    return categorieCompetences[category].base;
   }
   /* -------------------------------------------- */
   static getLabelCategorie(category) {
-    return categorieCompetences[category].label;
+    return categoriesCompetences[category].label;
+  }
+  /* -------------------------------------------- */
+  static getNiveauBase(category, categories = categoriesCompetences) {
+    return categories[category]?.base ?? 0;
   }
 
   /* -------------------------------------------- */
@@ -79,10 +79,9 @@ export class RdDItemCompetence extends Item {
 
   /* -------------------------------------------- */
   static isCompetenceArme(competence) {
-    if (competence.isCompetence()) {
+    if (competence.isCompetence() && !competence.isCorpsACorps() && !competence.isEsquive()) {
       switch (competence.system.categorie) {
         case 'melee':
-          return !Grammar.toLowerCaseNoAccent(competence.name).includes('esquive');
         case 'tir':
         case 'lancer':
           return true;
@@ -93,10 +92,10 @@ export class RdDItemCompetence extends Item {
 
   /* -------------------------------------------- */
   static isArmeUneMain(competence) {
-    return RdDItemCompetence.isCompetenceArme(competence) && competence.name.toLowerCase().includes("1 main");
+    return competence.isCompetenceArme() && competence.name.toLowerCase().includes("1 main");
   }
   static isArme2Main(competence) {
-    return RdDItemCompetence.isCompetenceArme(competence) && competence.name.toLowerCase().includes("2 main");
+    return competence.isCompetenceArme() && competence.name.toLowerCase().includes("2 main");
   }
 
   static isThanatos(competence) {
@@ -190,18 +189,9 @@ export class RdDItemCompetence extends Item {
     }
   }
 
-  /* -------------------------------------------- */
-  static isVisible(item) {
-    return Number(item.system.niveau) != RdDItemCompetence.getNiveauBase(item.system.categorie);
-  }
-
-  static nomContientTexte(item, texte) {
-    return Grammar.toLowerCaseNoAccent(item.name).includes(Grammar.toLowerCaseNoAccent(texte))
-  }
-
   /* -------------------------------------------- */
   static isNiveauBase(item) {
-    return Number(item.system.niveau) == RdDItemCompetence.getNiveauBase(item.system.categorie);
+    return Number(item.system.niveau) == RdDItemCompetence.getNiveauBase(item.system.categorie, item.getCategories());
   }
 
   /* -------------------------------------------- */
@@ -268,18 +258,22 @@ export class RdDItemCompetence extends Item {
   /* -------------------------------------------- */
   static computeResumeArchetype(competences) {
     const computed = duplicate(limitesArchetypes);
+    computed.forEach(it => { it.nombre = 0; it.reste = it.nombreMax; });
+
     competences.map(it => Math.max(0, it.system.niveau_archetype))
       .filter(n => n > 0)
       .forEach(n => {
-        computed[n] = computed[n] ?? { niveau: n, nombreMax: 0, reste: 0 };
+        computed[n] = computed[n] ?? { niveau: n, nombreMax: 0, reste: 0, nombre: 0 };
-        computed[n].reste = computed[n].reste - 1;
+        computed[n].reste--;
+        computed[n].nombre++;
+
       });
-      return computed.filter(it => it.reste > 0 && it.niveau > 0);
+    return computed.filter(it => it.niveau > 0);
   }
 
   /* -------------------------------------------- */
   static triVisible(competences) {
-    return competences.filter(it => it.system.isVisible)
+    return competences.filter(it => !it.system.isHidden)
       .sort((a, b) => RdDItemCompetence.compare(a, b))
   }
 

module/item-competencecreature.js

@@ -1,49 +1,110 @@
 
+import { TYPES } from "./item.js";
 import { RdDCombatManager } from "./rdd-combat.js";
 
+const categories = {
+  "generale": { base: 0, label: "Générale" },
+  "naturelle": { base: 0, label: "Arme naturelle" },
+  "melee": { base: 0, label: "Mêlée" },
+  "parade": { base: 0, label: "Parade" },
+  "tir": { base: 0, label: "Tir" },
+  "lancer": { base: 0, label: "Lancer" },
+  "possession": { base: 0, label: "Possession" },
+}
+
 /* -------------------------------------------- */
 export class RdDItemCompetenceCreature extends Item {
 
-  /* -------------------------------------------- */
+  static getCategories() {
-  static setRollDataCreature(rollData) {
+    return categories;
-    rollData.competence = rollData.competence
-    rollData.carac = { "carac_creature": { label: rollData.competence.name, value: rollData.competence.system.carac_value } }
-    rollData.competence.system.defaut_carac = "carac_creature"
-    rollData.competence.system.categorie = "creature"
-    rollData.selectedCarac =  rollData.carac.carac_creature
-    if (rollData.competence.system.iscombat) {
-      rollData.arme = RdDItemCompetenceCreature.armeNaturelle(rollData.competence);
-    }
   }
 
   /* -------------------------------------------- */
-  static armeNaturelle(competencecreature) {
+  static setRollDataCreature(rollData) {
-    if (RdDItemCompetenceCreature.isCompetenceAttaque(competencecreature)) {
+    rollData.carac = { "carac_creature": { label: rollData.competence.name, value: rollData.competence.system.carac_value } }
-      // si c'est un Item compétence: cloner pour ne pas modifier lma compétence
+    rollData.competence.system.defaut_carac = "carac_creature"
-      let arme = (competencecreature instanceof Item) ? competencecreature.clone():  competencecreature;
+    rollData.selectedCarac = rollData.carac.carac_creature
-      mergeObject(arme.system,
+    rollData.arme = RdDItemCompetenceCreature.armeCreature(rollData.competence);
+  }
+
+  /* -------------------------------------------- */
+  static armeCreature(item) {
+    const categorieAttaque = RdDItemCompetenceCreature.getCategorieAttaque(item)
+    if (categorieAttaque != undefined) {
+      // si c'est un Item compétence: cloner pour ne pas modifier la compétence
+      let arme = item.clone();
+      mergeObject(arme,
         {
+          action: item.isCompetencePossession() ? 'possession' : 'attaque',
+          system: {
             competence: arme.name,
-          initiative: RdDCombatManager.calculInitiative(competencecreature.system.niveau, competencecreature.system.carac_value),
+            cac: categorieAttaque == "naturelle" ? "naturelle" : "",
-          niveau: competencecreature.system.niveau,
+            niveau: item.system.niveau,
+            initiative: RdDCombatManager.calculInitiative(item.system.niveau, item.system.carac_value),
             equipe: true,
             resistance: 100,
             dommagesReels: arme.system.dommages,
             penetration: 0,
             force: 0,
             rapide: true,
-          cac: competencecreature.system.isnaturelle ? "naturelle" : "",
+          }
-          action: 'attaque'
         });
       return arme;
     }
-    console.error("RdDItemCompetenceCreature.toActionArme(", competencecreature, ") : impossible de transformer l'Item en arme");
     return undefined;
   }
 
   /* -------------------------------------------- */
   static isCompetenceAttaque(item) {
-    return item.type == 'competencecreature' && item.system.iscombat;
+    if (item.type == TYPES.competencecreature) {
+      switch (item.system.categorie) {
+        case "melee":
+        case "tir":
+        case "lancer":
+        case "naturelle":
+        case "possession":
+          return true
+      }
+    }
+    return undefined
+  }
+
+  static getCategorieAttaque(item) {
+    if (item.type == TYPES.competencecreature) {
+      switch (item.system.categorie) {
+        case "melee":
+        case "tir":
+        case "lancer":
+        case "naturelle":
+        case "possession":
+        case "parade":
+          return item.system.categorie
+      }
+    }
+    return undefined
+  }
+  static isDommages(item) {
+    if (item.type == TYPES.competencecreature) {
+      switch (item.system.categorie) {
+        case "melee":
+        case "tir":
+        case "lancer":
+        case "naturelle":
+          return true
+      }
+    }
+    return false
+  }
+  static isParade(item) {
+    if (item.type == TYPES.competencecreature) {
+      switch (item.system.categorie) {
+        case "melee":
+        case "naturelle":
+        case "parade":
+          return true
+      }
+    }
+    return false
   }
 
   /* -------------------------------------------- */

module/item-faune-sheet.js

@@ -1,67 +0,0 @@
-import { EnvironmentSheetHelper } from "./environnement.js";
-import { RdDItemSheet } from "./item-sheet.js";
-import { RdDUtility } from "./rdd-utility.js";
-
-export class RdDFauneItemSheet extends RdDItemSheet {
-
-  static get ITEM_TYPE() { return "faune" };
-
-  static get defaultOptions() {
-    return EnvironmentSheetHelper.defaultOptions(super.defaultOptions);
-  }
-
-  setPosition(options = {}) {
-    return EnvironmentSheetHelper.setPosition(this, super.setPosition(options));
-  }
-
-  async getData() {
-    const formData = await super.getData();
-    return await EnvironmentSheetHelper.getData(this, formData);
-  }
-
-  activateListeners(html) {
-    super.activateListeners(html);
-    if (!this.options.editable) return;
-
-    EnvironmentSheetHelper.activateListeners(this);
-
-    html.find("a.linked-actor-delete").click(event => this.onDeleteLinkedActor());
-    html.find("a.preparer-nourriture").click(event => this.preparerNourriture(event));
-    html.find("a.manger-nourriture").click(event => this.mangerNourriture(event));
-  }
-
-  async _onDropActor(event, dragData) {
-    console.log('faune:dropActor', event, dragData)
-    const linkedActor = fromUuidSync(dragData.uuid);
-    if (linkedActor?.pack) {
-      this.item.update({
-        'system.actor.pack': linkedActor.pack,
-        'system.actor.id': linkedActor._id,
-        'system.actor.name': linkedActor.name
-      });
-    }
-    else {
-      ui.notifications.warn(`${linkedActor.name} ne provient pas d'un compendium.
-        <br>Choisissez une créature du compendium pour représenter un élément de faune générique`)
-    }
-  }
-  async onDeleteLinkedActor() {
-    this.item.update({
-      'system.actor.pack': '',
-      'system.actor.id': '',
-      'system.actor.name': ''
-    });
-  }
-
-  async preparerNourriture(event) {
-    if (this.actor) {
-      await this.actor.preparerNourriture(this.item);
-    }
-  }
-  async mangerNourriture(event) {
-    if (this.actor) {
-      await this.actor.mangerNourriture(this.item);
-    }
-  }
-
-}

module/item-herbe-sheet.js

@@ -1,25 +0,0 @@
-import { EnvironmentSheetHelper } from "./environnement.js";
-import { RdDItemSheet } from "./item-sheet.js";
-
-export class RdDHerbeItemSheet extends RdDItemSheet {
-
-  static get ITEM_TYPE() { return "herbe" };
-
-  static get defaultOptions() {
-    return EnvironmentSheetHelper.defaultOptions(super.defaultOptions);
-  }
-
-  setPosition(options = {}) {
-    return EnvironmentSheetHelper.setPosition(this, super.setPosition(options));
-  }
-
-  async getData() {
-    const formData = await super.getData();
-    return await EnvironmentSheetHelper.getData(this, formData);
-  }
-
-  activateListeners(html) {
-    super.activateListeners(html);
-    EnvironmentSheetHelper.activateListeners(this);
-  }
-}

module/item-ingredient-sheet.js

@@ -1,25 +0,0 @@
-import { EnvironmentSheetHelper } from "./environnement.js";
-import { RdDItemSheet } from "./item-sheet.js";
-
-export class RdDIngredientItemSheet extends RdDItemSheet {
-
-  static get ITEM_TYPE() { return "ingredient" };
-
-  static get defaultOptions() {
-    return EnvironmentSheetHelper.defaultOptions(super.defaultOptions);
-  }
-
-  setPosition(options = {}) {
-    return EnvironmentSheetHelper.setPosition(this, super.setPosition(options));
-  }
-
-  async getData() {
-    const formData = await super.getData();
-    return await EnvironmentSheetHelper.getData(this, formData);
-  }
-
-  activateListeners(html) {
-    super.activateListeners(html);
-    EnvironmentSheetHelper.activateListeners(this);
-  }
-}

module/item-monnaie.js

@@ -2,22 +2,22 @@ import { Misc } from "./misc.js";
 import { LOG_HEAD } from "./constants.js";
 
 const MONNAIE_ETAIN = {
-  name: "Etain (1 denier)", type: 'monnaie',
+  name: "Denier (étain)", type: 'monnaie',
   img: "systems/foundryvtt-reve-de-dragon/icons/objets/piece_etain_poisson.webp",
   system: { quantite: 0, cout: 0.01, encombrement: 0.001, description: "" }
 };
 const MONNAIE_BRONZE = {
-  name: "Bronze (10 deniers)", type: 'monnaie',
+  name: "Sou (bronze)", type: 'monnaie',
   img: "systems/foundryvtt-reve-de-dragon/icons/objets/piece_bronze_epees.webp",
   system: { quantite: 0, cout: 0.10, encombrement: 0.002, description: "" }
 };
 const MONNAIE_ARGENT = {
-  name: "Argent (1 sol)", type: 'monnaie',
+  name: "Sol (argent)", type: 'monnaie',
   img: "systems/foundryvtt-reve-de-dragon/icons/objets/piece_argent_sol.webp",
   system: { quantite: 0, cout: 1, encombrement: 0.003, description: "" }
 };
 const MONNAIE_OR = {
-  name: "Or (10 sols)", type: 'monnaie',
+  name: "Dragon (or)", type: 'monnaie',
   img: "systems/foundryvtt-reve-de-dragon/icons/objets/piece_or_sol.webp",
   system: { quantite: 0, cout: 10, encombrement: 0.004, description: "" }
 };
@@ -62,21 +62,24 @@ export class Monnaie {
     return deniers;
   }
 
-  static getFortune(actor) {
+  static toSolsDeniers(fortune) {
-    if (actor) {
+    return {
-      Monnaie.validerMonnaies(actor);
+      sols: Math.floor(fortune),
-      return actor.itemTypes['monnaie']
+      deniers: Math.round(100 * (fortune - Math.floor(fortune)))
+    };
+  }
+
+  static getFortune(monnaies) {
+    return (monnaies??[])
       .map(m => Number(m.system.cout) * Number(m.system.quantite))
       .reduce(Misc.sum(), 0);
   }
-    return 0;
-  }
 
   static async optimiserFortune(actor, fortune) {
     let resteEnDeniers = Math.round(fortune * 100);
     let monnaies = actor.itemTypes['monnaie'];
     let updates = [];
-    Monnaie.validerMonnaies(actor);
+    Monnaie.validerMonnaies(monnaies, actor);
 
     let parValeur = Misc.classifyFirst(monnaies, it => VALEUR_DENIERS(it.system.cout));
     for (let valeurDeniers of [1000, 100, 10, 1]) {
@@ -99,9 +102,9 @@ export class Monnaie {
     }
   }
 
-  static validerMonnaies(actor) {
+  static validerMonnaies(monnaies, actor = undefined) {
-    actor.itemTypes['monnaie'].filter(it => VALEUR_DENIERS(it.system.cout) == 0)
+    monnaies.filter(it => VALEUR_DENIERS(it.system.cout) == 0)
-      .map(it => `La  monnaie ${it.name} de l'acteur ${actor.name} a une valeur de 0!`)
+      .map(it => `La  monnaie ${it.name} de l'acteur ${actor?.name ?? 'sélectionné'} a une valeur de 0!`)
       .forEach(message => {
         ui.notifications.warn(message);
         console.warn(message);

module/item-sheet.js

@@ -5,11 +5,14 @@ import { RdDItemCompetence } from "./item-competence.js";
 import { RdDHerbes } from "./rdd-herbes.js";
 import { RdDGemme } from "./rdd-gemme.js";
 import { HtmlUtility } from "./html-utility.js";
-import { ReglesOptionelles } from "./settings/regles-optionelles.js";
+import { ReglesOptionnelles } from "./settings/regles-optionnelles.js";
 import { SYSTEM_RDD } from "./constants.js";
 import { RdDSheetUtility } from "./rdd-sheet-utility.js";
 import { SystemCompendiums } from "./settings/system-compendiums.js";
 import { Misc } from "./misc.js";
+import { RdDTimestamp } from "./time/rdd-timestamp.js";
+import { RdDItemCompetenceCreature } from "./item-competencecreature.js";
+import { TYPES } from "./item.js";
 
 /**
  * Extend the basic ItemSheet for RdD specific items
@@ -60,13 +63,13 @@ export class RdDItemSheet extends ItemSheet {
       buttons.unshift({
         class: "vendre",
         icon: "fas fa-comments-dollar",
-        onclick: ev => this.item.proposerVente()
+        onclick: ev => this.item.proposerVente(1)
       });
     }
     buttons.unshift({
       class: "montrer",
       icon: "fas fa-comment",
-      onclick: ev => this.item.postItem()
+      onclick: ev => this.item.postItemToChat()
     });
     return buttons
   }
@@ -85,33 +88,32 @@ export class RdDItemSheet extends ItemSheet {
   /* -------------------------------------------- */
   async getData() {
     let formData = {
-      id: this.item.id,
       title: this.item.name,
+      id: this.item.id,
       type: this.item.type,
       img: this.item.img,
       name: this.item.name,
       system: this.item.system,
-      isGM: game.user.isGM,
       actorId: this.actor?.id,
-      isOwned: this.actor ? true : false,
-      owner: this.item.isOwner,
-      editable: this.isEditable,
-      cssClass: this.isEditable ? "editable" : "locked",
-      isSoins: false,
       description: await TextEditor.enrichHTML(this.item.system.description, { async: true }),
       descriptionmj: await TextEditor.enrichHTML(this.item.system.descriptionmj, { async: true }),
-      isComestible: this.item.isComestible()
+      isComestible: this.item.getUtilisationCuisine(),
+      options: RdDSheetUtility.mergeDocumentRights(this.options, this.item, this.isEditable)
+    }
+    if (this.item.type == TYPES.competencecreature) {
+      formData.isparade = RdDItemCompetenceCreature.isParade(this.item)
+      formData.isdommages = RdDItemCompetenceCreature.isDommages(this.item)
     }
 
-    const competences = await SystemCompendiums.getCompetences(this.actor?.type);
+    const competences = await SystemCompendiums.getCompetences('personnage');
-    formData.categorieCompetences = RdDItemCompetence.getCategorieCompetences()
+    formData.categories = this.item.getCategories()
     if (this.item.type == 'tache' || this.item.type == 'livre' || this.item.type == 'meditation' || this.item.type == 'oeuvre') {
       formData.caracList = duplicate(game.system.model.Actor.personnage.carac)
       formData.caracList["reve-actuel"] = duplicate(game.system.model.Actor.personnage.reve.reve)
       formData.competences = competences;
     }
     if (this.item.type == 'arme') {
-      formData.competences = competences.filter(it => RdDItemCompetence.isCompetenceArme(it));
+      formData.competences = competences.filter(it => it.isCompetenceArme())
     }
     if (['sort', 'sortreserve'].includes(this.item.type)) {
       formData.competences = competences.filter(it => RdDItemCompetence.isDraconic(it));
@@ -135,18 +137,14 @@ export class RdDItemSheet extends ItemSheet {
       RdDGemme.calculDataDerivees(this.item);
     }
     if (this.item.type == 'potion') {
-      if (this.dateUpdated) {
+      await RdDHerbes.addPotionFormData(formData);
-        formData.system.prdate = this.dateUpdated;
-        this.dateUpdated = undefined;
     }
-      await RdDHerbes.updatePotionData(formData);
+    if (formData.options.isOwned && this.item.type == 'herbe' && (formData.system.categorie == 'Soin' || formData.system.categorie == 'Repos')) {
-    }
-    if (formData.isOwned && this.item.type == 'herbe' && (formData.system.categorie == 'Soin' || formData.system.categorie == 'Repos')) {
       formData.isIngredientPotionBase = true;
     }
     if (this.item.type == 'sortreserve') {
       const sortId = this.item.system.sortid;
-      formData.sort = formData.isOwned ? this.item.actor.items.get(sortId) : game.items.get(sortId);
+      formData.sort = formData.options.isOwned ? this.item.actor.items.get(sortId) : game.items.get(sortId);
     }
     formData.bonusCaseList = RdDItemSort.getBonusCaseList(formData, true);
 
@@ -159,8 +157,10 @@ export class RdDItemSheet extends ItemSheet {
     super.activateListeners(html);
     this.html = html;
 
-    HtmlUtility._showControlWhen(this.html.find(".item-cout"), ReglesOptionelles.isUsing('afficher-prix-joueurs') || game.user.isGM || !this.item.isOwned);
+    HtmlUtility.showControlWhen(this.html.find(".item-cout"), ReglesOptionnelles.isUsing('afficher-prix-joueurs')
-    HtmlUtility._showControlWhen(this.html.find(".item-magique"), this.item.isMagique());
+      || game.user.isGM
+      || !this.item.isOwned);
+    HtmlUtility.showControlWhen(this.html.find(".item-magique"), this.item.isMagique());
 
     // Everything below here is only needed if the sheet is editable
     if (!this.options.editable) return;
@@ -185,15 +185,17 @@ export class RdDItemSheet extends ItemSheet {
       }
     })
 
-    this.html.find('.enchanteDate').change((event) => {
+    this.html.find('.date-enchantement').change((event) => {
-      let jour = Number(this.html.find('[name="splitDate.day"]').val());
+      const jour = Number(this.html.find('input.date-enchantement[name="enchantement.jour"]').val());
-      let mois = this.html.find('[name="splitDate.month"]').val();
+      const mois = RdDTimestamp.definition(this.html.find('select.date-enchantement[name="enchantement.mois"]').val());
-      this.dateUpdated = game.system.rdd.calendrier.getIndexFromDate(jour, mois);
+      const indexDate = game.system.rdd.calendrier.getIndexFromDate(jour, mois.heure);
+      this.item.update({ 'system.prdate': indexDate });
+      console.warn(`Date d'enchantement modifiée ${jour}/${mois.heure}: ${indexDate}`)
     });
 
     this.html.find('.creer-tache-livre').click((event) => this._getEventActor(event).creerTacheDepuisLivre(this.item));
-    this.html.find('.consommer-potion').click((event) => this._getEventActor(event).consommerPotion(this.item));
+    this.html.find('.consommer-potion').click((event) => this._getEventActor(event).consommerPotion(this.item, this.getActionRenderItem()));
-    this.html.find('.creer-potion-base').click((event) => this._getEventActor(event).dialogFabriquerPotion(this.item));
+    this.html.find('.creer-potion-base').click((event) => this._getEventActor(event).actionHerbe(this.item));
 
     this.html.find('.alchimie-tache a').click((event) => {
       let actor = this._getEventActor(event);
@@ -207,12 +209,38 @@ export class RdDItemSheet extends ItemSheet {
       }
     });
 
-    this.html.find('.item-split').click(async event => RdDSheetUtility.splitItem(RdDSheetUtility.getItem(event, this.actor), this.actor, async () => this.render(true)));
+    if (this.actor) {
+      this.html.find('.item-split').click(async event => RdDSheetUtility.splitItem(RdDSheetUtility.getItem(event, this.actor), this.actor, this.getActionRenderItem()));
       this.html.find('.item-edit').click(async event => RdDSheetUtility.getItem(event, this.actor)?.sheet.render(true));
-    this.html.find('.item-delete').click(async event => RdDUtility.confirmerSuppressionItem(this, RdDSheetUtility.getItem(event, this.actor)));
+      this.html.find('.item-delete').click(async event => RdDUtility.confirmActorItemDelete(this, RdDSheetUtility.getItem(event, this.actor)));
       this.html.find('.item-vendre').click(async event => RdDSheetUtility.getItem(event, this.actor)?.proposerVente());
-    this.html.find('.item-montrer').click(async event => RdDSheetUtility.getItem(event, this.actor)?.postItem());
+      this.html.find('.item-montrer').click(async event => RdDSheetUtility.getItem(event, this.actor)?.postItemToChat());
-    this.html.find('.item-action').click(async event => RdDSheetUtility.getItem(event, this.actor)?.actionPrincipale(this.actor, async () => this.render(true)));
+      this.html.find('.item-action').click(async event => RdDSheetUtility.getItem(event, this.actor)?.actionPrincipale(this.actor, this.getActionRenderItem()));
+
+      this.html.find('.item-quantite-plus').click(async event => {
+        await this.actor.itemQuantiteIncDec(RdDSheetUtility.getItemId(event), 1)
+        this.render();
+      });
+      this.html.find('.item-quantite-moins').click(async event => {
+        await this.actor.itemQuantiteIncDec(RdDSheetUtility.getItemId(event), -1)
+        this.render();
+      });
+    }
+
+    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);
+  }
+
+  getActionRenderItem() {
+    return async () => {
+      let item = this.item;
+      while (item) {
+        await item.sheet?.render()
+        item = this.actor.getContenant(item)
+      }
+    }
   }
 
   _getEventActor(event) {
@@ -221,12 +249,14 @@ export class RdDItemSheet extends ItemSheet {
     return actor;
   }
 
+
   /* -------------------------------------------- */
   async _onSelectCategorie(event) {
     event.preventDefault();
 
     if (this.item.isCompetence()) {
-      let level = RdDItemCompetence.getNiveauBase(event.currentTarget.value);
+      const categorie = event.currentTarget.value;
+      const level =  RdDItemCompetence.getNiveauBase(categorie, this.item.getCategories());
       this.item.system.base = level;
       this.html.find('[name="system.base"]').val(level);
     }
@@ -237,9 +267,8 @@ export class RdDItemSheet extends ItemSheet {
   _updateObject(event, formData) {
     if (this.item.type == 'sort') {
       // Données de bonus de cases ?
-      formData['system.bonuscase'] = RdDItemSort.buildBonusCaseStringFromFormData(formData.bonusValue, formData.caseValue);
+      formData['system.bonuscase'] = RdDItemSort.buildBonuscaseFromArrays(formData.bonusValue, formData.caseValue);
     }
-
     return this.item.update(formData);
   }
 

module/item-sort.js

@@ -1,4 +1,3 @@
-/* -------------------------------------------- */
 import { Misc } from "./misc.js";
 import { TMRUtility } from "./tmr-utility.js";
 
@@ -16,7 +15,7 @@ export class RdDItemSort extends Item {
   }
 
   /* -------------------------------------------- */
-  static setCoutReveReel(sort){
+  static setCoutReveReel(sort) {
     if (sort) {
       sort.system.ptreve_reel = this.isCoutVariable(sort) ? 1 : sort.system.ptreve;
     }
@@ -31,30 +30,22 @@ export class RdDItemSort extends Item {
   }
 
   /* -------------------------------------------- */
-  static buildBonusCaseList( caseBonusString, newCase ) {
+  static buildBonusCaseList(bonuscase, newCase) {
-      if (caseBonusString == undefined) {
+    const list = RdDItemSort._bonuscaseStringToList(bonuscase)
-        return [];
+    if (newCase) {
+      return list.concat({ case: "Nouvelle", bonus: 0 });
     }
-      let bonusCaseList = [];
+    return list;
-      let bonusCaseArray = caseBonusString == undefined ? [] : caseBonusString.split(',');
-      for( let bonusCase of bonusCaseArray) {
-        let bonusSplit = bonusCase.split(':');
-        bonusCaseList.push( { case: bonusSplit[0], bonus: bonusSplit[1] } );
-      }
-      if ( newCase )
-        bonusCaseList.push( {case: "Nouvelle", bonus: 0} );
-      return bonusCaseList;
   }
 
-  /* -------------------------------------------- */
   /**
    * Retourne une liste de bonus/case pour un item-sheet
   * @param {} item 
   */
-  static getBonusCaseList( item, newCase = false ) {
+  static getBonusCaseList(item, newCase = false) {
     // Gestion spéciale case bonus
-    if ( item.type == 'sort') {
+    if (item.type == 'sort') {
-      return this.buildBonusCaseList(item.system.bonuscase, newCase );
+      return RdDItemSort.buildBonusCaseList(item.system.bonuscase, newCase);
     }
     return undefined;
   }
@@ -63,56 +54,61 @@ export class RdDItemSort extends Item {
   /** Met à jour les données de formulaire 
    * si static des bonus de cases sont présents 
    * */
-  static buildBonusCaseStringFromFormData( bonuses, cases ) {
+  static buildBonuscaseFromArrays(bonuses, coords) {
-    if ( bonuses ) {
+    if (bonuses) {
-      let list = [];
+      const list = [];
-      let caseCheck = {};
+      const caseCheck = {};
-      for (let i=0; i<bonuses.length; i++) {
+      for (let i = 0; i < bonuses.length && i < coords.length; i++) {
-        let coord = cases[i]?.toUpperCase() || 'A1';
+        const coord = coords[i] == 'Fleuve' ? 'Fleuve' : (coords[i]?.toUpperCase() ?? 'A1');
-        let bonus = bonuses[i] || 0;
+        const bonus = bonuses[i] || 0;
-        if ( TMRUtility.verifyTMRCoord( coord ) && bonus > 0 && caseCheck[coord] == undefined ) {
+        if (TMRUtility.verifyTMRCoord(coord) && bonus > 0 && caseCheck[coord] == undefined) {
           caseCheck[coord] = bonus;
-          list.push( coord+":"+bonus );
+          list.push({ case: coord, bonus: bonus });
         }
       }
-      return list.toString();
+      return RdDItemSort._bonuscaseListToString(list);
     }
     return undefined;
   }
 
   /* -------------------------------------------- */
-  static incrementBonusCase( actor, sort, coord ) {
+  static incrementBonusCase(actor, sort, coord) {
-      let bonusCaseList = this.buildBonusCaseList(sort.system.bonuscase, false);
+    if (TMRUtility.getTMR(coord).type == "fleuve") {
-      //console.log("ITEMSORT", sort, bonusCaseList);
+      coord = 'Fleuve';
+    }
+    const list = RdDItemSort.buildBonusCaseList(sort.system.bonuscase, false);
+    const bonus = Number(list.find(it => it.case == coord)?.bonus ?? 0);
+    const modified = { case: coord, bonus: bonus + 1 };
 
-      let found = false;
+    const bonuscase = RdDItemSort._bonuscaseListToString(
-      let StringList = []; 
+      list.filter(it => it.case != coord).concat(modified)
-      for( let bc of bonusCaseList) {
+    );
-        if (bc.case == coord) { // Case existante
-          found = true;
-          bc.bonus = Number(bc.bonus) + 1;
-        }
-        StringList.push( bc.case+':'+bc.bonus );
-      }
-      if ( !found) { //Nouvelle case, bonus de 1
-        StringList.push(coord+':1');
-      }
 
     // Sauvegarde/update
-      let bonuscase = StringList.toString();
+    actor.updateEmbeddedDocuments('Item', [{ _id: sort._id, 'system.bonuscase': bonuscase }]);
-      //console.log("Bonus cae :", bonuscase);
-      actor.updateEmbeddedDocuments('Item', [{ _id: sort._id, 'system.bonuscase': bonuscase }] );
   }
 
+
   /* -------------------------------------------- */
-  static getCaseBonus( sort, coord) {
+  static getCaseBonus(sort, coord) {
-    let bonusCaseList = this.buildBonusCaseList(sort.system.bonuscase, false);
+    const isFleuve = TMRUtility.getTMR(coord).type == "fleuve";
-    for( let bc of bonusCaseList) {
+
-      if (bc.case == coord) { // Case existante
+    let bc = RdDItemSort.buildBonusCaseList(sort.system.bonuscase, false)
-        return Number(bc.bonus);
+      .filter(it => it.case == coord || (isFleuve && it.case == 'Fleuve'))
+      .find(it => true)
+    return Number(bc?.bonus ?? 0);
   }
+
+  static _bonuscaseListToString(list) {
+    return list.map(it => `${it.case}:${it.bonus}`)
+      .sort(Misc.ascending())
+      .join(',');
   }
-    return 0;
+  static _bonuscaseStringToList(bonuscase) {
+    return (bonuscase ?? '').split(',').map(it => {
+      const b = it.split(':');
+      return { case: b[0], bonus: b[1] };
+    });
   }
 
 }

module/item-tache.js

@@ -1,4 +0,0 @@
-export class RdDItemTache extends Item {
-  
-
-}

module/item.js

@@ -2,28 +2,88 @@ import { DialogItemVente } from "./dialog-item-vente.js";
 import { Grammar } from "./grammar.js";
 import { Misc } from "./misc.js";
 import { RdDHerbes } from "./rdd-herbes.js";
+import { RdDTimestamp } from "./time/rdd-timestamp.js";
 import { RdDUtility } from "./rdd-utility.js";
+import { SystemCompendiums } from "./settings/system-compendiums.js";
+import { RdDRaretes } from "./item/raretes.js";
+import { RdDItemCompetence } from "./item-competence.js";
+import { RdDItemCompetenceCreature } from "./item-competencecreature.js";
 
-const typesObjetsInventaire = [
+export const TYPES = {
-  "arme",
+  competence: 'competence',
-  "armure",
+  competencecreature: 'competencecreature',
-  "conteneur",
+  empoignade: 'empoignade',
-  "gemme",
+  possession: 'possession',
-  "herbe",
+  blessure: 'blessure',
-  "ingredient",
+  maladie: 'maladie',
-  "faune",
+  poison: 'poison',
-  "livre",
+  arme: 'arme',
-  "monnaie",
+  armure: 'armure',
-  "munition",
+  conteneur: 'conteneur',
-  "nourritureboisson",
+  objet: 'objet',
-  "objet",
+  monnaie: 'monnaie',
-  "potion",
+  gemme: 'gemme',
+  munition: 'munition',
+  nourritureboisson: 'nourritureboisson',
+  herbe: 'herbe',
+  plante: 'plante',
+  ingredient: 'ingredient',
+  faune: 'faune',
+  livre: 'livre',
+  potion: 'potion',
+  service: 'service',
+  musique: 'musique',
+  danse: 'danse',
+  chant: 'chant',
+  jeu: 'jeu',
+  recettecuisine: 'recettecuisine',
+  oeuvre: 'oeuvre',
+  recettealchimique: 'recettealchimique',
+  tache: 'tache',
+  sort: 'sort',
+  sortreserve: 'sortreserve',
+  rencontre: 'rencontre',
+  queue: 'queue',
+  ombre: 'ombre',
+  souffle: 'souffle',
+  tete: 'tete',
+  casetmr: 'casetmr',
+  meditation: 'meditation',
+  signedraconique: 'signedraconique',
+  tarot: 'tarot',
+  nombreastral: 'nombreastral',
+  extraitpoetique: 'extraitpoetique',
+}
+
+const typesInventaireMateriel = [
+  TYPES.arme,
+  TYPES.armure,
+  TYPES.conteneur,
+  TYPES.faune,
+  TYPES.gemme,
+  TYPES.herbe,
+  TYPES.plante,
+  TYPES.ingredient,
+  TYPES.livre,
+  TYPES.monnaie,
+  TYPES.munition,
+  TYPES.nourritureboisson,
+  TYPES.objet,
+  TYPES.potion,
 ]
-const typesObjetsOeuvres = ["oeuvre", "recettecuisine", "musique", "chant", "danse", "jeu"]
+const typesInventaire = {
-const typesObjetsDraconiques = ["queue", "ombre", "souffle", "tete", "signedraconique", "sortreserve", "rencontre"]
+  materiel: typesInventaireMateriel,
-const typesObjetsConnaissance = ["meditation", "recettealchimique", "sort"]
+  all: ['service'].concat(typesInventaireMateriel),
-const typesObjetsEffet = ["possession", "poison", "maladie"]
+}
-const typesObjetsCompetence = ["competence", "competencecreature"]
+
+const typesObjetsOeuvres = [TYPES.oeuvre, TYPES.recettecuisine, TYPES.musique, TYPES.chant, TYPES.danse, TYPES.jeu]
+const typesObjetsDraconiques = [TYPES.queue, TYPES.ombre, TYPES.souffle, TYPES.tete, TYPES.signedraconique, TYPES.sortreserve, TYPES.rencontre]
+const typesObjetsConnaissance = [TYPES.meditation, TYPES.recettealchimique, TYPES.sort]
+const typesObjetsEffet = [TYPES.possession, TYPES.poison, TYPES.maladie, TYPES.blessure]
+const typesObjetsCompetence = [TYPES.competence, TYPES.competencecreature]
+const typesObjetsTemporels = [TYPES.blessure, TYPES.poison, TYPES.maladie, TYPES.queue, TYPES.ombre, TYPES.souffle, TYPES.signedraconique, TYPES.rencontre]
+const typesObjetsEquipable = [TYPES.arme, TYPES.armure, TYPES.objet];
+const typesEnvironnement = typesInventaireMateriel;
 const encBrin = 0.00005; // un brin = 1 décigramme = 1/10g = 1/10000kg = 1/20000 enc
 const encPepin = 0.0007; /* un pépin de gemme = 1/10 cm3 = 1/1000 l = 3.5/1000 kg = 7/2000 kg = 7/1000 enc
 densité 3.5 (~2.3 à 4, parfois plus) -- https://www.juwelo.fr/guide-des-pierres/faits-et-chiffres/ 
@@ -57,34 +117,36 @@ export const defaultItemImg = {
   poison: "systems/foundryvtt-reve-de-dragon/icons/maladies_venins/venin.webp",
   oeuvre: "systems/foundryvtt-reve-de-dragon/icons/competence_comedie.webp",
   nourritureboisson: "systems/foundryvtt-reve-de-dragon/icons/objets/provision_crue.webp",
+  service: "systems/foundryvtt-reve-de-dragon/icons/services/lit.webp",
   signedraconique: "systems/foundryvtt-reve-de-dragon/icons/tmr/signe_draconique.webp",
   gemme: "systems/foundryvtt-reve-de-dragon/icons/gemmes/almaze.webp",
   possession: "systems/foundryvtt-reve-de-dragon/icons/entites/possession2.webp",
   sortreserve: "systems/foundryvtt-reve-de-dragon/icons/competence_oniros.webp",
   extraitpoetique: "systems/foundryvtt-reve-de-dragon/icons/competence_ecriture.webp",
   tarot: "systems/foundryvtt-reve-de-dragon/icons/tarots/dos-tarot.webp",
+  empoignade: "systems/foundryvtt-reve-de-dragon/icons/competence_corps_a_corps.webp"
 }
 
 /* -------------------------------------------- */
 export class RdDItem extends Item {
 
-  static getDefaultImg(itemType) {
+  static get defaultIcon() {
-    return defaultItemImg[itemType];
+    return undefined;
   }
 
-  static isItemInventaire(newLocal) {
+  static getDefaultImg(itemType) {
-    return typesObjetsInventaire.includes(newLocal.type);
+    return game.system.rdd.itemClasses[itemType]?.defaultIcon ?? defaultItemImg[itemType];
   }
 
   static isFieldInventaireModifiable(type, field) {
     switch (field) {
       case 'quantite':
-        if (['conteneur'].includes(type)) {
+        if ([TYPES.conteneur].includes(type)) {
           return false;
         }
         break;
       case 'cout':
-        if (['monnaie'].includes(type)) {
+        if ([TYPES.monnaie].includes(type)) {
           return game.user.isGM;
         }
         break;
@@ -92,65 +154,149 @@ export class RdDItem extends Item {
     return true;
   }
 
-  getUniteQuantite() {
+  static async getCorrespondingItem(itemRef) {
-    switch (this.type) {
+    if (itemRef.pack) {
-      case "monnaie": return "(Pièces)"
+      return await SystemCompendiums.loadDocument(itemRef)
-      case "herbe":
-        switch (this.system.categorie) {
-          case 'Alchimie': case 'Repos': case 'Soin':
-            return "(Brins)"
-          case 'Cuisine': return '';
     }
-        return '';
+    return game.items.get(itemRef.id ?? itemRef._id);
-      case "ingredient": return "(Pépins ou Brins)"
-    }
-    return '';
   }
 
-  constructor(itemData, context) {
+  static getItemTypesInventaire(mode = 'materiel') {
-    if (!itemData.img) {
+    return typesInventaire[mode ?? 'materiel']
-      itemData.img = RdDItem.getDefaultImg(itemData.type);
   }
-    super(itemData, context);
+  static getItemTypesDraconiques() {
+    return typesObjetsDraconiques;
   }
-
+  static getItemTypesEnvironnement() {
-  static getItemTypesInventaire() {
+    return typesEnvironnement;
-    return typesObjetsInventaire
   }
 
   static getTypesOeuvres() {
     return typesObjetsOeuvres
   }
 
-  isCompetencePersonnage() {
+  constructor(docData, context = {}) {
-    return this.type == 'competence'
+    if (!context.rdd?.ready) {
+      mergeObject(context, { rdd: { ready: true } });
+      const ItemConstructor = game.system.rdd.itemClasses[docData.type];
+      if (ItemConstructor) {
+        if (!docData.img) {
+          docData.img = ItemConstructor.defaultIcon;
         }
-  isCompetenceCreature() {
+        return new ItemConstructor(docData, context);
-    return this.type == 'competencecreature'
       }
-  isCompetence() {
-    return typesObjetsCompetence.includes(this.type)
     }
-  isInventaire() {
+    if (!docData.img) {
-    return RdDItem.isItemInventaire(this)
+      docData.img = RdDItem.getDefaultImg(docData.type);
     }
-  isOeuvre() {
+    super(docData, context);
-    return typesObjetsOeuvres.includes(this.type)
   }
-  isDraconique() {
+
-    return typesObjetsDraconiques.includes(this.type)
+  getUniteQuantite() {
+    switch (this.type) {
+      case TYPES.monnaie: return "(Pièces)"
+      case TYPES.herbe:
+        switch (this.system.categorie) {
+          case 'Alchimie': case 'Repos': case 'Soin':
+            return "(Brins)"
+          case 'Cuisine': return '';
         }
-  isEffet() {
+        return '';
-    return typesObjetsEffet.includes(this.type)
+      case TYPES.ingredient: return "(Pépins ou Brins)"
     }
-  isConnaissance() {
+    return '';
-    return typesObjetsConnaissance.includes(this.type)
   }
-  isConteneur() {
+
-    return this.type == 'conteneur';
+  isEquipable() {
+    return typesObjetsEquipable.includes(this.type)
   }
-  isMonnaie() {
+
-    return this.type == 'monnaie';
+  isCompetencePersonnage() { return this.type == TYPES.competence }
+  isCompetenceCreature() { return this.type == TYPES.competencecreature }
+  isConteneur() { return this.type == TYPES.conteneur; }
+  isMonnaie() { return this.type == TYPES.monnaie; }
+  isPotion() { return this.type == TYPES.potion; }
+  isNourritureBoisson() { return this.type == TYPES.nourritureboisson; }
+  isService() { return this.type == TYPES.service; }
+
+  isCompetence() { return typesObjetsCompetence.includes(this.type) }
+  isEsquive() {
+    return (this.isCompetence()
+      && this.system.categorie == 'melee'
+      && Grammar.includesLowerCaseNoAccent(this.name, 'Esquive'));
+  }
+
+  isCorpsACorps() {
+    return (this.isCompetence()
+      && this.system.categorie == 'melee'
+      && Grammar.includesLowerCaseNoAccent(this.name, 'Corps à Corps'));
+  }
+
+  isCompetenceArme() {
+    if (this.isCompetence()) {
+      switch (this.system.categorie) {
+        case 'melee':
+          return !this.isCorpsACorps() && !this.isEsquive()
+        case 'tir':
+        case 'lancer':
+          return true;
+      }
+    }
+    return false;
+  }
+
+
+  isCompetencePossession() { return TYPES.competencecreature == this.type && this.system.categorie == "possession" }
+  isTemporel() { return typesObjetsTemporels.includes(this.type) }
+  isOeuvre() { return typesObjetsOeuvres.includes(this.type) }
+  isDraconique() { return RdDItem.getItemTypesDraconiques().includes(this.type) }
+  isQueueDragon() { return [TYPES.queue, TYPES.ombre].includes(this.type) }
+  isEffet() { return typesObjetsEffet.includes(this.type) }
+  isConnaissance() { return typesObjetsConnaissance.includes(this.type) }
+
+  isInventaire(mode = 'materiel') { return RdDItem.getItemTypesInventaire(mode).includes(this.type); }
+  isBoisson() { return this.isNourritureBoisson() && this.system.boisson; }
+  isAlcool() { return this.isNourritureBoisson() && this.system.boisson && this.system.alcoolise; }
+  isHerbeAPotion() { return this.type == TYPES.herbe && (this.system.categorie == 'Soin' || this.system.categorie == 'Repos'); }
+  isBlessure() { return this.type == TYPES.blessure }
+
+  isPresentDansMilieux(milieux) {
+    return this.getEnvironnements(milieux).length > 0
+  }
+  getCategories() {
+    switch (this.type) {
+      case TYPES.competence: return RdDItemCompetence.getCategories()
+      case TYPES.competencecreature: return RdDItemCompetenceCreature.getCategories()
+    }
+    return {}
+  }
+
+  getEnvironnements(milieux = undefined) {
+    const environnements = this.isInventaire() ? this.system.environnement : undefined;
+    if (milieux == undefined || !environnements) {
+      return environnements ?? [];
+    }
+    return environnements.filter(env => milieux.includes(env.milieu))
+  }
+
+  getMilieux() {
+    return this.getEnvironnements().map(env => env.milieu);
+  }
+
+  getRaretes(milieux = undefined) {
+    if (this.isInventaire()) {
+      const raretes = this.getEnvironnements(milieux).map(env => RdDRaretes.byCode(env.rarete));
+      if (milieux == undefined && raretes.length == 0) {
+        return [RdDRaretes.rareteFrequente()];
+      }
+      return raretes;
+    }
+    return [RdDRaretes.rareteEgale()];
+  }
+
+  getFrequence(milieux = undefined) {
+    const frequences = this.getEnvironnements(milieux).map(it => it.frequence);
+    return frequences.length == 0 ? 0 : Math.max(...frequences);
   }
 
   getItemGroup() {
@@ -163,69 +309,128 @@ export class RdDItem extends Item {
     return "autres";
   }
 
-  isConteneurNonVide() {
+  isConteneurNonVide() { return this.isConteneur() && (this.system.contenu?.length ?? 0) > 0; }
-    return this.isConteneur() && (this.system.contenu?.length ?? 0) > 0;
+  isConteneurVide() { return this.isConteneur() && (this.system.contenu?.length ?? 0) == 0; }
+  isVideOuNonConteneur() { return !this.isConteneur() || (this.system.contenu?.length ?? 0) == 0; }
+
+  isFinPeriode(oldTimestamp, newTimestamp) {
+    if (!this.isTemporel()) {
+      return false;
+    }
+    const finPeriode = new RdDTimestamp(this.system.temporel.fin);
+    return oldTimestamp.compare(finPeriode) < 0 && finPeriode.compare(newTimestamp) <= 0
   }
 
-  isConteneurVide() {
+  async onCreateItemTemporel(actor) {
-    return this.isConteneur() && (this.system.contenu?.length ?? 0) == 0;
+    if (this.isTemporel()) {
+      const timestampDebut = game.system.rdd.calendrier.timestamp;
+      const timestampFin = await this.calculerFinPeriodeTemporel(timestampDebut);
+      await actor.updateEmbeddedDocuments('Item', [{
+        _id: this.id,
+        'system.temporel.debut': duplicate(timestampDebut),
+        'system.temporel.fin': duplicate(timestampFin),
+      }])
+    }
   }
 
-  isVideOuNonConteneur() {
+  async calculerFinPeriodeTemporel(timestampDebut) {
-    return !this.isConteneur() || (this.system.contenu?.length ?? 0) == 0;
+    return timestampDebut;
   }
 
-  isNourritureBoisson() {
+  async onFinPeriodeTemporel(oldTimestamp, newTimestamp) {
-    return this.type == 'nourritureboisson';
+    if (this.isTemporel() && this.actor) {
+      await this.onFinPeriode(oldTimestamp, newTimestamp);
+    }
   }
 
-  isComestible() {
+  async onFinPeriode(oldTimestamp, newTimestamp) {
+    console.log(`${this.actor.name}: l'objet ${this.name} a expiré et été supprimé`);
+    await this.actor?.deleteEmbeddedDocuments('Item', [this.id]);
+  }
+
+  getUtilisation() {
     switch (this.type) {
-      case 'nourritureboisson': return 'pret';
+      case TYPES.potion:
-      case 'herbe':
+        switch (this.system.categorie) {
-        return this.system.categorie == 'Cuisine' && this.system.sust > 0 ? 'brut' : '';
+          case 'Alchimie': case 'AlchimieEnchante': case 'AlchimieAutre': return 'alchimie'
-      case 'faune':
+          case 'Cuisine': return 'cuisine'
-        return this.system.sust > 0 ? 'brut' : '';
+          case 'Remede': case 'Repos': case 'ReposEnchante': case 'Soin': case 'SoinEnchante': return 'soins'
+        }
+        return '';
+      case TYPES.nourritureboisson: return 'cuisine';
+      case TYPES.herbe: case TYPES.faune: case TYPES.ingredient: case TYPES.plante:
+        switch (this.system.categorie) {
+          case 'Cuisine': return 'cuisine';
+          case 'Toxique': case 'Poison': return 'poison';
+          case 'Alchimie': return 'alchimie'
+          case 'Soin': case 'Repos': return 'soins'
+        }
+        return this.system.sust > 0 ? 'cuisine' : '';
     }
     return '';
   }
 
-  isAlcool() {
+  getUtilisationCuisine() {
-    return this.isNourritureBoisson() && this.system.boisson && this.system.alcoolise;
+    if (this.getUtilisation() == 'cuisine') {
+      switch (this.type) {
+        case TYPES.nourritureboisson:
+          return 'pret';
+        case TYPES.herbe: case TYPES.faune: case TYPES.ingredient: case TYPES.plante:
+          return 'brut';
+      }
+    }
+    return '';
   }
 
-  isHerbeAPotion() {
-    return this.type == 'herbe' && (this.system.categorie == 'Soin' || this.system.categorie == 'Repos');
-  }
-  isPotion() {
-    return this.type == 'potion';
-  }
   isCristalAlchimique() {
-    return this.type == 'objet' && Grammar.toLowerCaseNoAccent(this.name) == 'cristal alchimique' && this.system.quantite > 0;
+    return this.type == TYPES.objet && Grammar.includesLowerCaseNoAccent(this.name, 'cristal alchimique') && this.system.quantite > 0;
   }
 
   isMagique() {
     return this.system.magique
   }
 
+  isItemCommerce() {
+    return this.parent?.type == 'commerce';
+  }
+
+  isNomLike(texte) {
+    return Grammar.includesLowerCaseNoAccent(this.name, texte)
+  }
+  isNomTypeLike(texte) {
+    return this.isNomLike(texte) || Grammar.includesLowerCaseNoAccent(Misc.typeName(this.type, 'Item'), texte)
+  }
+
   getQuantite() {
-    return Math.round(this.isConteneur() ? 1 : (this.system.quantite ?? 0))
+    return this.isService() ? undefined : Math.round(this.system.quantite ?? 0)
   }
 
   getEncTotal() {
-    return this.getEnc() * this.getQuantite();
+    return (this.getQuantite() ?? 0) * this.getEnc();
   }
 
   getEnc() {
     switch (this.type) {
-      case 'herbe':
+      case TYPES.service:
+        return 0;
+      case TYPES.herbe:
         return this.getEncHerbe();
-      case 'gemme':
+      case TYPES.gemme:
         return encPepin * this.system.taille;
     }
     return Math.max(this.system.encombrement ?? 0, 0);
   }
 
+  getEncContenu() {
+    return this.getContenu()
+      .map(it => it.getRecursiveEnc())
+      .reduce(Misc.sum(), 0);
+  }
+
+  getRecursiveEnc() {
+    return this.getEncTotal() + this.getEncContenu()
+  }
+
   getEncHerbe() {
     switch (this.system.categorie) {
       case 'Repos': case 'Soin': case 'Alchimie':
@@ -235,14 +440,34 @@ export class RdDItem extends Item {
 
   }
 
+  getContenu() {
+    if (this.isConteneur()) {
+      return this.system.contenu.map(idContenu => this.actor.getItem(idContenu));
+    }
+    return []
+  }
+
+  isConteneurContenu(conteneur) {
+    return this.getContenu()
+      .find(it => it.id == conteneur.id || it.isConteneurContenu(conteneur))
+  }
+
   valeurTotale() {
-    return this.getQuantite() * this.valeur()
+    return (this.isService() ? 1 : this.getQuantite()) * this.valeur()
   }
 
   valeur() {
     return this.system.cout ?? 0
   }
 
+  calculerPrixCommercant() {
+    if (this.isItemCommerce()) {
+      // appliquer le pourcentage
+      return this.parent.calculerPrix(this);
+    }
+    return this.system.cout;
+  }
+
   prepareDerivedData() {
     super.prepareDerivedData();
     if (this.isInventaire()) {
@@ -252,6 +477,7 @@ export class RdDItem extends Item {
       }
       this.system.actionPrincipale = this.getActionPrincipale({ warnIfNot: false });
     }
+    this.equipable = this.isEquipable();
   }
 
   prepareDataPotion() {
@@ -267,19 +493,19 @@ export class RdDItem extends Item {
 
   getActionPrincipale(options = { warnIfNot: true }) {
     switch (this.type) {
-      case 'conteneur': return 'Ouvrir';
+      case TYPES.conteneur: return 'Ouvrir';
     }
     if (this.actor?.isPersonnage()) {
       const warn = options.warnIfNot;
-      if (this.isComestible() == 'brut') {
+      if (this.getUtilisationCuisine() == 'brut') {
-        return 'Utiliser';
+        return 'Cuisiner';
       }
       switch (this.type) {
-        case 'nourritureboisson': return this._actionOrWarnQuantiteZero(this.system.boisson ? 'Boire' : 'Manger', warn);
+        case TYPES.nourritureboisson: return this._actionOrWarnQuantiteZero(this.system.boisson ? 'Boire' : 'Manger', warn);
-        case 'potion': return this._actionOrWarnQuantiteZero('Boire', warn);
+        case TYPES.potion: return this._actionOrWarnQuantiteZero('Consommer', warn);
-        case 'livre': return this._actionOrWarnQuantiteZero('Lire', warn);
+        case TYPES.livre: return this._actionOrWarnQuantiteZero('Lire', warn);
-        case 'herbe': return this.isHerbeAPotion() ? this._actionOrWarnQuantiteZero('Décoction', warn) : undefined;
+        case TYPES.herbe: return this.isHerbeAPotion() ? this._actionOrWarnQuantiteZero('Décoction', warn) : undefined;
-        case 'queue': case 'ombre': return this.system.refoulement > 0 ? 'Refouler' : undefined;
+        case TYPES.queue: case TYPES.ombre: return this.system.refoulement > 0 ? 'Refouler' : undefined;
       }
     }
     return undefined;
@@ -287,19 +513,8 @@ export class RdDItem extends Item {
 
   /* -------------------------------------------- */
   async actionPrincipale(actor, onActionItem = async () => { }) {
-    if (!this.getActionPrincipale()) {
+    if (!this.getActionPrincipale()) { return }
-      return;
+    await actor?.actionPrincipale(this, onActionItem);
-    }
-    if (await actor.actionNourritureboisson(this, onActionItem)) {
-      return;
-    }
-    switch (this.type) {
-      case 'potion': return await actor.consommerPotion(this, onActionItem);
-      case 'livre': return await actor.actionLire(this);
-      case 'conteneur': return await this.sheet.render(true);
-      case 'herbe': return await actor.actionHerbe(this);
-      case 'queue': case 'ombre': return await actor.actionRefoulement(this);
-    }
   }
 
   _actionOrWarnQuantiteZero(actionName, warn) {
@@ -320,7 +535,7 @@ export class RdDItem extends Item {
   }
 
   async onCreateDecoupeComestible(actor) {
-    if (actor && this.isComestible() == 'brut' && this.system.sust != 1) {
+    if (actor && this.getUtilisationCuisine() == 'brut' && this.system.sust != 1) {
       if (this.system.sust < 1) {
         await actor.updateEmbeddedDocuments('Item', [{
           _id: this.id,
@@ -341,7 +556,7 @@ export class RdDItem extends Item {
   }
 
   async empiler(item) {
-    if (this.isComestible() == 'brut') {
+    if (this.getUtilisationCuisine() == 'brut') {
       const sust = this.system.sust + item.system.sust;
       const encombrement = this.system.encombrement + item.system.encombrement;
       await this.update({
@@ -355,7 +570,7 @@ export class RdDItem extends Item {
     await item.delete();
   }
 
-  async quantiteIncDec(nombre, options = { diminuerQuantite: true, supprimerSiZero: false }) {
+  async quantiteIncDec(nombre, options = { supprimerSiZero: false }) {
     const quantite = Number(this.system.quantite ?? -1);
     if (quantite >= 0) {
       const reste = Math.max(quantite + Number(nombre), 0);
@@ -392,8 +607,8 @@ export class RdDItem extends Item {
       return [false, `Impossible de regrouper ${this.name} avec ${other.name}`];
     }
     else {
-      const excludedProperties = ['quantite', 'cout', 'encTotal'];
+      const excludedProperties = ['quantite', 'cout', 'encTotal', 'environnement', 'contenu'];
-      if (this.isComestible()) {
+      if (this.getUtilisationCuisine()) {
         excludedProperties.push('sust', 'encombrement');
       }
       let differences = Object.entries(this.system)
@@ -410,13 +625,16 @@ export class RdDItem extends Item {
     return [true, undefined];
   }
 
-  async proposerVente() {
+  async proposerVente(quantiteMax = undefined) {
     console.log(this);
     if (this.isConteneurNonVide()) {
       ui.notifications.warn(`Votre ${this.name} n'est pas vide, pas possible de le proposer`);
       return;
     }
-    await DialogItemVente.display(this, async (vente) => {
+    await DialogItemVente.display({
+      item: this,
+      quantiteMax,
+      callback: async (vente) => {
         vente["properties"] = this.getProprietes();
         if (vente.isOwned) {
           if (vente.quantiteNbLots * vente.tailleLot > vente.quantiteMax) {
@@ -426,38 +644,44 @@ export class RdDItem extends Item {
         }
         vente.jsondata = JSON.stringify(vente.item);
 
-      console.log(vente);
         let html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-vente-item.html', vente);
         ChatMessage.create(RdDUtility.chatDataSetup(html));
+      }
     });
   }
 
   /* -------------------------------------------- */
   getProprietes() {
+    if (this[`_${this.type}ChatData`]) {
       return this[`_${this.type}ChatData`]().filter(it => it != undefined);
     }
+    return [];
+  }
 
   /* -------------------------------------------- */
-  async postItem(modeOverride) {
+  async postItemToChat(modeOverride) {
     console.log(this);
-    let chatData = duplicate(this);
+    let chatData = {
-    chatData["properties"] = this.getProprietes();
+      doctype: 'Item',
-    if (this.actor) {
+      id: this.id,
-      chatData.actor = { id: this.actor.id };
+      type: this.type,
+      img: this.img,
+      pack: this.pack,
+      name: this.name,
+      actor: this.actor ? { id: this.actor.id } : undefined,
+      system: { description: this.system.description },
+      properties: this.getProprietes(),
     }
-    // JSON object for easy creation
+    renderTemplate(this.getChatItemTemplate(), chatData).then(html => {
-    chatData.jsondata = JSON.stringify(
-      {
-        compendium: "postedItem",
-        payload: chatData,
-      });
-
-    renderTemplate('systems/foundryvtt-reve-de-dragon/templates/post-item.html', chatData).then(html => {
       let chatOptions = RdDUtility.chatDataSetup(html, modeOverride);
       ChatMessage.create(chatOptions)
     });
   }
 
+  getChatItemTemplate() {
+    return 'systems/foundryvtt-reve-de-dragon/templates/post-item.html';
+  }
+
   static propertyIfDefined(name, val, condition = true) {
     return condition ? `<b>${name}</b>: ${val}` : undefined;
   }
@@ -488,7 +712,7 @@ export class RdDItem extends Item {
   _armeChatData() {
     return [
       `<b>Compétence</b>: ${this.system.competence}`,
-      `<b>Dommages</b>: ${this.system.dommages}`,
+      `<b>Dommages</b>: ${this.system.dommages} ${this.system.mortalite == 'non-mortel' ? '(Non mortel)' : ''}`,
       `<b>Force minimum</b>: ${this.system.force}`,
       `<b>Resistance</b>: ${this.system.resistance}`,
       ...this._inventaireTemplateChatData()
@@ -706,5 +930,4 @@ export class RdDItem extends Item {
       ...this._inventaireTemplateChatData()
     ]
   }
-
 }

module/item/armure.js

@@ -0,0 +1,51 @@
+import { RdDItem } from "../item.js";
+import { Misc } from "../misc.js";
+import { ReglesOptionnelles } from "../settings/regles-optionnelles.js";
+
+export class RdDItemArmure extends RdDItem {
+
+  static get defaultIcon() {
+    return "systems/foundryvtt-reve-de-dragon/icons/armes_armures/armure_plaques.webp";
+  }
+
+  deteriorerArmure(dmg) {
+    if (!ReglesOptionnelles.isUsing('deteriorationArmure') || this.system.protection == '0') {
+      return;
+    }
+    let deterioration = (this.system.deterioration ?? 0) + dmg;
+    let protection = this.system.protection;
+
+    if (deterioration >= 10) {
+      deterioration -= 10;
+      protection = this.calculProtectionDeterioree();
+      ChatMessage.create({ content: `Votre armure ${this.name} s'est détériorée, elle protège maintenant de ${protection}` });
+    }
+    this.update({
+      system: {
+        deterioration: deterioration,
+        protection: protection
+      }
+    });
+  }
+
+  calculProtectionDeterioree() {
+    const protectionCourante = this.system.protection;
+    let res = /(\d+)?d(\d+)(\-\d+)?/.exec(protectionCourante);
+    if (res) {
+      let protection = Misc.toInt(res[2]);
+      let malus = Misc.toInt(res[3]) - 1;
+      if (protection + malus <= 0) {
+        return 0;
+      } else {
+        return `1d${protection}${malus}`;
+      }
+    }
+    else if (/\d+/.exec(protectionCourante)) {
+      return `1d${protectionCourante}`;
+    }
+    else {
+      ui.notifications.warn(`La valeur d'armure de votre ${this.name} est incorrecte`);
+      return undefined;
+    }
+  }
+}

module/item/blessure.js

@@ -0,0 +1,199 @@
+import { RdDItem } from "../item.js";
+import { Misc } from "../misc.js";
+import { RdDTimestamp } from "../time/rdd-timestamp.js";
+
+const BASE_TACHE_SOIN_BLESSURE = {
+  type: "tache",
+  img: 'systems/foundryvtt-reve-de-dragon/icons/competence_chirurgie.webp',
+  system: { carac: "dexterite", competence: "Chirurgie", periodicite: "1 round", fatigue: 0, }
+}
+const TACHES_SOIN_BLESSURE = {
+  6: { name: 'Blessure critique', system: { difficulte: -6, points_de_tache: 6 } },
+  4: { name: 'Blessure grave', system: { difficulte: -4, points_de_tache: 4 } },
+  2: { name: 'Blessure légère', system: { difficulte: -2, points_de_tache: 2 } },
+}
+
+const definitionsBlessures = [
+  { 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" }
+]
+
+export class RdDItemBlessure extends RdDItem {
+
+  static get defaultIcon() {
+    return "systems/foundryvtt-reve-de-dragon/icons/sante/blessure.webp";
+  }
+
+  prepareDerivedData() {
+    super.prepareDerivedData();
+    this.system.label = this.getLabelGravite()
+  }
+
+  static prepareTacheSoin(gravite) {
+    const tache = TACHES_SOIN_BLESSURE[gravite]
+    if (!tache) {
+      ui.notifications.warn(`Pas de tâche de soins pour une blessure ${gravite}`)
+      return undefined;
+    }
+    return mergeObject(duplicate(BASE_TACHE_SOIN_BLESSURE), tache)
+  }
+  static async createBlessure(actor, gravite, localisation = '', attacker) {
+    const definition = RdDItemBlessure.getDefinition(gravite)
+    const blessure = {
+      name: definition.label,
+      type: 'blessure',
+      img: definition.icon,
+      system: {
+        gravite: gravite,
+        difficulte: - gravite,
+        localisation: localisation,
+        origine: attacker?.name ?? ""
+      }
+    }
+    const blessures = await actor.createEmbeddedDocuments('Item', [blessure])
+    return blessures[0]
+  }
+
+  static async createTacheSoinBlessure(actor, gravite) {
+    const tache = RdDItemBlessure.prepareTacheSoin(gravite)
+    if (tache) {
+      const taches = await actor.createEmbeddedDocuments('Item', [tache], { renderSheet: false });
+      return taches[0];
+    }
+    return undefined
+  }
+
+  async updateTacheSoinBlessure(tache) {
+    if (tache) {
+      await tache.update({
+        system: {
+          itemId: this.id,
+          difficulte: Math.min(this.system.difficulte, tache.system.difficulte),
+          points_de_tache_courant: Math.max(0, this.system.premierssoins.tache)
+        }
+      });
+    }
+  }
+
+  async setSoinsBlessure(systemUpdate = {}) {
+    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 }) {
+    if (this.parent != actor || actor == undefined) {
+      return
+    }
+    if (new RdDTimestamp(this.system.temporel.fin).compare(timestamp) > 0) {
+      // attente periode
+      return
+    }
+    if (this.system.gravite > 0) {
+      const update = { system: { premierssoins: { bonus: 0 }, soinscomplets: { bonus: 0 } } }
+      const gravite = this.system.gravite;
+      const graviteMoindre = gravite - 2;
+      const moindres = blessures.filter(it => it.system.gravite == graviteMoindre, 'blessures').length
+      const label = this.getLabelGravite();
+
+      let rolled = await actor.jetRecuperationConstitution(this.system.soinscomplets.bonus, message);
+
+      if (rolled.isETotal) {
+        message.content += ` -- une blessure ${label} s'infecte (temps de guérison augmenté de ${gravite} jours, perte de vie)`;
+        await actor.santeIncDec("vie", -1);
+        mergeObject(update, {
+          system: { fin: { indexDate: timestamp.addJours(gravite).indexDate } }
+        });
+      }
+      else {
+        if (!isMaladeEmpoisonne && rolled.isSuccess && this.peutRetrograder(graviteMoindre, moindres)) {
+          message.content += ` -- une blessure ${label} cicatrise`;
+          mergeObject(update, {
+            system: { gravite: graviteMoindre, fin: { indexDate: timestamp.addJours(graviteMoindre).indexDate } }
+          });
+        }
+        else {
+          message.content += ` -- une blessure ${label} reste stable`;
+        }
+      }
+      await this.update(update);
+    }
+  }
+
+  peutRetrograder(graviteMoindre, moindres) {
+    return moindres < RdDItemBlessure.getDefinition(graviteMoindre).max
+  }
+
+  async calculerFinPeriodeTemporel(debut) {
+    return await debut.nouveauJour().addJours(this.system.gravite);
+  }
+
+  async onFinPeriode(oldTimestamp, newTimestamp) {
+    if (this.system.gravite <= 0) {
+      await super.onFinPeriode(oldTimestamp, newTimestamp)
+    }
+  }
+
+  getImgSoins(gravite, soins) {
+    let img = 'blessure'
+    if (gravite > 6) {
+      img = 'mort'
+    }
+    if (gravite <= 0) {
+      img = 'eraflure'
+    }
+    return `systems/foundryvtt-reve-de-dragon/icons/sante/${soins ? 'blessure-soins' : img}.webp`
+  }
+
+  getLabelGravite() {
+    return RdDItemBlessure.getDefinition(this.system.gravite).label
+  }
+
+  static getDefinition(gravite) {
+    return definitionsBlessures.sort(Misc.ascending(it => it.gravite))
+      .find(it => it.gravite >= gravite);
+  }
+  static maxBlessures(gravite) {
+    return RdDItemBlessure.getDefinition(gravite).max
+  }
+
+  isContusion() {
+    return this.system.gravite <= 0
+  }
+  isLegere() {
+    return this.system.gravite > 0 && this.system.gravite <= 2
+  }
+  isGrave() {
+    return this.system.gravite > 2 && this.system.gravite <= 4
+  }
+  isCritique() {
+    return this.system.gravite > 4 && this.system.gravite <= 6
+  }
+  isMort() {
+    return this.system.gravite > 6
+  }
+
+  getProprietes() {
+    return [
+      RdDItem.propertyIfDefined('Causée par', this.system.origine, this.system.origine),
+      `<b>Heure et Date</b>: ${new RdDTimestamp(this.system.temporel.debut).formatDateHeure()}`,
+      RdDItem.propertyIfDefined('Blessé', this.parent?.name, this.parent),
+      `<b>Localisation</b>: ${this.system.localisation}`,
+      `<b>Gravité</b>: ${RdDItemBlessure.getDefinition(this.system.gravite).label}`,
+      `<b>Difficulté des soins</b>: ${this.system.difficulte}`,
+      (this.system.soinscomplets.done ?
+        `<b>Bonus soins complets</b>: ${this.system.soinscomplets.bonus}` :
+        (this.system.premierssoins.done ?
+          `<b>Bonus premiers soins</b>: ${this.system.premierssoins.bonus}` :
+          `<b>Points de tâche</b>: ${this.system.premierssoins.tache}`
+        )
+      ),
+    ];
+  }
+}

module/item/maladie.js

@@ -0,0 +1,47 @@
+import { RdDItem } from "../item.js";
+import { Misc } from "../misc.js";
+import { RdDTimestamp } from "../time/rdd-timestamp.js";
+
+export class RdDItemMaladie extends RdDItem {
+
+  static get defaultIcon() {
+    return "systems/foundryvtt-reve-de-dragon/icons/maladies_venins/maladie.webp";
+  }
+
+  async calculerFinPeriodeTemporel(debut) {
+    return await debut.addPeriode(this.system.periode.nombre, this.system.periode.unite);
+  }
+
+  async onFinPeriode(oldTimestamp, newTimestamp) {
+    await RdDItemMaladie.notifierMaladiePoison(this, oldTimestamp, newTimestamp)
+  }
+
+  static async notifierMaladiePoison(mal, oldTimestamp, newTimestamp) {
+    if (mal.actor) {
+      const souffrance = mal.system.identifie
+        ? `de ${mal.name}`
+        : `d'un mal inconnu`
+      ChatMessage.create({ content: `${mal.actor.name} souffre ${souffrance} (${Misc.typeName('Item', mal.type)}): vérifiez que les effets ne se sont pas aggravés !` });
+      mal.postItemToChat('gmroll');
+      await RdDItemMaladie.prolongerPeriode(mal,oldTimestamp, newTimestamp);
+    }
+  }
+
+  static async prolongerPeriode(mal, oldTimestamp, newTimestamp) {
+    if (mal.actor) {
+      // TODO: déterminer le nombre de périodes écoulées
+      console.log(`${mal.actor.name}: le mal ${mal.name} a atteint la fin de sa période et été prolongé`);
+      const current = newTimestamp;
+      const finPeriode = new RdDTimestamp(mal.system.temporel.fin)
+      const periodeSuivante = (finPeriode.compare(current) > 0 ? finPeriode : current);
+      const timestampFin = await mal.calculerFinPeriodeTemporel(periodeSuivante);
+
+      await mal.actor.updateEmbeddedDocuments('Item', [{
+        _id: mal.id,
+        'system.temporel.fin': duplicate(timestampFin),
+      }])
+    }
+  }
+
+
+}

module/item/ombre.js

@@ -0,0 +1,11 @@
+import { RdDItem } from "../item.js";
+
+export class RdDItemOmbre extends RdDItem {
+  static get defaultIcon() {
+    return "systems/foundryvtt-reve-de-dragon/icons/queue_dragon.webp";
+  }
+
+  async calculerFinPeriodeTemporel(debut) {
+    return await debut.appliquerDuree(this.system.duree, this.parent);
+  }
+}

module/item/poison.js

@@ -0,0 +1,17 @@
+import { RdDItem } from "../item.js";
+import { RdDItemMaladie } from "./maladie.js";
+
+export class RdDItemPoison extends RdDItem {
+
+  static get defaultIcon() {
+    return "systems/foundryvtt-reve-de-dragon/icons/maladies_venins/venin.webp";
+  }
+
+  async calculerFinPeriodeTemporel(debut) {
+    return await debut.addPeriode(this.system.periode.nombre, this.system.periode.unite) ;
+  }
+
+  async onFinPeriode(oldTimestamp, newTimestamp) {
+    RdDItemMaladie.notifierMaladiePoison(this, oldTimestamp, newTimestamp)
+  }
+}

module/item/queue.js

@@ -0,0 +1,13 @@
+import { RdDItem } from "../item.js";
+
+export class RdDItemQueue extends RdDItem {
+
+  static get defaultIcon() {
+    return "systems/foundryvtt-reve-de-dragon/icons/queue_dragon.webp";
+  }
+
+  async calculerFinPeriodeTemporel(debut) {
+    return await debut.appliquerDuree(this.system.duree, this.parent);
+  }
+
+}

module/item/raretes.js

@@ -0,0 +1,31 @@
+
+const RARETE_COMMUNE = { code: 'Commune', label: 'Commune', frequence: 54, min: 27, max: 108 };
+const RARETE_FREQUENTE = { code: 'Frequente', label: 'Fréquente', frequence: 18, min: 9, max: 36 };
+const RARETE_RARE = { code: 'Rare', label: 'Rare', frequence: 6, min: 3, max: 12 };
+const RARETE_RARISSIME = { code: 'Rarissime', label: 'Rarissime', frequence: 2, min: 1, max: 4 };
+const RARETE_INEXISTANT = { code: 'Inexistant', label: 'Inexistant', frequence: 0, min: 0, max: 0 };
+const RARETE_EGALE = { code: 'eqal', label: 'Egal', frequence: 1, min: 1, max: 1 };
+
+const RARETES = [
+  RARETE_COMMUNE,
+  RARETE_FREQUENTE,
+  RARETE_RARE,
+  RARETE_RARISSIME,
+  RARETE_INEXISTANT,
+]
+
+export class RdDRaretes {
+
+  static rareteFrequente() { return RARETE_FREQUENTE; }
+  static rareteEgale() { return RARETE_EGALE; }
+  static raretes() { return RARETES; }
+
+  static byCode(code = undefined) {
+    return RARETES.find(it => it.code == code) ?? RARETE_FREQUENTE;
+  }
+
+  static getChamp(rarete, field = undefined) {
+    return RdDRaretes.byCode(rarete)[field ?? 'frequence'];
+  }
+
+}

module/item/rencontre.js

@@ -1,4 +1,5 @@
-import { EffetsRencontre } from "./effets-rencontres.js";
+import { EffetsRencontre } from "../tmr/effets-rencontres.js";
+import { RdDItem } from "../item.js";
 
 const tableEffets = [
   { code: "messager", resultat: "succes", description: "Envoie un message à (force) cases", method: EffetsRencontre.messager },
@@ -36,7 +37,11 @@ const tableEffets = [
   // { code: "epart-souffle", resultat: "echec", description: "Souffle de dragon sur échec particulier" },
 ];
 
-export class RdDRencontre {
+export class RdDRencontre extends RdDItem {
+
+  static get defaultIcon() {
+    return "systems/foundryvtt-reve-de-dragon/icons/tete_dragon.webp";
+  }
 
   static getEffetsSucces() { return RdDRencontre.getEffets("succes"); }
   static getEffetsEchec() { return RdDRencontre.getEffets("echec"); }
@@ -68,4 +73,8 @@ export class RdDRencontre {
     }
   }
 
+  async calculerFinPeriodeTemporel(debut) {
+    return await debut.nouvelleHeure().addHeures(12);
+  }
+
 }

module/item/service.js

@@ -0,0 +1,17 @@
+import { RdDItem } from "../item.js";
+
+export class RdDItemService extends RdDItem {
+
+  static get defaultIcon() {
+    return "systems/foundryvtt-reve-de-dragon/icons/services/lit.webp";
+  }
+
+  isService() { return true; }
+  getProprietes() {
+    return [
+      RdDItem.propertyIfDefined('Qualité', this.system.qualite, this.system.qualite != 0),
+      RdDItem.propertyIfDefined('Moral', 'Situation heureuse', this.system.moral),
+      RdDItem.propertyIfDefined('Coût', `${this.calculerPrixCommercant()} sols`),
+    ];
+  }
+}

module/item/sheet-base-inventaire.js

@@ -0,0 +1,120 @@
+import { HtmlUtility } from "../html-utility.js";
+import { RdDItemSheet } from "../item-sheet.js";
+import { Misc } from "../misc.js";
+import { RdDRaretes } from "./raretes.js";
+
+const TYPE_ITEMS_NATURELS = ["faune", "herbe", "plante", "ingredient"];
+
+export class RdDItemInventaireSheet extends RdDItemSheet {
+
+  static get defaultOptions() {
+    return mergeObject(RdDItemSheet.defaultOptions, {
+      tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "informations" }]
+    });
+  }
+
+  setPosition(options = {}) {
+    const position = super.setPosition(options);
+    const sheetHeader = this.element.find(".sheet-header");
+    const sheetBody = this.element.find(".sheet-body");
+    sheetBody.css("height", position.height - sheetHeader[0].clientHeight)
+    return position;
+  }
+
+  async getData() {
+    const formData = await super.getData();
+    return mergeObject(formData, {
+      milieux: await game.system.rdd.environnement.autresMilieux(this.item)
+    });
+  }
+
+  activateListeners(html) {
+    super.activateListeners(html);
+    HtmlUtility.showControlWhen(this.html.find("div.description-milieu"), TYPE_ITEMS_NATURELS.includes(this.item.type));
+
+    if (!this.options.editable) return;
+    this.html.find("a.preparer-nourriture").click(event => this.preparerNourriture(event));
+    this.html.find("a.manger-nourriture").click(event => this.mangerNourriture(event));
+
+    this.html.find("input.input-selection-milieu").keypress(event => {
+      if (event.keyCode == '13') {
+        this.onAddMilieu(event);
+      }
+      event.stopPropagation();
+    })
+    this.html.find("a.milieu-add").click(event => this.onAddMilieu(event));
+    this.html.find("div.environnement-milieu a.milieu-delete").click(event => this.onDeleteMilieu(event));
+    this.html.find("div.environnement-milieu select.environnement-rarete").change(event => this.onChange(event,
+      updated => this.$changeRarete(event, updated)));
+    this.html.find("div.environnement-milieu input[name='environnement-frequence']").change(event => this.onChange(event,
+      updated => this.$changeFrequence(event, updated)));
+
+
+  }
+
+  async preparerNourriture(event) {
+    if (this.actor && this.item.getUtilisationCuisine() == 'brut') {
+      await this.actor.preparerNourriture(this.item);
+    }
+  }
+
+  async mangerNourriture(event) {
+    if (this.actor && this.item.getUtilisation() == 'cuisine') {
+      await this.actor.mangerNourriture(this.item);
+    }
+  }
+
+  $changeFrequence(event, updated) {
+    updated.frequence = Number(this.html.find(event.currentTarget).val());
+  }
+
+  $changeRarete(event, updated) {
+    const code = this.html.find(event.currentTarget).val();
+    const rarete = RdDRaretes.byCode(code);
+    updated.rarete = rarete.code;
+    updated.frequence = rarete.frequence;
+  }
+
+  async onAddMilieu(event) {
+    const milieu = this.html.find('input.input-selection-milieu').val();
+    if (!milieu) {
+      ui.notifications.warn(`Choisissez le milieu dans lequel se trouve le/la ${this.item.name}`);
+      return
+    }
+    const list = this.item.getEnvironnements();
+    const exists = list.find(it => it.milieu == milieu);
+    if (exists) {
+      ui.notifications.warn(`${this.item.name} a déjà une rareté ${exists.rarete} en ${milieu} (fréquence: ${exists.frequence})`);
+      return
+    }
+    const rarete = RdDRaretes.rareteFrequente();
+    const added = { milieu, rarete: rarete.code, frequence: rarete.frequence };
+    const newList = [added, ...list].sort(Misc.ascending(it => it.milieu))
+    await this.item.update({ 'system.environnement': newList })
+  }
+
+  async onDeleteMilieu(event) {
+    const milieu = this.$getEventMilieu(event);
+    if (milieu != undefined) {
+      const newList = this.item.getEnvironnements().filter(it => it.milieu != milieu)
+        .sort(Misc.ascending(it => it.milieu));
+      await this.item.update({ 'system.environnement': newList });
+    }
+  }
+
+  async onChange(event, doMutation) {
+    const list = this.item.system.environnement;
+    const milieu = this.$getEventMilieu(event);
+    const updated = list.find(it => it.milieu == milieu);
+    if (updated) {
+      doMutation(updated);
+      const newList = [...list.filter(it => it.milieu != milieu), updated]
+        .sort(Misc.ascending(it => it.milieu));
+      await this.item.update({ 'system.environnement': newList });
+    }
+  }
+
+  $getEventMilieu(event) {
+    return this.html.find(event.currentTarget)?.parents("div.environnement-milieu").data("milieu");
+  }
+}

module/item/sheet-blessure.js

@@ -0,0 +1,29 @@
+import { RdDItemSheet } from "../item-sheet.js";
+
+export class RdDBlessureItemSheet extends RdDItemSheet {
+
+  static get ITEM_TYPE() { return "blessure" };
+
+  async getData() {
+    const formData = await super.getData();
+    formData.disabled = formData.options.isGM || formData.options.isOwned ? '' : 'disabled';
+    return formData;
+  }
+
+  activateListeners(html) {
+    super.activateListeners(html);
+
+    if (!this.options.editable) return;
+
+    this.html.find('[name="premierssoins-done"]').change(async event => {
+      await this.item.setSoinsBlessure({ premierssoins: { done: event.currentTarget.checked } });
+    });
+    this.html.find('[name="soinscomplets-done"]').change(async event => {
+      await this.item.setSoinsBlessure({ soinscomplets: { done: event.currentTarget.checked } })
+    });
+    this.html.find('[name="system-gravite"]').change(async event => {
+      const gravite = Number(event.currentTarget.value)
+      await this.item.setSoinsBlessure({ gravite: gravite, difficulte: - gravite })
+    });
+  }
+}

module/item/sheet-conteneur.js

@@ -1,8 +1,9 @@
-import { RdDItemSheet } from "./item-sheet.js";
+import { RdDBaseActorSheet } from "../actor/base-actor-sheet.js";
-import { RdDSheetUtility } from "./rdd-sheet-utility.js";
+import { RdDSheetUtility } from "../rdd-sheet-utility.js";
-import { RdDUtility } from "./rdd-utility.js";
+import { RdDUtility } from "../rdd-utility.js";
+import { RdDItemInventaireSheet } from "./sheet-base-inventaire.js";
 
-export class RdDConteneurItemSheet extends RdDItemSheet {
+export class RdDConteneurItemSheet extends RdDItemInventaireSheet {
 
   static get ITEM_TYPE() { return "conteneur" };
 
@@ -27,9 +28,8 @@ export class RdDConteneurItemSheet extends RdDItemSheet {
 
   /* -------------------------------------------- */
   prepareConteneurData(formData) {
-    RdDUtility.filterEquipementParType(formData, this.actor.itemTypes);
+    RdDBaseActorSheet.filterItemsPerTypeForSheet(formData, this.actor.itemTypes);
-
+    this.objetVersConteneur = RdDUtility.buildArbreDeConteneurs(formData.conteneurs, formData.inventaires);
-    this.objetVersConteneur = RdDUtility.buildArbreDeConteneurs(formData.conteneurs, formData.objets);
     formData.subItems = formData.conteneurs.find(it => it._id == this.item.id)?.subItems;
   }
 
@@ -43,7 +43,8 @@ export class RdDConteneurItemSheet extends RdDItemSheet {
     const dragData = {
       actorId: this.actor.id,
       type: "Item",
-      data: item.system
+      data: item.system,
+      uuid: item.uuid
     };
 
     event.dataTransfer.setData("text/plain", JSON.stringify(dragData));
@@ -51,7 +52,8 @@ export class RdDConteneurItemSheet extends RdDItemSheet {
 
   async _onDropItem(event, dragData) {
     if (this.actor) {
-      const dropParams = RdDSheetUtility.prepareItemDropParameters(this.item.id, this.actor, dragData, this.objetVersConteneur);
+      const destItemId = this.html.find(event.target)?.closest('.item').attr('data-item-id') ?? this.item.id
+      const dropParams = await RdDSheetUtility.prepareItemDropParameters(destItemId, this.actor, dragData, this.objetVersConteneur);
       await this.actor.processDropItem(dropParams);
       await this.render(true);
     }

module/item/sheet-faune.js

@@ -0,0 +1,38 @@
+import { RdDItemInventaireSheet } from "./sheet-base-inventaire.js";
+
+export class RdDFauneItemSheet extends RdDItemInventaireSheet {
+
+  static get ITEM_TYPE() { return "faune" };
+
+  activateListeners(html) {
+    super.activateListeners(html);
+
+    if (!this.options.editable) return;
+
+    html.find("a.linked-actor-delete").click(event => this.onDeleteLinkedActor());
+  }
+
+  async _onDropActor(event, dragData) {
+    console.log('faune:dropActor', event, dragData)
+    const linkedActor = fromUuidSync(dragData.uuid);
+    if (linkedActor?.pack) {
+      this.item.update({
+        'system.actor.pack': linkedActor.pack,
+        'system.actor.id': linkedActor._id,
+        'system.actor.name': linkedActor.name
+      });
+    }
+    else {
+      ui.notifications.warn(`${linkedActor.name} ne provient pas d'un compendium.
+        <br>Choisissez une créature du compendium pour représenter un élément de faune générique`)
+    }
+  }
+  async onDeleteLinkedActor() {
+    this.item.update({
+      'system.actor.pack': '',
+      'system.actor.id': '',
+      'system.actor.name': ''
+    });
+  }
+
+}

module/item/sheet-herbe.js

@@ -0,0 +1,6 @@
+import { RdDItemInventaireSheet } from "./sheet-base-inventaire.js";
+
+export class RdDHerbeItemSheet extends RdDItemInventaireSheet {
+
+  static get ITEM_TYPE() { return "herbe" };
+}

module/item/sheet-ingredient.js

@@ -0,0 +1,5 @@
+import { RdDItemInventaireSheet } from "./sheet-base-inventaire.js";
+
+export class RdDIngredientItemSheet extends RdDItemInventaireSheet {
+  static get ITEM_TYPE() { return "ingredient" };
+}

module/item/sheet-plante.js

@@ -0,0 +1,7 @@
+import { RdDItemInventaireSheet } from "./sheet-base-inventaire.js";
+
+export class RdDPlanteItemSheet extends RdDItemInventaireSheet {
+
+  static get ITEM_TYPE() { return "plante" };
+
+}

module/item/sheet-rencontre.js

@@ -1,5 +1,5 @@
-import { RdDRencontre } from "./item-rencontre.js";
+import { RdDRencontre } from "./rencontre.js";
-import { RdDItemSheet } from "./item-sheet.js";
+import { RdDItemSheet } from "../item-sheet.js";
 
 export class RdDRencontreItemSheet extends RdDItemSheet {
   
@@ -23,15 +23,8 @@ export class RdDRencontreItemSheet extends RdDItemSheet {
 
   /* -------------------------------------------- */
   async getData() {
-    const formData = duplicate(this.item);
+    const formData = await super.getData();
     mergeObject(formData, {
-      title: formData.name,
-      isGM: game.user.isGM,
-      owner: this.actor?.isOwner,
-      isOwned: this.actor ? true : false,
-      actorId: this.actor?.id,
-      editable: this.isEditable,
-      cssClass: this.isEditable ? "editable" : "locked",
       effets: {
         succes: {
           liste: RdDRencontre.getEffetsSucces(),

module/item/sheet-service.js

@@ -0,0 +1,16 @@
+import { RdDItemSheet } from "../item-sheet.js";
+
+export class RdDServiceItemSheet extends RdDItemSheet {
+
+  static get ITEM_TYPE() { return "service" };
+
+  async getData() {
+    const formData = await super.getData();
+    formData.disabled = formData.options.isGM || formData.options.isOwned ? '' : 'disabled';
+    return formData;
+  }
+
+  activateListeners(html) {
+    super.activateListeners(html);
+  }
+}

module/item/sheet-signedraconique.js

@@ -1,6 +1,6 @@
-import { RdDItemSheet } from "./item-sheet.js";
+import { RdDItemSheet } from "../item-sheet.js";
-import { RdDItemSigneDraconique } from "./item-signedraconique.js";
+import { RdDItemSigneDraconique } from "./signedraconique.js";
-import { TMRUtility } from "./tmr-utility.js";
+import { TMRUtility } from "../tmr-utility.js";
 
 /**
  * Item sheet pour signes draconiques
@@ -23,18 +23,9 @@ export class RdDSigneDraconiqueItemSheet extends RdDItemSheet {
 
   /* -------------------------------------------- */
   async getData() {
-    const formData = duplicate(this.item);
+    const formData = await super.getData();
     this.tmrs = TMRUtility.buildSelectionTypesTMR(this.item.system.typesTMR);
-    mergeObject(formData, {
+    formData.tmrs = this.tmrs;
-      tmrs: this.tmrs,
-      title: formData.name,
-      isGM: game.user.isGM,
-      owner: this.actor?.isOwner,
-      isOwned: this.actor ? true : false,
-      actorId: this.actor?.id,
-      editable: this.isEditable,
-      cssClass: this.isEditable ? "editable" : "locked",
-    });
     return formData;
   }
 

module/item/signedraconique.js

@@ -1,8 +1,9 @@
-import { defaultItemImg } from "./item.js";
+import { RdDItem, defaultItemImg } from "../item.js";
-import { Misc } from "./misc.js";
+import { Misc } from "../misc.js";
-import { RdDDice } from "./rdd-dice.js";
+import { RdDDice } from "../rdd-dice.js";
-import { RdDRollTables } from "./rdd-rolltables.js";
+import { RdDRollTables } from "../rdd-rolltables.js";
-import { TMRType, TMRUtility } from "./tmr-utility.js";
+import { RdDTimestamp } from "../time/rdd-timestamp.js";
+import { TMRType, TMRUtility } from "../tmr-utility.js";
 
 const tableSignesIndicatifs = [
   { rarete: "Très facile", difficulte: 0, xp: 6, nbCases: 14 },
@@ -15,7 +16,17 @@ const tableSignesIndicatifs = [
 
 const DIFFICULTE_LECTURE_SIGNE_MANQUE = +11;
 
-export class RdDItemSigneDraconique {
+export class RdDItemSigneDraconique extends RdDItem {
+
+  static get defaultIcon() {
+    return "systems/foundryvtt-reve-de-dragon/icons/tmr/signe_draconique.webp";
+  }
+
+  
+  async calculerFinPeriodeTemporel(debut) {
+    // TODO
+    return RdDTimestamp.formulesDuree().find(it => it.code == "").calcul(debut, this.actor);
+  }
 
   static prepareSigneDraconiqueMeditation(meditation, rolled) {
     return {

module/item/souffle.js

@@ -0,0 +1,13 @@
+import { RdDItem } from "../item.js";
+
+export class RdDItemSouffle extends RdDItem {
+
+  static get defaultIcon() {
+    return "systems/foundryvtt-reve-de-dragon/icons/souffle_dragon.webp";
+  }
+
+  async calculerFinPeriodeTemporel(debut) {
+    return await debut.appliquerDuree(this.system.duree, this.parent);
+  }
+
+}

module/migrations.js

@@ -1,6 +1,10 @@
+import { RdDBaseActor } from "./actor/base-actor.js";
 import { LOG_HEAD, SYSTEM_RDD } from "./constants.js";
-import { Environnement } from "./environnement.js";
 import { Grammar } from "./grammar.js";
+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";
 
 class Migration {
   get code() { return "sample"; }
@@ -9,7 +13,7 @@ class Migration {
 
   async applyItemsUpdates(computeUpdates) {
     await game.actors.forEach(async (actor) => {
-      const actorItemUpdates = computeUpdates(actor.items);
+      const actorItemUpdates = computeUpdates(actor.items).filter(it => it != undefined);
       if (actorItemUpdates.length > 0) {
         console.log(
           this.code,
@@ -20,7 +24,7 @@ class Migration {
       }
     });
 
-    const itemUpdates = computeUpdates(game.items);
+    const itemUpdates = computeUpdates(game.items).filter(it => it != undefined);
     if (itemUpdates.length > 0) {
       console.log(this.code, "Applying updates on items", itemUpdates);
       await Item.updateDocuments(itemUpdates);
@@ -29,6 +33,38 @@ class Migration {
 
 }
 
+class _1_5_34_migrationPngWebp {
+  get code() { return "migrationPngWebp"; }
+  get version() { return "1.5.34"; }
+  async migrate() {
+
+    const regexOldPngJpg = /(systems\/foundryvtt-reve-de-dragon\/icons\/.*)\.(png|jpg)/;
+    const replaceWithWebp = '$1.webp';
+    function convertImgToWebp(img) {
+      return img.replace(regexOldPngJpg, replaceWithWebp);
+    }
+    function prepareDocumentsImgUpdate(documents) {
+      return documents.filter(it => it.img && it.img.match(regexOldPngJpg))
+        .map(it => {
+          return { _id: it.id, img: convertImgToWebp(it.img) }
+        });
+    }
+
+    const itemsUpdates = prepareDocumentsImgUpdate(game.items);
+    const actorsUpdates = prepareDocumentsImgUpdate(game.actors);
+    //Migrate system png to webp
+    await Item.updateDocuments(itemsUpdates);
+    await Actor.updateDocuments(actorsUpdates);
+    game.actors.forEach(actor => {
+      if (actor.token?.img && actor.token.img.match(regexOldPngJpg)) {
+        actor.update({ "token.img": convertImgToWebp(actor.token.img) });
+      }
+      const actorItemsToUpdate = prepareDocumentsImgUpdate(actor.items);
+      actor.updateEmbeddedDocuments('Item', actorItemsToUpdate);
+    });
+  }
+}
+
 class _10_0_16_MigrationSortsReserve extends Migration {
   get code() { return "creation-item-sort-reserve"; }
   get version() { return "10.0.16"; }
@@ -236,7 +272,7 @@ class _10_3_0_Inventaire extends Migration {
   }
   _updatesMonnaies(items) {
     return items
-      .filter(it => ['monnaie'].includes(it.type) && it.system.cout == undefined)
+      .filter(it => ['monnaie'].includes(it.type) && it.system.valeur_deniers != undefined)
       .map(it => { return { _id: it.id, 'system.cout': it.system.valeur_deniers / 100, 'system.valeur_deniers': undefined } });
   }
 }
@@ -251,10 +287,229 @@ class _10_3_0_FrequenceEnvironnement extends Migration {
   }
 
   _updatesFrequences(it) {
+    const rarete = RdDRaretes.byCode(it.system.rarete);
     return {
       _id: it.id,
       'system.rarete': undefined,
-      'system.environnement': [{ milieu: it.system.milieu, rarete: it.system.rarete, frequence: Environnement.getFrequenceRarete(it.system.rarete, 'frequence') }]
+      'system.environnement': [{ milieu: it.system.milieu, rarete: rarete.code, frequence: rarete.frequence }]
+    }
+  }
+}
+
+class _10_3_17_Monnaies extends Migration {
+  constructor() {
+    super();
+    this.mapValeur = {
+      "Etain (1 denier)": { name: 'Denier (étain)', system: { cout: 0.01 } },
+      "Bronze (10 deniers)": { name: "Sou (bronze)", system: { cout: 0.1 } },
+      "Argent (1 sol)": { name: "Sol (argent)", system: { cout: 1 } },
+      "Or (10 sols)": { name: "Dragon (or)", system: { cout: 10 } }
+    };
+  }
+  get code() { return "migration-monnaies"; }
+  get version() { return "10.3.17"; }
+
+  async migrate() {
+    await this.applyItemsUpdates(items => this._updatesMonnaies(items));
+  }
+
+  _updatesMonnaies(items) {
+    return items
+      .filter(it => 'monnaie' == it.type)
+      .filter(it => this.mapValeur[it.name] != undefined)
+      .map(it => {
+        const correction = this.mapValeur[it.name];
+        return {
+          _id: it.id,
+          'name': correction.name,
+          'system.cout': correction.system.cout,
+          'system.valeur_deniers': undefined
+        }
+      });
+  }
+}
+
+class _10_4_6_ServicesEnCommerces extends Migration {
+
+  get code() { return "migration-service-acteurs"; }
+  get version() { return "10.4.6"; }
+
+  async migrate() {
+    const servicesToMigrate = game.items.filter(it => it.type == 'service');
+    servicesToMigrate.forEach(async service => {
+      const commerce = await this.convertServiceToCommerce(service);
+      await RdDBaseActor.create(commerce, { renderSheet: false });
+      await service.delete();
+    });
+  }
+
+  async convertServiceToCommerce(service) {
+    return {
+      name: service.name, img: service.img, type: 'commerce',
+      system: {
+        description: service.system.description,
+        notesmj: service.system.descriptionmj,
+        illimite: service.system.illimite
+      },
+      items: await this.transformInventaireCommerce(service)
+    }
+  }
+  async transformInventaireCommerce(service) {
+    const serviceItems = (service.system.items ?? []);
+    const commerceItems = await Promise.all(serviceItems.map(async (it) => { return await this.transformToItemBoutique(it); }));
+    return commerceItems.concat(Monnaie.monnaiesStandard());
+  }
+
+  async transformToItemBoutique(serviceRefItem) {
+    const item = await RdDItem.getCorrespondingItem(serviceRefItem);
+    const itemToCreate = {
+      name: item.name, img: item.img, type: item.type,
+      system: mergeObject({ cout: serviceRefItem.system.cout, quantite: serviceRefItem.system.quantite }, item.system, { overwrite: false })
+    };
+    return itemToCreate;
+  }
+}
+
+class _10_5_0_UpdatePeriodicite extends Migration {
+  get code() { return "migration-periodicite-poisons-maladies"; }
+  get version() { return "10.5.0"; }
+
+  async migrate() {
+    await this.applyItemsUpdates(items => this._updatePeriodicite(items));
+  }
+
+  _updatePeriodicite(items) {
+    return items.filter(it => ['poison', 'maladie'].includes(it.type))
+      .filter(it => it.system.periodicite != "")
+      .map(it => {
+        let [incubation, periodicite] = this.getPeriodicite(it);
+        const periode = periodicite.split(' ');
+        let unite = periode.length == 2
+          ? RdDTimestamp.formulesPeriode().find(it => Grammar.includesLowerCaseNoAccent(periode[1], it.code))?.code
+          : undefined
+        if (unite && Number(periode[0])) {
+          return {
+            _id: it.id,
+            'system.periodicite': undefined,
+            'system.incubation': incubation,
+            'system.periode.nombre': Number.parseInt(periode[0]),
+            'system.periode.unite': unite
+          };
+        }
+        else {
+          return {
+            _id: it.id,
+            'system.periodicite': undefined,
+            'system.incubation': it.system.periodicite
+          };
+        }
+      }).filter(it => it != undefined);
+  }
+
+  getPeriodicite(it) {
+    let p = it.system.periodicite.split(/[\/\\]/);
+    switch (p.length) {
+      case 2: return [p[0].trim(), p[1].trim()];
+      case 1: return ["", it.system.periodicite.trim()];
+      default: return [it.system.periodicite.trim(), ""];
+    }
+  }
+}
+
+class _10_7_0_MigrationBlessures extends Migration {
+  get code() { return "migration-blessures"; }
+  get version() { return "10.7.0"; }
+
+  async migrate() {
+    const timestamp = game.system.rdd.calendrier.getTimestamp()
+    await Promise.all(game.actors.filter(it => it.isPersonnage() || it.isCreature())
+      .map(async (actor) => {
+        const legeres = actor.system.blessures?.legeres.liste.filter(it => it.active).map(it => this.creerBlessure(2, 'légère', it, timestamp)) ?? [];
+        const graves = actor.system.blessures?.graves.liste.filter(it => it.active).map(it => this.creerBlessure(4, 'grave', it, timestamp)) ?? [];
+        const critiques = actor.system.blessures?.critiques.liste.filter(it => it.active).map(it => this.creerBlessure(6, 'critique', it, timestamp));
+        const blessures = legeres.concat(graves).concat(critiques);
+        if (blessures.length > 0) {
+          await actor.createEmbeddedDocuments("Item", blessures);
+        }
+        await actor.update({
+          'system.blessures.legeres.liste': [],
+          'system.blessures.graves.liste': [],
+          'system.blessures.critiques.liste': []
+        })
+      }));
+  }
+  creerBlessure(gravite, graviteTexte, blessure, timestamp) {
+    const dateBlessure = timestamp.addJours(-blessure.jours);
+    const datePremiereRecup = dateBlessure.addJours(gravite);
+    return {
+      name: `Blessure ${graviteTexte}`,
+      type: 'blessure',
+      img: `systems/foundryvtt-reve-de-dragon/icons/sante/blessure${blessure.psdone ? '-soins' : ''}.webp`,
+      system: {
+        gravite: gravite,
+        difficulte: -gravite,
+        debut: { indexDate: dateBlessure.indexDate, indexMinute: 0 },
+        fin: { indexDate: datePremiereRecup.indexDate, indexMinute: 0 },
+        premierssoins: { done: blessure.psdone, bonus: blessure.premiers_soins },
+        soinscomplets: { done: blessure.scdone, bonus: blessure.soins_complets },
+        localisation: blessure.localisation
+      }
+    }
+  }
+}
+
+class _10_7_19_CategorieCompetenceCreature extends Migration {
+  get code() { return "categorie-competence-creature"; }
+  get version() { return "10.7.19"; }
+
+  async migrate() {
+    await this.applyItemsUpdates(items => items
+      .filter(it => TYPES.competencecreature == it.type)
+      .map(it => this.migrateCompetenceCreature(it))
+    );
+  }
+
+  migrateCompetenceCreature(it) {
+    const categorie = this.getCategorie(it)
+    if (categorie == it.system.categorie) {
+      return undefined
+    }
+    return { _id: it.id, 'system.categorie': categorie }
+  }
+
+  getCategorie(it) {
+    if (it.system.ispossession) {
+      return 'possession'
+    }
+    switch (it.system.categorie) {
+      case "melee":
+        if (it.system.isnaturelle) {
+          return 'naturelle'
+        }
+        return 'melee'
+      case "particuliere": case "specialisee": case "connaissance":
+        return "generale"
+      default:
+        return it.system.categorie
+    }
+  }
+}
+
+class _10_7_19_PossessionsEntiteVictime extends Migration {
+  get code() { return "possessions-entite-victime"; }
+  get version() { return "10.7.19"; }
+
+  async migrate() {
+    await this.applyItemsUpdates(items => items
+      .filter(it => TYPES.possession == it.type)
+      .map(it => this.migratePossession(it))
+    );
+  }
+
+  migratePossession(it) {
+    return { _id: it.id,
+      'system.entite.actorid': it.system.possesseurid,
+      'system.victime.actorid': it.system.possedeid
     }
   }
 }
@@ -262,6 +517,7 @@ class _10_3_0_FrequenceEnvironnement extends Migration {
 export class Migrations {
   static getMigrations() {
     return [
+      new _1_5_34_migrationPngWebp(),
       new _10_0_16_MigrationSortsReserve(),
       new _10_0_17_MigrationCompetenceCreature(),
       new _10_0_21_VehiculeStructureResistanceMax(),
@@ -269,7 +525,13 @@ export class Migrations {
       new _10_2_5_ArmesTirLancer(),
       new _10_2_10_DesirLancinant_IdeeFixe(),
       new _10_3_0_Inventaire(),
-      new _10_3_0_FrequenceEnvironnement()
+      new _10_3_0_FrequenceEnvironnement(),
+      new _10_3_17_Monnaies(),
+      new _10_4_6_ServicesEnCommerces(),
+      new _10_5_0_UpdatePeriodicite(),
+      new _10_7_0_MigrationBlessures(),
+      new _10_7_19_CategorieCompetenceCreature(),
+      new _10_7_19_PossessionsEntiteVictime(),
     ];
   }
 
@@ -284,18 +546,12 @@ export class Migrations {
   }
 
   migrate() {
-    const currentVersion = game.settings.get(SYSTEM_RDD,"systemMigrationVersion");
+    const currentVersion = game.settings.get(SYSTEM_RDD, "systemMigrationVersion");
-    //if (isNewerVersion(game.system.version, currentVersion)) {
+    if (isNewerVersion(game.system.version, currentVersion)) {
-    if (true) { /* comment previous and uncomment here to test before upgrade  */
+      // if (true) { /* comment previous and uncomment here to test before upgrade  */
       const migrations = Migrations.getMigrations().filter(m => isNewerVersion(m.version, currentVersion));
       if (migrations.length > 0) {
-        migrations.sort((a, b) =>
+        migrations.sort((a, b) => this.compareVersions(a, b));
-          isNewerVersion(a.version, b.version)
-            ? 1
-            : isNewerVersion(b.version, a.version)
-              ? -1
-              : 0
-        );
         migrations.forEach(async (m) => {
           ui.notifications.info(
             `Executing migration ${m.code}: version ${currentVersion} is lower than ${m.version}`
@@ -321,4 +577,8 @@ export class Migrations {
       console.log(LOG_HEAD + `No system version changed`);
     }
   }
+
+  compareVersions(a, b) {
+    return isNewerVersion(a.version, b.version) ? 1 : isNewerVersion(b.version, a.version) ? -1 : 0;
+  }
 }

module/misc.js

@@ -42,10 +42,13 @@ export class Misc {
   }
 
   static typeName(type, subType) {
-    return subType ? game.i18n.localize(`${type.toUpperCase()}.Type${Misc.upperFirst(subType)}`)
+    return subType ? game.i18n.localize(`TYPES.${type}.${Misc.upperFirst(subType)}`)
       : '';
   }
 
+  static arrayOrEmpty(items) {
+    return items?.length ? items : [];
+  }
   /**
    * Converts the value to an integer, or to 0 if undefined/null/not representing integer
    * @param {*} value value to convert to an integer using parseInt
@@ -60,8 +63,8 @@ export class Misc {
 
   static keepDecimals(num, decimals) {
     if (decimals <= 0 || decimals > 6) return num;
-    const decimal = Math.pow(10, parseInt(decimals));
+    const power10n = Math.pow(10, parseInt(decimals));
-    return Math.round(num * decimal) / decimal;
+    return Math.round(num * power10n) / power10n;
   }
 
   static getFractionHtml(diviseur) {
@@ -82,6 +85,7 @@ export class Misc {
     list.forEach(it => addToObj(obj, it))
     return obj;
   }
+
   static concat(lists) {
     return lists.reduce((a, b) => a.concat(b), []);
   }
@@ -115,6 +119,17 @@ export class Misc {
     }
   }
 
+  /**
+   * @returns an array of incremental integers (including from / excluding to).
+   *  if max<min, the array is decrementing integers 
+   */
+  static intArray(from, to) {
+    if (from > to) {
+      return Array.from(Array(from - to).keys()).map(i => from - i)
+    }
+    return Array.from(Array(to - from).keys()).map(i => from + i)
+  }
+
   static distinct(array) {
     return [...new Set(array)];
   }
@@ -150,11 +165,11 @@ export class Misc {
     return game.users.filter(u => u.isGM && u.active).sort(Misc.ascending(u => u.id)).find(u => u.isGM && u.active);
   }
 
-  static isOwnerPlayer(actor, user=undefined) {
+  static isOwnerPlayer(actor, user = undefined) {
     return actor.testUserPermission(user ?? game.user, CONST.DOCUMENT_PERMISSION_LEVELS.OWNER)
   }
 
-  static  isOwnerPlayerOrUniqueConnectedGM(actor, user =undefined){
+  static isOwnerPlayerOrUniqueConnectedGM(actor, user = undefined) {
     return Misc.isOwnerPlayer(actor, user) ?? Misc.isUniqueConnectedGM();
   }
 
@@ -224,4 +239,15 @@ export class Misc {
     }
     return subset;
   }
+
+  static cssRotation(angle) {
+    const rotation = `rotate(${angle}deg)`;
+    return {
+      'transform': rotation,
+      '-ms-transform': rotation,
+      '-moz-transform': rotation,
+      '-webkit-transform': rotation,
+      '-o-transform': rotation
+    };
+  }
 }

module/rdd-alchimie.js

@@ -8,13 +8,11 @@ export class RdDAlchimie {
 
   /* -------------------------------------------- */
   static processManipulation(recette, actorId = undefined) {
-    //console.log("CALLED", recette, recette.isOwned, actorId );
     let manip = recette.system.manipulation;
     let matchArray = manip.match(matchOperations);
     if (matchArray) {
       for (let matchStr of matchArray) {
         let result = matchStr.match(matchOperationTerms);
-        //console.log("RESULT ", result);
         if (result[1] && result[2]) {
           let commande = Misc.upperFirst(result[1]);
           let replacement = this[`_alchimie${commande}`](recette, result[2], actorId);
@@ -27,20 +25,19 @@ export class RdDAlchimie {
 
   /* -------------------------------------------- */
   static _alchimieCouleur(recette, couleurs, actorId) {
-    if (actorId) {
+    return RdDAlchimie._alchimieLink(recette, couleurs, actorId,  'couleur',  'Température');
-      return `<span class="alchimie-tache"><a data-recette-id="${recette._id}" data-actor-id="${actorId}" data-alchimie-tache="couleur" data-alchimie-data="${couleurs}">couleur ${couleurs}</a></span>`;
-    } else {
-      return `<span class="alchimie-tache">couleur ${couleurs} </span>`;
-    }
   }
 
   /* -------------------------------------------- */
   static _alchimieConsistance(recette, consistances, actorId) {
-    if (actorId) {
+    return RdDAlchimie._alchimieLink(recette, consistances, actorId,  'consistance',  'Consistance');
-      return `<span class="alchimie-tache"><a data-recette-id="${recette._id}" data-actor-id="${actorId}" data-alchimie-tache="consistance" data-alchimie-data="${consistances}">consistance ${consistances}</a></span>`;
-    } else {
-      return `<span class="alchimie-tache">consistance ${consistances} </span>`;
   }
+
+  static _alchimieLink(recette, termes, actorId, tacheAlchimie, labelTache) {
+    const difficulte = RdDAlchimie.getDifficulte(termes);
+    const link = actorId ? ` <a data-recette-id="${recette._id}" data-actor-id="${actorId}" data-alchimie-tache="${tacheAlchimie}" data-alchimie-data="${termes}">` : '';
+    const endLink = actorId ? '</a>' : '';
+    return `<span class="alchimie-tache">${link}${labelTache} ${termes} (${difficulte})${endLink}</span>`;
   }
 
   /* -------------------------------------------- */

module/rdd-astrologie-editeur.js

@@ -1,48 +0,0 @@
-
-/**
- * Extend the base Dialog entity by defining a custom window to perform roll.
- * @extends {Dialog}
- */
- export class RdDAstrologieEditeur extends Dialog {
-
-  /* -------------------------------------------- */
-  constructor(html, calendrier, calendrierData) {
-
-    let myButtons = {
-        resetButton: { label: "Re-tirer les nombres astraux", callback: html => this.resetNombreAstraux() },
-        saveButton: { label: "Fermer", callback: html => this.fillData() }
-      };
-
-    // Common conf
-    let dialogConf = { content: html, title: "Editeur d'Astrologie", buttons: myButtons, default: "saveButton" };
-    let dialogOptions = { classes: ["rdd-roll-dialog"], width: 600, height: 300, 'z-index': 99999 }  
-    super(dialogConf, dialogOptions)
-    
-    this.calendrier = calendrier;
-    this.updateData( calendrierData );
-  }
-
-  activateListeners(html) {
-    super.activateListeners(html);
-    this.html = html;
-  }
-
-
-  /* -------------------------------------------- */  
-  async resetNombreAstraux() {
-    game.system.rdd.calendrier.resetNombreAstral();
-    await game.system.rdd.calendrier.rebuildListeNombreAstral();
-
-    game.system.rdd.calendrier.showAstrologieEditor();
-  }
-
-  /* -------------------------------------------- */  
-  fillData( ) {
-  }
-
-  /* -------------------------------------------- */
-  updateData( calendrierData ) {
-    this.calendrierData = duplicate(calendrierData);
-  }
-
-}

module/rdd-astrologie-joueur.js

@@ -1,104 +0,0 @@
-import { RdDItemCompetence } from "./item-competence.js";
-import { Misc } from "./misc.js";
-import { SYSTEM_SOCKET_ID } from "./constants.js";
-
-
-/**
- * Extend the base Dialog entity by defining a custom window to perform roll.
- * @extends {Dialog}
- */
-export class RdDAstrologieJoueur extends Dialog {
-
-  /* -------------------------------------------- */
-  static async create(actor, dialogConfig) {
-
-    let dialogData = {
-      nombres: this.organizeNombres(actor),
-      dates: game.system.rdd.calendrier.getJoursSuivants(10),
-      etat: actor.getEtatGeneral(),
-      ajustementsConditions: CONFIG.RDD.ajustementsConditions,
-      astrologie: RdDItemCompetence.findCompetence(actor.items, 'Astrologie')
-    }
-    const html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/dialog-astrologie-joueur.html', dialogData);
-    let options = { classes: ["rdd-roll-dialog"], width: 600, height: 500, 'z-index': 99999 };
-    if (dialogConfig.options) {
-      mergeObject(options, dialogConfig.options, { overwrite: true });
-    }
-    return new RdDAstrologieJoueur(html, actor, dialogData);
-  }
-
-  /* -------------------------------------------- */
-  constructor(html, actor, dialogData) {
-    const dialogConf = {
-      title: "Nombres Astraux",
-      content: html,
-      default: "saveButton",
-      buttons: {
-        saveButton: { label: "Fermer", callback: html => this.quitDialog() }
-      },
-    };
-    const dialogOptions = { classes: ["rdd-roll-dialog"], width: 600, height: 300, 'z-index': 99999 };
-    super(dialogConf, dialogOptions);
-
-    this.actor = actor;
-    this.dataNombreAstral = duplicate(dialogData);
-  }
-
-  /* -------------------------------------------- */
-  activateListeners(html) {
-    super.activateListeners(html);
-    this.html = html;
-
-    this.html.find(function () {
-      this.html.find("[name='diffConditions']").val(0);
-    });
-
-    this.html.find('[name="jet-astrologie"]').click((event) => {
-      this.requestJetAstrologie();
-    });
-  }
-
-  /* -------------------------------------------- */
-  static organizeNombres(actor) {
-    let itemNombres = actor.listItemsData('nombreastral');
-    let itemFiltered = {};
-    for (let item of itemNombres) {
-      if (itemFiltered[item.system.jourindex]) {
-        itemFiltered[item.system.jourindex].listValues.push(item.system.value);
-      } else {
-        itemFiltered[item.system.jourindex] = {
-          listValues: [item.system.value],
-          jourlabel: item.system.jourlabel
-        }
-      }
-    }
-    return itemFiltered;
-  }
-
-  /* -------------------------------------------- */
-  requestJetAstrologie() {
-    let socketData = {
-      id: this.actor.id,
-      carac_vue: this.actor.system.carac['vue'].value,
-      etat: this.dataNombreAstral.etat,
-      astrologie: this.dataNombreAstral.astrologie,
-      conditions: this.html.find('[name="diffConditions"]').val(),
-      date: this.html.find('[name="joursAstrologie"]').val(),
-      userId: game.user.id
-    }
-    if (Misc.isUniqueConnectedGM()) {
-      game.system.rdd.calendrier.requestNombreAstral(socketData);
-    } else {
-      game.socket.emit(SYSTEM_SOCKET_ID, {
-        msg: "msg_request_nombre_astral",
-        data: socketData
-      });
-    }
-    this.close();
-  }
-
-  /* -------------------------------------------- */
-  quitDialog() {
-  }
-
-}

module/rdd-bonus.js

@@ -1,4 +1,5 @@
 import { RdDCarac } from "./rdd-carac.js";
+import { RdDPossession } from "./rdd-possession.js";
 
 const conditionsTactiques = [
   { type: '', descr: '', dmg: 0, attaque: 0, parade: 0, esquive: true },
@@ -24,11 +25,17 @@ export class RdDBonus {
   }
   /* -------------------------------------------- */
   static isDefenseAttaqueFinesse(rollData) {
+    if (rollData.isEmpoignade && rollData.rolled?.isPart) {
+      return true
+    }
+    if (RdDPossession.isDefensePossession(rollData)) {
+      return RdDPossession.isPossessionFinesse(rollData)
+    }
     return rollData.attackerRoll?.particuliere == 'finesse';
   }
 
   /* -------------------------------------------- */
-  static dmg(rollData, dmgActor, isCauchemar = false) {
+  static dmg(rollData, dmgActor, isEntiteIncarnee = false) {
     let dmg = { total: 0 };
     if (rollData.arme && rollData.arme.name.toLowerCase() == "esquive") {
       // Specific case management
@@ -41,7 +48,7 @@ export class RdDBonus {
       dmg.dmgSurprise = RdDBonus.dmgBonus(rollData.ajustements?.attaqueDefenseurSurpris.used);
       dmg.dmgActor = rollData.selectedCarac ? RdDBonus._dmgPerso(dmgActor, rollData.selectedCarac.label, dmg.dmgArme) : 0;
       dmg.total = dmg.dmgSurprise + dmg.dmgTactique + dmg.dmgArme + dmg.dmgActor + dmg.dmgParticuliere;
-      dmg.mortalite = RdDBonus._calculMortalite(rollData, isCauchemar)
+      dmg.mortalite = RdDBonus._calculMortalite(rollData, isEntiteIncarnee)
     }
     return dmg;
   }
@@ -62,11 +69,8 @@ export class RdDBonus {
   }
 
   /* -------------------------------------------- */
-  static _calculMortalite(rollData, isCauchemar) {
+  static _calculMortalite(rollData, isEntiteIncarnee) {
-    if (isCauchemar) {
+    return isEntiteIncarnee ? "entiteincarnee"
-      return "cauchemar";
-    }
-    return isCauchemar ? "cauchemar"
       : rollData.dmg?.mortalite
       ?? rollData.arme?.system.mortalite
       ?? "mortel";
@@ -74,7 +78,7 @@ export class RdDBonus {
 
   /* -------------------------------------------- */
   static _dmgArme(rollData) {
-    if ( rollData.arme) {
+    if (rollData.arme) {
       let dmgBase = rollData.arme.system.dommagesReels ?? Number(rollData.arme.system.dommages ?? 0);
       //Le bonus dégats magiques ne peut pas faire dépasser le bonus de l'arme (cf p.278)
       return dmgBase + Math.min(dmgBase, rollData.arme.system.magique ? rollData.arme.system.ecaille_efficacite : 0);

module/rdd-calendrier-editeur.js

@@ -1,52 +0,0 @@
-import { Misc } from "./misc.js";
-
-/**
- * Extend the base Dialog entity by defining a custom window to perform roll.
- * @extends {Dialog}
- */
-export class RdDCalendrierEditeur extends Dialog {
-
-  /* -------------------------------------------- */
-  constructor(html, calendrier, calendrierData) {
-    let dialogConf = {
-      content: html,
-      title: "Editeur de date/heure",
-      buttons: {
-        save: { label: "Enregistrer", callback: html => this.fillData() }
-      },
-      default: "save"
-    };
-    let dialogOptions = { classes: ["rdd-dialog-calendar-editor"], width: 400, height: 'fit-content', 'z-index': 99999 }
-    super(dialogConf, dialogOptions)
-
-    this.calendrier = calendrier;
-    this.calendrierData = calendrierData;
-  }
-
-  activateListeners(html) {
-    super.activateListeners(html);
-    this.html = html;
-    this.html.find("input[name='nomMois']").val(this.calendrierData.moisKey);
-    this.html.find("select[name='nomHeure']").val(this.calendrierData.heureKey);
-    this.html.find("select[name='jourMois']").val(this.calendrierData.jourMois);
-    this.html.find("select[name='minutesRelative']").val(calendrierData.minutesRelative);
-    this.html.find("select[name='annee']").val(this.calendrierData.annee);
-  }
-
-  /* -------------------------------------------- */
-  fillData() {
-    this.calendrierData.annee = this.html.find("input[name='annee']").val();
-    this.calendrierData.moisKey = this.html.find("select[name='nomMois']").val();
-    this.calendrierData.heureKey = this.html.find("select[name='nomHeure']").val();
-    this.calendrierData.jourMois = this.html.find("select[name='jourMois']").val();
-    this.calendrierData.minutesRelative = this.html.find("select[name='minutesRelative']").val();
-
-    this.calendrier.saveEditeur(this.calendrierData)
-  }
-
-  /* -------------------------------------------- */
-  updateData(calendrierData) {
-    this.calendrierData = duplicate(calendrierData);
-  }
-
-}

module/rdd-calendrier.js

@@ -1,649 +0,0 @@
-/* -------------------------------------------- */
-import { RdDCalendrierEditeur } from "./rdd-calendrier-editeur.js";
-import { RdDAstrologieEditeur } from "./rdd-astrologie-editeur.js";
-import { HtmlUtility } from "./html-utility.js";
-import { RdDResolutionTable } from "./rdd-resolution-table.js";
-import { RdDUtility } from "./rdd-utility.js";
-import { Grammar } from "./grammar.js";
-import { RdDDice } from "./rdd-dice.js";
-import { Misc } from "./misc.js";
-import { HIDE_DICE, SHOW_DICE, SYSTEM_RDD, SYSTEM_SOCKET_ID } from "./constants.js";
-import { DialogChronologie } from "./dialog-chronologie.js";
-
-/* -------------------------------------------- */
-const dossierIconesHeures = 'systems/foundryvtt-reve-de-dragon/icons/heures/'
-const heuresList = ["vaisseau", "sirene", "faucon", "couronne", "dragon", "epees", "lyre", "serpent", "poissonacrobate", "araignee", "roseau", "chateaudormant"];
-const heuresDef = {
-  "vaisseau": {key: "vaisseau", label: "Vaisseau", lettreFont: 'v', saison: "printemps", heure: 0, icon: 'hd01.svg' },
-  "sirene": { key: "sirene", label: "Sirène", lettreFont: 'i', saison: "printemps", heure: 1, icon: 'hd02.svg' },
-  "faucon": { key: "faucon", label: "Faucon", lettreFont: 'f', saison: "printemps", heure: 2, icon: 'hd03.svg' },
-  "couronne": { key: "couronne", label: "Couronne", lettreFont: '', saison: "ete", heure: 3, icon: 'hd04.svg' },
-  "dragon": { key: "dragon", label: "Dragon", lettreFont: 'd', saison: "ete", heure: 4, icon: 'hd05.svg' },
-  "epees": { key: "epees", label: "Epées", lettreFont: 'e', saison: "ete", heure: 5, icon: 'hd06.svg' },
-  "lyre": { key: "lyre", label: "Lyre", lettreFont: 'l', saison: "automne", heure: 6, icon: 'hd07.svg' },
-  "serpent": { key: "serpent", label: "Serpent", lettreFont: 's', saison: "automne", heure: 7, icon: 'hd08.svg' },
-  "poissonacrobate": { key: "poissonacrobate", label: "Poisson Acrobate", lettreFont: 'p', saison: "automne", heure: 8, icon: 'hd09.svg' },
-  "araignee": { key: "araignee", label: "Araignée", lettreFont: 'a', saison: "hiver", heure: 9, icon: 'hd10.svg' },
-  "roseau": { key: "roseau", label: "Roseau", lettreFont: 'r', saison: "hiver", heure: 10, icon: 'hd11.svg' },
-  "chateaudormant": { key: "chateaudormant", label: "Château Dormant", lettreFont: 'c', saison: "hiver", heure: 11, icon: 'hd12.svg' }
-};
-const saisonsDef = {
-  "printemps": { label: "Printemps" },
-  "ete": { label: "Eté" },
-  "automne": { label: "Automne" },
-  "hiver": { label: "Hiver" }
-};
-
-const RDD_MOIS_PAR_AN = 12;
-export const RDD_JOUR_PAR_MOIS = 28;
-const RDD_HEURES_PAR_JOUR = 12;
-const RDD_MINUTES_PAR_HEURES = 120;
-const MAX_NOMBRE_ASTRAL = 12;
-
-/* -------------------------------------------- */
-export class RdDCalendrier extends Application {
-
-  static get defaultOptions() {
-    return mergeObject(super.defaultOptions, {
-      template: "systems/foundryvtt-reve-de-dragon/templates/calendar-template.html",
-      popOut: false,
-      resizable: false
-    });
-  }
-
-  static createCalendrierPos() {
-    return { top: 200, left: 200 };
-  }
-
-  static getDefSigne(chiffre) {
-    chiffre = chiffre % RDD_MOIS_PAR_AN;
-    return Object.values(heuresDef).find(h => h.heure == chiffre);
-  }
-
-  static getSigneAs(key, value) {
-    const heure = (typeof value == 'string' || typeof value == 'number') && Number.isInteger(Number(value))
-      ? Number(value)
-      : (typeof value == 'string') ? RdDCalendrier.getChiffreFromSigne(value)
-      : undefined
-
-    if (heure != undefined && ['key', 'label', 'lettreFont', 'saison', 'heure', 'icon'].includes(key)) {
-      return RdDCalendrier.getDefSigne(heure)[key]
-    }
-    if (heure != undefined && ['webp'].includes(key)) {
-      return RdDCalendrier.getDefSigne(heure)['icon'].replace('svg', 'webp');
-    }
-    console.error(`Appel à getSigneAs('${key}', ${value}) avec une clé/heure incorrects`);
-    return value;
-
-  }
-  static getChiffreFromSigne(signe) {
-    return heuresList.indexOf(signe);
-  }
-
-  static createCalendrierInitial() {
-    return {
-      heureRdD: 0,
-      minutesRelative: 0,
-      indexJour: 0,
-      annee: 0,
-      moisRdD: 0,
-      moisLabel: heuresDef["vaisseau"].label,
-      jour: 0
-    }
-  }
-
-  getCalendrier(index) {
-    index = index ?? this.getCurrentDayIndex();
-    const mois = Math.floor(index / RDD_JOUR_PAR_MOIS) % RDD_MOIS_PAR_AN;
-    return {
-      heureRdD: 0, // Index dans heuresList / heuresDef[x].heure
-      minutesRelative: 0,
-      indexJour: index,
-      annee: Math.floor(index / (RDD_JOUR_PAR_MOIS * RDD_MOIS_PAR_AN)),
-      moisRdD: RdDCalendrier.getDefSigne(mois).heure,
-      moisLabel: RdDCalendrier.getDefSigne(mois).label,
-      jour: (index % RDD_JOUR_PAR_MOIS) // Le calendrier stocke le jour en 0-27, mais en 1-28 à l'affichage
-    }
-  }
-
-  constructor() {
-    super();
-    // position
-    this.calendrierPos = duplicate(game.settings.get(SYSTEM_RDD, "calendrier-pos"));
-    if (this.calendrierPos == undefined || this.calendrierPos.top == undefined) {
-      this.calendrierPos = RdDCalendrier.createCalendrierPos();
-      game.settings.set(SYSTEM_RDD, "calendrier-pos", this.calendrierPos);
-    }
-
-    // Calendrier
-    this.calendrier = duplicate(game.settings.get(SYSTEM_RDD, "calendrier") ?? RdDCalendrier.createCalendrierInitial());
-    this.calendrier.annee = this.calendrier.annee ?? Math.floor((this.calendrier.moisRdD ?? 0) / RDD_MOIS_PAR_AN);
-    this.calendrier.moisRdD = (this.calendrier.moisRdD ?? 0) % RDD_MOIS_PAR_AN;
-
-    if (Misc.isUniqueConnectedGM()) { // Uniquement si GM
-      game.settings.set(SYSTEM_RDD, "calendrier", this.calendrier);
-
-      this.listeNombreAstral = this.getListeNombreAstral();
-      this.rebuildListeNombreAstral(HIDE_DICE); // Ensure always up-to-date
-    }
-    console.log('RdDCalendrier.constructor()', this.calendrier, this.calendrierPos, this.listeNombreAstral);
-  }
-
-  /* -------------------------------------------- */
-  /** @override */
-  async activateListeners(html) {
-    super.activateListeners(html);
-    this.html = html;
-
-    this.updateDisplay();
-
-    this.html.find('.ajout-chronologie').click(ev => DialogChronologie.create());
-
-    this.html.find('.calendar-btn').click(ev => this.onCalendarButton(ev));
-
-    this.html.find('.calendar-btn-edit').click(ev => {
-      ev.preventDefault();
-      this.showCalendarEditor();
-    });
-
-    this.html.find('.astrologie-btn-edit').click(ev => {
-      ev.preventDefault();
-      this.showAstrologieEditor();
-    });
-
-    this.html.find('#calendar-move-handle').mousedown(ev => {
-      ev.preventDefault();
-      ev = ev || window.event;
-      let isRightMB = false;
-      if ("which" in ev) { // Gecko (Firefox), WebKit (Safari/Chrome) & Opera
-        isRightMB = ev.which == 3;
-      } else if ("button" in ev) { // IE, Opera 
-        isRightMB = ev.button == 2;
-      }
-
-      if (!isRightMB) {
-        dragElement(document.getElementById("calendar-time-container"));
-        let pos1 = 0, pos2 = 0, pos3 = 0, pos4 = 0;
-
-        function dragElement(elmnt) {
-          elmnt.onmousedown = dragMouseDown;
-          function dragMouseDown(e) {
-            e = e || window.event;
-            e.preventDefault();
-            pos3 = e.clientX;
-            pos4 = e.clientY;
-
-            document.onmouseup = closeDragElement;
-            document.onmousemove = elementDrag;
-          }
-
-          function elementDrag(e) {
-            e = e || window.event;
-            e.preventDefault();
-            // calculate the new cursor position:
-            pos1 = pos3 - e.clientX;
-            pos2 = pos4 - e.clientY;
-            pos3 = e.clientX;
-            pos4 = e.clientY;
-            // set the element's new position:
-            elmnt.style.bottom = undefined
-            elmnt.style.top = (elmnt.offsetTop - pos2) + "px";
-            elmnt.style.left = (elmnt.offsetLeft - pos1) + "px";
-          }
-
-          function closeDragElement() {
-            // stop moving when mouse button is released:
-            elmnt.onmousedown = undefined;
-            document.onmouseup = undefined;
-            document.onmousemove = undefined;
-            let xPos = (elmnt.offsetLeft - pos1) > window.innerWidth ? window.innerWidth - 200 : (elmnt.offsetLeft - pos1);
-            let yPos = (elmnt.offsetTop - pos2) > window.innerHeight - 20 ? window.innerHeight - 100 : (elmnt.offsetTop - pos2)
-            xPos = xPos < 0 ? 0 : xPos;
-            yPos = yPos < 0 ? 0 : yPos;
-            if (xPos != (elmnt.offsetLeft - pos1) || yPos != (elmnt.offsetTop - pos2)) {
-              elmnt.style.top = (yPos) + "px";
-              elmnt.style.left = (xPos) + "px";
-            }
-            game.system.rdd.calendrier.calendrierPos.top = yPos;
-            game.system.rdd.calendrier.calendrierPos.left = xPos;
-            if (game.user.isGM) {
-              game.settings.set(SYSTEM_RDD, "calendrier-pos", duplicate(game.system.rdd.calendrier.calendrierPos));
-            }
-          }
-        }
-      } else if (isRightMB) {
-        game.system.rdd.calendrier.calendrierPos.top = 200;
-        game.system.rdd.calendrier.calendrierPos.left = 200;
-        if (game.user.isGM) {
-          game.settings.set(SYSTEM_RDD, "calendrier-pos", duplicate(game.system.rdd.calendrier.calendrierPos));
-        }
-        this.setPos(game.system.rdd.calendrier.calendrierPos);
-      }
-    });
-  }
-  /* -------------------------------------------- */
-  getListeNombreAstral() {
-    return game.settings.get(SYSTEM_RDD, "liste-nombre-astral") ?? [];
-  }
-
-  /* -------------------------------------------- */
-  getDateFromIndex(index) {
-    const dateRdD = this.getCalendrier(index);
-    return (dateRdD.jour + 1) + ' ' + dateRdD.moisLabel;
-  }
-
-  /* -------------------------------------------- */
-  getDayMonthFromIndex(index = undefined) {
-    const dateRdD = this.getCalendrier(index);
-    return {
-      day: dateRdD.jour + 1,
-      month: heuresList[dateRdD.moisRdD]
-    }
-  }
-
-  /* -------------------------------------------- */
-  getCurrentHeure() {
-    return heuresList[this.calendrier.heureRdD];
-  }
-
-  /* -------------------------------------------- */
-  getCurrentDayIndex() {
-    return (((this.calendrier.annee ?? 0) * RDD_MOIS_PAR_AN + (this.calendrier.moisRdD ?? 0)) * RDD_JOUR_PAR_MOIS) + (this.calendrier.jour ?? 0);
-  }
-
-  /* -------------------------------------------- */
-  getIndexFromDate(jour, mois) {
-    return (heuresDef[mois].heure * RDD_JOUR_PAR_MOIS) + jour - 1;
-  }
-  /* -------------------------------------------- */
-  getJoursSuivants(num) {
-    let jours = [];
-    let index = this.getCurrentDayIndex();
-    for (let i = 0; i < num; i++) {
-      jours[i] = { label: this.getDateFromIndex(index + i), index: index + i };
-    }
-    return jours;
-  }
-
-  /* -------------------------------------------- */
-  async ajouterNombreAstral(index, showDice = SHOW_DICE) {
-    const nombreAstral = await RdDDice.rollTotal("1dh", { showDice: showDice, rollMode: "selfroll" });
-    const dateFuture = this.getDateFromIndex(index);
-    if (showDice != HIDE_DICE) {
-      ChatMessage.create({
-        whisper: ChatMessage.getWhisperRecipients("GM"),
-        content: `Le chiffre astrologique du ${dateFuture} sera le ${nombreAstral}`
-      });
-    }
-    return {
-      nombreAstral: nombreAstral,
-      valeursFausses: [],
-      index: index
-    }
-  }
-
-  /* -------------------------------------------- */
-  getCurrentNombreAstral() {
-    let indexDate = this.getCurrentDayIndex();
-    return this.getNombreAstral(indexDate);
-  }
-
-  /* -------------------------------------------- */
-  resetNombreAstral() {
-    this.listeNombreAstral = [];
-    game.settings.set(SYSTEM_RDD, "liste-nombre-astral", this.listeNombreAstral);
-
-    game.socket.emit(SYSTEM_SOCKET_ID, {
-      msg: "msg_reset_nombre_astral",
-      data: {}
-    });
-  }
-
-  /* -------------------------------------------- */
-  getNombreAstral(indexDate) {
-    const listNombreAstral = this.getListeNombreAstral();
-    let astralData = listNombreAstral.find((nombreAstral, i) => nombreAstral.index == indexDate);
-    return astralData?.nombreAstral;
-  }
-
-  /* -------------------------------------------- */
-  async rebuildListeNombreAstral(showDice = HIDE_DICE) {
-    if (Misc.isUniqueConnectedGM()) {
-      let jourCourant = this.getCurrentDayIndex();
-      let newList = [];
-      for (let i = 0; i < MAX_NOMBRE_ASTRAL; i++) {
-        let dayIndex = jourCourant + i;
-        let na = this.listeNombreAstral.find(n => n.index == dayIndex);
-        if (na) {
-          newList[i] = na;
-        } else {
-          newList[i] = await this.ajouterNombreAstral(dayIndex, showDice);
-        }
-      }
-      game.settings.set(SYSTEM_RDD, "liste-nombre-astral", newList);
-      this.listeNombreAstral = newList;
-    }
-  }
-
-  /* -------------------------------------------- */
-  async onCalendarButton(ev) {
-    ev.preventDefault();
-    const calendarAvance = ev.currentTarget.attributes['data-calendar-avance'];
-    const calendarSet = ev.currentTarget.attributes['data-calendar-set'];
-    if (calendarAvance) {
-      await this.incrementTime(Number(calendarAvance.value));
-    }
-    else if (calendarSet) {
-      this.positionnerHeure(Number(calendarSet.value));
-    }
-    this.updateDisplay();
-  }
-
-  /* -------------------------------------------- */
-  checkMaladie( periode) {
-    for (let actor of game.actors) {
-      if (actor.type == 'personnage') {
-        let maladies = actor.items.filter( item => (item.type == 'maladie' || (item.type == 'poison' && item.system.active) ) && item.system.periodicite.toLowerCase().includes(periode) );
-        for (let maladie of maladies) {
-          if ( maladie.system.identifie) {
-            ChatMessage.create({ content: `${actor.name} souffre de ${maladie.name} (${maladie.type}): vérifiez que les effets ne se sont pas aggravés !` });
-          } else {
-            ChatMessage.create({ content: `${actor.name} souffre d'un mal inconnu (${maladie.type}): vérifiez que les effets ne se sont pas aggravés !` });
-          }
-          let itemMaladie = actor.getObjet(maladie.id)
-          itemMaladie.postItem( 'gmroll');
-        }
-      }
-    }    
-  }
-
-  /* -------------------------------------------- */
-  async incrementTime(minutes = 0) {
-    this.calendrier.minutesRelative += minutes;
-    this.checkMaladie("round");
-    this.checkMaladie("minute");
-    if (this.calendrier.minutesRelative >= RDD_MINUTES_PAR_HEURES) {
-      this.calendrier.minutesRelative -= RDD_MINUTES_PAR_HEURES;
-      this.calendrier.heureRdD += 1;
-      this.checkMaladie("heure");
-      }
-    if (this.calendrier.heureRdD >= RDD_HEURES_PAR_JOUR) {
-      this.calendrier.heureRdD -= RDD_HEURES_PAR_JOUR;
-      await this.incrementerJour();
-      this.checkMaladie("heure");
-      this.checkMaladie("jour");
-    }
-    game.settings.set(SYSTEM_RDD, "calendrier", duplicate(this.calendrier));
-    // Notification aux joueurs // TODO: replace with Hook on game settings update
-    game.socket.emit(SYSTEM_SOCKET_ID, {
-      msg: "msg_sync_time",
-      data: duplicate(this.calendrier)
-    });
-  }
-
-  /* -------------------------------------------- */
-  async incrementerJour() {
-    const index = this.getCurrentDayIndex() + 1;
-    this.calendrier = this.getCalendrier(index);
-    await this.rebuildListeNombreAstral();
-  }
-
-  /* -------------------------------------------- */
-  syncPlayerTime(calendrier) {
-    this.calendrier = duplicate(calendrier); // Local copy update
-    this.updateDisplay();
-  }
-
-  /* -------------------------------------------- */
-  async positionnerHeure(indexHeure) {
-    if (indexHeure <= this.calendrier.heureRdD) {
-      await this.incrementerJour();
-    }
-    this.calendrier.heureRdD = indexHeure;
-    this.calendrier.minutesRelative = 0;
-    game.settings.set(SYSTEM_RDD, "calendrier", duplicate(this.calendrier));
-  }
-
-  /* -------------------------------------------- */
-  fillCalendrierData(formData = {}) {
-    const mois = RdDCalendrier.getDefSigne(this.calendrier.moisRdD);
-    const heure = RdDCalendrier.getDefSigne(this.calendrier.heureRdD);
-    console.log('fillCalendrierData', this.calendrier, mois, heure);
-
-    formData.heureKey = heure.key;
-    formData.moisKey = mois.key;
-    formData.jourMois = this.calendrier.jour + 1;
-    formData.nomMois = mois.label; // heures et mois nommés identiques
-    formData.annee = this.calendrier.annee;
-    formData.iconMois = dossierIconesHeures + mois.icon;
-    formData.nomHeure = heure.label;
-    formData.iconHeure = dossierIconesHeures + heure.icon;
-    formData.nomSaison = saisonsDef[mois.saison].label;
-    formData.heureRdD = this.calendrier.heureRdD;
-    formData.minutesRelative = this.calendrier.minutesRelative;
-    formData.isGM = game.user.isGM;
-    return formData;
-  }
-
-  /* -------------------------------------------- */
-  getLectureAstrologieDifficulte(dateIndex) {
-    let indexNow = this.getCurrentDayIndex();
-    let diffDay = dateIndex - indexNow;
-    return - Math.floor(diffDay / 2);
-  }
-
-  /* -------------------------------------------- */
-  async requestNombreAstral(request) {
-    if (Misc.isUniqueConnectedGM()) { // Only once
-      console.log(request);
-      let jourDiff = this.getLectureAstrologieDifficulte(request.date);
-      let niveau = Number(request.astrologie.system.niveau) + Number(request.conditions) + Number(jourDiff) + Number(request.etat);
-      let rollData = {
-        caracValue: request.carac_vue,
-        finalLevel: niveau,
-        showDice: HIDE_DICE,
-        rollMode: "blindroll"
-      };
-      await RdDResolutionTable.rollData(rollData);
-      let nbAstral = this.getNombreAstral(request.date);
-      request.rolled = rollData.rolled;
-      request.isValid = true;
-      if (!request.rolled.isSuccess) {
-        request.isValid = false;
-        nbAstral = await RdDDice.rollTotal("1dhr" + nbAstral, { rollMode: "selfroll" });
-        // Mise à jour des nombres astraux du joueur
-        let astralData = this.listeNombreAstral.find((nombreAstral, i) => nombreAstral.index == request.date);
-        astralData.valeursFausses.push({ actorId: request.id, nombreAstral: nbAstral });
-        game.settings.set(SYSTEM_RDD, "liste-nombre-astral", this.listeNombreAstral);
-      }
-      request.nbAstral = nbAstral;
-      if (Misc.getActiveUser(request.userId)?.isGM) {
-        RdDUtility.responseNombreAstral(request);
-      } else {
-        game.socket.emit(SYSTEM_SOCKET_ID, {
-          msg: "msg_response_nombre_astral",
-          data: request
-        });
-      }
-    }
-  }
-
-  /* -------------------------------------------- */
-  findHeure(heure) {
-    heure = Grammar.toLowerCaseNoAccentNoSpace(heure);
-    let parHeureOuLabel = Object.values(heuresDef).filter(it => (it.heure + 1) == parseInt(heure) || Grammar.toLowerCaseNoAccentNoSpace(it.label) == heure);
-    if (parHeureOuLabel.length == 1) {
-      return parHeureOuLabel[0];
-    }
-    let parLabelPartiel = Object.values(heuresDef).filter(it => Grammar.toLowerCaseNoAccentNoSpace(it.label).includes(heure));
-    if (parLabelPartiel.length > 0) {
-      parLabelPartiel.sort(Misc.ascending(h => h.label.length));
-      return parLabelPartiel[0];
-    }
-    return undefined;
-  }
-  /* -------------------------------------------- */
-  getHeureNumber( hNum) {
-    let heure = Object.values(heuresDef).find(it => (it.heure) == hNum);
-    return heure
-  }
-
-  /* -------------------------------------------- */
-  getHeuresChanceMalchance(heureNaissance) {
-    let heuresChancesMalchances = [];
-    let defHeure = this.findHeure(heureNaissance);
-    if (defHeure) {
-      let hn = defHeure.heure;
-      let chiffreAstral = this.getCurrentNombreAstral() ?? 0;
-      heuresChancesMalchances[0] = { value : "+4", heures: [this.getHeureNumber((hn + chiffreAstral) % RDD_HEURES_PAR_JOUR).label]};
-      heuresChancesMalchances[1] = { value : "+2", heures: [this.getHeureNumber((hn + chiffreAstral+4) % RDD_HEURES_PAR_JOUR).label, 
-        this.getHeureNumber((hn + chiffreAstral + 8) % RDD_HEURES_PAR_JOUR).label ] };
-      heuresChancesMalchances[2] = { value : "-4", heures: [this.getHeureNumber((hn + chiffreAstral+6) % RDD_HEURES_PAR_JOUR).label]};
-      heuresChancesMalchances[3] = { value : "-2", heures: [this.getHeureNumber((hn + chiffreAstral+3) % RDD_HEURES_PAR_JOUR).label, 
-          this.getHeureNumber((hn + chiffreAstral + 9) % RDD_HEURES_PAR_JOUR).label ]};
-    }
-    return heuresChancesMalchances;
-  }
-
-  /* -------------------------------------------- */
-  getAjustementAstrologique(heureNaissance, name = undefined) {
-    let defHeure = this.findHeure(heureNaissance);
-    if (defHeure) {
-      let hn = defHeure.heure;
-      let chiffreAstral = this.getCurrentNombreAstral() ?? 0;
-      let heureCourante = this.calendrier.heureRdD;
-      let ecartChance = (hn + chiffreAstral - heureCourante) % RDD_HEURES_PAR_JOUR;
-      switch (ecartChance) {
-        case 0: return 4;
-        case 4: case 8: return 2;
-        case 6: return -4;
-        case 3: case 9: return -2;
-      }
-    }
-    else if (name) {
-      ui.notifications.warn(name + " n'a pas d'heure de naissance, ou elle est incorrecte : " + heureNaissance);
-    }
-    else {
-      ui.notifications.warn(heureNaissance + " ne correspond pas à une heure de naissance");
-    }
-    return 0;
-  }
-
-  /* -------------------------------------------- */
-  getData() {
-    let formData = super.getData();
-
-    this.fillCalendrierData(formData);
-
-    this.setPos(this.calendrierPos);
-    return formData;
-  }
-
-  /* -------------------------------------------- */
-  setPos(pos) {
-    return new Promise(resolve => {
-      function check() {
-        let elmnt = document.getElementById("calendar-time-container");
-        if (elmnt) {
-          elmnt.style.bottom = undefined;
-          let xPos = (pos.left) > window.innerWidth ? window.innerWidth - 200 : pos.left;
-          let yPos = (pos.top) > window.innerHeight - 20 ? window.innerHeight - 100 : pos.top;
-          elmnt.style.top = (yPos) + "px";
-          elmnt.style.left = (xPos) + "px";
-          resolve();
-        } else {
-          setTimeout(check, 30);
-        }
-      }
-      check();
-    });
-  }
-
-  /* -------------------------------------------- */
-  updateDisplay() {
-    let calendrier = this.fillCalendrierData();
-    // Rebuild text du calendrier
-    let dateHTML = `${calendrier.jourMois} ${calendrier.nomMois} ${calendrier.annee} (${calendrier.nomSaison})`
-    if (game.user.isGM) {
-      dateHTML = dateHTML + " - NA: " + (this.getCurrentNombreAstral() ?? "indéterminé");
-    }
-    for (let handle of document.getElementsByClassName("calendar-date-rdd")) {
-      handle.innerHTML = dateHTML;
-    }
-    for (let heure of document.getElementsByClassName("calendar-heure-texte")) {
-      heure.innerHTML = calendrier.nomHeure;
-    }
-    for (const minute of document.getElementsByClassName("calendar-time-disp")) {
-      minute.innerHTML = `${calendrier.minutesRelative} minutes`;
-    }
-    for (const heureImg of document.getElementsByClassName("calendar-heure-img")) {
-      heureImg.src = calendrier.iconHeure;
-    }
-  }
-
-  /* -------------------------------------------- */
-  async saveEditeur(calendrierData) {
-    this.calendrier.minutesRelative = Number(calendrierData.minutesRelative);
-    this.calendrier.jour = Number(calendrierData.jourMois) - 1;
-    this.calendrier.moisRdD = RdDCalendrier.getChiffreFromSigne(calendrierData.moisKey);
-    this.calendrier.annee = Number(calendrierData.annee);
-    this.calendrier.heureRdD = RdDCalendrier.getChiffreFromSigne(calendrierData.heureKey);
-    game.settings.set(SYSTEM_RDD, "calendrier", duplicate(this.calendrier));
-
-    await this.rebuildListeNombreAstral();
-
-    game.socket.emit(SYSTEM_SOCKET_ID, {
-      msg: "msg_sync_time",
-      data: duplicate(this.calendrier)
-    });
-
-    this.updateDisplay();
-  }
-
-  /* -------------------------------------------- */
-  async showCalendarEditor() {
-    let calendrierData = duplicate(this.fillCalendrierData());
-    if (this.editeur == undefined) {
-      calendrierData.jourMoisOptions = RdDCalendrier.buildJoursMois();
-      calendrierData.heuresOptions = [0, 1];
-      calendrierData.minutesOptions = Array(RDD_MINUTES_PAR_HEURES).fill().map((item, index) => 0 + index);
-      let html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/calendar-editor-template.html', calendrierData);
-      this.editeur = new RdDCalendrierEditeur(html, this, calendrierData)
-    }
-    this.editeur.updateData(calendrierData);
-    this.editeur.render(true);
-  }
-
-  static buildJoursMois() {
-    return Array(RDD_JOUR_PAR_MOIS).fill().map((item, index) => 1 + index);
-  }
-
-  /* -------------------------------------------- */
-  async showAstrologieEditor() {
-    let calendrierData = duplicate(this.fillCalendrierData());
-    let astrologieArray = [];
-    this.listeNombreAstral = this.listeNombreAstral || [];
-    for (let astralData of this.listeNombreAstral) {
-      astralData.humanDate = this.getDateFromIndex(astralData.index);
-      for (let vf of astralData.valeursFausses) {
-        let actor = game.actors.get(vf.actorId);
-        vf.actorName = (actor) ? actor.name : "Inconnu";
-      }
-      astrologieArray.push(duplicate(astralData));
-    }
-    let heuresParActeur = {};
-    for (let actor of game.actors) {
-      let heureNaissance = actor.getHeureNaissance();
-      if ( heureNaissance) {
-        heuresParActeur[actor.name] = this.getHeuresChanceMalchance(heureNaissance);
-      }      
-    }
-    //console.log("ASTRO", astrologieArray);
-    calendrierData.astrologieData = astrologieArray;
-    calendrierData.heuresParActeur = heuresParActeur;
-    let html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/calendar-astrologie-template.html', calendrierData);
-    let astrologieEditeur = new RdDAstrologieEditeur(html, this, calendrierData)
-    astrologieEditeur.updateData(calendrierData);
-    astrologieEditeur.render(true);
-  }
-}

module/rdd-carac.js

@@ -1,7 +1,7 @@
 import { Grammar } from "./grammar.js";
 import { Misc } from "./misc.js";
 
-const tableCaracDerivee = {
+const TABLE_CARACTERISTIQUES_DERIVEES = {
   // xp: coût pour passer du niveau inférieur à ce niveau
   1: { xp: 3, poids: "moins de 1kg", plusdom: -5, sconst: 0.5, sust: 0.1 },
   2: { xp: 3, poids: "1-5", plusdom: -4, sconst: 0.5, sust: 0.3 },
@@ -39,9 +39,10 @@ const tableCaracDerivee = {
 
 export class RdDCarac {
 
-  static isAgiliteOuDerivee(selectedCarac) {
+  static isAgiliteOuDerobee(selectedCarac) {
     return selectedCarac?.label.match(/(Agilité|Dérobée)/);
   }
+
   static isVolonte(selectedCarac) {
     return selectedCarac?.label == 'Volonté';
   }
@@ -57,15 +58,10 @@ export class RdDCarac {
       selectedCarac?.label.match(/(Apparence|Force|Agilité|Dextérité|Vue|Ouïe|Odorat-Goût|Empathie|Dérobée|Mêlée|Tir|Lancer)/);
   }
 
-  static isIgnoreEtatGeneral(rollData) {
+  static getCaracDerivee(value) {
-    const selectedCarac = rollData.selectedCarac;
+    return TABLE_CARACTERISTIQUES_DERIVEES[Math.min(Math.max(Number(value), 1), 32)];
-    return !selectedCarac ||
-      rollData.ethylisme ||
-      RdDCarac.isChance(selectedCarac) ||
-      (RdDCarac.isReve(selectedCarac) && !rollData.competence);
   }
 
-
   static computeTotal(carac, beaute = undefined) {
     const total = Object.values(carac ?? {}).filter(c => !c.derivee)
       .map(it => parseInt(it.value))
@@ -81,7 +77,7 @@ export class RdDCarac {
 
   /* -------------------------------------------- */
   static calculSConst(constitution) {
-    return Number(tableCaracDerivee[Number(constitution)].sconst);
+    return RdDCarac.getCaracDerivee(constitution).sconst;
   }
 
   /* -------------------------------------------- */
@@ -92,7 +88,7 @@ export class RdDCarac {
   }
 
   static getCaracXp(targetValue) {
-    return tableCaracDerivee[targetValue]?.xp ?? 200;
+    return RdDCarac.getCaracDerivee(targetValue)?.xp ?? 200;
   }
 
 
@@ -105,37 +101,4 @@ export class RdDCarac {
     return Grammar.toLowerCaseNoAccent(selectedCarac?.label)?.match(/(apparence|force|agilite|dexterite|vue|ouie|odorat|empathie|melee|tir|lancer|derobee)/);
   }
 
-  /* -------------------------------------------- */
-  static computeCarac(system) {
-    system.carac.force.value = Math.min(system.carac.force.value, parseInt(system.carac.taille.value) + 4);
-
-    system.carac.derobee.value = Math.floor(parseInt(((21 - system.carac.taille.value)) + parseInt(system.carac.agilite.value)) / 2);
-    let bonusDomKey = Math.floor((parseInt(system.carac.force.value) + parseInt(system.carac.taille.value)) / 2);
-    bonusDomKey = Math.min(Math.max(bonusDomKey, 0), 32); // Clamp de securite
-
-    let tailleData = tableCaracDerivee[bonusDomKey];
-    system.attributs.plusdom.value = tailleData.plusdom;
-
-    system.attributs.sconst.value = RdDCarac.calculSConst(system.carac.constitution.value);
-    system.attributs.sust.value = tableCaracDerivee[Number(system.carac.taille.value)].sust;
-
-    system.attributs.encombrement.value = (parseInt(system.carac.force.value) + parseInt(system.carac.taille.value)) / 2;
-    system.carac.melee.value = Math.floor((parseInt(system.carac.force.value) + parseInt(system.carac.agilite.value)) / 2);
-    system.carac.tir.value = Math.floor((parseInt(system.carac.vue.value) + parseInt(system.carac.dexterite.value)) / 2);
-    system.carac.lancer.value = Math.floor((parseInt(system.carac.tir.value) + parseInt(system.carac.force.value)) / 2);
-
-    system.sante.vie.max = Math.ceil((parseInt(system.carac.taille.value) + parseInt(system.carac.constitution.value)) / 2);
-
-    system.sante.vie.value = Math.min(system.sante.vie.value, system.sante.vie.max)
-    system.sante.endurance.max = Math.max(parseInt(system.carac.taille.value) + parseInt(system.carac.constitution.value), parseInt(system.sante.vie.max) + parseInt(system.carac.volonte.value));
-    system.sante.endurance.value = Math.min(system.sante.endurance.value, system.sante.endurance.max);
-    system.sante.fatigue.max = system.sante.endurance.max * 2;
-    system.sante.fatigue.value = Math.min(system.sante.fatigue.value, system.sante.fatigue.max);
-
-    //Compteurs
-    system.reve.reve.max = system.carac.reve.value;
-    system.compteurs.chance.max = system.carac.chance.value;
-  }
-
-
 }

module/rdd-combat.js

@@ -1,6 +1,5 @@
 import { ChatUtility } from "./chat-utility.js";
-import { ENTITE_BLURETTE, ENTITE_INCARNE, ENTITE_NONINCARNE, HIDE_DICE, SYSTEM_RDD, SYSTEM_SOCKET_ID } from "./constants.js";
+import { ENTITE_BLURETTE, HIDE_DICE, SYSTEM_RDD, SYSTEM_SOCKET_ID } from "./constants.js";
-import { DialogSelectTarget } from "./dialog-select-target.js";
 import { Grammar } from "./grammar.js";
 import { RdDItemArme } from "./item-arme.js";
 import { RdDItemCompetence } from "./item-competence.js";
@@ -10,9 +9,10 @@ import { RdDBonus } from "./rdd-bonus.js";
 import { RdDResolutionTable } from "./rdd-resolution-table.js";
 import { RdDRoll } from "./rdd-roll.js";
 import { RdDRollTables } from "./rdd-rolltables.js";
-import { ReglesOptionelles } from "./settings/regles-optionelles.js";
+import { ReglesOptionnelles } from "./settings/regles-optionnelles.js";
 import { STATUSES } from "./settings/status-effects.js";
 import { Targets } from "./targets.js";
+import { RdDEmpoignade } from "./rdd-empoignade.js";
 
 /* -------------------------------------------- */
 const premierRoundInit = [
@@ -40,35 +40,32 @@ export class RdDCombatManager extends Combat {
 
   static init() {
     /* -------------------------------------------- */
-    Hooks.on("getCombatTrackerEntryContext", (html, options) => {
+    Hooks.on("getCombatTrackerEntryContext", (html, options) => { RdDCombatManager.pushInitiativeOptions(html, options); });
-      RdDCombatManager.pushInitiativeOptions(html, options);
+    Hooks.on("updateCombat", (combat, change, options, userId) => { RdDCombat.onUpdateCombat(combat, change, options, userId) });
-    });
+    Hooks.on("preDeleteCombat", (combat, html, id) => { combat.onPreDeleteCombat() });
-    Hooks.on("preDeleteCombat", (combat, html, id) => {
-      combat.onPreDeleteCombat()
-    });
-  }
-
-  /* -------------------------------------------- */
-  cleanItemUse() {
-    for (let turn of this.turns) {
-      turn.actor.resetItemUse()
-    }
   }
 
   /* -------------------------------------------- */
   async nextRound() {
-    this.cleanItemUse();
     await this.finDeRound();
     return await super.nextRound();
   }
 
   /* -------------------------------------------- */
   async onPreDeleteCombat() {
+    if (Misc.isUniqueConnectedGM()) {
       await this.finDeRound({ terminer: true });
+      ChatUtility.removeChatMessageContaining(`<div data-combatid="${this.id}" data-combatmessage="actor-turn-summary">`)
+      game.messages.filter(m => ChatUtility.getMessageData(m, 'attacker-roll') != undefined && ChatUtility.getMessageData(m, 'defender-roll') != undefined)
+        .forEach(it => it.delete());
+      RdDEmpoignade.deleteAllEmpoignades()
+    }
   }
 
   /* -------------------------------------------- */
   async finDeRound(options = { terminer: false }) {
+    this.turns.forEach(turn => turn.actor.resetItemUse());
+
     for (let combatant of this.combatants) {
       if (combatant.actor) {
         await combatant.actor.finDeRound(options);
@@ -90,19 +87,32 @@ export class RdDCombatManager extends Combat {
       let rollFormula = formula ?? RdDCombatManager.formuleInitiative(2, 10, 0, 0);
       if (!formula) {
         if (combatant.actor.type == 'creature' || combatant.actor.type == 'entite') {
-          const competence = combatant.actor.items.find(it => it.system.iscombat)
+          const competence = combatant.actor.items.find(it => RdDItemCompetenceCreature.isCompetenceAttaque(it))
           if (competence) {
             rollFormula = RdDCombatManager.formuleInitiative(2, competence.system.carac_value, competence.system.niveau, 0);
           }
         } else {
           const armeCombat = combatant.actor.itemTypes['arme'].find(it => it.system.equipe)
-          const compName = (armeCombat == undefined) ? "Corps à corps" : armeCombat.system.competence;
+          let compName = "Corps à corps"
+          if (armeCombat) {
+            if (armeCombat.system.competence != "") {
+              compName = armeCombat.system.competence
+            }
+            if (armeCombat.system.lancer != "") {
+              compName = armeCombat.system.lancer
+            }
+            if (armeCombat.system.tir != "") {
+              compName = armeCombat.system.tir
+            }
+          }
           const competence = RdDItemCompetence.findCompetence(combatant.actor.items, compName);
-          if (competence) {
+          if (competence && competence.system.defaut_carac) {
             const carac = combatant.actor.system.carac[competence.system.defaut_carac].value;
             const niveau = competence.system.niveau;
             const bonusEcaille = (armeCombat?.system.magique) ? armeCombat.system.ecaille_efficacite : 0;
             rollFormula = RdDCombatManager.formuleInitiative(2, carac, niveau, bonusEcaille);
+          } else {
+            ui.notifications.warn(`Votre arme ${armeCombat.name} n'a pas de compétence renseignée`);
           }
         }
       }
@@ -111,10 +121,10 @@ export class RdDCombatManager extends Combat {
       if (!roll.total) {
         roll.evaluate({ async: false });
       }
-      if (roll.total <= 0) roll.total = 0.00;
+      const total = Math.max(roll.total, 0.00);
-      console.log("Compute init for", rollFormula, roll.total, combatant);
+      console.log("Compute init for", rollFormula, roll, total, combatant);
       let id = combatant._id || combatant.id;
-      await this.updateEmbeddedDocuments("Combatant", [{ _id: id, initiative: roll.total }]);
+      await this.updateEmbeddedDocuments("Combatant", [{ _id: id, initiative: total }]);
 
       // Send a chat message
       let rollMode = messageOptions.rollMode || game.settings.get("core", "rollMode");
@@ -145,9 +155,8 @@ export class RdDCombatManager extends Combat {
   }
 
   /* -------------------------------------------- */
-  static calculInitiative(niveau, caracValue, bonusEcaille = 0) {
+  static calculInitiative(niveau, caracValue, bonus = 0) {
-    let base = niveau + Math.floor(caracValue / 2);
+    let base = niveau + Math.floor(caracValue / 2) + bonus;
-    base += bonusEcaille;
     return "1d6" + (base >= 0 ? "+" : "") + base;
   }
 
@@ -162,9 +171,7 @@ export class RdDCombatManager extends Combat {
         if (arme.system.unemain && arme.system.deuxmains && !dommages.includes("/")) {
           ui.notifications.info("Les dommages de l'arme à 1/2 mains " + arme.name + " ne sont pas corrects (ie sous la forme X/Y)");
         }
-        console.log(">>>>", arme)
+        if (arme.system.unemain && arme.system.competence) {
-        if ((arme.system.unemain && arme.system.competence) ||
-          (arme.system.competence.toLowerCase().includes("corps à corps"))) {
           actions.push(RdDCombatManager.$prepareAttaqueArme({
             arme: arme,
             infoMain: "(1 main)",
@@ -179,7 +186,7 @@ export class RdDCombatManager extends Combat {
             arme: arme,
             infoMain: "(2 mains)",
             dommagesReel: Number(tableauDommages[1]),
-            competence: arme.system.competence.replace(" 1 main", " 2 mains"),
+            competence: RdDItemArme.competence2Mains(arme),
             carac: carac,
             competences: competences
           }));
@@ -222,15 +229,17 @@ export class RdDCombatManager extends Combat {
   }
 
   static listActionsCreature(competences) {
-    return competences.filter(it => RdDItemCompetenceCreature.isCompetenceAttaque(it))
+    return competences
-      .map(it => RdDItemCompetenceCreature.armeNaturelle(it));
+      .filter(it => RdDItemCompetenceCreature.isCompetenceAttaque(it))
+      .map(it => RdDItemCompetenceCreature.armeCreature(it))
+      .filter(it => it != undefined);
   }
 
   static listActionsPossessions(actor) {
     return RdDCombatManager._indexActions(actor.getPossessions().map(p => {
       return {
         name: p.name,
-        action: 'conjurer',
+        action: 'possession',
         system: {
           competence: p.name,
           possessionid: p.system.possessionid,
@@ -247,15 +256,14 @@ export class RdDCombatManager extends Combat {
       return actions;
     }
     if (actor.isCreatureEntite()) {
-      actions = actions.concat(RdDCombatManager.listActionsCreature(actor.itemTypes['competencecreature']));
+      actions = RdDCombatManager.listActionsCreature(actor.itemTypes['competencecreature']);
-    } else {
+    } else if (actor.isPersonnage()) {
       // Recupération des items 'arme'
-      const armes = actor.itemTypes['arme'].filter(it => RdDItemArme.isArmeUtilisable(it))
-        //.concat(RdDItemArme.empoignade())
-        .concat(RdDItemArme.mainsNues());
-
       const competences = actor.itemTypes['competence'];
-      actions = actions.concat(RdDCombatManager.listActionsArmes(armes, competences, actor.system.carac));
+      const armes = actor.itemTypes['arme'].filter(it => RdDItemArme.isArmeUtilisable(it))
+        .concat(RdDItemArme.empoignade(actor))
+        .concat(RdDItemArme.mainsNues(actor));
+      actions = RdDCombatManager.listActionsArmes(armes, competences, actor.system.carac);
 
       if (actor.system.attributs.hautrevant.value) {
         actions.push({ name: "Draconic", action: 'haut-reve', system: { initOnly: true, competence: "Draconic" } });
@@ -343,7 +351,7 @@ export class RdDCombatManager extends Combat {
     } else if (combatant.actor.getSurprise() == "demi") {
       initOffset = 0;
       initInfo = "Demi Surprise"
-    } else if (action.action == 'conjurer') {
+    } else if (action.action == 'possession') {
       initOffset = 10;
       caracForInit = combatant.actor.getReveActuel();
       initInfo = "Possession"
@@ -422,18 +430,11 @@ export class RdDCombatManager extends Combat {
 /* -------------------------------------------- */
 export class RdDCombat {
 
-  static init() {
-    Hooks.on("updateCombat", (combat, change, options, userId) => { RdDCombat.onUpdateCombat(combat, change, options, userId) });
-    Hooks.on("preDeleteCombat", (combat, options, userId) => { RdDCombat.onPreDeleteCombat(combat, options, userId); });
-  }
-
   /* -------------------------------------------- */
   static onSocketMessage(sockmsg) {
     switch (sockmsg.msg) {
-      case "msg_encaisser":
+      case "msg_encaisser": return RdDCombat.onMsgEncaisser(sockmsg.data);
-        return RdDCombat.onMsgEncaisser(sockmsg.data);
+      case "msg_defense": return RdDCombat.onMsgDefense(sockmsg.data);
-      case "msg_defense":
-        return RdDCombat.onMsgDefense(sockmsg.data);
     }
   }
 
@@ -444,22 +445,12 @@ export class RdDCombat {
     }
   }
 
-  /* -------------------------------------------- */
-  static onPreDeleteCombat(combat, options, userId) {
-    if (Misc.isUniqueConnectedGM()) {
-      combat.cleanItemUse();
-      ChatUtility.removeChatMessageContaining(`<div data-combatid="${combat.id}" data-combatmessage="actor-turn-summary">`)
-      game.messages.filter(m => ChatUtility.getMessageData(m, 'attacker-roll') != undefined && ChatUtility.getMessageData(m, 'defender-roll') != undefined)
-        .forEach(it => it.delete());
-    }
-  }
-
   /* -------------------------------------------- */
   static combatNouveauTour(combat) {
     if (Misc.isUniqueConnectedGM()) {
       let turn = combat.turns.find(t => t.token?.id == combat.current.tokenId);
       if (turn?.actor) {
-        RdDCombat.displayActorCombatStatus(combat, turn.actor);
+        RdDCombat.displayActorCombatStatus(combat, turn.actor, turn.token.id);
         // TODO Playaudio for player??
       }
     }
@@ -523,9 +514,13 @@ export class RdDCombat {
   /* -------------------------------------------- */
   static _callJetDeVie(event) {
     let actorId = event.currentTarget.attributes['data-actorId'].value;
-    let actor = game.actors.get(actorId);
+    let tokenId = event.currentTarget.attributes['data-tokenId'].value;
+    let token = canvas.tokens.placeables.find(t => t.id == tokenId)
+    const actor = token?.actor ?? game.actors.get(actorId);
+    if (actor?.isOwner) {
       actor.jetVie();
     }
+  }
 
   /* -------------------------------------------- */
   static registerChatCallbacks(html) {
@@ -550,7 +545,7 @@ export class RdDCombat {
         }
       });
     }
-    html.on("click", '#chat-jet-vie', event => {
+    html.on("click", 'a.chat-jet-vie', event => {
       event.preventDefault();
       RdDCombat._callJetDeVie(event);
     });
@@ -758,29 +753,14 @@ export class RdDCombat {
 
   /* -------------------------------------------- */
   async attaque(competence, arme) {
-    // const nonIncarnee = this.defender.isEntite([ENTITE_NONINCARNE])
-    // const blurette = this.defender.isEntite([ENTITE_BLURETTE])
-    // if (nonIncarnee || blurette) {
-    //   ChatMessage.create( {
-    //     content: `<strong>La cible est ${nonIncarnee ? 'non incarnée' : 'une blurette'}.
-    //       Il est impossible de l'atteindre.`,
-    //     whisper: ChatMessage.getWhisperRecipients("GM")})
-    // }
-
     if (!await this.attacker.accorder(this.defender, 'avant-attaque')) {
       return;
     }
-    if (arme.system.cac == 'empoignade' && this.attacker.isCombatTouche()) {
+    if (arme.system.cac == 'empoignade') {
-      ChatMessage.create({
+      RdDEmpoignade.onAttaqueEmpoignade(this.attacker, this.defender)
-        alias: this.attacker.name,
-        whisper: ChatUtility.getWhisperRecipientsAndGMs(this.attacker.name),
-        content: await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-actor-perte-empoignade.html', {
-          attacker: this.attacker,
-          competence: competence
-        })
-      });
       return;
     }
+    RdDEmpoignade.checkEmpoignadeEnCours(this.attacker)
 
     let rollData = this._prepareAttaque(competence, arme);
     console.log("RdDCombat.attaque >>>", rollData);
@@ -813,7 +793,6 @@ export class RdDCombat {
     let rollData = {
       passeArme: randomID(16),
       mortalite: arme?.system.mortalite,
-      coupsNonMortels: false,
       competence: competence,
       surprise: this.attacker.getSurprise(true),
       surpriseDefenseur: this.defender.getSurprise(true),
@@ -845,8 +824,8 @@ export class RdDCombat {
     // finesse seulement en mélée, pour l'empoignade, ou si la difficulté libre est de -1 minimum
     // rapidité seulement en mêlée, si l'arme le permet, et si la difficulté libre est de -1 minimum
     const isForce = !rollData.arme.system.empoignade;
-    const isFinesse = rollData.arme.system.empoignade || isMeleeDiffNegative;
+    const isFinesse = rollData.tactique != 'charge' && (rollData.arme.system.empoignade || isMeleeDiffNegative);
-    const isRapide = !rollData.arme.system.empoignade && isMeleeDiffNegative && rollData.arme.system.rapide;
+    const isRapide = rollData.tactique != 'charge' && !rollData.arme.system.empoignade && isMeleeDiffNegative && rollData.arme.system.rapide;
     // si un seul choix possible, le prendre
     if (isForce && !isFinesse && !isRapide) {
       return await this.choixParticuliere(rollData, "force");
@@ -910,8 +889,8 @@ export class RdDCombat {
     }
 
     // # utilisation esquive
-    const corpsACorps = this.defender.getCompetence("Corps à corps", { onMessage: it => console.info(it, this.defender) });
+    const corpsACorps = this.defender.getCompetenceCorpsACorps({ onMessage: it => console.info(it, this.defender) });
-    const esquives = duplicate(this.defender.getCompetences("esquive", { onMessage: it => console.info(it, this.defender) }))
+    const esquives = duplicate(this.defender.getCompetencesEsquive())
     esquives.forEach(e => e.system.nbUsage = e?._id ? this.defender.getItemUse(e._id) : 0);
 
     const paramChatDefense = {
@@ -972,9 +951,8 @@ export class RdDCombat {
   /* -------------------------------------------- */
   _filterArmesParade(defender, competence) {
     let items = defender.items.filter(it => RdDItemArme.isArmeUtilisable(it) || RdDItemCompetenceCreature.isCompetenceParade(it))
-    for (let item of items) {
+    items.forEach(item => item.system.nbUsage = defender.getItemUse(item.id)); // Ajout du # d'utilisation ce round  
-      item.system.nbUsage = defender.getItemUse(item.id); // Ajout du # d'utilisation ce round  
+
-    }
     switch (competence.system.categorie) {
       case 'tir':
       case 'lancer':
@@ -1073,7 +1051,7 @@ export class RdDCombat {
       competence: this.defender.getCompetence(competenceParade),
       arme: armeParade,
       surprise: this.defender.getSurprise(true),
-      needParadeSignificative: ReglesOptionelles.isUsing('categorieParade') && RdDItemArme.needParadeSignificative(attackerRoll.arme, armeParade),
+      needParadeSignificative: ReglesOptionnelles.isUsing('categorieParade') && RdDItemArme.needParadeSignificative(attackerRoll.arme, armeParade),
       needResist: RdDItemArme.needArmeResist(attackerRoll.arme, armeParade),
       carac: this.defender.system.carac,
       show: {}
@@ -1191,7 +1169,7 @@ export class RdDCombat {
 
   /* -------------------------------------------- */
   async computeDeteriorationArme(defenderRoll) {
-    if (!ReglesOptionelles.isUsing('resistanceArmeParade')) {
+    if (!ReglesOptionnelles.isUsing('resistanceArmeParade')) {
       return;
     }
     const attackerRoll = defenderRoll.attackerRoll;
@@ -1240,7 +1218,7 @@ export class RdDCombat {
           }
         }
         // Si l'arme de parade n'est pas un bouclier, jet de désarmement (p.132)
-        if (ReglesOptionelles.isUsing('defenseurDesarme') && resistance > 0 && RdDItemArme.getCategorieParade(defenderRoll.arme) != 'boucliers') {
+        if (ReglesOptionnelles.isUsing('defenseurDesarme') && resistance > 0 && RdDItemArme.getCategorieParade(defenderRoll.arme) != 'boucliers') {
           let desarme = await RdDResolutionTable.rollData({
             caracValue: this.defender.getForce(),
             finalLevel: Misc.toInt(defenderRoll.competence.system.niveau) - dmg,
@@ -1255,7 +1233,7 @@ export class RdDCombat {
   /* -------------------------------------------- */
   async computeRecul(defenderRoll) { // Calcul du recul (p. 132)
     const attackerRoll = defenderRoll.attackerRoll;
-    if (ReglesOptionelles.isUsing('recul') && this._isForceOuCharge(attackerRoll)) {
+    if (ReglesOptionnelles.isUsing('recul') && this._isForceOuCharge(attackerRoll)) {
       const impact = this._computeImpactRecul(attackerRoll);
       const rollRecul = await RdDResolutionTable.rollData({ caracValue: 10, finalLevel: impact });
       if (rollRecul.rolled.isSuccess) {
@@ -1320,7 +1298,7 @@ export class RdDCombat {
   }
 
   /* -------------------------------------------- */
-  static async displayActorCombatStatus(combat, actor) {
+  static async displayActorCombatStatus(combat, actor, tokenId) {
     let formData = {
       combatId: combat._id,
       alias: actor.name,
@@ -1329,17 +1307,18 @@ export class RdDCombat {
       blessuresStatus: actor.computeResumeBlessure(),
       SConst: actor.getSConst(),
       actorId: actor.id,
-      isGrave: false,
+      tokenId: tokenId,
-      isCritique: false
+      isGrave: actor.countBlessures(it => it.isGrave()) > 0,
+      isCritique: actor.countBlessures(it => it.isCritique()) > 0
     }
-    if (actor.countBlessuresNonSoigneeByName("critiques") > 0) { // Pour éviter le cumul grave + critique
+    await ChatMessage.create({
-      formData.isCritique = true;
+      content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-actor-turn-acteur.hbs`, formData),
-    } else if (actor.countBlessuresNonSoigneeByName("graves") > 0) {
+      alias: actor.name
-      formData.isGrave = true;
+    });
-    }
+    await ChatMessage.create({
-
+      content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-actor-turn-sante.hbs`, formData),
-    ChatUtility.createChatWithRollMode(actor.name, {
+      whisper: ChatUtility.getWhisperRecipientsAndGMs(actor.name),
-      content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-actor-turn-summary.html`, formData)
+      alias: actor.name
     });
   }
 }

module/rdd-commands.js

@@ -2,7 +2,8 @@
 
 import { DialogChronologie } from "./dialog-chronologie.js";
 import { DialogCreateSigneDraconique } from "./dialog-create-signedraconique.js";
-import { DialogStress } from "./dialog-stress.js";
+import { DialogChateauDormant } from "./sommeil/dialog-chateau-dormant.js";
+import { DialogStress } from "./sommeil/dialog-stress.js";
 import { RdDItemCompetence } from "./item-competence.js";
 import { Misc } from "./misc.js";
 import { RdDCarac } from "./rdd-carac.js";
@@ -13,7 +14,7 @@ import { RdDResolutionTable } from "./rdd-resolution-table.js";
 import { RdDRollResolutionTable } from "./rdd-roll-resolution-table.js";
 import { RdDRollTables } from "./rdd-rolltables.js";
 import { RdDUtility } from "./rdd-utility.js";
-import { CompendiumTableHelpers } from "./settings/system-compendiums.js";
+import { FenetreRechercheTirage } from "./tirage/fenetre-recherche-tirage.js";
 import { TMRUtility } from "./tmr-utility.js";
 
 const rddRollNumeric = /^(\d+)\s*([\+\-]?\d+)?\s*(s)?/;
@@ -23,6 +24,7 @@ export class RdDCommands {
 
   static init() {
     const rddCommands = new RdDCommands();
+    game.system.rdd.commands = rddCommands;
 
     Hooks.on("chatMessage", (html, content, msg) => {
       if (content[0] == '/') {
@@ -35,7 +37,6 @@ export class RdDCommands {
       return true;
     });
 
-    game.system.rdd.commands = rddCommands;
   }
 
   constructor() {
@@ -63,7 +64,6 @@ export class RdDCommands {
           <br><strong>/table rencontre deso</strong> affiche la table des rencontres en Désolation
           <br><strong>/table rencontre mauvaise</strong> affiche la table des mauvaises rencontres`
     });
-    this.registerCommand({ path: ["/table", "milieu"], func: (content, msg, params) => this.tableMilieu(msg, params, 'liste'), descr: "Affiche la table des ressource naturelles pour un milieu donné" });
 
     this.registerCommand({ path: ["/tirer", "comp"], func: (content, msg, params) => RdDRollTables.getCompetence('chat'), descr: "Tire une compétence au hasard" });
     this.registerCommand({ path: ["/tirer", "queue"], func: (content, msg, params) => RdDRollTables.getQueue('chat'), descr: "Tire une Queue de Dragon" });
@@ -75,8 +75,9 @@ export class RdDCommands {
     this.registerCommand({ path: ["/tirer", "ideefixe"], func: (content, msg, params) => RdDRollTables.getIdeeFixe('chat'), descr: "Tire une Idée fixe" });
     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: ["/tirer", "milieu"], func: (content, msg, params) => this.tableMilieu(msg, params, 'chat'), descr: "Effectue un tirage dans la table desressource naturelles pour un milieu donné" });
+    this.registerCommand({ path: ["/tirage"], func: (content, msg, params) => this.tirage(), descr: "Ouvre la fenêtre de recherche et tirage" });
 
+    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" });
     this.registerCommand({ path: ["/nom"], func: (content, msg, params) => RdDNameGen.getName(msg, params), descr: "Génère un nom aléatoire" });
 
@@ -207,7 +208,7 @@ export class RdDCommands {
     if (["gmroll", "blindroll"].includes(rollMode)) {
       msg["whisper"] = ChatMessage.getWhisperRecipients("GM");
     }
-    if (rollMode === "blindroll"){
+    if (rollMode === "blindroll") {
       msg["blind"] = true;
     }
     msg["type"] = 0;
@@ -225,7 +226,7 @@ export class RdDCommands {
     return false;
   }
 
-  _isCommandHandled(command){
+  _isCommandHandled(command) {
     return this.commandsTable[command] != undefined;
   }
 
@@ -254,10 +255,7 @@ export class RdDCommands {
   }
 
   /* -------------------------------------------- */
-  async help(msg) {
+  async help(msg, table = undefined) {
-    this.help(msg, undefined);
-  }
-  async help(msg, table) {
     let commands = []
     this._buildSubTableHelp(commands, table ?? this.commandsTable);
 
@@ -331,10 +329,10 @@ export class RdDCommands {
           diff = 0;
         }
         const caracName = params[0];
-        let competence = length > 1 ? actors[0].getCompetence(Misc.join(params.slice(1, length), ' ')) : undefined;
+        let competence = length > 1 ? actors[0].getCompetence(Misc.join(params.slice(1, length), ' ')) : { name: undefined };
         if (competence) {
           for (let actor of actors) {
-            await actor.rollCaracCompetence(caracName, competence.name, diff);
+            await actor.doRollCaracCompetence(caracName, competence.name, diff);
           }
         }
         return;
@@ -398,32 +396,6 @@ export class RdDCommands {
     return false;
   }
 
-  async tableMilieu(msg, params, toChat) {
-    if (params && params.length > 0) {
-      const search = Misc.join(params, ' ');
-      const milieux = await game.system.rdd.environnement.findEnvironnementsLike(search);
-      if (milieux.length == 0) {
-        const tous = Object.values(await game.system.rdd.environnement.milieux());
-        return RdDCommands._chatAnswer(msg, `<strong>Aucun milieu correspondant à '${search}'.</strong>
-          <br>Milieux disponibles:
-          <br><ul class="chat-list"><li>${tous.reduce(Misc.joining('</li><li>'))}</li></ul>`);
-      }
-      if (milieux.length > 1) {
-        ui.notifications.warn(`<strong>Plusieurs milieux correspondent à '${search}'</strong>:
-          <br><ul class="chat-list"><li>${milieux.reduce(Misc.joining('</li><li>'))}</li></ul>`);
-      }
-      const tableName = `ressources en ${milieux.reduce(Misc.joining(', '))}`;
-      if (toChat == 'liste') {
-        return await game.system.rdd.environnement.searchToChatMessage(milieux, tableName);
-      }
-      else {
-        const row = await game.system.rdd.environnement.getRandom(milieux, tableName);
-        await CompendiumTableHelpers.tableRowToChatMessage(row, 'Item');
-        return true;
-      }
-    }
-    return false;
-  }
   /* -------------------------------------------- */
   getCoutXpComp(msg, params) {
     if (params && (params.length == 1 || params.length == 2)) {
@@ -448,17 +420,27 @@ export class RdDCommands {
   }
 
   async creerSignesDraconiques() {
+    if (game.user.isGM) {
       DialogCreateSigneDraconique.createSigneForActors();
+    }
+    else {
+      ui.notifications.warn("Seul le MJ est autorisé à utiliser la commande /signe");
+    }
     return true;
   }
 
   async supprimerSignesDraconiquesEphemeres() {
+    if (game.user.isGM) {
       game.actors.forEach(actor => {
         const ephemeres = actor.items.filter(item => item.type = 'signedraconique' && item.system.ephemere);
         if (ephemeres.length > 0) {
           actor.deleteEmbeddedDocuments("Item", ephemeres.map(item => item.id));
         }
       });
+    }
+    else {
+      ui.notifications.warn("Seul le MJ est autorisé à utiliser la commande /signe");
+    }
     return true;
   }
 
@@ -481,13 +463,14 @@ export class RdDCommands {
       let name = params[params.length - 1];
       if (name == undefined) {
         for (let actor of game.actors) {
-          actor.distribuerStress('stress', stress, motif);
+          // TODO: ne plus stresser les entités de cauchemar!
+          await actor.distribuerStress('stress', stress, motif);
         }
       } else {
         //console.log(stressValue, nomJoueur);
         let actor = Misc.findActor(name, game.actors.filter(it => it.hasPlayerOwner)) ?? Misc.findPlayer(name)?.character
         if (actor) {
-          actor.distribuerStress('stress', stress, motif);
+          await actor.distribuerStress('stress', stress, motif);
         }
         else {
           ui.notifications.warn(`Pas de personnage ou de joueur correspondant à ${name}!`);
@@ -501,5 +484,11 @@ export class RdDCommands {
     return await RdDMeteo.getMeteo();
   }
 
+  async tirage() {
+    FenetreRechercheTirage.create();
+  }
+  async sommeil() {
+    DialogChateauDormant.create();
+  }
 }
 

module/rdd-compendium-organiser.js

@@ -1,8 +1,8 @@
 import { SYSTEM_RDD } from "./constants.js";
 
-export class RddCompendiumOrganiser {
+export class RdDCompendiumOrganiser {
   static init() {
-    Hooks.on('renderCompendium', async (pack, html, compendiumData) => RddCompendiumOrganiser.onRenderCompendium(pack, html, compendiumData))
+    Hooks.on('renderCompendium', async (pack, html, compendiumData) => RdDCompendiumOrganiser.onRenderCompendium(pack, html, compendiumData))
   }
 
   static async onRenderCompendium(compendium, html, compendiumData) {
@@ -10,14 +10,14 @@ export class RddCompendiumOrganiser {
     const pack = compendium.collection
     if (pack.metadata.system === SYSTEM_RDD) {
       html.find('.directory-item').each((i, element) => {
-        RddCompendiumOrganiser.setEntityTypeName(pack, element);
+        RdDCompendiumOrganiser.setEntityTypeName(pack, element);
       });
     }
   }
 
   static async setEntityTypeName(pack, element) {
-    const label = RddCompendiumOrganiser.getEntityTypeLabel(await pack.getDocument(element.dataset.documentId));
+    const label = RdDCompendiumOrganiser.getEntityTypeLabel(await pack.getDocument(element.dataset.documentId));
-    RddCompendiumOrganiser.insertEntityType(element, label);
+    RdDCompendiumOrganiser.insertEntityType(element, label);
   }
 
   static insertEntityType(element, label) {

module/rdd-confirm.js

@@ -1,10 +1,10 @@
 import { Grammar } from "./grammar.js";
-import { ReglesOptionelles } from "./settings/regles-optionelles.js";
+import { ReglesOptionnelles } from "./settings/regles-optionnelles.js";
 
 export class RdDConfirm {
   /* -------------------------------------------- */
   static confirmer(options, autresActions) {
-    options.bypass = options.bypass || !(options.settingConfirmer == undefined || ReglesOptionelles.isUsing(options.settingConfirmer));
+    options.bypass = options.bypass || !(options.settingConfirmer == undefined || ReglesOptionnelles.isUsing(options.settingConfirmer));
     if (options.bypass) {
       options.onAction();
     }
@@ -47,7 +47,7 @@ export class RdDConfirm {
         icon: '<i class="fas fa-user-check"></i>',
         label: options.buttonLabel + "<br>et ne plus demander",
         callback: () => {
-          ReglesOptionelles.set(options.settingConfirmer, false);
+          ReglesOptionnelles.set(options.settingConfirmer, false);
           options.onAction();
         }
       }

module/rdd-empoignade.js

@@ -0,0 +1,436 @@
+/* -------------------------------------------- */
+import { RdDResolutionTable } from "./rdd-resolution-table.js";
+import { RdDRoll } from "./rdd-roll.js";
+import { RdDItemCompetenceCreature } from "./item-competencecreature.js";
+import { ChatUtility } from "./chat-utility.js";
+import { STATUSES } from "./settings/status-effects.js";
+import { ReglesOptionnelles } from "./settings/regles-optionnelles.js";
+import { TYPES } from "./item.js";
+
+/* -------------------------------------------- */
+
+/* -------------------------------------------- */
+export class RdDEmpoignade {
+
+  /* -------------------------------------------- */
+  static init() {
+  }
+
+  /* -------------------------------------------- */
+  static registerChatCallbacks(html) {
+    html.on("click", '.defense-empoignade-cac', event => {
+      const chatMessage = ChatUtility.getChatMessage(event);
+      const rollData = RdDEmpoignade.$readRollEmpoignade(chatMessage);
+      let defenseMode = event.currentTarget.attributes['data-defense-mode'].value
+      RdDEmpoignade.onDefenseEmpoignade(rollData, defenseMode, "Corps à corps", "melee")
+    });
+    html.on("click", '.defense-empoignade-esquive', event => {
+      const chatMessage = ChatUtility.getChatMessage(event);
+      const rollData = RdDEmpoignade.$readRollEmpoignade(chatMessage);
+      let defenseMode = event.currentTarget.attributes['data-defense-mode'].value
+      RdDEmpoignade.onDefenseEmpoignade(rollData, defenseMode, "Esquive", "derobee")
+    });
+    html.on("click", '.empoignade-poursuivre', event => {
+      let attackerId = event.currentTarget.attributes['data-attackerId'].value
+      let defenderId = event.currentTarget.attributes['data-defenderId'].value
+      RdDEmpoignade.onAttaqueEmpoignadeValidee(game.actors.get(attackerId), game.actors.get(defenderId))
+    });
+    html.on("click", '.empoignade-entrainer-sol', event => {
+      const chatMessage = ChatUtility.getChatMessage(event);
+      const rollData = RdDEmpoignade.$readRollEmpoignade(chatMessage);
+      RdDEmpoignade.entrainerAuSol(rollData)
+      ChatUtility.removeChatMessageId(chatMessage.id)
+    });
+    html.on("click", '.empoignade-projeter-sol', event => {
+      const chatMessage = ChatUtility.getChatMessage(event);
+      const rollData = RdDEmpoignade.$readRollEmpoignade(chatMessage);
+      RdDEmpoignade.projeterAuSol(rollData)
+      ChatUtility.removeChatMessageId(chatMessage.id)
+    });
+    html.on("change", '.empoignade-perte-endurance', event => {
+      const chatMessage = ChatUtility.getChatMessage(event);
+      const rollData = RdDEmpoignade.$readRollEmpoignade(chatMessage);
+      if (event.currentTarget.value && event.currentTarget.value != "none") {
+        RdDEmpoignade.perteEndurance(rollData, event.currentTarget.value)
+        ChatUtility.removeChatMessageId(chatMessage.id)
+      }
+    });
+  }
+
+  /* -------------------------------------------- */
+  static checkEmpoignadeEnCours(actor) {
+    // TODO: autoriser la perception? la comédie/séduction?
+    if (RdDEmpoignade.isEmpoignadeEnCours(actor)) {
+      ui.notifications.warn("Une empoignade est en cours ! Normalement, vous ne pouvez rien faire d'autre que continuer l'empoignade ou la rompre.")
+      return true;
+    }
+    return false;
+  }
+
+  /* -------------------------------------------- */
+  static $storeRollEmpoignade(msg, rollData) {
+    RdDEmpoignade.$reduceActorToIds(rollData);
+    ChatUtility.setMessageData(msg, "empoignade-roll-data", rollData);
+  }
+
+  static $reduceActorToIds(rollData) {
+    rollData.attacker = { id: rollData.attacker.id };
+    rollData.defender = { id: rollData.defender.id };
+  }
+
+  /* -------------------------------------------- */
+  static $readRollEmpoignade(msg) {
+    const rollData = ChatUtility.getMessageData(msg, 'empoignade-roll-data');
+    RdDEmpoignade.$replaceIdsWithActors(rollData);
+    return rollData
+  }
+
+  static $replaceIdsWithActors(rollData) {
+    rollData.attacker = game.actors.get(rollData.attacker.id);
+    rollData.defender = game.actors.get(rollData.defender.id);
+  }
+
+  /* -------------------------------------------- */
+  static isEmpoignadeEnCours(actor) {
+    return actor.itemTypes[TYPES.empoignade].find(it => it.system.pointsemp > 0)
+  }
+
+  /* -------------------------------------------- */
+  static getEmpoignadeById(actor, id) {
+    let emp = actor.itemTypes[TYPES.empoignade].find(it => it.system.empoignadeid == id)
+    return emp && duplicate(emp) || undefined;
+  }
+
+  /* -------------------------------------------- */
+  static getEmpoignade(attacker, defender) {
+    let emp = attacker.itemTypes[TYPES.empoignade].find(it =>
+      (it.system.empoigneurid == attacker.id && it.system.empoigneid == defender.id) ||
+      (it.system.empoigneurid == defender.id && it.system.empoigneid == attacker.id)
+    )
+    if (emp) {
+      return duplicate(emp);
+    }
+    return undefined;
+  }
+
+  /* -------------------------------------------- */
+  static getMalusTaille(emp, attacker, defender) {
+    // Si pas empoigné, alors 0
+    if (emp.system.pointsemp == 0) {
+      return 0
+    }
+    // p135: Malus de -1 par point de taille de différence de taille au delà de 1 (donc -2 pour une différence de 3, ...)
+    const diffTaille = attacker.system.carac.taille.value - defender.system.carac.taille.value;
+    const diffTailleAbs = Math.abs(diffTaille)
+    const signDiff = diffTaille > 0 ? 1 : -1
+
+    if (diffTailleAbs > 2) {
+      return signDiff * (diffTailleAbs - 1)
+    }
+    return 0
+  }
+
+  static isActionAutorisee(mode, attacker, defender) {
+    const acting = RdDEmpoignade.isActionDefenseur(mode) ? defender : attacker;
+    if (acting.getUserLevel(game.user) < CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER) {
+      ui.notifications.warn(`Vous n'êtes pas autorisé à choisir l'action de ${acting.name}`)
+      return false;
+    }
+    return true
+  }
+
+  static isActionDefenseur(mode) {
+    switch (mode) {
+      case "liberer":
+      case "contrer-empoigner":
+        return true;
+    }
+    return false;
+  }
+
+  /* -------------------------------------------- */
+  static async onAttaqueEmpoignade(attacker, defender) {
+    if (!RdDEmpoignade.isActionAutorisee("empoigner", attacker, defender)) {
+      return
+    }
+    let empoignade = RdDEmpoignade.getEmpoignade(attacker, defender)
+    const isNouvelle = empoignade == undefined;
+    empoignade = empoignade ?? (await RdDEmpoignade.createEmpoignade(attacker, defender))
+    //console.log("W.", empoignade, defender.hasArmeeMeleeEquipee())
+    if ((isNouvelle || empoignade.system.pointsemp == 0) && defender.hasArmeeMeleeEquipee()) {
+      ChatUtility.createChatWithRollMode(attacker.name, {
+        content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-empoignade-valider.html`, { attacker: attacker, defender: defender })
+      })
+    } else {
+      await this.onAttaqueEmpoignadeValidee(attacker, defender)
+    }
+  }
+
+  /* -------------------------------------------- */
+  static async onAttaqueEmpoignadeValidee(attacker, defender) {
+    let empoignade = RdDEmpoignade.getEmpoignade(attacker, defender)
+    const isNouvelle = empoignade == undefined;
+    empoignade = empoignade ?? (await RdDEmpoignade.createEmpoignade(attacker, defender))
+
+    let mode = (empoignade && empoignade.system.empoigneurid == attacker.id) ? "empoigner" : "liberer"
+
+    if (!RdDEmpoignade.isActionAutorisee(mode, attacker, defender)) {
+      return
+    }
+
+    let rollData = {
+      mode, empoignade, attacker, defender,
+      isEmpoignade: true,
+      competence: attacker.getCompetenceCorpsACorps(),
+      selectedCarac: attacker.system.carac.melee,
+      malusTaille: RdDEmpoignade.getMalusTaille(empoignade, attacker, defender)
+    }
+    if (attacker.isCreatureEntite()) {
+      RdDItemCompetenceCreature.setRollDataCreature(rollData)
+    }
+    if (empoignade.system.pointsemp >= 2) {
+      if (!empoignade.system.ausol) {
+        let msg = await RdDResolutionTable.displayRollData(rollData, attacker, 'chat-empoignade-entrainer.html');
+        RdDEmpoignade.$storeRollEmpoignade(msg, rollData);
+      }
+    } else {
+      await RdDEmpoignade.$rollAttaqueEmpoignade(attacker, rollData, isNouvelle);
+    }
+  }
+
+  /* -------------------------------------------- */
+  static async onAttaqueEmpoignadeFromItem(empoignade) {
+    let attacker = game.actors.get(empoignade.system.empoigneurid)
+    let defender = game.actors.get(empoignade.system.empoigneid)
+    await this.onAttaqueEmpoignadeValidee(attacker, defender)
+  }
+
+  static async onImmobilisation(attacker, defender, empoignade) {
+    const rollData = {
+      mode: "immobilise",
+      empoignade, attacker, defender,
+      isEmpoignade: true,
+      competence: attacker.getCompetenceCorpsACorps()
+    }
+    const msg = await ChatMessage.create({
+      whisper: ChatUtility.getWhisperRecipientsAndGMs(attacker.name),
+      content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-empoignade-immobilise.html`, rollData)
+    })
+    RdDEmpoignade.$storeRollEmpoignade(msg, rollData);
+  }
+
+  /* -------------------------------------------- */
+  static async $rollAttaqueEmpoignade(attacker, rollData, isNouvelle = false) {
+    const dialog = await RdDRoll.create(attacker, rollData,
+      { html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-competence.html' },
+      {
+        name: 'jet-empoignade',
+        label: 'Empoigner',
+        callbacks: [{ action: async (r) => await RdDEmpoignade.$onRollEmpoignade(r, isNouvelle) },]
+      });
+    dialog.render(true);
+  }
+
+  /* -------------------------------------------- */
+  static async $onRollEmpoignade(rollData, isNouvelle = false) {
+    let attacker = game.actors.get(rollData.attacker.id)
+    let defender = game.actors.get(rollData.defender.id)
+
+
+    if (rollData.rolled.isSuccess && isNouvelle) {
+      const objectEmpoignade = rollData.empoignade.toObject();
+      // Creer l'empoignade sur attaquant/defenseur
+      attacker.creerObjetParMJ(objectEmpoignade);
+      defender.creerObjetParMJ(objectEmpoignade);
+    }
+
+    rollData.empoignade.isSuccess = rollData.rolled.isSuccess;
+    if (rollData.rolled.isPart) {
+      rollData.particuliere = "finesse";
+    }
+    let msg = await RdDResolutionTable.displayRollData(rollData, attacker, 'chat-empoignade-resultat.html');
+    RdDEmpoignade.$storeRollEmpoignade(msg, rollData);
+  }
+
+  /* -------------------------------------------- */
+  static async onDefenseEmpoignade(attackerRoll, mode, competenceName = "Corps à corps", carac = "melee") {
+    let attacker = game.actors.get(attackerRoll.attacker.id)
+    let defender = game.actors.get(attackerRoll.defender.id)
+    if (!RdDEmpoignade.isActionAutorisee(mode, attacker, defender)) {
+      return
+    }
+
+    let empoignade = this.getEmpoignade(attacker, defender)
+
+    if (!empoignade) {
+      ui.notifications.warn("Une erreur s'est produite : Aucune empoignade trouvée !!")
+      return
+    }
+
+    empoignade = duplicate(empoignade)
+    let defenderRoll = {
+      mode, attacker, defender, empoignade, attackerRoll,
+      diffLibre: attackerRoll.diffLibre,
+      attaqueParticuliere: attackerRoll.particuliere,
+      competence: defender.getCompetence(competenceName),
+      surprise: defender.getSurprise(true),
+      carac: defender.system.carac,
+      selectedCarac: defender.system.carac[carac],
+      malusTaille: RdDEmpoignade.getMalusTaille(empoignade, defender, attacker),
+      show: {}
+    };
+    await RdDEmpoignade.$rollDefenseEmpoignade(defender, defenderRoll);
+  }
+
+  /* -------------------------------------------- */
+  static async $rollDefenseEmpoignade(defender, defenderRoll) {
+    const dialog = await RdDRoll.create(defender, defenderRoll,
+      { html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-defense-empoignade.html' },
+      {
+        name: 'empoignade',
+        label: 'Contrer',
+        callbacks: [
+          { action: async (r) => await RdDEmpoignade.$onRollContrerLiberer(r) }
+        ]
+      }
+    );
+    dialog.render(true);
+  }
+
+  /* -------------------------------------------- */
+  static async $onRollContrerLiberer(rollData) {
+    let empoignade = rollData.empoignade
+    
+    if (rollData.mode == "contrer-empoigner" && !rollData.rolled.isSuccess) {
+      empoignade.system.pointsemp++
+      RdDEmpoignade.$updateEtatEmpoignade(empoignade)
+    }
+    if (rollData.mode == "contrer-liberer" && !rollData.rolled.isSuccess) {
+      empoignade.system.pointsemp--
+      RdDEmpoignade.$updateEtatEmpoignade(empoignade)
+    }
+    
+    await RdDResolutionTable.displayRollData(rollData, rollData.defender, 'chat-empoignade-resultat.html')
+    if (empoignade.system.pointsemp >= 2) {
+      let msg = await RdDResolutionTable.displayRollData(rollData, rollData.attacker, 'chat-empoignade-entrainer.html');
+      RdDEmpoignade.$storeRollEmpoignade(msg, rollData);
+    }
+  }
+
+  /* -------------------------------------------- */
+  static async $updateEtatEmpoignade(empoignade) {
+    console.log("UPDATE Empoignade", empoignade)
+
+    let defender = game.actors.get(empoignade.system.empoigneid)
+    let emp = RdDEmpoignade.getEmpoignadeById(defender, empoignade.system.empoignadeid)
+    let update = { _id: emp._id, "system.pointsemp": empoignade.system.pointsemp, "system.ausol": empoignade.system.ausol }
+    await defender.updateEmbeddedDocuments('Item', [update])
+
+    let attacker = game.actors.get(empoignade.system.empoigneurid)
+    emp = RdDEmpoignade.getEmpoignadeById(attacker, empoignade.system.empoignadeid)
+    update = { _id: emp._id, "system.pointsemp": empoignade.system.pointsemp, "system.ausol": empoignade.system.ausol }
+    await attacker.updateEmbeddedDocuments('Item', [update])
+  }
+
+  /* -------------------------------------------- */
+  static async $deleteEmpoignade(empoignade) {
+    console.log("DELETE Empoignade", empoignade)
+
+    let defender = game.actors.get(empoignade.system.empoigneid)
+    let emp = RdDEmpoignade.getEmpoignadeById(defender, empoignade.system.empoignadeid)
+    await defender.deleteEmbeddedDocuments('Item', [emp._id])
+  }
+
+  /* -------------------------------------------- */
+  static async entrainerAuSol(rollData) {
+    let attacker = game.actors.get(rollData.attacker.id)
+    let defender = game.actors.get(rollData.defender.id)
+    if (!RdDEmpoignade.isActionAutorisee("immobilise", attacker, defender)) {
+      return
+    }
+    let empoignade = this.getEmpoignade(attacker, defender)
+
+    empoignade.system.ausol = true
+    await this.$updateEtatEmpoignade(empoignade)
+
+    await attacker.setEffect(STATUSES.StatusProne, true);
+    await defender.setEffect(STATUSES.StatusProne, true);
+
+    let msg = await RdDResolutionTable.displayRollData(rollData, attacker, 'chat-empoignade-entrainer-sol.html');
+    RdDEmpoignade.$storeRollEmpoignade(msg, rollData);
+  }
+
+  /* -------------------------------------------- */
+  static async projeterAuSol(rollData) {
+    let attacker = game.actors.get(rollData.attacker.id)
+    let defender = game.actors.get(rollData.defender.id)
+    if (!RdDEmpoignade.isActionAutorisee("immobilise", attacker, defender)) {
+      return
+    }
+    let empoignade = this.getEmpoignade(attacker, defender)
+
+    await defender.setEffect(STATUSES.StatusProne, true);
+    await this.$deleteEmpoignade(empoignade)
+
+    let msg = await RdDResolutionTable.displayRollData(rollData, attacker, 'chat-empoignade-projeter-sol.html');
+    RdDEmpoignade.$storeRollEmpoignade(msg, rollData);
+  }
+
+  /* -------------------------------------------- */
+  static async perteEndurance(rollData, perteMode) {
+    let attacker = game.actors.get(rollData.attacker.id)
+    let defender = game.actors.get(rollData.defender.id)
+    if (!RdDEmpoignade.isActionAutorisee("immobilise", attacker, defender)) {
+      return
+    }
+    let empoignade = this.getEmpoignade(attacker, defender)
+
+    //console.log("Perte d'endurance :!!!", perteMode)
+    let endValue = defender.system.sante.endurance.value
+    if (perteMode == "end0") {
+      await defender.santeIncDec("endurance", -endValue);
+    }
+    if (perteMode == "end1") {
+      await defender.santeIncDec("endurance", -(endValue - 1));
+    }
+    if (perteMode == "endmoitie") {
+      await defender.santeIncDec("endurance", -Math.floor(endValue / 2));
+    }
+    if (perteMode == "endquart") {
+      await defender.santeIncDec("endurance", -(3 * Math.floor(endValue / 4)));
+    }
+    let msg = await RdDResolutionTable.displayRollData(rollData, attacker, 'chat-empoignade-perte-endurance.html');
+    RdDEmpoignade.$storeRollEmpoignade(msg, rollData);
+  }
+
+  /* -------------------------------------------- */
+  static async deleteAllEmpoignades() {
+    for (let actor of game.actors) {
+      let empIds = actor.itemTypes["empoignade"].map(it => it.id)
+      await actor.deleteEmbeddedDocuments('Item', empIds)
+    }
+  }
+
+  /* -------------------------------------------- */
+  static async deleteLinkedEmpoignade(actorId, empoignade) {
+    let actorDeleteId = (actorId == empoignade.system.empoigneurid) ? empoignade.system.empoigneid : empoignade.system.empoigneurid
+    let actor = game.actors.get(actorDeleteId)
+    let emp = this.getEmpoignadeById(actor, empoignade.system.empoignadeid)
+    if (emp) {
+      await actor.deleteEmbeddedDocuments('Item', [emp._id])
+    }
+  }
+
+  /* -------------------------------------------- */
+  static async createEmpoignade(attacker, defender) {
+    return await Item.create({
+      name: "Empoignade en cours de " + attacker.name + ' sur ' + defender.name,
+      type: 'empoignade',
+      img: "systems/foundryvtt-reve-de-dragon/icons/entites/possession2.webp",
+      system: { description: "", empoignadeid: randomID(16), compteempoigne: 0, empoigneurid: attacker.id, empoigneid: defender.id, ptsemp: 0, empoigneurname: attacker.name, empoignename: defender.name }
+    },
+      {
+        temporary: true
+      })
+  }
+}

module/rdd-herbes.js

@@ -1,7 +1,6 @@
-import { RdDUtility } from "./rdd-utility.js";
-import { RdDCalendrier } from "./rdd-calendrier.js";
 import { Grammar } from "./grammar.js";
 import { SystemCompendiums } from "./settings/system-compendiums.js";
+import { RdDTimestamp } from "./time/rdd-timestamp.js";
 
 /* -------------------------------------------- */
 export class RdDHerbes extends Item {
@@ -29,7 +28,7 @@ export class RdDHerbes extends Item {
   }
 
   /* -------------------------------------------- */
-  static async updatePotionData(formData) {
+  static async addPotionFormData(formData) {
     formData.isSoins = formData.system.categorie.includes('Soin');
     formData.isRepos = formData.system.categorie.includes('Repos');
     if (formData.isSoins) {
@@ -40,9 +39,8 @@ export class RdDHerbes extends Item {
     }
     formData.herbesSoins = RdDHerbes.buildHerbesList(this.herbesSoins, 12);
     formData.herbesRepos = RdDHerbes.buildHerbesList(this.herbesRepos, 7);
-    formData.jourMoisOptions = RdDCalendrier.buildJoursMois();
+    formData.dateActuelle = game.system.rdd.calendrier.dateCourante();
-    formData.dateActuelle = game.system.rdd.calendrier.getDateFromIndex();
+    formData.enchantement = RdDTimestamp.splitIndexDate(formData.system.prdate);
-    formData.splitDate = game.system.rdd.calendrier.getDayMonthFromIndex(formData.system.prdate);
   }
 
   /* -------------------------------------------- */

module/rdd-hotbar-drop.js

@@ -1,13 +1,17 @@
-import { Misc } from "./misc.js";
+import { RdDItemArme } from "./item-arme.js";
+import { RdDItemCompetenceCreature } from "./item-competencecreature.js";
+import { TYPES } from "./item.js";
 
 export class RdDHotbar {
 
-  static async addToHotbar(item, slot) {
+  static async createItemMacro(item, slot, armeCompetence = undefined) {
-    let command = `game.system.rdd.RdDHotbar.rollMacro("${item.name}", "${item.type}");`;
+    const itemName = item.name;
-    let macro = game.macros.contents.find(m => (m.name === item.name) && (m.command === command));
+    let macroName = itemName + RdDHotbar.$macroNameSuffix(armeCompetence);
+    let command = `game.system.rdd.RdDHotbar.rollMacro("${itemName}", "${item.type}", "${armeCompetence}");`
+    let macro = game.macros.contents.find(m => (m.name === itemName) && (m.command === command));
     if (!macro) {
       macro = await Macro.create({
-        name: item.name,
+        name: macroName,
         type: "script",
         img: item.img,
         command: command
@@ -16,6 +20,59 @@ export class RdDHotbar {
     await game.user.assignHotbarMacro(macro, slot);
   }
 
+  static $macroNameSuffix(armeCompetence) {
+    switch (armeCompetence) {
+      case 'unemain': return ' (1 main)';
+      case 'deuxmains': return ' (2 main)';
+      case 'tir': return ' (tir)';
+      case 'lancer': return ' (lancer)';
+      case 'pugilat': return ' (pugilat)';
+      case 'empoignade': return ' (empoignade)';
+
+    }
+    return ''
+  }
+
+  static async addToHotbar(item, slot) {
+    switch (item?.type ?? '') {
+      case TYPES.arme:
+        {
+          // Les armes peuvent avoir plusieurs usages
+          if (item.system.competence != '') {
+            if (item.system.unemain) {
+              await this.createItemMacro(item, slot++, 'unemain')
+            }
+            if (item.system.deuxmains) {
+              await this.createItemMacro(item, slot++, 'deuxmains')
+            }
+          }
+          if (item.system.lancer != '') {
+            await this.createItemMacro(item, slot++, 'lancer')
+          }
+          if (item.system.tir != '') {
+            await this.createItemMacro(item, slot++, 'lancer')
+          }
+        }
+        return
+      case TYPES.competencecreature:
+        const categorie = RdDItemCompetenceCreature.getCategorieAttaque(item) ?? 'competence';
+        await this.createItemMacro(item, slot, categorie)
+        return
+      default:
+      case TYPES.competence:
+        await this.createItemMacro(item, slot++, 'competence')
+        if (item.isCorpsACorps()) {
+          await this.createItemMacro(item, slot++, 'pugilat')
+          await this.createItemMacro(item, slot++, 'empoignade')
+        }
+        if (item.isCompetenceArme()) {
+          ui.notifications.info(`${item.name} est une compétence d'arme, la macro n'est pas liée à un arme.<br>
+          Créez la macro depuis l'arme ou l'onglet combat pour garder les automatisations de combat.`);
+        }
+        return
+    }
+  }
+
   /**
    * Create a macro when dropping an entity on the hotbar
    * Item      - open roll dialog for item
@@ -24,33 +81,34 @@ export class RdDHotbar {
    */
   static initDropbar() {
 
-    Hooks.on("hotbarDrop", (bar, documentData, slot) => {
+    Hooks.on('hotbarDrop', (bar, documentData, slot) => {
 
       // Create item macro if rollable item - weapon, spell, prayer, trait, or skill
-      if (documentData.type == "Item") {
+      if (documentData.type == 'Item') {
-        let item = fromUuidSync(documentData.uuid)
+        const item = fromUuidSync(documentData.uuid) ?? this.actor.items.get(documentData.uuid)
-        if (item == undefined) {
+        console.log('DROP', documentData, item)
-          item = this.actor.items.get(documentData.uuid)
+        switch (item?.type) {
-        }
+          case TYPES.arme:
-        console.log("DROP", documentData, item)
+          case TYPES.competence:
-        if (!item || (item.type != "arme" && item.type != "competence")) {
+          case TYPES.competencecreature:
-          return true
-        }
             this.addToHotbar(item, slot)
             return false
         }
+      }
 
       return true
     })
   }
 
   /** Roll macro */
-  static rollMacro(itemName, itemType, bypassData) {
+  static rollMacro(itemName, itemType, categorieArme = 'competence') {
     const speaker = ChatMessage.getSpeaker();
     let actor;
     if (speaker.token) actor = game.actors.tokens[speaker.token];
     if (!actor) actor = game.actors.get(speaker.actor);
-
+    if (!actor) {
+      return ui.notifications.warn(`Impossible de trouver le personnage concerné`);
+    }
     let item = actor?.items.find(it => it.name === itemName && it.type == itemType) ?? undefined;
     if (!item) {
       return ui.notifications.warn(`Impossible de trouver l'objet de cette macro`);
@@ -58,10 +116,23 @@ export class RdDHotbar {
 
     // Trigger the item roll
     switch (item.type) {
-      case "arme":
+      case TYPES.arme:
-        return actor.rollArme(item);
+        return actor.rollArme(item, categorieArme);
-      case "competence":
+      case TYPES.competence:
-        return actor.rollCompetence(itemName);
+        if (item.isCorpsACorps()) {
+          switch (categorieArme) {
+            case 'pugilat':
+              return actor.rollArme(RdDItemArme.mainsNues(actor), 'competence');
+            case 'empoignade':
+              return actor.rollArme(RdDItemArme.empoignade(actor), 'competence');
+          }
+        }
+        return actor.rollCompetence(item);
+      case TYPES.competencecreature:
+        return item.system.iscombat && !item.system.isparade
+          ? actor.rollArme(item, categorieArme)
+          : actor.rollCompetence(item);
+
     }
   }
 

module/rdd-main.js

@@ -1,78 +1,222 @@
-/**
- * RdD system
- * Author: LeRatierBretonnien
- * Software License: GNU GPLv3
- */
-
-/* -------------------------------------------- */
-
-/* -------------------------------------------- */
-// Import Modules
 import { SYSTEM_RDD, SYSTEM_SOCKET_ID } from "./constants.js";
-import { RdDActor } from "./actor.js";
+import { Migrations } from './migrations.js';
-import { RdDItemSheet } from "./item-sheet.js";
+
-import { RdDActorSheet } from "./actor-sheet.js";
-import { RdDActorCreatureSheet } from "./actor-creature-sheet.js";
-import { RdDActorVehiculeSheet } from "./actor-vehicule-sheet.js";
-import { RdDActorEntiteSheet } from "./actor-entite-sheet.js";
 import { RdDUtility } from "./rdd-utility.js";
 import { TMRUtility } from "./tmr-utility.js";
-import { RdDCalendrier } from "./rdd-calendrier.js";
+import { TMRRencontres } from "./tmr-rencontres.js";
+import { RdDCalendrier } from "./time/rdd-calendrier.js";
+import { RdDTimestamp } from "./time/rdd-timestamp.js";
+import { DialogChronologie } from "./dialog-chronologie.js";
+
 import { RdDResolutionTable } from "./rdd-resolution-table.js";
 import { RdDTokenHud } from "./rdd-token-hud.js";
 import { RdDCommands } from "./rdd-commands.js";
 import { RdDCombatManager, RdDCombat } from "./rdd-combat.js";
 import { ChatUtility } from "./chat-utility.js";
 import { StatusEffects } from "./settings/status-effects.js";
-import { RddCompendiumOrganiser } from "./rdd-compendium-organiser.js";
+import { RdDCompendiumOrganiser } from "./rdd-compendium-organiser.js";
-import { ReglesOptionelles } from "./settings/regles-optionelles.js";
+import { ReglesOptionnelles } from "./settings/regles-optionnelles.js";
 import { RdDHotbar } from "./rdd-hotbar-drop.js"
 import { EffetsDraconiques } from "./tmr/effets-draconiques.js";
 import { RdDHerbes } from "./rdd-herbes.js";
-import { RdDItem } from "./item.js";
 import { RdDDice } from "./rdd-dice.js";
 import { RdDPossession } from "./rdd-possession.js";
-import { RdDSigneDraconiqueItemSheet } from "./item-signedraconique-sheet.js";
 import { Misc } from "./misc.js";
-import { Migrations } from './migrations.js';
+
-import { DialogChronologie } from "./dialog-chronologie.js";
 import { SystemCompendiums } from "./settings/system-compendiums.js";
-import { RdDRencontreItemSheet } from "./item-rencontre-sheet.js";
-import { TMRRencontres } from "./tmr-rencontres.js";
-import { RdDHerbeItemSheet } from "./item-herbe-sheet.js";
 import { Environnement } from "./environnement.js";
-import { RdDIngredientItemSheet } from "./item-ingredient-sheet.js";
-import { RdDFauneItemSheet } from "./item-faune-sheet.js";
-import { RdDConteneurItemSheet } from "./item-conteneur-sheet.js";
 
-/* -------------------------------------------- */
+import { RdDActor } from "./actor.js";
-/*  Foundry VTT Initialization                  */
+import { RdDBaseActor } from "./actor/base-actor.js";
-/* -------------------------------------------- */
+import { RdDCommerce } from "./actor/commerce.js";
+import { RdDEntite } from "./actor/entite.js";
+import { RdDVehicule } from "./actor/vehicule.js";
+import { RdDActorSheet } from "./actor-sheet.js";
+import { RdDCommerceSheet } from "./actor/commerce-sheet.js";
+import { RdDCreatureSheet } from "./actor/creature-sheet.js";
+import { RdDActorEntiteSheet } from "./actor/entite-sheet.js";
+import { RdDActorVehiculeSheet } from "./actor/vehicule-sheet.js";
+
+import { RdDItem } from "./item.js";
+import { RdDItemBlessure } from "./item/blessure.js";
+import { RdDItemService } from "./item/service.js";
+import { RdDItemMaladie } from "./item/maladie.js";
+import { RdDItemPoison } from "./item/poison.js";
+import { RdDItemSigneDraconique } from "./item/signedraconique.js";
+import { RdDItemQueue } from "./item/queue.js";
+import { RdDItemOmbre } from "./item/ombre.js";
+import { RdDItemSouffle } from "./item/souffle.js";
+import { RdDRencontre } from "./item/rencontre.js";
+
+import { RdDItemSheet } from "./item-sheet.js";
+import { RdDBlessureItemSheet } from "./item/sheet-blessure.js";
+import { RdDServiceItemSheet } from "./item/sheet-service.js";
+import { RdDRencontreItemSheet } from "./item/sheet-rencontre.js";
+import { RdDHerbeItemSheet } from "./item/sheet-herbe.js";
+import { RdDPlanteItemSheet } from "./item/sheet-plante.js";
+import { RdDIngredientItemSheet } from "./item/sheet-ingredient.js";
+import { RdDFauneItemSheet } from "./item/sheet-faune.js";
+import { RdDConteneurItemSheet } from "./item/sheet-conteneur.js";
+import { RdDSigneDraconiqueItemSheet } from "./item/sheet-signedraconique.js";
+import { RdDItemInventaireSheet } from "./item/sheet-base-inventaire.js";
+import { AppAstrologie } from "./sommeil/app-astrologie.js";
+import { RdDItemArmure } from "./item/armure.js";
+import { AutoAdjustDarkness as AutoAdjustDarkness } from "./time/auto-adjust-darkness.js";
+import { RdDCreature } from "./actor/creature.js";
+
+/**
+ * RdD system
+ * Author: LeRatierBretonnien
+ * Software License: GNU GPLv3
+ */
+export class SystemReveDeDragon {
+
+  static start() {
+    const system = new SystemReveDeDragon();
+    Hooks.once('init', async () => await system.onInit());
+    Hooks.once('diceSoNiceReady', (dice3d) => RdDDice.diceSoNiceReady(dice3d));
+  }
+
+  constructor() {
+    this.RdDUtility = RdDUtility;
+    this.RdDHotbar = RdDHotbar;
+    this.itemClasses = {
+      armure: RdDItemArmure,
+      blessure: RdDItemBlessure,
+      maladie: RdDItemMaladie,
+      ombre: RdDItemOmbre,
+      poison: RdDItemPoison,
+      queue: RdDItemQueue,
+      rencontre: RdDRencontre,
+      service: RdDItemService,
+      signedraconique: RdDItemSigneDraconique,
+      souffle: RdDItemSouffle,
+    }
+    this.actorClasses = {
+      commerce: RdDCommerce,
+      creature: RdDCreature,
+      entite: RdDEntite,
+      personnage: RdDActor,
+      vehicule: RdDVehicule,
+    }
+  }
+
+  /* -------------------------------------------- */
+  /*  Foundry VTT Initialization                  */
+  /* -------------------------------------------- */
+  async onInit() {
+    game.system.rdd = this;
+    this.AppAstrologie = AppAstrologie;
 
 
-
-/************************************************************************************/
-Hooks.once("init", async function () {
     console.log(`Initializing Reve de Dragon System`);
 
     // preload handlebars templates
     RdDUtility.preloadHandlebarsTemplates();
-  // Create useful storage space
+
-  game.system.rdd = {
+    /* -------------------------------------------- */
-    TMRUtility,
+    this.initSystemSettings();
-    RdDUtility,
+
-    RdDHotbar,
+    /* -------------------------------------------- */
-    RdDPossession,
+    // Set an initiative formula for the system 
+    CONFIG.Combat.initiative = {
+      formula: "1+(1d6/10)",
+      decimals: 2
+    };
+
+    /* -------------------------------------------- */
+    game.socket.on(SYSTEM_SOCKET_ID, async (sockmsg) => {
+      console.log(">>>>> MSG RECV", sockmsg);
+      try {
+        RdDUtility.onSocketMessage(sockmsg);
+        RdDCombat.onSocketMessage(sockmsg);
+        ChatUtility.onSocketMessage(sockmsg);
+        RdDBaseActor.onSocketMessage(sockmsg);
+      } catch (e) {
+        console.error('game.socket.on(SYSTEM_SOCKET_ID) Exception: ', sockmsg, ' => ', e)
+      }
+    });
+
+    /* -------------------------------------------- */
+    // Define custom Entity classes
+    CONFIG.Actor.documentClass = RdDBaseActor;
+    CONFIG.Item.documentClass = RdDItem;
+    CONFIG.RDD = {
+      resolutionTable: RdDResolutionTable.resolutionTable,
+      carac_array: RdDUtility.getCaracArray(),
+      ajustementsConditions: RdDUtility.getAjustementsConditions(),
+      difficultesLibres: RdDUtility.getDifficultesLibres()
     }
 
     /* -------------------------------------------- */
+    // Register sheet application classes
+    Actors.unregisterSheet("core", ActorSheet);
+    Actors.registerSheet(SYSTEM_RDD, RdDCommerceSheet, { types: ["commerce"], makeDefault: true });
+    Actors.registerSheet(SYSTEM_RDD, RdDActorSheet, { types: ["personnage"], makeDefault: true });
+    Actors.registerSheet(SYSTEM_RDD, RdDCreatureSheet, { types: ["creature"], makeDefault: true });
+    Actors.registerSheet(SYSTEM_RDD, RdDActorVehiculeSheet, { types: ["vehicule"], makeDefault: true });
+    Actors.registerSheet(SYSTEM_RDD, RdDActorEntiteSheet, { types: ["entite"], makeDefault: true });
+    Items.unregisterSheet("core", ItemSheet);
+
+    RdDItemSheet.register(RdDSigneDraconiqueItemSheet);
+    RdDItemSheet.register(RdDRencontreItemSheet);
+    RdDItemSheet.register(RdDConteneurItemSheet);
+    RdDItemSheet.register(RdDHerbeItemSheet);
+    RdDItemSheet.register(RdDFauneItemSheet);
+    RdDItemSheet.register(RdDPlanteItemSheet);
+    RdDItemSheet.register(RdDIngredientItemSheet);
+    RdDItemSheet.register(RdDServiceItemSheet);
+    RdDItemSheet.register(RdDBlessureItemSheet);
+
+    Items.registerSheet(SYSTEM_RDD, RdDItemInventaireSheet, {
+      types: [
+        "objet", "arme", "armure", "livre", "potion", "munition",
+        "monnaie", "nourritureboisson", "gemme",
+      ], makeDefault: true
+    });
+    Items.registerSheet(SYSTEM_RDD, RdDItemSheet, {
+      types: [
+        "competence", "competencecreature",
+        "recettealchimique", "musique", "chant", "danse", "jeu", "recettecuisine", "oeuvre",
+        "meditation", "queue", "ombre", "souffle", "tete", "casetmr", "sort", "sortreserve",
+        "nombreastral", "tache", "maladie", "poison", "possession",
+        "tarot", "extraitpoetique", "empoignade"
+      ], makeDefault: true
+    });
+    CONFIG.Combat.documentClass = RdDCombatManager;
+
+    // préparation des différents modules
+    AutoAdjustDarkness.init();
+    RdDTimestamp.init();
+    RdDCalendrier.init();
+    SystemCompendiums.init();
+    DialogChronologie.init();
+    ReglesOptionnelles.init();
+    RdDUtility.init();
+    RdDDice.init();
+    RdDCommands.init();
+    RdDCombatManager.init();
+    RdDTokenHud.init();
+    RdDBaseActor.init();
+    RdDCompendiumOrganiser.init();
+    EffetsDraconiques.init()
+    TMRUtility.init();
+    RdDHotbar.initDropbar();
+    RdDPossession.init();
+    TMRRencontres.init();
+    Environnement.init();
+
+    Hooks.once('ready', () => this.onReady());
+  }
+
+  initSystemSettings() {
     game.settings.register(SYSTEM_RDD, "accorder-entite-cauchemar", {
       name: "Accorder le rêve aux entités",
       hint: "A quel moment les personnages doivent accorder leur rêve aux entités de cauchemar",
       scope: "world",
       config: true,
       type: String,
-    choices: {           // If choices are defined, the resulting setting will be a select menu
+      choices: {
         "avant-attaque": "Avant l'attaque",
         "avant-defense": "Avant la défense",
         "avant-encaissement": "Avant l'encaissement",
@@ -80,43 +224,6 @@ Hooks.once("init", async function () {
       default: "avant-encaissement"
     });
 
-  /* -------------------------------------------- */
-  game.settings.register(SYSTEM_RDD, "calendrier", {
-    name: "calendrier",
-    scope: "world",
-    config: false,
-    default: RdDCalendrier.createCalendrierInitial(),
-    type: Object
-  });
-
-  /* -------------------------------------------- */
-  game.settings.register(SYSTEM_RDD, "migration-png-webp-1.5.34", {
-    name: "calendrier",
-    scope: "world",
-    config: false,
-    default: false,
-    type: Boolean
-  });
-
-  /* -------------------------------------------- */
-  game.settings.register(SYSTEM_RDD, "liste-nombre-astral", {
-    name: "liste-nombre-astral",
-    scope: "world",
-    config: false,
-    default: [],
-    type: Object
-  });
-
-  /* -------------------------------------------- */
-  game.settings.register(SYSTEM_RDD, "calendrier-pos", {
-    name: "calendrierPos",
-    scope: "client",
-    config: false,
-    default: RdDCalendrier.createCalendrierPos(),
-    type: Object
-  });
-
-
     /* -------------------------------------------- */
     game.settings.register(SYSTEM_RDD, "supprimer-dialogues-combat-chat", {
       name: "Supprimer les dialogues de combat",
@@ -126,6 +233,7 @@ Hooks.once("init", async function () {
       default: true,
       type: Boolean
     });
+
     /* -------------------------------------------- */
     game.settings.register(SYSTEM_RDD, "activer-sons-audio", {
       name: "Activer les bruitages intégrés",
@@ -149,89 +257,43 @@ Hooks.once("init", async function () {
       },
       default: "aucun"
     });
-
-  /* -------------------------------------------- */
-  // Set an initiative formula for the system 
-  CONFIG.Combat.initiative = {
-    formula: "1+(1d6/10)",
-    decimals: 2
-  };
-
-  /* -------------------------------------------- */
-  game.socket.on(SYSTEM_SOCKET_ID, async (sockmsg) => {
-    console.log(">>>>> MSG RECV", sockmsg);
-    try {
-      RdDUtility.onSocketMessage(sockmsg);
-      RdDCombat.onSocketMessage(sockmsg);
-      ChatUtility.onSocketMessage(sockmsg);
-      RdDActor.onSocketMessage(sockmsg);
-    } catch (e) {
-      console.error('game.socket.on(SYSTEM_SOCKET_ID) Exception: ', sockmsg, ' => ', e)
   }
-  });
+
+  async onReady() {
 
     /* -------------------------------------------- */
-  // Define custom Entity classes
+    /*  Foundry VTT Initialization                  */
-  CONFIG.Actor.documentClass = RdDActor;
+    /* -------------------------------------------- */
-  CONFIG.Item.documentClass = RdDItem;
+    // CSS patch for v9
-  CONFIG.RDD = {
+    if (game.version) {
-    resolutionTable: RdDResolutionTable.resolutionTable,
+      let sidebar = document.getElementById("sidebar");
-    carac_array: RdDUtility.getCaracArray(),
+      sidebar.style.width = "min-content";
-    ajustementsConditions: RdDUtility.getAjustementsConditions(),
+    }
-    difficultesLibres: RdDUtility.getDifficultesLibres()
+    game.system.rdd.calendrier = new RdDCalendrier();
+    if (Misc.isUniqueConnectedGM()) {
+      new Migrations().migrate();
+      this.messageDeBienvenue();
+      this.registerUsageCount(SYSTEM_RDD);
+    }
+
+    StatusEffects.onReady();
+    RdDHerbes.initializeHerbes();
+    RdDDice.onReady();
+    /* -------------------------------------------- */
+    /* Affiche/Init le calendrier */
+    game.system.rdd.calendrier.display();
+    // Avertissement si joueur sans personnage
+    if (!game.user.isGM && game.user.character == undefined) {
+      ui.notifications.info("Attention ! Vous n'êtes connecté à aucun personnage !");
+      ChatMessage.create({
+        content: "<b>ATTENTION</b> Le joueur " + game.user.name + " n'est connecté à aucun personnage !",
+        user: game.user.id
+      });
+    }
   }
 
   /* -------------------------------------------- */
-  // Register sheet application classes
+  messageDeBienvenue() {
-  Actors.unregisterSheet("core", ActorSheet);
-  Actors.registerSheet(SYSTEM_RDD, RdDActorSheet, { types: ["personnage"], makeDefault: true });
-  Actors.registerSheet(SYSTEM_RDD, RdDActorCreatureSheet, { types: ["creature"], makeDefault: true });
-  Actors.registerSheet(SYSTEM_RDD, RdDActorVehiculeSheet, { types: ["vehicule"], makeDefault: true });
-  Actors.registerSheet(SYSTEM_RDD, RdDActorEntiteSheet, { types: ["entite"], makeDefault: true });
-  Items.unregisterSheet("core", ItemSheet);
-
-  RdDItemSheet.register(RdDSigneDraconiqueItemSheet);
-  RdDItemSheet.register(RdDRencontreItemSheet);
-  RdDItemSheet.register(RdDConteneurItemSheet);
-  RdDItemSheet.register(RdDHerbeItemSheet);
-  RdDItemSheet.register(RdDFauneItemSheet);
-  RdDItemSheet.register(RdDIngredientItemSheet);
-
-  Items.registerSheet(SYSTEM_RDD, RdDItemSheet, {
-    types: [
-      "competence", "competencecreature",
-      "recettealchimique", "musique", "chant", "danse", "jeu", "recettecuisine", "oeuvre",
-      "objet", "arme", "armure", "livre", "potion", "munition",
-      "monnaie", "nourritureboisson", "gemme",
-      "meditation", "queue", "ombre", "souffle", "tete", "casetmr", "sort", "sortreserve",
-      "nombreastral", "tache", "maladie", "poison", "possession",
-      "tarot", "extraitpoetique"
-    ], makeDefault: true
-  });
-  CONFIG.Combat.documentClass = RdDCombatManager;
-
-  // préparation des différents modules
-  SystemCompendiums.init();
-  DialogChronologie.init();
-  ReglesOptionelles.init();
-  RdDUtility.init();
-  RdDDice.init();
-  RdDCommands.init();
-  RdDCombat.init();
-  RdDCombatManager.init();
-  RdDTokenHud.init();
-  RdDActor.init();
-  RddCompendiumOrganiser.init();
-  EffetsDraconiques.init()
-  TMRUtility.init();
-  RdDHotbar.initDropbar();
-  RdDPossession.init();
-  TMRRencontres.init();
-  Environnement.init();
-});
-
-/* -------------------------------------------- */
-function messageDeBienvenue() {
     if (game.user.isGM) {
       ChatUtility.removeChatMessageContaining('<div id="message-bienvenue-rdd">');
       ChatMessage.create({
@@ -241,11 +303,11 @@ function messageDeBienvenue() {
       <br>La commande <code>/aide</code> dans le chat permet de voir les commandes spécifiques à Rêve de Dragon.</div>
       ` });
     }
-}
+  }
 
-/* -------------------------------------------- */
+  /* -------------------------------------------- */
-// Register world usage statistics
+  // Register world usage statistics
-function registerUsageCount(registerKey) {
+  async registerUsageCount(registerKey) {
     if (game.user.isGM) {
       game.settings.register("world", "world-key", {
         name: "Unique world key",
@@ -264,82 +326,9 @@ function registerUsageCount(registerKey) {
       $.ajax(regURL)
       /* -------------------------------------------- */
     }
-}
-
-/* -------------------------------------------- */
-/*  Foundry VTT Initialization                  */
-/* -------------------------------------------- */
-Hooks.once("ready", async function () {
-  await migrationPngWebp_1_5_34()
-  if (Misc.isUniqueConnectedGM()) {
-    new Migrations().migrate();
-  }
-
-  StatusEffects.onReady();
-  RdDHerbes.initializeHerbes();
-  RdDDice.onReady();
-  /* -------------------------------------------- */
-  /* Affiche/Init le calendrier */
-  let calendrier = new RdDCalendrier();
-  let templatePath = "systems/foundryvtt-reve-de-dragon/templates/calendar-template.html";
-  let templateData = {};
-  renderTemplate(templatePath, templateData).then(html => {
-    calendrier.render(true);
-  });
-  game.system.rdd.calendrier = calendrier; // Reference;
-
-  // Avertissement si joueur sans personnage
-  if (!game.user.isGM && game.user.character == undefined) {
-    ui.notifications.info("Attention ! Vous n'êtes connecté à aucun personnage !");
-    ChatMessage.create({
-      content: "<b>ATTENTION</b> Le joueur " + game.user.name + " n'est connecté à aucun personnage !",
-      user: game.user.id
-    });
-  }
-  if (Misc.isUniqueConnectedGM()) {
-    messageDeBienvenue();
-    registerUsageCount(SYSTEM_RDD);
-  }
-});
-
-async function migrationPngWebp_1_5_34() {
-  if (!game.settings.get(SYSTEM_RDD, "migration-png-webp-1.5.34")) {
-    const regexOldPngJpg = /(systems\/foundryvtt-reve-de-dragon\/icons\/.*)\.(png|jpg)/;
-    const replaceWithWebp = '$1.webp';
-    function convertImgToWebp(img) {
-      return img.replace(regexOldPngJpg, replaceWithWebp);
-    }
-    function prepareDocumentsImgUpdate(documents) {
-      return documents.filter(it => it.img && it.img.match(regexOldPngJpg))
-        .map(it => {
-          return { _id: it.id, img: convertImgToWebp(it.img) }
-        });
-    }
-    const itemsUpdates = prepareDocumentsImgUpdate(game.items);
-    const actorsUpdates = prepareDocumentsImgUpdate(game.actors);
-    //Migrate system png to webp
-    await Item.updateDocuments(itemsUpdates);
-    await Actor.updateDocuments(actorsUpdates);
-    game.actors.forEach(actor => {
-      if (actor.token?.img && actor.token.img.match(regexOldPngJpg)) {
-        actor.update({ "token.img": convertImgToWebp(actor.token.img) });
-      }
-      const actorItemsToUpdate = prepareDocumentsImgUpdate(actor.items);
-      actor.updateEmbeddedDocuments('Item', actorItemsToUpdate);
-    });
-    game.settings.set(SYSTEM_RDD, "migration-png-webp-1.5.34", true)
-  }
-
-  // CSS patch for v9
-  if (game.version) {
-    let sidebar = document.getElementById("sidebar");
-    sidebar.style.width = "min-content";
   }
 
 }
 
-/* -------------------------------------------- */
+SystemReveDeDragon.start();
-/*  Dice-so-nice ready                          */
-/* -------------------------------------------- */
-Hooks.once('diceSoNiceReady', (dice3d) => RdDDice.diceSoNiceReady(dice3d));
 

module/rdd-namegen.js

@@ -1,4 +1,4 @@
-import { RdDActor } from "./actor.js";
+import { RdDBaseActor } from "./actor/base-actor.js";
 import { Misc } from "./misc.js";
 import { RdDDice } from "./rdd-dice.js";
 
@@ -20,7 +20,7 @@ export class RdDNameGen {
 
   static async onCreerActeur(event) {
     const button = event.currentTarget;
-    await RdDActor.create({
+    await RdDBaseActor.create({
         name: button.attributes['data-nom'].value,
         type: button.attributes['data-type'].value
       },

module/rdd-possession.js

@@ -1,9 +1,9 @@
 /* -------------------------------------------- */
-import { RdDCombat } from "./rdd-combat.js";
 import { RdDResolutionTable } from "./rdd-resolution-table.js";
 import { RdDRoll } from "./rdd-roll.js";
 import { RdDItemCompetenceCreature } from "./item-competencecreature.js";
 import { Targets } from "./targets.js";
+import { TYPES } from "./item.js";
 
 /* -------------------------------------------- */
 /* On part du principe qu'une entité démarre tjs 
@@ -20,9 +20,9 @@ export class RdDPossession {
 
   /* -------------------------------------------- */
   static searchPossessionFromEntite(attacker, defender) {
-    let poss = attacker.items.find(poss => poss.type == 'possession' && poss.system.possedeid == defender.id);
+    let poss = attacker.items.find(poss => poss.type == TYPES.possession && poss.system.victime.actorid == defender.id);
     if (!poss) {
-      poss = defender.items.find(poss => poss.type == 'possession' && poss.system.possedeid == defender.id);
+      poss = defender.items.find(poss => poss.type == TYPES.possession && poss.system.victime.actorid == defender.id);
     }
     return poss && duplicate(poss) || undefined;
   }
@@ -31,13 +31,13 @@ export class RdDPossession {
   static async onAttaquePossession(target, attacker, competence, suitePossession = undefined) {
     const defender = target.actor;
     const fromEntite = RdDPossession.searchPossessionFromEntite(attacker, defender);
-    const isNouvelle = !suitePossession && ! fromEntite;
+    const isNouvelle = !suitePossession && !fromEntite;
     const possession = (suitePossession ?? fromEntite ?? (await RdDPossession.createPossession(attacker, defender)));
 
     RdDPossession.$updateEtatPossession(possession)
 
     let rollData = {
-      mode: "possession",
+      mode: "attaque",
       isECNIDefender: false,
       competence: competence,
       possession: possession,
@@ -45,25 +45,26 @@ export class RdDPossession {
       defender: defender,
       targetToken: Targets.extractTokenData(target)
     };
-    if (attacker.isCreatureEntite()) {
+    RdDPossession.selectCompetenceDraconicOuPossession(rollData, attacker)
-      RdDItemCompetenceCreature.setRollDataCreature(rollData)
-    }
 
     await RdDPossession.$rollAttaquePossession(attacker, rollData, isNouvelle);
   }
 
   /* -------------------------------------------- */
-  static async onConjurerPossession(attacker, competence, possession) {
+  static async onConjurerPossession(attacker, possession) {
     possession = duplicate(possession);
     RdDPossession.$updateEtatPossession(possession)
+
+    const defender = game.actors.get(possession.system.entite.actorid);
     let rollData = {
-      mode: "possession",
+      mode: "attaque",
       isECNIDefender: true,
-      competence: competence,
       possession: possession,
       attacker: attacker,
-      defender: game.actors.get(possession.system.possesseurid)
+      defender: defender,
     };
+    RdDPossession.selectCompetenceDraconicOuPossession(rollData, attacker)
+
     await RdDPossession.$rollAttaquePossession(attacker, rollData);
   }
 
@@ -71,7 +72,7 @@ export class RdDPossession {
   static async onDefensePossession(attackerId, defenderId, possessionId) {
     let attacker = game.actors.get(attackerId)
     let possession = attacker?.getPossession(possessionId)
-    defenderId = defenderId ?? possession?.system.possesseurid ?? undefined
+    defenderId = defenderId ?? possession?.system.entite.actorid ?? undefined
     let defender = game.actors.get(defenderId)
     possession = possession ?? defender?.getPossession(possessionId) ?? undefined;
 
@@ -82,20 +83,30 @@ export class RdDPossession {
     possession = duplicate(possession)
     // Update for draconic roll
     let rollData = {
-      mode: "conjuration",
+      mode: "defense",
       isECNIDefender: defender.type == "entite",
       possession: possession,
       attacker: attacker,
       defender: defender,
-      competence: defender.getDraconicOuPossession(),
-      selectedCarac: defender.system.carac.reve,
-      forceCarac: { 'reve-actuel': { label: "Rêve Actuel", value: defender.getReveActuel() } }
     }
-    rollData.competence.system.defaut_carac = 'reve-actuel'
+    RdDPossession.selectCompetenceDraconicOuPossession(rollData, defender)
+    rollData.diffLibre = RdDPossession.getInfoAttaque(rollData).diffLibre
     
     await RdDPossession.$rollDefensePossession(defender, rollData);
   }
   
+  static selectCompetenceDraconicOuPossession(rollData, rollingActor) {
+    rollData.competence = rollingActor.getDraconicOuPossession();
+    if (rollingActor.isCreatureEntite()) {
+      RdDItemCompetenceCreature.setRollDataCreature(rollData)
+    }
+    else {
+      rollData.selectedCarac = rollingActor.system.carac.reve
+      rollData.forceCarac = { 'reve-actuel': { label: "Rêve Actuel", value: rollingActor.getReveActuel() } }
+      rollData.competence.system.defaut_carac = 'reve-actuel'
+    }
+  }
+
   /* -------------------------------------------- */
   static async $rollAttaquePossession(attacker, rollData, isNouvelle = false) {
     const dialog = await RdDRoll.create(attacker, rollData,
@@ -104,21 +115,22 @@ export class RdDPossession {
         name: 'jet-possession',
         label: rollData.isECNIDefender ? 'Conjurer la possession' : 'Possession',
         callbacks: [
-          { condition: r => (r.rolled.isSuccess), action: async (r) => await RdDPossession.$onRollPossession(r, true, isNouvelle) },
+          { action: async (r) => await RdDPossession.$onRollPossession(r, isNouvelle) },
-          { condition: r => (r.rolled.isEchec), action: async (r) => await RdDPossession.$onRollPossession(r, false, isNouvelle) },
         ]
       });
     dialog.render(true);
   }
 
   /* -------------------------------------------- */
-  static async $onRollPossession(rollData, isSuccess, isNouvelle = false) {
+  static async $onRollPossession(rollData, isNouvelle = false) {
-    rollData.possession.isSuccess = isSuccess;
+    rollData.possession.isSuccess = rollData.rolled.isSuccess;
-    RdDPossession.$updateEtatPossession(rollData.possession);
+    RdDPossession.$updateEtatPossession(rollData.possession, rollData);
     if (isNouvelle) {
       // Creer la possession sur le defenseur
-      rollData.defender.createEmbeddedDocuments('Item', [rollData.possession.toObject()])
+      await rollData.defender.createEmbeddedDocuments('Item', [rollData.possession.toObject()])
     }
+    const possession = (rollData.isECNIDefender ? rollData.attacker : rollData.defender).getPossession(rollData.possession.system.possessionid)
+    RdDPossession.storePossessionAttaque(possession, rollData)
     await RdDResolutionTable.displayRollData(rollData, rollData.attacker, 'chat-resultat-possession.html');
   }
 
@@ -127,7 +139,7 @@ export class RdDPossession {
     const dialog = await RdDRoll.create(defender, rollData,
       { html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-defense-possession.html' },
       {
-        name: 'conjurer',
+        name: 'possession',
         label: 'Conjurer une Possession',
         callbacks: [
           { action: async (r) => await RdDPossession.$onRollConjuration(r) }
@@ -139,23 +151,30 @@ export class RdDPossession {
 
   /* -------------------------------------------- */
   static async $onRollConjuration(rollData) {
-    let actor = game.actors.get(rollData.possession.system.possedeid)
+    let victime = game.actors.get(rollData.possession.system.victime.actorid)
+    let compteur = rollData.possession.system.compteur
     if (!rollData.rolled.isSuccess) {
       if (rollData.isECNIDefender) {
-        rollData.possession.system.compteur--
+        compteur--
       } else {
-        rollData.possession.system.compteur++
+        compteur++
       }
-      let update = { _id: rollData.possession._id, "system.compteur": rollData.possession.system.compteur }
-      await actor.updateEmbeddedDocuments('Item', [update])
     }
-
+    const possession = victime.getPossession(rollData.possession.system.possessionid)
+    await possession.update({
+      system: {
+        compteur: compteur,
+        entite: { diffLibre: 0, finesse: false },
+        victime: { diffLibre: 0, finesse: false }
+      }
+    })
+    rollData.possession = possession
     RdDPossession.$updateEtatPossession(rollData.possession)
 
-    await RdDResolutionTable.displayRollData(rollData,rollData.defender, 'chat-resultat-possession.html')
+    await RdDResolutionTable.displayRollData(rollData, rollData.defender, 'chat-resultat-possession.html')
     if (rollData.possession.isPosseder || rollData.possession.isConjurer) {
       // conjuration
-      actor.deleteEmbeddedDocuments("Item", [rollData.possession._id])
+      victime.deleteEmbeddedDocuments("Item", [rollData.possession._id])
     }
   }
 
@@ -180,12 +199,42 @@ export class RdDPossession {
     }
   }
 
+  /* -------------------------------------------- */
+  static isPossessionFinesse(rollData) {
+    return RdDPossession.getInfoAttaque(rollData).finesse
+  }
+  /* -------------------------------------------- */
+  static getInfoAttaque(rollData) {
+    return rollData.possession.system[rollData.isECNIDefender ? 'victime' : 'entite'];
+  }
+  /* -------------------------------------------- */
+  static isDefensePossession(rollData) {
+    return rollData.possession && rollData.mode == "defense"
+  }
+  /* -------------------------------------------- */
+  static storePossessionAttaque(possession, rollData = undefined) {
+    const attaquant = rollData?.isECNIDefender ? 'victime' : 'entite'
+    possession.update({
+      [`system.${attaquant}`]: {
+        diffLibre: rollData?.diffLibre ?? 0,
+        finesse: rollData?.rolled.isPart ?? false
+      }
+    })
+  }
+
   /* -------------------------------------------- */
   static async createPossession(attacker, defender) {
     return await Item.create({
       name: "Possession en cours de " + attacker.name, type: 'possession',
       img: "systems/foundryvtt-reve-de-dragon/icons/entites/possession2.webp",
-        system: { description: "", typepossession: attacker.name, possede: false, possessionid: randomID(16), possesseurid: attacker.id, possedeid: defender.id, date: 0, compteur: 0 }
+      system: {
+        description: "", typepossession: attacker.name,
+        possede: false,
+        possessionid: randomID(16),
+        entite: { actorid: attacker.id },
+        victime: { actorid: defender.id },
+        compteur: 0
+      }
     },
       {
         temporary: true

module/rdd-resolution-table.js

@@ -1,7 +1,7 @@
 import { ChatUtility } from "./chat-utility.js";
 import { Misc } from "./misc.js";
 import { RdDDice } from "./rdd-dice.js";
-import { ReglesOptionelles } from "./settings/regles-optionelles.js";
+import { ReglesOptionnelles } from "./settings/regles-optionnelles.js";
 
 /**
  * difficultés au delà de -10
@@ -28,7 +28,7 @@ const reussites = [
 
 const reussiteInsuffisante = { code: "notSign", isPart: false, isSign: false, isSuccess: false, isEchec: true, isEPart: false, isETotal: false, ptTache: 0, ptQualite: -2, quality: "Réussite insuffisante", condition: (target, roll) => false }
 /* -------------------------------------------- */
-const caracMaximumResolution = 60;
+const CARAC_MAXIMUM_RESOLUTION = 40;
 /* -------------------------------------------- */
 export class RdDResolutionTable {
   static resolutionTable = this.build()
@@ -36,7 +36,7 @@ export class RdDResolutionTable {
   /* -------------------------------------------- */
   static build() {
     let table = []
-    for (var caracValue = 0; caracValue <= caracMaximumResolution; caracValue++) {
+    for (var caracValue = 0; caracValue <= CARAC_MAXIMUM_RESOLUTION; caracValue++) {
       table[caracValue] = this._computeRow(caracValue);
     }
     return table;
@@ -91,13 +91,17 @@ export class RdDResolutionTable {
 
   /* -------------------------------------------- */
   static async displayRollData(rollData, actor = undefined, template = 'chat-resultat-general.html') {
-    return await ChatUtility.createChatWithRollMode(actor?.userName ?? game.user.name, {
+    return await ChatUtility.createChatWithRollMode(RdDResolutionTable.actorChatName(actor), {
-      content: await RdDResolutionTable.buildRollDataHtml(rollData, actor, template)
+      content: await RdDResolutionTable.buildRollDataHtml(rollData, template)
     });
   }
 
+  static actorChatName(actor) {
+    return actor?.userName ?? game.user.name;
+  }
+
   /* -------------------------------------------- */
-  static async buildRollDataHtml(rollData, actor, template = 'chat-resultat-general.html') {
+  static async buildRollDataHtml(rollData, template = 'chat-resultat-general.html') {
     rollData.show = rollData.show || {};
     return await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/${template}`, rollData);
   }
@@ -122,7 +126,7 @@ export class RdDResolutionTable {
     rolled.bonus = rollData.bonus;
     rolled.factorHtml = Misc.getFractionHtml(rollData.diviseurSignificative);
 
-    if (ReglesOptionelles.isUsing("afficher-colonnes-reussite")) {
+    if (ReglesOptionnelles.isUsing("afficher-colonnes-reussite")) {
       rolled.niveauNecessaire = this.findNiveauNecessaire(caracValue, rolled.roll);
       rolled.ajustementNecessaire = rolled.niveauNecessaire - finalLevel;
     }
@@ -195,17 +199,6 @@ export class RdDResolutionTable {
     return Math.max(Math.floor(carac * (diff + 10) / 2), 1);
   }
 
-  /* -------------------------------------------- */
-  static isAjustementAstrologique(rollData) {
-    if (rollData.selectedCarac?.label.toLowerCase().includes('chance')) {
-      return true;
-    }
-    if (rollData.selectedSort?.system.isrituel) {
-      return true;
-    }
-    return false;
-  }
-
   /* -------------------------------------------- */
   static isEchec(rollData) {
     switch (rollData.surprise) {
@@ -294,12 +287,9 @@ export class RdDResolutionTable {
       carac: carac,
       difficulte: level,
       min: minLevel,
-      rows: RdDResolutionTable.incrementalArray(minCarac, maxCarac),
+      rows: Misc.intArray(minCarac, maxCarac+1),
-      cols: RdDResolutionTable.incrementalArray(minLevel, maxLevel)
+      cols: Misc.intArray(minLevel, maxLevel+1)
     });
   }
-  static incrementalArray(min, max) {
-    return Array.from(Array(max-min+1).keys()).map(i=>i+min)
-  }
 
 }

module/rdd-roll-encaisser.js

@@ -30,9 +30,9 @@ export class RdDEncaisser extends Dialog {
       };
     }
     else if (actor.isEntite([ENTITE_BLURETTE, ENTITE_INCARNE])) {
-      dialogConf.default = "cauchemar"
+      dialogConf.default = "entiteincarnee"
       dialogConf.buttons = {
-        "cauchemar": { label: "Cauchemar", callback: html => this.performEncaisser("cauchemar") }
+        "entiteincarnee": { label: "Entité incarnée", callback: html => this.performEncaisser("entiteincarnee") }
       }
     }
 
@@ -70,7 +70,6 @@ export class RdDEncaisser extends Dialog {
         total: Number(this.modifier),
         ajustement: Number(this.modifier),
         encaisserSpecial: this.encaisserSpecial,
-        loc: { result: 0, label: "" },
         mortalite: mortalite
       }
     });

module/rdd-roll-resolution-table.js

@@ -112,7 +112,7 @@ export class RdDRollResolutionTable extends Dialog {
   async updateRollResult() {
     let rollData = this.rollData;
     rollData.caracValue = parseInt(rollData.selectedCarac.value)
-    rollData.finalLevel = this._computeFinalLevel(rollData);
+    rollData.finalLevel = Misc.toInt(rollData.diffConditions) + Misc.toInt(rollData.diffLibre);
 
     const htmlTable = await RdDResolutionTable.buildHTMLTable({
       carac: rollData.caracValue,
@@ -129,12 +129,6 @@ export class RdDRollResolutionTable extends Dialog {
   }
 
   /* -------------------------------------------- */
-  _computeFinalLevel(rollData) {
-    const diffConditions = Misc.toInt(rollData.diffConditions);
-    const diffLibre = Misc.toInt(rollData.diffLibre);
-
-    return diffLibre + diffConditions;
-  }
 
   async close() {
     await super.close();

module/rdd-roll.js

@@ -6,7 +6,7 @@ import { Misc } from "./misc.js";
 import { RdDBonus } from "./rdd-bonus.js";
 import { RdDCarac } from "./rdd-carac.js";
 import { RdDResolutionTable } from "./rdd-resolution-table.js";
-import { ReglesOptionelles } from "./settings/regles-optionelles.js";
+import { ReglesOptionnelles } from "./settings/regles-optionnelles.js";
 
 /**
  * Extend the base Dialog entity to select roll parameters
@@ -22,7 +22,7 @@ export class RdDRoll extends Dialog {
 
     const html = await renderTemplate(dialogConfig.html, rollData);
 
-    let options = { classes: ["rdd-roll-dialog"], width: 600, height: 'fit-content', 'z-index': 99999, close: html => {} };
+    let options = { classes: ["rdd-roll-dialog"], width: 650, height: 'fit-content', 'z-index': 99999, close: html => {} };
     if (dialogConfig.close) {
       options.close = dialogConfig.close;
     }
@@ -50,8 +50,6 @@ export class RdDRoll extends Dialog {
         encTotal: true
       },
       isMalusEncombrementTotal: RdDItemCompetence.isMalusEncombrementTotal(rollData.competence),
-      malusArmureValue: actor.getMalusArmure(),
-      surencMalusValue: actor.computeMalusSurEncombrement(),
       encTotal: actor.getEncTotal(),
       ajustementAstrologique: actor.ajustementAstrologique(),
       surprise: actor.getSurprise(false),
@@ -85,7 +83,7 @@ export class RdDRoll extends Dialog {
     if (RdDBonus.isDefenseAttaqueFinesse(rollData)) {
       facteurSign *= 2;
     }
-    if (!ReglesOptionelles.isUsing('tripleSignificative')) {
+    if (!ReglesOptionnelles.isUsing('tripleSignificative')) {
       facteurSign = Math.min(facteurSign, 4);
     }
     return facteurSign;
@@ -187,7 +185,7 @@ export class RdDRoll extends Dialog {
       console.log("RdDRollSelectDialog - Cout reve", ptreve);
       this.updateRollResult(html);
     });
-    this.html.find("[name='coupsNonMortels']").change((event) => {
+    this.html.find("input.check-mortalite").change((event) => {
       this.rollData.dmg.mortalite = event.currentTarget.checked ? "non-mortel" : "mortel";
       this.updateRollResult(html);
     });
@@ -276,11 +274,11 @@ export class RdDRoll extends Dialog {
     const diffVariable = RdDItemSort.isDifficulteVariable(sort);
     const coutVariable = RdDItemSort.isCoutVariable(sort);
 
-    HtmlUtility._showControlWhen(this.html.find(".div-sort-non-rituel"), !sort.system.isrituel);
+    HtmlUtility.showControlWhen(this.html.find(".div-sort-non-rituel"), !sort.system.isrituel);
-    HtmlUtility._showControlWhen(this.html.find(".div-sort-difficulte-var"), diffVariable);
+    HtmlUtility.showControlWhen(this.html.find(".div-sort-difficulte-var"), diffVariable);
-    HtmlUtility._showControlWhen(this.html.find(".div-sort-difficulte-fixe"), !diffVariable);
+    HtmlUtility.showControlWhen(this.html.find(".div-sort-difficulte-fixe"), !diffVariable);
-    HtmlUtility._showControlWhen(this.html.find(".div-sort-ptreve-var"), coutVariable);
+    HtmlUtility.showControlWhen(this.html.find(".div-sort-ptreve-var"), coutVariable);
-    HtmlUtility._showControlWhen(this.html.find(".div-sort-ptreve-fixe"), !coutVariable);
+    HtmlUtility.showControlWhen(this.html.find(".div-sort-ptreve-fixe"), !coutVariable);
   }
 
   async setSelectedSigneDraconique(signe) {
@@ -291,36 +289,31 @@ export class RdDRoll extends Dialog {
 
   /* -------------------------------------------- */
   async updateRollResult(html) {
-    let rollData = this.rollData;
+    const rollData = this.rollData;
 
     rollData.dmg = rollData.attackerRoll?.dmg ?? RdDBonus.dmg(rollData, this.actor.getBonusDegat())
     rollData.caracValue = parseInt(rollData.selectedCarac.value)
-    rollData.mortalite = rollData.attackerRoll?.dmg.mortalite ?? rollData.dmg.mortalite ?? 'mortel';
+    rollData.dmg.mortalite = rollData.dmg.mortalite ?? 'mortel';
-    rollData.coupsNonMortels = (rollData.attackerRoll?.dmg.mortalite ?? rollData.dmg.mortalite) == 'non-mortel';
     rollData.use.appelAuMoral = this.actor.isPersonnage() && RdDCarac.isActionPhysique(rollData.selectedCarac);
-    let dmgText = Misc.toSignedString(rollData.dmg.total);
-
-    switch (rollData.mortalite) {
-      case 'non-mortel': dmgText = `(${dmgText}) non-mortel`; break;
-      case 'empoignade': dmgText = `empoignade`; break;
-    }
 
     RollDataAjustements.calcul(rollData, this.actor);
-    rollData.finalLevel = this._computeFinalLevel(rollData);
 
     const resolutionTable = await RdDResolutionTable.buildHTMLTable(RdDResolutionTable.subTable(rollData.caracValue, rollData.finalLevel))
     const adjustements = await this.buildAjustements(rollData);
     
-    HtmlUtility._showControlWhen(this.html.find(".use-encTotal"), rollData.ajustements.encTotal.visible && RdDCarac.isAgiliteOuDerivee(rollData.selectedCarac));
+    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-surenc"), rollData.ajustements.surenc.visible && RdDCarac.isActionPhysique(rollData.selectedCarac));
-    HtmlUtility._showControlWhen(this.html.find(".utilisation-moral"), rollData.use.appelAuMoral);
+    HtmlUtility.showControlWhen(this.html.find(".utilisation-moral"), rollData.use.appelAuMoral);
-    HtmlUtility._showControlWhen(this.html.find(".diffMoral"), rollData.ajustements.moralTotal.used);
+    HtmlUtility.showControlWhen(this.html.find(".divAppelAuMoral"), rollData.use.appelAuMoral);
-    HtmlUtility._showControlWhen(this.html.find(".divAppelAuMoral"), rollData.use.appelAuMoral);
+    // HtmlUtility.showControlWhen(this.html.find(".diffMoral"), rollData.ajustements.moral.used);
 
     // Mise à jour valeurs
     this.html.find(".dialog-roll-title").text(this._getTitle(rollData));
-    this.html.find("[name='coupsNonMortels']").prop('checked', rollData.mortalite == 'non-mortel');
+    this.html.find("input.check-mortalite").prop('checked', rollData.dmg.mortalite == 'non-mortel');
-    this.html.find(".dmg-arme-actor").text(dmgText);
+    this.html.find("label.dmg-arme-actor").text(rollData.dmg.mortalite == 'empoignade'? 'empoignade': Misc.toSignedString(rollData.dmg.total) );
+    this.html.find("label.arme-mortalite").text(rollData.dmg.mortalite);
+    // this.html.find("[name='dmg-arme-actor']").text(rollData.dmg.mortalite == 'empoignade'? 'empoignade': Misc.toSignedString(rollData.dmg.total) );
+    // this.html.find("[name='arme-mortalite']").text(rollData.dmg.mortalite);
     this.html.find("div.placeholder-ajustements").empty().append(adjustements);
     this.html.find("div.placeholder-resolution").empty().append(resolutionTable)
   }
@@ -331,30 +324,6 @@ export class RdDRoll extends Dialog {
     return await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/partial-roll-ajustements.html`, rollData);
   }
 
-  /* -------------------------------------------- */
-  _computeFinalLevel(rollData) {
-    return RollDataAjustements.sum(rollData.ajustements);
-  }
-  /* -------------------------------------------- */
-  _computeDiffCompetence(rollData) {
-    if (rollData.competence) {
-      return Misc.toInt(rollData.competence.system.niveau);
-    }
-    if (rollData.draconicList) {
-      return Misc.toInt(rollData.competence.system.niveau);
-    }
-    return 0;
-  }
-
-  /* -------------------------------------------- */
-  _computeMalusArmure(rollData) {
-    let malusArmureValue = 0;
-    if (rollData.malusArmureValue && (rollData.selectedCarac.label == "Agilité" || rollData.selectedCarac.label == "Dérobée")) {
-      malusArmureValue = rollData.malusArmureValue;
-    }
-    return malusArmureValue;
-  }
-
   /* -------------------------------------------- */
   _getTitle(rollData) {
     const carac = rollData.selectedCarac.label;
@@ -362,16 +331,19 @@ export class RdDRoll extends Dialog {
       return carac;
     }
     const compName = rollData.competence.name;
-    if (rollData.draconicList && rollData.selectedSort) {
-      return compName + " - " + rollData.selectedSort.name;
-    }
-    // If a weapon is there, add it in the title
     const niveau = Misc.toSignedString(rollData.competence.system.niveau)
     if (compName == carac) {
       // cas des créatures
-      return carac + " Niveau " + niveau
+      return `${carac} Niveau ${niveau}`
     }
-    const armeTitle = (rollData.arme) ? " (" + rollData.arme.name + ") " : "";
+    if (rollData.draconicList && rollData.selectedSort) {
-    return carac + "/" + compName + armeTitle + " Niveau " + niveau
+      // cas de lancer de sort
+      return `${rollData.competence.name} Niveau ${niveau} ${rollData.selectedSort.name}`
+    }
+    if (rollData.arme && rollData.arme.name != compName) {
+      // ajouter l'arme au titre si son nom n'est pas la compétence
+      return `${carac} /  ${compName} (${rollData.arme.name}) Niveau ${niveau}`
+    }
+    return `${carac} / ${compName} Niveau ${niveau}`
   }
 }