Push

templates/actor-sheet.html

@@ -259,8 +259,6 @@
           <li class="item stat flexrow list-item" data-item-id="{{weapon._id}}">
             <img class="sheet-competence-img" src="{{weapon.img}}" />
             <span class="generic-label"><a class="weapon-roll">{{weapon.name}}</a></span>
-            <span class="generic-label">{{weapon.data.typeText}}</span>
-            <span class="generic-label">Speed {{weapon.data.speed}}</span>
             <span class="generic-label"><a class="weapon-damage-roll">Damage {{weapon.data.damageDice}}</a></span>
             <div class="item-controls">
               <a class="item-control item-equip" title="Equip">{{#if weapon.data.equipped}}<i
@@ -279,7 +277,8 @@
           {{#each armors as |armor key|}}
           <li class="item stat flexrow list-item" data-item-id="{{armor._id}}">
             <img class="sheet-competence-img" src="{{armor.img}}" />
-            <span class="stat-label outfit-label">{{armor.name}}</span>
+            <span class="stat-label outfit-label"><a class="armor-roll">{{armor.name}}</a></span>
+            <span class="stat-label outfit-label">Res. {{armor.data.resistanceDice}}</span>
             <div class="item-controls">
               <a class="item-control item-equip" title="Worn">{{#if armor.data.equipped}}<i
                   class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>

templates/chat-generic-result.html

@@ -21,19 +21,30 @@
         {{#if weapon}}  
         <li>Weapon : {{weapon.name}}</li>
         {{/if}}
+        {{#if power}}  
+        <li>Power : {{power.name}}</li>
+        {{/if}}
         {{#if isDamage}}
         <li>Weapon Damage Dice : {{weapon.data.damageDice}}</li>
         {{/if}}
+        {{#if isResistance}}
+        <li>Armor Resistance  Dice : {{armor.data.resistanceDice}}</li>
+        {{/if}}
         {{#if stat}}  
         <li>Statistic : {{stat.label}}</li>
         {{/if}}
         {{#if spec}}  
         <li>Specialisation : {{spec.name}}</li>
         {{/if}}
-        {{#if isDamage}}
-        <li><strong>Damages : {{finalScore}}</strong>
+
+        {{#if isResistance}}
+        <li><strong>Defense Result : {{finalScore}}</strong>
         {{else}}
-        <li><strong>Final Result : {{finalScore}}</strong>
+          {{#if isDamage}}
+          <li><strong>Damages : {{finalScore}}</strong>
+          {{else}}
+          <li><strong>Final Result : {{finalScore}}</strong>
+          {{/if}}
         {{/if}}
         
         {{#if linkedRollId}}