From 8dea766540560e05ff74e10f92cb9f248391a62c Mon Sep 17 00:00:00 2001
From: Vincent Vandemeulebrouck <vincent.vandemeulebrouck@itiviti.com>
Date: Wed, 21 Apr 2021 20:43:03 +0200
Subject: [PATCH] =?UTF-8?q?Rework=20m=C3=A9ditation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 module/actor.js                       | 24 ++++---
 templates/dialog-roll-meditation.html | 99 ++++++++++++---------------
 2 files changed, 57 insertions(+), 66 deletions(-)

diff --git a/module/actor.js b/module/actor.js
index 54d52034..e1715786 100644
--- a/module/actor.js
+++ b/module/actor.js
@@ -2482,16 +2482,20 @@ export class RdDActor extends Actor {
 
     console.log("rollMeditation !!!", meditationData);
 
-    const dialog = await RdDRoll.create(this, meditationData, { html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-meditation.html' }, {
-      name: 'jet-meditation',
-      label: 'Jet de Meditation ' + meditation.name,
-      height: 600,
-      callbacks: [
-        this.createCallbackExperience(),
-        { condition: r => r.rolled.isETotal, action: r => this._meditationETotal(r) },
-        { action: r => this._meditationResult(r) }
-      ]
-    });
+    const dialog = await RdDRoll.create(this, meditationData,
+      {
+        html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-meditation.html',
+        options: { height: 575, }
+      },
+      {
+        name: 'jet-meditation',
+        label: "Jet de méditation",
+        callbacks: [
+          this.createCallbackExperience(),
+          { condition: r => r.rolled.isETotal, action: r => this._meditationETotal(r) },
+          { action: r => this._meditationResult(r) }
+        ]
+      });
     dialog.render(true);
   }
 
diff --git a/templates/dialog-roll-meditation.html b/templates/dialog-roll-meditation.html
index 63475128..8e69969c 100644
--- a/templates/dialog-roll-meditation.html
+++ b/templates/dialog-roll-meditation.html
@@ -1,61 +1,48 @@
 <form class="dialog-roll-meditation">
- <div class="form-group">
-  <ul class="item-list">
-    <li class="item flexrow">
-      <label><strong>Thème : {{meditation.data.theme}} </strong></label>
-      <label>Intellect {{numberFormat carac.intellect.value decimals=0 sign=false}} / {{competence.name}} {{numberFormat competence.data.niveau decimals=0 sign=true}}</label>
-    </li>
-    <li class="item flexrow">
-      <label>Sujet : {{competence.name}} ({{meditation.data.theme}})</label>
-      <label>Durée : 60 minutes</label>
-    </li>
-    <li class="item flexrow">
-      <label>Support : {{meditation.data.support}}</label>
-      <label>Malus spécial : {{meditation.data.malus}}</label>
-    </li>
-    <li class="item flexrow"><label>Case TMR : {{meditation.data.tmr}}</label></li>
-  </ul>
-</div>
+  <h2>{{meditation.name}}</h2>
+  <div class="grid grid-2col">
+    <div class="flex-group-left">
+      <img class="chat-icon" src="{{competence.img}}" alt="{{competence.name}}" />
+      <div class="flexcol">
+        <label><strong>{{meditation.data.theme}}</strong></label>
+        <hr>
+        <label>Support: <strong>{{upperFirst meditation.data.support}}</strong></label>
+        <label>Case TMR: <strong>{{upperFirst meditation.data.tmr}}</strong></label>
+        <label>Durée: 60 minutes</label>
+        <hr>
+        <label>Intellect / {{competence.name}}:
+          {{numberFormat carac.intellect.value decimals=0 sign=false}} / {{numberFormat competence.data.niveau decimals=0 sign=true}}</label>
+      </div>
+    </div>
+    <div class="flex-group-left">
+      <div class="flexrow">
+        <label><strong>Conditions Optionnelles : </strong></label>
+      </div>
+      <div class="flexrow">
+        <label>Comportement antérieur : {{upperFirst meditation.data.comportement}}</label>
+        <input class="attribute-value conditionMeditation" type="checkbox" id="isComportement" {{#if conditionMeditation.isComportement}}checked{{/if}} />
+      </div>
+      <div class="flexrow">
+        <label>Heure : {{upperFirst meditation.data.heure}}</label>
+        <input class="attribute-value conditionMeditation" type="checkbox" id="isHeure" {{#if conditionMeditation.isHeure}}checked{{/if}} />
+      </div>
+      <div class="flexrow">
+        <label>Purification : {{upperFirst meditation.data.purification}}</label>
+        <input class="attribute-value conditionMeditation" type="checkbox" id="isPurification" {{#if conditionMeditation.isPurification}}checked{{/if}} />
+      </div>
+      <div class="flexrow">
+        <label>Vêture : {{upperFirst meditation.data.veture}}</label>
+        <input class="attribute-value conditionMeditation" type="checkbox" id="isVeture" {{#if conditionMeditation.isVeture}}checked{{/if}} />
+      </div>
+      <hr>
+      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html"}}
+      <div id="tableAjustements"></div>
+    </div>
+  </div>
 
-<div class="form-group">
-  <label class="h4"><strong>Conditions Optionnelles : </strong></label>
-</div>
-<div class="form-group">
-  <ul class="item-list">
-  <li class="item flexrow">
-    <label>Heure : {{meditation.data.heure}}</label>
-    <input class="attribute-value conditionMeditation" type="checkbox" id="isHeure" {{#if conditionMeditation.isHeure}}checked{{/if}}/>    
-  </li>
-  <li class="item flexrow">
-    <label>Purification : {{meditation.data.purification}}</label>
-    <input class="attribute-value conditionMeditation" type="checkbox" id="isPurification" {{#if conditionMeditation.isPurification}}checked{{/if}}/>    
-  </li>
-  <li class="item flexrow">
-    <label>Vêture : {{meditation.data.veture}}</label>
-    <input class="attribute-value conditionMeditation" type="checkbox" id="isVeture" {{#if conditionMeditation.isVeture}}checked{{/if}}/>    
-  </li>
-  <li class="item flexrow">
-    <label>Comportement antérieur : {{meditation.data.comportement}}</label>
-    <input class="attribute-value conditionMeditation" type="checkbox" id="isComportement" {{#if conditionMeditation.isComportement}}checked{{/if}}/>    
-  </li>
-</ul>
-
-</div>
-  <label>Conditions supplémentaires : </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 id="tableAjustements">
-</div>
-<div id="tableResolution"></div>
-<div id="tableProbaReussite"></div>
+  <div id="tableResolution"></div>
+  <div id="tableProbaReussite"></div>
 </form>
 
 <script>
-</script>
+</script>
\ No newline at end of file