From b663560b533a22006bc71bf7cc8137f43b055a78 Mon Sep 17 00:00:00 2001
From: Vincent Vandemeulebrouck <vincent.vandemeulebrouck@itiviti.com>
Date: Wed, 21 Apr 2021 22:02:17 +0200
Subject: [PATCH] Rework cuisine

---
 module/actor.js                           | 26 ++++----
 templates/dialog-roll-recettecuisine.html | 74 ++++++++++-------------
 2 files changed, 47 insertions(+), 53 deletions(-)

diff --git a/module/actor.js b/module/actor.js
index e1715786..677fea6f 100644
--- a/module/actor.js
+++ b/module/actor.js
@@ -2335,16 +2335,20 @@ export class RdDActor extends Actor {
 
     console.log("rollArt !!!", artData);
 
-    const dialog = await RdDRoll.create(this, artData, { html: `systems/foundryvtt-reve-de-dragon/templates/dialog-roll-${artData.art}.html` }, {
-      name: `jet-${artData.art}`,
-      label: `${artData.verbe} ${oeuvre.name}`,
-      height: 600,
-      callbacks: [
-        this.createCallbackExperience(),
-        this.createCallbackAppelAuMoral(),
-        { action: r => callBackResult(r) }
-      ]
-    });
+    const dialog = await RdDRoll.create(this, artData,
+      {
+        html: `systems/foundryvtt-reve-de-dragon/templates/dialog-roll-${oeuvre.type}.html`,
+        options: { height: 500, }
+      },
+      {
+        name: `jet-${artData.art}`,
+        label: `${artData.verbe} ${oeuvre.name}`,
+        callbacks: [
+          this.createCallbackExperience(),
+          this.createCallbackAppelAuMoral(),
+          { action: r => callBackResult(r) }
+        ]
+      });
     dialog.render(true);
   }
 
@@ -2396,13 +2400,13 @@ export class RdDActor extends Actor {
 
   /* -------------------------------------------- */
   async rollRecetteCuisine(id) {
+    const oeuvre = Misc.data(this.getRecetteCuisine(id));
     const artData = {
       art: 'cuisine',
       verbe: 'Cuisiner',
       proportions: 1,
       ajouterEquipement: false
     };
-    const oeuvre = Misc.data(this.getRecetteCuisine(id));
     await this._rollArt(artData, 'odoratgout', oeuvre, r => this._resultRecetteCuisine(r));
   }
 
diff --git a/templates/dialog-roll-recettecuisine.html b/templates/dialog-roll-recettecuisine.html
index 8ad1d093..a8316dbb 100644
--- a/templates/dialog-roll-recettecuisine.html
+++ b/templates/dialog-roll-recettecuisine.html
@@ -1,54 +1,44 @@
 <form class="rdddialog">
+  <h2 class="tooltip" style="width: 100%;">Cuisiner: {{oeuvre.name}}
+    <div class="tooltiptext ttt-titre">
+      {{> "systems/foundryvtt-reve-de-dragon/templates/chat-poesie.html" oeuvre.data}}
+    </div>
+  </h2>
+    
   <div class="grid grid-2col">
     <div class="flex-group-left">
-      <ul>
-        <li><label>Cuisiner : {{oeuvre.name}}</label></li>
-        <li><label>Jet : ODORAT-GOUT / {{competence.name}}</label></li>
-        <li><label>Exotisme : {{oeuvre.data.exotisme}}</label></li>
-      </ul>
+      <img class="chat-icon" src="{{competence.img}}" alt="{{competence.name}}" />
+      <div>
+        <div class="flexrow">
+          <label>Caractéristique: </label><label>{{selectedCarac.label}}</label>
+        </div>
+        <div class="flexrow">
+          <label>{{competence.name}}: </label><label>{{numberFormat competence.data.niveau decimals=0 sign=true}}</label></label>
+        </div>
+        <div class="flexrow">
+          <label>Exotisme: </label><label>{{oeuvre.data.exotisme}}</label>
+        </div>
+        <div class="flexrow">
+          <label for="proportions">Proportions: </label>
+          <input class="cuisine-proportions" type="number" size="4" name="proportions" value="{{proportions}}" data-dtype="Number" />
+        </div>
+        <div class="flexrow">
+          <label for="ajouterEquipement">Ajouter à l'équipement</label>
+          <input class="checkbox-by-name" type="checkbox" name="ajouterEquipement" {{#if ajouterEquipement}}checked{{/if}} />
+        </div>
+      </div>
     </div>
     <div class="flex-group-left">
       <div class="flexrow">
-        <label class="competence-label">Multiplier les proportions</label>
-        <input class="competence-value cuisine-proportions" type="number" size="4" name="proportions" value="{{proportions}}" data-dtype="Number" />
-        
-      </div>
-      <div class="flexrow">
-        <label class="competence-label">Ajouter à l'équipement</label>
-        <input class="checkbox-by-name" type="checkbox" name="ajouterEquipement" {{#if ajouterEquipement}}checked{{/if}} />
+        <label>Difficulté</label>
+        <label>{{numberFormat diffLibre decimals=0 sign=true}}</label>
       </div>
+      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html"}}
+      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-moral.html"}}
+      <div id="tableAjustements" class="flexrow"></div>
     </div>
   </div>
-  <div class="grid grid-3col">
-    <div class="flex-group-left">
-      <label>Conditions</label>
-      <select name="diffConditions" id="diffConditions" data-dtype="number">
-        {{#select diffConditions}}
-        {{#each ajustementsConditions as |key|}}
-        <option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option>
-        {{/each}}
-        {{/select}}
-      </select>
-    </div>
-    <div class="flex-group-left">
-      <label>Difficulté</label>
-      <select name="diffLibre" id="diffLibre" data-dtype="number">
-        {{#select diffLibre}}
-        {{#each difficultesLibres as |key|}}
-        <option value={{key}}>{{numberFormat key decimals=0 sign=true}}</option>
-        {{/each}}
-        {{/select}}
-      </select>
-    </div>
-    <div class="flex-group-right flexrow">
-      <div class="tooltipAppelAuMoral divAppelAuMoral">
-        <img class="imgAppelAuMoral small-button-container" src="/systems/foundryvtt-reve-de-dragon/icons/moral-neutre.svg">
-        <span class="tooltipAppelAuMoralText">Sans appel au moral</span>
-      </div>
-    </div>
-  </div>
-  <div id="tableAjustements">
-  </div>
+
   <div id="tableResolution"></div>
   <div id="tableProbaReussite"></div>
 </form>