Add initiative and ammo

templates/chat/chat-generic-result.hbs

@@ -31,7 +31,7 @@
         {{/if}}
 
         <li>Bonus/Malus: {{bonusMalus}}% </li>
-        <li>Final score: {{percentValue}}% </li>
+        <li>Target Number: {{percentValue}}% </li>
         <li>Result: {{diceResult}} </li>
         <li>Degrees: {{degrees}} </li>
         
@@ -51,15 +51,19 @@
 
       {{#if (and weapon isSuccess)}}
         {{#if weapon.ammo}}
-          <li>Roll Ammo Damage ({{weapon.ammo.name}}): [[/r {{weapon.ammo.system.damage}}]]</li>
+          <li>Roll Ammo Damage ({{weapon.ammo.name}}): [[/r {{weapon.ammo.system.damage}}*{{damageMultiplier}}*{{locationMultiplier}}]]</li>
+          <li>BR: {{weapon.ammo.system.br}}</li>          
+
         {{else}}
           {{#if weapon.system.hashpdamage}}
-            <li>Roll HP Damage: [[/r {{weapon.system.damage}}]]</li>
+            <li>Roll HP Damage: [[/r {{weapon.system.damage}}*{{damageMultiplier}}*{{locationMultiplier}}]]</li>
           {{/if}}
           {{#if weapon.system.hasfatiguedamage}}
-            <li>Roll Fatigue Damage: [[/r {{weapon.system.fatiguedamage}}]]</li>
+            <li>Roll Fatigue Damage: [[/r {{weapon.ammo.system.fatiguedamage}}*{{damageMultiplier}}*{{locationMultiplier}}]]</li>
           {{/if}}
+          <li>BR: [[/r {{weapon.system.br}}]]</li>          
         {{/if}}
+          <li>Penetration : {{mul weapon.system.penetrationmin damageMultiplier}} - {{mul weapon.system.penetrationmax damageMultiplier}}</li>          
       {{/if}}
 
       {{#if (and (not isSuccess) rerolls)}}