Update fight options

templates/chat-message.hbs

@@ -7,125 +7,218 @@
     <div class="intro-right">
       <ul>
         {{#if (eq rollType "char")}}
-        <li><strong>{{localize "CTHULHUETERNAL.Label.charRoll"}}</strong></li>
+          <li><strong>{{localize "CTHULHUETERNAL.Label.charRoll"}}</strong></li>
         {{/if}}
 
         {{#if (eq rollType "skill")}}
-        <li><strong>{{localize "CTHULHUETERNAL.Label.skillRoll"}}</strong></li>
+          <li><strong>{{localize
+                "CTHULHUETERNAL.Label.skillRoll"
+              }}</strong></li>
         {{/if}}
 
         {{#if isNudgedRoll}}
-        <li><strong>{{localize "CTHULHUETERNAL.Label.nudgedRoll"}} : {{wpCost}} {{localize "CTHULHUETERNAL.Label.WPSpent"}}</strong></li>
+          <li><strong>{{localize "CTHULHUETERNAL.Label.nudgedRoll"}}
+              :
+              {{wpCost}}
+              {{localize "CTHULHUETERNAL.Label.WPSpent"}}</strong></li>
         {{/if}}
 
         {{#if weapon}}
-        <li><strong>{{localize "CTHULHUETERNAL.Label.Weapon"}} : {{weapon.name}}</strong></li>
+          <li><strong>{{localize "CTHULHUETERNAL.Label.Weapon"}}
+              :
+              {{weapon.name}}</strong></li>
         {{/if}}
 
         {{#if (eq rollType "resource")}}
-        <li><strong>{{rollItem.name}} : {{initialScore}}</strong></li>
+          <li><strong>{{rollItem.name}} : {{initialScore}}</strong></li>
         {{else}}
-        <li><strong>{{rollItem.name}} : {{initialScore}}%</strong></li>
+          <li><strong>{{rollItem.name}} : {{initialScore}}%</strong></li>
         {{/if}}
 
         {{#if isZeroWP}}
-        <li class="red-warning">{{localize "CTHULHUETERNAL.Label.ZeroWP"}}</li>
+          <li class="red-warning">{{localize
+              "CTHULHUETERNAL.Label.ZeroWP"
+            }}</li>
         {{else}}
-        {{#if isLowWP}}
-        <li class="orange-warning">{{localize "CTHULHUETERNAL.Label.LowWP"}} : -20%</li>
-        {{/if}}
+          {{#if isLowWP}}
+            <li class="orange-warning">{{localize "CTHULHUETERNAL.Label.LowWP"}}
+              : -20%</li>
+          {{/if}}
         {{/if}}
 
         {{#if isExhausted}}
-        <li class="orange-warning">{{localize "CTHULHUETERNAL.Label.Exhausted"}} : -20%</li>
+          <li class="orange-warning">{{localize
+              "CTHULHUETERNAL.Label.Exhausted"
+            }}
+            : -20%</li>
         {{/if}}
 
-        {{#if  (eq rollType "resource")}}
-        <li>{{localize "CTHULHUETERNAL.Label.multiplier"}} : {{multiplier}}</li>
+        {{#if (eq rollType "resource")}}
+          <li>{{localize "CTHULHUETERNAL.Label.multiplier"}}
+            :
+            {{multiplier}}</li>
         {{else}}
-        <li>{{localize "CTHULHUETERNAL.Label.modifier"}} : {{totalModifier}}%</li>
+          <li>{{localize "CTHULHUETERNAL.Label.modifier"}}
+            :
+            {{totalModifier}}%</li>
         {{/if}}
 
-        <li>{{localize "CTHULHUETERNAL.Label.targetScore"}} : {{targetScore}}%</li>
+        <li>{{localize "CTHULHUETERNAL.Label.targetScore"}}
+          :
+          {{targetScore}}%</li>
         {{#if isSuccess}}
           {{#if isCritical}}
-            <li class="result-critical-success">{{localize "CTHULHUETERNAL.Label.criticalSuccess"}}
+            <li class="result-critical-success">{{localize
+                "CTHULHUETERNAL.Label.criticalSuccess"
+              }}
             </li>
           {{else}}
-          <li class="result-success">
-            {{localize "CTHULHUETERNAL.Label.success"}}
-            {{#if isNudge}}
-              <a class="nudge-roll" data-tooltip="{{localize "CTHULHUETERNAL.Label.rollNudge"}}"><i class="fa-solid fa-circle-sort-down"></i></a>
-            {{/if}}
+            <li class="result-success">
+              {{localize "CTHULHUETERNAL.Label.success"}}
+              {{#if isNudge}}
+                <a
+                  class="nudge-roll"
+                  data-tooltip="{{localize ' CTHULHUETERNAL.Label.rollNudge'}}"
+                ><i class="fa-solid fa-circle-sort-down"></i></a>
+              {{/if}}
 
-          </li>
+            </li>
           {{/if}}
-            {{#if  (eq rollType "weapon")}}
-              <li>
+          {{#if (eq rollType "weapon")}}
+            <li>
               {{#if (eq weapon.system.weaponType "rangedfirearm")}}
                 {{#if weapon.system.hasDamageDistance}}
                   {{#each weapon.system.damageDistance as |damageDistance|}}
                     {{#if (gt damageDistance.distance 0)}}
-                    <a class="damage-roll" data-item-id="{{weapon.id}}" data-action="roll" data-roll-type="damage"
-                      data-roll-value="{{damageDistance.damage}}" >
-                      <i class="fa-solid fa-gun"></i>
-                      <span class="damage-distance">{{damageDistance.distance}}:{{damageDistance.damage}}&nbsp;&nbsp;</span>
-                    </a>
+                      <a
+                        class="damage-roll"
+                        data-item-id="{{weapon.id}}"
+                        data-action="roll"
+                        data-roll-type="damage"
+                        data-roll-value="{{damageDistance.damage}}"
+                      >
+                        <i class="fa-solid fa-gun"></i>
+                        <span
+                          class="damage-distance"
+                        >{{damageDistance.distance}}:{{damageDistance.damage}}&nbsp;&nbsp;</span>
+                      </a>
                     {{/if}}
                   {{/each}}
                 {{else}}
-                  <a class="damage-roll" data-roll-value="{{weapon.system.damage}}" data-tooltip="{{localize "CTHULHUETERNAL.Label.rollDamage"}}"><i class="fa-solid fa-gun"></i></a>
+                  <a
+                    class="damage-roll"
+                    data-roll-value="{{weapon.system.damage}}"
+                    data-tooltip="{{localize
+                      '
+            CTHULHUETERNAL.Label.rollDamage'
+                    }}"
+                  ><i class="fa-solid fa-gun"></i></a>
                 {{/if}}
               {{else}}
-                <a class="damage-roll" data-roll-value="{{weapon.system.damage}}" data-tooltip="{{localize "CTHULHUETERNAL.Label.rollDamage"}}"><i class="fa-solid fa-sword"></i></a>
+                <a
+                  class="damage-roll"
+                  data-roll-value="{{weapon.system.damage}}"
+                  data-tooltip="{{localize
+                    '
+            CTHULHUETERNAL.Label.rollDamage'
+                  }}"
+                ><i class="fa-solid fa-sword"></i></a>
               {{/if}}
+            </li>
+          {{/if}}
+          {{#if (eq rollType "skill")}}
+            {{#if rollItem.system.isHealing}}
+              <li>
+                <a
+                  class="healing-roll"
+                  data-tooltip="{{localize
+                    ' CTHULHUETERNAL.Label.rollHealing'
+                  }}"
+                ><i class="fa-solid fa-heart"></i></a>
               </li>
             {{/if}}
-            {{#if (eq rollType "skill") }}
-              {{#if rollItem.system.isHealing}}
-                <li>
-                <a class="healing-roll" data-tooltip="{{localize "CTHULHUETERNAL.Label.rollHealing"}}"><i class="fa-solid fa-heart"></i></a>
-                </li>
-              {{/if}}
-            {{/if}}
-          </li>
+          {{/if}}
 
         {{/if}}
 
         {{#if isFailure}}
           {{#if isCritical}}
-            <li class="result-critical-failure">{{localize "CTHULHUETERNAL.Label.criticalFailure"}}
+            <li class="result-critical-failure">{{localize
+                "CTHULHUETERNAL.Label.criticalFailure"
+              }}
             </li>
           {{else}}
-          <li class="result-failure">
-            {{localize "CTHULHUETERNAL.Label.failure"}}
-          </li>
+            <li class="result-failure">
+              {{localize "CTHULHUETERNAL.Label.failure"}}
+            </li>
           {{/if}}
 
           {{#if isNudge}}
-          <li>
-            <a class="nudge-roll" data-tooltip="{{localize "CTHULHUETERNAL.Label.rollNudge"}}"><i class="fa-solid fa-circle-sort-down"></i></a>
-          </li>
+            <li>
+              <a
+                class="nudge-roll"
+                data-tooltip="{{localize 'CTHULHUETERNAL.Label.rollNudge'}}"
+              ><i class="fa-solid fa-circle-sort-down"></i></a>
+            </li>
           {{/if}}
 
-
         {{/if}}
+
+        {{#if isAttackRoll}}
+          {{#if defenseRoll}}
+            <li>{{localize "CTHULHUETERNAL.Label.defenseRoll"}}</li>
+            {{#if attackSuccess}}
+              <li class="result-success">{{localize
+                  "CTHULHUETERNAL.Label.attackSuccess"
+                }}</li>
+            {{else}}
+              <li class="result-failure">{{localize
+                  "CTHULHUETERNAL.Label.attackFailure"
+                }}</li>
+            {{/if}}
+          {{else}}
+            {{#if targetId}}
+              <li class="orange-warning">{{localize
+                  "CTHULHUETERNAL.Label.noDefenseRoll"
+                }}</li>
+              <a
+                class="opposed-roll"
+                data-tooltip="{{localize 'CTHULHUETERNAL.Label.opposedRoll'}}"
+              >
+                <i class="fa-duotone fa-light fa-arrows-to-line"></i></a>
+            {{else}}
+              <li class="orange-warning">{{localize
+                  "CTHULHUETERNAL.Label.noTarget"
+                }}</li>
+              <a
+                class="opposed-roll"
+                data-tooltip="{{localize 'CTHULHUETERNAL.Label.opposedRoll'}}"
+              >
+                <i class="fa-duotone fa-light fa-arrows-to-line"></i></a>
+            {{/if}}
+          {{/if}}
+        {{/if}}
+
       </ul>
     </div>
   </div>
   {{#if isDamage}}
-  <div>
-    {{#if (and isGM hasTarget)}}
-    {{{localize "CTHULHUETERNAL.Roll.displayArmor" targetName=targetName targetArmor=targetArmor
-    realDamage=realDamage}}}
-    {{/if}}
-  </div>
+    <div>
+      {{#if (and isGM hasTarget)}}
+        {{{localize
+          "CTHULHUETERNAL.Roll.displayArmor"
+          targetName=targetName
+          targetArmor=targetArmor
+          realDamage=realDamage
+        }}}
+      {{/if}}
+    </div>
   {{/if}}
   {{#unless isPrivate}}
-  <div class="dice-result">
-    <h4 class="dice-total">{{total}}</h4>
-    <div class="dice-formula">{{formula}}</div>
-    {{{tooltip}}}
-  </div>
+    <div class="dice-result">
+      <h4 class="dice-total">{{total}}</h4>
+      <div class="dice-formula">{{formula}}</div>
+      {{{tooltip}}}
+    </div>
   {{/unless}}
 </div>

templates/chat-regular-damage.hbs

@@ -23,6 +23,7 @@
       <li class="li-apply-wounds">
         {{localize "CTHULHUETERNAL.Label.applyWounds"}}
         <select name="combatant" class="li-apply-wounds-select">
+          <option value="none"></option>
           {{selectOptions combatants valueAttr="id" labelAttr="name"}}
         </select>
       </li>

templates/roll-dialog.hbs

@@ -9,9 +9,12 @@
 
     {{#if (eq rollType "resource")}}
     <legend>{{localize "CTHULHUETERNAL.Label.resourceRating"}}</legend>
-    <div class="dialog-skill">{{rollItem.name}} : <span class="resource-score">{{initialScore}} ({{mul initialScore 5}}%)</span></div>
-    <div class="dialog-skill">{{localize "CTHULHUETERNAL.Label.Hand"}} : {{rollItem.hand}} <input type="checkbox" data-action="selectHand" {{checked rollItem.enableHand}}></div>
-    <div class="dialog-skill">{{localize "CTHULHUETERNAL.Label.Stowed"}} : {{rollItem.stowed}} <input type="checkbox" data-action="selectStowed" {{checked rollItem.enableStowed}}></div>
+    <div class="dialog-skill">{{rollItem.name}} : <span class="resource-score">{{initialScore}} ({{mul initialScore
+        5}}%)</span></div>
+    <div class="dialog-skill">{{localize "CTHULHUETERNAL.Label.Hand"}} : {{rollItem.hand}} <input type="checkbox"
+        data-action="selectHand" {{checked rollItem.enableHand}}></div>
+    <div class="dialog-skill">{{localize "CTHULHUETERNAL.Label.Stowed"}} : {{rollItem.stowed}} <input type="checkbox"
+        data-action="selectStowed" {{checked rollItem.enableStowed}}></div>
     <div class="dialog-skill">
       {{localize "CTHULHUETERNAL.Label.Storage"}} : {{rollItem.storage}}
       <input type="checkbox" data-action="selectStorage" {{checked rollItem.enableStorage}}>
@@ -23,76 +26,85 @@
     {{#if weapon}}
     <div class="dialog-skill">{{localize "CTHULHUETERNAL.Label.Weapon"}} : {{weapon.name}}</div>
 
-      {{#if (eq weapon.system.weaponType "melee")}}
-        <div class="dialog-skill">
-          {{localize "CTHULHUETERNAL.Label.targetMove"}}
-          <select name="meleeTargetMoveChoice" class="roll-skill-modifier">
-            {{selectOptions choiceMeleeTargetMove localize=true selected=meleeTargetMoveChoice valueAttr="id" labelAttr="label"}}
-          </select>
-        </div>
-      {{/if}}
-      {{#if isRangedWeapon}}
-        <div class="dialog-skill">
-          {{localize "CTHULHUETERNAL.Label.rangedRange"}}
-          <select name="rangedRangeChoice" class="roll-skill-modifier">
-            {{selectOptions choiceRangedRange localize=true selected=rangedRangeChoice valueAttr="id" labelAttr="label"}}
-          </select>
-        </div>
-        <div class="dialog-skill">
-          {{localize "CTHULHUETERNAL.Label.targetMove"}}
-          <select name="rangedTargetMoveChoice" class="roll-skill-modifier">
-            {{selectOptions choiceRangedTargetMove localize=true selected=rangedTargetMoveChoice valueAttr="id" labelAttr="label"}}
-          </select>
-        </div>
+    {{#if targetName}}
+    <div class="dialog-skill">{{localize "CTHULHUETERNAL.Label.Target"}} : {{targetName}}</div>
+    {{/if}}
 
-        <div class="dialog-skill">
-          {{localize "CTHULHUETERNAL.Label.aimingLastRound"}}
-          <input type="checkbox" name="aimingLastRound">
-        </div>
-        {{#if weapon.system.hasSight}}
-        <div class="dialog-skill">
-          {{localize "CTHULHUETERNAL.Label.aimingWithSight"}}
-          <input type="checkbox" name="aimingWithSight">
-        </div>
-        {{/if}}
 
-      {{/if}}
+    {{#if (eq weapon.system.weaponType "melee")}}
+    <div class="dialog-skill">
+      {{localize "CTHULHUETERNAL.Label.targetMove"}}
+      <select name="meleeTargetMoveChoice" class="roll-skill-modifier">
+        {{selectOptions choiceMeleeTargetMove localize=true selected=meleeTargetMoveChoice valueAttr="id"
+        labelAttr="label"}}
+      </select>
+    </div>
+    {{/if}}
+    {{#if isRangedWeapon}}
+    <div class="dialog-skill">
+      {{localize "CTHULHUETERNAL.Label.rangedRange"}}
+      <select name="rangedRangeChoice" class="roll-skill-modifier">
+        {{selectOptions choiceRangedRange localize=true selected=rangedRangeChoice valueAttr="id" labelAttr="label"}}
+      </select>
+    </div>
+    <div class="dialog-skill">
+      {{localize "CTHULHUETERNAL.Label.targetMove"}}
+      <select name="rangedTargetMoveChoice" class="roll-skill-modifier">
+        {{selectOptions choiceRangedTargetMove localize=true selected=rangedTargetMoveChoice valueAttr="id"
+        labelAttr="label"}}
+      </select>
+    </div>
 
-      <div class="dialog-skill">
-        {{localize "CTHULHUETERNAL.Label.visibility"}}
-        <select name="visibilityChoice" class="roll-skill-modifier">
-          {{selectOptions choiceVisibility localize=true selected=visibilityChoice valueAttr="id" labelAttr="label"}}
-        </select>
-      </div>
-      <div class="dialog-skill">
-        {{localize "CTHULHUETERNAL.Label.attackerState"}}
-        <select name="attackerStateChoice" class="roll-skill-modifier">
-          {{selectOptions choiceAttackerState localize=true selected=attackerStateChoice valueAttr="id" labelAttr="label"}}
-        </select>
-      </div>
-      <div class="dialog-skill">
-        {{localize "CTHULHUETERNAL.Label.targetSize"}}
-        <select name="targetSizeChoice" class="roll-skill-modifier">
-          {{selectOptions choiceTargetSize localize=true selected=targetSizeChoice valueAttr="id" labelAttr="label"}}
-        </select>
-      </div>
+    <div class="dialog-skill">
+      {{localize "CTHULHUETERNAL.Label.aimingLastRound"}}
+      <input type="checkbox" name="aimingLastRound">
+    </div>
+    {{#if weapon.system.hasSight}}
+    <div class="dialog-skill">
+      {{localize "CTHULHUETERNAL.Label.aimingWithSight"}}
+      <input type="checkbox" name="aimingWithSight">
+    </div>
+    {{/if}}
 
-      {{#if weapon.system.hasSelectiveFire}}
-      <div class="dialog-skill">Selective Fire :
-        <select name="selectiveFireChoice" class="roll-skill-modifier">
-          {{selectOptions choiceSelectiveFire localize=true selected=selectiveFireChoice valueAttr="id" labelAttr="label"}}
-        </select>
-      </div>
-      {{/if}}
+    {{/if}}
+
+    <div class="dialog-skill">
+      {{localize "CTHULHUETERNAL.Label.visibility"}}
+      <select name="visibilityChoice" class="roll-skill-modifier">
+        {{selectOptions choiceVisibility localize=true selected=visibilityChoice valueAttr="id" labelAttr="label"}}
+      </select>
+    </div>
+    <div class="dialog-skill">
+      {{localize "CTHULHUETERNAL.Label.attackerState"}}
+      <select name="attackerStateChoice" class="roll-skill-modifier">
+        {{selectOptions choiceAttackerState localize=true selected=attackerStateChoice valueAttr="id"
+        labelAttr="label"}}
+      </select>
+    </div>
+    <div class="dialog-skill">
+      {{localize "CTHULHUETERNAL.Label.targetSize"}}
+      <select name="targetSizeChoice" class="roll-skill-modifier">
+        {{selectOptions choiceTargetSize localize=true selected=targetSizeChoice valueAttr="id" labelAttr="label"}}
+      </select>
+    </div>
+
+    {{#if weapon.system.hasSelectiveFire}}
+    <div class="dialog-skill">Selective Fire :
+      <select name="selectiveFireChoice" class="roll-skill-modifier">
+        {{selectOptions choiceSelectiveFire localize=true selected=selectiveFireChoice valueAttr="id"
+        labelAttr="label"}}
+      </select>
+    </div>
+    {{/if}}
 
     {{/if}}
 
     {{#if isZeroWP}}
     <div class="dialog-skill red-warning">{{localize "CTHULHUETERNAL.Label.ZeroWP"}}</div>
     {{else}}
-      {{#if isLowWP}}
-      <div class="dialog-skill orange-warning">{{localize "CTHULHUETERNAL.Label.LowWP"}} : -20%</div>
-      {{/if}}
+    {{#if isLowWP}}
+    <div class="dialog-skill orange-warning">{{localize "CTHULHUETERNAL.Label.LowWP"}} : -20%</div>
+    {{/if}}
     {{/if}}
 
     {{#if isExhausted}}