Update combat tab

templates/chat/chat-generic-result.hbs

@@ -18,8 +18,14 @@
 
     <div>
       <ul>
+        {{#if target}}
         <li>Target Roll : {{target}}-
         </li>
+        {{/if}}
+
+        {{#if rollSource}}  
+        <li>Roll : {{rollSource}}</li>
+        {{/if}}
 
         {{#if charac}}  
         <li>CHAR : {{charac.label}}</li>
@@ -29,11 +35,24 @@
         <li>{{item.name}} ({{upperFirst item.type}})</li>
         {{/if}}
 
+        {{#if (exists bonusMalus)}}
         <li>Bonus/Penalty : {{bonusMalus}}
         </li>
+        {{/if}}
 
-        <li><strong>Result : {{result}}</strong>  ({{#if isSuccess}}Success!!{{else}}Failure!{{/if}})</li>
+        <li><strong>Result : {{result}}</strong>
+          {{#if (exists margin)}}
+            ({{#if isSuccess}}Success!!{{else}}Failure!{{/if}})
+          {{/if}}
+        </li>
+
+        {{#if (exists bodyValue)}}
+        <li><strong>BODY : {{bodyValue}}</strong>
+        {{/if}}
+        
+        {{#if (exists margin)}}
         <li><strong>Margin : {{margin}}</strong>
+        {{/if}}
 
       </ul>  
     </div>