Combat tracker enhancements

templates/chat-generic-result.html

@@ -24,6 +24,11 @@
         {{#if isDamage}}
         <li>Weapon Damage Dice : {{weaponDamageDice}}</li>
         {{/if}}
+
+        {{#if (eq subKey "dmg-res")}}
+        <li>Damage Resistance</li>
+        {{/if}}
+
         {{#if isResistance}}
         <li>Armor Resistance  Dice : {{armor.system.resistanceDice}}</li>
         <li>ADRL : {{armor.system.adrl}}</li>
@@ -53,12 +58,11 @@
         {{/if}}
         
         {{#if (eq subKey "dmg-res")}}
-        <li>Damage Resistance</li>
-        {{#each armorsList as |armor idx|}}
-          {{#if armor.applied}}
-            <li>ADRL: {{armor.adrl}}</li>
-          {{/if}}
-        {{/each}}
+          {{#each armorsList as |armor idx|}}
+            {{#if armor.applied}}
+              <li>ADRL: {{armor.adrl}}</li>
+            {{/if}}
+          {{/each}}
         {{/if}}
 
         {{#if power}}  

templates/item-effect-sheet.html

@@ -88,7 +88,13 @@
             <li class="flexrow"><label class="generic-label">Display Text when added to Actor</label>
               <input type="text" class="input-numeric-short padd-right" name="system.droptext" value="{{data.droptext}}" data-dtype="String"/>
             </li>
-            
+
+            <li class="flexrow"><label class="generic-label">Provide extra TICs ?</label>
+              <select class="competence-base flexrow" type="text" name="system.extratics" value="{{data.extratics}}" data-dtype="String">
+                {{selectOptions config.extraTIC selected=data.extratics nameAttr="key" labelAttr="name" }}
+              </select> 
+          </li>
+
             <li class="flexrow"><label class="generic-label">Affect Status?</label>
               <label class="attribute-value checkbox"><input type="checkbox" name="system.affectstatus" {{checked data.affectstatus}}/></label>
             </li>

templates/pegasus-combat-tracker.html

@@ -66,7 +66,7 @@
       <li class="combatant actor directory-item flexrow {{this.css}}" data-combatant-id="{{this.id}}">
           <img class="token-image" data-src="{{this.img}}" alt="{{this.name}}"/>
           <div class="token-name flexcol">
-              <h4>{{this.name}}</h4>
+              <h4>{{this.name}}</h4><a class="select-combat-actor" data-combatant-id="{{this.id}}"><i class="fas fa-hand-pointer"></i></a>
               <div class="combatant-controls flexrow">
                   {{#if ../user.isGM}}
                   <a class="combatant-control {{#if this.hidden}}active{{/if}}" aria-label="{{localize 'COMBAT.ToggleVis'}}" role="button" data-tooltip="COMBAT.ToggleVis" data-control="toggleHidden">
@@ -96,10 +96,15 @@
           {{/if}}
           
           <div class="combat-tracker-tic-section flexcol" id="{{this.id}}">
-            <a class="combat-tracker-tic" data-tic-num="1" data-combatant-id="{{this.id}}">{{getTIC 1 this.id}}</a>
-            {{#if (isCharacter this.id)}}
-            <a class="combat-tracker-tic" data-tic-num="2" data-combatant-id="{{this.id}}">{{getTIC 2 this.id}}</a>
-            {{/if}}
+            {{#each this.TICs as | tic index|}}
+              <button class="combat-tracker-tic-button"><a class="combat-tracker-tic" data-tic-num="{{index}}" data-combatant-id="{{../id}}">
+                {{#if tic.revealed}}
+                  ACTED
+                {{else}}
+                  TIC: {{add index 1}}
+                {{/if}}
+              </a></button>
+            {{/each}}
           </div>
 
           <div class="token-initiative">              

templates/roll-dialog-generic.html

@@ -156,16 +156,12 @@
       {{/if}}
       
       {{#if isInit}}
-      <div class="flexrow">
-        <span class="roll-dialog-label">TIC 1:</span>
-        <input class="roll-input-tic" id="roll-input-tic1" type="text" name="tic1" value="{{tic1}}" data-dtype="String">
-      </div>
-      {{#if (eq actorType "character")}}
+        {{#each TICs as |tic index|}}
         <div class="flexrow">
-          <span class="roll-dialog-label">TIC 2:</span>
-          <input class="roll-input-tic" id="roll-input-tic2" type="text" name="tic2" value="{{tic2}}" data-dtype="String">
+          <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>
-        {{/if}}
+        {{/each}}
       {{/if}}
 
     </div>