Add weapons attacks

templates/actors/actor-sheet.hbs

@@ -62,6 +62,10 @@
             <input type="text" class="item-field-label-short padd-right" name="system.secondary.{{key}}.bonus" value="{{second.bonus}}" data-dtype="Number"/>
           {{/each}}
           </li>
+          <li class="item stat flexrow list-item list-item-shadow">
+            <label class="item-field-label-medium">Rerolls : </label>
+            <input type="text" class="item-field-label-short padd-right" name="system.various.rerolls.value" value="{{system.various.rerolls.value}}" data-dtype="Number"/>
+          </li>
         </ul>
 
       </div>
@@ -150,10 +154,13 @@
                 <h3><label class="items-title-text">Weapons</label></h3>
               </span>
               <span class="item-field-label-short">
-                <label class="short-label">Ability</label>
+                <label class="short-label">Type</label>
+              </span>
+              <span class="item-field-label-long">
+                <label class="short-label">Skill</label>
               </span>
               <span class="item-field-label-medium">
-                <label class="short-label">Range</label>
+                <label class="short-label">Damage</label>
               </span>
             </li>
             {{#each equippedWeapons as |weapon key|}}
@@ -162,44 +169,13 @@
                   src="{{weapon.img}}" /></a>
               <span class="item-name-label-long"><a class ="roll-weapon">{{weapon.name}}</a></span>
 
-              <span class="item-field-label-short">{{weapon.system.ability}}</span>
+              <span class="item-field-label-short">{{upperFirst weapon.system.weapontype}}</span>
 
-              <span class="item-field-label-medium">{{perk.system.range}}</span>
+              <span class="item-field-label-long">{{weapon.system.skill}}</span>
 
-              <div class="item-filler">&nbsp;</div>
-              <div class="item-controls item-controls-fixed">
-                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-              </div>
-            </li>
-            {{/each}}
-          </ul>
-        </div>
+              <span class="item-field-label-long">{{weapon.system.damage}}</span>
 
-        <div>
-          <ul class="stat-list alternate-list">
-            <li class="item flexrow list-item items-title-bg">
-              <span class="item-name-label-header-long">
-                <h3><label class="items-title-text">Feats</label></h3>
-              </span>
-              <span class="item-field-label-medium">
-                <label class="short-label">Feature Die?</label>
-              </span>
-              <span class="item-field-label-medium">
-                <label class="short-label">SL?</label>
-              </span>
-              <span class="item-field-label-medium">
-                <label class="short-label">SL</label>
-              </span>
-            </li>
-            {{#each feats as |feat key|}}
-            <li class="item flexrow list-item list-item-shadow" data-item-id="{{feat._id}}">
-              <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
-                  src="{{feat.img}}" /></a>
-              <span class="item-name-label-long">{{feat.name}}</span>
 
-              <span class="item-field-label-medium">{{upperFirst feat.system.isfeatdie}}</span>
-              <span class="item-field-label-medium">{{upperFirst feat.system.issl}}</span>
-              <span class="item-field-label-medium">{{feat.system.sl}}</span>
 
               <div class="item-filler">&nbsp;</div>
               <div class="item-controls item-controls-fixed">
@@ -210,27 +186,6 @@
           </ul>
         </div>
 
-        <div>
-          <ul class="stat-list alternate-list">
-            <li class="item flexrow list-item items-title-bg">
-              <span class="item-name-label-header-long">
-                <h3><label class="items-title-text">Conditions</label></h3>
-              </span>
-            </li>
-            {{#each conditions as |condition key|}}
-            <li class="item flexrow list-item list-item-shadow" data-item-id="{{condition._id}}">
-              <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
-                  src="{{condition.img}}" /></a>
-              <span class="item-name-label-long">{{condition.name}}</span>
-              <div class="item-filler">&nbsp;</div>
-              <div class="item-controls item-controls-fixed">
-                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-              </div>
-            </li>
-            {{/each}}
-          </ul>
-        </div>
-
       </div>
     </div>
 
@@ -263,9 +218,9 @@
             <span class="item-name-label">
               <a class="power-roll">{{spell.name}}</a>
             </span>
-            <span class="item-field-label-medium">{{upperFirst spell.system.lore}}</span>
-            <span class="item-field-label-short">{{upperFirst spell.system.circle}}</span>
-            <span class="item-field-label-medium">{{upperFirst spell.system.range}}</span>
+            <span class="item-field-label-medium">{{spell.system.lore}}</span>
+            <span class="item-field-label-short">{{spell.system.circle}}</span>
+            <span class="item-field-label-medium">{{spell.system.range}}</span>
             <div class="item-filler">&nbsp;</div>
             <div class="item-controls item-controls-fixed">
               <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
@@ -356,8 +311,8 @@
           <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
               src="{{weapon.img}}" /></a>
           <span class="item-name-label">{{weapon.name}}</span>
-          <span class="item-field-label-short"><label>{{upper weapon.system.ability}}</label></span>
-          <span class="item-field-label-short"><label>{{upper weapon.system.damage}}</label></span>
+          <span class="item-field-label-short"><label>{{weapon.system.ability}}</label></span>
+          <span class="item-field-label-short"><label>{{weapon.system.damage}}</label></span>
 
           <div class="item-filler">&nbsp;</div>
           <div class="item-controls item-controls-fixed">

templates/apps/roll-dialog-generic.hbs

@@ -7,18 +7,35 @@
   </header>
 
     <div class="flexcol">
-      
+  
+      {{#if skill}}
+      <div class="flexrow">
+        <span class="roll-dialog-label">Skill : </span>
+        <span class="roll-dialog-label">{{skill.name}} ( {{skill.total}}% )</span>
+      </div>
+      {{/if}}
+
       {{#if weapon}}
       <div class="flexrow">
         <span class="roll-dialog-label">Weapon : </span>
         <span class="roll-dialog-label">{{weapon.name}}</span>
       </div>
-      {{/if}}
-
-      {{#if skill}}
       <div class="flexrow">
-        <span class="roll-dialog-label">Skill : </span>
-        <span class="roll-dialog-label">{{skill.name}} ( {{skill.total}}% )</span>
+        <span class="roll-dialog-label">Above effective range ({{weapon.system.effectiverange}}, -30%) : </span>
+        <label class="attribute-value checkbox"><input type="checkbox" id="above-effective-range" {{checked isAboveEffectiveRange}}/></label>
+      </div>
+      <div class="flexrow">
+        <span class="roll-dialog-label">Aiming : </span>
+          <select class="status-small-label color-class-common" type="text" id="weapon-aiming" value="{{weaponAiming}}" data-dtype="String" >
+          {{#select weaponAiming}}
+          <option value="none">None</option>
+          <option value="arm">Arm (-50)</option>
+          <option value="head">Head (-50)</option>
+          <option value="torso">Torso(-30)</option>
+          <option value="leg">Leg (-30)</option>
+          <option value="hand">Hand/Weapon (-70)</option>
+          {{/select}}
+        </select>
       </div>
       {{/if}}
 

templates/chat/chat-generic-result.hbs

@@ -20,15 +20,20 @@
       <ul>
 
         {{#if skill}}
-        <li>Skill : {{skill.name}} ({{skill.total}}%) 
-        </li>
+        <li>Skill : {{skill.name}} ({{skill.total}}%)</li>
         {{/if}}
-        <li>Bonus/Malus: {{bonusMalus}}%
-        </li>
-        <li> Result: {{diceResult}} 
-        </li>
-        <li> Degrees: {{degrees}} 
-        </li>
+        {{#if weapon}}
+        <li>Weapon : {{weapon.name}}</li>
+        <li>Location hit : {{upperFirst weaponAiming}} ({{locationMalus}})</li>
+        {{/if}}
+        {{#if isAboveEffectiveRange}}
+        <li>Above effective range: yes, -30% applied</li>
+        {{/if}}
+
+        <li>Bonus/Malus: {{bonusMalus}}% </li>
+        <li>Final score: {{percentValue}}% </li>
+        <li>Result: {{diceResult}} </li>
+        <li>Degrees: {{degrees}} </li>
         
         {{#if isCriticalSuccess}}
         <li><strong>Critical Success !</strong></li> 
@@ -44,6 +49,14 @@
           {{/if}}
         {{/if}}
 
+      {{#if (and weapon isSuccess)}}
+        <li>Roll Damage: [[/r {{weapon.system.damage}}]]</li>
+      {{/if}}
+
+      {{#if (and (not isSuccess) rerolls)}}
+        <button class="chat-card-button chat-reroll">Reroll !</button>      
+      {{/if}}
+
       </ul>  
     </div>