Automatisations de combats, WIP

templates/chat-degats-result.html

@@ -18,8 +18,15 @@
 
 <div>
   <ul>
-    <li>Arme : {{arme.name}} (+{{arme.system.totalDegats}})</li>
-    <li>Dégats : {{finalResult}} {{#if arme.system.nonletaux}}(Non létaux){{else}}(Létaux){{/if}}</li>    
+    <li>Arme : {{arme.name}} (+{{degatsFormula}})</li>
+    <li>Information : {{degatsMessage}}</li>
+    <li>Dégats : {{finalResult}} {{#if arme.system.nonletaux}}(Non létaux){{else}}(Létaux){{/if}}</li>
+    {{#if nextBonus}}
+      <li>Bonus pour prochaine attaque : {{nextBonus}}</li>
+    {{/if}}
+    {{#if nextMalus}}
+      <li>Malus au défenseur pour prochaine action : {{nextMalus}}</li>
+    {{/if}}
   </ul>
 </div>
 

templates/chat-generic-result.html

@@ -20,6 +20,16 @@
   <ul>
     <li class="mournblade-roll">Attribut : {{attr.label}}</li>
 
+    {{#if arme}}
+    <li>Arme : {{arme.name}} (+{{arme.system.bonusmaniementoff}})</li>
+      {{#if defender}}
+        <li>Cible : {{defender.name}}</li>
+      {{/if}}
+      {{#if typeAttaque}}
+        <li>Attaque : {{lookup config.attaques typeAttaque}}</li>
+      {{/if}}
+    {{/if}}
+
     {{#if competence}}
     <li>Compétence : {{competence.name}}</li>
     {{/if}}
@@ -39,15 +49,15 @@
     <li>{{textBonus}} : {{bonusRoll.total}}</li>
     {{/if}}
 
-    {{#if arme}}
-    <li>Arme : {{arme.name}} (+{{arme.system.bonusmaniementoff}})</li>
-    {{/if}}
-
     <li>Formule : {{diceFormula}}</li>
     <li>Dé : {{diceResult}}</li>
     
     {{#if difficulte}}
-      <li>Difficulté : {{difficulte}}</li>
+      <li>Difficulté : {{difficulte}} 
+      {{#if (and arm.system.isMelee armeDefense)}}
+       ({{armeDefense.name}})
+      {{/if}}
+      </li>
     {{/if}}
     
     <li></li>
@@ -76,6 +86,13 @@
       </li>
       {{/if}}
     {{/each}}
+
+    {{#if (and arme isSuccess)}}
+    <li>
+      <button class="chat-card-button chat-card-button-degats arme-roll-degats"> Lancer les dégats ! </button>
+    </li>
+    {{/if}}
+
   </ul>
 </div>
 

templates/roll-dialog-generic.html

@@ -10,17 +10,18 @@
 
     <div class="flexrow">
       {{#if (eq attrKey "tochoose")}}
-        <span class="roll-dialog-label">Attribut</span>
-        <select class="status-small-label color-class-common" id ="attrKey" type="text" name="attrKey" value="attrKey" data-dtype="string" >
-          {{#select attrKey}}
-          {{#each attributs as |attrLabel attrKey|}}
-            <option value="{{attrKey}}">{{attrLabel}}</option>
-          {{/each}}
-          {{/select}}
-        </select>      
+      <span class="roll-dialog-label">Attribut</span>
+      <select class="status-small-label color-class-common" id="attrKey" type="text" name="attrKey" value="attrKey"
+        data-dtype="string">
+        {{#select attrKey}}
+        {{#each attributs as |attrLabel attrKey|}}
+        <option value="{{attrKey}}">{{attrLabel}}</option>
+        {{/each}}
+        {{/select}}
+      </select>
       {{else}}
-        <span class="roll-dialog-label">{{attr.label}}</span>
-        <span class="small-label">{{attr.value}}</span>
+      <span class="roll-dialog-label">{{attr.label}}</span>
+      <span class="small-label">{{attr.value}}</span>
       {{/if}}
     </div>
 
@@ -48,14 +49,87 @@
     </div>
     <div class="flexrow">
       <span class="roll-dialog-label">Points d'Ame</span>
-      <select class="roll-dialog-label" id="runeame" type="text" name="runeame" value="{{runeame}}"
-        data-dtype="Number">
+      <select class="roll-dialog-label" id="runeame" type="text" name="runeame" value="{{runeame}}" data-dtype="Number">
         {{#select runeame}}
         {{{pointAmeOptions}}}
         {{/select}}
       </select>
     </div>
+    {{/if}}
 
+    {{#if arme}}
+    <div class="flexrow">
+      <span class="roll-dialog-label">Arme : </span>
+      <span class="roll-dialog-label">{{arme.name}} (+{{arme.system.bonusmaniementoff}})</span>
+    </div>
+    {{#if arme.system.isMelee}}
+    <div class="flexrow">
+      <span class="roll-dialog-label">Attaque : </span>
+      <select class="roll-dialog-label" id="typeAttaque" type="text" name="typeAttaque" value="{{typeAttaque}}"
+        data-dtype="String">
+        {{#select typeAttaque}}
+        {{#each config.attaques as |attaque key|}}
+        <option value="{{key}}">{{attaque}}</option>
+        {{/each}}
+        {{/select}}
+      </select>
+    </div>
+    {{/if}}
+    {{/if}}
+
+
+    {{#if arme}}
+      {{#if arme.system.isMelee}}
+        {{#if armeDefense}}
+        <div class="flexrow">
+          <span class="roll-dialog-label">Défense adversaire : </span>
+          <span class="roll-dialog-label"><strong>{{difficulte}}</strong> </span>
+        </div>
+        {{/if}}
+      {{/if}}      
+      {{#if arme.system.isDistance}}
+        <div class="flexrow">
+          <span class="roll-dialog-label">Bonus de visée (+5) ? : </span>
+          <input class="" type="checkbox" id="visee" name="visee" {{checked visee}} />
+        </div>
+        {{#if defender}}
+          <div class="flexrow">
+            <span class="roll-dialog-label">La cible est consciente du tir (-{{defender.system.attributs.adr.value}})? : </span>
+            <input class="" type="checkbox" id="cibleconsciente" name="cibleconsciente" {{checked cibleconsciente}} />
+          </div>
+        {{else}}
+          <div class="flexrow">
+            <span class="roll-dialog-label">Pas de cible désignée ! </span>
+          </div>
+        {{/if}}
+        <div class="flexrow">
+          <span class="roll-dialog-label">La cible court (-5/-10)? : </span>
+          <input class="" type="checkbox" id="ciblecourt" name="ciblecourt" {{checked ciblecourt}} />
+        </div>
+        <div class="flexrow">
+          <span class="roll-dialog-label">Couvert ? : </span>
+          <select class="roll-dialog-label" id="typeCouvert" type="text" name="typeCouvert" value="{{typeCouvert}}"
+            data-dtype="String">
+            {{#select typeCouvert}}
+            {{#each config.couverts as |couvert key|}}
+              <option value="{{key}}">{{couvert.name}}</option>
+            {{/each}}
+            {{/select}}
+          </select>
+        </div>
+        <div class="flexrow">
+          <span class="roll-dialog-label">Portée : </span>
+          <select class="roll-dialog-label" id="difficulte" type="text" name="difficulte" value="{{difficulte}}"
+            data-dtype="Number">
+            {{#select difficulte}}
+            <option value="10">Moins que courte (10)</option>
+            <option value="15">Courte et + (15)</option>
+            <option value="20">Moyenne et + (20)</option>
+            <option value="25">Longue et + (25)</option>
+            {{/select}}
+          </select>
+        </div>
+      {{/if}}
     {{/if}}
 
     <div class="flexrow">
@@ -68,12 +142,7 @@
       </select>
     </div>
 
-    {{#if armeDefense}}
-    <div class="flexrow">
-      <span class="roll-dialog-label">Défense adversaire : </span>
-      <span class="roll-dialog-label"><strong>{{difficulte}}</strong> </span>
-    </div>
-    {{else}}
+    {{#if selectDifficulte}}
       <div class="flexrow">
         <span class="roll-dialog-label">Difficulté : </span>
         <select class="roll-dialog-label" id="difficulte" type="text" name="difficulte" value="{{difficulte}}"
@@ -94,7 +163,7 @@
     {{#if canEclatDoubleD20}}
     <div class="flexrow">
       <span class="roll-dialog-label">Doubler le d20 (1 Point d'Eclat)</span>
-      <input class="" id="doubleD20" type="checkbox" name="doubleD20" value="{{doubleD20}}" {{checked doubleD20}}/>
+      <input class="" id="doubleD20" type="checkbox" name="doubleD20" value="{{doubleD20}}" {{checked doubleD20}} />
     </div>
     {{/if}}