From c3d8f53c1be576d196b32f83969284450799a28c Mon Sep 17 00:00:00 2001
From: raphaelpieroni <raphaelpieroni@yahoo.fr>
Date: Tue, 11 May 2021 23:41:58 +0200
Subject: [PATCH 1/4] Align skills and caracs

---
 module/rdd-utility.js                         |  1 +
 ...r-sheet-categorie-competences-partial.html |  2 +-
 templates/actor-sheet-competence-partial.html | 59 +++++++++----------
 templates/actor-sheet.html                    | 20 +++----
 4 files changed, 40 insertions(+), 42 deletions(-)

diff --git a/module/rdd-utility.js b/module/rdd-utility.js
index 7e575f86..614dec35 100644
--- a/module/rdd-utility.js
+++ b/module/rdd-utility.js
@@ -220,6 +220,7 @@ 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) => { return a.name.localeCompare(b.name); }) );
 
     return loadTemplates(templatePaths);
   }
diff --git a/templates/actor-sheet-categorie-competences-partial.html b/templates/actor-sheet-categorie-competences-partial.html
index a3fa8da9..8a20a5e5 100644
--- a/templates/actor-sheet-categorie-competences-partial.html
+++ b/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}}
diff --git a/templates/actor-sheet-competence-partial.html b/templates/actor-sheet-competence-partial.html
index 9162435f..4022579d 100644
--- a/templates/actor-sheet-competence-partial.html
+++ b/templates/actor-sheet-competence-partial.html
@@ -1,34 +1,31 @@
 {{#if visible}}
-{{#if data.isLevelUp}}
-<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>
+  <li class="item flexrow list-item {{#if data.isLevelUp}}xp-level-up tooltip{{/if}}" data-item-id="{{_id}}">
+    <a class="competence-label" name="{{name}}">
+      <img class="sheet-competence-img" src="{{img}}"/>
+      <span class="competence-label">{{name}}</span>
+    </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-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}}/>
     {{/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-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}}/>
-  {{/if}}
-  <div class="item-controls">
-    <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>
+    <div class="item-controls">
+      <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}}
+    {{#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}}
+  </li>
 {{/if}}
\ No newline at end of file
diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html
index 70809aeb..60a3acf0 100644
--- a/templates/actor-sheet.html
+++ b/templates/actor-sheet.html
@@ -156,7 +156,7 @@
             </div>
             <div class="flex-group-left flexcol" >
               <ul class="carac-list">
-                <li class="competence flexrow  list-item">
+                <li class="competence flexrow list-item">
                   <span class="competence-label flexrow" name="beaute">Beauté : 
                     <input class="description-value" type="text" name="data.beaute" value="{{data.beaute}}" data-dtype="String" {{#unless @root.options.editCaracComp}}disabled{{/unless}}/>
                   </span>
@@ -233,18 +233,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=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=competenceByCategory.specialisee categorie="Compétences Spécialisées"}}
+              {{> "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=(sortCompetence 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"}}
             </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=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=competenceByCategory.connaissance categorie="Connaissances"}}
+              {{> "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=(sortCompetence 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=(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>
@@ -726,7 +726,7 @@
           <div class="form-group editor">
             {{editor content=data.notes target="data.notes" button=true owner=owner editable=editable}}
           </div>
-          <h3>Journal d'Experience</h3>          
+          <h3>Journal d'Experience</h3>
           <div class="form-group editor">
             <ul class="item-list alterne-list">
               {{#each data.experiencelog as |xp key|}}

From 958ab1e6df167995c68fe6316c238b2d884c5061 Mon Sep 17 00:00:00 2001
From: raphaelpieroni <raphaelpieroni@yahoo.fr>
Date: Wed, 12 May 2021 23:07:32 +0200
Subject: [PATCH 2/4] Enforce skill upgradable color

---
 styles/simple.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/styles/simple.css b/styles/simple.css
index f220adac..69aa3110 100644
--- a/styles/simple.css
+++ b/styles/simple.css
@@ -658,7 +658,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 {

From c41a7c92509a64a2216eaaf3091ba6e94e5746b1 Mon Sep 17 00:00:00 2001
From: raphaelpieroni <raphaelpieroni@yahoo.fr>
Date: Thu, 13 May 2021 00:37:28 +0200
Subject: [PATCH 3/4] Sort skills

---
 module/rdd-utility.js | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/module/rdd-utility.js b/module/rdd-utility.js
index 614dec35..3817ec8d 100644
--- a/module/rdd-utility.js
+++ b/module/rdd-utility.js
@@ -220,7 +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) => { return a.name.localeCompare(b.name); }) );
+    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);
   }

From a448f68190203615d42e1c6da16f4c13dff27546 Mon Sep 17 00:00:00 2001
From: raphaelpieroni <raphaelpieroni@yahoo.fr>
Date: Thu, 13 May 2021 00:38:06 +0200
Subject: [PATCH 4/4] Align skills and hide controls

---
 module/actor-sheet.js                         |  7 ++++-
 styles/simple.css                             | 31 ++++++++++++++++++-
 templates/actor-sheet-competence-partial.html |  8 ++---
 templates/actor-sheet.html                    | 15 +++++----
 4 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/module/actor-sheet.js b/module/actor-sheet.js
index 441e0222..0eb85585 100644
--- a/module/actor-sheet.js
+++ b/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) => {
diff --git a/styles/simple.css b/styles/simple.css
index 69aa3110..6935a4a1 100644
--- a/styles/simple.css
+++ b/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;
 }
 
@@ -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;
diff --git a/templates/actor-sheet-competence-partial.html b/templates/actor-sheet-competence-partial.html
index 4022579d..ec217cf9 100644
--- a/templates/actor-sheet-competence-partial.html
+++ b/templates/actor-sheet-competence-partial.html
@@ -15,10 +15,6 @@
              value="{{numberFormat data.xp_sort decimals=0 sign=false}}" data-dtype="number"
              {{#unless @root.options.editCaracComp}}disabled{{/unless}}/>
     {{/if}}
-    <div class="item-controls">
-      <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"
@@ -27,5 +23,9 @@
     {{#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>
   </li>
 {{/if}}
\ No newline at end of file
diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html
index 60a3acf0..1bdd8fe9 100644
--- a/templates/actor-sheet.html
+++ b/templates/actor-sheet.html
@@ -113,7 +113,7 @@
         <div class="tab items" data-group="primary" data-tab="carac">
           <div class="grid grid-2col">
             <div class="flex-group-left flexcol">
-              <span><a class="lock-unlock-sheet"><img class="small-button-container" 
+              <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>
               <ul class="carac-list alterne-list">
@@ -221,15 +221,18 @@
         {{!-- Compétences Tab --}}
         <div class="tab competences" data-group="primary" data-tab="competences">
           <div class="flexrow">
-            <span><a class="lock-unlock-sheet"><img class="small-button-container" 
+            <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><a id="show-hide-competences"><img class="small-button-container" 
+            <span><a id="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"
-              >{{#if options.showCompNiveauBase}}Montrer tout{{else}}Filtrer{{/if}}</a></span> 
-            <span><a id="show-hide-archetype"><img class="small-button-container" 
+              >{{#if options.showCompNiveauBase}}Montrer tout{{else}}Filtrer{{/if}}</a></span>
+            <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> 
+              >{{#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">