module/actor-sheet.js

@@ -37,7 +37,8 @@ export class RdDActorSheet extends ActorSheet {
   /* -------------------------------------------- */
   async getData() {
     const objectData = Misc.data(this.object);
-    this.timerRecherche = undefined;
+
+    //this.actor.checkMonnaiePresence(this.actor.data.items); // Always check 
 
     let formData = {
       title: this.title,
@@ -77,8 +78,8 @@ export class RdDActorSheet extends ActorSheet {
     };
 
     formData.competences.forEach(item => {
-      item.visible = this.options.recherche
+      item.visible = this.options.cherchercompetence
-        ? RdDItemCompetence.nomContientTexte(item, this.options.recherche.text)
+        ? RdDItemCompetence.nomContientTexte(item, this.options.cherchercompetence)
         : (!this.options.showCompNiveauBase || !RdDItemCompetence.isNiveauBase(item));
       RdDItemCompetence.levelUp(item, formData.data.compteurs.experience.value);
     });
@@ -423,31 +424,12 @@ export class RdDActorSheet extends ActorSheet {
       this.options.editCaracComp = !this.options.editCaracComp;
       this.render(true);
     });
-
+    html.find('.cherchercompetence').change(async event => {
-    html.find('.recherche')
+      this.options.cherchercompetence = event.currentTarget.value;
-      .each((index, field) => {
-        if (this.options.recherche) {
-          field.focus();
-          field.setSelectionRange(this.options.recherche.start, this.options.recherche.end);
-        }
-      })
-      .keyup(async event => {
-        const nouvelleRecherche = this._optionRecherche(event.currentTarget);
-        if (this.options.recherche?.text != nouvelleRecherche?.text){
-          this.options.recherche = nouvelleRecherche;
-          if (this.timerRecherche) {
-            clearTimeout(this.timerRecherche);
-          }
-          this.timerRecherche = setTimeout(() => {
-            this.timerRecherche = undefined;
       this.render(true);
-          }, 500);
+    });
-        }
-      })
-      .change(async event =>
-        this.options.recherche = this._optionRecherche(event.currentTarget)
-      );
     html.find('.vue-detaillee').click(async event => {
+      console.log("CONTROLS", this.options.vueDetaillee)
       this.options.vueDetaillee = !this.options.vueDetaillee;
       this.render(true);
     });
@@ -533,17 +515,6 @@ export class RdDActorSheet extends ActorSheet {
     });
   }
 
-  _optionRecherche(target) {
-    if (!target.value?.length){
-      return undefined;
-    }
-    return {
-      text: target.value,
-      start: target.selectionStart,
-      end: target.selectionEnd,
-    };
-  }
-
   _getEventArmeCombat(event) {
     const li = $(event.currentTarget)?.parents(".item");
     let armeName = li.data("arme-name");

module/actor.js

@@ -33,8 +33,7 @@ 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 { SYSTEM_RDD, SYSTEM_SOCKET_ID } from "./constants.js";
-
 
 /* -------------------------------------------- */
 /**
@@ -99,6 +98,7 @@ export class RdDActor extends Actor {
    * @param {Object} options     (Unused) Additional options which customize the creation workflow.
    *
    */
+
   static async create(actorData, options) {
     // Case of compendium global import
     if (actorData instanceof Array) {
@@ -135,6 +135,13 @@ export class RdDActor extends Actor {
     this.encTotal = 0;
     this.prixTotalEquipement = 0;
 
+    /*
+    // Auto-resize token
+    if (this.isToken) {
+      let tokenSize = actorData.data.carac.taille.value/10;
+      this.token.update({height: tokenSize, width: tokenSize } );
+    }*/
+
     // Make separate methods for each Actor type (character, npc, etc.) to keep
     // things organized.
     if (actorData.type === 'personnage') this._prepareCharacterData(actorData);
@@ -240,7 +247,7 @@ export class RdDActor extends Actor {
   }
   /* -------------------------------------------- */
   getForce() {
-    if (this.isEntite()) {
+    if (this.isEntiteCauchemar()) {
       return Misc.toInt(Misc.templateData(this).carac.reve?.value);
     }
     return Misc.toInt(Misc.templateData(this).carac.force?.value);
@@ -613,10 +620,7 @@ export class RdDActor extends Actor {
       content: "Remise à neuf de " + this.name
     };
     const actorData = Misc.data(this);
-    if (this.isEntite([ENTITE_NONINCARNE])) {
+    if (this.isEntiteCauchemar()) {
-      return;
-    }
-    if (this.isEntite([ENTITE_INCARNE, ENTITE_BLURETTE])) {
       await this.santeIncDec("endurance", actorData.data.sante.endurance.max - actorData.data.sante.endurance.value);
     }
     else {
@@ -1217,39 +1221,21 @@ export class RdDActor extends Actor {
       if (srcId != destId && itemId != destId) { // déplacement de l'objet
         const dest = this.getObjet(destId);
         const src = this.getObjet(srcId);
-        if (dest?.isEquipementSimilaire(item)) {
+        // changer de conteneur
+        if (this.conteneurPeutContenir(dest, item)) {
+          await this.enleverDeConteneur(item, src, params.onEnleverConteneur);
+          await this.ajouterDansConteneur(item, dest, params.onAjouterDansConteneur);
+        }
+        else if (dest?.isEquipementSimilaire(item)) {
           await this.regrouperEquipementsSimilaires(item, dest);
           result = false;
         }
-        else
-        {
-          const cible = this.getContenantOrParent(dest);
-          // changer de conteneur
-          if (cible == undefined) {
-            await this.enleverDeConteneur(item, src, params.onEnleverConteneur);
-          }
-          else if (this.conteneurPeutContenir(cible, item)) {
-            await this.enleverDeConteneur(item, src, params.onEnleverConteneur);
-            await this.ajouterDansConteneur(item, cible, params.onAjouterDansConteneur);
-          }
-        }
       }
     }
     await this.computeEncombrementTotalEtMalusArmure();
     return result;
   }
 
-  getContenantOrParent(dest) {
-    if (!dest || dest.isConteneur()) {
-      return dest;
-    }
-    return this.getContenant(dest);
-  }
-
-  getContenant(item) {
-    return this.items.find(it => it.isConteneur() && Misc.templateData(it).contenu.includes(item.id));
-  }
-
   /* -------------------------------------------- */
   conteneurPeutContenir(dest, item) {
     if (!dest) {
@@ -1644,7 +1630,7 @@ export class RdDActor extends Actor {
 
   /* -------------------------------------------- */
   async setSonne(sonne = true) {
-    if (this.isEntite()) {
+    if (this.isEntiteCauchemar()) {
       return;
     }
     if (!game.combat && sonne) {
@@ -1656,7 +1642,7 @@ export class RdDActor extends Actor {
 
   /* -------------------------------------------- */
   getSConst() {
-    if (this.isEntite()) {
+    if (this.isEntiteCauchemar()) {
       return 0;
     }
     return RdDCarac.calculSConst(Misc.templateData(this).carac.constitution.value);
@@ -1773,7 +1759,7 @@ export class RdDActor extends Actor {
     result.newValue = Math.max(minValue, Math.min(compteur.value + inc, compteur.max));
     //console.log("New value ", inc, minValue, result.newValue);
     let fatigue = 0;
-    if (name == "endurance" && !this.isEntite()) {
+    if (name == "endurance" && !this.isEntiteCauchemar()) {
       if (result.newValue == 0 && inc < 0 && !isCritique) { // perte endurance et endurance devient 0 (sauf critique) -> -1 vie
         sante.vie.value--;
         result.perteVie = true;
@@ -1810,7 +1796,7 @@ export class RdDActor extends Actor {
   }
 
   isDead() {
-    return !this.isEntite() && Misc.templateData(this).sante.vie.value < -this.getSConst()
+    return !this.isEntiteCauchemar() && Misc.templateData(this).sante.vie.value < -this.getSConst()
   }
 
   /* -------------------------------------------- */
@@ -3164,11 +3150,7 @@ export class RdDActor extends Actor {
       case 'chance-actuelle': case 'chance actuelle':
         return carac.chance;
     }
-    const caracList = Object.entries(carac);
+    let entry = Misc.findFirstLike(name, Object.entries(carac), { mapper: it => it[1].label, description: 'caractéristique' });
-    let entry = Misc.findFirstLike(name, caracList, { mapper: it => it[0], description: 'caractéristique' });
-    if (!entry || entry.length ==0) {
-      entry = Misc.findFirstLike(name, caracList, { mapper: it => it[1].label, description: 'caractéristique' });
-    }
     return entry && entry.length > 0 ? carac[entry[0]] : undefined;
   }
 
@@ -3373,7 +3355,7 @@ export class RdDActor extends Actor {
     let encaissement = await this.jetEncaissement(rollData);
 
     this.ajouterBlessure(encaissement); // Will upate the result table
-    const perteVie = this.isEntite()
+    const perteVie = this.isEntiteCauchemar()
       ? { newValue: 0 }
       : await this.santeIncDec("vie", - encaissement.vie);
     const perteEndurance = await this.santeIncDec("endurance", -encaissement.endurance, encaissement.critiques > 0);
@@ -3388,7 +3370,7 @@ export class RdDActor extends Actor {
       sonne: perteEndurance.sonne,
       jetEndurance: perteEndurance.jetEndurance,
       endurance: santeOrig.endurance.value - perteEndurance.newValue,
-      vie: this.isEntite() ? 0 : (santeOrig.vie.value - perteVie.newValue),
+      vie: this.isEntiteCauchemar() ? 0 : (santeOrig.vie.value - perteVie.newValue),
       show: defenderRoll?.show ?? {}
     });
 
@@ -3578,8 +3560,8 @@ export class RdDActor extends Actor {
   /* -------------------------------------------- */
   async accorder(entite, when = 'avant-encaissement') {
     if (when != game.settings.get(SYSTEM_RDD, "accorder-entite-cauchemar")
-      || !entite.isEntite([ENTITE_INCARNE])
+      || !entite.isEntiteCauchemar()
-      || entite.isEntiteAccordee(this)) {
+      || entite.isEntiteCauchemarAccordee(this)) {
       return true;
     }
     const tplData = Misc.templateData(this);
@@ -3603,32 +3585,29 @@ export class RdDActor extends Actor {
   }
 
   /* -------------------------------------------- */
-  isEntite(typeentite = [] ) {
+  isEntiteCauchemar() {
-    return this.data.type == 'entite' && (typeentite.length == 0 || typeentite.includes(this.data.data.definition.typeentite));
+    return this.data.type == 'entite';
   }
 
   /* -------------------------------------------- */
-  isEntiteAccordee(attaquant) {
+  isEntiteCauchemarAccordee(attaquant) {
-    if (!this.isEntite([ENTITE_INCARNE])) { 
+    if (!this.isEntiteCauchemar()) { return true; }
-      return true; 
-    }
     let resonnance = Misc.templateData(this).sante.resonnance;
-    console.log("RESONN", resonnance)
+    return (resonnance.actors.find(it => it == attaquant._id));
-    return (resonnance.actors.find(it => it == attaquant.id));
   }
 
   /* -------------------------------------------- */
   async setEntiteReveAccordee(attaquant) {
-    if (!this.isEntite([ENTITE_INCARNE])) {
+    if (!this.isEntiteCauchemar()) {
       ui.notifications.error("Impossible de s'accorder à " + this.name + ": ce n'est pas une entite de cauchemer/rêve");
       return;
     }
     let resonnance = duplicate(Misc.templateData(this).sante.resonnance);
-    if (resonnance.actors.find(it => it == attaquant.id)) {
+    if (resonnance.actors.find(it => it == attaquant._id)) {
       // déjà accordé
       return;
     }
-    resonnance.actors.push(attaquant.id);
+    resonnance.actors.push(attaquant._id);
     await this.update({ "data.sante.resonnance": resonnance });
     return;
   }
@@ -4182,7 +4161,7 @@ export class RdDActor extends Actor {
 
   /* -------------------------------------------- */
   async setStatusEffect(label, status, updates = {}) {
-    if (this.isEntite() || this.data.type == 'vehicule') {
+    if (this.isEntiteCauchemar() || this.data.type == 'vehicule') {
       return;
     }
     console.log("setStatusEffect", label, status, updates)

module/constants.js

@@ -3,7 +3,3 @@ export const SYSTEM_SOCKET_ID = 'system.foundryvtt-reve-de-dragon';
 
 export const HIDE_DICE = 'hide';
 export const SHOW_DICE = 'show';
-
-export const ENTITE_INCARNE = 'incarne';
-export const ENTITE_NONINCARNE = 'nonincarne';
-export const ENTITE_BLURETTE = 'blurette';

module/dialog-item-achat.js

@@ -55,7 +55,7 @@ export class DialogItemAchat extends Dialog {
 
   static prepareVenteData(buttonAcheter, vendeurId, vendeur, acheteur) {
     const jsondata = buttonAcheter.attributes['data-jsondata']?.value;
-    const prixLot = parseInt(buttonAcheter.attributes['data-prixLot']?.value ?? 0);
+    const prixLot = buttonAcheter.attributes['data-prixLot']?.value ?? 0;
     let venteData = {
       item: JSON.parse(jsondata),
       vendeurId: vendeurId,

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 { 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";
@@ -106,8 +106,8 @@ export class RdDCombatManager extends Combat {
       }
       //console.log("Combatat", c);
       const roll = combatant.getInitiativeRoll(rollFormula);
-      if (!roll.total) {
+      if ( !roll.total) {
-        roll.evaluate({ async: false });
+        roll.evaluate( {async: false});
       }
       if (roll.total <= 0) roll.total = 0.00;
       console.log("Compute init for", rollFormula, roll.total, combatant);
@@ -187,7 +187,7 @@ export class RdDCombatManager extends Combat {
             action.data.dommagesReels = Number(tableauDegats[0]);
             arme2main.data.dommagesReels = Number(tableauDegats[1]);
           }
-          else {
+          else{
             ui.notifications.info("Les dommages de l'arme à 1/2 mains " + action.name + " ne sont pas corrects (ie sous la forme X/Y)");
           }
         }
@@ -197,7 +197,8 @@ export class RdDCombatManager extends Combat {
   }
 
   static listActionsPossessions(actor) {
-    return RdDCombatManager._indexActions(actor.getPossessions().map(p => {
+    return RdDCombatManager._indexActions(actor.getPossessions().map(p =>
+      {
         return {
           name: p.name,
           action: 'conjurer',
@@ -213,7 +214,7 @@ export class RdDCombatManager extends Combat {
   static listActionsCombat(combatant) {
     const actor = combatant.actor;
     let actions = RdDCombatManager.listActionsPossessions(actor);
-    if (actions.length > 0) {
+    if (actions.length>0) {
       return actions;
     }
     let items = actor.data.items;
@@ -319,7 +320,7 @@ export class RdDCombatManager extends Combat {
       initOffset = 10;
       caracForInit = combatant.actor.getReveActuel();
       initInfo = "Possession"
-    } else if (action.action == 'autre') {
+    } else if (action.name == 'autre') {
       initOffset = 2;
       initInfo = "Autre Action"
     } else if (action.action == 'haut-reve') {
@@ -371,7 +372,7 @@ export class RdDCombatManager extends Combat {
   static displayInitiativeMenu(html, combatantId) {
     console.log("Combatant ; ", combatantId);
     const combatant = game.combat.combatants.get(combatantId);
-    if (!(combatant?.actor)) {
+    if (! (combatant?.actor) ) {
       ui.notifications.warn(`Le combatant ${combatant.name ?? combatantId} n'est pas associé à un acteur, impossible de déterminer ses actions de combat!`)
       return;
     }
@@ -456,7 +457,7 @@ export class RdDCombat {
     else {
       const defender = target?.actor;
       const defenderTokenId = target?.data._id;
-      if (defender.type == 'entite' && defender.data.data.definition.typeentite == ENTITE_NONINCARNE) {
+      if ( defender.type == 'entite' && defender.data.data.definition.typeentite == 'nonincarne') {
         ui.notifications.warn("Vous ne pouvez pas cibler une entité non incarnée !!!!");
       } else {
         return this.create(attacker, defender, defenderTokenId, target)
@@ -566,7 +567,7 @@ export class RdDCombat {
   async onEvent(button, event) {
     const chatMessage = ChatUtility.getChatMessage(event);
     const defenderRoll = ChatUtility.getMessageData(chatMessage, 'defender-roll');
-    const attackerRoll = defenderRoll?.attackerRoll ?? ChatUtility.getMessageData(chatMessage, 'attacker-roll');
+    const attackerRoll = defenderRoll?.attackerRoll ?? ChatUtility.getMessageData(chatMessage, 'attacker-roll') ;
     console.log('RdDCombat', attackerRoll, defenderRoll);
     const defenderTokenId = event.currentTarget.attributes['data-defenderTokenId']?.value;
 
@@ -798,7 +799,7 @@ export class RdDCombat {
   async _onAttaqueNormale(attackerRoll) {
     console.log("RdDCombat.onAttaqueNormale >>>", attackerRoll);
 
-    attackerRoll.dmg = RdDBonus.dmg(attackerRoll, this.attacker.getBonusDegat(), this.defender.isEntite());
+    attackerRoll.dmg = RdDBonus.dmg(attackerRoll, this.attacker.getBonusDegat(), this.defender.isEntiteCauchemar());
     let defenderRoll = { attackerRoll: attackerRoll, passeArme: attackerRoll.passeArme, show: {} }
     attackerRoll.show = {
       cible: this.target ? this.defender.data.name : 'la cible',
@@ -816,7 +817,7 @@ export class RdDCombat {
   }
 
   /* -------------------------------------------- */
-  isPossession(attackerRoll) {
+  isPossession( attackerRoll) {
     return attackerRoll.selectedCarac.label.toLowerCase() == 'possession';
   }
 
@@ -961,8 +962,9 @@ export class RdDCombat {
     const arme = this.defender.getArmeParade(armeParadeId);
     console.log("RdDCombat.parade >>>", attackerRoll, armeParadeId, arme);
     const competence = Misc.templateData(arme)?.competence;
-    if (competence == undefined) {
+    if (competence == undefined)
-      console.error("Pas de compétence de parade associée à ", arme);
+    {
+      console.error("Pas de compétence de parade associée à ", arme) ;
       return;
     }
 
@@ -1245,12 +1247,10 @@ export class RdDCombat {
   /* -------------------------------------------- */
   /* retourne true si on peut continuer, false si on ne peut pas continuer */
   async accorderEntite(when = 'avant-encaissement') {
-    console.log("TETETET", game.settings.get(SYSTEM_RDD, "accorder-entite-cauchemar"), this.defender.isEntite([ENTITE_INCARNE]), this.defender.isEntiteAccordee(this.attacker))
-    
     if (when != game.settings.get(SYSTEM_RDD, "accorder-entite-cauchemar")
       || this.defender == undefined
-      || !this.defender.isEntite([ENTITE_INCARNE])
+      || !this.defender.isEntiteCauchemar()
-      || this.defender.isEntiteAccordee(this.attacker)) {
+      || this.defender.isEntiteCauchemarAccordee(this.attacker)) {
       return true;
     }
 

module/rdd-namegen.js

@@ -1,29 +1,19 @@
-import { RdDActor } from "./actor.js";
 import { Misc } from "./misc.js";
 import { RdDDice } from "./rdd-dice.js";
 
-const words = ['pore', 'pre', 'flor', 'lane', 'turlu', 'pin', 'a', 'alph', 'i', 'onse', 'iane', 'ane', 'zach', 'arri', 'ba', 'bo', 'bi',
+const words = [ 'pore', 'pre', 'flor', 'lane', 'turlu', 'pin', 'a', 'alph', 'i', 'onse', 'iane', 'ane', 'zach', 'arri', 'ba', 'bo', 'bi', 
-  'alta', 'par', 'pir', 'zor', 'zir', 'de', 'pol', 'tran', 'no', 'la', 'al', 'pul', 'one', 'ner', 'nur', 'mac', 'mery',
+              'alta', 'par', 'pir', 'zor', 'zir', 'de', 'pol', 'tran', 'no', 'la', 'al' , 'pul', 'one', 'ner', 'nur', 'mac', 'mery',
               'cat', 'do', 'di', 'der', 'er', 'el', 'far', 'fer', 'go', 'guer', 'hot', 'jor', 'jar', 'ji', 'kri', 'ket', 'lor', 'hur',
               'lar', 'lir', 'lu', 'pot', 'pro', 'pra', 'pit', 'qua', 'qui', 're', 'ral', 'sal', 'sen', 'ted', 'to', 'ta', 'lars', 'ver',
-  'vin', 'ov', 'wal', 'ry', 'ly', ''];
+              'vin', 'ov', 'wal', 'ry', 'ly', '' ];
 
 /* -------------------------------------------- */
 export class RdDNameGen {
 
-  static async getName(msg, params) {
+  static async getName( msg, params ) {
-    const html = await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-command-nom.html`, {
+    let name = Misc.upperFirst( await RdDDice.rollOneOf(words) + await RdDDice.rollOneOf(words) )
-      nom: Misc.upperFirst(await RdDDice.rollOneOf(words) + await RdDDice.rollOneOf(words))
+    //console.log(name);
-    });
+    ChatMessage.create( { content: `Nom : ${name}`, whisper: ChatMessage.getWhisperRecipients("GM") } );
-    ChatMessage.create({ content: html, whisper: ChatMessage.getWhisperRecipients("GM") });
   }
 
-  static async onCreerActeur(event) {
-    const button = event.currentTarget;
-    await RdDActor.create({
-        name: button.attributes['data-nom'].value,
-        type: button.attributes['data-type'].value
-      },
-      {renderSheet: true});
-  }
 }

module/rdd-resolution-table.js

@@ -158,7 +158,6 @@ export class RdDResolutionTable {
     if (difficulte < -10) {
       return duplicate(levelDown.find(levelData => levelData.level == difficulte));
     }
-    console.log("DATA :", caracValue, difficulte)
     return duplicate(RdDResolutionTable.resolutionTable[caracValue][difficulte + 10]);
   }
 

module/rdd-roll-encaisser.js

@@ -1,5 +1,3 @@
-import { ENTITE_BLURETTE, ENTITE_INCARNE, ENTITE_NONINCARNE } from "./constants.js";
-
 /**
  * Extend the base Dialog entity by defining a custom window to perform roll.
  * @extends {Dialog}
@@ -9,19 +7,15 @@ export class RdDEncaisser extends Dialog {
   /* -------------------------------------------- */
   constructor(html, actor) {
     // Common conf
-    let buttons = {};
+    const buttonsCreatures = {
-    if (!actor.isEntite()){
-      buttons = {
       "mortel": { label: "Mortel", callback: html => this.performEncaisser("mortel") },
       "non-mortel": { label: "Non-mortel", callback: html => this.performEncaisser("non-mortel") },
       "sonne": { label: "Sonné", callback: html => this.actor.setSonne() },
     };
-    }
+    const buttonsEntitesCauchemar = {
-    else if (actor.isEntite([ENTITE_BLURETTE, ENTITE_INCARNE])){
-      buttons = {
       "cauchemar": { label: "cauchemar", callback: html => this.performEncaisser("cauchemar") }
-      }
+    };
-    }
+    const buttons = actor.isEntiteCauchemar() ? buttonsEntitesCauchemar : buttonsCreatures;
 
     let dialogConf = {
       title: "Jet d'Encaissement",
@@ -30,6 +24,7 @@ export class RdDEncaisser extends Dialog {
       default: "mortel"
     }
 
+
     let dialogOptions = {
       classes: ["rdddialog"],
       width: 320,

module/rdd-utility.js

@@ -11,7 +11,6 @@ import { RdDDice } from "./rdd-dice.js";
 import { RdDItem } from "./item.js";
 import { Monnaie } from "./item-monnaie.js";
 import { RdDPossession } from "./rdd-possession.js";
-import { RdDNameGen } from "./rdd-namegen.js";
 
 /* -------------------------------------------- */
 // This table starts at 0 -> niveau -10
@@ -122,12 +121,8 @@ export class RdDUtility {
       'systems/foundryvtt-reve-de-dragon/templates/actor-liste-blessures-partial.html',
       'systems/foundryvtt-reve-de-dragon/templates/actor-blessure-partial.html',
       // Conteneur/item in Actor sheet
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-conteneur.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-item.html',
       "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-monnaie.html",
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-liens-animaux.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-liens-suivants.html',
-      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-liens-vehicules.html',
       'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-editor-notes-mj.html',
       //Items
       'systems/foundryvtt-reve-de-dragon/templates/item-competence-sheet.html',
@@ -239,8 +234,7 @@ export class RdDUtility {
     Handlebars.registerHelper('typeTmr-name', coord => TMRUtility.typeTmrName(coord));
     Handlebars.registerHelper('min', (...args) => Math.min(...args.slice(0, -1)));
 
-    Handlebars.registerHelper('filtreTriCompetences', competences => competences.filter(it => it.visible)
+    Handlebars.registerHelper('sortCompetence', competences => competences.sort((a, b) => {
-      .sort((a, b) => {
       if (a.name.startsWith("Survie") && b.name.startsWith("Survie")) {
         if (a.name.includes("Cité")) return -1;
         if (b.name.includes("Cité")) return 1;
@@ -269,8 +263,7 @@ export class RdDUtility {
         return a.name.localeCompare(b.name);
       }
       return a.name.localeCompare(b.name);
-      })
+    }));
-    );
 
     return loadTemplates(templatePaths);
   }
@@ -471,32 +464,34 @@ export class RdDUtility {
   /** Construit la structure récursive des conteneurs, avec imbrication potentielle
    * 
    */
-  static buildConteneur(objet, profondeur) {
+  static buildConteneur(objet, niveau) {
-    if (!profondeur) profondeur = 1;
+    if (!niveau) niveau = 1;
-    objet.niveau = profondeur;
+    objet.niveau = niveau;
-    const isConteneur = objet.type == 'conteneur';
+    //console.log("OBJ:", objet);
-    const isOuvert = isConteneur && this.getAfficheContenu(objet._id);
+    let str = Handlebars.partials['systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-conteneur.html']({ item: objet });
-    const isVide = isConteneur && Misc.templateData(objet).contenu.length == 0;
+    if (objet.type == 'conteneur') {
-    const conteneur = Handlebars.partials['systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-item.html']({
+      const afficherContenu = this.getAfficheContenu(objet._id);
-      item: objet,
+      str = str + RdDUtility.buildContenu(objet, niveau, afficherContenu);
-      vide: isVide,
+    }
-      ouvert: isOuvert
+    return str;
-    });
-    const contenu = isConteneur ? RdDUtility.buildContenu(objet, profondeur, isOuvert) : '';
-    return conteneur + contenu;
   }
 
   /* -------------------------------------------- */
-  static buildContenu(objet, profondeur, afficherContenu) {
+  static buildContenu(objet, niveau, afficherContenu) {
-    if (!profondeur) profondeur = 1;
+    if (!niveau) niveau = 1;
-    objet.niveau = profondeur;
+    objet.niveau = niveau;
-    const display = afficherContenu ? 'item-display-show' : 'item-display-hide';
+    let strContenu = "";
     //console.log("ITEM DISPLAYED", objet );
-    let strContenu = `<ul class='item-list alterne-list ${display} list-item-margin${profondeur}'>`;
+    if (afficherContenu) {
-    for (let subItem of objet.subItems) {
+      strContenu = "<ul class='item-list alterne-list item-display-show list-item-margin" + niveau + "'>";
-      strContenu += this.buildConteneur(subItem, profondeur + 1);
+    } else {
+      strContenu = "<ul class='item-list alterne-list item-display-hide list-item-margin" + niveau + "'>";
     }
-    return strContenu + "</ul>";
+    for (let subItem of objet.subItems) {
+      strContenu = strContenu + this.buildConteneur(subItem, niveau + 1);
+    }
+    strContenu = strContenu + "</ul>";
+    return strContenu;
   }
 
   /* -------------------------------------------- */
@@ -709,7 +704,6 @@ export class RdDUtility {
 
     // gestion bouton tchat Acheter
     html.on("click", '.button-acheter', event => DialogItemAchat.onButtonAcheter(event));
-    html.on("click", '.button-creer-acteur', event => RdDNameGen.onCreerActeur(event));
 
     // Gestion du bouton payer
     html.on("click", '.payer-button', event => {

styles/simple.css

@@ -66,10 +66,6 @@
   --debug-box-shadow-green: inset 0 0 2px green;
 
 /* =================== 3. some constants ============ */ 
-  --color-controls:rgba(0, 0, 0, 0.9);
-  --color-controls-hover:rgba(255, 255, 128, 0.7);
-  --color-control-border-hover:rgba(255, 128, 0, 0.8);
-  --color-gold: rgba(191, 149, 63, 0.8);
   --gradient-gold: linear-gradient(30deg, rgba(191, 149, 63, 0.3), rgba(252, 246, 186, 0.3), rgba(179, 135, 40, 0.3), rgba(251, 245, 183, 0.3), rgba(170, 119, 28, 0.3));
   --gradient-silver: linear-gradient(30deg, rgba(61, 55, 93, 0.3), rgba(178, 179, 196, 0.3), rgba(59, 62, 63, 0.6), rgba(206, 204, 199, 0.3), rgba(61, 46, 49, 0.3));
   --gradient-green: linear-gradient(30deg, rgba(7, 76, 0, 0.3), rgba(66, 163, 65, 0.2), rgba(184, 226, 163, 0.1), rgba(66, 163, 65, 0.2), rgba(184, 226, 163, 0.3));
@@ -108,9 +104,6 @@
 .strong-text{
   font-weight: bold;
 }
-i:is(.fas, .far) {
-  font-size: smaller;
-}
 
 .tabs .item.active, .blessures-list li ul li:first-child:hover, a:hover {
   text-shadow: 1px 0px 0px #ff6600;
@@ -232,26 +225,6 @@ table {border: 1px solid #7a7971;}
   flex-grow : 3;
 }
 /* Styles limited to foundryvtt-reve-de-dragon sheets */
-.equipement-nom {
-  flex-grow : 4;
-  margin: 0;
-  justify-content: center;
-  text-align: left;
-}
-.equipement-detail {
-  margin: 0;
-  flex: 'flex-shrink' ;
-  align-items: center;
-  justify-content: center;
-  text-align: center;
-}
-.equipement-actions {
-  margin: 0;
-  flex-grow: 2;
-  align-items: center;
-  justify-content: center;
-  text-align: left;
-}
 
 .foundryvtt-reve-de-dragon .sheet-header {
   -webkit-box-flex: 0;
@@ -295,6 +268,12 @@ table {border: 1px solid #7a7971;}
   border-width: 0;
 	border: 1px solid rgba(0, 0, 0, 0);
 }
+.button-img:hover {
+	color: rgba(255, 255, 128, 0.7);
+	border: 1px solid rgba(255, 128, 0, 0.8);
+	cursor: pointer;
+}
+
 .button-effect-img {
   vertical-align: baseline;
   width: 16px;
@@ -302,16 +281,9 @@ table {border: 1px solid #7a7971;}
   height: 16;
   border-width: 0;
 }
-.small-button-direction {
+.button-effect-img:hover {
-  height: 32px;
+  color: rgba(255, 255, 128, 0.7);
-  width: 32px;
+  border: 1px solid rgba(255, 128, 0, 0.8);
-  border: 0;
-  vertical-align: bottom;
-}
-:is(.button-img,.button-effect-img:hover,.small-button-direction):hover {
-  color: var(--color-controls-hover);
-  border: 1px solid var(--color-control-border-hover);
-  text-shadow: 1px 0px 0px #ff6600;
   cursor: pointer;
 }
 
@@ -322,6 +294,18 @@ table {border: 1px solid #7a7971;}
   vertical-align: bottom;
 }
 
+.small-button-direction {
+  height: 32px;
+  width: 32px;
+  border: 0;
+  vertical-align: bottom;
+}
+.small-button-direction:hover {
+	color: rgba(255, 255, 128, 0.7);
+	border: 1px solid rgba(255, 128, 0, 0.8);
+	cursor: pointer;
+}
+
 .foundryvtt-reve-de-dragon .sheet-header .header-fields {
   -webkit-box-flex: 1;
   -ms-flex: 1;
@@ -362,25 +346,25 @@ table {border: 1px solid #7a7971;}
   flex-grow: 0;
 }
 
-.rdd.sheet .window-content .sheet-body .carac-list .caracteristique {
+.rdd.sheet .window-content .sheet-body .carac-list .competence {
   flex-wrap: nowrap;
   justify-content: stretch;
 }
-.rdd.sheet .window-content .sheet-body .carac-list .caracteristique > .carac-label {
+.rdd.sheet .window-content .sheet-body .carac-list .competence > .carac-label {
   flex-basis: 50%;
 }
-.rdd.sheet .window-content .sheet-body .carac-list .caracteristique > .attribut-label {
+.rdd.sheet .window-content .sheet-body .carac-list .competence > .attribut-label {
   flex-basis: 50%;
 }
-.rdd.sheet .window-content .sheet-body .carac-list .caracteristique > .competence-value.total {
+.rdd.sheet .window-content .sheet-body .carac-list .competence > .competence-value.total {
   flex-grow: 1;
   text-align: right;
 }
-.rdd.sheet .window-content .sheet-body .carac-list .caracteristique > .utiliser-attribut {
+.rdd.sheet .window-content .sheet-body .carac-list .competence > .utiliser-attribut {
   flex-basis: available;
   flex-grow: 1;
 }
-.rdd.sheet .window-content .sheet-body .carac-list .caracteristique > * {
+.rdd.sheet .window-content .sheet-body .carac-list .competence > * {
   flex-basis: 13%;
   flex-grow: 0;
 }
@@ -485,18 +469,13 @@ table {border: 1px solid #7a7971;}
   flex: 0 0 86px;
   text-align: right;
 }
+
 .competence-list .item-controls {
   display: contents !important;
 }
 .competence-list .item-controls.hidden-controls {
   display: none !important;
 }
-.item-controls i:is(.fas,.far) {
-  color: var(--color-controls);
-}
-.item-controls i:is(.fas,.far):hover {
-  opacity: 0.7  ;
-}
 
 .rdddialog .dialog-roll-sort s{
   width: 600px;
@@ -588,7 +567,7 @@ table {border: 1px solid #7a7971;}
   color: rgba(255, 255, 255, 0.75);
   background: rgba(255, 255, 255, 0.05);
   border: 0 none;
-  margin-bottom: 0.2rem;
+  margin-bottom: 0.25rem;
 }
 
 .window-app .window-content, .window-app.sheet .window-content .sheet-body{
@@ -622,7 +601,7 @@ section.sheet-body{padding: 0.25rem 0.5rem;}
 
 nav.sheet-tabs .item {
   position: relative;
-  padding: 0 0.2rem;
+  padding: 0 0.25rem;
 }
 
 nav.sheet-tabs .item:after {
@@ -648,15 +627,11 @@ section.sheet-body:after {
 .sheet header.sheet-header .flex-compteurs {text-align: right;}
 .sheet header.sheet-header .resource-content {width: 2rem;}
 
-.compteur span {
+.ctn-vie span, .ctn-endu span, .ctn-fatigue span, .ctn-reve span {
   display: inline-block;
   text-align: left;
   width: 2rem;
 }
-.compteur a i:is(.fas,.far):hover {
-  opacity: 0.7  ;
-}
-
 .select-diff {
   display: inline-block;
   text-align: left;
@@ -669,6 +644,17 @@ section.sheet-body:after {
   max-width: 90%;
 }
 
+.plus-moins {
+  display: inline-block;
+  width: 1.25rem;
+  background: rgba(30, 25, 20, 1);
+  text-align: center;
+  border: 1px solid rgba(72, 46, 28, 1);
+  border-radius: 0.25rem;
+  line-height: 1.25rem;
+  color: rgba(255, 255, 255, 0.5);
+}
+
 .alchimie-tache {
   font-weight: bold;
   background: rgb(182, 180, 179);
@@ -725,13 +711,10 @@ ul, ol {
 ul, li {
   list-style-type: none;
 }
-.sheet .caracteristique li {
+
-  margin: 0.1rem;
-  padding: 0.2rem;
-}
 .sheet li {
-  margin: 0.1rem;
+  margin: 0.125rem;
-  padding: 0.1rem;
+  padding: 0.25rem;
 }
 .header-fields li {
   margin: 0;
@@ -748,19 +731,23 @@ ul, li {
   background: rgb(160, 130, 100, 0.05);
 }
 .xp-level-up {
-  margin: 0.1rem;
+  margin: 0.125rem;
   box-shadow: inset 0px 0px 1px #00000096;
   border-radius: 0.25rem;
-  padding: 0.1rem;
+  padding: 0.125rem;
   flex: 1 1 5rem;  
   background: var(--gradient-gold) !important;
 }
 .niveau-archetype {
   background: var(--gradient-silver-light) !important;
 }
-.item-controls i.fas.allouer-stress.level-up {
+.fa-arrow-alt-circle-up.allouer-stress {
-  color: var(--color-gold);
+  color: rgba(83, 60, 14, 0.8);
 }
+.fa-arrow-alt-circle-up.allouer-stress-level-up {
+  color: rgba(191, 149, 63, 0.8);
+}
+
 .blessures-list ul {
   display: flex;
 }
@@ -779,18 +766,18 @@ ul, li {
   font-weight: bold;
 }
 .list-item {
-  margin: 0.1rem;
+  margin: 0.125rem;
   box-shadow: inset 0px 0px 1px #00000096;
   border-radius: 0.25rem;
-  padding: 0.1rem;
+  padding: 0.125rem;
   flex: 1 1 5rem;
   display: flex !important;
-  align-items: center !important;
+  align-items: baseline !important;
 }
 
 .table-row {
-  margin: 0.1rem;
+  margin: 0.125rem;
-  padding: 0.1rem;
+  padding: 0.125rem;
   flex: 1 1 5rem;
 }
 
@@ -814,37 +801,28 @@ ul, li {
   background: rgb(200, 10, 100, 0.25);
 }
 
-.item-column {
+.item-quantite {
-  margin-left: 0.2rem;
+  margin-left: 0.5rem;
-  margin-right: 0.2rem;
-  justify-content: center;
-  text-align: center;
 }
 
 .list-item-margin1 {
-  margin-left: 0.5rem;
-}
-.list-item-margin2 {
   margin-left: 1rem;
 }
-.list-item-margin3 {
+.list-item-margin2 {
-  margin-left: 1.5rem;
-}
-.list-item-margin4 {
   margin-left: 2rem;
 }
-.list-item-margin5 {
+.list-item-margin3 {
-  margin-left: 2.5rem;
-}
-.list-item-margin6 {
   margin-left: 3rem;
 }
+.list-item-margin4 {
+  margin-left: 4rem;
+}
 
 .sheet-competence-img {
   width: 24px;
   height: 24px;
   flex-grow: 0;
-  margin-right: 0.2rem;
+  margin-right: 0.25rem;
   vertical-align: bottom;
 }
 .competence-column {
@@ -888,20 +866,20 @@ ul, li {
 .competence-value {
   flex-grow: 0;
   flex-basis: 2rem;
-  margin-right: 0.2rem;
+  margin-right: 0.25rem;
-  margin-left: 0.2rem;
+  margin-left: 0.25rem;
 }
 .description-value {
   flex-grow: 0;
   flex-basis: 4rem;
-  margin-right: 0.2rem;
+  margin-right: 0.25rem;
-  margin-left: 0.2rem;
+  margin-left: 0.25rem;
 }
 .competence-xp {
   flex-grow: 0;
   flex-basis: 2rem;
-  margin-right: 0.2rem;
+  margin-right: 0.25rem;
-  margin-left: 0.2rem;
+  margin-left: 0.25rem;
 }
 .blessures-title { 
   font-weight: bold;
@@ -979,7 +957,7 @@ ul, li {
   flex-basis: auto;
   padding: 0;
   line-height: 1rem;
-  margin: 0.2rem;
+  margin: 0.25rem;
 }
 .control-icon.tokenhudicon.right {
   margin-left: 8px;
@@ -997,7 +975,7 @@ ul, li {
   border-left: none;
   font-weight: 500;
   font-size: 1rem;
-  color: var(--color-controls);
+  color: black;
   padding-top: 5px;
   margin-right: 0px;
   width: 45px;
@@ -1097,7 +1075,7 @@ ul, li {
 .sidebar-tab .directory-list .entity {
     border-top: 1px dashed rgba(0,0,0,0.25);
     border-bottom: 0 none;
-    padding: 0.2rem 0; 
+    padding: 0.25rem 0; 
 }
 
 .sidebar-tab .directory-list .entity:hover {
@@ -1175,11 +1153,11 @@ ul, li {
   border-image-width: 4px;
   border-image-outset: 0px;
 }
-#controls .control-tools {
+  #controls .control-tools {
     max-height: calc(100vh - 156px);
     height: auto;
 }
-#controls :is(.scene-control.active,.control-tool.active, .scene-control:hover, .control-tool:hover) {
+#controls .scene-control.active, #controls .control-tool.active, #controls .scene-control:hover, #controls .control-tool:hover {
   background: rgba(72, 46, 28, 1);
   background-origin: padding-box;
   border-image: url(img/ui/footer-button.webp) 10 repeat;
@@ -1365,8 +1343,8 @@ ul, li {
 	color: rgba(255, 255, 255, 0.5);
 }
 .calendar-btn:hover {
-	color: var(--color-controls-hover);
+	color: rgba(255, 255, 128, 0.7);
-	border: 1px solid var(--color-control-border-hover);
+	border: 1px solid rgba(255, 128, 0, 0.8);
 	cursor: pointer;
 }
 

system.json

@@ -29,7 +29,7 @@
   "url": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/",
   "license": "LICENSE.txt",
   "flags": {},
-  "version": "1.5.90",
+  "version": "1.5.82",
   "minimumCoreVersion": "0.8.0",
   "compatibleCoreVersion": "9",
   "scripts": [],
@@ -500,7 +500,7 @@
   "dependencies": [],
   "socket": true,
   "manifest": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/raw/v1.5/system.json",
-  "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-1.5.90.zip",
+  "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-1.5.82.zip",
   "protected": false,
   "gridDistance": 1,
   "gridUnits": "m",

templates/actor-blessure-partial.html

@@ -1,5 +1,5 @@
 <tr class="table-row alterne-row item" data-blessure-type="{{gravite}}" data-attribute={{key}} data-blessure-index="{{key}}" >
-  <td class="blessure-control" title="Blessure {{title}}" data-blessure-active="{{bless.active}}">
+  <td class="item-control blessure-control" title="Blessure {{title}}" data-blessure-active="{{bless.active}}">
     {{#if bless.active}}
     <i class="fas fa-skull-crossbones blessure-active-{{gravite}}" name="blessure-{{gravite}}-{{key}}-active"></i>
     {{else}}

templates/actor-creature-sheet.html

@@ -108,8 +108,8 @@
               <input class="competence-value creature-dommages" type="text" compname="{{comp.name}}"
                 value="{{numberFormat comp.data.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-control 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>
+                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
               </div>
             </li>
             {{/each}}
@@ -126,7 +126,35 @@
 
     {{!-- Equipment Tab --}}
     <div class="tab items" data-group="primary" data-tab="items">
-      {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire.html"}}
+
+      {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-monnaie.html" monnaie=monnaie}}
+
+      <span class="item-name"><h4>Equipement porté</h4></span>
+      <span class="item-name">Encombrement total/max : {{numberFormat calc.encTotal decimals=2}} / {{data.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}}
+
+      <ul class="item-list alterne-list">
+        <li class="competence-header flexrow">
+          <img class="sheet-competence-img" src="{{img}}" title="Equipement"/>
+          <span class="competence-title flex-grow">Nom</span>
+          <span class="competence-title">Q.</span>
+          <span class="competence-title">Enc.</span>
+          <span class="competence-title flex-grow">Equiper/Editer/Suppr.</span>
+        </li>
+        {{#each objets as |item id|}}
+          {{#unless item.estContenu}}
+          {{#if (ne item.type 'conteneur')}}
+            {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-conteneur.html" item=item }}
+          {{/if}}
+          {{/unless}}
+        {{/each}}
+        {{#each conteneurs as |conteneur id|}}
+          {{buildConteneur this}}
+        {{/each}}
+      </ul>
     </div>
 
     {{!-- Biography Tab --}}

templates/actor-entite-sheet.html

@@ -33,7 +33,7 @@
         <div class="flex-group-left flexcol">
           <ol class="carac-list alterne-list">
             {{#each data.carac as |carac key|}}
-            <li class="caracteristique flexrow list-item" data-attribute="{{key}}">
+            <li class="competence flexrow list-item" data-attribute="{{key}}">
               {{#if (eq key 'taille')}}
               <span class="carac-label flexrow" name="data.carac.{{key}}.label">{{carac.label}}</span>
               {{else}}
@@ -50,7 +50,7 @@
         <div class="flex-group-left flexcol">        
 
           <ol class="carac-list alterne-list">
-            <li class="caracteristique flexrow list-item">
+            <li class="competence flexrow list-item">
               <span class="carac-label flexrow" name="catEntite">Catégorie : </span>
               <select name="data.definition.categorieentite" value="{{data.definition.categorieentite}}" data-dtype="String">
                 {{#select data.definition.categorieentite}}
@@ -59,24 +59,23 @@
                 {{/select}}
               </select>
             </li>
-            <li class="caracteristique flexrow list-item">
+            <li class="competence flexrow list-item">
               <span class="carac-label flexrow" name="typeEntite">Type d'entité : </span>
               <select name="data.definition.typeentite" value="{{data.definition.typeentite}}" data-dtype="String">
                 {{#select data.definition.typeentite}}
                 <option value="incarne">Incarnée</option>
                 <option value="nonincarne">Non Incarnée</option>
-                <option value="blurette">Blurete</option>
                 {{/select}}
               </select>
             </li>
             {{#each data.attributs as |attr key|}}
-            <li class="caracteristique flexrow list-item" data-attribute="{{key}}">
+            <li class="competence flexrow list-item" data-attribute="{{key}}">
               <span class="carac-label flexrow" name="data.attributs.{{key}}.label">{{attr.label}} : </span>
               <span><input class="attribut-value flexrow" type="text" name="data.attributs.{{key}}.value"
                   value="{{attr.value}}" data-dtype="{{attr.type}}" /></span>
             </li>
             {{/each}}
-            <li class="caracteristique flexrow list-item" data-attribute="endurance">
+            <li class="competence flexrow list-item" data-attribute="endurance">
               <span class="competence-label flexrow" name="data.sante.endurance.label">Endurance : </span>
               <span><input class="sante-value flexrow" type="text" name="data.sante.endurance.value"
                   value="{{data.sante.endurance.value}}" data-dtype="Number" /></span><span>/ </span>
@@ -104,8 +103,8 @@
               <input class="competence-value creature-dommages" type="text" compname="{{comp.name}}"
                 value="{{numberFormat comp.data.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-control 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>
+                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
               </div>
             </li>
             {{/each}}
@@ -118,8 +117,8 @@
               <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-control 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>
+                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
               </div>
             </li>
             {{/each}}

templates/actor-sheet-categorie-competences-partial.html

@@ -1,9 +1,7 @@
-{{#if competences}}
+<header class="competence-header flexrow">
-<div class="flex-shrink">
-  <header class="competence-header flexrow">
   <span class="competence-title">{{categorie}}</span>
-  </header>
+</header>
-  <ul class="item-list alterne-list competence-list">
+<ul class="item-list alterne-list competence-list">
   {{#if @root.options.vueDetaillee}}
   <li class="item flexrow list-item ">
     
@@ -26,6 +24,4 @@
   {{#each competences as |comp key|}}
   {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-competence-partial.html" comp}}
   {{/each}}
-  </ul>
+</ul>
-</div>
-{{/if}}

templates/actor-sheet-competence-partial.html

@@ -7,7 +7,7 @@
 
     {{#if data.isLevelUp}}
     <span class="tooltiptext ttt-xp">Vous pouvez dépenser {{data.xpNext}} points d'Experience pour augmenter de 1 votre compétence {{name}}</span>
-    <a class="competence-xp-augmenter" compname="{{name}}" title="Augmenter">
+    <a class="item-control competence-xp-augmenter" compname="{{name}}" title="Augmenter">
       <i class="fas fa-arrow-alt-circle-up"></i>
     </a>
     {{/if}}
@@ -31,9 +31,9 @@
     {{#if @root.options.vueDetaillee}}
     <div class="item-controls">
       {{#if data.stressXpMax}}
-      <a class="competence-stress-augmenter" compname="{{name}}" 
+      <a class="item-control competence-stress-augmenter" compname="{{name}}" 
             title="Dépenser {{data.stressXpMax}} points de stress {{#if data.isStressLevelUp}} pour augmenter d'un niveau {{/if}}">
-            <i class="fas fa-arrow-alt-circle-up allouer-stress {{#if data.isStressLevelUp}}level-up{{/if}}"></i>
+            <i class="fas fa-arrow-alt-circle-up allouer-stress{{#if data.isStressLevelUp}}-level-up{{/if}}"></i>
       </a>
       {{else}}
       <i class="far fa-circle"></i>
@@ -41,9 +41,9 @@
       <input class="competence-archetype niveau-archetype" type="text" compname="{{name}}" name="comp-archetype-{{name}}"
             value="{{numberFormat data.niveau_archetype decimals=0 sign=true}}" data-dtype="number"
             {{#unless @root.options.editCaracComp}}disabled{{/unless}} />
-      <a class="item-edit" title="Modifier"><i class="fas fa-edit"></i></a>
+      <a class="item-control item-edit" title="Modifier"><i class="fas fa-edit"></i></a>
       {{#if @root.options.isGM}}
-      <a class="item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+      <a class="item-control item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
       {{/if}}
     </div>
     {{/if}}

templates/actor-sheet-inventaire-conteneur.html

@@ -0,0 +1,32 @@
+<li class="item flexrow list-item" data-item-id="{{item._id}}" draggable="true">
+  <img class="sheet-competence-img" src="{{item.img}}" title="{{item.name}}"/>
+
+  {{#if (eq item.type 'conteneur')}}
+  <span class="item-name conteneur-name flex-grow"><a data-item-id="{{item._id}}">+{{item.name}}</a></span>
+  {{else}}
+  <span class="item-name flex-grow">{{item.name}}</span>
+  {{/if}}
+  <span class="item-quantite">{{item.data.quantite}}
+    {{#if (gt item.data.quantite 1)}}
+    <a class="item-control item-split" title="Séparer"><i class="fas fa-unlink"></i></a>
+    {{/if}}
+  </span>
+  <span class="item-quantite">{{numberFormat item.data.encTotal decimals=2}}</span>
+  <div class="item-controls flex-grow">
+    {{#unless item.estContenu}}
+    {{#if (ne item.type 'conteneur')}}
+    <a class="item-control item-equip" title="Equiper">{{#if item.data.equipe}}<i class="fas fa-hand-rock"></i>{{else}}<i class="far fa-hand-paper"></i>{{/if}}</a>
+    {{/if}}
+    {{/unless}}
+    <a class="item-control item-edit" title="Editer"><i class="fas fa-edit"></i></a>
+    <a class="item-control item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+    {{#if (or (eq item.type 'arme') (eq item.type 'conteneur') item.data.quantite)}}
+    &nbsp;
+    <a class="item-control item-vendre" title="Vendre ou donner"><i class="fas fa-comments-dollar"></i></a>
+    {{/if}}
+    <a class="item-control item-montrer" title="Montrer"><i class="fas fa-comment"></i></a>
+    {{#if item.data.actionPrincipale}}
+    <a class="item-name item-action">{{item.data.actionPrincipale}}</a>
+    {{/if}}
+  </div>
+</li>

templates/actor-sheet-inventaire-item.html

@@ -1,48 +0,0 @@
-<li class="item flexrow list-item" data-item-id="{{item._id}}" draggable="true">
-  <span class="equipement-nom {{#if (eq item.type 'conteneur')}}conteneur-name{{/if}} ">
-    {{#if (eq item.type 'conteneur')}}
-      {{#if vide}}
-        <i class="far fa-square"></i>
-      {{else}}
-        <a data-item-id="{{item._id}}">
-        {{#if ouvert}}
-        <i class="far fa-minus-square"></i>
-        {{else}}
-        <i class="far fa-plus-square"></i>
-        {{/if}}
-        </a>
-      {{/if}}
-      <a data-item-id="{{item._id}}">
-        <img class="sheet-competence-img" src="{{item.img}}" title="{{item.name}}"/>
-        <span>{{item.name}}</span>
-      </a>
-    {{else}}
-    <img class="sheet-competence-img" src="{{item.img}}" title="{{item.name}}"/>
-    <span>{{item.name}}</span>
-    {{/if}}
-  </span>
-  <span class="equipement-detail">{{item.data.quantite}}
-    {{#if (gt item.data.quantite 1)}}
-    <a class="item-split" title="Séparer"><i class="fas fa-unlink"></i></a>
-    {{/if}}
-  </span>
-  <span class="equipement-detail">{{numberFormat item.data.encTotal decimals=2}}</span>
-  <span class="equipement-actions item-controls">
-    {{#unless item.estContenu}}
-    {{#if (ne item.type 'conteneur')}}
-    <a class="item-equip" title="Equiper">{{#if item.data.equipe}}<i class="fas fa-hand-rock"></i>{{else}}<i class="far fa-hand-paper"></i>{{/if}}</a>
-    {{/if}}
-    {{/unless}}
-    <a class="item-edit" title="Editer"><i class="fas fa-edit"></i></a>
-    <a class="item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
-    &nbsp;
-    {{#if (or (eq item.type 'arme') (eq item.type 'conteneur') item.data.quantite)}}
-    <a class="item-vendre" title="Vendre ou donner"><i class="fas fa-comments-dollar"></i></a>
-    {{/if}}
-    <a class="item-montrer" title="Montrer"><i class="fas fa-comment"></i></a>
-    {{#if item.data.actionPrincipale}}
-    <a class="item-action">{{item.data.actionPrincipale}}</a>
-    {{/if}}
-  </span>
-</li>
-

templates/actor-sheet-inventaire-monnaie.html

@@ -3,26 +3,16 @@
   {{#each monnaie as |piece id|}}
   <li class="item flexrow list-item" data-item-id="{{piece._id}}">
     <img class="sheet-competence-img" src="{{piece.img}}" title="{{piece.name}}"/>
-    <span class="equipement-nom">{{piece.name}}</span>
+    <span class="competence-title competence-label">{{piece.name}}</span>
-    <span class="equipement-detail item-controls">
+    <span class="competence-title competence-label">{{piece.data.quantite}}</span>
-      <a class="monnaie-moins"><i class="fas fa-minus-square"></i></a>
+    <span class="competence-title">
-    </span>
+      <a class="monnaie-plus plus-moins">+</a>
-    <span class="equipement-detail">
+      <a class="monnaie-moins plus-moins">-</a>
-      <span>{{piece.data.quantite}}</span>
-    </span>
-    <span class="equipement-detail item-controls">
-      <a class="monnaie-plus"><i class="fas fa-plus-square"></i></a>
-    </span>
-
-    <!-- <span class="equipement-detail">
-      <span class="flex-shrink"><a class="monnaie-moins"><i class="fas fa-minus-square"></i></a></span>
-      <span>{{piece.data.quantite}}</span>
-      <span class="flex-shrink"><a class="monnaie-plus"><i class="fas fa-plus-square"></i></a></span>
-    </span> -->
-    <span class="equipement-actions  item-controls">
-      <a class="item-edit" title="Editer"><i class="fas fa-edit"></i></a>
-      <a class="item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
     </span>
+    <div class="item-controls flex-shrink">
+      <a class="item-control item-edit" title="Editer"><i class="fas fa-edit"></i></a>
+      <a class="item-control item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+  </div>
   </li>
   {{/each}}
 </ul>

templates/actor-sheet-inventaire.html

@@ -1,26 +0,0 @@
-{{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-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}} / {{data.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}}
-<ul class="item-list alterne-list">
-  <li class="competence-header flexrow">
-    <span class="equipement-nom">Nom</span>
-    <span class="equipement-detail">Q.</span>
-    <span class="equipement-detail">Enc.</span>
-    <span class="equipement-actions">Actions</span>
-  </li>
-  {{#each objets as |item id|}}
-    {{#unless item.estContenu}}
-    {{#if (ne item.type 'conteneur')}}
-      {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-item.html" item=item vide=true ouvert=true }}
-    {{/if}}
-    {{/unless}}
-  {{/each}}
-  {{#each conteneurs as |conteneur id|}}
-    {{buildConteneur this}}
-  {{/each}}
-</ul>

templates/actor-sheet-liens-animaux.html

@@ -1,12 +0,0 @@
-<span class="item-name"><h4>Compagnons animaux</h4></span>
-<ul class="item-list alterne-list">
-  {{#each subacteurs.montures as |monture id|}}
-  <li class="item flexrow list-item" data-actor-id="{{monture.id}}">
-    <img class="sheet-competence-img" src="{{monture.img}}" title="{{monture.name}}"/>
-    <span class="subacteur-label"><a>{{monture.name}}</a></span>
-    <div class="flex-shrink">
-      <a class="subacteur-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
-  </div>
-  </li>
-  {{/each}}
-</ul>

templates/actor-sheet-liens-suivants.html

@@ -1,12 +0,0 @@
-<span class="item-name"><h4>Suivants</h4></span>
-<ul class="item-list alterne-list">
-  {{#each subacteurs.suivants as |suivant id|}}
-  <li class="item flexrow list-item" data-actor-id="{{suivant.id}}">
-    <img class="sheet-competence-img" src="{{suivant.img}}" title="{{suivant.name}}"/>
-    <span class="competence-title subacteur-label"><a>{{suivant.name}}</a></span>
-    <div class="item-controls flex-shrink">
-      <a class="subacteur-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
-  </div>
-  </li>
-  {{/each}}
-</ul>

templates/actor-sheet-liens-vehicules.html

@@ -1,15 +0,0 @@
-<span class="item-name"><h4>Véhicules</h4></span>
-<ul class="item-list alterne-list">
-  {{#each subacteurs.vehicules as |vehicule id|}}
-  <li class="item flexrow list-item" data-actor-id="{{vehicule.id}}">
-    <img class="sheet-competence-img" src="{{vehicule.img}}" title="{{vehicule.name}}"/>
-    <span class="flex-grow subacteur-label"><a>{{vehicule.name}}</a></span>
-    <span>{{vehicule.categorie}}</span>
-    <span>{{vehicule.structure}}</span>
-    <div class="flex-shrink">
-      <a class="subacteur-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
-  </div>
-  </li>
-  {{/each}}
-</ul>
-

templates/actor-sheet-oeuvre-partial.html

@@ -4,8 +4,8 @@
     <a>{{oeuvre.name}} (niveau {{oeuvre.data.niveau}})</a>
   </span>
   <div class="item-controls">
-    <a class="item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
+    <a class="item-control 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>
+    <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
   </div>
 </li>
 

templates/actor-sheet.html

@@ -10,40 +10,40 @@
         <div class="flexrow">
           <ul class="flex-group-center flex-compteurs">
             <li>
-              <label class="compteur">
+              <label class="ctn-vie">
                 <a class="jet-vie">Vie</a>
-                <a class="vie-moins"><i class="fas fa-minus-square"></i></a>
+                <a class="vie-moins plus-moins">-</a>
                 <input class="resource-content" type="text" name="data.sante.vie.value" value="{{data.sante.vie.value}}" data-dtype="Number"/>
                 <span>/ {{data.sante.vie.max}}</span>
-                <a class="vie-plus"><i class="fas fa-plus-square"></i></a>
+                <a class="vie-plus plus-moins">+</a>
               </label>
             </li>
             <li>
-              <label class="compteur">
+              <label class="ctn-endu">
                 <a class="jet-endurance">Endurance</a>                
-                <a class="endurance-moins"><i class="fas fa-minus-square"></i></a>
+                <a class="endurance-moins plus-moins">-</a>
                 <input class="resource-content" type="text" name="data.sante.endurance.value" value="{{data.sante.endurance.value}}" data-dtype="Number"/>
                 <span>/ {{data.sante.endurance.max}}</span>
-                <a class="endurance-plus"><i class="fas fa-plus-square"></i></a>
+                <a class="endurance-plus plus-moins">+</a>
               </label>
             </li>
             <li>
-              <label class="appliquerFatigue compteur tooltip">
+              <label class="appliquerFatigue ctn-fatigue tooltip">
                 <span class="tooltiptext ttt-fatigue">{{{calc.fatigue.html}}}</span>
                 Fatigue
-                <a class="fatigue-moins"><i class="fas fa-minus-square"></i></a>
+                <a class="fatigue-moins plus-moins">-</a>
                 <input class="resource-content" id="fatigue-value" type="text" name="data.sante.fatigue.value" value="{{data.sante.fatigue.value}}" data-dtype="Number" />
                 <span>/ {{data.sante.fatigue.max}}</span>
-                <a class="fatigue-plus"><i class="fas fa-plus-square"></i></a>
+                <a class="fatigue-plus plus-moins">+</a>
               </label>
             </li>
             <li>
-              <label class="compteur">
+              <label class="ctn-reve">
                 <span class="ptreve-actuel"><a>Rêve</a></span>
-                <a class="ptreve-actuel-moins"><i class="fas fa-minus-square"></i></a>
+                <a class="ptreve-actuel-moins plus-moins">-</a>
                 <input class="resource-content" id="pointsreve-value" type="text" name="data.reve.reve.value" value="{{data.reve.reve.value}}" data-dtype="Number" />
                 <span>/ {{data.reve.seuil.value}}</span>
-                <a class="ptreve-actuel-plus"><i class="fas fa-plus-square"></i></a>
+                <a class="ptreve-actuel-plus plus-moins">+</a>
               </label>
             </li>
           </ul>
@@ -102,9 +102,9 @@
               <ul class="carac-list alterne-list">
                 {{#each data.carac as |carac key|}}
                     {{#if carac.isLevelUp}}
-                    <li class="caracteristique flexrow item-list xp-level-up" data-attribute="{{key}}">
+                    <li class="competence flexrow item-list xp-level-up" data-attribute="{{key}}">
                     {{else}}
-                    <li class="caracteristique flexrow list-item" data-attribute="{{key}}">
+                    <li class="competence flexrow list-item" data-attribute="{{key}}">
                     {{/if}}
                     {{#if (eq key 'taille')}}
                       <span class="carac-label" name="data.carac.{{key}}.label">{{carac.label}}</span>
@@ -131,7 +131,7 @@
                           <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">
+                          <a class="item-control carac-xp-augmenter" name="augmenter.{{key}}" title="Augmenter">
                             <i class="fas fa-arrow-alt-circle-up"></i>
                           </a>
                           {{/if}}
@@ -139,7 +139,7 @@
                     {{/if}}
                     </li>
                 {{/each}}
-                <li class="caracteristique flexrow">
+                <li class="competence 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>
@@ -147,14 +147,14 @@
             </div>
             <div class="flex-group-left flexcol" >
               <ul class="carac-list">
-                <li class="caracteristique flexrow list-item">
+                <li class="competence flexrow list-item">
                   <span class="carac-label" name="beaute">Beauté&nbsp;:</span>
                   <input class="description-value" type="text" name="data.beaute" value="{{data.beaute}}" data-dtype="String" {{#unless @root.options.editCaracComp}}disabled{{/unless}}/>
                   <label class="carac-xp"/>
                 </li>
                 {{#each data.attributs as |attr key|}}
                 {{#unless (eq key 'hautrevant')}}
-                <li class="caracteristique flexrow  list-item" data-attribute="{{key}}">
+                <li class="competence flexrow  list-item" data-attribute="{{key}}">
                   <span class="carac-label" name="data.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"/>
@@ -167,16 +167,16 @@
                 {{/each}}
               </ul>
               <ul class="carac-list alterne-list">
-                <li class="caracteristique flexrow list-item">
+                <li class="competence 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="{{data.compteurs.chance.value}}" data-dtype="number"/>
-                  <span class="utiliser-attribut" style="padding-left: 5px"><a class="chance-appel">Utiliser</a></span>
+                  <span class="utiliser-attribut" style="padding-left: 5px"><a class="item-control chance-appel">Utiliser</a></span>
                 </li>
                 {{#each data.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">
+                    <li class="competence flexrow list-item">
                       <span class="attribut-label">{{compteur.label}}</span>
                       {{#if (eq compteur.label 'Ethylisme')}}
                       <select class="description-value" name="data.compteurs.ethylisme.value" id="ethylisme" data-dtype="Number">
@@ -189,9 +189,9 @@
                       {{/if}}
                       <span class="utiliser-attribut" style="padding-left: 5px">
                         {{#if compteur.isStress}}
-                        <a class="stress-test" title="Transformer">Transformer</a>
+                        <a class="item-control 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>
+                        <a class="item-control 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>
@@ -215,9 +215,11 @@
             <span><a class="lock-unlock-sheet"><img class="small-button-container"
               src="systems/foundryvtt-reve-de-dragon/icons/{{#if options.editCaracComp}}unlocked.svg{{else}}locked.svg{{/if}}" alt="blocker/débloquer">
               {{#if options.editCaracComp}}Verrouiller{{else}}Déverrouiller{{/if}}</a></span>
-            <span>
+            <span class="flexrow">
-              <input class="recherche flex-grow" type="text" value="{{options.recherche.text}}" name="recherche" 
+              <i class="fas fa-search"></i>
+              <input class="cherchercompetence" type="text" value="{{options.cherchercompetence}}" name="cherchercompetence" 
                 size="8" data-dtype="String" placeholder="chercher"/>
+              <span></span>
             </span>
             <span><a class="show-hide-competences"><img class="small-button-container"
               src="systems/foundryvtt-reve-de-dragon/icons/{{#if options.showCompNiveauBase}}no-filter.svg{{else}}filter.svg{{/if}}" alt="filter/montrer tout">
@@ -230,18 +232,18 @@
           </div>
           <div class="grid grid-2col">
             <div class="flex-group-left flexcol competence-column">
-              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(filtreTriCompetences competenceByCategory.generale) categorie="Compétences générales"}}
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(sortCompetence competenceByCategory.generale) categorie="Compétences générales"}}
-              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(filtreTriCompetences competenceByCategory.particuliere) categorie="Compétences Particulières"}}
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(sortCompetence competenceByCategory.particuliere) categorie="Compétences Particulières"}}
-              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(filtreTriCompetences competenceByCategory.specialisee) categorie="Compétences Spécialisées"}}
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(sortCompetence competenceByCategory.specialisee) categorie="Compétences Spécialisées"}}
             </div>
 
             <div class="flex-group-left flexcol competence-column">
-              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(filtreTriCompetences competenceByCategory.melee) categorie="Compétences de Mêlée"}}
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(sortCompetence competenceByCategory.melee) categorie="Compétences de Mêlée"}}
-              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(filtreTriCompetences competenceByCategory.tir) categorie="Compétences de Tir"}}
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(sortCompetence competenceByCategory.tir) categorie="Compétences de Tir"}}
-              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(filtreTriCompetences competenceByCategory.lancer) categorie="Compétences de Lancer"}}
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(sortCompetence competenceByCategory.lancer) categorie="Compétences de Lancer"}}
-              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(filtreTriCompetences competenceByCategory.connaissance) categorie="Connaissances"}}
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(sortCompetence competenceByCategory.connaissance) categorie="Connaissances"}}
               {{#if (or data.attributs.hautrevant.value options.vueDetaillee)}}
-              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(filtreTriCompetences competenceByCategory.draconic) categorie="Draconic"}}
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(sortCompetence competenceByCategory.draconic) categorie="Draconic"}}
               {{/if}}
 
               <div>
@@ -347,8 +349,8 @@
                 {{/if}}
               </span>
               <div class="item-controls">
-                <a class="item-edit" title="Modifier"><i class="fas fa-edit"></i></a>
+                <a class="item-control item-edit" title="Modifier"><i class="fas fa-edit"></i></a>
-                <a class="item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+                <a class="item-control item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
               </div>          
           </li>
           {{/each}}
@@ -370,8 +372,8 @@
               </span>
               <span class="competence-label">{{possession.data.type}}</span>
               <div class="item-controls">
-                <a class="item-edit" title="Modifier"><i class="fas fa-edit"></i></a>
+                <a class="item-control item-edit" title="Modifier"><i class="fas fa-edit"></i></a>
-                <a class="item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+                <a class="item-control item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
               </div>          
           </li>
           {{/each}}
@@ -389,8 +391,8 @@
                (or @root.options.isGM (not tache.data.cacher_points_de_tache))
             }}/{{tache.data.points_de_tache}}{{/if}})</a></span>
             <div class="item-controls flex-shrink">
-              <a class="item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
+              <a class="item-control 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>
+              <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
             </div>
           </li>
           {{/each}}
@@ -419,8 +421,8 @@
           {{#each jeux as |jeu id|}}
           <li class="item flexrow list-item" data-item-id="{{jeu._id}}"><span class="competence-title jeu-label"><a>{{jeu.name}} (base {{jeu.data.base}})</a></span>
             <div class="item-controls flex-shrink">
-              <a class="item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
+              <a class="item-control 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>
+              <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
             </div>
           </li>
           {{/each}}
@@ -430,8 +432,8 @@
           {{#each recettesAlchimiques as |recette id|}}
           <li class="item flexrow list-item" data-item-id="{{recette._id}}"><span class="competence-title recette-label item-edit"><a>{{recette.name}}</a></span>
             <div class="item-controls flex-shrink">
-              <a class="item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
+              <a class="item-control 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>
+              <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
             </div>
           </li>
           {{/each}}
@@ -517,7 +519,7 @@
           <li class="item flexrow" data-attribute={{key}} data-item-id="{{queue._id}}">
             <span class="display-label flex-grow"><a data-item-id="{{queue._id}}">{{queue.name}}</a></span>
             <div class="item-controls flex-shrink">
-              <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+              <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
             </div>
           </li>
           {{/each}}
@@ -530,7 +532,7 @@
           <li class="item flexrow" data-attribute={{key}} data-item-id="{{ombre._id}}">
             <span class="display-label flex-grow"><a data-item-id="{{ombre._id}}">{{ombre.name}}</a></span>
             <div class="item-controls flex-shrink">
-              <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+              <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
             </div>
           </li>
           {{/each}}
@@ -543,7 +545,7 @@
           <li class="item flexrow" data-attribute={{key}} data-item-id="{{souffle._id}}">
             <span class="display-label flex-grow"><a data-item-id="{{souffle._id}}">{{souffle.name}}</a></span>
             <div class="item-controls flex-shrink">
-              <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+              <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
             </div>
           </li>
           {{/each}}
@@ -556,7 +558,7 @@
           <li class="item flexrow" data-attribute={{key}} data-item-id="{{tete._id}}">
             <span class="display-label flex-grow"><a data-item-id="{{tete._id}}">{{tete.name}}</a></span>
             <div class="item-controls flex-shrink">
-              <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+              <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
             </div>
           </li>
           {{/each}}
@@ -571,7 +573,7 @@
                 <span class="display-label flex-grow"> <a data-item-id="{{signe._id}}">{{signe.name}}</a></span> 
                 <span class="flex-shrink">{{signe.data.difficulte}}</span>
                 <div class="item-controls flex-shrink">
-                  <a class="item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+                  <a class="item-control item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
                 </div>
               </li>
               {{/each}}
@@ -589,7 +591,7 @@
                 <span>{{upperFirst rencontre.heure}}, le {{rencontre.date}}</span> 
                 {{/if}}
                 <div class="item-controls flex-shrink">
-                  <a class="rencontre-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+                  <a class="item-control rencontre-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
                 </div>
               </li>
               {{/each}}
@@ -604,7 +606,7 @@
                 <span class="display-label">{{reserve.sort.name}} r{{reserve.sort.data.ptreve_reel}}</span> 
                 <span>{{reserve.coord}} - {{caseTmr-label reserve.coord}}</span> 
                 <div class="item-controls flex-shrink">
-                  <a class="item-delete flex-shrink" title="Supprimer"><i class="fas fa-trash"></i></a>
+                  <a class="item-control item-delete flex-shrink" title="Supprimer"><i class="fas fa-trash"></i></a>
                 </div>
               </li>
               {{/each}}
@@ -624,7 +626,7 @@
               </span> 
               <span>{{sort.data.draconic}} / {{sort.data.difficulte}}</span>
               <div class="item-controls flex-shrink">
-                <a class="item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+                <a class="item-control item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
               </div>
             </li>
             {{/each}}
@@ -636,8 +638,8 @@
             <li class="item flexrow" data-item-id="{{meditation._id}}" data-attribute="{{key}}">
               <span class="meditation-label flex-grow"><a data-item-id="{{meditation._id}}">{{meditation.name}} - {{meditation.data.competence}}</a></span> 
               <div class="item-controls flex-shrink">
-                <a class="item-edit" title="Editer"><i class="fas fa-edit"></i></a>
+                <a class="item-control item-edit" title="Editer"><i class="fas fa-edit"></i></a>
-                <a class="item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+                <a class="item-control item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
               </div>
             </li>
             {{/each}}
@@ -651,7 +653,7 @@
                 <span class="display-label"><a data-item-id="{{casetmr._id}}">{{casetmr.name}}</a></span>
                 <span>{{casetmr.data.coord}} - {{caseTmr-label casetmr.data.coord}}</span> 
                 <div class="item-controls flex-shrink">
-                  <a class="item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+                  <a class="item-control item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
                 </div>
               </li>
               {{/each}}
@@ -664,10 +666,79 @@
       {{!-- Equipment Tab --}}
       <div class="tab items" data-group="primary" data-tab="items">
         
-        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire.html"}}
+        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-monnaie.html" monnaie=monnaie}}
-        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-liens-animaux.html"}}
+
-        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-liens-suivants.html"}}
+        <span class="item-name"><h4>Equipement porté</h4></span>
-        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-liens-vehicules.html"}}
+        <div>
+          <span class="item-name">Encombrement total/max : {{numberFormat calc.encTotal decimals=2}} / {{data.attributs.encombrement.value}} <b>{{calc.surEncombrementMessage}}</b></span> - 
+          <span class="item-name">Estimation de l'équipement : {{numberFormat calc.prixTotalEquipement decimals=2}} Sols</span>
+        </div>
+        <div>
+          <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}}
+        </div>
+        <ul class="item-list alterne-list">
+          <li class="competence-header flexrow">
+            <img class="sheet-competence-img" src="{{img}}" title="Equipement"/>
+            <span class="competence-title flex-grow">Nom</span>
+            <span class="competence-title">Q.</span>
+            <span class="competence-title">Enc.</span>
+            <span class="competence-title flex-grow">Equiper/Editer/Suppr.</span>
+          </li>
+          {{#each objets as |item id|}}
+            {{#unless item.estContenu}}
+            {{#if (ne item.type 'conteneur')}}
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-conteneur.html" item=item }}
+            {{/if}}
+            {{/unless}}
+          {{/each}}
+          {{#each conteneurs as |conteneur id|}}
+            {{buildConteneur this}}
+          {{/each}}
+        </ul>
+
+        <span class="item-name"><h4>Compagnons animaux</h4></span>
+        <ul class="item-list alterne-list">
+          {{#each subacteurs.montures as |monture id|}}
+          <li class="item flexrow list-item" data-actor-id="{{monture.id}}">
+            <img class="sheet-competence-img" src="{{monture.img}}" title="{{monture.name}}"/>
+            <span class="competence-title subacteur-label"><a>{{monture.name}}</a></span>
+            <div class="item-controls flex-shrink">
+              <a class="item-control subacteur-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+          </div>
+          </li>
+          {{/each}}
+        </ul>
+        
+        <span class="item-name"><h4>Véhicules</h4></span>
+        <ul class="item-list alterne-list">
+          {{#each subacteurs.vehicules as |vehicule id|}}
+          <li class="item flexrow list-item" data-actor-id="{{vehicule.id}}">
+            <img class="sheet-competence-img" src="{{vehicule.img}}" title="{{vehicule.name}}"/>
+            <span class="competence-title subacteur-label"><a>{{vehicule.name}}</a></span>
+            <span class="competence-title">{{vehicule.categorie}}</span>
+            <span class="competence-title">{{vehicule.structure}}</span>
+            <div class="item-controls flex-shrink">
+              <a class="item-control subacteur-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+          </div>
+          </li>
+          {{/each}}
+        </ul>
+
+        <span class="item-name"><h4>Suivants</h4></span>
+        <ul class="item-list alterne-list">
+          {{#each subacteurs.suivants as |suivant id|}}
+          <li class="item flexrow list-item" data-actor-id="{{suivant.id}}">
+            <img class="sheet-competence-img" src="{{suivant.img}}" title="{{suivant.name}}"/>
+            <span class="competence-title subacteur-label"><a>{{suivant.name}}</a></span>
+            <div class="item-controls flex-shrink">
+              <a class="item-control subacteur-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+          </div>
+          </li>
+          {{/each}}
+        </ul>
 
       </div>
 

templates/actor-vehicule-sheet.html

@@ -25,7 +25,7 @@
       <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="competence flexrow list-item" data-attribute="{{key}}">
               <span class="carac-label flexrow" name="categorie">Catégorie</span>
               <select name="data.categorie" class="categorie" data-dtype="String">
                 {{#select data.categorie}}
@@ -33,31 +33,31 @@
                 {{/select}}
               </select>
             </li>
-            <li class="caracteristique flexrow list-item" data-attribute="{{key}}">
+            <li class="competence flexrow list-item" data-attribute="{{key}}">
               <span class="carac-label flexrow" name="categorie">Résistance</span>
               <input class="competence-value flexrow" type="text" name="data.resistance" value="{{data.resistance}}" data-dtype="Number" />
             </li>
-            <li class="caracteristique flexrow list-item" data-attribute="{{key}}">
+            <li class="competence flexrow list-item" data-attribute="{{key}}">
               <span class="carac-label flexrow" name="categorie">Structure</span>
               <input class="competence-value flexrow" type="text" name="data.structure" value="{{data.structure}}" data-dtype="Number" />
             </li>
-            <li class="caracteristique flexrow list-item" data-attribute="{{key}}">
+            <li class="competence flexrow list-item" data-attribute="{{key}}">
               <span class="carac-label flexrow" name="categorie">Vitesse</span>
               <input class="competence-value flexrow" type="text" name="data.vitesse" value="{{data.vitesse}}" data-dtype="String" />
             </li>
-            <li class="caracteristique flexrow list-item" data-attribute="{{key}}">
+            <li class="competence flexrow list-item" data-attribute="{{key}}">
               <span class="carac-label flexrow" name="categorie">Bonus</span>
               <input class="competence-value flexrow" type="text" name="data.bonus" value="{{data.bonus}}" data-dtype="String" />
             </li>
-            <li class="caracteristique flexrow list-item" data-attribute="{{key}}">
+            <li class="competence flexrow list-item" data-attribute="{{key}}">
               <span class="carac-label flexrow" name="categorie">Manoeuvrabilité</span>
               <input class="competence-value flexrow" type="text" name="data.manoeuvrabilite" value="{{data.manoeuvrabilite}}" data-dtype="String" />
             </li>
-            <li class="caracteristique flexrow list-item" data-attribute="{{key}}">
+            <li class="competence flexrow list-item" data-attribute="{{key}}">
               <span class="carac-label flexrow" name="categorie">Equipage</span>
               <input class="competence-value flexrow" type="text" name="data.equipage" value="{{data.equipage}}" data-dtype="Number" />
             </li>
-            <li class="caracteristique flexrow list-item" data-attribute="{{key}}">
+            <li class="competence flexrow list-item" data-attribute="{{key}}">
               <span class="carac-label flexrow" name="categorie">Capacité d'Encombrement</span>
               <input class="competence-value flexrow" type="text" name="data.capacite_encombrement" value="{{data.capacite_encombrement}}" data-dtype="Number" />
             </li>
@@ -69,7 +69,45 @@
     {{!-- Equipment Tab --}}
     <div class="tab items" data-group="primary" data-tab="items">
 
-      {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire.html"}}
+      {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-monnaie.html" monnaie=monnaie}}
+
+      <span class="item-name"><h4>Equipement chargé</h4></span>
+
+      <span class="item-name">Encombrement total/max : {{numberFormat calc.encTotal decimals=2}} / {{data.capacite_encombrement}} <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}}
+      <ul class="item-list alterne-list">
+        <li class="competence-header flexrow">
+          <img class="sheet-competence-img" src="{{img}}" title="Equipement"/>
+          <span class="competence-title competence-label flex-grow">Nom</span>
+          <span class="competence-title competence-label">Q.</span>
+          <span class="competence-title competence-value">Enc.</span>
+          <span class="competence-title competence-value">Equiper/Editer/Suppr.</span>
+        </li>
+        {{#each objets as |item id|}}
+          {{#unless item.estContenu}}
+          {{#if (ne item.type 'conteneur')}}
+          <li class="item flexrow list-item" data-item-id="{{item._id}}">
+              <img class="sheet-competence-img" src="{{item.img}}" title="{{item.name}}"/>
+              <span class="item-name flex-grow">{{item.name}}</span>
+              <span class="item-quantite">{{item.data.quantite}}</span>
+              <span class="item-quantite">{{numberFormat item.data.encTotal decimals=2}}</span>
+              <div class="item-controls">
+                  <a class="item-control item-equip" title="Equiper">{{#if item.data.equipe}}<i class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
+                  <a class="item-control item-edit" title="Editer"><i class="fas fa-edit"></i></a>
+                  <a class="item-control item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+              </div>
+          </li>
+          {{/if}}
+          {{/unless}}
+          {{/each}}
+          {{#each conteneurs as |conteneur id|}}
+          {{buildConteneur this}}
+          {{/each}}
+        </ul>
+      </div>
 
       
     {{!-- Biography Tab --}}

templates/chat-command-nom.html

@@ -1,16 +0,0 @@
-
-<h4>Proposition de nom: {{nom}}</h4>
-<span class="chat-card-button-area">
-  <a class="button-creer-acteur chat-card-button"
-    data-nom='{{nom}}'
-    data-type='personnage'
-    >
-  Créer un Personnage</a>
-</span>
-<span class="chat-card-button-area">
-  <a class="button-creer-acteur chat-card-button"
-    data-nom='{{nom}}'
-    data-type='creature'>
-  Créer une créature</a>
-</span>
-

templates/hud-actor-init.html

@@ -2,6 +2,7 @@
   <img class="rdd-hud-togglebutton" src="icons/svg/sword.svg" width="36" height="36" title="Initiative" />
   <div class="rdd-hud-list tokenhudext right">
     {{#each actions as |action key|}}
+    {{log 'action-hud-init' action}}
     <div class="control-icon tokenhudicon rdd-hud-menu"
         data-combatant-id="{{../combatant.id}}"
         data-action-index="{{action.index}}"

templates/item-conteneur-sheet.html

@@ -29,10 +29,11 @@
         <span><label>Contenu : </label></span>
         <ul class="item-list alterne-list">
           <li class="competence-header flexrow">
-            <span class="equipement-nom">Nom</span>
+            <img class="sheet-competence-img" src="{{img}}" title="Equipement"/>
-            <span class="equipement-detail">Q.</span>
+            <span class="competence-title flex-grow">Nom</span>
-            <span class="equipement-detail">Enc.</span>
+            <span class="competence-title">Q.</span>
-            <span class="equipement-actions">Actions</span>
+            <span class="competence-title">Enc.</span>
+            <span class="competence-title flex-grow">Equiper/Editer/Suppr.</span>
           </li>
            {{buildContenu this}}
         </ul>