Fix various issues with rolls and compendiums

templates/chat-message.hbs

@@ -12,18 +12,28 @@
         {{/if}}
 
 
+        {{#if (eq rollType "damage")}}
+        <li class="result-success">Weapon Damage</li>
+        <li><strong>{{weapon.name}}</strong></li>
+        {{else}}
         {{#if weapon}}
         <li><strong>Weapon : {{weapon.name}}</strong></li>
         {{/if}}
+        {{/if}}
 
         <li><strong>{{localize rollItem.label}} : {{fullFormula}}</strong></li>
 
+        {{#if (eq rollType "damage")}}
+        {{else}}
         {{#if isEncumbered}}
         <li class="red-warning">Encumbered : -1D</li>
         {{/if}}
-
         <li>{{localize "FTLNOMAD.Label.modifier"}} : {{skillModifier}}D {{rangeModifier}}D {{numericModifier}}D</li>
+        {{/if}}
 
+
+        {{#if (eq rollType "damage")}}
+        {{else}}
         {{#if isSuccess}}
         <li class="result-success">
           {{localize "FTLNOMAD.Label.success"}}
@@ -35,6 +45,8 @@
           {{localize "FTLNOMAD.Label.failure"}}
         </li>
         {{/if}}
+        {{/if}}
+
       </ul>
     </div>
   </div>