Sync v9

templates/chat-generic-result.html

@@ -18,22 +18,28 @@
 
     <div>
       <ul>
+        {{#if weapon}}  
+        <li>Weapon : {{weapon.name}}</li>
+        {{/if}}
+        {{#if isDamage}}
+        <li>Weapon Damage Dice : {{weapon.data.damageDice}}</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>
+        {{else}}
         <li><strong>Final Result : {{finalScore}}</strong>
+        {{/if}}
         
         {{#if linkedRollId}}
         <li><button class="chat-card-button apply-defense-roll" data-roll-score="{{finalScore}}" data-roll-id="{{@root.rollId}}" data-actor-id="{{actorId}}" data-defender-id="{{defenseAttackerId}}">Use this Roll as defense</button></li>
         {{/if}}
 
-        {{#if dmgResult}}
-        <li>Damages : {{dmgResult}}</li>
-        {{/if}}
-
       </ul>  
     </div>