Ajout distance

Reviewed-on: #564

module/actor-creature-sheet.js

@@ -4,7 +4,6 @@
  * @extends {ActorSheet}
  */
 
-import { HtmlUtility } from "./html-utility.js";
 import { RdDUtility } from "./rdd-utility.js";
 import { RdDActorSheet } from "./actor-sheet.js";
 import { RdDCarac } from "./rdd-carac.js";
@@ -24,34 +23,11 @@ export class RdDActorCreatureSheet extends RdDActorSheet {
     });
   }
 
-
-  /* -------------------------------------------- */
-  async getData() {
-    let formData = await super.getData()
-    //console.log("Creature : ", formData, formData.system)
-    formData.calc = {
-      caracTotal: RdDCarac.computeTotal(formData.system.carac),
-      resumeBlessures: this.actor.computeResumeBlessure(formData.system.blessures),
-      encTotal: await this.actor.computeEncombrementTotalEtMalusArmure(),
-      surEncombrementMessage: this.actor.getMessageSurEncombrement()
-    }
-
-    RdDUtility.filterItemsPerTypeForSheet(formData, this.actor.itemTypes);
-    this.objetVersConteneur = RdDUtility.buildArbreDeConteneurs(formData.conteneurs, formData.objets);
-    formData.conteneurs = RdDUtility.conteneursRacine(formData.conteneurs);
-
-    console.log("Creature : ", this.objetVersConteneur, formData);
-
-    return formData;
-  }
-
   /* -------------------------------------------- */
   /** @override */
   activateListeners(html) {
     super.activateListeners(html);
 
-    HtmlUtility._showControlWhen($(".gm-only"), game.user.isGM);
-
     // Everything below here is only needed if the sheet is editable
     if (!this.options.editable) return;
 

module/actor-entite-sheet.js

@@ -1,14 +1,8 @@
-/**
- * Extend the basic ActorSheet with some very simple modifications
- * @extends {ActorSheet}
- */
-
+import { RdDActorSheet } from "./actor-sheet.js";
 import { HtmlUtility } from "./html-utility.js";
-import { Misc } from "./misc.js";
 import { RdDUtility } from "./rdd-utility.js";
 
-/* -------------------------------------------- */  
-export class RdDActorEntiteSheet extends ActorSheet {
+export class RdDActorEntiteSheet extends RdDActorSheet {
 
   /** @override */
 	static get defaultOptions() {
@@ -22,64 +16,14 @@ export class RdDActorEntiteSheet extends ActorSheet {
     });
   }
 
-
-  /* -------------------------------------------- */
-  async getData() {
-    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)),
-      //   items: items,
-      limited: this.actor.limited,
-      options: this.options,
-      owner: this.actor.isOwner,
-      description:  await TextEditor.enrichHTML(this.object.system.description, {async: true}),
-      notesmj: await TextEditor.enrichHTML(this.object.system.notesmj, {async: true}),
-    };
-    
-    formData.options.isGM = game.user.isGM;
-    RdDUtility.filterItemsPerTypeForSheet(formData, this.actor.itemTypes);
-
-
-    return formData;
-  }
-  
   /* -------------------------------------------- */
   /** @override */
 	activateListeners(html) {
     super.activateListeners(html);
 
-    HtmlUtility._showControlWhen($(".gm-only"), game.user.isGM);
-
     // Everything below here is only needed if the sheet is editable
     if (!this.options.editable) return;
 
-    // Update Inventory Item
-    html.find('.item-edit').click(event => {
-      const li = $(event.currentTarget).parents(".item");
-      const item = this.actor.getEmbeddedDocument('Item', li.data("itemId"));
-      item.sheet.render(true);
-    });
-
-    // Delete Inventory Item
-    html.find('.item-delete').click(event => {
-      const li = $(event.currentTarget).parents(".item");
-      this.actor.deleteEmbeddedDocuments('Item', [li.data("itemId")]);
-      li.slideUp(200, () => this.render(false));
-    });
-
-    // Roll Carac
-    html.find('.carac-label a').click(async event => {
-      let caracName = event.currentTarget.attributes.name.value;
-      this.actor.rollCarac( caracName.toLowerCase() );
-    });
-    
     // On competence change
     html.find('.creature-carac').change(async event => {
         let compName = event.currentTarget.attributes.compname.value;
@@ -93,53 +37,6 @@ export class RdDActorEntiteSheet extends ActorSheet {
         let compName = event.currentTarget.attributes.compname.value;
         this.actor.updateCreatureCompetence( compName, "dommages", parseInt(event.target.value) );
       } );    
-  
-    // Roll Skill
-    html.find('.competence-label a').click(async event => {
-      let compName = event.currentTarget.text;
-      this.actor.rollCompetence( compName );
-    });
-
-    html.find('.endurance-plus').click(event => {
-      this.actor.santeIncDec("endurance", 1);
-      this.render(true);
-    });
-    html.find('.endurance-moins').click(event => {
-      this.actor.santeIncDec("endurance", -1);
-      this.render(true);
-    });
-
-    html.find('.encaisser-direct').click(event => {
-      this.actor.encaisser();
-    });
-
-    html.find('.remise-a-neuf').click(event => {
-      if (game.user.isGM) {
-        this.actor.remiseANeuf();
-      }
-    });
-  }
-  
-
-  /* -------------------------------------------- */
-
-  /** @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");
-    const bodyHeight = position.height - sheetHeader[0].clientHeight - sheetTabs[0].clientHeight;
-    sheetBody.css("height", bodyHeight);
-    return position;
   }
 
-
-  /* -------------------------------------------- */
-
-  /** @override */
-  _updateObject(event, formData) {
-    // Update the Actor
-    return this.actor.update(formData);
-  }
 }

module/actor-sheet.js

@@ -37,7 +37,7 @@ export class RdDActorSheet extends ActorSheet {
   /* -------------------------------------------- */
   async getData() {
     this.timerRecherche = undefined;
-    
+
     let formData = {
       title: this.title,
       id: this.actor.id,
@@ -51,72 +51,70 @@ export class RdDActorSheet extends ActorSheet {
       limited: this.actor.limited,
       options: this.options,
       owner: this.actor.isOwner,
-      biographie:  await TextEditor.enrichHTML(this.object.system.biographie, {async: true}),
-      notes:  await TextEditor.enrichHTML(this.object.system.notes, {async: true}),
+      description: await TextEditor.enrichHTML(this.object.system.description, {async: true}),
+      biographie: await TextEditor.enrichHTML(this.object.system.biographie, {async: true}),
+      notes: await TextEditor.enrichHTML(this.object.system.notes, {async: true}),
       notesmj: await TextEditor.enrichHTML(this.object.system.notesmj, {async: true}),
+      calc: {
+        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(),
+      },
     }
+    formData.options.isGM =  game.user.isGM;
+
     RdDUtility.filterItemsPerTypeForSheet(formData, this.actor.itemTypes);
-  
-    formData.options.isGM = game.user.isGM;
-
-    if (formData.type == 'creature') return formData; // Shortcut
-
-    formData.byCateg = Misc.classify(formData.competences, it => it.system.categorie)
-
-    formData.calc = {
-      comptageArchetype: RdDItemCompetence.computeResumeArchetype(formData.competences),
-      competenceXPTotal: RdDItemCompetence.computeTotalXP(formData.competences),
-      caracTotal: RdDCarac.computeTotal(formData.system.carac, formData.system.beaute),
-      // Mise à jour de l'encombrement total et du prix de l'équipement
-      encTotal: await this.actor.computeEncombrementTotalEtMalusArmure(),
-      prixTotalEquipement: this.actor.computePrixTotalEquipement(),
-      surprise: RdDBonus.find(this.actor.getSurprise(false)).descr,
-      fatigue: RdDUtility.calculFatigueHtml(formData.system.sante.fatigue.value, formData.system.sante.endurance.max),
-      resumeBlessures: this.actor.computeResumeBlessure(formData.system.blessures),
-      surEncombrementMessage: this.actor.getMessageSurEncombrement()
-    };
-
-    formData.competences.forEach(item => {
-      item.system.isVisible = this.options.recherche
-        ? RdDItemCompetence.nomContientTexte(item, this.options.recherche.text)
-        : (!this.options.showCompNiveauBase || !RdDItemCompetence.isNiveauBase(item));
-      RdDItemCompetence.levelUp(item, formData.system.compteurs.experience.value);
-    });
-    Object.values(formData.system.carac).forEach(c => {
-      RdDCarac.levelUp(c);
-    });
-
-
-    // toujours avoir une liste d'armes (pour mettre esquive et corps à corps)
-    formData.combat = duplicate(formData.armes ?? []);
-    RdDItemArme.computeNiveauArmes(formData.combat, formData.competences);
-    RdDItemArme.ajoutCorpsACorps(formData.combat, formData.competences, formData.system.carac);
-    formData.esquives = this.actor.getCompetences("Esquive");
-    formData.combat = RdDCombatManager.listActionsArmes(formData.combat, formData.competences, formData.system.carac);
-
-    this.armesList = formData.combat;
-
-    // Common data
-    formData.ajustementsConditions = CONFIG.RDD.ajustementsConditions;
-    formData.difficultesLibres = CONFIG.RDD.difficultesLibres;
-
-    formData.hautreve = {
-      isDemiReve: this.actor.getEffect(STATUSES.StatusDemiReve),
-      rencontres: duplicate(formData.system.reve.rencontre.list),
-      cacheTMR: this.actor.isTMRCache()
-    }
-
     this.objetVersConteneur = RdDUtility.buildArbreDeConteneurs(formData.conteneurs, formData.objets);
     formData.conteneurs = RdDUtility.conteneursRacine(formData.conteneurs);
 
-    formData.subacteurs = {
-      vehicules: this.actor.listeVehicules(),
-      montures: this.actor.listeMontures(),
-      suivants: this.actor.listeSuivants()
-    }
-    if (this.actor.getBestDraconic().system.niveau > -11 && !this.actor.isHautRevant()) {
-      ui.notifications.error(`${this.actor.name} a des compétences draconiques, mais pas le don de Haut-Rêve!
-        <br>Ajoutez-lui la tête "Don de Haut-Rêve" pour lui permettre d'utiliser ses compétences et d'accéder aux terres médianes du rêve`);
+    if (formData.type == 'personnage') {
+      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.fatigue= RdDUtility.calculFatigueHtml(formData.system.sante.fatigue.value, formData.system.sante.endurance.max);
+
+      formData.competences.forEach(item => {
+        item.system.isVisible = this.options.recherche
+        ? RdDItemCompetence.nomContientTexte(item, this.options.recherche.text)
+        : (!this.options.showCompNiveauBase || !RdDItemCompetence.isNiveauBase(item));
+        RdDItemCompetence.levelUp(item, formData.system.compteurs.experience.value);
+      });
+
+      Object.values(formData.system.carac).forEach(c => {
+        RdDCarac.levelUp(c);
+      });
+
+      // toujours avoir une liste d'armes (pour mettre esquive et corps à corps)
+      formData.combat = duplicate(formData.armes ?? []);
+      RdDItemArme.computeNiveauArmes(formData.combat, formData.competences);
+      RdDItemArme.ajoutCorpsACorps(formData.combat, formData.competences, formData.system.carac);
+      formData.esquives = this.actor.getCompetences("Esquive");
+      formData.combat = RdDCombatManager.listActionsArmes(formData.combat, formData.competences, formData.system.carac);
+
+      this.armesList = formData.combat;
+
+      // Common data
+      formData.ajustementsConditions = CONFIG.RDD.ajustementsConditions;
+      formData.difficultesLibres = CONFIG.RDD.difficultesLibres;
+
+      formData.hautreve = {
+        isDemiReve: this.actor.getEffect(STATUSES.StatusDemiReve),
+        rencontres: duplicate(formData.system.reve.rencontre.list),
+        cacheTMR: this.actor.isTMRCache()
+      }
+
+      formData.subacteurs = {
+        vehicules: this.actor.listeVehicules(),
+        montures: this.actor.listeMontures(),
+        suivants: this.actor.listeSuivants()
+      }
+      if (this.actor.getBestDraconic().system.niveau > -11 && !this.actor.isHautRevant()) {
+        ui.notifications.error(`${this.actor.name} a des compétences draconiques, mais pas le don de Haut-Rêve!
+          <br>Ajoutez-lui la tête "Don de Haut-Rêve" pour lui permettre d'utiliser ses compétences et d'accéder aux terres médianes du rêve`);
+      }
     }
     return formData;
   }
@@ -156,7 +154,6 @@ export class RdDActorSheet extends ActorSheet {
   activateListeners(html) {
     super.activateListeners(html);
 
-    HtmlUtility._showControlWhen($(".gm-only"), game.user.isGM);
     HtmlUtility._showControlWhen($(".appliquerFatigue"), ReglesOptionelles.isUsing("appliquer-fatigue"));
 
     // Everything below here is only needed if the sheet is editable
@@ -168,7 +165,6 @@ export class RdDActorSheet extends ActorSheet {
     });
     html.find('.item-edit').click(async event => {
       const item = RdDSheetUtility.getItem(event, this.actor)
-      console.log("ITEM :", item)
       item.sheet.render(true)
     })
     html.find('.display-label a').click(async event => {
@@ -234,7 +230,7 @@ export class RdDActorSheet extends ActorSheet {
     html.find('.creer-une-oeuvre').click(async event => {
       RdDUtility.selectTypeOeuvre(this);
     });
-    html.find('#nettoyer-conteneurs').click(async event => {
+    html.find('.nettoyer-conteneurs').click(async event => {
       this.actor.nettoyerConteneurs();
     });
 
@@ -327,7 +323,7 @@ export class RdDActorSheet extends ActorSheet {
       this.actor.reinsertionAleatoire("Action MJ");
     });
     html.find('.afficher-tmr').click(async event => {
-      this.actor.afficheTMRetMessage();
+      this.actor.changeTMRVisible();
     });
 
     // Points de reve actuel
@@ -497,7 +493,7 @@ export class RdDActorSheet extends ActorSheet {
     html.find('.moral-heureux').click(async event => {
       this.actor.jetDeMoral('heureuse');
     });
-    html.find('#ethylisme-test').click(async event => {
+    html.find('.ethylisme-test').click(async event => {
       this.actor.jetEthylisme();
     });
 
@@ -570,7 +566,10 @@ export class RdDActorSheet extends ActorSheet {
     const sheetHeader = this.element.find(".sheet-header");
     const sheetTabs = this.element.find(".sheet-tabs");
     const sheetBody = this.element.find(".sheet-body");
-    const bodyHeight = position.height - sheetHeader[0].clientHeight - sheetTabs[0].clientHeight;
+    let bodyHeight = position.height - sheetHeader[0].clientHeight;
+    if (sheetTabs.length>0) {
+      bodyHeight  -= sheetTabs[0].clientHeight;
+    }
     sheetBody.css("height", bodyHeight);
     return position;
   }

module/actor-vehicule-sheet.js

@@ -1,15 +1,9 @@
-/**
- * Extend the basic ActorSheet with some very simple modifications
- * @extends {ActorSheet}
- */
-
 import { RdDUtility } from "./rdd-utility.js";
-import { HtmlUtility } from "./html-utility.js";
-import { Misc } from "./misc.js";
 import { RdDSheetUtility } from "./rdd-sheet-utility.js";
+import { RdDActorSheet } from "./actor-sheet.js";
 
 /* -------------------------------------------- */
-export class RdDActorVehiculeSheet extends ActorSheet {
+export class RdDActorVehiculeSheet extends RdDActorSheet {
 
   /** @override */
   static get defaultOptions() {
@@ -25,142 +19,5 @@ export class RdDActorVehiculeSheet extends ActorSheet {
     });
   }
 
-  /* -------------------------------------------- */
-  async getData() {
-    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.biographie, {async: true}),
-      notesmj: await TextEditor.enrichHTML(this.object.system.notesmj, {async: true}),
-    };
 
-    RdDUtility.filterItemsPerTypeForSheet(formData, this.actor.itemTypes);
-    this.objetVersConteneur = RdDUtility.buildArbreDeConteneurs(formData.conteneurs, formData.objets);
-    formData.conteneurs = RdDUtility.conteneursRacine(formData.conteneurs);
-
-    formData.options.isGM = game.user.isGM;
-
-    formData.calc = {
-      encTotal: await this.actor.computeEncombrementTotalEtMalusArmure(),
-      surEncombrementMessage: this.actor.getMessageSurEncombrement()
-    }
-
-    console.log("DATA", formData);
-
-    return formData;
-  }
-
-  async computeMalusArmure() {
-    // pas de malus armure
-  }
-  /* -------------------------------------------- */
-  async _onDropItem(event, dragData) {
-    const destItemId = $(event.target)?.closest('.item').attr('data-item-id');
-    const dropParams = RdDSheetUtility.prepareItemDropParameters(destItemId, this.actor.id, dragData, this.objetVersConteneur);
-    const callSuper = await this.actor.processDropItem(dropParams);
-    if (callSuper) {
-      await super._onDropItem(event, dragData)
-    }
-  }
-
-  /* -------------------------------------------- */
-  async createItem(name, type) {
-    await this.actor.createEmbeddedDocuments('Item', [{ name: name, type: type }], { renderSheet: true });
-  }
-
-  /* -------------------------------------------- */
-  async monnaieIncDec(id, value) {
-    let monnaie = this.getMonnaie(id);
-    if (monnaie) {
-      const quantite = Math.max(0, monnaie.system.quantite + value);
-      await this.updateEmbeddedDocuments('Item', [{ _id: monnaie.id, 'data.quantite': quantite }]);
-    }
-  }
-
-  /* -------------------------------------------- */
-  /** @override */
-  activateListeners(html) {
-    super.activateListeners(html);
-
-    HtmlUtility._showControlWhen($(".gm-only"), game.user.isGM);
-
-    // Everything below here is only needed if the sheet is editable
-    if (!this.options.editable) return;
-
-    // Update Inventory Item
-    html.find('.item-edit').click(async event => {
-      const item = RdDSheetUtility.getItem(event, this.actor);
-      item.sheet.render(true);
-    });
-    // Delete Inventory Item
-    html.find('.item-delete').click(async event => {
-      const li = RdDSheetUtility.getEventElement(event);
-      const item = this.actor.getObjet(li.data("item-id"));
-      RdDUtility.confirmerSuppressionItem(this, item, li);
-    });
-    html.find('.item-vendre').click(async event => {
-      const item = RdDSheetUtility.getItem(event, this.actor);
-      item?.proposerVente();
-    });
-    html.find('.item-montrer').click(async event => {
-      const item = RdDSheetUtility.getItem(event, this.actor);
-      item?.postItem();
-    });
-
-    html.find('.item-action').click(async event => {
-      const item = RdDSheetUtility.getItem(event, this.actor);
-      this.actor.actionItem(item);
-    });
-
-    html.find('.creer-un-objet').click(async event => {
-      RdDUtility.selectObjetType(this);
-    });
-    html.find('#nettoyer-conteneurs').click(async event => {
-      this.actor.nettoyerConteneurs();
-    });
-
-    html.find('.monnaie-plus').click(async event => {
-      this.actor.monnaieIncDec(RdDSheetUtility.getItemId(event), 1);
-    });
-    html.find('.monnaie-moins').click(async event => {
-      this.actor.monnaieIncDec(RdDSheetUtility.getItemId(event), -1);
-    });
-
-    // Display info about queue
-    html.find('.conteneur-name a').click((event) => {
-      RdDUtility.toggleAfficheContenu(RdDSheetUtility.getItemId(event));
-      this.render(true);
-    });
-
-  }
-
-  /* -------------------------------------------- */
-  /** @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");
-    const bodyHeight = position.height - sheetHeader[0].clientHeight - sheetTabs[0].clientHeight;
-    sheetBody.css("height", bodyHeight);
-    return position;
-  }
-
-
-  /* -------------------------------------------- */
-  /** @override */
-  _updateObject(event, formData) {
-    // Update the Actor
-    return this.actor.update(formData);
-  }
 }

module/actor.js

@@ -33,7 +33,9 @@ import { RollDataAjustements } from "./rolldata-ajustements.js";
 import { DialogItemAchat } from "./dialog-item-achat.js";
 import { RdDItem } from "./item.js";
 import { RdDPossession } from "./rdd-possession.js";
-import { ENTITE_BLURETTE, ENTITE_INCARNE, ENTITE_NONINCARNE, SYSTEM_RDD, SYSTEM_SOCKET_ID } from "./constants.js";
+import { ENTITE_BLURETTE, ENTITE_INCARNE, ENTITE_NONINCARNE, HIDE_DICE, SHOW_DICE, SYSTEM_RDD, SYSTEM_SOCKET_ID } from "./constants.js";
+import { RdDConfirm } from "./rdd-confirm.js";
+import { DialogValidationEncaissement } from "./dialog-validation-encaissement.js";
 
 const POSSESSION_SANS_DRACONIC = {
   img: 'systems/foundryvtt-reve-de-dragon/icons/entites/possession.webp',
@@ -115,17 +117,13 @@ export class RdDActor extends Actor {
     const isPersonnage = actorData.type == "personnage";
     // If the created actor has items (only applicable to duplicated actors) bypass the new actor creation logic
     if (actorData.items) {
-      let actor = await super.create(actorData, options);
-      if (isPersonnage) {
-        await actor.checkMonnaiePresence();
-      }
-      return actor;
+      return await super.create(actorData, options);
     }
 
     if (isPersonnage) {
-      const competences = await RdDUtility.loadCompendium(RdDItemCompetence.actorCompendium(actorData.type));
+      const competences = await RdDUtility.loadItems(it => it.isCompetencePersonnage(), 'foundryvtt-reve-de-dragon.competences');
       actorData.items = competences.map(i => i.toObject());
-      actorData.items = actorData.items.concat(Monnaie.monnaiesData());
+      actorData.items = actorData.items.concat(Monnaie.monnaiesStandard());
     }
     else {
       actorData.items = [];
@@ -139,13 +137,12 @@ export class RdDActor extends Actor {
 
     // Dynamic computing fields
     this.encTotal = 0;
-    this.prixTotalEquipement = 0;
 
     // Make separate methods for each Actor type (character, npc, etc.) to keep
     // things organized.
-    if (this.type === 'personnage') this._prepareCharacterData(this)
-    if (this.type === 'creature') this._prepareCreatureData(this)
-    if (this.type === 'vehicule') this._prepareVehiculeData(this)
+    if (this.isPersonnage()) this._prepareCharacterData(this)
+    if (this.isCreature()) this._prepareCreatureData(this)
+    if (this.isVehicule()) this._prepareVehiculeData(this)
   }
 
   /* -------------------------------------------- */
@@ -179,10 +176,7 @@ export class RdDActor extends Actor {
     this.computeIsHautRevant();
     await this.cleanupConteneurs();
     await this.computeEncombrementTotalEtMalusArmure();
-    this.computePrixTotalEquipement();
     this.computeEtatGeneral();
-    // Sanity check
-    await this.checkMonnaiePresence();
   }
 
   /* -------------------------------------------- */
@@ -195,15 +189,6 @@ export class RdDActor extends Actor {
     }
   }
 
-  /* -------------------------------------------- */
-  async checkMonnaiePresence() { // Ajout opportuniste si les pièces n'existent pas.
-    if (!this.items) return; // Sanity check during import
-    let manquantes = Monnaie.monnaiesManquantes(this);
-    if (manquantes.length > 0) {
-      await this.createEmbeddedDocuments('Item', manquantes, { renderSheet: false });
-    }
-  }
-
   /* -------------------------------------------- */
   isCreature() {
     return this.type == 'creature' || this.type == 'entite';
@@ -212,6 +197,9 @@ export class RdDActor extends Actor {
   isPersonnage() {
     return this.type == 'personnage';
   }
+  isVehicule() {
+    return this.type == 'vehicule';
+  }
   /* -------------------------------------------- */
   isHautRevant() {
     return this.isPersonnage() && this.system.attributs.hautrevant.value != ""
@@ -299,11 +287,6 @@ export class RdDActor extends Actor {
     return Math.floor(this.encTotal ?? 0);
   }
 
-  /* -------------------------------------------- */
-  getPrixTotalEquipement() {
-    return Math.floor(this.system.prixTotalEquipement ?? 0)
-  }
-
   /* -------------------------------------------- */
   getCompetence(idOrName, options = {}) {
     return RdDItemCompetence.findCompetence(this.items, idOrName, options)
@@ -361,7 +344,7 @@ export class RdDActor extends Actor {
   }
   /* -------------------------------------------- */
   getDraconicList() {
-    return this.items.filter(it => it.type == 'competence' && it.system.categorie == 'draconic')
+    return this.items.filter(it => it.isCompetencePersonnage() && it.system.categorie == 'draconic')
   }
   /* -------------------------------------------- */
   getBestDraconic() {
@@ -1163,18 +1146,26 @@ export class RdDActor extends Actor {
   /* -------------------------------------------- */
   /** Fonction de remise à plat de l'équipement (ie vide les champs 'contenu') */
   async nettoyerConteneurs() {
-    const corrections = [];
-    for (let item of this.items) {
-      if (item.estContenu) {
-        item.estContenu = undefined;
+    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);
+        }
       }
-      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);
-    }
+    });
   }
 
   async processDropItem(params) {
@@ -1356,23 +1347,23 @@ export class RdDActor extends Actor {
 
   /* -------------------------------------------- */
   async computeMalusArmure() {
-    const newMalusArmure = this.filterItems(it => it.type == 'armure' && it.system.equipe)
+    if (this.isPersonnage()) {
+      const malusArmure = this.filterItems(it => it.type == 'armure' && it.system.equipe)
       .map(it => it.system.malus ?? 0)
       .reduce(Misc.sum(), 0);
-    // Mise à jour éventuelle du malus armure
-    if (this.system.attributs?.malusarmure?.value != newMalusArmure) {
-      await this.updateAttributeValue("malusarmure", newMalusArmure);
+      // Mise à jour éventuelle du malus armure
+      if (this.system.attributs?.malusarmure?.value != malusArmure) {
+        await this.updateAttributeValue("malusarmure", malusArmure);
+      }
     }
-    return newMalusArmure;
   }
 
   /* -------------------------------------------- */
   computePrixTotalEquipement() {
-    this.prixTotalEquipement = this.filterItems(it => it.system.prixTotal)
-      .map(it => it.system.prixTotal ?? 0)
+    const deniers = this.items.filter(it => it.isEquipement())
+      .map(it => it.prixTotalDeniers())
       .reduce(Misc.sum(), 0);
-    // Mise à jour valeur totale de l'équipement
-    return this.prixTotalEquipement;
+    return deniers / 100;
   }
 
   /* -------------------------------------------- */
@@ -1486,12 +1477,16 @@ export class RdDActor extends Actor {
   }
 
   /* -------------------------------------------- */
-  async cacheTMR() {
-    await this.update({ 'system.reve.tmrpos.cache': true });
+  /* -------------------------------------------- */
+  async changeTMRVisible() {
+    await this.setTMRVisible(this.system.reve.tmrpos.cache ? true : false);
   }
-  async montreTMR() {
-    await this.update({ 'system.reve.tmrpos.cache': false });
+
+  async setTMRVisible(newState) {
+    await this.update({ 'system.reve.tmrpos.cache': !newState });
+    this.notifyRefreshTMR();
   }
+
   isTMRCache() {
     return this.system.reve.tmrpos.cache;
   }
@@ -1505,11 +1500,6 @@ export class RdDActor extends Actor {
     });
   }
 
-  /* -------------------------------------------- */
-  async afficheTMRetMessage() {
-    await this.montreTMR();
-    this.notifyRefreshTMR();
-  }
 
   /* -------------------------------------------- */
   async reinsertionAleatoire(raison, accessible = tmr => true) {
@@ -1524,7 +1514,7 @@ export class RdDActor extends Actor {
   }
 
   async forcerPositionTMRInconnue(tmr) {
-    await this.cacheTMR();
+    await this.setTMRVisible(false);
     await this.updateCoordTMR(tmr.coord);
     this.notifyRefreshTMR();
   }
@@ -2328,7 +2318,7 @@ export class RdDActor extends Actor {
       case "detection d'aura":
         return draconicList;
       case "annulation de magie":
-        return draconicList.filter(it => !Grammar.toLowerCaseNoAccent(it.name).includes('thanatos'));
+        return draconicList.filter(it => !RdDItemCompetence.isThanatos(it));
     }
     return [RdDItemCompetence.getVoieDraconic(draconicList, sort.system.draconic)];
   }
@@ -2556,11 +2546,13 @@ export class RdDActor extends Actor {
       if (rollData.competence.system.iscombat) {
         if (rollData.competence.system.ispossession) {
           RdDPossession.onAttaquePossession(this, rollData.competence)
-        } else {
+          return
+        }
+        else if (RdDCombat.getTarget()) {
           const arme = RdDItemCompetenceCreature.toActionArme(rollData.competence)
           RdDCombat.createUsingTarget(this)?.attaque(competence, arme)
+          return
         }
-        return
       }
       // Fake competence pour créature
       RdDItemCompetenceCreature.setRollDataCreature(rollData)
@@ -3179,7 +3171,17 @@ export class RdDActor extends Actor {
       ui.notifications.warn("Le joueur ou le MJ est déja dans les Terres Médianes avec ce personnage ! Visualisation uniquement");
       mode = "visu"; // bascule le mode en visu automatiquement
     }
+    RdDConfirm.confirmer({
+      bypass: mode == 'visu',
+      settingConfirmer: "confirmation-tmr",
+      content: `<p>Voulez vous monter dans les TMR en mode ${mode}?</p>`,
+      title: 'Confirmer la montée dans les TMR',
+      buttonLabel: 'Monter dans les TMR',
+      onAction: async () => await this._doDisplayTMR(mode)
+    });
+  }
 
+  async _doDisplayTMR(mode) {
     let isRapide = mode == "rapide";
     if (mode != "visu") {
       let minReveValue = (isRapide && !EffetsDraconiques.isDeplacementAccelere(this) ? 3 : 2) + this.countMonteeLaborieuse();
@@ -3259,7 +3261,6 @@ export class RdDActor extends Actor {
       let update = { _id: item.id, "system.equipe": isEquipe };
       await this.updateEmbeddedDocuments('Item', [update]);
       this.computeEncombrementTotalEtMalusArmure(); // Mise à jour encombrement
-      this.computePrixTotalEquipement(); // Mis à jour du prix total de l'équipement
       if (isEquipe)
         this.verifierForceMin(item);
     }
@@ -3330,20 +3331,39 @@ export class RdDActor extends Actor {
   }
 
   /* -------------------------------------------- */
-  async encaisserDommages(rollData, attacker = undefined, defenderRoll = undefined) {
+  async encaisserDommages(rollData, attacker = undefined, show = undefined) {
     if (attacker && !await attacker.accorder(this, 'avant-encaissement')) {
       return;
     }
+    this.validerEncaissement(rollData, show);
+  }
 
-    console.log("encaisserDommages", rollData)
+  async validerEncaissement(rollData, show) {
+    if (ReglesOptionelles.isUsing('validation-encaissement-gr') && !game.user.isGM) {
+        RdDActor.remoteActorCall({
+          actorId: this.id,
+          method: 'validerEncaissement',
+          args: [rollData, show]
+        });
+        return;
+    }
+    const armure = await this.computeArmure(rollData);
+    if (ReglesOptionelles.isUsing('validation-encaissement-gr')) {
+      DialogValidationEncaissement.validerEncaissement(this, rollData, armure, show, (encaissement, show) => this._appliquerEncaissement(encaissement, show));
+    }
+    else {
+      let encaissement = await RdDUtility.jetEncaissement(rollData, armure, { showDice: SHOW_DICE });
+      await this._appliquerEncaissement(encaissement, show)
+    }
+  }
 
+  async _appliquerEncaissement(encaissement, show) {
     let santeOrig = duplicate(this.system.sante);
-    let encaissement = await this.jetEncaissement(rollData);
 
     this.ajouterBlessure(encaissement); // Will upate the result table
     const perteVie = this.isEntite()
       ? { newValue: 0 }
-      : await this.santeIncDec("vie", - encaissement.vie);
+      : await this.santeIncDec("vie", -encaissement.vie);
     const perteEndurance = await this.santeIncDec("endurance", -encaissement.endurance, encaissement.critiques > 0);
 
     this.computeEtatGeneral();
@@ -3356,7 +3376,7 @@ export class RdDActor extends Actor {
       jetEndurance: perteEndurance.jetEndurance,
       endurance: santeOrig.endurance.value - perteEndurance.newValue,
       vie: this.isEntite() ? 0 : (santeOrig.vie.value - perteVie.newValue),
-      show: defenderRoll?.show ?? {}
+      show: show ?? {}
     });
 
     await ChatUtility.createChatWithRollMode(this.name, {
@@ -3374,65 +3394,6 @@ export class RdDActor extends Actor {
     }
   }
 
-  /* -------------------------------------------- */
-  async jetEncaissement(rollData) {
-    let formula = "2d10";
-
-    // Chaque dé fait au minmum la difficulté libre
-    if (ReglesOptionelles.isUsing('degat-minimum-malus-libre')) {
-      if (rollData.diffLibre < 0) {
-        let valeurMin = Math.abs(rollData.diffLibre);
-        formula += "min" + valeurMin;
-      }
-    }
-    // Chaque dé fait au minmum la difficulté libre
-    if (ReglesOptionelles.isUsing('degat-ajout-malus-libre')) {
-      if (rollData.diffLibre < 0) {
-        let valeurMin = Math.abs(rollData.diffLibre);
-        formula += "+" + valeurMin;
-      }
-    }
-
-    let roll = await RdDDice.roll(formula);
-
-    // 1 dé fait au minmum la difficulté libre
-    if (ReglesOptionelles.isUsing('degat-minimum-malus-libre-simple')) {
-      if (rollData.diffLibre < 0) {
-        let valeurMin = Math.abs(rollData.diffLibre);
-        if (roll.terms[0].results[0].result < valeurMin) {
-          roll.terms[0].results[0].result = valeurMin;
-        } else if (roll.terms[0].results[1].result < valeurMin) {
-          roll.terms[0].results[1].result = valeurMin;
-        }
-        roll._total = roll.terms[0].results[0].result + roll.terms[0].results[1].result;
-      }
-    }
-
-    const armure = await this.computeArmure(rollData);
-    const jetTotal = roll.total + rollData.dmg.total - armure;
-
-    let encaissement = RdDUtility.selectEncaissement(jetTotal, rollData.dmg.mortalite)
-    let over20 = Math.max(jetTotal - 20, 0);
-    encaissement.dmg = rollData.dmg;
-    encaissement.dmg.loc = rollData.dmg.loc ?? await RdDUtility.getLocalisation(this.type);
-    encaissement.dmg.loc.label = encaissement.dmg.loc.label ?? 'Corps;'
-    encaissement.roll = roll;
-    encaissement.armure = armure;
-    encaissement.total = jetTotal;
-    encaissement.vie = await RdDActor._evaluatePerte(encaissement.vie, over20);
-    encaissement.endurance = await RdDActor._evaluatePerte(encaissement.endurance, over20);
-    encaissement.penetration = rollData.arme?.system.penetration ?? 0;
-
-    return encaissement;
-  }
-
-  /* -------------------------------------------- */
-  static async _evaluatePerte(formula, over20) {
-    let perte = new Roll(formula, { over20: over20 });
-    await perte.evaluate({ async: true });
-    return perte.total;
-  }
-
   /* -------------------------------------------- */
   ajouterBlessure(encaissement) {
     if (this.type == 'entite') return; // Une entité n'a pas de blessures
@@ -3598,33 +3559,11 @@ export class RdDActor extends Actor {
 
   /* -------------------------------------------- */
   getFortune() {
-    let monnaies = this.itemTypes['monnaie'];
-    if (monnaies.length < 4) {
-      ui.notifications.error("Problème de monnaies manquantes, impossible de payer correctement!")
-      throw "Problème de monnaies manquantes, impossible de payer correctement!";
-    }
-    return monnaies.map(m => Number(m.system.valeur_deniers) * Number(m.system.quantite))
+    return this.itemTypes['monnaie']
+      .map(m => Number(m.system.valeur_deniers) * Number(m.system.quantite))
       .reduce(Misc.sum(), 0);
   }
 
-  /* -------------------------------------------- */
-  async optimizeArgent(fortuneTotale) {
-    let monnaies =  this.itemTypes['monnaie'];
-    let parValeur = Misc.classifyFirst(monnaies, it => it.system.valeur_deniers);
-    let nouvelleFortune = {
-      1000: Math.floor(fortuneTotale / 1000), // or
-      100: Math.floor(fortuneTotale / 100) % 10, // argent
-      10: Math.floor(fortuneTotale / 10) % 10, // bronze
-      1: fortuneTotale % 10 // étain
-    }
-    console.log('RdDActor.optimizeArgent', fortuneTotale, 'nouvelleFortune', nouvelleFortune, 'monnaie_par_valeur', parValeur);
-    let updates = [];
-    for (const [valeur, nombre] of Object.entries(nouvelleFortune)) {
-      updates.push({ _id: parValeur[valeur].id, 'system.quantite': nombre });
-    }
-    await this.updateEmbeddedDocuments('Item', updates);
-  }
-
   /* -------------------------------------------- */
   async depenserDeniers(depense, dataObj = undefined, quantite = 1, toActorId) {
     depense = Number(depense);
@@ -3641,10 +3580,9 @@ export class RdDActor extends Actor {
     }
     else {
       if (fortune >= depense) {
-        fortune -= depense;
         const toActor = game.actors.get(toActorId)
         await toActor?.ajouterDeniers(depense, this.id);
-        await this.optimizeArgent(fortune);
+        await Monnaie.optimiser(this, fortune - depense);
         msg = `Vous avez payé <strong>${depense} Deniers</strong>${toActor ? " à " + toActor.name : ''}, qui ont été soustraits de votre argent.`;
         RdDAudio.PlayContextAudio("argent"); // Petit son
 
@@ -3667,18 +3605,19 @@ export class RdDActor extends Actor {
   }
 
   async depenser(depense) {
-    depense = Number(depense);
-    let fortune = this.getFortune();
-    let reste = fortune - depense;
+    let reste = this.getFortune() - Number.parseInt(depense);
     if (reste >= 0) {
-      fortune -= depense;
-      await this.optimizeArgent(fortune);
+      await Monnaie.optimiser(this, reste);
     }
     return reste;
   }
 
   async ajouterDeniers(gain, fromActorId = undefined) {
     gain = Number.parseInt(gain);
+    if (gain < 0) {
+      ui.notifications.error(`Impossible d'ajouter un gain de ${gain} <0`);
+      return;
+    }
     if (gain == 0) {
       return;
     }
@@ -3691,9 +3630,7 @@ export class RdDActor extends Actor {
     }
     else {
       const fromActor = game.actors.get(fromActorId)
-      let fortune = this.getFortune();
-      fortune += gain;
-      await this.optimizeArgent(fortune);
+      await Monnaie.optimiser(this, gain + this.getFortune());
 
       RdDAudio.PlayContextAudio("argent"); // Petit son
       ChatMessage.create({
@@ -3723,8 +3660,7 @@ export class RdDActor extends Actor {
         actorId: achat.vendeurId ?? achat.acheteurId,
         method: 'achatVente',
         args: [achat]
-      },
-      );
+      });
       return;
     }
 
@@ -3732,8 +3668,8 @@ export class RdDActor extends Actor {
     const vendeur = achat.vendeurId ? game.actors.get(achat.vendeurId) : undefined;
     const messageVente = game.messages.get(achat.chatMessageIdVente);
     const html = await messageVente.getHTML();
-    const buttonAcheter = html.find(".button-acheter")[0];
-    const vente = DialogItemAchat.prepareVenteData(buttonAcheter, achat.vendeurId, vendeur, acheteur);
+    const button = html.find(".button-acheter")[0];
+    const vente = DialogItemAchat.venteData(button);
     const itemId = vente.item._id;
     const isItemEmpilable = "quantite" in vente.item.system;
 
@@ -4134,7 +4070,7 @@ export class RdDActor extends Actor {
 
   /* -------------------------------------------- */
   async setEffect(statusId, status) {
-    if (this.isEntite() || this.type == 'vehicule') {
+    if (this.isEntite() || this.isVehicule()) {
       return;
     }
     console.log("setEffect", statusId, status)
@@ -4164,7 +4100,7 @@ export class RdDActor extends Actor {
 
   /* -------------------------------------------- */
   async onPreUpdateItem(item, change, options, id) {
-    if (item.type == 'competence' && item.system.defaut_carac && item.system.xp) {
+    if (item.isCompetencePersonnage() && item.system.defaut_carac && item.system.xp) {
       await this.checkCompetenceXP(item.name, item.system.xp);
     }
   }

module/chat-utility.js

@@ -129,7 +129,7 @@ export class ChatUtility {
 
   /* -------------------------------------------- */
   static getUsers(filter) {
-    return Misc.getUsers().filter(filter).map(user => user.id);
+    return game.users.filter(filter).map(user => user.id);
   }
 
   /* -------------------------------------------- */

module/dialog-item-achat.js

@@ -1,34 +1,52 @@
 
+import { Monnaie } from "./item-monnaie.js";
 import { Misc } from "./misc.js";
 import { RdDUtility } from "./rdd-utility.js";
 
 export class DialogItemAchat extends Dialog {
 
-  static async onButtonAcheter(event) {
-    const buttonAcheter = event.currentTarget;
-    if (!buttonAcheter.attributes['data-jsondata']?.value) {
-      ui.notifications.warn("Impossible d'acheter: informations sur l'objet manquantes")
-      return;
-    }
-    const chatMessageIdVente = RdDUtility.findChatMessageId(buttonAcheter);
-
-    const vendeurId = buttonAcheter.attributes['data-vendeurId']?.value;
+  static venteData(button) {
+    const vendeurId = button.attributes['data-vendeurId']?.value;
     const vendeur = vendeurId ? game.actors.get(vendeurId) : undefined;
     const acheteur = RdDUtility.getSelectedActor();
-
+    const json = button.attributes['data-jsondata']?.value;
     if (!acheteur && !vendeur) {
       ui.notifications.info("Pas d'acheteur ni de vendeur, aucun changement");
-      return;
+      return undefined;
+    }
+    if (!json) {
+      ui.notifications.warn("Impossible d'acheter: informations sur l'objet manquantes")
+      return undefined;
     }
 
-    let venteData = DialogItemAchat.prepareVenteData(buttonAcheter, vendeurId, vendeur, acheteur);
+    const prixLot = Monnaie.arrondiDeniers(button.attributes['data-prixLot']?.value ?? 0);
+    return {
+      item: json ? JSON.parse(json) : undefined,
+      vendeurId: vendeurId,
+      vendeur: vendeur,
+      acheteur: acheteur,
+      tailleLot: parseInt(button.attributes['data-tailleLot']?.value ?? 1),
+      quantiteIllimite: button.attributes['data-quantiteIllimite']?.value == 'true',
+      quantiteNbLots: parseInt(button.attributes['data-quantiteNbLots']?.value),
+      choix: {
+        nombreLots: 1,
+        seForcer: false,
+        supprimerSiZero: true
+      },
+      prixLot: prixLot,
+      prixTotal: prixLot,
+      isVente: prixLot > 0,
+      chatMessageIdVente: RdDUtility.findChatMessageId(button)
+    };
+  }
+  static async onAcheter(venteData) {
     const html = await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/dialog-item-achat.html`, venteData);
-    const dialog = new DialogItemAchat(html, vendeur, acheteur, venteData, chatMessageIdVente);
+    const dialog = new DialogItemAchat(html, venteData);
     dialog.render(true);
   }
 
-  constructor(html, vendeur, acheteur, venteData, chatMessageIdVente) {
-    const isConsommable = venteData.item.type == 'nourritureboisson';
+  constructor(html, venteData) {
+    const isConsommable = venteData.item.type == 'nourritureboisson' && venteData.acheteur?.isPersonnage();
     let options = { classes: ["dialogachat"], width: 400, height: isConsommable ? 450 : 350, 'z-index': 99999 };
 
     const actionAchat = venteData.prixLot > 0 ? "Acheter" : "Prendre";
@@ -47,42 +65,17 @@ export class DialogItemAchat extends Dialog {
 
     super(conf, options);
 
-    this.vendeur = vendeur;
-    this.acheteur = acheteur;
-    this.chatMessageIdVente = chatMessageIdVente;
     this.venteData = venteData;
   }
 
-  static prepareVenteData(buttonAcheter, vendeurId, vendeur, acheteur) {
-    const jsondata = buttonAcheter.attributes['data-jsondata']?.value;
-    const prixLot = parseInt(buttonAcheter.attributes['data-prixLot']?.value ?? 0);
-    return {
-      item: JSON.parse(jsondata),
-      vendeurId: vendeurId,
-      vendeur: vendeur,
-      acheteur: acheteur,
-      tailleLot: parseInt(buttonAcheter.attributes['data-tailleLot']?.value ?? 1),
-      quantiteIllimite: buttonAcheter.attributes['data-quantiteIllimite']?.value == 'true',
-      quantiteNbLots: parseInt(buttonAcheter.attributes['data-quantiteNbLots']?.value),
-      choix: {
-        nombreLots: 1,
-        seForcer: false,
-        supprimerSiZero: true
-      },
-      prixLot: prixLot,
-      prixTotal: prixLot,
-      isVente: prixLot > 0
-    };
-  }
-
   async onAchat() {
     await $(".nombreLots").change();
-    (this.vendeur ?? this.acheteur).achatVente({
+    (this.venteData.vendeur ?? this.venteData.acheteur).achatVente({
       userId: game.user.id,
-      vendeurId: this.vendeur?.id,
-      acheteurId: this.acheteur?.id,
+      vendeurId: this.venteData.vendeur?.id,
+      acheteurId: this.venteData.acheteur?.id,
       prixTotal: this.venteData.prixTotal,
-      chatMessageIdVente: this.chatMessageIdVente,
+      chatMessageIdVente: this.venteData.chatMessageIdVente,
       choix: this.venteData.choix
     });
   }

module/dialog-item-vente.js

@@ -3,7 +3,7 @@ import { Misc } from "./misc.js";
 
 export class DialogItemVente extends Dialog {
 
-  static async create(item, callback) {
+  static async display(item, callback) {
     const quantite = item.isConteneur() ? 1 : item.system.quantite;
     const venteData = {
       item: item,
@@ -20,7 +20,7 @@ export class DialogItemVente extends Dialog {
       isOwned: item.isOwned,
     };
     const html = await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/dialog-item-vente.html`, venteData);
-    return new DialogItemVente(venteData, html, callback);
+    return new DialogItemVente(venteData, html, callback).render(true);
   }
 
   constructor(venteData, html, callback) {

module/dialog-validation-encaissement.js

@@ -0,0 +1,70 @@
+import { HIDE_DICE, SHOW_DICE } from "./constants.js";
+import { RdDUtility } from "./rdd-utility.js";
+
+/**
+ * Extend the base Dialog entity by defining a custom window to perform roll.
+ * @extends {Dialog}
+ */
+export class DialogValidationEncaissement extends Dialog {
+
+  static async validerEncaissement(actor, rollData, armure, show, 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,
+      show: show
+    });
+    const dialog = new DialogValidationEncaissement(html, actor, rollData, armure, encaissement, show, onEncaisser);
+    dialog.render(true);
+  }
+
+  /* -------------------------------------------- */
+  constructor(html, actor, rollData, armure, encaissement, show, onEncaisser) {
+    // Common conf
+    let buttons = {
+      "valider": { label: "Valider", callback: html => this.validerEncaissement() },
+      "annuler": { label: "Annuler", callback: html => { } },
+    };
+
+    let dialogConf = {
+      title: "Validation d'encaissement",
+      content: html,
+      buttons: buttons,
+      default: "valider"
+    }
+
+    let dialogOptions = {
+      classes: ["rdddialog"],
+      width: 350,
+      height: 290
+    }
+
+    // Select proper roll dialog template and stuff
+    super(dialogConf, dialogOptions);
+
+    this.actor = actor
+    this.rollData = rollData;
+    this.armure = armure;
+    this.encaissement = encaissement;
+    this.show = show;
+    this.onEncaisser = onEncaisser;
+    this.forceDiceResult = {total: encaissement.roll.result };
+  }
+
+  /* -------------------------------------------- */
+  activateListeners(html) {
+    super.activateListeners(html);
+    html.find('input.encaissement-roll-result').keyup(async event => {
+      this.forceDiceResult.total = event.currentTarget.value;
+      this.encaissement = await RdDUtility.jetEncaissement(this.rollData, this.armure, { showDice: HIDE_DICE, forceDiceResult: this.forceDiceResult});
+      $('label.encaissement-total').text(this.encaissement.total);
+      $('label.encaissement-blessure').text(this.encaissement.blessures)
+    });
+  }
+
+  async validerEncaissement() {
+    this.encaissement = await RdDUtility.jetEncaissement(this.rollData, this.armure, { showDice: SHOW_DICE, forceDiceResult: this.forceDiceResult});
+    this.onEncaisser(this.encaissement, this.show)
+  }
+}

module/item-competence.js

@@ -57,8 +57,8 @@ const competence_xp_cumul = _buildCumulXP();
 export class RdDItemCompetence extends Item {
 
   /* -------------------------------------------- */
-  static actorCompendium(actorType) {
-    return compendiumCompetences[actorType];
+  static actorCompendium(actorType = undefined) {
+    return compendiumCompetences[actorType ?? 'personnage'];
   }
 
   /* -------------------------------------------- */
@@ -89,22 +89,28 @@ export class RdDItemCompetence extends Item {
 
   /* -------------------------------------------- */
   static isCompetenceArme(competence) {
-    switch (competence.system.categorie) {
-      case 'melee':
-        return competence.name != 'Esquive';
-      case 'tir':
-      case 'lancer':
-        return true;
+    if (competence.isCompetence()) {
+      switch (competence.system.categorie) {
+        case 'melee':
+          return !Grammar.toLowerCaseNoAccent(competence.name).includes('esquive');
+        case 'tir':
+        case 'lancer':
+          return true;
+      }
     }
     return false;
   }
 
   /* -------------------------------------------- */
   static isArmeUneMain(competence) {
-    return competence.name.toLowerCase().includes("1 main");
+    return RdDItemCompetence.isCompetenceArme(competence) && competence.name.toLowerCase().includes("1 main");
   }
   static isArme2Main(competence) {
-    return competence.name.toLowerCase().includes("2 main");
+    return RdDItemCompetence.isCompetenceArme(competence) && competence.name.toLowerCase().includes("2 main");
+  }
+
+  static isThanatos(competence) {
+    return competence.isCompetencePersonnage() && Grammar.toLowerCaseNoAccent(competence.name).includes('thanatos');
   }
 
   /* -------------------------------------------- */
@@ -133,7 +139,7 @@ export class RdDItemCompetence extends Item {
 
   /* -------------------------------------------- */
   static computeXP(competence) {
-    const factor = competence.name.includes('Thanatos') ? 2 : 1; // Thanatos compte double !
+    const factor = RdDItemCompetence.isThanatos(competence) ? 2 : 1; // Thanatos compte double !
     const xpNiveau = RdDItemCompetence.computeDeltaXP(competence.system.base, competence.system.niveau ?? competence.system.base);
     const xp = competence.system.xp ?? 0;
     const xpSort = competence.system.xp_sort ?? 0;
@@ -213,21 +219,14 @@ export class RdDItemCompetence extends Item {
     if (idOrName == undefined) {
       return undefined;
     }
-    options = mergeObject(options, {
-      preFilter: it => RdDItemCompetence.isCompetence(it),
-      description: 'compétence',
-    });
-    return list.find(it => it.id == idOrName && RdDItemCompetence.isCompetence(it))
+    options = mergeObject(options, { preFilter: it => it.isCompetence(), description: 'compétence', });
+    return list.find(it => it.id == idOrName && it.isCompetence())
       ?? Misc.findFirstLike(idOrName, list, options);
   }
 
   /* -------------------------------------------- */
   static findCompetences(list, name) {
-    return Misc.findAllLike(name, list, { filter: it => RdDItemCompetence.isCompetence(it), description: 'compétence' });
-  }
-
-  static isCompetence(item) {
-    return item.type == 'competence' || item.type == 'competencecreature';
+    return Misc.findAllLike(name, list, { filter: it => it.isCompetence(), description: 'compétence' });
   }
 
   /* -------------------------------------------- */

module/item-monnaie.js

@@ -1,44 +1,32 @@
 import { Misc } from "./misc.js";
-import { LOG_HEAD, SYSTEM_RDD } from "./constants.js";
+import { LOG_HEAD } from "./constants.js";
 
-const MONNAIES_STANDARD = [
-  {
-    name: "Etain (1 denier)", type: 'monnaie',
-    img: "systems/foundryvtt-reve-de-dragon/icons/objets/piece_etain_poisson.webp",
-    system: { quantite: 0, valeur_deniers: 1, encombrement: 0.001, description: "" }
-  },
-  {
-    name: "Bronze (10 deniers)", type: 'monnaie',
-    img: "systems/foundryvtt-reve-de-dragon/icons/objets/piece_bronze_epees.webp",
-    system: { quantite: 0, valeur_deniers: 10, encombrement: 0.002, description: "" }
-  },
-  {
-    name: "Argent (1 sol)", type: 'monnaie',
-    img: "systems/foundryvtt-reve-de-dragon/icons/objets/piece_argent_sol.webp",
-    system: { quantite: 0, valeur_deniers: 100, encombrement: 0.003, description: "" }
-  },
-  {
-    name: "Or (10 sols)", type: 'monnaie',
-    img: "systems/foundryvtt-reve-de-dragon/icons/objets/piece_or_sol.webp",
-    system: { quantite: 0, valeur_deniers: 1000, encombrement: 0.004, description: "" }
-  }
-]
-const VALEURS_STANDARDS = MONNAIES_STANDARD.map(it =>it.system.valeur_deniers);
+const MONNAIE_ETAIN = {
+  name: "Etain (1 denier)", type: 'monnaie',
+  img: "systems/foundryvtt-reve-de-dragon/icons/objets/piece_etain_poisson.webp",
+  system: { quantite: 0, valeur_deniers: 1, encombrement: 0.001, description: "" }
+};
+const MONNAIE_BRONZE = {
+  name: "Bronze (10 deniers)", type: 'monnaie',
+  img: "systems/foundryvtt-reve-de-dragon/icons/objets/piece_bronze_epees.webp",
+  system: { quantite: 0, valeur_deniers: 10, encombrement: 0.002, description: "" }
+};
+const MONNAIE_ARGENT = {
+  name: "Argent (1 sol)", type: 'monnaie',
+  img: "systems/foundryvtt-reve-de-dragon/icons/objets/piece_argent_sol.webp",
+  system: { quantite: 0, valeur_deniers: 100, encombrement: 0.003, description: "" }
+};
+const MONNAIE_OR = {
+  name: "Or (10 sols)", type: 'monnaie',
+  img: "systems/foundryvtt-reve-de-dragon/icons/objets/piece_or_sol.webp",
+  system: { quantite: 0, valeur_deniers: 1000, encombrement: 0.004, description: "" }
+};
+
+const MONNAIES_STANDARD = [MONNAIE_ETAIN, MONNAIE_BRONZE, MONNAIE_ARGENT, MONNAIE_OR];
 
 export class Monnaie {
 
-  static isSystemMonnaie(item, items) {
-    if (item.type == 'monnaie')    {
-      const valeur = item.system.valeur_deniers;
-      if (VALEURS_STANDARDS.includes(valeur)) {
-        const monnaiesDeValeur = items.filter(it => it.type == 'monnaie' && it.system.valeur_deniers == valeur)
-        return monnaiesDeValeur.length<=1;
-      }
-    }
-    return false;
-  }
-
-  static monnaiesData() {
+  static monnaiesStandard() {
     return MONNAIES_STANDARD;
   }
 
@@ -56,10 +44,47 @@ export class Monnaie {
   }
 
   static arrondiDeniers(sols) {
-    return sols.toFixed(2);
+    return Number(sols).toFixed(2);
   }
 
   static triValeurDenier() {
     return Misc.ascending(item => item.system.valeur_deniers)
   }
+
+  static async creerMonnaiesStandard(actor) {
+    await actor.createEmbeddedDocuments('Item', MONNAIES_STANDARD, { renderSheet: false });
+  }
+
+  static async creerMonnaiesDeniers(actor, fortune) {
+    await actor.createEmbeddedDocuments('Item', [Monnaie.creerDeniers(fortune)], { renderSheet: false });
+  }
+
+  static creerDeniers(fortune) {
+    const deniers = duplicate(MONNAIE_ETAIN);
+    deniers.system.quantite = fortune;
+    return deniers;
+  }
+
+  static async optimiser(actor, fortune) {
+    let reste = fortune;
+    let monnaies = actor.itemTypes['monnaie'];
+    let updates = [];
+    let parValeur = Misc.classifyFirst(monnaies, it => it.system.valeur_deniers);
+    for (let valeur of  [1000, 100, 10, 1]) {
+      if (parValeur[valeur]) {
+        const piecesDeCetteValeur = Math.floor(reste / valeur);
+        updates.push({ _id: parValeur[valeur].id, 'system.quantite': piecesDeCetteValeur });
+        reste -= piecesDeCetteValeur*valeur;
+      }
+    }
+    console.log('Monnaie.optimiser', actor.name, 'total', fortune, 'parValeur', parValeur, 'updates', updates, 'reste', reste);
+    if (updates.length > 0) {
+      await actor.updateEmbeddedDocuments('Item', updates);
+    }
+    if (reste>0){
+      // créer le reste en deniers fortune en deniers
+      await Monnaie.creerMonnaiesDeniers(actor, reste);
+    }
+  }
+
 }

module/item-sheet.js

@@ -90,11 +90,10 @@ export class RdDItemSheet extends ItemSheet {
     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 = await RdDUtility.loadCompendium('foundryvtt-reve-de-dragon.competences')
+      formData.competences = await RdDUtility.loadItems(it => it.isCompetencePersonnage(), RdDItemCompetence.actorCompendium(this.actor?.type))
     }
     if (this.item.type == 'arme') {
-      formData.competences = await RdDUtility.loadCompendium('foundryvtt-reve-de-dragon.competences', it => RdDItemCompetence.isCompetenceArme(it));
-      console.log(formData.competences)
+      formData.competences = await RdDUtility.loadItems(it => RdDItemCompetence.isCompetenceArme(it),  RdDItemCompetence.actorCompendium(this.actor?.type))
     }
     if (this.item.type == 'recettecuisine') {
       formData.ingredients =  await TextEditor.enrichHTML(this.object.system.ingredients, {async: true})
@@ -115,7 +114,7 @@ export class RdDItemSheet extends ItemSheet {
         formData.system.prdate = this.dateUpdated;
         this.dateUpdated = undefined;
       }
-      RdDHerbes.updatePotionData(formData);
+      await RdDHerbes.updatePotionData(formData);
     }
     if (formData.isOwned && this.item.type == 'herbe' && (formData.system.categorie == 'Soin' || formData.system.categorie == 'Repos')) {
       formData.isIngredientPotionBase = true;
@@ -160,7 +159,7 @@ export class RdDItemSheet extends ItemSheet {
     html.find(".categorie").change(event => this._onSelectCategorie(event));
 
     html.find('.sheet-competence-xp').change((event) => {
-      if (this.item.type == 'competence') {
+      if (this.item.isCompetencePersonnage()) {
         RdDUtility.checkThanatosXP(this.item.name);
       }
     });

module/item.js

@@ -1,16 +1,35 @@
 import { DialogItemVente } from "./dialog-item-vente.js";
 import { Grammar } from "./grammar.js";
-import { Misc } from "./misc.js";
 import { RdDHerbes } from "./rdd-herbes.js";
 import { RdDUtility } from "./rdd-utility.js";
 
-const typesObjetsEquipement = ["objet", "arme", "armure", "gemme", "conteneur", "herbe", "ingredient", "livre", "potion", "munition", "nourritureboisson", "monnaie"]
+const typesObjetsEquipement = [
+  "arme",
+  "armure",
+  "conteneur",
+  "gemme",
+  "herbe",
+  "ingredient",
+  "livre",
+  "monnaie",
+  "munition",
+  "nourritureboisson",
+  "objet",
+  "potion",
+]
 const typesObjetsOeuvres = ["oeuvre", "recettecuisine", "musique", "chant", "danse", "jeu"]
-const encBrin = 0.00005;// un brin = 1 décigramme = 1/10g = 1/10000kg = 1/20000 enc
+const typesObjetsDraconiques = ["queue", "ombre", "souffle", "tete", "signedraconique", "sortreserve"]
+const typesObjetsConnaissance = ["meditation", "recettealchimique", "sort"]
+const typesObjetsEffet = ["possession", "poison", "maladie"]
+const typesObjetsCompetence = ["competence", "competencecreature"]
+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/ 
+   */
 
 export const defaultItemImg = {
   competence: "systems/foundryvtt-reve-de-dragon/icons/competence_defaut.webp",
-  compcreature: "systems/foundryvtt-reve-de-dragon/icons/competence_defaut.webp",
+  competencecreature: "systems/foundryvtt-reve-de-dragon/icons/competence_defaut.webp",
   arme: "systems/foundryvtt-reve-de-dragon/icons/armes_armures/epee_gnome.webp",
   armure: "systems/foundryvtt-reve-de-dragon/icons/armes_armures/armure_plaques.webp",
   conteneur: "systems/foundryvtt-reve-de-dragon/icons/objets/sac_a_dos.webp",
@@ -50,7 +69,7 @@ export class RdDItem extends Item {
     super(itemData, context);
   }
 
-  static getTypeObjetsEquipement() {
+  static getTypesObjetsEquipement() {
     return typesObjetsEquipement
   }
 
@@ -58,14 +77,41 @@ export class RdDItem extends Item {
     return typesObjetsOeuvres
   }
 
-  isCompetence() {
-    return this.type == 'competence';
+  isCompetencePersonnage() {
+    return this.type == 'competence'
+  }
+  isCompetence() {
+    return typesObjetsCompetence.includes(this.type)
+  }
+  isEquipement() {
+    return typesObjetsEquipement.includes(this.type)
+  }
+  isOeuvre() {
+    return typesObjetsOeuvres.includes(this.type)
+  }
+  isDraconique() {
+    return typesObjetsDraconiques.includes(this.type)
+  }
+  isEffet() {
+    return typesObjetsEffet.includes(this.type)
+  }
+  isConnaissance() {
+    return typesObjetsConnaissance.includes(this.type)
   }
-
   isConteneur() {
     return this.type == 'conteneur';
   }
 
+  getItemGroup() {
+    if (this.isEquipement()) return "equipement";
+    if (this.isOeuvre()) return "oeuvre";
+    if (this.isDraconique()) return "draconique";
+    if (this.isConnaissance()) return "connaissance";
+    if (this.isEffet()) return "effet";
+    if (this.isCompetence()) return "competence";
+    return "autres";
+  }
+
   isConteneurNonVide() {
     return this.isConteneur() && (this.system.contenu?.length ?? 0) > 0;
   }
@@ -87,11 +133,6 @@ export class RdDItem extends Item {
   isPotion() {
     return this.type == 'potion';
   }
-
-  isEquipement() {
-    return RdDItem.getTypeObjetsEquipement().includes(this.type)
-  }
-
   isCristalAlchimique() {
     return this.type == 'objet' && Grammar.toLowerCaseNoAccent(this.name) == 'cristal alchimique' && this.system.quantite > 0;
   }
@@ -100,22 +141,36 @@ export class RdDItem extends Item {
     return this.system.magique
   }
 
-  getEncTotal() {
-    return Number(this.system.encombrement ?? 0) * Number(this.system.quantite ?? 1)
+  getQuantite() {
+    return Math.round(this.isConteneur() ? 1 : (this.system.quantite ?? 0))
   }
+
+  getEncTotal() {
+    return this.getEnc() * this.getQuantite();
+  }  
+
   getEnc() {
     switch (this.type) {
       case 'herbe':
         return encBrin;
+      case 'gemme':
+        return encPepin * this.system.taille;
     }
-    return this.system.encombrement ?? 0;
+    return Math.max(this.system.encombrement ?? 0, 0);
+  }
+
+  prixTotalDeniers() {
+    return this.getQuantite() * this.valeurDeniers()
+  }
+
+  valeurDeniers() {
+    return Math.max(Math.round(this.system.cout ? (this.system.cout * 100) : (this.system.valeur_deniers ?? 0)), 0) 
   }
 
   prepareDerivedData() {
     super.prepareDerivedData();
     if (this.isEquipement()) {
-      this._calculsEquipement();
-
+      this.system.encTotal = this.getEncTotal();
       if (this.isPotion()) {
         this.prepareDataPotion()
       }
@@ -128,23 +183,12 @@ export class RdDItem extends Item {
     this.system.magique = categorie.includes('enchante');
     if (this.system.magique) {
       if (categorie.includes('soin') || categorie.includes('repos')) {
-        // TODO: utiliser calculePointsRepos / calculePointsGuerison
-        this.system.puissance = RdDHerbes.calculePuissancePotion(this);
+        // TODO: utiliser calculPointsRepos / calculPointsGuerison
+        this.system.puissance = RdDHerbes.calculPuissancePotion(this);
       }
     }
   }
 
-  _calculsEquipement() {
-    const quantite = this.isConteneur() ? 1 : (this.system.quantite ?? 0);
-    const enc = this.getEnc();
-    if (enc != undefined) {
-      this.system.encTotal = Math.max(enc, 0) * quantite;
-    }
-    if (this.cout != undefined) {
-      this.system.prixTotal = Math.max(this.cout, 0) * quantite;
-    }
-  }
-
   getActionPrincipale(options = { warnIfNot: true }) {
     const warn = options.warnIfNot;
     switch (this.type) {
@@ -202,18 +246,18 @@ export class RdDItem extends Item {
     if (!other || !this.isEquipement()) return undefined;
 
     let message = undefined;
-    if (this.type != other.type) {
-      message = `Impossible de regrouper ${this.type} avec ${other.type}`;
+    if (this.system.quantite == undefined) {
+      message = `Impossible de regrouper des ${this.type}, ils ne sont pas empilables`;
+    } 
+    else if (this.type != other.type) {
+      message = `Impossible de regrouper des ${this.type} avec des ${other.type}`;
     }
     else if (this.name != other.name) {
       message = `Impossible de regrouper ${this.name} avec ${other.name}`;
     }
-    else if (this.system.quantite == undefined) {
-      message = `Impossible de regrouper des ${this.type}, ils ne sont pas empilables`;
-    } 
     else {
       const differences = Object.entries(this.system)
-        .filter(([key, value]) => !['quantite', 'encTotal', 'prixTotal', 'cout'].includes(key) && value != other.system[key]);
+        .filter(([key, value]) => !['quantite', 'cout'].includes(key) && value != other.system[key]);
       if (differences.length > 0) {
         message = `Impossible de regrouper les ${this.type} ${this.name}: `;
         for (const [key, value] of differences) {
@@ -227,26 +271,23 @@ export class RdDItem extends Item {
   async proposerVente() {
     console.log(this);
     if (this.isConteneurNonVide()) {
-      ui.notifications.warn(`Votre ${this.name} n'est pas vide, pas possible de le donner ou le vendre`);
+      ui.notifications.warn(`Votre ${this.name} n'est pas vide, pas possible de le proposer`);
       return;
     }
-    const dialog = await DialogItemVente.create(this, (vente) => this._onProposerVente(vente))
-    dialog.render(true);
-  }
-
-  async _onProposerVente(venteData) {
-    venteData["properties"] = this.getProprietes();
-    if (venteData.isOwned) {
-      if (venteData.quantiteNbLots * venteData.tailleLot > venteData.quantiteMax) {
-        ui.notifications.warn(`Vous avez ${venteData.quantiteMax} ${venteData.item.name}, ce n'est pas suffisant pour vendre ${venteData.quantiteNbLots} de ${venteData.tailleLot}`)
-        return;
+    await DialogItemVente.display(this, async (vente) =>  {
+      vente["properties"] = this.getProprietes();
+      if (vente.isOwned) {
+        if (vente.quantiteNbLots * vente.tailleLot > vente.quantiteMax) {
+          ui.notifications.warn(`Vous avez ${vente.quantiteMax} ${vente.item.name}, ce n'est pas suffisant pour vendre ${vente.quantiteNbLots} de ${vente.tailleLot}`)
+          return;
+        }
       }
-    }
-    venteData.jsondata = JSON.stringify(venteData.item);
-
-    console.log(venteData);
-    let html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-vente-item.html', venteData);
-    ChatMessage.create(RdDUtility.chatDataSetup(html));
+      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));
+    });
   }
 
   /* -------------------------------------------- */

module/misc.js

@@ -105,17 +105,6 @@ export class Misc {
     return params.reduce((a, b) => a + separator + b);
   }
 
-
-  static getEntityTypeLabel(entity) {
-    const documentName = entity?.documentName
-    const type = entity?.type
-    if (documentName === 'Actor' || documentName === 'Item') {
-      const label = CONFIG[documentName]?.typeLabels?.[type] ?? type;
-      return game.i18n.has(label) ? game.i18n.localize(label) : t;
-    }
-    return type;
-  }
-
   static connectedGMOrUser(ownerId = undefined) {
     if (ownerId && game.user.id == ownerId) {
       return ownerId;
@@ -123,16 +112,12 @@ export class Misc {
     return Misc.firstConnectedGM()?.id ?? game.user.id;
   }
 
-  static getUsers() {
-    return game.version ? game.users : game.users.entities;
-  }
-
   static getActiveUser(id) {
-    return Misc.getUsers().find(u => u.id == id && u.active);
+    return game.users.find(u => u.id == id && u.active);
   }  
 
   static firstConnectedGM() {
-    return Misc.getUsers().filter(u => u.isGM && u.active).sort(Misc.ascending(u => u.id)).find(u => u.isGM && u.active);
+    return game.users.filter(u => u.isGM && u.active).sort(Misc.ascending(u => u.id)).find(u => u.isGM && u.active);
     
   }
 
@@ -153,7 +138,7 @@ export class Misc {
 
   /* -------------------------------------------- */
   static findPlayer(name) {
-    return Misc.findFirstLike(name, Misc.getUsers(), { description: 'joueur' });
+    return Misc.findFirstLike(name, game.users, { description: 'joueur' });
   }
 
   /* -------------------------------------------- */

module/rdd-calendrier.js

@@ -534,9 +534,7 @@ export class RdDCalendrier extends Application {
   async activateListeners(html) {
     super.activateListeners(html);
 
-    HtmlUtility._showControlWhen($(".gm-only"), game.user.isGM);
-
-    await this.updateDisplay();
+    this.updateDisplay();
 
     html.find('.calendar-btn').click(ev => this.onCalendarButton(ev));
 

module/rdd-carac.js

@@ -62,7 +62,7 @@ export class RdDCarac {
 
 
   static computeTotal(carac, beaute = undefined) {
-    const total = Object.values(carac).filter(c => !c.derivee)
+    const total = Object.values(carac ?? {}).filter(c => !c.derivee)
       .map(it => parseInt(it.value))
       .reduce(Misc.sum(), 0);
     const beauteSuperieur10 = Math.max((beaute ?? 10) - 10, 0);

module/rdd-combat.js

@@ -1,5 +1,5 @@
 import { ChatUtility } from "./chat-utility.js";
-import { ENTITE_INCARNE, ENTITE_NONINCARNE, HIDE_DICE, SYSTEM_RDD, SYSTEM_SOCKET_ID } from "./constants.js";
+import { ENTITE_BLURETTE, ENTITE_INCARNE, ENTITE_NONINCARNE, HIDE_DICE, SYSTEM_RDD, SYSTEM_SOCKET_ID } from "./constants.js";
 import { Grammar } from "./grammar.js";
 import { RdDItemArme } from "./item-arme.js";
 import { RdDItemCompetence } from "./item-competence.js";
@@ -351,6 +351,7 @@ export class RdDCombatManager extends Combat {
     game.combat.rollInitiative(combatantId, rollFormula, { initInfo: initInfo });
   }
 
+  /* -------------------------------------------- */
   static _baseInitOffset(categorie, arme) {
     if (categorie == "tir") { // Offset de principe pour les armes de jet
       return 8;
@@ -448,7 +449,7 @@ export class RdDCombat {
 
   /* -------------------------------------------- */
   static createUsingTarget(attacker) {
-    const target = RdDCombat.getTarget();
+    const target = RdDCombat.getTarget()
     if (target == undefined) {
       ui.notifications.warn((game.user.targets?.size ?? 0) > 1
         ? "Vous devez choisir <strong>une seule</strong> cible à attaquer!"
@@ -555,12 +556,12 @@ export class RdDCombat {
 
   /* -------------------------------------------- */
   constructor(attacker, defender, defenderTokenId, target) {
-    this.attacker = attacker;
-    this.defender = defender;
-    this.target = target;
-    this.attackerId = this.attacker.id;
-    this.defenderId = this.defender.id;
-    this.defenderTokenId = defenderTokenId;
+    this.attacker = attacker
+    this.defender = defender
+    this.target = target
+    this.attackerId = this.attacker.id
+    this.defenderId = this.defender.id
+    this.defenderTokenId = defenderTokenId
   }
 
   /* -------------------------------------------- */
@@ -686,8 +687,82 @@ export class RdDCombat {
     return rollData.rolled.isSuccess;
   }
 
+  /* -------------------------------------------- */
+  async proposerAjustementTirLancer( rollData ) {
+    if (['tir', 'lancer'].includes(rollData.competence.system.categorie)) {
+      if (this.defender.isEntite([ENTITE_BLURETTE])){
+        ChatMessage.create( {
+          content: `<strong>La cible est une blurette, l'arme à distance sera perdue dans le blurêve`,
+          whisper: ChatMessage.getWhisperRecipients("GM")})
+      }
+      else {
+        const defenderToken = canvas.tokens.get(this.defenderTokenId);
+        const dist = this.distance(_token, defenderToken)
+        const isVisible = this.isVisible(_token, defenderToken)
+        const portee = this._ajustementPortee(dist, rollData.arme)
+        const taille = this._ajustementTaille(this.defender)
+        const activite = this._ajustementMouvement(this.defender)
+        const total = [portee, taille, activite].map(it=>it.diff).filter(d => !Number.isNaN(d)).reduce(Misc.sum(), 0)
+        ChatMessage.create({
+          content: await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-info-distance.html', {
+            rollData: rollData,
+            attacker: _token,
+            isVisible: isVisible,
+            defender: defenderToken,
+            distance: dist,
+            portee: portee,
+            taille: taille,
+            activite: activite,
+            total: total
+          }),
+          whisper: ChatMessage.getWhisperRecipients("GM")
+        })
+      }
+    }
+  }
+
+  isVisible(token, defenderToken) {
+    return canvas.effects.visibility.testVisibility(defenderToken.center, { object: token })
+  }
+    
+  distance(token, defenderToken) {
+    return Number(canvas.grid.measureDistances([{ ray: new Ray(token.center, defenderToken.center) }], { gridSpaces: false })).toFixed(1);
+  }
+
+  _ajustementPortee(dist, arme) {
+    if (dist <= arme.system.portee_courte) return {msg:"courte", diff:0};
+    if (dist <= arme.system.portee_moyenne) return {msg: "moyenne" , diff: -3};
+    if (dist <= arme.system.portee_extreme) return {msg: "extrême", diff:-5};
+    return {msg: "inatteignable", diff: -10};
+  }
+
+  _ajustementTaille(actor) {
+    if (actor.isVehicule()) return {msg: "véhicule", diff: 0}
+    const taille = actor.getCaracByName('TAILLE')?.value ?? 1;
+    if (taille <= 1) return {msg: "souris", diff: -8};
+    if (taille <= 3) return {msg: "chat", diff: -4};
+    if (taille <= 5) return {msg: "chien", diff: -2};
+    if (taille <= 15) return {msg: "humanoïde", diff: 0};
+    if (taille <= 20) return {msg: "ogre", diff: 2};
+    return {msg: "gigantesque", diff: 4};
+  }
+  _ajustementMouvement(defender) {
+    if (defender.getSurprise(true)) return {msg: "immobile (surprise)", diff: 0};
+    if (game.combat?.combatants.find(it => it.actorId == defender.id)) return {msg: "en mouvement (combat)", diff: -4};
+    return {msg: "à déterminer (0 immobile, -3 actif, -4 en mouvement, -5 en zig-zag)", diff: -3};
+  }
+
   /* -------------------------------------------- */
   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.accorderEntite('avant-attaque')) {
       return;
     }
@@ -708,6 +783,7 @@ export class RdDCombat {
     if (arme) {
       this.attacker.verifierForceMin(arme);
     }
+    await this.proposerAjustementTirLancer(rollData)
 
     const dialog = await RdDRoll.create(this.attacker, rollData,
       {
@@ -802,7 +878,7 @@ export class RdDCombat {
     attackerRoll.dmg = RdDBonus.dmg(attackerRoll, this.attacker.getBonusDegat(), this.defender.isEntite());
     let defenderRoll = { attackerRoll: attackerRoll, passeArme: attackerRoll.passeArme, show: {} }
     attackerRoll.show = {
-      cible: this.target ? this.defender.system.name : 'la cible',
+      cible: this.target ? this.defender.name : 'la cible',
       isRecul: (attackerRoll.particuliere == 'force' || attackerRoll.tactique == 'charge')
     }
     await RdDResolutionTable.displayRollData(attackerRoll, this.attacker, 'chat-resultat-attaque.html');
@@ -1227,7 +1303,7 @@ export class RdDCombat {
       attackerRoll.defenderTokenId = defenderTokenId;
 
       await this.computeRecul(defenderRoll);
-      this.defender.encaisserDommages(attackerRoll, this.attacker, defenderRoll);
+      this.defender.encaisserDommages(attackerRoll, this.attacker, defenderRoll?.show);
     }
     else { // envoi à un GM: les joueurs n'ont pas le droit de modifier les personnages qu'ils ne possèdent pas
       game.socket.emit(SYSTEM_SOCKET_ID, {

module/rdd-compendium-organiser.js

@@ -1,5 +1,4 @@
 import { SYSTEM_RDD } from "./constants.js";
-import { Misc } from "./misc.js";
 
 export class RddCompendiumOrganiser {
   static init() {
@@ -17,7 +16,7 @@ export class RddCompendiumOrganiser {
   }
 
   static async setEntityTypeName(pack, element) {
-    const label = Misc.getEntityTypeLabel(await pack.getDocument(element.dataset.documentId));
+    const label = RddCompendiumOrganiser.getEntityTypeLabel(await pack.getDocument(element.dataset.documentId));
     RddCompendiumOrganiser.insertEntityType(element, label);
   }
 
@@ -27,4 +26,16 @@ export class RddCompendiumOrganiser {
     }
   }
 
+  
+  static getEntityTypeLabel(entity) {
+    const documentName = entity?.documentName
+    const type = entity?.type 
+    if (documentName === 'Actor' || documentName === 'Item') {
+      const label = CONFIG[documentName]?.typeLabels?.[type] ?? type;
+      return game.i18n.has(label) ? game.i18n.localize(label) : t;
+    }
+    return type;
+  }
+
+
 }

module/rdd-confirm.js

@@ -0,0 +1,56 @@
+import { Grammar } from "./grammar.js";
+import { ReglesOptionelles } from "./regles-optionelles.js";
+
+export class RdDConfirm {
+  /* -------------------------------------------- */
+  static confirmer(options, autresActions) {
+    options.bypass = options.bypass || !(options.settingConfirmer == undefined || ReglesOptionelles.isUsing(options.settingConfirmer));
+    if (options.bypass) {
+      options.onAction();
+    }
+    else {
+      let buttons = {
+        "action": RdDConfirm._createButtonAction(options),
+        "cancel": RdDConfirm._createButtonCancel()
+      };
+      if (options.settingConfirmer) {
+        buttons = mergeObject(RdDConfirm._createButtonActionSave(options), buttons);
+      }
+      if (autresActions) {
+        buttons = mergeObject(autresActions, buttons);
+      }
+      const dialogDetails = {
+        title: options.title,
+        content: options.content,
+        default: "cancel",
+        buttons: buttons
+      };
+      new Dialog(dialogDetails, { width: 150 * Object.keys(buttons).length }).render(true);
+    }
+  }
+
+  static _createButtonCancel() {
+    return { icon: '<i class="fas fa-times"></i>', label: "Annuler" };
+  }
+
+  static _createButtonAction(options) {
+    return {
+      icon: '<i class="fas fa-check"></i>',
+      label: options.buttonLabel,
+      callback: () => options.onAction()
+    };
+  }
+
+  static _createButtonActionSave(options) {
+    return {
+      "actionSave": {
+        icon: '<i class="fas fa-user-check"></i>',
+        label: "Toujours "+ options.buttonLabel.toLowerCase(),
+        callback: () => {
+          ReglesOptionelles.set(options.settingConfirmer, false);
+          options.onAction();
+        }
+      }
+    };
+  }
+}

module/rdd-dice.js

@@ -132,18 +132,15 @@ export class RdDDice {
     }
   }
 
-  static async roll(formula, options = { showDice: SHOW_DICE, rollMode: undefined }) {
-    const roll = new Roll(formula);
-    await roll.evaluate({ async: true });
-    if (options.showDice != HIDE_DICE) {
-      await this.showDiceSoNice(roll, options.rollMode ?? game.settings.get("core", "rollMode"));
-    }
-    return roll;
+  static async rollTotal(formula, options = { showDice: HIDE_DICE }) {
+    return (await RdDDice.roll(formula, options)).total;
   }
 
-  static async rollTotal(formula, options = { showDice: HIDE_DICE}) {
-    const roll = await RdDDice.roll(formula, options);
-    return roll.total;
+  static async roll(formula, options = { showDice: SHOW_DICE, rollMode: undefined }) {
+    const roll = new Roll(RdDDice._formulaOrFake(formula, options));
+    await roll.evaluate({ async: true });
+    await this.showDiceSoNice(roll, options);
+    return roll;
   }
 
   static async rollOneOf(array) {
@@ -160,27 +157,106 @@ export class RdDDice {
   }
 
   /* -------------------------------------------- */
-  static async showDiceSoNice(roll, rollMode) {
-    if (game.modules.get("dice-so-nice")?.active) {
-      if (game.dice3d) {
-        let whisper = null;
-        let blind = false;
-        rollMode = rollMode ?? game.settings.get("core", "rollMode");
-        switch (rollMode) {
-          case "blindroll": //GM only
-            blind = true;
-          case "gmroll": //GM + rolling player
-            whisper = ChatUtility.getUsers(user => user.isGM);
-            break;
-          case "roll": //everybody
-            whisper = ChatUtility.getUsers(user => user.active);
-            break;
-          case "selfroll":
-            whisper = [game.user.id];
-            break;
-        }
-        await game.dice3d.showForRoll(roll, game.user, true, whisper, blind);
+  static async showDiceSoNice(roll, options) {
+    if (options.showDice == HIDE_DICE || !game.modules.get("dice-so-nice")?.active || !game.dice3d) {
+      return;
+    }
+    
+    let { whisper, blind } = RdDDice._getWhisperBlind(options);
+    if (options.forceDiceResult?.total) {
+      let terms = await RdDDice._getForcedTerms(options);
+      if (terms) {
+        await game.dice3d.show({ throws: [{ dice: terms }] })
+        return;
       }
     }
+    await game.dice3d.showForRoll(roll, game.user, true, whisper, blind);
+  }
+
+  static _formulaOrFake(formula, options) {
+    if (options?.forceDiceResult?.total) {
+      options.forceDiceResult.formula = formula;
+      return options.forceDiceResult.total.toString()
+    }
+    return formula;
+  }
+
+  static async _getForcedTerms(options) {
+    const total = options.forceDiceResult.total;
+    switch (options.forceDiceResult.formula) {
+      case '1d100':
+        return terms1d100(total);
+      case "2d10":
+        return await terms2d10(total);
+    }
+    return undefined;
+
+    function terms1d100(total) {
+      const unites = total % 10;
+      const dizaines = Math.floor(total / 10);
+      return [{
+        resultLabel: dizaines * 10,
+        d100Result: total,
+        result: dizaines,
+        type: "d100",
+        vectors: [],
+        options: {}
+      },
+      {
+        resultLabel: unites,
+        d100Result: total,
+        result: unites,
+        type: "d10",
+        vectors: [],
+        options: {}
+      }];
+    }
+
+    async function terms2d10(total) {
+      if (total>20 || total<2) { return undefined }
+      let first = await RdDDice.d10();
+      let second = Math.min(total-first, 10);
+      first = Math.max(first, total-second);
+      return [{
+        resultLabel:first,
+        result: first,
+        type: "d10",
+        vectors: [],
+        options: {}
+      },
+      {
+        resultLabel: second,
+        result: second,
+        type: "d10",
+        vectors: [],
+        options: {}
+      }];
+    }
+  }
+
+  static async d10() {
+    let roll = new Roll('1d10');
+    await roll.evaluate({ async: true });
+    return roll.total;
+  }
+
+  static _getWhisperBlind(options) {
+    let whisper = null;
+    let blind = false;
+    let rollMode = options.rollMode ?? game.settings.get("core", "rollMode");
+    switch (rollMode) {
+      case "blindroll": //GM only
+        blind = true;
+      case "gmroll": //GM + rolling player
+        whisper = ChatUtility.getUsers(user => user.isGM);
+        break;
+      case "roll": //everybody
+        whisper = ChatUtility.getUsers(user => user.active);
+        break;
+      case "selfroll":
+        whisper = [game.user.id];
+        break;
+    }
+    return { whisper, blind };
   }
 }

module/rdd-herbes.js

@@ -1,76 +1,75 @@
 import { RdDUtility } from "./rdd-utility.js";
 import { RdDCalendrier } from "./rdd-calendrier.js";
+import { Grammar } from "./grammar.js";
 
 /* -------------------------------------------- */
 export class RdDHerbes extends Item {
 
   /* -------------------------------------------- */
-  static isHerbeSoin( botaniqueItem ) {
-    return botaniqueItem.categorie == 'Soin';
-  }
-  /* -------------------------------------------- */
-  static isHerbeRepos( botaniqueItem ) {
-    return botaniqueItem.categorie == 'Repos';
+  static async initializeHerbes() {
+    this.herbesSoins = await RdDHerbes.listCategorieHerbes('Soin');
+    this.herbesRepos = await RdDHerbes.listCategorieHerbes('Repos');
   }
 
-  /* -------------------------------------------- */
-  static async initializeHerbes( ) {  
-    this.herbesSoins = await RdDUtility.loadCompendium('foundryvtt-reve-de-dragon.botanique', item => this.isHerbeSoin(item));
-    this.herbesRepos = await RdDUtility.loadCompendium('foundryvtt-reve-de-dragon.botanique', item => this.isHerbeRepos(item));
+  static async listCategorieHerbes(categorie) {
+    return await RdDUtility.loadItems(
+      it => it.type == 'herbe' && it.system.categorie.toLowerCase() == categorie.toLowerCase(),
+      'foundryvtt-reve-de-dragon.botanique');
   }
 
   /* -------------------------------------------- */
   static buildHerbesList(listeHerbes, max) {
     let list = {}
-    for ( let herbe of listeHerbes) {
+    for (let herbe of listeHerbes) {
       let brins = max - herbe.system.niveau;
-      list[herbe.system.name] = `${herbe.system.name} (Bonus: ${herbe.system.niveau}, Brins: ${brins})`;
+      list[herbe.name] = `${herbe.name} (Bonus: ${herbe.system.niveau}, Brins: ${brins})`;
     }
     list['Autre'] = 'Autre (Bonus: variable, Brins: variable)'
     return list;
   }
 
   /* -------------------------------------------- */
-  static updatePotionData( formData ) {
-    formData.herbesSoins = this.buildHerbesList(this.herbesSoins, 12);
-    formData.herbesRepos = this.buildHerbesList(this.herbesRepos, 7);
+  static async updatePotionData(formData) {
+    formData.isSoins = formData.system.categorie.includes('Soin');
+    formData.isRepos = formData.system.categorie.includes('Repos');
+    if (formData.isSoins) {
+      RdDHerbes.calculBonusHerbe(formData, this.herbesSoins, 12);
+    }
+    if (formData.isRepos) {
+      RdDHerbes.calculBonusHerbe(formData, this.herbesRepos, 7);
+    }
+    formData.herbesSoins = RdDHerbes.buildHerbesList(this.herbesSoins, 12);
+    formData.herbesRepos = RdDHerbes.buildHerbesList(this.herbesRepos, 7);
     formData.jourMoisOptions = RdDCalendrier.buildJoursMois();
     formData.dateActuelle = game.system.rdd.calendrier.getDateFromIndex();
     formData.splitDate = game.system.rdd.calendrier.getNumericDateFromIndex(formData.system.prdate);
-
-    if (formData.system.categorie.includes('Soin') ) {
-      formData.isHerbe = true;
-      this.computeHerbeBonus(formData, this.herbesSoins, 12);
-    } else if (formData.system.categorie.includes('Repos')) {
-      formData.isRepos = true;
-      this.computeHerbeBonus(formData, this.herbesRepos, 7);
-    }
   }
 
   /* -------------------------------------------- */
-  static calculePuissancePotion( potion ) {
+  static calculPuissancePotion(potion) {
     return potion.system.herbebonus * potion.system.pr;
   }
 
   /* -------------------------------------------- */
-  static calculePointsRepos( potion ) {
+  static calculPointsRepos(potion) {
     return potion.system.herbebonus * potion.system.pr;
   }
 
   /* -------------------------------------------- */
-  static calculePointsGuerison( potion ){
+  static calculPointsGuerison(potion) {
     return potion.system.herbebonus * potion.system.pr;
   }
 
   /* -------------------------------------------- */
-  static computeHerbeBonus( formData, herbesList, max) {
-    if ( Number(formData.system.herbebrins) ) {
-    let herbe = herbesList.find(item => item.name.toLowerCase() == formData.system.herbe.toLowerCase() );
-      if( herbe ) {
-        let brinsBase = max - herbe.system.niveau;
-        formData.system.herbebonus = Math.max(herbe.system.niveau - Math.max(brinsBase - formData.system.herbebrins, 0), 0);
+  static calculBonusHerbe(formData, herbesList, max) {
+    if (Number(formData.system.herbebrins)) {
+      let herbe = herbesList.find(item => item.name.toLowerCase() == formData.system.herbe.toLowerCase());
+      if (herbe) {
+        const brinsRequis = max - herbe.system.niveau;
+        const brinsManquants = Math.max(brinsRequis - formData.system.herbebrins, 0);
+        formData.system.herbebonus = Math.max(herbe.system.niveau - brinsManquants, 0);
       }
     }
-  }  
+  }
 
 }  

module/rdd-main.js

@@ -150,11 +150,14 @@ Hooks.once("init", async function () {
   /* -------------------------------------------- */
   game.socket.on(SYSTEM_SOCKET_ID, sockmsg => {
     console.log(">>>>> MSG RECV", sockmsg);
-
-    RdDUtility.onSocketMessage(sockmsg);
-    RdDCombat.onSocketMessage(sockmsg);
-    ChatUtility.onSocketMessage(sockmsg);
-    RdDActor.onSocketMessage(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)
+    }
   });
 
   /* -------------------------------------------- */

module/rdd-resolution-table.js

@@ -142,10 +142,8 @@ export class RdDResolutionTable {
 
   /* -------------------------------------------- */
   static async rollChances(chances, diviseur, forceDiceResult = -1) {
-    if (forceDiceResult <= 0 || forceDiceResult > 100) {
-      forceDiceResult = -1;
-    }
-    chances.roll = await RdDDice.rollTotal((forceDiceResult == -1) ? "1d100" : `${forceDiceResult}`, chances);
+    chances.forceDiceResult = forceDiceResult <= 0 || forceDiceResult > 100 ? undefined : {total: forceDiceResult};
+    chances.roll = await RdDDice.rollTotal( "1d100", chances);
     mergeObject(chances, this.computeReussite(chances, chances.roll, diviseur), { overwrite: true });
     return chances;
   }

module/rdd-roll-encaisser.js

@@ -1,4 +1,4 @@
-import { ENTITE_BLURETTE, ENTITE_INCARNE, ENTITE_NONINCARNE } from "./constants.js";
+import { ENTITE_BLURETTE, ENTITE_INCARNE} from "./constants.js";
 
 /**
  * Extend the base Dialog entity by defining a custom window to perform roll.
@@ -33,7 +33,7 @@ export class RdDEncaisser extends Dialog {
     let dialogOptions = {
       classes: ["rdddialog"],
       width: 320,
-      height: 240
+      height: 260
     }
 
     // Select proper roll dialog template and stuff

module/rdd-roll.js

@@ -144,6 +144,7 @@ export class RdDRoll extends Dialog {
 
   /* -------------------------------------------- */
   async onAction(action, html) {
+    this.rollData.forceDiceResult = Number.parseInt($('#force-dice-result').val()) ?? -1;
     await RdDResolutionTable.rollData(this.rollData);
     console.log("RdDRoll -=>", this.rollData, this.rollData.rolled);
     this.actor.setRollWindowsOpened(false);

module/rdd-rolltables.js

@@ -2,16 +2,22 @@ export class RdDRollTables {
 
   /* -------------------------------------------- */
   static async genericGetTableResult(tableName, toChat) {
-    let table = game.tables.find(table => table.name.toLowerCase() == tableName.toLowerCase())
-    if ( !table) {
-      const pack = game.packs.get("foundryvtt-reve-de-dragon.tables-diverses");
-      const index = await pack.getIndex();
-      const entry = index.find(e => e.name === tableName);
-      table = await pack.getDocument(entry._id);
-    }
+    let table = RdDRollTables.getWorldTable() ?? (await RdDRollTables.getSystemTable(tableName));
     const draw = await table.draw({ displayChat: toChat, rollMode: "gmroll"});
     //console.log("RdDRollTables", tableName, toChat, ":", draw);
     return draw.results.length > 0 ? draw.results[0] : undefined;
+
+  }
+
+  static getWorldTable() {
+    return game.tables.find(table => table.name.toLowerCase() == tableName.toLowerCase());
+  }
+
+  static async getSystemTable(tableName) {
+    const pack = game.packs.get("foundryvtt-reve-de-dragon.tables-diverses");
+    const index = await pack.getIndex();
+    const entry = index.find(e => e.name === tableName);
+    return await pack.getDocument(entry._id);
   }
 
   /* -------------------------------------------- */

module/rdd-sheet-utility.js

@@ -1,5 +1,4 @@
 import { DialogSplitItem } from "./dialog-split-item.js";
-import { Misc } from "./misc.js";
 
 export class RdDSheetUtility {
 

module/rdd-tmr-dialog.js

@@ -158,7 +158,7 @@ export class RdDTMRDialog extends Dialog {
   }
 
   _tokenDemiReve() {
-    return EffetsDraconiques.demiReve.token(this.pixiTMR, this.actor.system, () => this.actor.system.reve.tmrpos.coord);
+    return EffetsDraconiques.demiReve.token(this.pixiTMR, this.actor, () => this.actor.system.reve.tmrpos.coord);
   }
 
   forceDemiRevePositionView() {
@@ -625,16 +625,16 @@ export class RdDTMRDialog extends Dialog {
   /* -------------------------------------------- */
   isCaseHumide(tmr) {
     if (!(TMRUtility.isCaseHumide(tmr) || this.isCaseHumideAdditionelle(tmr))) {
-      return undefined;
+      return false;
     }
     if (this.isCaseMaitrisee(tmr.coord)) {
       ChatMessage.create({
         content: tmr.label + ": cette case humide est déja maitrisée grâce à votre Tête <strong>Quête des Eaux</strong>",
         whisper: ChatMessage.getWhisperRecipients(game.user.name)
       });
-      return undefined;
+      return false;
     }
-    return -7;
+    return true;
   }
 
   /* -------------------------------------------- */
@@ -878,11 +878,13 @@ export class RdDTMRDialog extends Dialog {
 
     if (this.isDemiReveCache()) {
       if (this.isTerreAttache(targetCoord)
-      || (this.isCaseHumide(currentCoord) && this.isCaseHumide(targetCoord))
+      || this.isConnaissanceFleuve(currentCoord, targetCoord)
       || deplacementType == 'changeur')
       {
         // déplacement possible
-        await this.actor.montreTMR();
+        await this.actor.setTMRVisible(true);
+        this.demiReve = this._tokenDemiReve();
+        this._trackToken(this.demiReve);
       }
       else
       {

module/rdd-utility.js

@@ -12,6 +12,8 @@ import { RdDItem } from "./item.js";
 import { Monnaie } from "./item-monnaie.js";
 import { RdDPossession } from "./rdd-possession.js";
 import { RdDNameGen } from "./rdd-namegen.js";
+import { RdDConfirm } from "./rdd-confirm.js";
+import { RdDActor } from "./actor.js";
 
 /* -------------------------------------------- */
 // This table starts at 0 -> niveau -10
@@ -116,9 +118,22 @@ export class RdDUtility {
       'systems/foundryvtt-reve-de-dragon/templates/actor-entite-sheet.html',
       'systems/foundryvtt-reve-de-dragon/templates/actor-vehicule-sheet.html',
       // sous-parties de feuilles de personnages
+      'systems/foundryvtt-reve-de-dragon/templates/actor/header-buttons.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/header-etat.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/header-compteurs.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/header-compteurs-creature.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/header-compteurs-entitee.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/header-effects.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/vue-detaillee.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/carac-main.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/carac-derivee.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/carac-creature.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/carac-entitee.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/comp-creature.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/comp-possession.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/carac-total.html',
       'systems/foundryvtt-reve-de-dragon/templates/actor/competence.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor/categorie-competences.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor/effects.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor/competence-categorie.html',
       'systems/foundryvtt-reve-de-dragon/templates/actor/xp-competences.html',
       'systems/foundryvtt-reve-de-dragon/templates/actor/combat.html',
       'systems/foundryvtt-reve-de-dragon/templates/actor/blessures.html',
@@ -199,6 +214,7 @@ export class RdDUtility {
       'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-carac.html',
       'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-sort.html',
       'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-encaisser.html',
+      'systems/foundryvtt-reve-de-dragon/templates/dialog-validation-encaissement.html',
       'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-meditation.html',
       'systems/foundryvtt-reve-de-dragon/templates/dialog-tmr.html',
       'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-alchimie.html',
@@ -227,6 +243,7 @@ export class RdDUtility {
       'systems/foundryvtt-reve-de-dragon/templates/chat-infojet.html',
       'systems/foundryvtt-reve-de-dragon/templates/chat-description.html',
       'systems/foundryvtt-reve-de-dragon/templates/chat-info-appel-au-moral.html',
+      'systems/foundryvtt-reve-de-dragon/templates/chat-info-distance.html',
       'systems/foundryvtt-reve-de-dragon/templates/chat-demande-defense.html',
       'systems/foundryvtt-reve-de-dragon/templates/chat-demande-attaque-particuliere.html',
       'systems/foundryvtt-reve-de-dragon/templates/chat-demande-attaque-etotal.html',
@@ -262,6 +279,7 @@ export class RdDUtility {
     Handlebars.registerHelper('caseTmr-type', coord => TMRUtility.getTMRType(coord));
     Handlebars.registerHelper('typeTmr-name', coord => TMRUtility.typeTmrName(coord));
     Handlebars.registerHelper('min', (...args) => Math.min(...args.slice(0, -1)));
+    Handlebars.registerHelper('regle-optionnelle', (option) => ReglesOptionelles.isUsing(option));
 
     Handlebars.registerHelper('filtreTriCompetences', competences => competences.filter(it => it.system.isVisible)
       .sort((a, b) => {
@@ -307,7 +325,7 @@ export class RdDUtility {
 
   /* -------------------------------------------- */
   static async selectObjetType(actorSheet) {
-    let typeObjets = RdDItem.getTypeObjetsEquipement();
+    let typeObjets = RdDItem.getTypesObjetsEquipement();
     let options = `<span class="competence-label">Selectionnez le type d'équipement</span><select class="item-type">`;
     for (let typeName of typeObjets) {
       options += `<option value="${typeName}">${typeName}</option>`
@@ -636,7 +654,68 @@ export class RdDUtility {
   }
 
   /* -------------------------------------------- */
-  static selectEncaissement(degats, mortalite) {
+  static async jetEncaissement(rollData, armure, options = { showDice: HIDE_DICE }) {
+    let formula = "2d10";
+
+    // Chaque dé fait au minmum la difficulté libre
+    if (ReglesOptionelles.isUsing('degat-minimum-malus-libre')) {
+      if (rollData.diffLibre < 0) {
+        let valeurMin = Math.abs(rollData.diffLibre);
+        formula += "min" + valeurMin;
+      }
+    }
+    // Chaque dé fait au minmum la difficulté libre
+    if (ReglesOptionelles.isUsing('degat-ajout-malus-libre')) {
+      if (rollData.diffLibre < 0) {
+        let valeurMin = Math.abs(rollData.diffLibre);
+        formula += "+" + valeurMin;
+      }
+    }
+
+    let roll = await RdDDice.roll(formula, options);
+
+    // 1 dé fait au minmum la difficulté libre
+    if (ReglesOptionelles.isUsing('degat-minimum-malus-libre-simple')) {
+      if (rollData.diffLibre < 0) {
+        let valeurMin = Math.abs(rollData.diffLibre);
+        if (roll.terms[0].results[0].result < valeurMin) {
+          roll.terms[0].results[0].result = valeurMin;
+        } else if (roll.terms[0].results[1].result < valeurMin) {
+          roll.terms[0].results[1].result = valeurMin;
+        }
+        roll._total = roll.terms[0].results[0].result + roll.terms[0].results[1].result;
+      }
+    }
+
+    return await RdDUtility.prepareEncaissement(rollData, roll, armure);
+  }
+  
+  /* -------------------------------------------- */
+  static async prepareEncaissement(rollData, roll, armure) {
+    const jetTotal = roll.total + rollData.dmg.total - armure;
+    let encaissement = RdDUtility._selectEncaissement(jetTotal, rollData.dmg.mortalite);
+    let over20 = Math.max(jetTotal - 20, 0);
+    encaissement.dmg = rollData.dmg;
+    encaissement.dmg.loc = rollData.dmg.loc ?? await RdDUtility.getLocalisation(this.type);
+    encaissement.dmg.loc.label = encaissement.dmg.loc.label ?? 'Corps;';
+    encaissement.roll = roll;
+    encaissement.armure = armure;
+    encaissement.total = jetTotal;
+    encaissement.vie = await RdDUtility._evaluatePerte(encaissement.vie, over20);
+    encaissement.endurance = await RdDUtility._evaluatePerte(encaissement.endurance, over20);
+    encaissement.penetration = rollData.arme?.system.penetration ?? 0;
+    encaissement.blessures = (
+      encaissement.critiques> 0 ? "Critique":
+      encaissement.graves> 0 ? "Grave":
+      encaissement.legeres> 0 ? "Légère":
+      encaissement.eraflures>0 ? "Contusions/Eraflures":
+      'Aucune'
+    );
+    return encaissement;
+  }
+
+  /* -------------------------------------------- */
+  static _selectEncaissement(degats, mortalite) {
     const table = definitionsEncaissement[mortalite] === undefined ? definitionsEncaissement["mortel"] : definitionsEncaissement[mortalite];
     for (let encaissement of table) {
       if ((encaissement.minimum === undefined || encaissement.minimum <= degats)
@@ -647,6 +726,13 @@ export class RdDUtility {
     return duplicate(table[0]);
   }
 
+  /* -------------------------------------------- */
+  static async _evaluatePerte(formula, over20) {
+    let perte = new Roll(formula, { over20: over20 });
+    await perte.evaluate({ async: true });
+    return perte.total;
+  }
+
   /* -------------------------------------------- */
   static currentFatigueMalus(value, max) {
     if (ReglesOptionelles.isUsing("appliquer-fatigue")) {
@@ -667,17 +753,28 @@ export class RdDUtility {
   }
 
   /* -------------------------------------------- */
-  static async loadCompendiumData(compendium) {
-    const pack = game.packs.get(compendium);
-    return await pack?.getDocuments() ?? [];
+  static async loadItems(filter, compendium) {
+    let items = game.items.filter(filter);
+    if (compendium) {
+      const ids = items.map(it => it.id);
+      const names = items.map(it => it.name.toLowerCase());
+      items = items.concat(await RdDUtility.loadCompendium(compendium, it => !ids.includes(it.id) && !names.includes(it.name.toLowerCase()) && filter(it)));
+    }
+    return items;
   }
 
   /* -------------------------------------------- */
-  static async loadCompendium(compendium, filter = item => true) {
+  static async loadCompendium(compendium, filter = it => true) {
     let compendiumData = await RdDUtility.loadCompendiumData(compendium);
     return compendiumData.filter(filter);
   }
 
+  /* -------------------------------------------- */
+  static async loadCompendiumData(compendium) {
+    const pack = game.packs.get(compendium);
+    return await pack?.getDocuments() ?? [];
+  }
+
   /* -------------------------------------------- */
   static async responseNombreAstral(callData) {
     let actor = game.actors.get(callData.id);
@@ -734,7 +831,12 @@ export class RdDUtility {
     });
 
     // gestion bouton tchat Acheter
-    html.on("click", '.button-acheter', event => DialogItemAchat.onButtonAcheter(event));
+    html.on("click", '.button-acheter', event => {
+      const venteData = DialogItemAchat.venteData(event.currentTarget);
+      if (venteData) {
+        DialogItemAchat.onAcheter(venteData);
+      }
+    });
     html.on("click", '.button-creer-acteur', event => RdDNameGen.onCreerActeur(event));
 
     // Gestion du bouton payer
@@ -854,38 +956,17 @@ export class RdDUtility {
     return chatData;
   }
 
-  /* -------------------------------------------- */
-  static confirmerSuppression(sheet, htmlToDelete, options) {
-    const d = new Dialog({
-      title: options.title ?? 'Confirmer la suppression',
-      content: `<p>Etes vous certain de vouloir supprimer ${options.supprimer ?? 'cet objet'} ?</p>`,
-      buttons: {
-        delete: {
-          icon: '<i class="fas fa-check"></i>',
-          label: options.deleteLabel ?? 'Supprimer',
-          callback: () => {
-            options.onDelete();
-            RdDUtility.slideOnDelete(sheet, htmlToDelete);
-          }
-        },
-        cancel: {
-          icon: '<i class="fas fa-times"></i>',
-          label: "Annuler"
-        }
-      },
-      default: "cancel"
-    });
-    d.render(true);
-  }
-
   /* -------------------------------------------- */
   static confirmerSuppressionSubacteur(sheet, subActor, htmlToDelete) {
-    RdDUtility.confirmerSuppression(sheet, htmlToDelete,{
-      supprimer: "le lien vers le véhicule/monture/suivant : " + subActor.name,
-      deleteLabel: "Supprimer le lien",
-      onDelete:  () => {
-       console.log("Delete : ", subActor.id);
+    RdDConfirm.confirmer({
+      settingConfirmer: "confirmation-supprimer-lien-acteur",
+      content: `<p>Etes vous certain de vouloir supprimer le lien vers ${subActor.name} ?</p>`,
+      title: 'Confirmer la suppression',
+      buttonLabel: 'Supprimer le lien',
+      onAction: () => {
+        console.log('Delete : ', subActor.id);
         sheet.actor.removeSubacteur(subActor.id);
+        RdDUtility.slideOnDelete(sheet, htmlToDelete);
       }
     })
   }
@@ -893,51 +974,40 @@ export class RdDUtility {
   /* -------------------------------------------- */
   static async confirmerSuppressionItem(sheet, item, htmlToDelete) {
     const itemId = item.id;
-    if (Monnaie.isSystemMonnaie(item, sheet.actor.items)) {
-      ui.notifications.warn("Suppression des monnaies de base impossible");
-      return;
-    }
-
-    let msgTxt = "<p>Etes vous certain de vouloir supprimer cet objet ?";
-    let buttons = {
-      delete: {
-        icon: '<i class="fas fa-check"></i>',
-        label: "Supprimer l'objet",
-        callback: () => {
-          console.log("Delete : ", itemId);
-          sheet.actor.deleteEmbeddedDocuments('Item', [itemId], { renderSheet: false });
-          RdDUtility.slideOnDelete(sheet, htmlToDelete);
-        }
-      },
-      cancel: {
-        icon: '<i class="fas fa-times"></i>',
-        label: "Annuler"
+    const confirmationSuppression = {
+      settingConfirmer: "confirmation-supprimer-" + item.getItemGroup(),
+      content: `<p>Etes vous certain de vouloir supprimer: ${item.name}?</p>`,
+      title: `Supprimer ${item.name}`,
+      buttonLabel: "Supprimer",
+      onAction: () => {
+        console.log('Delete : ', itemId);
+        sheet.actor.deleteEmbeddedDocuments('Item', [itemId], { renderSheet: false });
+        RdDUtility.slideOnDelete(sheet, htmlToDelete);
       }
+    };
+    if (item.isConteneurNonVide()) {
+      confirmationSuppression.content += `<p>Ce conteneur n'est pas vide. Que voulez vous supprimer?</p>`;
+      confirmationSuppression.settingConfirmer = undefined;
+      RdDConfirm.confirmer(confirmationSuppression,
+        {
+          'deleteall': {
+            icon: '<i class="fas fa-check"></i>',
+            label: "Supprimer conteneur et contenu",
+            callback: () => {
+              console.log("Delete : ", itemId);
+              sheet.actor.deleteAllConteneur(itemId, { renderSheet: false });
+              RdDUtility.slideOnDelete(sheet, htmlToDelete);
+            }
+          }
+        });
     }
-    if (item.type == 'conteneur' && item.system.contenu.length > 0) {
-      msgTxt += "<br>Ce conteneur n'est pas vide. Choisissez l'option de suppression";
-      buttons['deleteall'] = {
-        icon: '<i class="fas fa-check"></i>',
-        label: "Supprimer le conteneur et tout son contenu",
-        callback: () => {
-          console.log("Delete : ", itemId);
-          sheet.actor.deleteAllConteneur(itemId, { renderSheet: false });
-          RdDUtility.slideOnDelete(sheet, htmlToDelete);
-        }
-      }
+    else {
+      RdDConfirm.confirmer(confirmationSuppression)
     }
-    msgTxt += "</p>";
-    let d = new Dialog({
-      title: "Confirmer la suppression",
-      content: msgTxt,
-      buttons: buttons,
-      default: "cancel"
-    });
-    d.render(true);
   }
 
   static slideOnDelete(sheet, htmlToDelete) {
-    return htmlToDelete.slideUp(200, () => sheet.render(false)); 
+    return htmlToDelete.slideUp(200, () => sheet.render(false));
   }
 
   /* -------------------------------------------- */

module/regles-optionelles.js

@@ -2,27 +2,42 @@ import { SYSTEM_RDD } from "./constants.js";
 import { Misc } from "./misc.js";
 
 const listeReglesOptionelles = [
-  { name: 'recul', group: 'Règles de combat', descr: "Appliquer le recul en cas de particulière en force ou de charge" },
-  { name: 'resistanceArmeParade', group: 'Règles de combat', descr: "Faire le jet de résistance des armes lors de parades pouvant les endommager" },
-  { name: 'deteriorationArmure', group: 'Règles de combat', descr: "Tenir compte de la détérioration des armures" },
-  { name: 'defenseurDesarme', group: 'Règles de combat', descr: "Le défenseur peut être désarmé en parant une particulière en force ou une charge avec une arme autre qu'un bouclier" },
-  { name: 'categorieParade', group: 'Règles de combat', descr: "Le défenseur doit obtenir une significative en cas de parade avec des armes de catégories différentes" },
-  { name: 'tripleSignificative', group: 'Règles de combat', descr: "En cas de demi-surprise, d'attaque particulière en finesse, et de catégories d'armes différentes, le défenseur doit obtenir 1/8 des chances de succès" },
-  { name: 'degat-minimum-malus-libre-simple', group: 'Règles de combat', descr: "Le malus libre d'attaque remplace une des valeurs de dés d'encaissement si elle est plus petite. Exemple : la difficulté libre de l'attaquant est de -4. Sur le jet d'encaissement, si 1 résultat est inférieur à 4, alors il devient 4.", default: false },
-  { name: 'degat-minimum-malus-libre', group: 'Règles de combat', descr: "Le malus libre d'attaque remplace une valeur de dés d'encaissement si elle est plus petite. Exemple : la difficulté libre de l'attaquant est de -4. Sur le jet d'encaissement, tout résultat inférieur à 4 devient 4.", default: false },
-  { name: 'degat-ajout-malus-libre', group: 'Règles de combat', descr: "Le malus libre d'attaque s'ajoute au jet d'encaissement et aux autres bonus. Exemple : la difficulté libre de l'attaquant est de -4. Le jet d'encaissement est effectué à 2d10+4, plus les bonus de situation et d'armes.", default: false },
-  { name: 'astrologie', group: 'Règles générales', descr: "Appliquer les ajustements astrologiques aux jets de chance et aux rituels", default: true },
-  { name: 'afficher-prix-joueurs', group: 'Règles générales', descr: "Afficher le prix de l'équipement des joueurs", default: true },
-  { name: 'appliquer-fatigue', group: 'Règles générales', descr: "Appliquer les règles de fatigue", default: true },
-  { name: 'afficher-colonnes-reussite', group: 'Règles générales', descr: "Afficher le nombre de colonnes de réussite ou d'échec", default: false },
+  { group: 'Règles de combat', name: 'recul', descr: "Appliquer le recul en cas de particulière en force ou de charge" },
+  { group: 'Règles de combat', name: 'resistanceArmeParade', descr: "Faire le jet de résistance des armes lors de parades pouvant les endommager" },
+  { group: 'Règles de combat', name: 'deteriorationArmure', descr: "Tenir compte de la détérioration des armures" },
+  { group: 'Règles de combat', name: 'defenseurDesarme', descr: "Le défenseur peut être désarmé en parant une particulière en force ou une charge avec une arme autre qu'un bouclier" },
+  { group: 'Règles de combat', name: 'categorieParade', descr: "Le défenseur doit obtenir une significative en cas de parade avec des armes de catégories différentes" },
+  { group: 'Règles de combat', name: 'tripleSignificative', descr: "En cas de demi-surprise, d'attaque particulière en finesse, et de catégories d'armes différentes, le défenseur doit obtenir 1/8 des chances de succès" },
+  { group: 'Règles de combat', name: 'degat-minimum-malus-libre-simple', descr: "Le malus libre d'attaque remplace une des valeurs de dés d'encaissement si elle est plus petite. Exemple : la difficulté libre de l'attaquant est de -4. Sur le jet d'encaissement, si le plus petit dé est inférieur à 4, alors il devient 4.", default: false },
+  { group: 'Règles de combat', name: 'degat-minimum-malus-libre', descr: "Le malus libre d'attaque remplace une valeur de dés d'encaissement si elle est plus petite. Exemple : la difficulté libre de l'attaquant est de -4. Sur le jet d'encaissement, tout résultat inférieur à 4 devient 4.", default: false },
+  { group: 'Règles de combat', name: 'degat-ajout-malus-libre', descr: "Le malus libre d'attaque s'ajoute au jet d'encaissement et aux autres bonus. Exemple : la difficulté libre de l'attaquant est de -4. Le jet d'encaissement est effectué à 2d10+4, plus les bonus de situation et d'armes.", default: false },
+  { group: 'Règles de combat', name: 'validation-encaissement-gr', descr: "Le Gardien des Rêves doit valider les jets d'encaissement et peut les changer.", default: false },
+
+  { group: 'Règles générales', name: 'astrologie', descr: "Appliquer les ajustements astrologiques aux jets de chance et aux rituels"},
+  { group: 'Règles générales', name: 'afficher-prix-joueurs', descr: "Afficher le prix de l'équipement des joueurs", uniquementJoueur: true},
+  { group: 'Règles générales', name: 'appliquer-fatigue', descr: "Appliquer les règles de fatigue"},
+  { group: 'Règles générales', name: 'afficher-colonnes-reussite', descr: "Afficher le nombre de colonnes de réussite ou d'échec", default: false },
+
+  { group: 'Confirmations', name: 'confirmation-tmr', descr: "Confirmer pour monter dans les TMR", scope: "client"},
+  { group: 'Confirmations', name: 'confirmation-vider', descr: "Confirmer pour vider l'équipement", scope: "client"},
+  { group: 'Confirmations', name: 'confirmation-supprimer-lien-acteur',  descr: "Confirmer pour détacher un animal/suivant/véhicule", scope: "client"},
+  { group: 'Confirmations', name: 'confirmation-supprimer-equipement',   descr: "Confirmer la suppression des équipements", scope: "client"},
+  { group: 'Confirmations', name: 'confirmation-supprimer-oeuvre',       descr: "Confirmer la suppression des oeuvres", scope: "client"},
+  { group: 'Confirmations', name: 'confirmation-supprimer-connaissance', descr: "Confirmer la suppression des connaissances", scope: "client"},
+  { group: 'Confirmations', name: 'confirmation-supprimer-draconique',   descr: "Confirmer la suppression des queues, souffles, têtes", scope: "client"},
+  { group: 'Confirmations', name: 'confirmation-supprimer-effet',        descr: "Confirmer la suppression des effets", scope: "client"},
+  { group: 'Confirmations', name: 'confirmation-supprimer-competence',   descr: "Confirmer la suppression des compétences", scope: "client"},
+  { group: 'Confirmations', name: 'confirmation-supprimer-autres',       descr: "Confirmer la suppression des autres types d'Objets", scope: "client"},
 ];
 
+const uniquementJoueur = listeReglesOptionelles.filter(it => it.uniquementJoueur).map(it=>it.name);
+
 export class ReglesOptionelles extends FormApplication {
   static init() {
     for (const regle of listeReglesOptionelles) {
       const name = regle.name;
       const id = ReglesOptionelles._getIdRegle(name);
-      game.settings.register(SYSTEM_RDD, id, { name: id, scope: "world", config: false, default: regle.default == undefined ? true : regle.default, type: Boolean });
+      game.settings.register(SYSTEM_RDD, id, { name: id, scope: regle.scope ?? "world", config: false, default: regle.default == undefined ? true : regle.default, type: Boolean });
     }
 
     game.settings.registerMenu(SYSTEM_RDD, "rdd-options-regles", {
@@ -30,8 +45,7 @@ export class ReglesOptionelles extends FormApplication {
       label: "Choix des règles optionelles",
       hint: "Ouvre la fenêtre de sélection des règles optionelles",
       icon: "fas fa-bars",
-      type: ReglesOptionelles,
-      restricted: true
+      type: ReglesOptionelles
     });
   }
 
@@ -49,7 +63,7 @@ export class ReglesOptionelles extends FormApplication {
       id: "optional-settings",
       template: "systems/foundryvtt-reve-de-dragon/templates/regles-optionelles.html",
       height: 600,
-      width: 350,
+      width: 450,
       minimizable: false,
       closeOnSubmit: true,
       title: "Règles optionnelles"
@@ -59,10 +73,10 @@ export class ReglesOptionelles extends FormApplication {
 
   getData() {
     let formData = super.getData();
-    const regles = listeReglesOptionelles.map(it => {
+    const regles = listeReglesOptionelles.filter(it => game.user.isGM || it.scope == "client").map(it => {
       it = duplicate(it);
       it.id = ReglesOptionelles._getIdRegle(it.name);
-      it.active = ReglesOptionelles.isUsing(it.name);
+      it.active = ReglesOptionelles.isSet(it.name);
       return it;
     });
     formData.regles = regles;
@@ -71,9 +85,20 @@ export class ReglesOptionelles extends FormApplication {
   }
 
   static isUsing(name) {
+    if (game.user.isGM && uniquementJoueur.includes(name)) {
+      return true;
+    }
+    return ReglesOptionelles.isSet(name);
+  }
+
+  static isSet(name) {
     return game.settings.get(SYSTEM_RDD, ReglesOptionelles._getIdRegle(name));
   }
 
+  static set(name, value) {
+    return game.settings.set(SYSTEM_RDD, ReglesOptionelles._getIdRegle(name), value ? true: false);
+  }
+
   activateListeners(html) {
     html.find(".select-option").click((event) => {
       if (event.currentTarget.attributes.name) {

packs/competences-entites.db

@@ -12,3 +12,4 @@
 {"_id":"gPOQd9NI7AFH0whX","name":"Epée Bâtarde","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":true,"dommages":4,"description":"","carac-value":null,"categorie_parade":"epees-lourdes","isparade":true},"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.competences-humanoides.YTKld5ggDsHqwYoR"}},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_epee_1_main.webp","effects":[]}
 {"_id":"j1xHCzfIeYKgXxoH","name":"Morsure","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":true,"dommages":1,"description":"","categorie_parade":"","isparade":false},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/compcreature-morsure.webp","effects":[]}
 {"_id":"lDZ3qUPKN35ob5TH","name":"Grande morsure","permission":{"default":0,"Q2G6GTdrotKzYGUC":3},"type":"competencecreature","data":{"categorie_parade":"","niveau":0,"carac_value":0,"iscombat":true,"isparade":false,"dommages":2,"description":""},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/compcreature-morsure.webp","effects":[]}
+{"name":"Possession","type":"competencecreature","flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.competences-entites.c0I93Q53i4ZmxpyT"}},"img":"systems/foundryvtt-reve-de-dragon/icons/entites/possession.webp","effects":[],"system":{"categorie_parade":"","niveau":2,"default_diffLibre":-4,"categorie":"melee","carac_value":14,"iscombat":true,"isnaturelle":true,"ispossession":true,"dommages":0,"description":"<p>L'entit&eacute; tente de prendre possession du corps de sa victime.</p>","descriptionmj":"","isparade":false},"ownership":{"default":0,"Hp9ImM4o9YRTSdfu":3},"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.22","coreVersion":"10.286","createdTime":1663624976822,"modifiedTime":1664918524164,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"},"folder":null,"sort":0,"_id":"wDHR5UHWq568lfGa"}

packs/vehicules.db

@@ -1,9 +1,9 @@
-{"_id":"0ZW71u9G8fqnyNfy","name":"Drakkar","type":"vehicule","sort":100001,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.vehicules.0ZW71u9G8fqnyNfy"}},"img":"systems/foundryvtt-reve-de-dragon/icons/vehicules/drakkar.webp","items":[],"effects":[],"system":{"categorie":"Bateau","resistance":28,"structure":12,"vitesse":"3/2/1","bonus":"(10)/+10/+14","manoeuvrabilite":"0/-2/-4","equipage":8,"capacite_encombrement":150,"etat":{"resistance":{"type":"number","max":28,"value":28,"label":"Résistance","derivee":false},"structure":{"type":"number","max":12,"value":12,"label":"Structure","derivee":false}},"description":"Description ...","race":"","notesmj":"Notes du MJ","attributs":{"malusarmure":{"value":0}}},"ownership":{"default":0,"rYShh2P1DNavdoBD":3},"prototypeToken":{"flags":{},"name":"Drakkar","displayName":0,"width":10,"height":10,"lockRotation":false,"rotation":0,"actorLink":false,"disposition":0,"displayBars":0,"bar1":{"attribute":"sante.vie"},"bar2":{"attribute":"sante.endurance"},"randomImg":false,"light":{"dim":0,"bright":0,"angle":360,"color":null,"alpha":1,"animation":{"type":null,"speed":5,"intensity":5,"reverse":false},"coloration":1,"attenuation":0.5,"luminosity":0.5,"saturation":0,"contrast":0,"shadows":0,"darkness":{"min":0,"max":1}},"texture":{"src":"systems/foundryvtt-reve-de-dragon/icons/vehicules/drakkar_token.webp","tint":null,"scaleX":1,"scaleY":1,"offsetX":0,"offsetY":0,"rotation":0},"sight":{"angle":360,"enabled":false,"range":0,"brightness":1,"visionMode":"basic","color":null,"attenuation":0.1,"saturation":0,"contrast":0},"alpha":1,"detectionModes":[]},"folder":null,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.21","coreVersion":"10.286","createdTime":1664231097623,"modifiedTime":1664231486338,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
-{"_id":"5FWY38a5emYmqisa","name":"Cariole","type":"vehicule","sort":100001,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.vehicules.5FWY38a5emYmqisa"}},"img":"systems/foundryvtt-reve-de-dragon/icons/vehicules/cariole.webp","items":[],"effects":[],"system":{"categorie":"Cariole à Bras","resistance":10,"structure":6,"vitesse":"","bonus":"","manoeuvrabilite":"","equipage":1,"capacite_encombrement":50,"etat":{"resistance":{"type":"number","max":10,"value":10,"label":"Résistance","derivee":false},"structure":{"type":"number","max":6,"value":6,"label":"Structure","derivee":false}},"description":"Description ...","race":"","notesmj":"Notes du MJ","attributs":{"malusarmure":{"value":0}}},"ownership":{"default":0,"rYShh2P1DNavdoBD":3},"prototypeToken":{"flags":{},"name":"Cariole","displayName":0,"width":2,"height":2,"lockRotation":false,"rotation":0,"actorLink":false,"disposition":0,"displayBars":0,"bar1":{"attribute":"sante.vie"},"bar2":{"attribute":"sante.endurance"},"randomImg":false,"light":{"dim":0,"bright":0,"angle":360,"color":null,"alpha":1,"animation":{"type":null,"speed":5,"intensity":5,"reverse":false},"coloration":1,"attenuation":0.5,"luminosity":0.5,"saturation":0,"contrast":0,"shadows":0,"darkness":{"min":0,"max":1}},"texture":{"src":"systems/foundryvtt-reve-de-dragon/icons/vehicules/cariole_token.webp","tint":null,"scaleX":1,"scaleY":1,"offsetX":0,"offsetY":0,"rotation":0},"sight":{"angle":360,"enabled":false,"range":0,"brightness":1,"visionMode":"basic","color":null,"attenuation":0.1,"saturation":0,"contrast":0},"alpha":1,"detectionModes":[]},"folder":null,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.21","coreVersion":"10.286","createdTime":1664231097624,"modifiedTime":1664231486337,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
-{"_id":"C0JpbzQSELoml971","name":"Canot","type":"vehicule","sort":100001,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.vehicules.C0JpbzQSELoml971"}},"img":"systems/foundryvtt-reve-de-dragon/icons/vehicules/canot.webp","items":[],"effects":[],"system":{"categorie":"Barque","resistance":14,"structure":6,"vitesse":"","bonus":"(2)/+3/+5","manoeuvrabilite":"","equipage":1,"capacite_encombrement":50,"etat":{"resistance":{"type":"number","max":14,"value":14,"label":"Résistance","derivee":false},"structure":{"type":"number","max":6,"value":6,"label":"Structure","derivee":false}},"description":"Description ...","race":"","notesmj":"Notes du MJ","attributs":{"malusarmure":{"value":0}}},"ownership":{"default":0,"rYShh2P1DNavdoBD":3},"prototypeToken":{"flags":{},"name":"Canot","displayName":0,"width":3,"height":3,"lockRotation":false,"rotation":0,"actorLink":false,"disposition":0,"displayBars":0,"bar1":{"attribute":"sante.vie"},"bar2":{"attribute":"sante.endurance"},"randomImg":false,"light":{"dim":0,"bright":0,"angle":360,"color":null,"alpha":1,"animation":{"type":null,"speed":5,"intensity":5,"reverse":false},"coloration":1,"attenuation":0.5,"luminosity":0.5,"saturation":0,"contrast":0,"shadows":0,"darkness":{"min":0,"max":1}},"texture":{"src":"systems/foundryvtt-reve-de-dragon/icons/vehicules/canot_token.webp","tint":null,"scaleX":1,"scaleY":1,"offsetX":0,"offsetY":0,"rotation":0},"sight":{"angle":360,"enabled":false,"range":0,"brightness":1,"visionMode":"basic","color":null,"attenuation":0.1,"saturation":0,"contrast":0},"alpha":1,"detectionModes":[]},"folder":null,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.21","coreVersion":"10.286","createdTime":1664231097625,"modifiedTime":1664231486336,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
-{"_id":"PoQUTsNThYDp6XAW","name":"Nef","type":"vehicule","sort":100001,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.vehicules.PoQUTsNThYDp6XAW"}},"img":"systems/foundryvtt-reve-de-dragon/icons/vehicules/nef.webp","items":[],"effects":[],"system":{"categorie":"Bateau","resistance":30,"structure":14,"vitesse":"5/4/2","bonus":"","manoeuvrabilite":"0/-3/-4","equipage":12,"capacite_encombrement":200,"etat":{"resistance":{"type":"number","max":30,"value":30,"label":"Résistance","derivee":false},"structure":{"type":"number","max":14,"value":14,"label":"Structure","derivee":false}},"description":"Description ...","race":"","notesmj":"Notes du MJ","attributs":{"malusarmure":{"value":0}}},"ownership":{"default":0,"rYShh2P1DNavdoBD":3},"prototypeToken":{"flags":{},"name":"Nef","displayName":0,"width":13,"height":13,"lockRotation":false,"rotation":0,"actorLink":false,"disposition":0,"displayBars":0,"bar1":{"attribute":"sante.vie"},"bar2":{"attribute":"sante.endurance"},"randomImg":false,"light":{"dim":0,"bright":0,"angle":360,"color":null,"alpha":1,"animation":{"type":null,"speed":5,"intensity":5,"reverse":false},"coloration":1,"attenuation":0.5,"luminosity":0.5,"saturation":0,"contrast":0,"shadows":0,"darkness":{"min":0,"max":1}},"texture":{"src":"systems/foundryvtt-reve-de-dragon/icons/vehicules/nef_token.webp","tint":null,"scaleX":1,"scaleY":1,"offsetX":0,"offsetY":0,"rotation":0},"sight":{"angle":360,"enabled":false,"range":0,"brightness":1,"visionMode":"basic","color":null,"attenuation":0.1,"saturation":0,"contrast":0},"alpha":1,"detectionModes":[]},"folder":null,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.21","coreVersion":"10.286","createdTime":1664231097626,"modifiedTime":1664231486339,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
-{"_id":"RFOYL8HBUxd32DXS","name":"Galère","type":"vehicule","sort":100001,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.vehicules.RFOYL8HBUxd32DXS"}},"img":"systems/foundryvtt-reve-de-dragon/icons/vehicules/galere.webp","items":[],"effects":[],"system":{"categorie":"Bateau","resistance":36,"structure":14,"vitesse":"2/2/1","bonus":"(12)/+12/+16","manoeuvrabilite":"0/-4/-6","equipage":10,"capacite_encombrement":300,"etat":{"resistance":{"type":"number","max":36,"value":36,"label":"Résistance","derivee":false},"structure":{"type":"number","max":14,"value":14,"label":"Structure","derivee":false}},"description":"Description ...","race":"","notesmj":"Notes du MJ","attributs":{"malusarmure":{"value":0}}},"ownership":{"default":0,"rYShh2P1DNavdoBD":3},"prototypeToken":{"flags":{},"name":"Galère","displayName":0,"width":14,"height":14,"lockRotation":false,"rotation":0,"actorLink":false,"disposition":0,"displayBars":0,"bar1":{"attribute":"sante.vie"},"bar2":{"attribute":"sante.endurance"},"randomImg":false,"light":{"dim":0,"bright":0,"angle":360,"color":null,"alpha":1,"animation":{"type":null,"speed":5,"intensity":5,"reverse":false},"coloration":1,"attenuation":0.5,"luminosity":0.5,"saturation":0,"contrast":0,"shadows":0,"darkness":{"min":0,"max":1}},"texture":{"src":"systems/foundryvtt-reve-de-dragon/icons/vehicules/galere_token.webp","tint":null,"scaleX":1,"scaleY":1,"offsetX":0,"offsetY":0,"rotation":0},"sight":{"angle":360,"enabled":false,"range":0,"brightness":1,"visionMode":"basic","color":null,"attenuation":0.1,"saturation":0,"contrast":0},"alpha":1,"detectionModes":[]},"folder":null,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.21","coreVersion":"10.286","createdTime":1664231097627,"modifiedTime":1664231486339,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
-{"_id":"TDpSn7GawJ1LCHp7","name":"Charette","type":"vehicule","sort":100001,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.vehicules.TDpSn7GawJ1LCHp7"}},"img":"systems/foundryvtt-reve-de-dragon/icons/vehicules/charette.webp","items":[],"effects":[],"system":{"categorie":"Chariot","resistance":16,"structure":8,"vitesse":"","bonus":"","manoeuvrabilite":"","equipage":1,"capacite_encombrement":100,"etat":{"resistance":{"type":"number","max":16,"value":16,"label":"Résistance","derivee":false},"structure":{"type":"number","max":8,"value":8,"label":"Structure","derivee":false}},"description":"Description ...","race":"","notesmj":"Notes du MJ","attributs":{"malusarmure":{"value":0}}},"ownership":{"default":0,"rYShh2P1DNavdoBD":3},"prototypeToken":{"flags":{},"name":"Charette","displayName":0,"width":3,"height":3,"lockRotation":false,"rotation":0,"actorLink":false,"disposition":0,"displayBars":0,"bar1":{"attribute":"sante.vie"},"bar2":{"attribute":"sante.endurance"},"randomImg":false,"light":{"dim":0,"bright":0,"angle":360,"color":null,"alpha":1,"animation":{"type":null,"speed":5,"intensity":5,"reverse":false},"coloration":1,"attenuation":0.5,"luminosity":0.5,"saturation":0,"contrast":0,"shadows":0,"darkness":{"min":0,"max":1}},"texture":{"src":"systems/foundryvtt-reve-de-dragon/icons/vehicules/charette_token.webp","tint":null,"scaleX":1.1,"scaleY":1.1,"offsetX":0,"offsetY":0,"rotation":0},"sight":{"angle":360,"enabled":false,"range":0,"brightness":1,"visionMode":"basic","color":null,"attenuation":0.1,"saturation":0,"contrast":0},"alpha":1,"detectionModes":[]},"folder":null,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.21","coreVersion":"10.286","createdTime":1664231097629,"modifiedTime":1664231486337,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
-{"_id":"ZiyRDzz3gGzlpLIc","name":"Barque","type":"vehicule","sort":100001,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.vehicules.ZiyRDzz3gGzlpLIc"}},"img":"systems/foundryvtt-reve-de-dragon/icons/vehicules/barque.webp","items":[],"effects":[],"system":{"categorie":"Barque","resistance":20,"structure":10,"vitesse":"3/2/1","bonus":"(4)/+4/+6","manoeuvrabilite":"0/0/-4","equipage":4,"capacite_encombrement":100,"etat":{"resistance":{"type":"number","max":20,"value":20,"label":"Résistance","derivee":false},"structure":{"type":"number","max":10,"value":10,"label":"Structure","derivee":false}},"description":"Description ...","race":"","notesmj":"Notes du MJ","attributs":{"malusarmure":{"value":0}}},"ownership":{"default":0,"rYShh2P1DNavdoBD":3},"prototypeToken":{"flags":{},"name":"Barque","displayName":0,"width":6,"height":6,"lockRotation":false,"rotation":0,"actorLink":false,"disposition":0,"displayBars":0,"bar1":{"attribute":"sante.vie"},"bar2":{"attribute":"sante.endurance"},"randomImg":false,"light":{"dim":0,"bright":0,"angle":360,"color":null,"alpha":1,"animation":{"type":null,"speed":5,"intensity":5,"reverse":false},"coloration":1,"attenuation":0.5,"luminosity":0.5,"saturation":0,"contrast":0,"shadows":0,"darkness":{"min":0,"max":1}},"texture":{"src":"systems/foundryvtt-reve-de-dragon/icons/vehicules/barque_token.webp","tint":null,"scaleX":1,"scaleY":1,"offsetX":0,"offsetY":0,"rotation":0},"sight":{"angle":360,"enabled":false,"range":0,"brightness":1,"visionMode":"basic","color":null,"attenuation":0.1,"saturation":0,"contrast":0},"alpha":1,"detectionModes":[]},"folder":null,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.21","coreVersion":"10.286","createdTime":1664231097629,"modifiedTime":1664231486336,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
-{"_id":"gM77co80kmpVsYg6","name":"Posé par terre","type":"vehicule","sort":100001,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.vehicules.gM77co80kmpVsYg6"}},"img":"systems/foundryvtt-reve-de-dragon/icons/templates/icone_parchement_vierge.webp","items":[],"effects":[],"system":{"categorie":"Autre","resistance":0,"structure":0,"vitesse":"","bonus":"","manoeuvrabilite":"","equipage":0,"capacite_encombrement":100,"etat":{"resistance":{"type":"number","max":0,"value":0,"label":"Résistance","derivee":false},"structure":{"type":"number","max":0,"value":0,"label":"Structure","derivee":false}},"description":"<p>D&eacute;poser ici les objets que vous voulez &eacute;changer avec d'autres joueurs</p>","race":"","notesmj":"","attributs":{"malusarmure":{"value":0}}},"ownership":{"default":0,"Q2G6GTdrotKzYGUC":3},"prototypeToken":{"flags":{},"name":"Posé par terre","displayName":0,"width":1,"height":1,"lockRotation":false,"rotation":0,"actorLink":true,"disposition":0,"displayBars":0,"bar1":{"attribute":"sante.vie"},"bar2":{"attribute":"sante.endurance"},"randomImg":false,"light":{"dim":0,"bright":0,"angle":360,"color":null,"alpha":1,"animation":{"type":null,"speed":5,"intensity":5,"reverse":false},"coloration":1,"attenuation":0.5,"luminosity":0.5,"saturation":0,"contrast":0,"shadows":0,"darkness":{"min":0,"max":1}},"texture":{"src":"systems/foundryvtt-reve-de-dragon/icons/templates/icone_parchement_vierge.webp","tint":null,"scaleX":1,"scaleY":1,"offsetX":0,"offsetY":0,"rotation":0},"sight":{"angle":360,"enabled":false,"range":0,"brightness":1,"visionMode":"basic","color":null,"attenuation":0.1,"saturation":0,"contrast":0},"alpha":1,"detectionModes":[]},"folder":null,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.21","coreVersion":"10.286","createdTime":1664231097630,"modifiedTime":1664231486340,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
-{"_id":"idyDmDWYpQ4Eppen","name":"Chariot","type":"vehicule","sort":100001,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.vehicules.idyDmDWYpQ4Eppen"}},"img":"systems/foundryvtt-reve-de-dragon/icons/vehicules/chariot.webp","items":[],"effects":[],"system":{"categorie":"Chariot","resistance":20,"structure":10,"vitesse":"","bonus":"","manoeuvrabilite":"","equipage":1,"capacite_encombrement":150,"etat":{"resistance":{"type":"number","max":20,"value":20,"label":"Résistance","derivee":false},"structure":{"type":"number","max":10,"value":10,"label":"Structure","derivee":false}},"description":"Description ...","race":"","notesmj":"Notes du MJ","attributs":{"malusarmure":{"value":0}}},"ownership":{"default":0,"rYShh2P1DNavdoBD":3},"prototypeToken":{"flags":{},"name":"Chariot","displayName":0,"width":4,"height":4,"lockRotation":false,"rotation":0,"actorLink":false,"disposition":0,"displayBars":0,"bar1":{"attribute":"sante.vie"},"bar2":{"attribute":"sante.endurance"},"randomImg":false,"light":{"dim":0,"bright":0,"angle":360,"color":null,"alpha":1,"animation":{"type":null,"speed":5,"intensity":5,"reverse":false},"coloration":1,"attenuation":0.5,"luminosity":0.5,"saturation":0,"contrast":0,"shadows":0,"darkness":{"min":0,"max":1}},"texture":{"src":"systems/foundryvtt-reve-de-dragon/icons/vehicules/chariot_token.webp","tint":null,"scaleX":1.4,"scaleY":1.4,"offsetX":0,"offsetY":0,"rotation":0},"sight":{"angle":360,"enabled":false,"range":0,"brightness":1,"visionMode":"basic","color":null,"attenuation":0.1,"saturation":0,"contrast":0},"alpha":1,"detectionModes":[]},"folder":null,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.21","coreVersion":"10.286","createdTime":1664231097632,"modifiedTime":1664231486338,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
+{"_id":"0ZW71u9G8fqnyNfy","name":"Drakkar","type":"vehicule","sort":100001,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.vehicules.0ZW71u9G8fqnyNfy"}},"img":"systems/foundryvtt-reve-de-dragon/icons/vehicules/drakkar.webp","items":[],"effects":[],"system":{"categorie":"Bateau","resistance":28,"structure":12,"vitesse":"3/2/1","bonus":"(10)/+10/+14","manoeuvrabilite":"0/-2/-4","equipage":8,"capacite_encombrement":150,"etat":{"resistance":{"type":"number","max":28,"value":28,"label":"Résistance","derivee":false},"structure":{"type":"number","max":12,"value":12,"label":"Structure","derivee":false}},"description":"Description ...","race":"","notesmj":"Notes du MJ"},"ownership":{"default":0,"rYShh2P1DNavdoBD":3},"prototypeToken":{"flags":{},"name":"Drakkar","displayName":0,"width":10,"height":10,"lockRotation":false,"rotation":0,"actorLink":false,"disposition":0,"displayBars":0,"bar1":{"attribute":"sante.vie"},"bar2":{"attribute":"sante.endurance"},"randomImg":false,"light":{"dim":0,"bright":0,"angle":360,"color":null,"alpha":1,"animation":{"type":null,"speed":5,"intensity":5,"reverse":false},"coloration":1,"attenuation":0.5,"luminosity":0.5,"saturation":0,"contrast":0,"shadows":0,"darkness":{"min":0,"max":1}},"texture":{"src":"systems/foundryvtt-reve-de-dragon/icons/vehicules/drakkar_token.webp","tint":null,"scaleX":1,"scaleY":1,"offsetX":0,"offsetY":0,"rotation":0},"sight":{"angle":360,"enabled":false,"range":0,"brightness":1,"visionMode":"basic","color":null,"attenuation":0.1,"saturation":0,"contrast":0},"alpha":1,"detectionModes":[]},"folder":null,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.21","coreVersion":"10.286","createdTime":1664231097623,"modifiedTime":1664231486338,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
+{"_id":"5FWY38a5emYmqisa","name":"Cariole","type":"vehicule","sort":100001,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.vehicules.5FWY38a5emYmqisa"}},"img":"systems/foundryvtt-reve-de-dragon/icons/vehicules/cariole.webp","items":[],"effects":[],"system":{"categorie":"Cariole à Bras","resistance":10,"structure":6,"vitesse":"","bonus":"","manoeuvrabilite":"","equipage":1,"capacite_encombrement":50,"etat":{"resistance":{"type":"number","max":10,"value":10,"label":"Résistance","derivee":false},"structure":{"type":"number","max":6,"value":6,"label":"Structure","derivee":false}},"description":"Description ...","race":"","notesmj":"Notes du MJ"},"ownership":{"default":0,"rYShh2P1DNavdoBD":3},"prototypeToken":{"flags":{},"name":"Cariole","displayName":0,"width":2,"height":2,"lockRotation":false,"rotation":0,"actorLink":false,"disposition":0,"displayBars":0,"bar1":{"attribute":"sante.vie"},"bar2":{"attribute":"sante.endurance"},"randomImg":false,"light":{"dim":0,"bright":0,"angle":360,"color":null,"alpha":1,"animation":{"type":null,"speed":5,"intensity":5,"reverse":false},"coloration":1,"attenuation":0.5,"luminosity":0.5,"saturation":0,"contrast":0,"shadows":0,"darkness":{"min":0,"max":1}},"texture":{"src":"systems/foundryvtt-reve-de-dragon/icons/vehicules/cariole_token.webp","tint":null,"scaleX":1,"scaleY":1,"offsetX":0,"offsetY":0,"rotation":0},"sight":{"angle":360,"enabled":false,"range":0,"brightness":1,"visionMode":"basic","color":null,"attenuation":0.1,"saturation":0,"contrast":0},"alpha":1,"detectionModes":[]},"folder":null,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.21","coreVersion":"10.286","createdTime":1664231097624,"modifiedTime":1664231486337,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
+{"_id":"C0JpbzQSELoml971","name":"Canot","type":"vehicule","sort":100001,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.vehicules.C0JpbzQSELoml971"}},"img":"systems/foundryvtt-reve-de-dragon/icons/vehicules/canot.webp","items":[],"effects":[],"system":{"categorie":"Barque","resistance":14,"structure":6,"vitesse":"","bonus":"(2)/+3/+5","manoeuvrabilite":"","equipage":1,"capacite_encombrement":50,"etat":{"resistance":{"type":"number","max":14,"value":14,"label":"Résistance","derivee":false},"structure":{"type":"number","max":6,"value":6,"label":"Structure","derivee":false}},"description":"Description ...","race":"","notesmj":"Notes du MJ"},"ownership":{"default":0,"rYShh2P1DNavdoBD":3},"prototypeToken":{"flags":{},"name":"Canot","displayName":0,"width":3,"height":3,"lockRotation":false,"rotation":0,"actorLink":false,"disposition":0,"displayBars":0,"bar1":{"attribute":"sante.vie"},"bar2":{"attribute":"sante.endurance"},"randomImg":false,"light":{"dim":0,"bright":0,"angle":360,"color":null,"alpha":1,"animation":{"type":null,"speed":5,"intensity":5,"reverse":false},"coloration":1,"attenuation":0.5,"luminosity":0.5,"saturation":0,"contrast":0,"shadows":0,"darkness":{"min":0,"max":1}},"texture":{"src":"systems/foundryvtt-reve-de-dragon/icons/vehicules/canot_token.webp","tint":null,"scaleX":1,"scaleY":1,"offsetX":0,"offsetY":0,"rotation":0},"sight":{"angle":360,"enabled":false,"range":0,"brightness":1,"visionMode":"basic","color":null,"attenuation":0.1,"saturation":0,"contrast":0},"alpha":1,"detectionModes":[]},"folder":null,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.21","coreVersion":"10.286","createdTime":1664231097625,"modifiedTime":1664231486336,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
+{"_id":"PoQUTsNThYDp6XAW","name":"Nef","type":"vehicule","sort":100001,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.vehicules.PoQUTsNThYDp6XAW"}},"img":"systems/foundryvtt-reve-de-dragon/icons/vehicules/nef.webp","items":[],"effects":[],"system":{"categorie":"Bateau","resistance":30,"structure":14,"vitesse":"5/4/2","bonus":"","manoeuvrabilite":"0/-3/-4","equipage":12,"capacite_encombrement":200,"etat":{"resistance":{"type":"number","max":30,"value":30,"label":"Résistance","derivee":false},"structure":{"type":"number","max":14,"value":14,"label":"Structure","derivee":false}},"description":"Description ...","race":"","notesmj":"Notes du MJ"},"ownership":{"default":0,"rYShh2P1DNavdoBD":3},"prototypeToken":{"flags":{},"name":"Nef","displayName":0,"width":13,"height":13,"lockRotation":false,"rotation":0,"actorLink":false,"disposition":0,"displayBars":0,"bar1":{"attribute":"sante.vie"},"bar2":{"attribute":"sante.endurance"},"randomImg":false,"light":{"dim":0,"bright":0,"angle":360,"color":null,"alpha":1,"animation":{"type":null,"speed":5,"intensity":5,"reverse":false},"coloration":1,"attenuation":0.5,"luminosity":0.5,"saturation":0,"contrast":0,"shadows":0,"darkness":{"min":0,"max":1}},"texture":{"src":"systems/foundryvtt-reve-de-dragon/icons/vehicules/nef_token.webp","tint":null,"scaleX":1,"scaleY":1,"offsetX":0,"offsetY":0,"rotation":0},"sight":{"angle":360,"enabled":false,"range":0,"brightness":1,"visionMode":"basic","color":null,"attenuation":0.1,"saturation":0,"contrast":0},"alpha":1,"detectionModes":[]},"folder":null,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.21","coreVersion":"10.286","createdTime":1664231097626,"modifiedTime":1664231486339,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
+{"_id":"RFOYL8HBUxd32DXS","name":"Galère","type":"vehicule","sort":100001,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.vehicules.RFOYL8HBUxd32DXS"}},"img":"systems/foundryvtt-reve-de-dragon/icons/vehicules/galere.webp","items":[],"effects":[],"system":{"categorie":"Bateau","resistance":36,"structure":14,"vitesse":"2/2/1","bonus":"(12)/+12/+16","manoeuvrabilite":"0/-4/-6","equipage":10,"capacite_encombrement":300,"etat":{"resistance":{"type":"number","max":36,"value":36,"label":"Résistance","derivee":false},"structure":{"type":"number","max":14,"value":14,"label":"Structure","derivee":false}},"description":"Description ...","race":"","notesmj":"Notes du MJ"},"ownership":{"default":0,"rYShh2P1DNavdoBD":3},"prototypeToken":{"flags":{},"name":"Galère","displayName":0,"width":14,"height":14,"lockRotation":false,"rotation":0,"actorLink":false,"disposition":0,"displayBars":0,"bar1":{"attribute":"sante.vie"},"bar2":{"attribute":"sante.endurance"},"randomImg":false,"light":{"dim":0,"bright":0,"angle":360,"color":null,"alpha":1,"animation":{"type":null,"speed":5,"intensity":5,"reverse":false},"coloration":1,"attenuation":0.5,"luminosity":0.5,"saturation":0,"contrast":0,"shadows":0,"darkness":{"min":0,"max":1}},"texture":{"src":"systems/foundryvtt-reve-de-dragon/icons/vehicules/galere_token.webp","tint":null,"scaleX":1,"scaleY":1,"offsetX":0,"offsetY":0,"rotation":0},"sight":{"angle":360,"enabled":false,"range":0,"brightness":1,"visionMode":"basic","color":null,"attenuation":0.1,"saturation":0,"contrast":0},"alpha":1,"detectionModes":[]},"folder":null,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.21","coreVersion":"10.286","createdTime":1664231097627,"modifiedTime":1664231486339,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
+{"_id":"TDpSn7GawJ1LCHp7","name":"Charette","type":"vehicule","sort":100001,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.vehicules.TDpSn7GawJ1LCHp7"}},"img":"systems/foundryvtt-reve-de-dragon/icons/vehicules/charette.webp","items":[],"effects":[],"system":{"categorie":"Chariot","resistance":16,"structure":8,"vitesse":"","bonus":"","manoeuvrabilite":"","equipage":1,"capacite_encombrement":100,"etat":{"resistance":{"type":"number","max":16,"value":16,"label":"Résistance","derivee":false},"structure":{"type":"number","max":8,"value":8,"label":"Structure","derivee":false}},"description":"Description ...","race":"","notesmj":"Notes du MJ"},"ownership":{"default":0,"rYShh2P1DNavdoBD":3},"prototypeToken":{"flags":{},"name":"Charette","displayName":0,"width":3,"height":3,"lockRotation":false,"rotation":0,"actorLink":false,"disposition":0,"displayBars":0,"bar1":{"attribute":"sante.vie"},"bar2":{"attribute":"sante.endurance"},"randomImg":false,"light":{"dim":0,"bright":0,"angle":360,"color":null,"alpha":1,"animation":{"type":null,"speed":5,"intensity":5,"reverse":false},"coloration":1,"attenuation":0.5,"luminosity":0.5,"saturation":0,"contrast":0,"shadows":0,"darkness":{"min":0,"max":1}},"texture":{"src":"systems/foundryvtt-reve-de-dragon/icons/vehicules/charette_token.webp","tint":null,"scaleX":1.1,"scaleY":1.1,"offsetX":0,"offsetY":0,"rotation":0},"sight":{"angle":360,"enabled":false,"range":0,"brightness":1,"visionMode":"basic","color":null,"attenuation":0.1,"saturation":0,"contrast":0},"alpha":1,"detectionModes":[]},"folder":null,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.21","coreVersion":"10.286","createdTime":1664231097629,"modifiedTime":1664231486337,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
+{"_id":"ZiyRDzz3gGzlpLIc","name":"Barque","type":"vehicule","sort":100001,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.vehicules.ZiyRDzz3gGzlpLIc"}},"img":"systems/foundryvtt-reve-de-dragon/icons/vehicules/barque.webp","items":[],"effects":[],"system":{"categorie":"Barque","resistance":20,"structure":10,"vitesse":"3/2/1","bonus":"(4)/+4/+6","manoeuvrabilite":"0/0/-4","equipage":4,"capacite_encombrement":100,"etat":{"resistance":{"type":"number","max":20,"value":20,"label":"Résistance","derivee":false},"structure":{"type":"number","max":10,"value":10,"label":"Structure","derivee":false}},"description":"Description ...","race":"","notesmj":"Notes du MJ"},"ownership":{"default":0,"rYShh2P1DNavdoBD":3},"prototypeToken":{"flags":{},"name":"Barque","displayName":0,"width":6,"height":6,"lockRotation":false,"rotation":0,"actorLink":false,"disposition":0,"displayBars":0,"bar1":{"attribute":"sante.vie"},"bar2":{"attribute":"sante.endurance"},"randomImg":false,"light":{"dim":0,"bright":0,"angle":360,"color":null,"alpha":1,"animation":{"type":null,"speed":5,"intensity":5,"reverse":false},"coloration":1,"attenuation":0.5,"luminosity":0.5,"saturation":0,"contrast":0,"shadows":0,"darkness":{"min":0,"max":1}},"texture":{"src":"systems/foundryvtt-reve-de-dragon/icons/vehicules/barque_token.webp","tint":null,"scaleX":1,"scaleY":1,"offsetX":0,"offsetY":0,"rotation":0},"sight":{"angle":360,"enabled":false,"range":0,"brightness":1,"visionMode":"basic","color":null,"attenuation":0.1,"saturation":0,"contrast":0},"alpha":1,"detectionModes":[]},"folder":null,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.21","coreVersion":"10.286","createdTime":1664231097629,"modifiedTime":1664231486336,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
+{"_id":"gM77co80kmpVsYg6","name":"Posé par terre","type":"vehicule","sort":100001,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.vehicules.gM77co80kmpVsYg6"}},"img":"systems/foundryvtt-reve-de-dragon/icons/templates/icone_parchement_vierge.webp","items":[],"effects":[],"system":{"categorie":"Autre","resistance":0,"structure":0,"vitesse":"","bonus":"","manoeuvrabilite":"","equipage":0,"capacite_encombrement":100,"etat":{"resistance":{"type":"number","max":0,"value":0,"label":"Résistance","derivee":false},"structure":{"type":"number","max":0,"value":0,"label":"Structure","derivee":false}},"description":"<p>D&eacute;poser ici les objets que vous voulez &eacute;changer avec d'autres joueurs</p>","race":"","notesmj":""},"ownership":{"default":0,"Q2G6GTdrotKzYGUC":3},"prototypeToken":{"flags":{},"name":"Posé par terre","displayName":0,"width":1,"height":1,"lockRotation":false,"rotation":0,"actorLink":true,"disposition":0,"displayBars":0,"bar1":{"attribute":"sante.vie"},"bar2":{"attribute":"sante.endurance"},"randomImg":false,"light":{"dim":0,"bright":0,"angle":360,"color":null,"alpha":1,"animation":{"type":null,"speed":5,"intensity":5,"reverse":false},"coloration":1,"attenuation":0.5,"luminosity":0.5,"saturation":0,"contrast":0,"shadows":0,"darkness":{"min":0,"max":1}},"texture":{"src":"systems/foundryvtt-reve-de-dragon/icons/templates/icone_parchement_vierge.webp","tint":null,"scaleX":1,"scaleY":1,"offsetX":0,"offsetY":0,"rotation":0},"sight":{"angle":360,"enabled":false,"range":0,"brightness":1,"visionMode":"basic","color":null,"attenuation":0.1,"saturation":0,"contrast":0},"alpha":1,"detectionModes":[]},"folder":null,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.21","coreVersion":"10.286","createdTime":1664231097630,"modifiedTime":1664231486340,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}
+{"_id":"idyDmDWYpQ4Eppen","name":"Chariot","type":"vehicule","sort":100001,"flags":{"core":{"sourceId":"Compendium.foundryvtt-reve-de-dragon.vehicules.idyDmDWYpQ4Eppen"}},"img":"systems/foundryvtt-reve-de-dragon/icons/vehicules/chariot.webp","items":[],"effects":[],"system":{"categorie":"Chariot","resistance":20,"structure":10,"vitesse":"","bonus":"","manoeuvrabilite":"","equipage":1,"capacite_encombrement":150,"etat":{"resistance":{"type":"number","max":20,"value":20,"label":"Résistance","derivee":false},"structure":{"type":"number","max":10,"value":10,"label":"Structure","derivee":false}},"description":"Description ...","race":"","notesmj":"Notes du MJ"},"ownership":{"default":0,"rYShh2P1DNavdoBD":3},"prototypeToken":{"flags":{},"name":"Chariot","displayName":0,"width":4,"height":4,"lockRotation":false,"rotation":0,"actorLink":false,"disposition":0,"displayBars":0,"bar1":{"attribute":"sante.vie"},"bar2":{"attribute":"sante.endurance"},"randomImg":false,"light":{"dim":0,"bright":0,"angle":360,"color":null,"alpha":1,"animation":{"type":null,"speed":5,"intensity":5,"reverse":false},"coloration":1,"attenuation":0.5,"luminosity":0.5,"saturation":0,"contrast":0,"shadows":0,"darkness":{"min":0,"max":1}},"texture":{"src":"systems/foundryvtt-reve-de-dragon/icons/vehicules/chariot_token.webp","tint":null,"scaleX":1.4,"scaleY":1.4,"offsetX":0,"offsetY":0,"rotation":0},"sight":{"angle":360,"enabled":false,"range":0,"brightness":1,"visionMode":"basic","color":null,"attenuation":0.1,"saturation":0,"contrast":0},"alpha":1,"detectionModes":[]},"folder":null,"_stats":{"systemId":"foundryvtt-reve-de-dragon","systemVersion":"10.0.21","coreVersion":"10.286","createdTime":1664231097632,"modifiedTime":1664231486338,"lastModifiedBy":"Hp9ImM4o9YRTSdfu"}}

styles/img/ui/appel-chance.svg

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="80.64064mm"
+   height="87.145065mm"
+   viewBox="0 0 80.64064 87.145065"
+   version="1.1"
+   id="svg857"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
+   sodipodi:docname="appel-chance.svg">
+  <defs
+     id="defs851" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.3758788"
+     inkscape:cx="275.41114"
+     inkscape:cy="237.41072"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     inkscape:document-rotation="0"
+     showgrid="false"
+     inkscape:window-width="3840"
+     inkscape:window-height="2054"
+     inkscape:window-x="-11"
+     inkscape:window-y="-11"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata854">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-65.513013,-104.59413)">
+    <g
+       id="g7"
+       transform="matrix(0.26458333,0,0,0.26458333,66.057598,105.25559)"
+       style="image-rendering:auto;fill:#ffffff;stroke:none">
+      <title
+         id="title4">Layer 1</title>
+      <path
+         fill="#ffffff"
+         fill-rule="evenodd"
+         stroke="#000000"
+         stroke-width="8"
+         id="path2"
+         d="m 206.5,1.5 q 8.5,0 15,3 6.5,3 12.25,8.25 5.75,5.25 12.5,15.5 Q 253,38.5 259.5,43 266,47.5 273.75,52.25 281.5,57 285.5,63 q 4,6 5.75,11.5 1.75,5.5 0,18 -1.75,12.5 -5.75,20 -4,7.5 -12.75,14.25 -8.75,6.75 -17.25,10.75 -8.5,4 -15,6 -6.5,2 -28.75,4.25 -22.25,2.25 -23,3 l -0.75,0.75 0.5,1.25 q 0.5,1.25 32,0.5 31.5,-0.75 43.5,2.75 12,3.5 18.25,8.25 6.25,4.75 9.75,10.25 3.5,5.5 5.5,10.5 2,5 0.5,19.5 -1.5,14.5 -4.75,19.75 -3.25,5.25 -3.75,6.5 l -0.5,1.25 -4.25,2.5 q -4.25,2.5 -10.25,10.5 -6,8 -10,16.5 -4,8.5 -6.75,12.25 -2.75,3.75 -5.25,5.5 -2.5,1.75 -4,4 -1.5,2.25 -9.5,6.25 -8,4 -18.5,2.5 Q 210,290.5 202.75,285.25 195.5,280 190.5,275 q -5,-5 -10.25,-12.25 -5.25,-7.25 -7,-10.5 Q 171.5,249 169,237 q -2.5,-12 -5.5,-21 l -3,-9 -1.5,6.5 q -1.5,6.5 0,28.5 1.5,22 6.5,35 5,13 9.25,18.25 4.25,5.25 10,10.5 5.75,5.25 4.75,10.75 -1,5.5 -1.25,5.75 L 188,322.5 181,321 q -7,-1.5 -13.75,-7.25 Q 160.5,308 156,301.5 q -4.5,-6.5 -8.5,-17 -4,-10.5 -5.5,-20.5 -1.5,-10 -0.25,-36.25 l 1.25,-26.25 -3.25,0.75 q -3.25,0.75 -4.75,5.25 -1.5,4.5 -5.5,29.5 -4,25 -8,32.5 -4,7.5 -7.25,10.75 -3.25,3.25 -8.25,6.75 -5,3.5 -11,5.5 -6,2 -19,0.5 Q 63,291.5 57,288 51,284.5 43.25,274.75 35.5,265 31.75,257 L 28,249 26.5,247.75 Q 25,246.5 20.75,242.75 16.5,239 10,230.5 3.5,222 2.5,219 1.5,216 3,202.5 4.5,189 9.5,181 14.5,173 21.75,167.25 29,161.5 37,158.5 q 8,-3 36.5,-3.5 28.5,-0.5 30.75,-2.75 l 2.25,-2.25 -1.25,-1.25 Q 104,147.5 74,145 44,142.5 30.5,136.5 17,130.5 11.75,125.25 6.5,120 4.5,116.5 2.5,113 2,103.5 1.5,94 5.25,84.75 9,75.5 21.5,65 34,54.5 35,54.25 L 36,54 37.5,51.25 Q 39,48.5 46.25,39.25 53.5,30 57.25,25.75 61,21.5 68,16 75,10.5 83,8 91,5.5 97,6 q 6,0.5 14,4 8,3.5 14.25,9.25 6.25,5.75 9.25,12.25 3,6.5 4.5,15.5 1.5,9 4.25,34 2.75,25 3.75,25 h 1 l 0.75,-2.5 Q 149.5,101 151.5,72 153.5,43 155,39.5 156.5,36 162.25,27.75 168,19.5 176,13.5 q 8,-6 15,-9 7,-3 15.5,-3 z"
+         style="fill:#ffffff;stroke:none" />
+    </g>
+  </g>
+</svg>

styles/simple.css

@@ -93,7 +93,7 @@
 .sheet nav.sheet-tabs {
   font-family: "CaslonAntique";
 } /* For nav and title */
-.window-app input, .foundryvtt-reve-de-dragon .item-form, .sheet header.sheet-header .flex-group-center.flex-compteurs, .sheet header.sheet-header .flex-group-center.flex-fatigue, select, button, .item-checkbox, #sidebar, #players, #navigation #nav-toggle {
+.window-app input, .foundryvtt-reve-de-dragon .item-form, .sheet header.sheet-header .flex-compteurs, .sheet header.sheet-header .flex-group-center.flex-fatigue, select, button, .item-checkbox, #sidebar, #players, #navigation #nav-toggle {
   font-family: "CaslonAntique"; /* For sheet parts */
 }
 
@@ -332,9 +332,9 @@ input:is(.blessure-premiers_soins, .blessure-soins_complets) {
 }
 .button-img {
   vertical-align: baseline;
-  width: 8%;
-  height: 8%;
-  max-height: 48px;
+  width: 32px;
+  height: 32px;
+  max-height: 36px;
   border-width: 0;
   border: 1px solid rgba(0, 0, 0, 0);
 }
@@ -409,10 +409,11 @@ input:is(.blessure-premiers_soins, .blessure-soins_complets) {
   flex-wrap: nowrap;
   justify-content: stretch;
 }
-.rdd.sheet .window-content .sheet-body .carac-list .caracteristique.vehicle {
+.rdd.sheet .window-content .sheet-body .carac-list .caracteristique.streched {
   flex-wrap: nowrap;
   justify-content: stretch;
   flex-basis: 7.5em;
+  width: max-content;
 }
 
 .rdd.sheet .window-content .sheet-body .carac-list .caracteristique > .carac-label {
@@ -638,7 +639,14 @@ section.sheet-body{padding: 0.25rem 0.5rem;}
   margin: 0.5rem 0 0.5rem  0.5rem;
   padding: 0;
 }
-
+.sheet header.sheet-header h1 {
+  flex: 3;
+}
+.sheet header.sheet-header img.button-img{
+  height: 48px;
+  padding: 1px;
+  margin: 1px;
+}
 .sheet nav.sheet-tabs {
   font-size: 0.65rem;
   font-weight: bold;
@@ -680,9 +688,13 @@ section.sheet-body:after {
   clear: both;
 }
 
-.sheet header.sheet-header .flex-compteurs {text-align: right;}
+.sheet header.sheet-header .flex-compteurs { text-align: right; max-width: max-content;}
 .sheet header.sheet-header .resource-content {width: 2rem;}
 
+li label.compteur {
+  display: inline-block;
+  flex-direction: row;
+}
 .compteur span {
   display: inline-block;
   text-align: left;

system.json

@@ -34,10 +34,10 @@
   ],
   "url": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/",
   "license": "LICENSE.txt",
-  "version": "10.0.22",
+  "version": "10.0.27",
   "compatibility": {
     "minimum": "10",
-    "verified": "10.286"
+    "verified": "10.287"
   },
   "esmodules": [
     "module/rdd-main.js"
@@ -333,7 +333,7 @@
   ],
   "socket": true,
   "manifest": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/raw/v10/system.json",
-  "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-10.0.22.zip",
+  "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-10.0.27.zip",
   "gridDistance": 1,
   "gridUnits": "m",
   "primaryTokenAttribute": "sante.vie",

template.json

@@ -238,7 +238,7 @@
         }        
       }
     },
-    "common": {
+    "personnage": {
       "carac": {
         "taille": {
           "type": "number",
@@ -574,7 +574,7 @@
     }    
   },
   "personnage": {
-    "templates": [ "background", "common", "subacteurs" ]
+    "templates": [ "personnage", "background", "subacteurs" ]
   },
   "creature": {
     "templates": [ "creature", "description" ]

templates/actor-creature-sheet.html

@@ -2,33 +2,33 @@
 
   {{!-- Sheet Header --}}
   <header class="sheet-header">
-    <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}" />
     <div class="header-fields">
       <div class="flexrow">
-        <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name" /></h1>
-      </div>
-      <div class="flexrow flex-group-center flex-actions-bar">
-        <div>
+        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}" />
+        <h1 class="charname flex-grow"><input name="name" type="text" value="{{name}}" placeholder="Name" /></h1>
+        <div class="flex-group-center">
           <span class="encaisser-direct"><a title="Encaisser des dommages"><img class="button-img" src="icons/svg/bones.svg" alt="Encaisser des dommages"/></a></span>
-          <span class="gm-only remise-a-neuf"><a title="Remise à neuf"><img class="button-img" src="icons/svg/regen.svg" alt="Remise à neuf"/></a></span>
+          {{#if @root.options.isGM}}
+          <span class="remise-a-neuf"><a title="Remise à neuf"><img class="button-img" src="icons/svg/regen.svg" alt="Remise à neuf"/></a></span>
+          {{/if}}
         </div>
       </div>
-      <div class="flexrow">
-        <div class="flexrow">
-          <span>{{calc.resumeBlessures}}</span>
+      <div class="flex-group-left flexrow">
+        {{>"systems/foundryvtt-reve-de-dragon/templates/actor/header-compteurs-creature.html"}}
+        <div class="flex-group-center">
+          <span>
+            {{calc.resumeBlessures}}
+            &hyphen; Etat Général : {{system.compteurs.etat.value}}
+          </span>
+          {{>"systems/foundryvtt-reve-de-dragon/templates/actor/header-effects.html"}}
         </div>
-        <div class="flexrow">
-          {{>"systems/foundryvtt-reve-de-dragon/templates/actor/effects.html"}}
-        </div>
-    </div>
+      </div>
     </div>
   </header>
 
   {{!-- Sheet Tab Navigation --}}
   <nav class="sheet-tabs tabs" data-group="primary">
     <a class="item" data-tab="carac">Caractéristiques</a>
-    <a class="item" data-tab="competences">Compétences</a>
-    <a class="item" data-tab="blessures">Blessures</a>
     <a class="item" data-tab="items">Équipement</a>
     <a class="item" data-tab="description">Description</a>
   </nav>
@@ -36,91 +36,21 @@
   {{!-- Sheet Body --}}
   <section class="sheet-body">
 
-    {{!-- Carac Tab --}}
+    {{!-- Carac & compétences --}}
     <div class="tab items" data-group="primary" data-tab="carac">
+      <div class="flexrow">
+        {{>"systems/foundryvtt-reve-de-dragon/templates/actor/vue-detaillee.html"}}
+      </div>
       <div class="grid grid-2col">
         <div class="flex-group-left flexcol">
-          <ol class="carac-list alterne-list">
-            {{#each system.carac as |carac key|}}
-            <li class="flexrow list-item" data-attribute="{{key}}">
-              {{#if (eq key 'taille')}}
-              <span class="carac-label flexrow" name="system.carac.{{key}}.label">{{carac.label}}</span>
-              {{else}}
-              <span class="carac-label flexrow" name="system.carac.{{key}}.label"><a
-                  name={{key}}>{{carac.label}}</a></span>
-              {{/if}}
-              <input class="competence-value flexrow" type="text" name="system.carac.{{key}}.value"
-                value="{{carac.value}}" data-dtype="{{carac.type}}" />
-            </li>
-            {{/each}}
-            <li class="flexrow">
-              <span class="carac-label" name="carac-total">Total Caractéristiques</span>
-              <span class="competence-value" name="carac-total-value">{{calc.caracTotal}}</span>
-            </li>
-          </ol>
+          {{>"systems/foundryvtt-reve-de-dragon/templates/actor/carac-main.html"}}
+          {{>"systems/foundryvtt-reve-de-dragon/templates/actor/carac-creature.html"}}
         </div>
-        <div class="flex-group-left flexcol">
-          <ol class="carac-list alterne-list">
-            {{#each system.attributs as |attr key|}}
-            <li class="flexrow list-item" data-attribute="{{key}}">
-              <span class="carac-label" name="system.attributs.{{key}}.label">{{attr.label}}</span>
-              <input type="text" name="system.attributs.{{key}}.value" value="{{attr.value}}" data-dtype="{{attr.type}}" />
-            </li>
-            {{/each}}
-            <li class="flexrow list-item" data-attribute="vie">
-              <span class="competence-label" name="system.sante.vie.label">Vie</span>
-              <span class="flexrow" >
-                <input type="text" name="system.sante.vie.value" value="{{system.sante.vie.value}}" data-dtype="Number" /> / 
-                <input type="text" name="system.sante.vie.max" value="{{system.sante.vie.max}}" data-dtype="Number" />
-              </span>
-            </li>
-            <li class="flexrow list-item" data-attribute="endurance">
-              <span class="competence-label" name="system.sante.endurance.label">Endurance</span>
-              <span class="flexrow" >
-                <input type="text" name="system.sante.endurance.value" value="{{system.sante.endurance.value}}" data-dtype="Number" /> / 
-                <input type="text" name="system.sante.endurance.max" value="{{system.sante.endurance.max}}" data-dtype="Number" />
-              </span>
-            </li>
-            <li class="flexrow list-item" data-attribute="etat">
-              <span class="competence-label" name="system.compteurs.etat.label">Etat Général</span>
-              <input type="text" value="{{system.compteurs.etat.value}}" disabled />
-            </li>
-          </ol>
-        </div>
-      </div>
-    </div>
-
-    {{!-- Compétences Tab --}}
-    <div class="tab competences" data-group="primary" data-tab="competences">
-      <div class="flexcol">
         <div class="flex-group-left flexcol competence-column">
-          <ol class="item-list alterne-list">
-            {{#each competences as |comp key|}}
-            <li class="item flexrow list-item" data-item-id="{{comp._id}}">
-              <a class="competence-label" name="{{comp.name}}">
-                <img class="sheet-competence-img" src="{{comp.img}}"/>
-                <span class="competence-label">{{comp.name}}</span>
-              </a>
-                <input class="competence-value creature-carac" type="text" compname="{{comp.name}}"
-                value="{{comp.system.carac_value}}" data-dtype="number" />
-              <input class="competence-value creature-niveau" type="text" compname="{{comp.name}}"
-                value="{{numberFormat comp.system.niveau decimals=0 sign=true}}" data-dtype="number" />
-              <input class="competence-value creature-dommages" type="text" compname="{{comp.name}}"
-                value="{{numberFormat comp.system.dommages decimals=0 sign=true}}" data-dtype="number" />
-              <div class="item-controls">
-                <a class="item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-                <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-              </div>
-            </li>
-            {{/each}}
-          </ol>
+          {{>"systems/foundryvtt-reve-de-dragon/templates/actor/comp-creature.html"}}
         </div>
       </div>
-    </div>
 
-    {{!-- blessures Tab --}}
-    <div class="tab blessures" data-group="primary" data-tab="blessures" style="height:200px">
-      {{!-- Liste de blessures --}}
       {{> "systems/foundryvtt-reve-de-dragon/templates/actor/blessures.html"}}
     </div>
 

templates/actor-entite-sheet.html

@@ -2,138 +2,48 @@
 
   {{!-- Sheet Header --}}
   <header class="sheet-header">
-    <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}" />
     <div class="header-fields">
       <div class="flexrow">
+        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}" />
         <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name" /></h1>
-      </div>
-      <div class="flexrow flex-group-center flex-actions-bar">
-        <div>
+        <div class="flex-group-center">
           <span class="encaisser-direct"><a title="Encaisser des dommages"><img class="button-img" src="icons/svg/bones.svg" alt="Encaisser des dommages"/></a></span>
-          <span class="gm-only remise-a-neuf"><a title="Remise à neuf"><img class="button-img" src="icons/svg/regen.svg" alt="Remise à neuf"/></a></span>
+          {{#if @root.options.isGM}}
+          <span class="remise-a-neuf"><a title="Remise à neuf"><img class="button-img" src="icons/svg/regen.svg" alt="Remise à neuf"/></a></span>
+          {{/if}}
         </div>
       </div>
+      <div class="flex-group-left flexrow">
+        {{>"systems/foundryvtt-reve-de-dragon/templates/actor/header-compteurs-entitee.html"}}
+      </div>
     </div>
 </header>
 
-  {{!-- Sheet Tab Navigation --}}
-  <nav class="sheet-tabs tabs" data-group="primary">
-    <a class="item" data-tab="carac">Caractéristiques</a>
-    <a class="item" data-tab="competences">Compétences</a>
-    <a class="item" data-tab="description">Description</a>
-  </nav>
-
   {{!-- Sheet Body --}}
   <section class="sheet-body">
 
     {{!-- Carac Tab --}}
-    <div class="tab items" data-group="primary" data-tab="carac">
-
+    <div class="items" data-group="primary" data-tab="carac">
+      <div class="flexrow">
+        {{>"systems/foundryvtt-reve-de-dragon/templates/actor/vue-detaillee.html"}}
+      </div>
       <div class="grid grid-2col">
         <div class="flex-group-left flexcol">
-          <ol class="carac-list alterne-list">
-            {{#each system.carac as |carac key|}}
-            <li class="caracteristique flexrow list-item" data-attribute="{{key}}">
-              {{#if (eq key 'taille')}}
-              <span class="carac-label flexrow" name="system.carac.{{key}}.label">{{carac.label}}</span>
-              {{else}}
-              <span class="carac-label flexrow" name="system.carac.{{key}}.label"><a
-                  name={{key}}>{{carac.label}}</a></span>
-              {{/if}}
-              <input class="competence-value flexrow" type="text" name="system.carac.{{key}}.value"
-                value="{{carac.value}}" data-dtype="{{carac.type}}" />
-            </li>
-            {{/each}}
-          </ol>
+          {{>"systems/foundryvtt-reve-de-dragon/templates/actor/carac-main.html"}}
+          {{>"systems/foundryvtt-reve-de-dragon/templates/actor/carac-entitee.html"}}
         </div>
-
-        <div class="flex-group-left flexcol">        
-
-          <ol class="carac-list alterne-list">
-            <li class="caracteristique flexrow list-item">
-              <span class="carac-label flexrow" name="catEntite">Catégorie : </span>
-              <select name="system.definition.categorieentite" value="{{system.definition.categorieentite}}" data-dtype="String">
-                {{#select system.definition.categorieentite}}
-                <option value="cauchemar">Cauchemar</option>
-                <option value="reve">Rêve</option>
-                {{/select}}
-              </select>
-            </li>
-            <li class="caracteristique flexrow list-item">
-              <span class="carac-label flexrow" name="typeEntite">Type d'entité : </span>
-              <select name="system.definition.typeentite" value="{{system.definition.typeentite}}" data-dtype="String">
-                {{#select system.definition.typeentite}}
-                <option value="incarne">Incarnée</option>
-                <option value="nonincarne">Non Incarnée</option>
-                <option value="blurette">Blurette</option>
-                {{/select}}
-              </select>
-            </li>
-            {{#each system.attributs as |attr key|}}
-            <li class="caracteristique flexrow list-item" data-attribute="{{key}}">
-              <span class="carac-label flexrow" name="system.attributs.{{key}}.label">{{attr.label}} : </span>
-              <span><input class="attribut-value flexrow" type="text" name="system.attributs.{{key}}.value"
-                  value="{{attr.value}}" data-dtype="{{attr.type}}" /></span>
-            </li>
-            {{/each}}
-            <li class="caracteristique flexrow list-item" data-attribute="endurance">
-              <span class="competence-label flexrow" name="system.sante.endurance.label">Endurance : </span>
-              <span><input class="sante-value flexrow" type="text" name="system.sante.endurance.value"
-                  value="{{system.sante.endurance.value}}" data-dtype="Number" /></span><span>/ </span>
-              <span><input class="sante-value flexrow" type="text" name="system.sante.endurance.max"
-                  value="{{system.sante.endurance.max}}" data-dtype="Number" /></span>
-            </li>
-          </ol>
+        <div class="flex-group-left flexcol">
+          <div class="flex-group-left flexcol competence-column">
+            {{>"systems/foundryvtt-reve-de-dragon/templates/actor/comp-creature.html"}}
+            {{>"systems/foundryvtt-reve-de-dragon/templates/actor/comp-possession.html"}}
+          </div>
         </div>
       </div>
-    </div>
-    
-    {{!-- Compétences Tab --}}
-    <div class="tab competences" data-group="primary" data-tab="competences">
-      <div class="flexcol">
-        <div class="flex-group-left flexcol competence-column">
-          <ol class="item-list alterne-list">
-            {{#each competences as |comp key|}}
-            <li class="item flexrow list-item" data-item-id="{{comp._id}}">
-              <img class="sheet-competence-img" src="{{comp.img}}" />
-              <span class="competence-label"><a>{{comp.name}}</a></span>
-              <input class="competence-value creature-carac" type="text" compname="{{comp.name}}"
-                value="{{comp.system.carac_value}}" data-dtype="number" />
-              <input class="competence-value creature-niveau" type="text" compname="{{comp.name}}"
-                value="{{numberFormat comp.system.niveau decimals=0 sign=true}}" data-dtype="number" />
-              <input class="competence-value creature-dommages" type="text" compname="{{comp.name}}"
-                value="{{numberFormat comp.system.dommages decimals=0 sign=true}}" data-dtype="number" />
-              <div class="item-controls">
-                <a class="item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-                <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-              </div>
-            </li>
-            {{/each}}
-          </ol>
-        </div>
-        <div class="flex-group-left flexcol competence-column">
-          <ol class="item-list alterne-list">
-            {{#each possessions as |possession key|}}
-            <li class="item flexrow list-item" data-item-id="{{possession._id}}">
-              <img class="sheet-competence-img" src="{{possession.img}}" />
-              <span class="competence-label">{{possession.name}}</span>
-              <div class="item-controls">
-                <a class="item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-                <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-              </div>
-            </li>
-            {{/each}}
-          </ol>
-        </div>
-      </div>
-    </div>
-
-    {{!-- Biography Tab --}}
-    <div class="tab description" data-group="primary" data-tab="description">
       <div class="form-group editor">
         {{editor description target="system.description" button=true owner=owner editable=true}}
       </div>
       {{>"systems/foundryvtt-reve-de-dragon/templates/actor/editor-notes-mj.html"}}
+
     </div>
 
   </section>

templates/actor-sheet.html

@@ -8,69 +8,11 @@
           <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
         </div>
         <div class="flexrow">
-          <ul class="flex-group-center flex-compteurs">
-            <li>
-              <label class="compteur">
-                <a class="jet-vie">Vie</a>
-                <a class="vie-moins"><i class="fas fa-minus-square"></i></a>
-                <input class="resource-content" type="text" name="system.sante.vie.value" value="{{system.sante.vie.value}}" data-dtype="Number"/>
-                <span>/ {{system.sante.vie.max}}</span>
-                <a class="vie-plus"><i class="fas fa-plus-square"></i></a>
-              </label>
-            </li>
-            <li>
-              <label class="compteur">
-                <a class="jet-endurance">Endurance</a>
-                <a class="endurance-moins"><i class="fas fa-minus-square"></i></a>
-                <input class="resource-content" type="text" name="system.sante.endurance.value" value="{{system.sante.endurance.value}}" data-dtype="Number"/>
-                <span>/ {{system.sante.endurance.max}}</span>
-                <a class="endurance-plus"><i class="fas fa-plus-square"></i></a>
-              </label>
-            </li>
-            <li>
-              <label class="appliquerFatigue compteur tooltip">
-                <span class="tooltiptext ttt-fatigue">{{{calc.fatigue.html}}}</span>
-                Fatigue
-                <a class="fatigue-moins"><i class="fas fa-minus-square"></i></a>
-                <input class="resource-content" id="fatigue-value" type="text" name="system.sante.fatigue.value" value="{{system.sante.fatigue.value}}" data-dtype="Number" />
-                <span>/ {{system.sante.fatigue.max}}</span>
-                <a class="fatigue-plus"><i class="fas fa-plus-square"></i></a>
-              </label>
-            </li>
-            <li>
-              <label class="compteur">
-                <span class="ptreve-actuel"><a>Rêve</a></span>
-                <a class="ptreve-actuel-moins"><i class="fas fa-minus-square"></i></a>
-                <input class="resource-content" id="pointsreve-value" type="text" name="system.reve.reve.value" value="{{system.reve.reve.value}}" data-dtype="Number" />
-                <span>/ {{system.reve.seuil.value}}</span>
-                <a class="ptreve-actuel-plus"><i class="fas fa-plus-square"></i></a>
-              </label>
-            </li>
-          </ul>
-          <div class="flex-group-center  flex-actions-bar">
-            <div>
-              <span class="encaisser-direct"><a title="Encaisser des dommages"><img class="button-img" src="icons/svg/bones.svg" alt="Encaisser des dommages"/></a></span>
-              <span class="gm-only remise-a-neuf"><a title="Remise à neuf"><img class="button-img" src="icons/svg/regen.svg" alt="Remise à neuf"/></a></span>
-              <span class="repos"><a title="Repos"><img class="button-img" src="icons/svg/sleep.svg" alt="Se reposer"/></a></span>
-              {{#if system.attributs.hautrevant.value}}
-              <span class="monte-tmr"><a title="Montée dans les Terres M&eacute;dianes !" {{#if hautreve.isDemiReve}}disabled{{/if}}><img class="button-img" src="systems/foundryvtt-reve-de-dragon/styles/img/ui/icon-tmr-normal.svg" alt="Montée dans les Terres M&eacute;dianes !"/></a></span>
-              <span class="monte-tmr-rapide"><a title="Montée accélérée dans les Terres M&eacute;dianes !"><img class="button-img" src="systems/foundryvtt-reve-de-dragon/styles/img/ui/icon-tmr-rapide.svg" alt="Montée accélérée dans les Terres M&eacute;dianes !"/></a></span>
-              <span class="visu-tmr"><a title="Regarder les Terres M&eacute;dianes"><img class="button-img" src="systems/foundryvtt-reve-de-dragon/styles/img/ui/icon-tmr-view.svg" alt="Regarder les Terres M&eacute;dianes"/></a></span>
-              {{/if}}
-            </div>
-            <div class="flexrow">
-              <span class="appliquerFatigue tooltip tooltip-dotted">Malus de fatigue : {{calc.fatigue.malus}}
-                <span class="tooltiptext ttt-fatigue">{{{calc.fatigue.html}}}</span>
-              </span>
-              <span>{{calc.resumeBlessures}}</span>
-            </div>
-            <div class="flexrow">
-              <span>{{system.compteurs.etat.label}}: {{system.compteurs.etat.value}}</span>
-              <span>{{system.compteurs.surenc.label}}: {{system.compteurs.surenc.value}}</span>
-            </div>
-            <div class="flexrow">
-              {{>"systems/foundryvtt-reve-de-dragon/templates/actor/effects.html"}}
-            </div>
+          {{>"systems/foundryvtt-reve-de-dragon/templates/actor/header-compteurs.html"}}
+          <div class="flex-group-center">
+            {{>"systems/foundryvtt-reve-de-dragon/templates/actor/header-buttons.html"}}
+            {{>"systems/foundryvtt-reve-de-dragon/templates/actor/header-etat.html"}}
+            {{>"systems/foundryvtt-reve-de-dragon/templates/actor/header-effects.html"}}
           </div>
         </div>
       </div>
@@ -85,131 +27,27 @@
         <a class="item" data-tab="hautreve">Haut-Rêve</a>
         <a class="item" data-tab="items">Équipement</a>
         <a class="item" data-tab="description">Description</a>
-    </nav>
-
-    {{!-- Sheet Body --}}
-    <section class="sheet-body">
-
+      </nav>
+      
+      {{!-- Sheet Body --}}
+      <section class="sheet-body">
+        
         {{!-- Carac Tab --}}
         <div class="tab items" data-group="primary" data-tab="carac">
           <div class="flexrow">
-            <span><a class="vue-detaillee">
-              <i class="fas {{#if options.vueDetaillee}}fa-eye-slash{{else}}fa-eye{{/if}}"></i>
-              {{#if options.vueDetaillee}}Vue simplifiée{{else}}Vue détaillée{{/if}}</a>
-            </span>
+            {{>"systems/foundryvtt-reve-de-dragon/templates/actor/vue-detaillee.html"}}
           </div>
           <div class="grid grid-2col">
             <div class="flex-group-left flexcol">
-              <ul class="carac-list alterne-list">
-                {{#each system.carac as |carac key|}}
-                    {{#if carac.isLevelUp}}
-                    <li class="caracteristique flexrow item-list xp-level-up" data-attribute="{{key}}">
-                    {{else}}
-                    <li class="caracteristique flexrow list-item" data-attribute="{{key}}">
-                    {{/if}}
-                    {{#if (eq key 'taille')}}
-                      <span class="carac-label" name="system.carac.{{key}}.label">{{carac.label}}</span>
-                      <input class="carac-value" type="text" name="system.carac.{{key}}.value" value="{{carac.value}}" data-dtype="{{carac.type}}" {{#unless @root.options.vueDetaillee}}disabled{{/unless}} />
-                      <label class="carac-xp"/>
-                    {{else}}
-                        {{#if carac.derivee}}
-                        <span class="carac-label" name="system.carac.{{key}}.label"> <a name={{key}}>{{carac.label}}</a></span>
-                        <label class="competence-value">{{carac.value}}</label>
-                        <label class="carac-xp"/>
-                        {{else}}
-                          {{#if carac.isLevelUp}}
-                            <span class="carac-label tooltip" name="system.carac.{{key}}.label">
-                              <span class="tooltiptext ttt-xp">
-                              Vous pouvez dépenser {{carac.xpNext}} points d'Experience pour augmenter de 1 votre caractéristique {{carac.label}}
-                            </span>
-                            <a name={{key}}>{{carac.label}}</a></span>
-                          {{else}}
-                            <span class="carac-label tooltip" name="system.carac.{{key}}.label"><a name={{key}}>{{carac.label}}</a></span>
-                          {{/if}}
-                          <input class="carac-value" type="text" name="system.carac.{{key}}.value" value="{{carac.value}}" data-dtype="{{carac.type}}" {{#unless @root.options.vueDetaillee}}disabled{{/unless}} />
-                          <span class="carac-xp tooltip">
-                          <input class="carac-xp" type="text" name="system.carac.{{key}}.xp" value="{{carac.xp}}" data-dtype="number" {{#unless @root.options.vueDetaillee}}disabled{{/unless}} />
-                          <span class="tooltiptext ttt-xp">Vous devez acquérir {{carac.xpNext}} points d'Experience pour augmenter de 1 votre {{carac.label}}</span>      
-                          </span>
-                          {{#if carac.isLevelUp}}
-                          <a class="carac-xp-augmenter" name="augmenter.{{key}}" title="Augmenter">
-                            <i class="fas fa-arrow-alt-circle-up"></i>
-                          </a>
-                          {{/if}}
-                        {{/if}}
-                    {{/if}}
-                    </li>
-                {{/each}}
-                <li class="caracteristique flexrow">
-                  <span class="carac-label" name="carac-total">Total Caractéristiques </span>
-                  <span class="competence-value total" name="carac-total-value">{{calc.caracTotal}} </span>
-                </li>
-              </ul>
+              {{>"systems/foundryvtt-reve-de-dragon/templates/actor/carac-main.html"}}
+              {{>"systems/foundryvtt-reve-de-dragon/templates/actor/carac-total.html"}}
             </div>
             <div class="flex-group-left flexcol" >
-              <ul class="carac-list">
-                <li class="caracteristique flexrow list-item">
-                  <span class="carac-label" name="beaute">Beauté&nbsp;:</span>
-                  <input class="description-value" type="text" name="system.beaute" value="{{system.beaute}}" data-dtype="String" {{#unless @root.options.vueDetaillee}}disabled{{/unless}}/>
-                  <label class="carac-xp"/>
-                </li>
-                {{#each system.attributs as |attr key|}}
-                {{#unless (eq key 'hautrevant')}}
-                <li class="caracteristique flexrow  list-item" data-attribute="{{key}}">
-                  <span class="carac-label" name="system.attributs.{{key}}.label">{{attr.label}}&nbsp;:</span>
-                  {{#if (eq key 'protection')}}
-                  <input class="description-value" id="attribut-protection-edit" type="text" name="{{key}}" value="{{attr.value}}" data-dtype="number"/>
-                  {{else}}
-                  <input class="description-value" type="text" disabled name="system.attributs.{{key}}." value="{{attr.value}}" data-dtype="number"/>
-                  {{/if}}
-                  <label class="carac-xp"/>
-                </li>
-                {{/unless}}
-                {{/each}}
-              </ul>
-              <ul class="carac-list alterne-list">
-                <li class="caracteristique flexrow list-item">
-                  <span class="attribut-label chance-actuelle"><a>Chance actuelle</a></span>
-                  <input class="description-value compteur-edit" type="text" name="chance" value="{{system.compteurs.chance.value}}" data-dtype="number"/>
-                  <span class="utiliser-attribut" style="padding-left: 5px"><a class="chance-appel">Utiliser</a></span>
-                </li>
-                {{#each system.compteurs as |compteur key|}}
-                  {{#if (eq compteur.label 'Chance')}}
-                  {{else if (eq compteur.label 'Experience')}}
-                  {{else if compteur.isInput}}
-                    <li class="caracteristique flexrow list-item">
-                      <span class="attribut-label">{{compteur.label}}</span>
-                      {{#if (eq compteur.label 'Ethylisme')}}
-                      <select class="description-value" name="system.compteurs.ethylisme.value" id="ethylisme" data-dtype="Number">
-                        {{#select compteur.value}}
-                        {{>"systems/foundryvtt-reve-de-dragon/templates/niveau-ethylisme.html"}}
-                        {{/select}}
-                      </select>          
-                      {{else}}
-                      <input class="description-value compteur-edit" id="{{key}}-edit" type="text" name="{{key}}" value="{{compteur.value}}" data-dtype="number"/>
-                      {{/if}}
-                      <span class="utiliser-attribut" style="padding-left: 5px">
-                        {{#if compteur.isStress}}
-                        <a class="stress-test" title="Transformer">Transformer</a>
-                        {{else if (eq compteur.label 'Ethylisme')}}
-                        <a class="ethylisme-test" id="ethylisme-test" title="Jet d'Ethylisme">Boire</a>
-                        {{else if (eq compteur.label 'Moral')}}
-                        <a class="moral-malheureux" title="Jet de moral situation malheureuse"><img class="small-button-container" src="systems/foundryvtt-reve-de-dragon/icons/moral-malheureux.svg" alt="Jet de moral situation malheureuse"/></a>
-                        <a class="moral-neutre" title="Jet de moral situation neutre"><img class="small-button-container" src="systems/foundryvtt-reve-de-dragon/icons/moral-neutre.svg" alt="Jet de moral situation neutre"/></a>
-                        <a class="moral-heureux" title="Jet de moral situation heureuse"><img class="small-button-container" src="systems/foundryvtt-reve-de-dragon/icons/moral-heureux.svg" alt="Jet de moral situation heureuse"/></a>
-                        {{else}}
-                        <label></label>
-                      {{/if}}
-                      </span>
-                    </li>
-                  {{/if}}
-                {{/each}}
-              </ul>
-<!--              <ul class="carac-list"></ul>-->
+              {{>"systems/foundryvtt-reve-de-dragon/templates/actor/carac-derivee.html"}}
             </div>
           </div>
         </div>
-        
+
         {{!-- Compétences Tab --}}
         <div class="tab competences" data-group="primary" data-tab="competences">
           <div class="flexrow">
@@ -226,21 +64,23 @@
               <input class="recherche flex-grow" type="text" value="{{options.recherche.text}}" name="recherche" 
               size="8" data-dtype="String" placeholder="chercher"/>
             </span>
+            <span>
+            </span>
           </div>
           <div class="grid grid-2col">
             <div class="flex-group-left flexcol competence-column">
-              {{> "systems/foundryvtt-reve-de-dragon/templates/actor/categorie-competences.html" competences=(filtreTriCompetences byCateg.generale) categorie="Compétences générales"}}
-              {{> "systems/foundryvtt-reve-de-dragon/templates/actor/categorie-competences.html" competences=(filtreTriCompetences byCateg.particuliere) categorie="Compétences Particulières"}}
-              {{> "systems/foundryvtt-reve-de-dragon/templates/actor/categorie-competences.html" competences=(filtreTriCompetences byCateg.specialisee) categorie="Compétences Spécialisées"}}
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor/competence-categorie.html" competences=(filtreTriCompetences byCateg.generale) categorie="Compétences générales"}}
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor/competence-categorie.html" competences=(filtreTriCompetences byCateg.particuliere) categorie="Compétences Particulières"}}
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor/competence-categorie.html" competences=(filtreTriCompetences byCateg.specialisee) categorie="Compétences Spécialisées"}}
             </div>
 
             <div class="flex-group-left flexcol competence-column">
-              {{> "systems/foundryvtt-reve-de-dragon/templates/actor/categorie-competences.html" competences=(filtreTriCompetences byCateg.melee) categorie="Compétences de Mêlée"}}
-              {{> "systems/foundryvtt-reve-de-dragon/templates/actor/categorie-competences.html" competences=(filtreTriCompetences byCateg.tir) categorie="Compétences de Tir"}}
-              {{> "systems/foundryvtt-reve-de-dragon/templates/actor/categorie-competences.html" competences=(filtreTriCompetences byCateg.lancer) categorie="Compétences de Lancer"}}
-              {{> "systems/foundryvtt-reve-de-dragon/templates/actor/categorie-competences.html" competences=(filtreTriCompetences byCateg.connaissance) categorie="Connaissances"}}
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor/competence-categorie.html" competences=(filtreTriCompetences byCateg.melee) categorie="Compétences de Mêlée"}}
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor/competence-categorie.html" competences=(filtreTriCompetences byCateg.tir) categorie="Compétences de Tir"}}
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor/competence-categorie.html" competences=(filtreTriCompetences byCateg.lancer) categorie="Compétences de Lancer"}}
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor/competence-categorie.html" competences=(filtreTriCompetences byCateg.connaissance) categorie="Connaissances"}}
               {{#if (or system.attributs.hautrevant.value options.vueDetaillee)}}
-              {{> "systems/foundryvtt-reve-de-dragon/templates/actor/categorie-competences.html" competences=(filtreTriCompetences byCateg.draconic) categorie="Draconic"}}
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor/competence-categorie.html" competences=(filtreTriCompetences byCateg.draconic) categorie="Draconic"}}
               {{/if}}
               {{> "systems/foundryvtt-reve-de-dragon/templates/actor/xp-competences.html"}}
             </div>

templates/actor-vehicule-sheet.html

@@ -12,62 +12,73 @@
 
   {{!-- Sheet Tab Navigation --}}
   <nav class="sheet-tabs tabs" data-group="primary">
-    <a class="item" data-tab="carac">Caractéristiques</a>
-    <a class="item" data-tab="items">Contenu</a>
     <a class="item" data-tab="description">Description</a>
+    <a class="item" data-tab="items">Chargement</a>
   </nav>
 
   {{!-- Sheet Body --}}
   <section class="sheet-body">
 
     {{!-- Carac Tab --}}
-    <div class="tab items" data-group="primary" data-tab="carac">
+    <div class="tab" data-group="primary" data-tab="description">
+      <div class="flexrow">
+        {{>"systems/foundryvtt-reve-de-dragon/templates/actor/vue-detaillee.html"}}
+      </div>
       <div class="grid grid-2col">
         <div class="flex-group-left flexcol">
           <ol class="carac-list alterne-list">
-            <li class="caracteristique flexrow list-item" data-attribute="{{key}}">
+            <li class="caracteristique flexrow list-item">
+              <span class="carac-label">Résistance</span>
+              <input class="competence-value" type="text" name="system.etat.resistance.value" value="{{system.etat.resistance.value}}" data-dtype="Number" />
+              /
+              <input class="competence-value" type="text" name="system.etat.resistance.max" value="{{system.etat.resistance.max}}" data-dtype="Number" {{#unless @root.options.vueDetaillee}}disabled{{/unless}} />
+            </li>
+            <li class="caracteristique flexrow list-item">
+              <span class="carac-label">Structure</span>
+              <input class="competence-value" type="text" name="system.etat.structure.value" value="{{system.etat.structure.value}}" data-dtype="Number" />
+              /
+              <input class="competence-value" type="text" name="system.etat.structure.max" value="{{system.etat.structure.max}}" data-dtype="Number" {{#unless @root.options.vueDetaillee}}disabled{{/unless}} />
+            </li>
+          </ol>
+        </div>
+        <div class="flex-group-left flexcol">
+          <ol>
+            <li class="caracteristique flexrow list-item">
               <span class="carac-label">Catégorie</span>
-              <select name="system.categorie" class="categorie" data-dtype="String">
+              <select name="system.categorie" class="categorie" data-dtype="String" {{#unless @root.options.vueDetaillee}}disabled{{/unless}}>
                 {{#select system.categorie}}
                 {{>"systems/foundryvtt-reve-de-dragon/templates/enum-categorie-vehicule.html"}}
                 {{/select}}
               </select>
             </li>
-            <li class="caracteristique flexrow list-item" data-attribute="{{key}}">
-              <span class="carac-label">Résistance</span>
-              <input class="competence-value flexrow" type="text" name="system.etat.resistance.value" value="{{system.etat.resistance.value}}" data-dtype="Number" />
-              /
-              <input class="competence-value flexrow" type="text" name="system.etat.resistance.max" value="{{system.etat.resistance.max}}" data-dtype="Number" />
-            </li>
-            <li class="caracteristique flexrow list-item" data-attribute="{{key}}">
-              <span class="carac-label">Structure</span>
-              <input class="competence-value flexrow" type="text" name="system.etat.structure.value" value="{{system.etat.structure.value}}" data-dtype="Number" />
-              /
-              <input class="competence-value flexrow" type="text" name="system.etat.structure.max" value="{{system.etat.structure.max}}" data-dtype="Number" />
-            </li>
-            <li class="caracteristique flexrow list-item" data-attribute="{{key}}">
+            <li class="caracteristique flexrow list-item">
               <span class="carac-label">Vitesse</span>
-              <input class="caracteristique vehicle" type="text" name="system.vitesse" value="{{system.vitesse}}" data-dtype="String" />
+              <input class="caracteristique streched" type="text" name="system.vitesse" value="{{system.vitesse}}" data-dtype="String" {{#unless @root.options.vueDetaillee}}disabled{{/unless}} />
             </li>
-            <li class="caracteristique flexrow list-item" data-attribute="{{key}}">
-              <span class="carac-label">Bonus</span>
-              <input class="caracteristique vehicle" type="text" name="system.bonus" value="{{system.bonus}}" data-dtype="String" />
+            <li class="caracteristique flexrow list-item">
+              <span class="carac-label">Bonus rames</span>
+              <input class="caracteristique streched" type="text" name="system.bonus" value="{{system.bonus}}" data-dtype="String" {{#unless @root.options.vueDetaillee}}disabled{{/unless}} />
             </li>
-            <li class="caracteristique flexrow list-item" data-attribute="{{key}}">
+            <li class="caracteristique flexrow list-item">
               <span class="carac-label">Manoeuvrabilité</span>
-              <input class="caracteristique vehicle" type="text" name="system.manoeuvrabilite" value="{{system.manoeuvrabilite}}" data-dtype="String" />
+              <input class="caracteristique streched" type="text" name="system.manoeuvrabilite" value="{{system.manoeuvrabilite}}" data-dtype="String" {{#unless @root.options.vueDetaillee}}disabled{{/unless}} />
             </li>
-            <li class="caracteristique flexrow list-item" data-attribute="{{key}}">
+            <li class="caracteristique flexrow list-item">
               <span class="carac-label">Equipage</span>
-              <input class="caracteristique vehicle" type="text" name="system.equipage" value="{{system.equipage}}" data-dtype="Number" />
+              <input class="caracteristique streched" type="text" name="system.equipage" value="{{system.equipage}}" data-dtype="Number" {{#unless @root.options.vueDetaillee}}disabled{{/unless}} />
             </li>
-            <li class="caracteristique flexrow list-item" data-attribute="{{key}}">
+            <li class="caracteristique flexrow list-item">
               <span class="carac-label">Capacité d'Encombrement</span>
-              <input class="caracteristique vehicle" type="text" name="system.capacite_encombrement" value="{{system.capacite_encombrement}}" data-dtype="Number" />
+              <input class="caracteristique streched" type="text" name="system.capacite_encombrement" value="{{system.capacite_encombrement}}" data-dtype="Number" {{#unless @root.options.vueDetaillee}}disabled{{/unless}} />
             </li>
           </ol>
         </div>
       </div>
+
+      <div class="form-group editor">
+        {{editor description target="system.description" button=true owner=owner editable=editable}}
+      </div>
+      {{>"systems/foundryvtt-reve-de-dragon/templates/actor/editor-notes-mj.html"}}
     </div>
 
     {{!-- Equipment Tab --}}
@@ -75,13 +86,5 @@
       {{> "systems/foundryvtt-reve-de-dragon/templates/actor/inventaire.html"}}
     </div>
 
-    {{!-- Biography Tab --}}
-    <div class="tab description" data-group="primary" data-tab="description">
-      <div class="form-group editor">
-        {{editor description target="system.description" button=true owner=owner editable=editable}}
-      </div>
-      {{>"systems/foundryvtt-reve-de-dragon/templates/actor/editor-notes-mj.html"}}
-    </div>
-
   </section>
 </form>

templates/actor/carac-creature.html

@@ -0,0 +1,8 @@
+<ol class="carac-list alterne-list">
+  {{#each system.attributs as |attr key|}}
+  <li class="caracteristique flexrow list-item" data-attribute="{{key}}">
+    <span class="carac-label" name="system.attributs.{{key}}.label">{{attr.label}}</span>
+    <input class="caracteristique streched" type="text" name="system.attributs.{{key}}.value" value="{{attr.value}}" data-dtype="{{attr.type}}" {{#unless @root.options.vueDetaillee}}disabled{{/unless}}/>
+  </li>
+  {{/each}}
+</ol>

templates/actor/carac-derivee.html

@@ -0,0 +1,55 @@
+<ul class="carac-list">
+  <li class="caracteristique flexrow list-item">
+    <span class="carac-label" name="beaute">Beauté&nbsp;:</span>
+    <input class="description-value" type="text" name="system.beaute" value="{{system.beaute}}" data-dtype="String" {{#unless @root.options.vueDetaillee}}disabled{{/unless}}/>
+    <label class="carac-xp"/>
+  </li>
+  {{#each system.attributs as |attr key|}}
+  {{#unless (eq key 'hautrevant')}}
+  <li class="caracteristique flexrow  list-item" data-attribute="{{key}}">
+    <span class="carac-label" name="system.attributs.{{key}}.label">{{attr.label}}&nbsp;:</span>
+    {{#if (eq key 'protection')}}
+    <input class="description-value" id="attribut-protection-edit" type="text" name="{{key}}" value="{{attr.value}}" data-dtype="number"/>
+    {{else}}
+    <input class="description-value" type="text" disabled name="system.attributs.{{key}}." value="{{attr.value}}" data-dtype="number"/>
+    {{/if}}
+    <label class="carac-xp"/>
+  </li>
+  {{/unless}}
+  {{/each}}
+</ul>
+<ul class="carac-list alterne-list">
+  <li class="caracteristique flexrow list-item">
+    <span class="attribut-label chance-actuelle"><a>Chance actuelle</a></span>
+    <input class="description-value compteur-edit" type="text" name="chance" value="{{system.compteurs.chance.value}}" data-dtype="number"/>
+  </li>
+  {{#each system.compteurs as |compteur key|}}
+    {{#if (eq compteur.label 'Chance')}}
+    {{else if (eq compteur.label 'Experience')}}
+    {{else if compteur.isInput}}
+      <li class="caracteristique flexrow list-item">
+        <span class="attribut-label">{{compteur.label}}</span>
+        {{#if (eq compteur.label 'Ethylisme')}}
+        <select class="description-value" name="system.compteurs.ethylisme.value" id="ethylisme" data-dtype="Number">
+          {{#select compteur.value}}
+          {{>"systems/foundryvtt-reve-de-dragon/templates/niveau-ethylisme.html"}}
+          {{/select}}
+        </select>
+        {{else}}
+        <input class="description-value compteur-edit" id="{{key}}-edit" type="text" name="{{key}}" value="{{compteur.value}}" data-dtype="number"/>
+        {{/if}}
+        <span class="utiliser-attribut" style="padding-left: 5px">
+          {{#if compteur.isStress}}
+          <a class="stress-test" title="Transformer">Transformer</a>
+          {{else if (eq compteur.label 'Moral')}}
+          <a class="moral-malheureux" title="Jet de moral situation malheureuse"><img class="small-button-container" src="systems/foundryvtt-reve-de-dragon/icons/moral-malheureux.svg" alt="Jet de moral situation malheureuse"/></a>
+          <a class="moral-neutre" title="Jet de moral situation neutre"><img class="small-button-container" src="systems/foundryvtt-reve-de-dragon/icons/moral-neutre.svg" alt="Jet de moral situation neutre"/></a>
+          <a class="moral-heureux" title="Jet de moral situation heureuse"><img class="small-button-container" src="systems/foundryvtt-reve-de-dragon/icons/moral-heureux.svg" alt="Jet de moral situation heureuse"/></a>
+          {{else}}
+          <label></label>
+          {{/if}}
+        </span>
+      </li>
+    {{/if}}
+  {{/each}}
+</ul>

templates/actor/carac-entitee.html

@@ -0,0 +1,28 @@
+{{log 'entitee.system' system}}
+<ol class="carac-list alterne-list">
+  <li class="caracteristique flexrow list-item">
+    <span class="carac-label" name="catEntite">Catégorie : </span>
+    <select name="system.definition.categorieentite" value="{{system.definition.categorieentite}}" data-dtype="String" {{#unless @root.options.vueDetaillee}}disabled{{/unless}}>
+      {{#select system.definition.categorieentite}}
+      <option value="cauchemar">Cauchemar</option>
+      <option value="reve">Rêve</option>
+      {{/select}}
+    </select>
+  </li>
+  <li class="caracteristique flexrow list-item">
+    <span class="carac-label" name="typeEntite">Type d'entité : </span>
+    <select name="system.definition.typeentite" value="{{system.definition.typeentite}}" data-dtype="String" {{#unless @root.options.vueDetaillee}}disabled{{/unless}}>
+      {{#select system.definition.typeentite}}
+      <option value="incarne">Incarnée</option>
+      <option value="nonincarne">Non Incarnée</option>
+      <option value="blurette">Blurette</option>
+      {{/select}}
+    </select>
+  </li>
+  {{#each system.attributs as |attr key|}}
+  <li class="caracteristique flexrow list-item" data-attribute="{{key}}">
+    <span class="carac-label" name="system.attributs.{{key}}.label">{{attr.label}} : </span>
+    <input class="caracteristique streched" type="text" name="system.attributs.{{key}}.value" value="{{attr.value}}" data-dtype="{{attr.type}}" {{#unless @root.options.vueDetaillee}}disabled{{/unless}}/>
+  </li>
+  {{/each}}
+</ol>

templates/actor/carac-main.html

@@ -0,0 +1,41 @@
+<ul class="carac-list alterne-list">
+  {{#each system.carac as |carac key|}}
+      {{#if carac.isLevelUp}}
+      <li class="caracteristique flexrow item-list xp-level-up" data-attribute="{{key}}">
+      {{else}}
+      <li class="caracteristique flexrow list-item" data-attribute="{{key}}">
+      {{/if}}
+      {{#if (eq key 'taille')}}
+        <span class="carac-label" name="system.carac.{{key}}.label">{{carac.label}}</span>
+        <input class="carac-value" type="text" name="system.carac.{{key}}.value" value="{{carac.value}}" data-dtype="{{carac.type}}" {{#unless @root.options.vueDetaillee}}disabled{{/unless}} />
+        <label class="carac-xp"/>
+      {{else}}
+          {{#if carac.derivee}}
+          <span class="carac-label" name="system.carac.{{key}}.label"> <a name={{key}}>{{carac.label}}</a></span>
+          <label class="competence-value">{{carac.value}}</label>
+          <label class="carac-xp"/>
+          {{else}}
+            {{#if carac.isLevelUp}}
+              <span class="carac-label tooltip" name="system.carac.{{key}}.label">
+                <span class="tooltiptext ttt-xp">
+                Vous pouvez dépenser {{carac.xpNext}} points d'Experience pour augmenter de 1 votre caractéristique {{carac.label}}
+              </span>
+              <a name={{key}}>{{carac.label}}</a></span>
+            {{else}}
+              <span class="carac-label tooltip" name="system.carac.{{key}}.label"><a name={{key}}>{{carac.label}}</a></span>
+            {{/if}}
+            <input class="carac-value" type="text" name="system.carac.{{key}}.value" value="{{carac.value}}" data-dtype="{{carac.type}}" {{#unless @root.options.vueDetaillee}}disabled{{/unless}} />
+            <span class="carac-xp tooltip">
+            <input class="carac-xp" type="text" name="system.carac.{{key}}.xp" value="{{carac.xp}}" data-dtype="number" {{#unless @root.options.vueDetaillee}}disabled{{/unless}} />
+            <span class="tooltiptext ttt-xp">Vous devez acquérir {{carac.xpNext}} points d'Experience pour augmenter de 1 votre {{carac.label}}</span>      
+            </span>
+            {{#if carac.isLevelUp}}
+            <a class="carac-xp-augmenter" name="augmenter.{{key}}" title="Augmenter">
+              <i class="fas fa-arrow-alt-circle-up"></i>
+            </a>
+            {{/if}}
+          {{/if}}
+      {{/if}}
+      </li>
+  {{/each}}
+</ul>

templates/actor/carac-total.html

@@ -0,0 +1,6 @@
+<ul class="carac-list alterne-list">
+  <li class="caracteristique flexrow">
+    <span class="carac-label" name="carac-total">Total Caractéristiques </span>
+    <span class="competence-value total" name="carac-total-value">{{calc.caracTotal}} </span>
+  </li>
+</ul>

templates/actor/comp-creature.html

@@ -0,0 +1,26 @@
+<ol class="item-list alterne-list">
+  {{#each competences as |comp key|}}
+  <li class="item flexrow list-item" data-item-id="{{comp._id}}">
+    <a class="competence-label">
+      <img class="sheet-competence-img" src="{{comp.img}}" />
+      <span>{{comp.name}}</span>
+    </a>
+
+    <input class="competence-value creature-carac" type="text" compname="{{comp.name}}"
+      value="{{comp.system.carac_value}}" data-dtype="number" 
+      {{#unless @root.options.vueDetaillee}}disabled{{/unless}}/>
+    <input class="competence-value creature-niveau" type="text" compname="{{comp.name}}"
+      value="{{numberFormat comp.system.niveau decimals=0 sign=true}}" data-dtype="number"
+      {{#unless @root.options.vueDetaillee}}disabled{{/unless}}/>
+    <input class="competence-value creature-dommages" type="text" compname="{{comp.name}}"
+      value="{{numberFormat comp.system.dommages decimals=0 sign=true}}" data-dtype="number" 
+      {{#unless @root.options.vueDetaillee}}disabled{{/unless}}/>
+      {{#if @root.options.vueDetaillee}}
+      <div class="item-controls">
+        <a class="item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
+        <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+      </div>
+      {{/if}}
+  </li>
+  {{/each}}
+</ol>

templates/actor/comp-possession.html

@@ -0,0 +1,16 @@
+{{#if possessions}}
+<div class="flex-group-left flexcol competence-column">
+  <ol class="item-list alterne-list">
+    {{#each possessions as |possession key|}}
+    <li class="item flexrow list-item" data-item-id="{{possession._id}}">
+      <img class="sheet-competence-img" src="{{possession.img}}" />
+      <span class="competence-label">{{possession.name}}</span>
+      <div class="item-controls">
+        <a class="item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
+        <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+      </div>
+    </li>
+    {{/each}}
+  </ol>
+</div>
+{{/if}}

templates/actor/competence.html

@@ -2,7 +2,7 @@
   <li class="item flexrow list-item {{#if system.isLevelUp}}xp-level-up tooltip{{/if}}" data-item-id="{{_id}}">
     <a class="competence-label" name="{{name}}">
       <img class="sheet-competence-img" src="{{img}}"/>
-      <span class="competence-label">{{name}}</span>
+      <span>{{name}}</span>
     </a>
 
     {{#if system.isLevelUp}}

templates/actor/effects.html

@@ -1,13 +0,0 @@
-{{#if calc.surprise}}{{calc.surprise}}! {{/if}}
-{{#if effects}}
-{{#each effects as |effect key|}}
-<span class="active-effect" data-effect="{{effect.flags.core.statusId}}">
-  <img class="button-effect-img delete-active-effect" src="{{effect.icon}}" alt="{{localize effect.label}}" width="24" height="24" />
-</span>
-{{/each}}
-{{#if options.isGM}}
-<span class="enlever-tous-effets"><a>(enlever tout)</a></span>
-{{/if}}
-{{else}}
-Aucun effet actif
-{{/if}}

templates/actor/haut-revant.html

@@ -1,10 +1,10 @@
 {{#if options.isGM}}
 <li class="item flexrow">
   <span>
-    <a class="chat-card-button forcer-tmr-aleatoire">Ré-insertion aléatoire (ie TMR cachée)</a>
+    <a class="chat-card-button forcer-tmr-aleatoire">Ré-insertion aléatoire</a>
   </span>
   <span>
-    <a class="chat-card-button afficher-tmr">Montrer les TMR</a>
+    <a class="chat-card-button afficher-tmr">{{#if hautreve.cacheTMR}}Montrer les TMR{{else}}Cacher les TMR{{/if}}</a>
   </span>
 </li>
 {{/if}}

templates/actor/header-buttons.html

@@ -0,0 +1,28 @@
+<div>
+  <span class="chance-appel">
+    <a title="Appel à la chance"><img class="button-img" src="systems/foundryvtt-reve-de-dragon/styles/img/ui/appel-chance.svg" alt="Appel à la chance"/></a>
+  </span>
+  <span class="encaisser-direct">
+    <a title="Encaisser des dommages"><img class="button-img" src="icons/svg/bones.svg" alt="Encaisser des dommages"/></a>
+  </span>
+  <span class="ethylisme-test">
+    <a title="Jet d'Ethylisme"><img class="button-img" src="icons/svg/tankard.svg" alt="Boire"/></a>
+  </span>
+  <span class="repos">
+    <a title="Repos"><img class="button-img" src="icons/svg/sleep.svg" alt="Se reposer"/></a>
+  </span>
+  {{#if system.attributs.hautrevant.value}}
+  <span class="monte-tmr">
+    <a title="Montée dans les Terres M&eacute;dianes !" {{#if hautreve.isDemiReve}}disabled{{/if}}><img class="button-img" src="systems/foundryvtt-reve-de-dragon/styles/img/ui/icon-tmr-normal.svg" alt="Montée dans les Terres M&eacute;dianes !"/></a></span>
+  <span class="monte-tmr-rapide">
+    <a title="Montée accélérée dans les Terres M&eacute;dianes !"><img class="button-img" src="systems/foundryvtt-reve-de-dragon/styles/img/ui/icon-tmr-rapide.svg" alt="Montée accélérée dans les Terres M&eacute;dianes !"/></a></span>
+  <span class="visu-tmr">
+    <a title="Regarder les Terres M&eacute;dianes"><img class="button-img" src="systems/foundryvtt-reve-de-dragon/styles/img/ui/icon-tmr-view.svg" alt="Regarder les Terres M&eacute;dianes"/></a>
+  </span>
+  {{/if}}
+  {{#if @root.options.isGM}}
+  <span class="remise-a-neuf">
+    <a title="Remise à neuf"><img class="button-img" src="icons/svg/regen.svg" alt="Remise à neuf"/></a>
+  </span>
+  {{/if}}
+</div>

templates/actor/header-compteurs-creature.html

@@ -0,0 +1,24 @@
+<ul class="flex-compteurs">
+  <li data-attribute="vie">
+    <label class="compteur">
+      <a class="jet-vie" name="system.sante.vie.label">Vie</a>
+      <a class="vie-moins"><i class="fas fa-minus-square"></i></a>
+      <input class="resource-content" type="text" name="system.sante.vie.value" value="{{system.sante.vie.value}}" data-dtype="Number" />
+      / {{#if @root.options.vueDetaillee}}
+      <input class="resource-content" type="text" name="system.sante.vie.max" value="{{system.sante.vie.max}}" data-dtype="Number"/>
+      {{else}}{{system.sante.vie.max}}{{/if}}
+      <a class="vie-plus"><i class="fas fa-plus-square"></i></a>
+    </label>
+  </li>
+  <li data-attribute="endurance">
+    <label class="compteur">
+      <a class="jet-endurance" name="system.sante.endurance.label">Endurance</a>
+      <a class="endurance-moins"><i class="fas fa-minus-square"></i></a>
+      <input class="resource-content" type="text" name="system.sante.endurance.value" value="{{system.sante.endurance.value}}" data-dtype="Number"/>
+      / {{#if @root.options.vueDetaillee}}
+      <input class="resource-content" type="text" name="system.sante.endurance.max" value="{{system.sante.endurance.max}}" data-dtype="Number"/>
+      {{else}}{{system.sante.endurance.max}}{{/if}}
+      <a class="endurance-plus"><i class="fas fa-plus-square"></i></a>
+    </label>
+  </li>
+</ul>

templates/actor/header-compteurs-entitee.html

@@ -0,0 +1,13 @@
+{{#if (eq system.definition.typeentite 'incarne')}}
+<li data-attribute="endurance">
+  <label class="compteur">
+    Endurance
+    <a class="endurance-moins"><i class="fas fa-minus-square"></i></a>
+    <input class="resource-content" type="text" name="system.sante.endurance.value" value="{{system.sante.endurance.value}}" data-dtype="Number" />
+    / {{#if @root.options.vueDetaillee}}
+    <input class="resource-content" type="text" name="system.sante.endurance.max" value="{{system.sante.endurance.max}}" data-dtype="Number"/>
+    {{else}}{{system.sante.endurance.max}}{{/if}}
+  <a class="endurance-plus"><i class="fas fa-plus-square"></i></a>
+  </label>
+</li>
+{{/if}}

templates/actor/header-compteurs.html

@@ -0,0 +1,39 @@
+<ul class="flex-group-center flex-compteurs">
+  <li>
+    <label class="compteur">
+      <a class="jet-vie">Vie</a>
+      <a class="vie-moins"><i class="fas fa-minus-square"></i></a>
+      <input class="resource-content" type="text" name="system.sante.vie.value" value="{{system.sante.vie.value}}" data-dtype="Number"/>
+      <span>/ {{system.sante.vie.max}}</span>
+      <a class="vie-plus"><i class="fas fa-plus-square"></i></a>
+    </label>
+  </li>
+  <li>
+    <label class="compteur">
+      <a class="jet-endurance">Endurance</a>
+      <a class="endurance-moins"><i class="fas fa-minus-square"></i></a>
+      <input class="resource-content" type="text" name="system.sante.endurance.value" value="{{system.sante.endurance.value}}" data-dtype="Number"/>
+      <span>/ {{system.sante.endurance.max}}</span>
+      <a class="endurance-plus"><i class="fas fa-plus-square"></i></a>
+    </label>
+  </li>
+  <li>
+    <label class="appliquerFatigue compteur tooltip">
+      <span class="tooltiptext ttt-fatigue">{{{calc.fatigue.html}}}</span>
+      Fatigue
+      <a class="fatigue-moins"><i class="fas fa-minus-square"></i></a>
+      <input class="resource-content" id="fatigue-value" type="text" name="system.sante.fatigue.value" value="{{system.sante.fatigue.value}}" data-dtype="Number" />
+      <span>/ {{system.sante.fatigue.max}}</span>
+      <a class="fatigue-plus"><i class="fas fa-plus-square"></i></a>
+    </label>
+  </li>
+  <li>
+    <label class="compteur">
+      <span class="ptreve-actuel"><a>Rêve</a></span>
+      <a class="ptreve-actuel-moins"><i class="fas fa-minus-square"></i></a>
+      <input class="resource-content" id="pointsreve-value" type="text" name="system.reve.reve.value" value="{{system.reve.reve.value}}" data-dtype="Number" />
+      <span>/ {{system.reve.seuil.value}}</span>
+      <a class="ptreve-actuel-plus"><i class="fas fa-plus-square"></i></a>
+    </label>
+  </li>
+</ul>

templates/actor/header-effects.html

@@ -0,0 +1,17 @@
+<div class="flexrow">
+  {{#if calc.surprise}}{{calc.surprise}}! {{/if}}
+  {{#if effects}}
+    <span>
+      {{#each effects as |effect key|}}
+      <span class="active-effect" data-effect="{{effect.flags.core.statusId}}">
+        <img class="button-effect-img delete-active-effect" src="{{effect.icon}}" alt="{{localize effect.label}}" width="24" height="24" />
+      </span>
+      {{/each}}
+    </span>
+    {{#if options.isGM}}
+    <span class="enlever-tous-effets"><a>(enlever tout)</a></span>
+    {{/if}}
+  {{else}}
+    <span>Aucun effet actif</span>
+  {{/if}}
+</div>

templates/actor/header-etat.html

@@ -0,0 +1,10 @@
+<div class="flexrow">
+  <span class="appliquerFatigue tooltip tooltip-dotted">Malus de fatigue : {{calc.fatigue.malus}}
+    <span class="tooltiptext ttt-fatigue">{{{calc.fatigue.html}}}</span>
+  </span>
+  <span>{{calc.resumeBlessures}}</span>
+</div>
+<div class="flexrow">
+  <span>{{system.compteurs.etat.label}}: {{system.compteurs.etat.value}}</span>
+  <span>{{system.compteurs.surenc.label}}: {{system.compteurs.surenc.value}}</span>
+</div>

templates/actor/inventaire.html

@@ -1,11 +1,17 @@
 {{> "systems/foundryvtt-reve-de-dragon/templates/actor/inventaire-monnaie.html" monnaie=monnaie}}
 
-<span class="item-name"><h4>Equipement</h4></span>
-<span class="item-name">Encombrement total/max : {{numberFormat calc.encTotal decimals=2}} / {{system.attributs.encombrement.value}} <b>{{calc.surEncombrementMessage}}</b></span> - 
-<span class="item-name"><a class="creer-un-objet">Créer un objet</a></span>
-{{#if options.isGM}}
-<span class="item-name"> - <a id="nettoyer-conteneurs">Vider tout les conteneurs</a></span>
-{{/if}}
+<h4>Equipement</h4>
+<span class="item-name">
+  Encombrement: {{numberFormat calc.encTotal decimals=2}} (max: {{system.attributs.encombrement.value}}){{#if calc.surEncombrementMessage}}<b>{{calc.surEncombrementMessage}}</b>{{/if}}
+  {{#if (regle-optionnelle 'afficher-prix-joueurs')}}
+  &hyphen; Valeur: {{numberFormat calc.prixTotalEquipement decimals=2}} Sols
+  {{/if}}
+  &hyphen;
+  <a class="chat-card-button creer-un-objet">Nouvel objet</a>
+  {{#if options.isGM}}
+  <a class="chat-card-button nettoyer-conteneurs">Tout vider</a>
+  {{/if}}
+</span>
 <ul class="item-list alterne-list">
   <li class="competence-header flexrow">
     <span class="equipement-nom">Nom</span>

templates/actor/oeuvres.html

@@ -1,4 +1,4 @@
-<h3>Oeuvres diverses</h3><a class="creer-une-oeuvre">Créer une oeuvre</a>
+<h3>Oeuvres diverses</h3><a class="chat-card-button creer-une-oeuvre">Créer une oeuvre</a>
 <ul class="item-list alterne-list">
   {{#each chants as |chant id|}}
   {{> "systems/foundryvtt-reve-de-dragon/templates/actor/oeuvre.html" oeuvre=chant typeOeuvre="Chant" classOeuvre="chant-label"}}

templates/actor/taches.html

@@ -1,4 +1,4 @@
-<h3>Tâches</h3><a class='creer-tache'>Créer une nouvelle Tâche</a>
+<h3>Tâches</h3><a class="chat-card-button creer-tache">Nouvelle Tâche</a>
 <ul class="item-list alterne-list">
   {{#each taches as |tache id|}}
   <li class="item flexrow list-item" data-item-id="{{tache._id}}">

templates/actor/vue-detaillee.html

@@ -0,0 +1,4 @@
+<span><a class="vue-detaillee">
+  <i class="fas {{#if options.vueDetaillee}}fa-eye-slash{{else}}fa-eye{{/if}}"></i>
+  {{#if options.vueDetaillee}}Vue simplifiée{{else}}Vue détaillée{{/if}}</a>
+</span>

templates/chat-info-distance.html

@@ -0,0 +1,14 @@
+<img class="chat-icon" src="{{rollData.arme.img}}" alt="{{rollData.arme.name}}" />
+<strong>Ajustement de tir/lancer</strong> proposé de <strong>{{total}}</strong>
+<ul>
+  <li>{{defender.name}} est à une distance indicative de {{distance}} mètres.</li>
+  {{#if isVisible}}
+    <li>Selon les murs et la lumière, la cible {{defender.name}} est visible de {{attacker.name}}.</li>
+  {{else}}
+    <li>Selon les murs et la lumière, la cible {{defender.name}} n'est pas visible de {{attacker.name}}.</li>
+  {{/if}}
+  {{log defender}}
+  <li>Portée {{portee.msg}} pour l'arme {{rollData.arme.name}} : {{portee.diff}}</li>
+  <li>De taille {{taille.msg}}: {{taille.diff}}</li>
+  <li>Mouvement {{activite.msg}}: {{activite.diff}}</li>
+</ul>

templates/dialog-item-achat.html

@@ -45,38 +45,38 @@
     </div>
   </div>
 
-  {{#if (eq item.type 'nourritureboisson')}}
-  <p>
-    Si vous souhaitez {{#if item.system.boisson}}boire{{else}}manger{{/if}}:
-  </p>
+  {{#if (and (eq item.type 'nourritureboisson') (eq acheteur.type 'personnage'))}}
+    <p>Si vous souhaitez {{#if item.system.boisson}}boire{{else}}manger{{/if}}:</p>
 
-  {{#if item.system.sust}}
-   <p>Cette {{#if item.system.boisson}}boisson{{else}}nourriture{{/if}} vous apportera <span
-       class="total-sust">{{totalSust}}</span> de sustantation.</p>
-   {{/if}}
-   {{#if item.system.boisson}}
-   <p>{{#if item.system.alcoolise}}
-     C'est une boisson alcoolisée de force {{item.system.force}}, vous effectuerez un jet d'éthylisme.
-     {{/if}}
-     Cette boisson vous apportera <span class="total-desaltere">{{totalDesaltere}}</span> unités d'eau.
-   </p>
-   {{/if}}
-   {{#if (gt item.system.qualite 0)}}
-   {{#if (gt item.system.qualite cuisine.system.niveau)}}
-   <p>La qualité du plat est telle qu'un jet de Goût/Cuisine à {{numberFormat item.system.qualite decimals=0 sign=true}}
-     vous permettra un jet de moral heureux.</p>
-   {{/if}}
-   {{/if}}
-   
-   {{#if (or (lt item.system.qualite 0) (lt item.system.exotisme 0))}}
-   <p>
-     Pour surmonter {{#if (lt item.system.qualite 0)}}le mauvais goût{{else}}l'exotisme{{/if}}, vous devez effectuer un jet de Volonté/Cuisine à {{numberFormat (min item.system.exotisme item.system.qualite) decimals=0 sign=true}}.
-   <br/>
-     <input class="attribute-value se-forcer" type="checkbox" name="se-forcer" {{#if choix.seForcer}}checked{{/if}}>
-       <label for="se-forcer">En cas d'échec, voulez-vous vous forcer à manger (et subir un jet de moral en situation malheureuse)?</label>
-     </input>
-   </p>
-   {{/if}}
+    {{#if item.system.sust}}
+      <p>Cette {{#if item.system.boisson}}boisson{{else}}nourriture{{/if}} vous apportera
+        <span class="total-sust">{{totalSust}}</span>
+        de sustantation.</p>
+    {{/if}}
+    {{#if item.system.boisson}}
+      <p>
+        {{#if item.system.alcoolise}}
+          C'est une boisson alcoolisée de force {{item.system.force}}, vous effectuerez un jet d'éthylisme.
+        {{/if}}
+        Cette boisson vous apportera <span class="total-desaltere">{{totalDesaltere}}</span> unités d'eau.
+      </p>
+    {{/if}}
+    {{#if (gt item.system.qualite 0)}}
+      {{#if (gt item.system.qualite cuisine.system.niveau)}}
+      <p>La qualité du plat est telle qu'un jet de Goût/Cuisine à {{numberFormat item.system.qualite decimals=0 sign=true}}
+        vous permettra un jet de moral heureux.</p>
+      {{/if}}
+    {{/if}}
+    
+    {{#if (or (lt item.system.qualite 0) (lt item.system.exotisme 0))}}
+      <p>
+        Pour surmonter {{#if (lt item.system.qualite 0)}}le mauvais goût{{else}}l'exotisme{{/if}}, vous devez effectuer un jet de Volonté/Cuisine à {{numberFormat (min item.system.exotisme item.system.qualite) decimals=0 sign=true}}.
+      <br/>
+        <input class="attribute-value se-forcer" type="checkbox" name="se-forcer" {{#if choix.seForcer}}checked{{/if}}>
+          <label for="se-forcer">En cas d'échec, voulez-vous vous forcer à manger (et subir un jet de moral en situation malheureuse)?</label>
+        </input>
+      </p>
+    {{/if}}
   {{/if}}
 
   {{#if isVente}}

templates/dialog-roll-encaisser.html

@@ -1,8 +1,8 @@
 <form class="encaisse-roll-dialog">
   <h2 class="encaisserdialog" id="encaisserTitle"></h2>
-  <div class="form-group">
-    <label class="competence-label">Modificateurs aux Dommages:</label>
-    <select class="competence-value" name="modificateurDegats" id="modificateurDegats" data-dtype="number">
+  <div class="flexrow">
+    <label>Modificateurs aux Dommages:</label>
+    <select class="competence-value flex-shrink" name="modificateurDegats" id="modificateurDegats" data-dtype="number">
       {{#select modificateurDegats}}
       {{#each ajustementsEncaissement as |key|}}
       <option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option>
@@ -10,9 +10,9 @@
       {{/select}}
     </select>
   </div>
-  <div class="form-group">
-    <label class="competence-label">Cas particuliers:</label>
-    <select class="competence-value" name="encaisserSpecial" id="encaisserSpecial" data-dtype="String">
+  <div class="flexcol">
+    <label >Cas particuliers:</label>
+    <select name="encaisserSpecial" id="encaisserSpecial" data-dtype="String">
       <option value="aucun">Aucun</option>
       <option value="noarmure">Ne pas compter les Armures</option>
       <option value="chute">Chute : Limiter les armures à 2 PA</option>

templates/dialog-validation-encaissement.html

@@ -0,0 +1,45 @@
+<form class="dialog-validation-encaissement">
+  <div class="flexrow flex-center">
+    <div class="flex-shrink"><img class="chat-icon" src="icons/svg/bones.svg" alt="Encaisser des dommages" /></div>
+    <div><h4>Encaissement de {{actor.name}}</h4></div>
+    <div class="flex-shrink"><img class="chat-icon" src="{{actor.img}}" title="{{actor.name}}" alt="{{actor.name}}" /></div>
+  </div>
+  <ul>
+    <li class="flexrow flex-group-left">
+      <label>Jet d'encaissement</label>
+      <input class="encaissement-roll-result" type="number" value="{{encaissement.roll.result}}" min="2" max="20" data-dtype="Number" />
+    </li>
+    <li class="flexrow flex-group-left">
+      <label>Total</label>
+      <span class="tooltip tooltip-dotted">
+        <label class="encaissement-total">{{encaissement.total}}</label>
+        <div class="tooltiptext ttt-ajustements">
+          <div>Armure: {{encaissement.armure}}</div>
+          {{#if rollData.dmg.penetration}}
+          <div>Pénétration: -{{rollData.dmg.penetration}}</div>
+          {{/if}}
+          <hr>
+          {{#if rollData.dmg.dmgArme}}
+          <div>+dom arme: {{numberFormat rollData.dmg.dmgArme decimals=0 sign=true}}</div>
+          {{/if}}
+          {{#if rollData.dmg.dmgActor}}
+          <div>+dom attaquant: {{numberFormat rollData.dmg.dmgActor decimals=0 sign=true}}</div>
+          {{/if}}
+          {{#if rollData.dmg.dmgParticuliere}}
+          <div>+dom particulière: {{numberFormat rollData.dmg.dmgParticuliere decimals=0 sign=true}}</div>
+          {{/if}}
+          {{#if rollData.dmg.dmgTactique}}
+          <div>+dom tactique: {{numberFormat rollData.dmg.dmgTactique decimals=0 sign=true}}</div>
+          {{/if}}
+          {{#if rollData.dmg.dmgSurprise}}
+          <div>+dom surprise: {{numberFormat rollData.dmg.dmgSurprise decimals=0 sign=true}}</div>
+          {{/if}}
+        </div>
+      </span>
+    </li>
+    <li class="flexrow flex-group-left">
+      <label>Blessure ({{rollData.dmg.mortalite}})</label>
+      <label class="encaissement-blessure">{{encaissement.blessures}}</label>
+    </li>
+  </ul>
+</form>

templates/item-potion-sheet.html

@@ -41,7 +41,7 @@
         {{/select}}
       </select>
     </div>
-    {{#if isHerbe}}
+    {{#if isSoins}}
     <div class="form-group">
       <label>Herbe</label>
       <select name="system.herbe" class="herbe" data-dtype="String">
@@ -86,7 +86,7 @@
       <label for="xp">Permanente ? </label>
       <input class="attribute-value" type="checkbox" name="system.prpermanent"  {{#if system.prpermanent}}checked{{/if}}/>
     </div>
-    {{#if isHerbe}}
+    {{#if isSoins}}
     <div class="form-group">
       <label for="xp">Points de guérison </label>
       <label for="xp">{{pointsGuerison}}</label>