Merge VK mods

module/actor-sheet.js

@@ -432,7 +432,9 @@ export class RdDActorSheet extends ActorSheet {
         }
       })
       .keyup(async event => {
-        this.options.recherche = this._optionRecherche(event.currentTarget)
+        const nouvelleRecherche = this._optionRecherche(event.currentTarget);
+        if (this.options.recherche?.text != nouvelleRecherche?.text){
+          this.options.recherche = nouvelleRecherche;
           if (this.timerRecherche) {
             clearTimeout(this.timerRecherche);
           }
@@ -440,6 +442,7 @@ export class RdDActorSheet extends ActorSheet {
             this.timerRecherche = undefined;
             this.render(true);
           }, 500);
+        }
       })
       .change(async event =>
         this.options.recherche = this._optionRecherche(event.currentTarget)

module/rdd-utility.js

@@ -122,8 +122,12 @@ 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-conteneur.html',
+      'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire.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',
@@ -235,7 +239,8 @@ export class RdDUtility {
     Handlebars.registerHelper('typeTmr-name', coord => TMRUtility.typeTmrName(coord));
     Handlebars.registerHelper('min', (...args) => Math.min(...args.slice(0, -1)));
 
-    Handlebars.registerHelper('sortCompetence', competences => competences.sort((a, b) => {
+    Handlebars.registerHelper('filtreTriCompetences', competences => competences.filter(it => it.visible)
+      .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;
@@ -243,7 +248,7 @@ export class RdDUtility {
           if (b.name.includes("Extérieur")) return 1;
           return a.name.localeCompare(b.name);
         }
-      if (a.system.categorie.startsWith("melee") && b.system.categorie.startsWith("melee")) {
+        if (a.data.categorie.startsWith("melee") && b.data.categorie.startsWith("melee")) {
           if (a.name.includes("Corps")) return -1;
           if (b.name.includes("Corps")) return 1;
           if (a.name.includes("Dague")) return -1;
@@ -264,7 +269,8 @@ export class RdDUtility {
           return a.name.localeCompare(b.name);
         }
         return a.name.localeCompare(b.name);
-    }));
+      })
+    );
 
     return loadTemplates(templatePaths);
   }
@@ -470,7 +476,7 @@ export class RdDUtility {
     const isConteneur = objet.type == 'conteneur';
     const isOuvert = isConteneur && this.getAfficheContenu(objet._id);
     const isVide = isConteneur && Misc.templateData(objet).contenu.length == 0;
-    const conteneur = Handlebars.partials['systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-conteneur.html']({
+    const conteneur = Handlebars.partials['systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-item.html']({
       item: objet,
       vide: isVide,
       ouvert: isOuvert

styles/simple.css

@@ -66,6 +66,10 @@
   --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));
@@ -104,6 +108,9 @@
 .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;
@@ -225,6 +232,26 @@ 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;
@@ -268,12 +295,6 @@ 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;
@@ -281,9 +302,16 @@ table {border: 1px solid #7a7971;}
   height: 16;
   border-width: 0;
 }
-.button-effect-img:hover {
+.small-button-direction {
-  color: rgba(255, 255, 128, 0.7);
+  height: 32px;
-  border: 1px solid rgba(255, 128, 0, 0.8);
+  width: 32px;
+  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;
 }
 
@@ -294,18 +322,6 @@ 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;
@@ -346,25 +362,25 @@ table {border: 1px solid #7a7971;}
   flex-grow: 0;
 }
 
-.rdd.sheet .window-content .sheet-body .carac-list .competence {
+.rdd.sheet .window-content .sheet-body .carac-list .caracteristique {
   flex-wrap: nowrap;
   justify-content: stretch;
 }
-.rdd.sheet .window-content .sheet-body .carac-list .competence > .carac-label {
+.rdd.sheet .window-content .sheet-body .carac-list .caracteristique > .carac-label {
   flex-basis: 50%;
 }
-.rdd.sheet .window-content .sheet-body .carac-list .competence > .attribut-label {
+.rdd.sheet .window-content .sheet-body .carac-list .caracteristique > .attribut-label {
   flex-basis: 50%;
 }
-.rdd.sheet .window-content .sheet-body .carac-list .competence > .competence-value.total {
+.rdd.sheet .window-content .sheet-body .carac-list .caracteristique > .competence-value.total {
   flex-grow: 1;
   text-align: right;
 }
-.rdd.sheet .window-content .sheet-body .carac-list .competence > .utiliser-attribut {
+.rdd.sheet .window-content .sheet-body .carac-list .caracteristique > .utiliser-attribut {
   flex-basis: available;
   flex-grow: 1;
 }
-.rdd.sheet .window-content .sheet-body .carac-list .competence > * {
+.rdd.sheet .window-content .sheet-body .carac-list .caracteristique > * {
   flex-basis: 13%;
   flex-grow: 0;
 }
@@ -469,13 +485,18 @@ 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;
@@ -567,7 +588,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.25rem;
+  margin-bottom: 0.2rem;
 }
 
 .window-app .window-content, .window-app.sheet .window-content .sheet-body{
@@ -601,7 +622,7 @@ section.sheet-body{padding: 0.25rem 0.5rem;}
 
 nav.sheet-tabs .item {
   position: relative;
-  padding: 0 0.25rem;
+  padding: 0 0.2rem;
 }
 
 nav.sheet-tabs .item:after {
@@ -627,11 +648,15 @@ section.sheet-body:after {
 .sheet header.sheet-header .flex-compteurs {text-align: right;}
 .sheet header.sheet-header .resource-content {width: 2rem;}
 
-.ctn-vie span, .ctn-endu span, .ctn-fatigue span, .ctn-reve span {
+.compteur 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;
@@ -644,17 +669,6 @@ 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);
@@ -711,10 +725,13 @@ ul, ol {
 ul, li {
   list-style-type: none;
 }
-
+.sheet .caracteristique li {
+  margin: 0.1rem;
+  padding: 0.2rem;
+}
 .sheet li {
-  margin: 0.125rem;
+  margin: 0.1rem;
-  padding: 0.25rem;
+  padding: 0.1rem;
 }
 .header-fields li {
   margin: 0;
@@ -731,23 +748,19 @@ ul, li {
   background: rgb(160, 130, 100, 0.05);
 }
 .xp-level-up {
-  margin: 0.125rem;
+  margin: 0.1rem;
   box-shadow: inset 0px 0px 1px #00000096;
   border-radius: 0.25rem;
-  padding: 0.125rem;
+  padding: 0.1rem;
   flex: 1 1 5rem;  
   background: var(--gradient-gold) !important;
 }
 .niveau-archetype {
   background: var(--gradient-silver-light) !important;
 }
-.fa-arrow-alt-circle-up.allouer-stress {
+.item-controls i.fas.allouer-stress.level-up {
-  color: rgba(83, 60, 14, 0.8);
+  color: var(--color-gold);
 }
-.fa-arrow-alt-circle-up.allouer-stress-level-up {
-  color: rgba(191, 149, 63, 0.8);
-}
-
 .blessures-list ul {
   display: flex;
 }
@@ -766,18 +779,18 @@ ul, li {
   font-weight: bold;
 }
 .list-item {
-  margin: 0.125rem;
+  margin: 0.1rem;
   box-shadow: inset 0px 0px 1px #00000096;
   border-radius: 0.25rem;
-  padding: 0.125rem;
+  padding: 0.1rem;
   flex: 1 1 5rem;
   display: flex !important;
-  align-items: baseline !important;
+  align-items: center !important;
 }
 
 .table-row {
-  margin: 0.125rem;
+  margin: 0.1rem;
-  padding: 0.125rem;
+  padding: 0.1rem;
   flex: 1 1 5rem;
 }
 
@@ -801,8 +814,11 @@ ul, li {
   background: rgb(200, 10, 100, 0.25);
 }
 
-.item-quantite {
+.item-column {
-  margin-left: 0.5rem;
+  margin-left: 0.2rem;
+  margin-right: 0.2rem;
+  justify-content: center;
+  text-align: center;
 }
 
 .list-item-margin1 {
@@ -828,7 +844,7 @@ ul, li {
   width: 24px;
   height: 24px;
   flex-grow: 0;
-  margin-right: 0.25rem;
+  margin-right: 0.2rem;
   vertical-align: bottom;
 }
 .competence-column {
@@ -872,20 +888,20 @@ ul, li {
 .competence-value {
   flex-grow: 0;
   flex-basis: 2rem;
-  margin-right: 0.25rem;
+  margin-right: 0.2rem;
-  margin-left: 0.25rem;
+  margin-left: 0.2rem;
 }
 .description-value {
   flex-grow: 0;
   flex-basis: 4rem;
-  margin-right: 0.25rem;
+  margin-right: 0.2rem;
-  margin-left: 0.25rem;
+  margin-left: 0.2rem;
 }
 .competence-xp {
   flex-grow: 0;
   flex-basis: 2rem;
-  margin-right: 0.25rem;
+  margin-right: 0.2rem;
-  margin-left: 0.25rem;
+  margin-left: 0.2rem;
 }
 .blessures-title { 
   font-weight: bold;
@@ -963,7 +979,7 @@ ul, li {
   flex-basis: auto;
   padding: 0;
   line-height: 1rem;
-  margin: 0.25rem;
+  margin: 0.2rem;
 }
 .control-icon.tokenhudicon.right {
   margin-left: 8px;
@@ -981,7 +997,7 @@ ul, li {
   border-left: none;
   font-weight: 500;
   font-size: 1rem;
-  color: black;
+  color: var(--color-controls);
   padding-top: 5px;
   margin-right: 0px;
   width: 45px;
@@ -1081,7 +1097,7 @@ ul, li {
 .sidebar-tab .directory-list .entity {
     border-top: 1px dashed rgba(0,0,0,0.25);
     border-bottom: 0 none;
-    padding: 0.25rem 0; 
+    padding: 0.2rem 0; 
 }
 
 .sidebar-tab .directory-list .entity:hover {
@@ -1159,11 +1175,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 .scene-control.active, #controls .control-tool.active, #controls .scene-control:hover, #controls .control-tool:hover {
+#controls :is(.scene-control.active,.control-tool.active, .scene-control:hover, .control-tool:hover) {
   background: rgba(72, 46, 28, 1);
   background-origin: padding-box;
   border-image: url(img/ui/footer-button.webp) 10 repeat;
@@ -1349,8 +1365,8 @@ ul, li {
 	color: rgba(255, 255, 255, 0.5);
 }
 .calendar-btn:hover {
-	color: rgba(255, 255, 128, 0.7);
+	color: var(--color-controls-hover);
-	border: 1px solid rgba(255, 128, 0, 0.8);
+	border: 1px solid var(--color-control-border-hover);
 	cursor: pointer;
 }
 

system.json

@@ -34,7 +34,7 @@
   ],
   "url": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/",
   "license": "LICENSE.txt",
-  "version": "10.0.6",
+  "version": "10.0.7",
   "compatibility": {
     "minimum": "10"
   },
@@ -331,14 +331,8 @@
     }
   ],
   "socket": true,
-<<<<<<< HEAD
   "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.6.zip",
+  "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-10.0.7.zip",
-=======
-  "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.86.zip",
-  "protected": false,
->>>>>>> origin/v1.5
   "gridDistance": 1,
   "gridUnits": "m",
   "primaryTokenAttribute": "sante.vie",

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="item-control blessure-control" title="Blessure {{title}}" data-blessure-active="{{bless.active}}">
+  <td class="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.system.dommages decimals=0 sign=true}}" data-dtype="number" />
               <div class="item-controls">
-                <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
+                <a class="item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+                <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
               </div>
             </li>
             {{/each}}
@@ -126,35 +126,7 @@
 
     {{!-- 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="competence flexrow list-item" data-attribute="{{key}}">
+            <li class="caracteristique 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="competence flexrow list-item">
+            <li class="caracteristique 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,7 +59,7 @@
                 {{/select}}
               </select>
             </li>
-            <li class="competence flexrow list-item">
+            <li class="caracteristique 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}}
@@ -70,13 +70,13 @@
               </select>
             </li>
             {{#each data.attributs as |attr key|}}
-            <li class="competence flexrow list-item" data-attribute="{{key}}">
+            <li class="caracteristique 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="competence flexrow list-item" data-attribute="endurance">
+            <li class="caracteristique 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 +104,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-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
+                <a class="item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+                <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
               </div>
             </li>
             {{/each}}
@@ -118,8 +118,8 @@
               <img class="sheet-competence-img" src="{{possession.img}}" />
               <span class="competence-label">{{possession.name}}</span>
               <div class="item-controls">
-                <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
+                <a class="item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+                <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
               </div>
             </li>
             {{/each}}

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

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

templates/actor-sheet-inventaire-item.html

@@ -0,0 +1,48 @@
+<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,16 +3,26 @@
   {{#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="competence-title competence-label">{{piece.name}}</span>
+    <span class="equipement-nom">{{piece.name}}</span>
-    <span class="competence-title competence-label">{{piece.system.quantite}}</span>
+    <span class="equipement-detail item-controls">
-    <span class="competence-title">
+      <a class="monnaie-moins"><i class="fas fa-minus-square"></i></a>
-      <a class="monnaie-plus plus-moins">+</a>
+    </span>
-      <a class="monnaie-moins plus-moins">-</a>
+    <span class="equipement-detail">
+      <span>{{piece.system.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

@@ -0,0 +1,26 @@
+{{> "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

@@ -0,0 +1,12 @@
+<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

@@ -0,0 +1,12 @@
+<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

@@ -0,0 +1,15 @@
+<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.system.niveau}})</a>
   </span>
   <div class="item-controls">
-    <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
+    <a class="item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-    <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+    <a class="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="ctn-vie">
+              <label class="compteur">
                 <a class="jet-vie">Vie</a>
-                <a class="vie-moins plus-moins">-</a>
+                <a class="vie-moins"><i class="fas fa-minus-square"></i></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 plus-moins">+</a>
+                <a class="vie-plus"><i class="fas fa-plus-square"></i></a>
               </label>
             </li>
             <li>
-              <label class="ctn-endu">
+              <label class="compteur">
                 <a class="jet-endurance">Endurance</a>
-                <a class="endurance-moins plus-moins">-</a>
+                <a class="endurance-moins"><i class="fas fa-minus-square"></i></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 plus-moins">+</a>
+                <a class="endurance-plus"><i class="fas fa-plus-square"></i></a>
               </label>
             </li>
             <li>
-              <label class="appliquerFatigue ctn-fatigue tooltip">
+              <label class="appliquerFatigue compteur tooltip">
                 <span class="tooltiptext ttt-fatigue">{{{calc.fatigue.html}}}</span>
                 Fatigue
-                <a class="fatigue-moins plus-moins">-</a>
+                <a class="fatigue-moins"><i class="fas fa-minus-square"></i></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 plus-moins">+</a>
+                <a class="fatigue-plus"><i class="fas fa-plus-square"></i></a>
               </label>
             </li>
             <li>
-              <label class="ctn-reve">
+              <label class="compteur">
                 <span class="ptreve-actuel"><a>Rêve</a></span>
-                <a class="ptreve-actuel-moins plus-moins">-</a>
+                <a class="ptreve-actuel-moins"><i class="fas fa-minus-square"></i></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 plus-moins">+</a>
+                <a class="ptreve-actuel-plus"><i class="fas fa-plus-square"></i></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="competence flexrow item-list xp-level-up" data-attribute="{{key}}">
+                    <li class="caracteristique flexrow item-list xp-level-up" data-attribute="{{key}}">
                     {{else}}
-                    <li class="competence flexrow list-item" data-attribute="{{key}}">
+                    <li class="caracteristique 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="item-control carac-xp-augmenter" name="augmenter.{{key}}" title="Augmenter">
+                          <a class="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="competence flexrow">
+                <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>
@@ -147,14 +147,14 @@
             </div>
             <div class="flex-group-left flexcol" >
               <ul class="carac-list">
-                <li class="competence flexrow list-item">
+                <li class="caracteristique 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="competence flexrow  list-item" data-attribute="{{key}}">
+                <li class="caracteristique 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="competence flexrow list-item">
+                <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="{{data.compteurs.chance.value}}" data-dtype="number"/>
-                  <span class="utiliser-attribut" style="padding-left: 5px"><a class="item-control chance-appel">Utiliser</a></span>
+                  <span class="utiliser-attribut" style="padding-left: 5px"><a class="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="competence flexrow list-item">
+                    <li class="caracteristique 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="item-control stress-test" title="Transformer">Transformer</a>
+                        <a class="stress-test" title="Transformer">Transformer</a>
                         {{else if (eq compteur.label 'Ethylisme')}}
-                        <a class="item-control ethylisme-test" id="ethylisme-test" title="Jet d'Ethylisme">Boire</a>
+                        <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>
@@ -215,11 +215,9 @@
             <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 class="flexrow">
+            <span>
-              <i class="fas fa-search"></i>
+              <input class="recherche flex-grow" type="text" value="{{options.recherche.text}}" name="recherche" 
-              <input class="recherche" type="text" value="{{options.recherche.text}}" name="recherche" 
                   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">
@@ -232,18 +230,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=(sortCompetence competenceByCategory.generale) categorie="Compétences générales"}}
+              {{> "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.particuliere) categorie="Compétences Particulières"}}
+              {{> "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.specialisee) categorie="Compétences Spécialisées"}}
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(filtreTriCompetences 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=(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.melee) categorie="Compétences de Mêlée"}}
-              {{> "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.tir) categorie="Compétences de Tir"}}
-              {{> "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.lancer) categorie="Compétences de Lancer"}}
-              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(sortCompetence competenceByCategory.connaissance) categorie="Connaissances"}}
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(filtreTriCompetences 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=(sortCompetence competenceByCategory.draconic) categorie="Draconic"}}
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(filtreTriCompetences competenceByCategory.draconic) categorie="Draconic"}}
               {{/if}}
 
               <div>
@@ -349,8 +347,8 @@
                 {{/if}}
               </span>
               <div class="item-controls">
-                <a class="item-control item-edit" title="Modifier"><i class="fas fa-edit"></i></a>
+                <a class="item-edit" title="Modifier"><i class="fas fa-edit"></i></a>
-                <a class="item-control item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+                <a class="item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
               </div>          
           </li>
           {{/each}}
@@ -372,8 +370,8 @@
               </span>
               <span class="competence-label">{{possession.system.type}}</span>
               <div class="item-controls">
-                <a class="item-control item-edit" title="Modifier"><i class="fas fa-edit"></i></a>
+                <a class="item-edit" title="Modifier"><i class="fas fa-edit"></i></a>
-                <a class="item-control item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+                <a class="item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
               </div>          
           </li>
           {{/each}}
@@ -391,8 +389,8 @@
                (or @root.options.isGM (not tache.system.cacher_points_de_tache))
             }}/{{tache.system.points_de_tache}}{{/if}})</a></span>
             <div class="item-controls flex-shrink">
-              <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
+              <a class="item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-              <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+              <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
             </div>
           </li>
           {{/each}}
@@ -421,8 +419,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.system.base}})</a></span>
             <div class="item-controls flex-shrink">
-              <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
+              <a class="item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-              <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+              <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
             </div>
           </li>
           {{/each}}
@@ -432,8 +430,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-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
+              <a class="item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-              <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+              <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
             </div>
           </li>
           {{/each}}
@@ -519,7 +517,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-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+              <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
             </div>
           </li>
           {{/each}}
@@ -532,7 +530,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-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+              <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
             </div>
           </li>
           {{/each}}
@@ -545,7 +543,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-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+              <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
             </div>
           </li>
           {{/each}}
@@ -558,7 +556,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-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+              <a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
             </div>
           </li>
           {{/each}}
@@ -573,7 +571,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-control item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+                  <a class="item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
                 </div>
               </li>
               {{/each}}
@@ -591,7 +589,7 @@
                 <span>{{upperFirst rencontre.heure}}, le {{rencontre.date}}</span> 
                 {{/if}}
                 <div class="item-controls flex-shrink">
-                  <a class="item-control rencontre-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+                  <a class="rencontre-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
                 </div>
               </li>
               {{/each}}
@@ -606,7 +604,7 @@
                 <span class="display-label">{{reserve.sort.name}} r{{reserve.sort.system.ptreve_reel}}</span> 
                 <span>{{reserve.coord}} - {{caseTmr-label reserve.coord}}</span> 
                 <div class="item-controls flex-shrink">
-                  <a class="item-control item-delete flex-shrink" title="Supprimer"><i class="fas fa-trash"></i></a>
+                  <a class="item-delete flex-shrink" title="Supprimer"><i class="fas fa-trash"></i></a>
                 </div>
               </li>
               {{/each}}
@@ -626,7 +624,7 @@
               </span> 
               <span>{{sort.system.draconic}} / {{sort.system.difficulte}}</span>
               <div class="item-controls flex-shrink">
-                <a class="item-control item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+                <a class="item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
               </div>
             </li>
             {{/each}}
@@ -638,8 +636,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.system.competence}}</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-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>
+                <a class="item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
               </div>
             </li>
             {{/each}}
@@ -653,7 +651,7 @@
                 <span class="display-label"><a data-item-id="{{casetmr._id}}">{{casetmr.name}}</a></span>
                 <span>{{casetmr.system.coord}} - {{caseTmr-label casetmr.system.coord}}</span> 
                 <div class="item-controls flex-shrink">
-                  <a class="item-control item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
+                  <a class="item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
                 </div>
               </li>
               {{/each}}
@@ -666,79 +664,10 @@
       {{!-- Equipment Tab --}}
       <div class="tab items" data-group="primary" data-tab="items">
         
-        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-monnaie.html" monnaie=monnaie}}
+        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire.html"}}
-
+        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-liens-animaux.html"}}
-        <span class="item-name"><h4>Equipement porté</h4></span>
+        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-liens-suivants.html"}}
-        <div>
+        {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-liens-vehicules.html"}}
-          <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 vide=true ouvert=true }}
-            {{/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="competence flexrow list-item" data-attribute="{{key}}">
+            <li class="caracteristique 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="competence flexrow list-item" data-attribute="{{key}}">
+            <li class="caracteristique 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="competence flexrow list-item" data-attribute="{{key}}">
+            <li class="caracteristique 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="competence flexrow list-item" data-attribute="{{key}}">
+            <li class="caracteristique 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="competence flexrow list-item" data-attribute="{{key}}">
+            <li class="caracteristique 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="competence flexrow list-item" data-attribute="{{key}}">
+            <li class="caracteristique 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="competence flexrow list-item" data-attribute="{{key}}">
+            <li class="caracteristique 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="competence flexrow list-item" data-attribute="{{key}}">
+            <li class="caracteristique 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,45 +69,7 @@
     {{!-- Equipment Tab --}}
     <div class="tab items" data-group="primary" data-tab="items">
 
-      {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-monnaie.html" monnaie=monnaie}}
+      {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire.html"}}
-
-      <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/hud-actor-init.html

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