Liste des ajustements

Après le travail sur les ChatMessage, centraliser les difficultés pour
les dialog-roll afin d'afficher tous les ajustements sous forme de
tooltips

Les ajustements à améliorer:
* malus armure
* sur-encombrement
* encombrement total

+ fix regression tâches
+ fix méditation isisPuritication

templates/chat-infojet.html

@@ -4,6 +4,7 @@
     {{#if ajustements}}
     <div class="tooltiptext ttt-ajustements">
       {{#each ajustements as |item key|}}
+      {{#if item.used}}
       <div class="{{#if item.strong}}strong-text{{/if}}">
         {{#if item.descr}}
         {{{item.descr}}}
@@ -11,6 +12,7 @@
         {{item.label}}: {{numberFormat item.value decimals=0 sign=true}}
         {{/if}}
       </div>
+      {{/if}}
       {{/each}}
     </div>
     {{/if}}

templates/chat-resultat-attaque.html

@@ -1,5 +1,5 @@
 <h4>{{alias}} attaque: {{arme.name}}</h4>
-<div>{{selectedCarac.label}} / {{competence.name}}, difficulté {{diffLibre}}</div>
+<div>{{selectedCarac.label}}{{#unless (eq selectedCarac.label competence.name)}} / {{competence.name}}{{/unless}}, difficulté {{diffLibre}}</div>
 {{> "systems/foundryvtt-reve-de-dragon/templates/chat-infojet.html"}}
 <hr>
 {{#if tactique}}

templates/chat-resultat-competence.html

@@ -1,7 +1,9 @@
 <h4>
   {{alias}} {{show.title}}:
   {{#if selectedCarac}}{{selectedCarac.label}}
-    {{#if competence}} / {{competence.name}}{{/if}}
+    {{#if competence}}
+    {{#unless (eq selectedCarac.label competence.name)}} / {{competence.name}}{{/unless}}     / {{competence.name}}
+    {{/if}}
   {{/if}}
 </h4>
 {{> "systems/foundryvtt-reve-de-dragon/templates/chat-infojet.html"}}

templates/chat-resultat-esquive.html

@@ -1,5 +1,5 @@
-<h4>{{alias}} esquive</h4>
-<div>{{selectedCarac.label}} / {{competence.name}} attaque à  {{diffLibre}}</div>
+<h4>{{alias}} esquive une attaque à {{diffLibre}}</h4>
+<div>{{selectedCarac.label}}{{#unless (eq selectedCarac.label competence.name)}} / {{competence.name}}{{/unless}}</div>
 {{> "systems/foundryvtt-reve-de-dragon/templates/chat-infojet.html"}}
 <hr>
 <div>

templates/chat-resultat-general.html

@@ -1,7 +1,7 @@
 <h4>
   {{alias}} {{#if show.title}}{{show.title}}: {{/if}}
   {{#if selectedCarac}}{{selectedCarac.label}}
-    {{#if competence}} / {{competence.name}}{{/if}}
+    {{#if competence}}{{#unless (eq selectedCarac.label competence.name)}} / {{competence.name}}{{/unless}}{{/if}}
     à {{diffLibre}}
   {{/if}}
 </h4>

templates/chat-resultat-parade.html

@@ -1,5 +1,5 @@
-<h4>{{alias}} pare: {{arme.name}}</h4>
-<div>{{selectedCarac.label}} / {{competence.name}}, attaque à {{diffLibre}}</div>
+<h4>{{alias}} pare une attaque à {{diffLibre}} - {{arme.name}}</h4>
+<div>{{selectedCarac.label}}{{#unless (eq selectedCarac.label competence.name)}} / {{competence.name}}{{/unless}}</div>
 {{> "systems/foundryvtt-reve-de-dragon/templates/chat-infojet.html"}}
 <hr>
 <div>

templates/dialog-competence.html

@@ -59,18 +59,15 @@
     {{/if}}
   </div>
 {{/if}}
-<div class="form-group">
-  <label for="categorie">Ajustements</label>
-  <label for="categorie">Etat général: {{numberFormat etat decimals=0 sign=true}}</label>
-  <label for="categorie" id="ajust-astrologique">Astrologique: {{numberFormat ajustementAstrologique decimals=0 sign=true}}</label>
-  <label>Final: <label id="roll-param">10 / 0</label>&nbsp;&nbsp;&nbsp;<label name="addon-message" id="addon-message"></label></label>
-</div>
 
 {{>"systems/foundryvtt-reve-de-dragon/templates/dialog-roll-surenc.html"}}
 {{>"systems/foundryvtt-reve-de-dragon/templates/dialog-roll-enctotal.html"}}
-<div id="resolutionTable">  
+
+<div id="tableAjustements">
 </div>
-<div id="resolutionValeurs">  
+<div id="tableResolution">
+</div>
+<div id="tableProbaReussite">  
 </div>
 
 </form>

templates/dialog-roll-ajustements.html

@@ -0,0 +1,19 @@
+<div class="table-ajustement">
+  <label class="tooltip">
+    <span>Ajustement Final:</span>
+    <span id="roll-param">{{selectedCarac.value}} / {{numberFormat finalLevel decimals=0 sign=true}}</span>
+    <div class="tooltiptext ttt-ajustements">
+      {{#each ajustements as |item key|}}
+      {{#if item.used}}
+      <div class="{{#if item.strong}}strong-text{{/if}}">
+        {{#if item.descr}}
+        {{{item.descr}}}
+        {{else}}
+        {{item.label}}: {{numberFormat item.value decimals=0 sign=true}}
+        {{/if}}
+      </div>
+      {{/if}}
+      {{/each}}
+    </div>
+  </label>
+</div>

templates/dialog-roll-carac.html

@@ -20,15 +20,11 @@
   <label class="diffMoral" for="categorie">Moral: {{#if (gt moral 0)}}+{{/if}}{{moral}}</label>
 </div>
 {{>"systems/foundryvtt-reve-de-dragon/templates/dialog-roll-surenc.html"}}
-<div class="form-group">
-  <label for="categorie">Ajustements</label>
-  <label for="categorie" id="etat-general">Etat général: {{numberFormat etat decimals=0 sign=true}}</label>
-  <label for="categorie" id="ajust-astrologique">Astrologique: {{numberFormat ajustementAstrologique decimals=0 sign=true}}</label>
-  <label>Final: <label id="roll-param">10 / 0</label>&nbsp;&nbsp;&nbsp;<label name="addon-message" id="addon-message"></label></label>
+<div id="tableAjustements">
 </div>
-<div id="resolutionTable">  
+<div id="tableResolution">
 </div>
-<div id="resolutionValeurs">  
+<div id="tableProbaReussite">  
 </div>
 </form>
 

templates/dialog-roll-enctotal.html

@@ -1,6 +1,7 @@
-{{#if isMalusEncombrementTotal}}
+{{#if ajustements.encTotal.visible}}
 <div class="form-group">
-  <label for="xp">Appliquer l'encombrement total comme malus (-{{encTotal}} ) ? </label>
-  <input class="attribute-value" type="checkbox" id="useMalusEncTotal" name="useMalusEncTotal"  {{#if useMalusEncTotal}}checked{{/if}}/>
+  <label>Appliquer l'encombrement total comme malus ({{encTotal}}) ? </label>
+  <input class="attribute-value" type="checkbox" id="ajustements-encTotal-apply"
+   name="ajustements.encTotal.apply"  {{#if ajustements.encTotal.apply}}checked{{/if}}/>
 </div>
 {{/if}}

templates/dialog-roll-ethylisme.html

@@ -21,9 +21,9 @@
     <label>Ajustement final : <label id="roll-param">10 / 0</label>&nbsp;&nbsp;&nbsp;<label name="addon-message" id="addon-message"></label></label>
   </div>
   
-  <div id="resolutionTable">
+  <div id="tableResolution">
   </div>
-  <div id="resolutionValeurs">  
+  <div id="tableProbaReussite">  
   </div>
   
 </form>

templates/dialog-roll-meditation.html

@@ -24,19 +24,19 @@
   <ul class="item-list">
   <li class="item flexrow">
     <label for="categorie">Heure : {{meditation.data.heure}}</label>
-    <input class="attribute-value" type="checkbox" id="isHeure" name="isHeure"  {{#if isHeure}}checked{{/if}}/>    
+    <input class="attribute-value conditionMeditation" type="checkbox" id="isHeure" {{#if conditionMeditation.isHeure}}checked{{/if}}/>    
   </li>
   <li class="item flexrow">
     <label for="categorie">Purification : {{meditation.data.purification}}</label>
-    <input class="attribute-value" type="checkbox" id="isPurification" name="isPurification"  {{#if isPurification}}checked{{/if}}/>    
+    <input class="attribute-value conditionMeditation" type="checkbox" id="isPurification" {{#if conditionMeditation.isPurification}}checked{{/if}}/>    
   </li>
   <li class="item flexrow">
     <label for="categorie">Vêture : {{meditation.data.veture}}</label>
-    <input class="attribute-value" type="checkbox" id="isVeture" name="isVeture"  {{#if isVeture}}checked{{/if}}/>    
+    <input class="attribute-value conditionMeditation" type="checkbox" id="isVeture" {{#if conditionMeditation.isVeture}}checked{{/if}}/>    
   </li>
   <li class="item flexrow">
-    <label for="categorie">Comportement antérieur : {{meditation.data.comportement}})</label>
-    <input class="attribute-value" type="checkbox" id="isComportement" name="isComportement"  {{#if isComportement}}checked{{/if}}/>    
+    <label for="categorie">Comportement antérieur : {{meditation.data.comportement}}</label>
+    <input class="attribute-value conditionMeditation" type="checkbox" id="isComportement" {{#if conditionMeditation.isComportement}}checked{{/if}}/>    
   </li>
 </ul>
 
@@ -51,14 +51,11 @@
   </select>
 </div>
 
-<div class="form-group">
-  <label for="categorie">Ajustements</label>
-  <label for="categorie" id="etat-general">Etat général: {{numberFormat etat decimals=0 sign=true}}</label>
-  <label>Final: <label id="roll-param">10 / 0</label>&nbsp;&nbsp;&nbsp;<label name="addon-message" id="addon-message"></label></label>
+<div id="tableAjustements">
 </div>
-<div id="resolutionTable">
+<div id="tableResolution">
 </div>
-<div id="resolutionValeurs">  
+<div id="tableProbaReussite">  
 </div>
 </form>
 

templates/dialog-roll-resolution.html

@@ -28,9 +28,11 @@
       {{/select}}
   </select>
 </div>
-<div id="resolutionTable">  
+<div id="tableAjustements">
 </div>
-<div id="resolutionValeurs">  
+<div id="tableResolution">  
+</div>
+<div id="tableProbaReussite">  
 </div>
 
 </form>

templates/dialog-roll-sort.html

@@ -57,15 +57,11 @@
   </select>
 </div>
 
-<div class="form-group">
-  <label for="categorie">Ajustements</label>
-  <label for="categorie" id="etat-general">Etat général: {{numberFormat etat decimals=0 sign=true}}</label>
-  <label for="categorie" id="ajust-astrologique">Astrologique: {{numberFormat ajustementAstrologique decimals=0 sign=true}}</label>
-  <label>Final: <label id="roll-param">10 / 0</label>&nbsp;&nbsp;&nbsp;<label name="addon-message" id="addon-message"></label></label>
+<div id="tableAjustements">
 </div>
-<div id="resolutionTable">
+<div id="tableResolution">
 </div>
-<div id="resolutionValeurs">  
+<div id="tableProbaReussite">  
 </div>
 </form>