Various v12 fixes

2024-07-13 12:12:38 +02:00
parent b83890a764
commit d83a999974
64 changed files with 422 additions and 446 deletions
--- a/templates/actor-sheet.html
+++ b/templates/actor-sheet.html
@ -14,7 +14,8 @@
                {{#each system.caracteristiques as |carac key|}}
                {{#if (eq kind "physical")}}
                <li class="item flexrow ">
-                  <h4 class="item-name-label competence-name roll-style"><a class="roll-carac" data-key="{{key}}">{{carac.label}}</a></h4>
+                  <h4 class="item-name-label competence-name roll-style"><a class="roll-carac"
+                      data-key="{{key}}">{{carac.label}}</a></h4>
                  <input type="text" class="padd-right status-small-label color-class-common item-field-label-short"
                    name="system.caracteristiques.{{key}}.value" value="{{carac.value}}" data-dtype="Number" />
                  <input type="text" class="padd-right status-small-label color-class-common item-field-label-short"
@ -30,7 +31,8 @@
                {{#each system.caracteristiques as |carac key|}}
                {{#if (eq kind "mental")}}
                <li class="item flexrow ">
-                  <h4 class="item-name-label competence-name roll-style"><a class="roll-carac" data-key="{{key}}">{{carac.label}}</a></h4>
+                  <h4 class="item-name-label competence-name roll-style"><a class="roll-carac"
+                      data-key="{{key}}">{{carac.label}}</a></h4>
                  <input type="text" class="padd-right status-small-label color-class-common item-field-label-short"
                    name="system.caracteristiques.{{key}}.value" value="{{carac.value}}" data-dtype="Number" />
                  <input type="text" class="padd-right status-small-label color-class-common item-field-label-short"
@ -41,25 +43,31 @@
              </ul>
            </div>

-          </div>            
-            <div class="flexrow">
-              <label class="item-field-label-short">PV</label>
-              <input type="text" class="item-field-label-short" name="system.pv.value" value="{{system.pv.value}}" data-dtype="Number" />
-              <input type="text" class="item-field-label-short" name="system.pv.max" value="{{system.pv.max}}" disabled data-dtype="Number" />
-              <input type="text" class="item-field-label-short" name="system.pv.mod" value="{{system.pv.mod}}" data-dtype="Number" />
-              <label class="item-field-label-short">Malus</label>
-              <input type="text" class="item-field-label-short" value="{{pvMalus.value}}" data-dtype="Number" disabled />
-              <span>&nbsp;&nbsp;</span>
+          </div>
+          <div class="flexrow">
+            <label class="item-field-label-short">PV</label>
+            <input type="text" class="item-field-label-short" name="system.pv.value" value="{{system.pv.value}}"
+              data-dtype="Number" />
+            <input type="text" class="item-field-label-short" name="system.pv.max" value="{{system.pv.max}}" disabled
+              data-dtype="Number" />
+            <input type="text" class="item-field-label-short" name="system.pv.mod" value="{{system.pv.mod}}"
+              data-dtype="Number" />
+            <label class="item-field-label-short">Malus</label>
+            <input type="text" class="item-field-label-short" value="{{pvMalus.value}}" data-dtype="Number" disabled />
+            <span>&nbsp;&nbsp;</span>

-              <select class="item-field-label-medium" type="text" name="system.statutmasque" value="{{system.statutmasque}}" data-dtype="string">
-                {{selectOptions config.statutMasque selected=system.statutmasque}}
-              </select>
-  
-              <span>&nbsp;&nbsp;</span>
-              <label class="item-field-label-short">Tricherie</label>
-              <input type="text" class="item-field-label-short" name="system.rang.tricherie.value" value="{{system.rang.tricherie.value}}" data-dtype="Number" />
-              <input type="text" class="item-field-label-short" name="system.rang.tricherie.max" value="{{system.rang.tricherie.max}}" data-dtype="Number" />
-            </div>
+            <select class="item-field-label-medium" type="text" name="system.statutmasque"
+              value="{{system.statutmasque}}" data-dtype="string">
+              {{selectOptions config.statutMasque selected=system.statutmasque}}
+            </select>
+
+            <span>&nbsp;&nbsp;</span>
+            <label class="item-field-label-short">Tricherie</label>
+            <input type="text" class="item-field-label-short" name="system.rang.tricherie.value"
+              value="{{system.rang.tricherie.value}}" data-dtype="Number" />
+            <input type="text" class="item-field-label-short" name="system.rang.tricherie.max"
+              value="{{system.rang.tricherie.max}}" data-dtype="Number" />
+          </div>

        </div>
      </div>
@ -88,13 +96,15 @@

          <div>
            {{#each utileSkillsPhysical as |skillDef keyProfil|}}
-              {{> systems/fvtt-les-heritiers/templates/partial-utile-skills.html skillDef=skillDef keyProfil=keyProfil config=config}}
+            {{> systems/fvtt-les-heritiers/templates/partial-utile-skills.html skillDef=skillDef keyProfil=keyProfil
+            config=config}}
            {{/each}}
          </div>

          <div>
            {{#each utileSkillsMental as |skillDef keyProfil|}}
-              {{> systems/fvtt-les-heritiers/templates/partial-utile-skills.html skillDef=skillDef keyProfil=keyProfil config=config}}
+            {{> systems/fvtt-les-heritiers/templates/partial-utile-skills.html skillDef=skillDef keyProfil=keyProfil
+            config=config}}
            {{/each}}
          </div>

@ -120,8 +130,8 @@
              <span class="item-field-label-long2 roll-style"><a class="roll-competence item-field-label-short"
                  data-attr-key="tochoose">{{skill.name}}</a></span>

-                  <select class="item-field-label-short edit-item-data" type="text"
-                data-item-field="niveau" value="{{skill.system.niveau}}" data-dtype="Number">
+              <select class="item-field-label-short edit-item-data" type="text" data-item-field="niveau"
+                value="{{skill.system.niveau}}" data-dtype="Number">
                {{selectOptions @root.config.listNiveau selected=skill.system.niveau}}
              </select>

@ -148,32 +158,41 @@
        <li class="item flexrow list-item items-title-bg">
          <label class="item-field-label-medium"><strong>Esquive</strong></label>
          <label class="item-field-label-medium">Masquée</label>
-          <input type="text" class="item-field-label-short" name="system.combat.esquive.masquee" value="{{system.combat.esquive.masquee}}" data-dtype="Number" />
+          <input type="text" class="item-field-label-short" name="system.combat.esquive.masquee"
+            value="{{system.combat.esquive.masquee}}" data-dtype="Number" />
          <label class="item-field-label-medium">Démasquée</label>
-          <input type="text" class="item-field-label-short" name="system.combat.esquive.demasquee" value="{{system.combat.esquive.demasquee}}" data-dtype="Number" />
+          <input type="text" class="item-field-label-short" name="system.combat.esquive.demasquee"
+            value="{{system.combat.esquive.demasquee}}" data-dtype="Number" />
          <label class="item-field-label-short">&nbsp;&nbsp;</label>
          <label class="item-field-label-medium"><strong>Parade</strong></label>
          <label class="item-field-label-medium">Masquée</label>
-          <input type="text" class="item-field-label-short" name="system.combat.parade.masquee" value="{{system.combat.parade.masquee}}" data-dtype="Number" />
+          <input type="text" class="item-field-label-short" name="system.combat.parade.masquee"
+            value="{{system.combat.parade.masquee}}" data-dtype="Number" />
          <label class="item-field-label-medium">Démasquée</label>
-          <input type="text" class="item-field-label-short" name="system.combat.parade.demasquee" value="{{system.combat.parade.demasquee}}" data-dtype="Number" />
+          <input type="text" class="item-field-label-short" name="system.combat.parade.demasquee"
+            value="{{system.combat.parade.demasquee}}" data-dtype="Number" />
        </li>
        <li class="item flexrow list-item items-title-bg">
          <label class="item-field-label-long">Rés. physique</label>
-          <input type="text" class="item-field-label-short" name="system.combat.resistancephysique.value" value="{{system.combat.resistancephysique.value}}" data-dtype="Number" />
+          <input type="text" class="item-field-label-short" name="system.combat.resistancephysique.value"
+            value="{{system.combat.resistancephysique.value}}" data-dtype="Number" />
          <label class="item-field-label-short">&nbsp;&nbsp;</label>
          <label class="item-field-label-long">Rés. psychique</label>
-          <input type="text" class="item-field-label-short" name="system.combat.resistancepsychique.value" value="{{system.combat.resistancepsychique.value}}" data-dtype="Number" />
+          <input type="text" class="item-field-label-short" name="system.combat.resistancepsychique.value"
+            value="{{system.combat.resistancepsychique.value}}" data-dtype="Number" />
          <label class="item-field-label-short">&nbsp;&nbsp;</label>
          <label class="item-field-label-medium">Protection : </label>
-          <input type="text" class="item-field-label-short" name="system.combat.protection.value" value="{{system.combat.protection.value}}" data-dtype="Number" />
+          <input type="text" class="item-field-label-short" name="system.combat.protection.value"
+            value="{{system.combat.protection.value}}" data-dtype="Number" />
        </li>
        <li class="item flexrow list-item items-title-bg">
          <label class="item-field-label-long">Effets secondaires</label>
-          <input type="text" class="item-field-label-short" name="system.combat.effetssecondaires" value="{{system.combat.effetssecondaires}}" data-dtype="String" />
+          <input type="text" class="item-field-label-short" name="system.combat.effetssecondaires"
+            value="{{system.combat.effetssecondaires}}" data-dtype="String" />
          <label class="item-field-label-short">&nbsp;&nbsp;</label>
          <label class="item-field-label-long">Dissimulation : </label>
-          <input type="text" class="item-field-label-short" name="system.combat.dissimulation.value" value="{{system.combat.dissimulation.value}}" data-dtype="Number" />
+          <input type="text" class="item-field-label-short" name="system.combat.dissimulation.value"
+            value="{{system.combat.dissimulation.value}}" data-dtype="Number" />
        </li>
      </ul>

@ -213,13 +232,14 @@
              <span class="item-field-label-short">
                <button class="roll-assomer-arme button-sheet-roll">Assomer</button>
              </span>
-              
+
              {{#if arme.system.isMelee}}
              <span class="item-field-label-short">
                <button class="roll-attaque-charge-arme button-sheet-roll">Charger</button>
              </span>
              <span class="item-field-label-short">
-                <button class="roll-attaque-brutale-arme button-sheet-roll button-sheet-roll-long1">Attaque brutale</button>
+                <button class="roll-attaque-brutale-arme button-sheet-roll button-sheet-roll-long1">Attaque
+                  brutale</button>
              </span>
              {{/if}}

@ -272,7 +292,7 @@

    {{!-- Fee Tab --}}
    <div class="tab fee" data-group="primary" data-tab="fee">
-      
+
      <div class="flexrow">
        <li class="item flexrow " data-item-id="{{fee._id}}" data-item-type="avantage">
          <img class="item-name-img" src="{{fee.img}}" />
@ -288,15 +308,22 @@
      <div class="flexrow">
        <ul>
          <li class="flexrow item">
-            <label class="item-field-label-medium roll-style"><a class="roll-rang item-field-label-short" data-rang-key="feerie">Féerie</a></label> 
-            <input type="text" class="item-field-label-short" name="system.rang.feerie.value" value="{{system.rang.feerie.value}}" data-dtype="Number" />
-            <input type="text" class="item-field-label-short" name="system.rang.feerie.max" value="{{system.rang.feerie.max}}" data-dtype="Number" />
+            <label class="item-field-label-medium roll-style"><a class="roll-rang item-field-label-short"
+                data-rang-key="feerie">Féerie</a></label>
+            <input type="text" class="item-field-label-short" name="system.rang.feerie.value"
+              value="{{system.rang.feerie.value}}" data-dtype="Number" />
+            <input type="text" class="item-field-label-short" name="system.rang.feerie.max"
+              value="{{system.rang.feerie.max}}" data-dtype="Number" />
            <span class="item-field-label-medium"></span>
-            <label class="item-field-label-medium roll-style"><a class="roll-rang item-field-label-short" data-rang-key="masque">Masque</a></label> 
-            <input type="text" class="item-field-label-short" name="system.rang.masque.value" value="{{system.rang.masque.value}}" data-dtype="Number" />
-            <input type="text" class="item-field-label-short" name="system.rang.masque.max" value="{{system.rang.masque.max}}" data-dtype="Number" />
+            <label class="item-field-label-medium roll-style"><a class="roll-rang item-field-label-short"
+                data-rang-key="masque">Masque</a></label>
+            <input type="text" class="item-field-label-short" name="system.rang.masque.value"
+              value="{{system.rang.masque.value}}" data-dtype="Number" />
+            <input type="text" class="item-field-label-short" name="system.rang.masque.max"
+              value="{{system.rang.masque.max}}" data-dtype="Number" />
            <span class="item-field-label-medium"></span>
-            <label class="item-field-label-long roll-style"><a class="dialog-recup-usage item-field-label-long">Récup. P. d'Usage</a></label> 
+            <label class="item-field-label-long roll-style"><a class="dialog-recup-usage item-field-label-long">Récup.
+                P. d'Usage</a></label>
          </li>
        </ul>
      </div>
@ -413,7 +440,7 @@
              <span class="item-field-label-medium">{{upperFirst pouvoir.system.pouvoirtype}}</span>
              <span class="item-field-label-medium">{{upperFirst pouvoir.system.niveau}}</span>
              <span class="item-field-label-medium">{{pouvoir.system.pointsusagecourant}}/{{pouvoir.maxUsage}}</span>
-              
+
              <div class="item-filler">&nbsp;</div>
              <div class="item-controls item-controls-fixed">
                <a class="item-control item-edit" title="Editer l'item"><i class="fas fa-edit"></i></a>
@ -458,7 +485,7 @@

    {{!-- Equipement Tab --}}
    <div class="tab equipement" data-group="primary" data-tab="equipement">
-      
+
      <div class="sheet-box color-bg-archetype">
        <ul class="item-list alternate-list">
          <li class="item flexrow list-item items-title-bg">
@ -466,8 +493,9 @@
              <h3><label class="items-title-text">Equipements</label></h3>
            </span>
            <div class="item-filler">&nbsp;</div>
-              <div class="item-controls item-controls-fixed">
-                <a class="item-control item-add" data-type="equipement" title="Créer un équipement"><i class="fas fa-plus"></i></a>
+            <div class="item-controls item-controls-fixed">
+              <a class="item-control item-add" data-type="equipement" title="Créer un équipement"><i
+                  class="fas fa-plus"></i></a>
            </div>
          </li>
          {{#each equipements as |equip key|}}
@ -495,8 +523,9 @@
              <h3><label class="items-title-text">Contacts, Allies et Ennemis</label></h3>
            </span>
            <div class="item-filler">&nbsp;</div>
-              <div class="item-controls item-controls-fixed">
-                <a class="item-control item-add" data-type="contact" title="Créer un contact"><i class="fas fa-plus"></i></a>
+            <div class="item-controls item-controls-fixed">
+              <a class="item-control item-add" data-type="contact" title="Créer un contact"><i
+                  class="fas fa-plus"></i></a>
            </div>
          </li>
      </div>
@ -509,8 +538,9 @@
              <h3><label class="items-title-text">{{contactList.label}}</label></h3>
            </span>
            <div class="item-filler">&nbsp;</div>
-              <div class="item-controls item-controls-fixed">
-                <a class="item-control item-add" data-type="contact" title="Créer un contact"><i class="fas fa-plus"></i></a>
+            <div class="item-controls item-controls-fixed">
+              <a class="item-control item-add" data-type="contact" title="Créer un contact"><i
+                  class="fas fa-plus"></i></a>
            </div>
          </li>
          {{#each contactList.list as |contact key|}}
@ -564,28 +594,37 @@
      <div class="flexrow">
        <ul>
          <li class="flexrow item">
-            <label class="item-field-label-long2">Nom humain</label> <input type="text" class="" name="system.biodata.nomhumain" value="{{system.biodata.nomhumain}}" data-dtype="String" />
+            <label class="item-field-label-long2">Nom humain</label> <input type="text" class=""
+              name="system.biodata.nomhumain" value="{{system.biodata.nomhumain}}" data-dtype="String" />
          </li>
          <li class="flexrow item">
-            <label class="item-field-label-long2">Activités</label> <input type="text" class="" name="system.biodata.activites" value="{{system.biodata.activites}}" data-dtype="String" />
+            <label class="item-field-label-long2">Activités</label> <input type="text" class=""
+              name="system.biodata.activites" value="{{system.biodata.activites}}" data-dtype="String" />
          </li>
          <li class="flexrow item">
-            <label class="item-field-label-long2">Apparence masquée</label> <input type="text" class="" name="system.biodata.apparencemasquee" value="{{system.biodata.apparencemasquee}}" data-dtype="String" />
+            <label class="item-field-label-long2">Apparence masquée</label> <input type="text" class=""
+              name="system.biodata.apparencemasquee" value="{{system.biodata.apparencemasquee}}" data-dtype="String" />
          </li>
          <li class="flexrow item">
-            <label class="item-field-label-long2">Apparence démasquée</label> <input type="text" class="" name="system.biodata.apparencedemasquee" value="{{system.biodata.apparencedemasquee}}" data-dtype="String" />
+            <label class="item-field-label-long2">Apparence démasquée</label> <input type="text" class=""
+              name="system.biodata.apparencedemasquee" value="{{system.biodata.apparencedemasquee}}"
+              data-dtype="String" />
          </li>
          <li class="flexrow item">
-            <label class="item-field-label-long2">Titre et Famille</label> <input type="text" class="" name="system.biodata.titrefamille" value="{{system.biodata.titrefamille}}" data-dtype="String" />
+            <label class="item-field-label-long2">Titre et Famille</label> <input type="text" class=""
+              name="system.biodata.titrefamille" value="{{system.biodata.titrefamille}}" data-dtype="String" />
          </li>
          <li class="flexrow item">
-            <label class="item-field-label-long2">Factions féériques</label> <input type="text" class="" name="system.biodata.factionfeerique" value="{{system.biodata.factionfeerique}}" data-dtype="String" />
+            <label class="item-field-label-long2">Factions féériques</label> <input type="text" class=""
+              name="system.biodata.factionfeerique" value="{{system.biodata.factionfeerique}}" data-dtype="String" />
          </li>
          <li class="flexrow item">
-            <label class="item-field-label-long2">Traits de caractères dominants</label> <input type="text" class="" name="system.biodata.traitscaracteres" value="{{system.biodata.traitscaracteres}}" data-dtype="String" />
+            <label class="item-field-label-long2">Traits de caractères dominants</label> <input type="text" class=""
+              name="system.biodata.traitscaracteres" value="{{system.biodata.traitscaracteres}}" data-dtype="String" />
          </li>
          <li class="flexrow item">
-            <label class="item-field-label-long2">Langues</label> <input type="text" class="" name="system.biodata.langues" value="{{system.biodata.langues}}" data-dtype="String" />
+            <label class="item-field-label-long2">Langues</label> <input type="text" class=""
+              name="system.biodata.langues" value="{{system.biodata.langues}}" data-dtype="String" />
          </li>
        </ul>
      </div>
@ -619,8 +658,8 @@
            </li>
            <li class="item flexrow">
              <label class="generic-label">Taille Démasquée</label>
-              <input type="text" class="" name="system.biodata.tailledemasquee" value="{{system.biodata.tailledemasquee}}"
-                data-dtype="String" />
+              <input type="text" class="" name="system.biodata.tailledemasquee"
+                value="{{system.biodata.tailledemasquee}}" data-dtype="String" />
            </li>
            <li class="flexrow item">
              <label class="generic-label">Type de taille</label>
@ -629,7 +668,8 @@
            </li>
            <li class="flexrow item">
              <label class="generic-label">Points d'héritage</label>
-              <input type="text" class="" name="system.rang.heritage.value" value="{{system.rang.heritage.value}}"  data-dtype="String" />
+              <input type="text" class="" name="system.rang.heritage.value" value="{{system.rang.heritage.value}}"
+                data-dtype="String" />
            </li>

          </ul>
@ -658,7 +698,7 @@
                data-dtype="String" />
            </li>
          </ul>
-       </div>
+        </div>
      </div>
    </div>

--- a/templates/chat-assommer-result.html
+++ b/templates/chat-assommer-result.html
@ -18,13 +18,13 @@

 <div>
  <ul>
-    <li>Assomer {{defenderName}} en état de : {{etatAssommer}}</li>    
-    
+    <li>Assomer {{defenderName}} en état de : {{etatAssommer}}</li>
+
    {{#if isSuccess}}
-      <li>Marge : {{marge}}</li>
-      <li>{{defenderName}} est assomé pour {{dureeAssommer}} minutes !</li>
+    <li>Marge : {{marge}}</li>
+    <li>{{defenderName}} est assomé pour {{dureeAssommer}} minutes !</li>
    {{else}}
-      <li>{{defenderName}} n'a pas été assomé et est conscient la tentative !</li>
+    <li>{{defenderName}} n'a pas été assomé et est conscient la tentative !</li>
    {{/if}}
  </ul>
-</div>
+</div>
--- a/templates/chat-cc-result.html
+++ b/templates/chat-cc-result.html
@ -18,25 +18,26 @@

 <div>
  <ul>
-    <li>Défense de {{defenderName}} : {{defenderMode}} ({{defenderValue}})</li>    
-    
-    {{#if isSuccess}}
-      <li>Marge : {{marge}}</li>
-      <li>Degats de l'arme : {{degatsArme}}</li>
-      
-      {{#if (eq attaqueCible "membre")}}
-      <li><strong>Cible un membre : La cible a -2 de malus sur ces actions avec ce membre (mouvement 2 si jambes)</strong></li>
-      {{/if}}
-      {{#if (eq attaqueCible "main")}}
-      <li><strong>Cible une main : La cible ne peut plus utiliser sa main</strong></li>
-      {{/if}}
+    <li>Défense de {{defenderName}} : {{defenderMode}} ({{defenderValue}})</li>

-      {{#if isCriticalSuccess}}
-      <Li>Critique : Aubaine ou +2 aux dégats ci-dessus</li>
-      {{/if}}
+    {{#if isSuccess}}
+    <li>Marge : {{marge}}</li>
+    <li>Degats de l'arme : {{degatsArme}}</li>
+
+    {{#if (eq attaqueCible "membre")}}
+    <li><strong>Cible un membre : La cible a -2 de malus sur ces actions avec ce membre (mouvement 2 si jambes)</strong>
+    </li>
+    {{/if}}
+    {{#if (eq attaqueCible "main")}}
+    <li><strong>Cible une main : La cible ne peut plus utiliser sa main</strong></li>
+    {{/if}}
+
+    {{#if isCriticalSuccess}}
+    <Li>Critique : Aubaine ou +2 aux dégats ci-dessus</li>
+    {{/if}}
    {{else}}
-      <li>Echec face à la {{defenderMode}} !</li>
+    <li>Echec face à la {{defenderMode}} !</li>
    {{/if}}

  </ul>
-</div>
+</div>
--- a/templates/chat-generic-result.html
+++ b/templates/chat-generic-result.html
@ -26,16 +26,16 @@

    {{#if competence}}
    <li>Compétence : {{competence.name}} ({{competence.system.niveau}})</li>
-      {{#if useSpecialite}}
-      <li>Bonus de spécialité +1</li>
-      {{/if}}
+    {{#if useSpecialite}}
+    <li>Bonus de spécialité +1</li>
+    {{/if}}
    {{/if}}

    {{#if arme}}
    <li>Attaque avec : {{arme.name}}</li>
-      {{#if (eq mode "assommer")}}
-      <li>Attaque pour assommer</li>
-      {{/if}}
+    {{#if (eq mode "assommer")}}
+    <li>Attaque pour assommer</li>
+    {{/if}}
    {{/if}}

    {{#if pouvoir}}
@ -50,44 +50,44 @@

    {{#if noRoll}}
    {{else}}
-      <li>Formule : {{diceFormula}}</li>
-      <li>Résultat du dé : {{diceResult}} </li>
+    <li>Formule : {{diceFormula}}</li>
+    <li>Résultat du dé : {{diceResult}} </li>

-      {{#if adjacentFaces}}
-        <li>Faces Adjacentes : 
-            {{#each adjacentFaces as |value key|}}
-              <a class="roll-tricherie-2" data-dice-value="{{value}}">{{value}}</a> 
-            {{/each}}
-        </li>
-      {{/if}}
-
-      <li>Total : {{finalResult}} {{#if (gt sdValue "-1")}}(Marge : {{marge}}){{/if}}</li>
-
-      
-      {{#if (gt sdValue "-1")}}
-      {{#if isSuccess}}
-      <li class="chat-success">Succès...
-      </li>
-      {{else}}
-      <li class="chat-failure">Echec...</li>
-      {{/if}}
-      {{/if}}
-
-      {{#if isBrelan}}
-      <li class="chat-success">Brelan sur 3 dés !</li>
-      {{/if}}
-      {{#if isSuite}}
-      <li class="chat-success">Suite sur 3 dés !</li>
-      {{/if}}
-
-      {{#if isCriticalSuccess}}
-      <li class="chat-success">Réussite Critique !!!</li>
-      {{/if}}
-      {{#if isCriticalFailure}}
-      <li class="chat-failure">Echec Critique !!!</li>
-      {{/if}}
+    {{#if adjacentFaces}}
+    <li>Faces Adjacentes :
+      {{#each adjacentFaces as |value key|}}
+      <a class="roll-tricherie-2" data-dice-value="{{value}}">{{value}}</a>
+      {{/each}}
+    </li>
    {{/if}}
-    
-  </ul>
-</div>

+    <li>Total : {{finalResult}} {{#if (gt sdValue "-1")}}(Marge : {{marge}}){{/if}}</li>
+
+
+    {{#if (gt sdValue "-1")}}
+    <li>Seuil de difficulté : {{sdValue}}</li>
+    {{#if isSuccess}}
+    <li class="chat-success">Succès...
+    </li>
+    {{else}}
+    <li class="chat-failure">Echec...</li>
+    {{/if}}
+    {{/if}}
+
+    {{#if isBrelan}}
+    <li class="chat-success">Brelan sur 3 dés !</li>
+    {{/if}}
+    {{#if isSuite}}
+    <li class="chat-success">Suite sur 3 dés !</li>
+    {{/if}}
+
+    {{#if isCriticalSuccess}}
+    <li class="chat-success">Réussite Critique !!!</li>
+    {{/if}}
+    {{#if isCriticalFailure}}
+    <li class="chat-failure">Echec Critique !!!</li>
+    {{/if}}
+    {{/if}}
+
+  </ul>
+</div>
--- a/templates/partial-list-niveau.html
+++ b/templates/partial-list-niveau.html
@ -1,11 +0,0 @@
-<option value="0">0</option>
-<option value="1">1</option>
-<option value="2">2</option>
-<option value="3">3</option>
-<option value="4">4</option>
-<option value="5">5</option>
-<option value="6">6</option>
-<option value="7">7</option>
-<option value="8">8</option>
-<option value="9">9</option>
-<option value="10">10</option>
--- a/templates/partial-utile-skills.html
+++ b/templates/partial-utile-skills.html
@ -1,46 +1,48 @@
-            <div class="sheet-box color-bg-archetype">
-              <ul class="item-list alternate-list">
-                <li class="item flexrow">
-                  {{#if isPNJ}}
-                    <span class="item-field-label-long roll-style">
-                      <a class="roll-root-competence item-field-label-short" data-attr-key="{{keyProfil}}">
-                        <h3><label class="items-title-text">{{upperFirst keyProfil}}</label></h3>
-                      </a>
-                    </span>
-                  {{else}}
-                    <span class="item-field-label-long">
-                      <h3><label class="items-title-text">{{upperFirst keyProfil}}</label></h3>
-                  </span>
-                  {{/if}}
+<div class="sheet-box color-bg-archetype">
+  <ul class="item-list alternate-list">
+    <li class="item flexrow">
+      {{#if isPNJ}}
+      <span class="item-field-label-long roll-style">
+        <a class="roll-root-competence item-field-label-short" data-attr-key="{{keyProfil}}">
+          <h3><label class="items-title-text">{{upperFirst keyProfil}}</label></h3>
+        </a>
+      </span>
+      {{else}}
+      <span class="item-field-label-long">
+        <h3><label class="items-title-text">{{upperFirst keyProfil}}</label></h3>
+      </span>
+      {{/if}}

-                  <span class="item-field-label-short">
-                    <label class="short-label">Niveau</label>
-                  </span>
-                  {{#if isPNJ}}
-                    <span class="item-field-label-short">
-                      <input type="text" data-dtype="Number" class="item-field-label-short" name="system.competences.{{keyProfil}}.niveau" value="{{skillDef.niveau}}">
-                    </span>
-                  {{/if}}
-                  <div class="item-filler">&nbsp;</div>
-                </li>
-                {{#each skillDef.skills as |skill key|}}
-                <li class="item flexrow " data-item-id="{{skill._id}}" data-item-type="competence">
-                  <span class="item-field-label-long roll-style"><a class="roll-competence item-field-label-short"
-                      data-attr-key="tochoose">{{skill.name}}</a></span>
-                  <select class="item-field-label-short edit-item-data" type="text"
-                    data-item-field="niveau" value="{{skill.system.niveau}}" data-dtype="Number">
-                    {{selectOptions @root.config.listNiveau selected=skill.system.niveau}}                        
-                  </select>
-                  <input type="checkbox" class="item-field-label-short edit-item-data" data-item-field="predilection" {{checked skill.system.predilection}}/>
-                  <div class="item-controls item-controls-fixed">
-                    <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 (count skill.specList)}}
-                    <span class="specialisarion-margin specialisation-label item-field-label-long2">{{skill.specList}}</span>
-                  {{/if}}
-    
-                {{/each}}
-              </ul>
-            </div>
+      <span class="item-field-label-short">
+        <label class="short-label">Niveau</label>
+      </span>
+      {{#if isPNJ}}
+      <span class="item-field-label-short">
+        <input type="text" data-dtype="Number" class="item-field-label-short"
+          name="system.competences.{{keyProfil}}.niveau" value="{{skillDef.niveau}}">
+      </span>
+      {{/if}}
+      <div class="item-filler">&nbsp;</div>
+    </li>
+    {{#each skillDef.skills as |skill key|}}
+    <li class="item flexrow " data-item-id="{{skill._id}}" data-item-type="competence">
+      <span class="item-field-label-long roll-style"><a class="roll-competence item-field-label-short"
+          data-attr-key="tochoose">{{skill.name}}</a></span>
+      <select class="item-field-label-short edit-item-data" type="text" data-item-field="niveau"
+        value="{{skill.system.niveau}}" data-dtype="Number">
+        {{selectOptions @root.config.listNiveau selected=skill.system.niveau}}
+      </select>
+      <input type="checkbox" class="item-field-label-short edit-item-data" data-item-field="predilection" {{checked
+        skill.system.predilection}} />
+      <div class="item-controls item-controls-fixed">
+        <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 (count skill.specList)}}
+    <span class="specialisarion-margin specialisation-label item-field-label-long2">{{skill.specList}}</span>
+    {{/if}}
+
+    {{/each}}
+  </ul>
+</div>
--- a/templates/roll-dialog-generic.html
+++ b/templates/roll-dialog-generic.html
@ -24,7 +24,7 @@
      <div class="flexrow">
        <span class="roll-dialog-label">Caracteristique</span>
        <select class="status-small-label color-class-common" id="caracKey" type="text" name="caracKey" value="caracKey" data-dtype="string" >
-          {{selectOptions caracList selected=caracKey labelAttr="label"}}                        
+          {{selectOptions caracList selected=caracKey valueAttr="abbrev" nameAttr="abbrev" labelAttr="label"}}                        
        </select>      
      </div>
    {{/if}}