MDL/ADRL fixes + MR fixes

templates/roll-dialog-generic.html

@@ -26,7 +26,7 @@
 
       {{#if statVehicle}}
       <div class="flexrow">
-        <span class="roll-dialog-label">{{upper  statVehicle.label}} :</span>
+        <span class="roll-dialog-label">{{upper statVehicle.label}} :</span>
         <select class="roll-dialog-label" id="statVehicleLevel" type="text" name="statVehicleLevel"
           value="{{statVehicle.currentlevel}}" data-dtype="Number" {{#if statKey}}disabled{{/if}}>
           {{#select statVehicle.currentlevel}}
@@ -37,73 +37,72 @@
       </div>
       {{/if}}
 
-        {{#if specList}}
-        <div class="flexrow">
-          <span class="roll-dialog-label">Spec : </span>
-          <select class="roll-dialog-label" id="specList" type="text" name="selectedSpec" value="{{selectedSpec}}"
-            data-dtype="String">
-            {{#select selectedSpec}}
-            <option value="0">None</option>
-            {{#each specList as |spec idx|}}
-            <option value="{{spec._id}}">{{spec.name}}</option>
-            {{/each}}
-            {{/select}}
-          </select>
-          <span class="small-label">&nbsp;</span>
-        </div>
-        <div class="flexrow">
-          <span class="roll-dialog-label">Spec Dice : </span>
-          <select class="roll-dialog-label" id="specDicesLevel" type="text" name="specDicesLevel"
-            value="{{specDicesLevel}}" data-dtype="Number" {{#if specList}}disabled{{/if}}>
-            {{#select specDicesLevel}}
-            {{{optionsDiceList}}}
-            {{/select}}
-          </select>
-          <span class="small-label">&nbsp;</span>
-        </div>
-        {{/if}}
+      {{#if specList}}
+      <div class="flexrow">
+        <span class="roll-dialog-label">Spec : </span>
+        <select class="roll-dialog-label" id="specList" type="text" name="selectedSpec" value="{{selectedSpec}}"
+          data-dtype="String">
+          {{#select selectedSpec}}
+          <option value="0">None</option>
+          {{#each specList as |spec idx|}}
+          <option value="{{spec._id}}">{{spec.name}}</option>
+          {{/each}}
+          {{/select}}
+        </select>
+        <span class="small-label">&nbsp;</span>
+      </div>
+      <div class="flexrow">
+        <span class="roll-dialog-label">Spec Dice : </span>
+        <select class="roll-dialog-label" id="specDicesLevel" type="text" name="specDicesLevel"
+          value="{{specDicesLevel}}" data-dtype="Number" {{#if specList}}disabled{{/if}}>
+          {{#select specDicesLevel}}
+          {{{optionsDiceList}}}
+          {{/select}}
+        </select>
+        <span class="small-label">&nbsp;</span>
+      </div>
+      {{/if}}
 
       {{/if}}
-      
+
       <div class="dice-pool-div">
         <span>
           <h3 class="dice-pool-label">Current pool</h3>
         </span>
         <div class="flexrow dice-pool-stack">
           {{#each dicePool as |dice idx|}}
-          <span><a class="pool-remove-dice" data-dice-idx="{{idx}}" data-dice-level="{{dice.level}}" data-dice-key="{{dice.key}}"><img class="dice-pool-image"
-                src="{{dice.img}}" alt="dices"></a></span>
+          <span><a class="pool-remove-dice" data-dice-idx="{{idx}}" data-dice-level="{{dice.level}}"
+              data-dice-key="{{dice.key}}"><img class="dice-pool-image" src="{{dice.img}}" alt="dices"></a></span>
           {{/each}}
         </div>
       </div>
 
-      {{#if noBonusDice}}
-        <div class="flexrow">
-          No bonus dice due to effect !
-        </div>
-        {{else}}
-        <div class="flexrow">
-          {{#each diceList as |dice idx|}}
-          <span><a class="pool-add-dice" data-dice-key="{{dice.key}}" data-dice-level="{{dice.level}}"><img class="dice-pool-image"
-                src="{{dice.img}}" alt="dices"></a></span>
-          {{/each}}
-        </div>
-      {{/if}}
-      
-      {{#if hindranceDices}}
       <div class="dice-pool-div">
         <span>
           <h3 class="dice-pool-label">Hindrance Dice</h3>
         </span>
         <div class="flexrow dice-pool-stack">
           {{#for 1 hindranceDices 1}}
-          <span><a class="" data-dice-idx="{{idx}}" data-dice-level="2" data-dice-key="d6"><img class="dice-pool-image"
+          <span><a class="pool-remove-hindrance-dice" data-dice-idx="{{idx}}" data-dice-level="2" data-dice-key="d6"><img class="dice-pool-image"
                 src="systems/fvtt-pegasus-rpg/images/dice/hindrance-dice.png" alt="dices"></a></span>
           {{/for}}
         </div>
       </div>
+
+      {{#if noBonusDice}}
+      <div class="flexrow">
+        No bonus dice due to effect !
+      </div>
+      {{else}}
+      <div class="flexrow">
+        {{#each diceList as |dice idx|}}
+        <span><a class="pool-add-dice" data-dice-key="{{dice.key}}" data-dice-level="{{dice.level}}"><img
+              class="dice-pool-image-add" src="{{dice.img}}" alt="dices"></a></span>
+        {{/each}}
+      </div>
       {{/if}}
 
+
       <div class="flexrow">
 
         <span class="roll-dialog-label">Modifiers : </span>
@@ -129,21 +128,30 @@
           <option value="d6">Outnumbered 2 Extra Allies d6</option>
           <option value="d8">Outnumbered 3 Extra Allies d8</option>
           <option value="d10">Outnumbered 4 Extra Allies d10</option>
-          <option value="d12">Outnumbered 5 Extra Allies d12<option>
+          <option value="d12">Outnumbered 5 Extra Allies d12
+          <option>
           <option value="none4">===== Called DMG Shot Bonus</option>
-          <option value="d12">Eyes/head d12<option>
+          <option value="d12">Eyes/head d12
+          <option>
           <option value="none4">===== Impact DMG Bonus</option>
-          <option value="d4">Soft d4<option>
-          <option value="d6">Thin/Flimsy  d6<option>
-          <option value="d8">Solid Furniture d8<option>
-          <option value="d10">Thin Metal/Thick Wood d10<option>
-          <option value="d12">Solid Object/Concrete d12<option>
+          <option value="d4">Soft d4
+          <option>
+          <option value="d6">Thin/Flimsy d6
+          <option>
+          <option value="d8">Solid Furniture d8
+          <option>
+          <option value="d10">Thin Metal/Thick Wood d10
+          <option>
+          <option value="d12">Solid Object/Concrete d12
+          <option>
           <option value="none5">===== Other Circumstances</option>
-          <option value="d4">Concentrated<option>
-          <option value="d4">Off Hand d4<option>
+          <option value="d4">Concentrated
+          <option>
+          <option value="d4">Off Hand d4
+          <option>
           <option value="d6">Higher Ground d6</option>
           {{/select}}
-          </select>
+        </select>
       </div>
 
     </div>
@@ -154,14 +162,14 @@
       {{else}}
       {{> systems/fvtt-pegasus-rpg/templates/partial-roll-select-effects.html}}
       {{/if}}
-      
+
       {{#if isInit}}
-        {{#each TICs as |tic index|}}
-        <div class="flexrow">
-          <span class="roll-dialog-label">TIC {{add index 1}}:</span>
-          <input class="roll-input-tic" id="roll-input-tic{{index}}" type="text" value="{{tic.text}}" data-dtype="String">
-        </div>
-        {{/each}}
+      {{#each TICs as |tic index|}}
+      <div class="flexrow">
+        <span class="roll-dialog-label">TIC {{add index 1}}:</span>
+        <input class="roll-input-tic" id="roll-input-tic{{index}}" type="text" value="{{tic.text}}" data-dtype="String">
+      </div>
+      {{/each}}
       {{/if}}
 
     </div>