From f7763483439dcbfb27d3c01ba5ec3c89b732f1c4 Mon Sep 17 00:00:00 2001
From: Vincent Vandemeulebrouck <vincent.vandemeulebrouck@itiviti.com>
Date: Sat, 30 Oct 2021 01:34:57 +0200
Subject: [PATCH] =?UTF-8?q?Am=C3=A9lioration=20templates=20partial?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

partial-roll-diffFixe pour les difficultés choisies
partial-roll-diffFixe pour les difficultés imposées
partial-roll-forcer pour forcer le résultat du jet

renommage dialog-roll-competence
---
 module/actor.js                                   |  4 ++--
 module/rdd-combat.js                              |  6 +++---
 module/rdd-utility.js                             |  4 +++-
 templates/dialog-roll-alchimie.html               |  6 ++----
 templates/dialog-roll-carac.html                  |  1 +
 templates/dialog-roll-chant.html                  |  6 ++----
 ...ompetence.html => dialog-roll-competence.html} | 15 +++------------
 templates/dialog-roll-danse.html                  |  7 +++----
 templates/dialog-roll-jeu.html                    |  1 +
 templates/dialog-roll-maitrise-tmr.html           |  6 ++----
 templates/dialog-roll-meditation.html             |  1 +
 templates/dialog-roll-musique.html                |  6 ++----
 templates/dialog-roll-oeuvre.html                 |  6 ++----
 templates/dialog-roll-recettecuisine.html         |  6 ++----
 templates/dialog-roll-reve-de-dragon.html         |  6 ++----
 templates/dialog-roll-signedraconique.html        |  6 ++----
 templates/dialog-roll-sort.html                   |  3 ++-
 templates/partial-roll-diffFixe.html              |  4 ++++
 templates/partial-roll-diffLibre.html             |  2 +-
 templates/partial-roll-forcer.html                |  6 ++++++
 20 files changed, 46 insertions(+), 56 deletions(-)
 rename templates/{dialog-competence.html => dialog-roll-competence.html} (88%)
 create mode 100644 templates/partial-roll-diffFixe.html
 create mode 100644 templates/partial-roll-forcer.html

diff --git a/module/actor.js b/module/actor.js
index c8dc3a9f..5c9849fa 100644
--- a/module/actor.js
+++ b/module/actor.js
@@ -2494,7 +2494,7 @@ export class RdDActor extends Actor {
     }
     console.log("rollCompetence !!!", rollData);
 
-    const dialog = await RdDRoll.create(this, rollData, { html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-competence.html' }, {
+    const dialog = await RdDRoll.create(this, rollData, { html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-competence.html' }, {
       name: 'jet-competence',
       label: 'Jet ' + Grammar.apostrophe('de', name),
       callbacks: [
@@ -2556,7 +2556,7 @@ export class RdDActor extends Actor {
 
     console.log("rollTache !!!", rollData);
 
-    const dialog = await RdDRoll.create(this, rollData, { html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-competence.html' }, {
+    const dialog = await RdDRoll.create(this, rollData, { html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-competence.html' }, {
       name: 'jet-competence',
       label: 'Jet de Tâche ' + tacheData.name,
       callbacks: [
diff --git a/module/rdd-combat.js b/module/rdd-combat.js
index fb02808c..c0c361cf 100644
--- a/module/rdd-combat.js
+++ b/module/rdd-combat.js
@@ -747,7 +747,7 @@ export class RdDCombat {
 
     const dialog = await RdDRoll.create(this.attacker, rollData,
       {
-        html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-competence.html',
+        html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-competence.html',
         options: { height: 540 }
       }, {
       name: 'jet-attaque',
@@ -1000,7 +1000,7 @@ export class RdDCombat {
 
     const dialog = await RdDRoll.create(this.defender, rollData,
       {
-        html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-competence.html',
+        html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-competence.html',
         options: { height: 540 }
       }, {
       name: 'jet-parade',
@@ -1088,7 +1088,7 @@ export class RdDCombat {
     let rollData = this._prepareEsquive(attackerRoll, esquive);
 
     const dialog = await RdDRoll.create(this.defender, rollData,
-      { html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-competence.html' }, {
+      { html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-competence.html' }, {
       name: 'jet-esquive',
       label: 'Esquiver',
       callbacks: [
diff --git a/module/rdd-utility.js b/module/rdd-utility.js
index 59c24956..4322b752 100644
--- a/module/rdd-utility.js
+++ b/module/rdd-utility.js
@@ -164,7 +164,7 @@ export class RdDUtility {
       'systems/foundryvtt-reve-de-dragon/templates/casetmr-specific-list.html',
       // Dialogs
       'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-resolution.html',
-      'systems/foundryvtt-reve-de-dragon/templates/dialog-competence.html',
+      'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-competence.html',
       'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-carac.html',
       'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-sort.html',
       'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-encaisser.html',
@@ -177,10 +177,12 @@ export class RdDUtility {
       'systems/foundryvtt-reve-de-dragon/templates/partial-description-sort.html',
       'systems/foundryvtt-reve-de-dragon/templates/partial-roll-ajustements.html',
       'systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffLibre.html',
+      'systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffFixe.html',
       'systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html',
       'systems/foundryvtt-reve-de-dragon/templates/partial-roll-surenc.html',
       'systems/foundryvtt-reve-de-dragon/templates/partial-roll-enctotal.html',
       'systems/foundryvtt-reve-de-dragon/templates/partial-roll-moral.html',
+      'systems/foundryvtt-reve-de-dragon/templates/partial-roll-forcer.html',
       'systems/foundryvtt-reve-de-dragon/templates/partial-select-carac.html',
       'systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html',
       // Calendrier
diff --git a/templates/dialog-roll-alchimie.html b/templates/dialog-roll-alchimie.html
index d6001a79..5e6f8133 100644
--- a/templates/dialog-roll-alchimie.html
+++ b/templates/dialog-roll-alchimie.html
@@ -10,10 +10,7 @@
       </div>
     </div>
     <div class="flex-group-left">
-      <div class="flexrow">
-        <label>Difficulté</label>
-        <label>{{numberFormat diffLibre decimals=0 sign=true}}</label>
-      </div>
+      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffFixe.html"}}
       {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html"}}
       {{#if alchimie.sansCristal}}
       <div class="flexrow">
@@ -21,6 +18,7 @@
         <label>(-4 sans Cristal Alchimique)</label>
       </div>
       {{/if}}
+      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-forcer.html"}}
       {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-moral.html"}}
       <div id="tableAjustements" class="flexrow"></div>
     </div>
diff --git a/templates/dialog-roll-carac.html b/templates/dialog-roll-carac.html
index 8d510bba..89c454ab 100644
--- a/templates/dialog-roll-carac.html
+++ b/templates/dialog-roll-carac.html
@@ -10,6 +10,7 @@
     <div class="flex-group-left">
       {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffLibre.html"}}
       {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html"}}
+      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-forcer.html"}}
       {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-moral.html"}}
       <div id="tableAjustements" class="flexrow"></div>
     </div>
diff --git a/templates/dialog-roll-chant.html b/templates/dialog-roll-chant.html
index df2482cb..8f72f568 100644
--- a/templates/dialog-roll-chant.html
+++ b/templates/dialog-roll-chant.html
@@ -11,11 +11,9 @@
       {{> "systems/foundryvtt-reve-de-dragon/templates/partial-description-overflow.html" oeuvre.data}}
     </div>
     <div class="flex-group-left">
-      <div class="flexrow">
-        <label>Difficulté</label>
-        <label>{{numberFormat diffLibre decimals=0 sign=true}}</label>
-      </div>
+      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffFixe.html"}}
       {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html"}}
+      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-forcer.html"}}
       {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-moral.html"}}
       <div id="tableAjustements" class="flexrow"></div>
     </div>
diff --git a/templates/dialog-competence.html b/templates/dialog-roll-competence.html
similarity index 88%
rename from templates/dialog-competence.html
rename to templates/dialog-roll-competence.html
index f298cf8a..86d26d22 100644
--- a/templates/dialog-competence.html
+++ b/templates/dialog-roll-competence.html
@@ -60,25 +60,16 @@
 
       {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-surenc.html"}}
       {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-enctotal.html"}}
-    
-      {{#if isGM}}
-      <div>
-        <span><label>Forcer le résultat : </label><input name='force-dice--result' id='force-dice-result' value='{{forceDiceResult}}'></span>
-      </div>
-      {{/if}}
-
     </div>
     
     <div class="flex-group-left">
       {{#if attackerRoll}}
-      <div class="flexrow">
-        <label>Difficulté</label>
-        <label>{{diffLibre}}</label>
-      </div>
+      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffFixe.html"}}
       {{else}}
-        {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffLibre.html"}}
+      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffLibre.html"}}
       {{/if}}
       {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html"}}
+      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-forcer.html"}}
       {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-moral.html"}}
       <div id="tableAjustements" class="flexrow"></div>
     </div>
diff --git a/templates/dialog-roll-danse.html b/templates/dialog-roll-danse.html
index d9507232..65d3376e 100644
--- a/templates/dialog-roll-danse.html
+++ b/templates/dialog-roll-danse.html
@@ -11,12 +11,11 @@
       {{> "systems/foundryvtt-reve-de-dragon/templates/partial-description-overflow.html" oeuvre.data}}
     </div>
     <div class="flex-group-left">
-      <div class="flexrow">
-        <label>Difficulté</label>
-        <label>{{numberFormat diffLibre decimals=0 sign=true}}</label>
-      </div>
+      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffFixe.html"}}
       {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html"}}
+      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-forcer.html"}}
       {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-moral.html"}}
+
       <div id="tableAjustements" class="flexrow"></div>
     </div>
   </div>
diff --git a/templates/dialog-roll-jeu.html b/templates/dialog-roll-jeu.html
index 1318700d..049a1512 100644
--- a/templates/dialog-roll-jeu.html
+++ b/templates/dialog-roll-jeu.html
@@ -14,6 +14,7 @@
     <div class="flex-group-left">
       {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffLibre.html"}}
       {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html"}}
+      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-forcer.html"}}
       {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-moral.html"}}
       <div id="tableAjustements" class="flexrow"></div>
     </div>
diff --git a/templates/dialog-roll-maitrise-tmr.html b/templates/dialog-roll-maitrise-tmr.html
index feef2c21..7408b24d 100644
--- a/templates/dialog-roll-maitrise-tmr.html
+++ b/templates/dialog-roll-maitrise-tmr.html
@@ -9,11 +9,9 @@
       </div>
     </div>
     <div class="flex-group-left">
-      <div class="flexrow">
-        <label>Difficulté</label>
-        <label>{{numberFormat diffLibre decimals=0 sign=true}}</label>
-      </div>
+      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffFixe.html"}}
       {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html"}}
+      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-forcer.html"}}
       <div id="tableAjustements" class="flexrow"></div>
     </div>
   </div>
diff --git a/templates/dialog-roll-meditation.html b/templates/dialog-roll-meditation.html
index 918e0315..718ae819 100644
--- a/templates/dialog-roll-meditation.html
+++ b/templates/dialog-roll-meditation.html
@@ -36,6 +36,7 @@
       </div>
       <hr>
       {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html"}}
+      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-forcer.html"}}
       <div id="tableAjustements"></div>
     </div>
   </div>
diff --git a/templates/dialog-roll-musique.html b/templates/dialog-roll-musique.html
index 6455e3d1..b93161f1 100644
--- a/templates/dialog-roll-musique.html
+++ b/templates/dialog-roll-musique.html
@@ -11,11 +11,9 @@
       {{> "systems/foundryvtt-reve-de-dragon/templates/partial-description-overflow.html" oeuvre.data}}
     </div>
     <div class="flex-group-left">
-      <div class="flexrow">
-        <label>Difficulté</label>
-        <label>{{numberFormat diffLibre decimals=0 sign=true}}</label>
-      </div>
+      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffFixe.html"}}
       {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html"}}
+      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-forcer.html"}}
       {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-moral.html"}}
       <div id="tableAjustements" class="flexrow"></div>
     </div>
diff --git a/templates/dialog-roll-oeuvre.html b/templates/dialog-roll-oeuvre.html
index 45d23f49..1a0c26db 100644
--- a/templates/dialog-roll-oeuvre.html
+++ b/templates/dialog-roll-oeuvre.html
@@ -12,11 +12,9 @@
       {{> "systems/foundryvtt-reve-de-dragon/templates/partial-description-overflow.html" oeuvre.data}}
     </div>
     <div class="flex-group-left">
-      <div class="flexrow">
-        <label>Difficulté</label>
-        <label>{{numberFormat diffLibre decimals=0 sign=true}}</label>
-      </div>
+      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffFixe.html"}}
       {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html"}}
+      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-forcer.html"}}
       {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-moral.html"}}
       <div id="tableAjustements" class="flexrow"></div>
     </div>
diff --git a/templates/dialog-roll-recettecuisine.html b/templates/dialog-roll-recettecuisine.html
index ab977783..394ff935 100644
--- a/templates/dialog-roll-recettecuisine.html
+++ b/templates/dialog-roll-recettecuisine.html
@@ -25,11 +25,9 @@
       </div>
     </div>
     <div class="flex-group-left">
-      <div class="flexrow">
-        <label>Difficulté</label>
-        <label>{{numberFormat diffLibre decimals=0 sign=true}}</label>
-      </div>
+      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffFixe.html"}}
       {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html"}}
+      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-forcer.html"}}
       {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-moral.html"}}
       <div id="tableAjustements" class="flexrow"></div>
     </div>
diff --git a/templates/dialog-roll-reve-de-dragon.html b/templates/dialog-roll-reve-de-dragon.html
index 4f7857a3..5e93afda 100644
--- a/templates/dialog-roll-reve-de-dragon.html
+++ b/templates/dialog-roll-reve-de-dragon.html
@@ -9,11 +9,9 @@
       </div>
     </div>
     <div class="flex-group-left">
-      <div class="flexrow">
-        <label>Difficulté</label>
-        <label>{{numberFormat diffLibre decimals=0 sign=true}}</label>
-      </div>
+      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffFixe.html"}}
       {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html"}}
+      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-forcer.html"}}
       <div id="tableAjustements" class="flexrow"></div>
     </div>
   </div>
diff --git a/templates/dialog-roll-signedraconique.html b/templates/dialog-roll-signedraconique.html
index b9de46d9..c790fe6b 100644
--- a/templates/dialog-roll-signedraconique.html
+++ b/templates/dialog-roll-signedraconique.html
@@ -31,11 +31,9 @@
           {{/select}}
         </select>
       </div>
-      <div class="flexrow">
-        <label>Difficulté</label>
-        <label class="signe-difficulte">{{diffLibre}}</label>
-      </div>
+      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffFixe.html"}}
       {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html"}}
+      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-forcer.html"}}
       <div id="tableAjustements" class="flexrow"></div>
     </div>
   </div>
diff --git a/templates/dialog-roll-sort.html b/templates/dialog-roll-sort.html
index e5e75302..920b4bf7 100644
--- a/templates/dialog-roll-sort.html
+++ b/templates/dialog-roll-sort.html
@@ -48,7 +48,7 @@
         </select>
       </div>
       <div class="flexrow">
-        <label for="diffLibre">Difficulté </label>
+        <label for="diffLibre">Difficulté</label>
         <select name="diffLibre" class="div-sort-difficulte-var" id="diffLibre" data-dtype="number">
           {{#select diffLibre}}
           {{#each difficultesLibres as |key|}}
@@ -59,6 +59,7 @@
         <label class="div-sort-difficulte-fixe">{{numberFormat selectedSort.data.difficulte decimals=0 sign=true}}</label>
       </div>
       {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html"}}
+      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-forcer.html"}}
       <div class="flexrow">
         <label for="bonus-case">Bonus de case </label>
         <label name="bonus-case" class="bonus-case">0%</label>
diff --git a/templates/partial-roll-diffFixe.html b/templates/partial-roll-diffFixe.html
new file mode 100644
index 00000000..25edb580
--- /dev/null
+++ b/templates/partial-roll-diffFixe.html
@@ -0,0 +1,4 @@
+<div class="flexrow">
+  <label>Difficulté imposée</label>
+  <label>{{numberFormat diffLibre decimals=0 sign=true}}</label>
+</div>
diff --git a/templates/partial-roll-diffLibre.html b/templates/partial-roll-diffLibre.html
index 544a7bb5..a20fb4b3 100644
--- a/templates/partial-roll-diffLibre.html
+++ b/templates/partial-roll-diffLibre.html
@@ -1,5 +1,5 @@
 <div class="flexrow">
-  <label for="diffLibre">Difficulté libre</label>
+  <label for="diffLibre">Difficulté choisie</label>
   <select name="diffLibre" id="diffLibre" data-dtype="number" {{#unless use.libre}}disabled{{/unless}}>
     {{#select diffLibre}}
     {{#each difficultesLibres as |key|}}
diff --git a/templates/partial-roll-forcer.html b/templates/partial-roll-forcer.html
new file mode 100644
index 00000000..db50a91d
--- /dev/null
+++ b/templates/partial-roll-forcer.html
@@ -0,0 +1,6 @@
+{{#if isGM}}
+<div class="flexrow">
+  <label for="force-dice-result">Résultat du dé</label>
+  <input name='force-dice-result' id='force-dice-result' value='{{forceDiceResult}}'>
+</div>
+{{/if}}