Merge branch 'character-sheet-style' into 'v1.4'

Character sheet style - Align and sort skills

See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!247

module/actor-sheet.js

@@ -30,7 +30,8 @@ export class RdDActorSheet extends ActorSheet {
       dragDrop: [{ dragSelector: ".item-list .item", dropSelector: null }],
       editCaracComp: false,
       showCompNiveauBase: false,
-      montrerArchetype: false
+      montrerArchetype: false,
+      hideControls: true
     });
   }
 
@@ -483,6 +484,10 @@ export class RdDActorSheet extends ActorSheet {
       this.options.montrerArchetype = !this.options.montrerArchetype;
       this.render(true);
     });
+    html.find('.lock-unlock-controls').click((event) => {console.log("CONTROLS",this.options.hideControls)
+      this.options.hideControls = !this.options.hideControls;
+      this.render(true);
+    });
 
     // On pts de reve change
     html.find('.pointsreve-value').change((event) => {

module/rdd-utility.js

@@ -220,6 +220,36 @@ export class RdDUtility {
     Handlebars.registerHelper('caseTmr-type', coord => TMRUtility.getTMRType(coord));
     Handlebars.registerHelper('typeTmr-name', coord => TMRUtility.typeTmrName(coord));
     Handlebars.registerHelper('equals', (a, b) => a == b);
+    Handlebars.registerHelper('sortCompetence', competences => competences.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;
+        if (a.name.includes("Extérieur")) return -1;
+        if (b.name.includes("Extérieur")) return 1;
+        return a.name.localeCompare(b.name);
+      }
+      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;
+        if (b.name.includes("Dague")) return 1;
+        if (a.name.includes("Esquive")) return -1;
+        if (b.name.includes("Esquive")) return 1;
+        return a.name.localeCompare(b.name);
+      }
+      if (a.name.startsWith("Voie") && b.name.startsWith("Voie")) {
+        if (a.name.includes("Oniros")) return -1;
+        if (b.name.includes("Oniros")) return 1;
+        if (a.name.includes("Hypnos")) return -1;
+        if (b.name.includes("Hypnos")) return 1;
+        if (a.name.includes("Narcos")) return -1;
+        if (b.name.includes("Narcos")) return 1;
+        if (a.name.includes("Thanatos")) return -1;
+        if (b.name.includes("Thanatos")) return 1;
+        return a.name.localeCompare(b.name);
+      }
+      return a.name.localeCompare(b.name);
+    }));
 
     return loadTemplates(templatePaths);
   }

styles/simple.css

@@ -429,6 +429,13 @@ table {border: 1px solid #7a7971;}
   text-align: right;
 }
 
+.competence-list .item-controls {
+  display: contents !important;
+}
+.competence-list .item-controls.hidden-controls {
+  display: none !important;
+}
+
 .rdddialog .dialog-roll-sort s{
   width: 600px;
   height: 430px;
@@ -612,8 +619,27 @@ section.sheet-body:after {
 }
 
 .window-app.sheet .window-content .carac-value, .window-app.sheet .window-content .competence-xp {
+  flex-grow: 0;
   margin: 0.05rem;
-  flex-basis: 3rem;
+  flex-basis: 2rem;
+  text-align: center;
+}
+.window-app.sheet .window-content .carac-value, .window-app.sheet .window-content .competence-value {
+  flex-grow: 0;
+  margin: 0.05rem;
+  flex-basis: 2rem;
+  text-align: center;
+}
+.window-app.sheet .window-content .carac-value, .window-app.sheet .window-content .competence-archetype {
+  flex-grow: 0;
+  margin: 0.05rem;
+  flex-basis: 2rem;
+  text-align: center;
+}
+.window-app.sheet .window-content .carac-value, .window-app.sheet .window-content .competence-xp-sort {
+  flex-grow: 0;
+  margin: 0.05rem;
+  flex-basis: 2rem;
   text-align: center;
 }
 
@@ -658,7 +684,7 @@ ul, li {
   border-radius: 0.25rem;
   padding: 0.125rem;
   flex: 1 1 5rem;  
-  background: rgba(195, 152, 22, 0.5);
+  background: rgba(195, 152, 22, 0.5) !important;
 }
 
 .blessures-list ul {
@@ -684,6 +710,8 @@ ul, li {
   border-radius: 0.25rem;
   padding: 0.125rem;
   flex: 1 1 5rem;
+  display: flex !important;
+  align-items: baseline !important;
 }
 
 .table-row {
@@ -734,6 +762,7 @@ ul, li {
   height: 24px;
   flex-grow: 0;
   margin-right: 0.25rem;
+  vertical-align: bottom;
 }
 .competence-column {
   flex-direction: column;

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

@@ -1,7 +1,7 @@
 <header class="competence-header flexrow">
   <span class="competence-title">{{categorie}}</span>
 </header>
-<ul class="item-list alterne-list">
+<ul class="item-list alterne-list competence-list">
   {{#each competences as |comp key|}}
   {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-competence-partial.html" comp}}
   {{/each}}

templates/actor-sheet-competence-partial.html

@@ -1,34 +1,31 @@
 {{#if visible}}
-{{#if data.isLevelUp}}
+  <li class="item flexrow list-item {{#if data.isLevelUp}}xp-level-up tooltip{{/if}}" data-item-id="{{_id}}">
-<li class="item flexrow xp-level-up" data-item-id="{{_id}}">
-  {{else}}
-<li class="item flexrow list-item" data-item-id="{{_id}}">
-  {{/if}}
     <a class="competence-label" name="{{name}}">
       <img class="sheet-competence-img" src="{{img}}"/>
-    {{#if data.isLevelUp}}
-    <span class="competence-label tooltip">
-      <span class="tooltiptext ttt-xp">
-        Vous pouvez dépenser {{data.xpNext}} points d'Experience pour augmenter de 1 votre compétence {{name}}
-      </span>
-      {{name}}
-    </span>
-    {{else}}
       <span class="competence-label">{{name}}</span>
-    {{/if}}
     </a>
-  <input class="competence-value" type="text" compname="{{name}}" value="{{numberFormat data.niveau decimals=0 sign=true}}" data-dtype="number" {{#unless @root.options.editCaracComp}}disabled{{/unless}} />
+    <input class="competence-value" type="text" compname="{{name}}"
-  <input class="competence-xp" type="text" compname="{{name}}" value="{{numberFormat data.xp decimals=0 sign=false}}" data-dtype="number" {{#unless @root.options.editCaracComp}}disabled{{/unless}} />
+           value="{{numberFormat data.niveau decimals=0 sign=true}}" data-dtype="number"
+           {{#unless @root.options.editCaracComp}}disabled{{/unless}} />
+    <input class="competence-xp" type="text" compname="{{name}}"
+           value="{{numberFormat data.xp decimals=0 sign=false}}" data-dtype="number"
+           {{#unless @root.options.editCaracComp}}disabled{{/unless}} />
     {{#if (eq data.categorie 'draconic')}}
-  <input class="competence-xp-sort" type="text" compname="{{name}}" value="{{numberFormat data.xp_sort decimals=0 sign=false}}" data-dtype="number" {{#unless @root.options.editCaracComp}}disabled{{/unless}}/>
+      <input class="competence-xp-sort" type="text" compname="{{name}}"
+             value="{{numberFormat data.xp_sort decimals=0 sign=false}}" data-dtype="number"
+             {{#unless @root.options.editCaracComp}}disabled{{/unless}}/>
     {{/if}}
-  <div class="item-controls">
+    {{#if @root.options.montrerArchetype}}
+      <input class="competence-archetype" type="text" compname="{{name}}"
+             value="{{numberFormat data.niveau_archetype decimals=0 sign=true}}" data-dtype="number"
+             {{#unless @root.options.editCaracComp}}disabled{{/unless}} />
+    {{/if}}
+    {{#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>
+    {{/if}}
+    <div class="item-controls {{#if @root.options.hideControls}}hidden-controls{{/if}}">
       <a class="item-control 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>
     </div>
-  {{#if @root.options.montrerArchetype}}
-  <input class="competence-archetype" type="text" compname="{{name}}"
-    value="{{numberFormat data.niveau_archetype decimals=0 sign=true}}" data-dtype="number" {{#unless @root.options.editCaracComp}}disabled{{/unless}} />
-  {{/if}}
   </li>
 {{/if}}

templates/actor-sheet.html

@@ -230,21 +230,24 @@
             <span><a id="show-hide-archetype"><img class="small-button-container"
               src="systems/foundryvtt-reve-de-dragon/icons/{{#if options.montrerArchetype}}no-filter.svg{{else}}filter.svg{{/if}}" alt="filter/montrer l'archétype"
               >{{#if options.montrerArchetype}}Masquer l'archétype{{else}}Voir l'archétype{{/if}}</a></span>
+            <span><a class="lock-unlock-controls">i class="fas fa-lock{{#if options.hideControls}}-open{{/if}}"></i>
+              {{#if options.hideControls}}Voir les contrôles{{else}}Masquer les contrôles{{/if}}
+            </a></span>
           </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=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=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=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=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=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=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=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.montrerArchetype)}}
-              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=competenceByCategory.draconic categorie="Draconic"}}
+              {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(sortCompetence competenceByCategory.draconic) categorie="Draconic"}}
               {{/if}}
 
               <div>