Weapon attack management

templates/chat/chat_dice_roll.html

@@ -2,6 +2,13 @@
   <div class="dice-result">
     Rolling for : {{name}}
   </div>
+
+  {{#if weapon}}
+  <div class="dice-result">
+    With Weapon : {{weapon.name}}
+  </div>
+  {{/if}}
+
   {{#if highopen }}
   <div class=dice-result>
     Rolled over 95 - High Open-Ended!
@@ -46,7 +53,7 @@
   <div class=dice-result>
     Darkness modifierDark : {{darknessModifier}}
   </div>
-  {{/if}}  
+  {{/if}}
 
   {{#if woundsModifier}}
   <div class="dice-result">
@@ -57,7 +64,7 @@
   <div class="dice-result">
     Total of d100 rolls:
     <h4 class="dice-total">{{totalRolls}}<br>
-    ({{#each rolls as |roll|}}{{roll.total}}{{#unless @last}}, {{/unless}}{{/each}})</h4>
+      ({{#each rolls as |roll|}}{{roll.total}}{{#unless @last}}, {{/unless}}{{/each}})</h4>
   </div>
   <div class=dice-result>
     Character Bonus : {{characterBonus}}
@@ -67,4 +74,73 @@
     Total :
     <h4 class="dice-total">{{totalFinal}}</h4>
   </div>
+
+  {{#if attackResult}}
+  <div class="dice-result">
+    Damage result :
+    <h4 class="dice-total">{{attackResult}}</h4>
+  </div>
+  {{/if}}
+
+  {{#if fumbleResult}}
+  <div class="dice-result">
+    <strong>Fumble !!!: {{fumbleResult}}</strong>
+  </div>
+  {{/if}}
+
+  {{#if criticalResult}}
+  <div class="dice-result">
+    Critical {{criticalResult.key}}: {{criticalResult.description}}
+  </div>
+
+  {{#each criticalResult.effects as |effect|}}
+      {{#if effect.cannot_parry}}
+      <div class="dice-result">
+        Cannot parry
+      </div>
+      {{/if}}
+      {{#if effect.damage}}
+      <div class="dice-result">
+        Damage : {{effect.damage}}
+      </div>
+      {{/if}}
+      {{#if effect.must_parry}}
+      <div class="dice-result">
+      Must parry
+      </div>
+      {{/if}}
+      {{#if effect.mustparry_duration}}
+      <div class="dice-result">
+      Must parry for {{effect.mustparry_duration}} rounds
+      </div>      
+      {{/if}}
+      {{#if effect.mustparry_value}}
+      <div class="dice-result">
+      Must parry with a value of {{effect.mustparry_value}}
+      </div>
+      {{/if}}
+      {{#if effect.round_bonus_duration}}
+      <div class="dice-result">
+      Bonus for {{effect.round_bonus_duration}} rounds
+      </div>
+      {{/if}}
+      {{#if effect.round_penalty_duration}}
+      <div class="dice-result">
+      Penalty for {{effect.round_penalty_duration}} rounds
+      </div>
+      {{/if}}
+      {{#if effect.stunned}}
+      <div class="dice-result">
+      Stunned
+      </div>
+      {{/if}}
+      {{#if effect.wounds_per_round}}
+      <div class="dice-result">
+      Wounds per round : {{effect.wounds_per_round}}
+      </div>
+      {{/if}}
+    </div>
+    {{/each}}
+  {{/if}}
+
 </div>

templates/sheets/apps/app_dice_roller.html

@@ -86,6 +86,22 @@
         <div>Misc Bonus:</div>
         <div><input name="miscBonus" value="0" /></div>
       </div>
+
+      {{#if weapon}}
+      <div class="dice-roller-item">
+        <div>Target armor class:</div>
+        <div>
+          <select name="targetArmorClass">
+            {{#select targetArmorClass}}
+            {{#each config.armor_values as |value key|}}
+              <option value="{{key}}">{{value}}</option>
+            {{/each}}
+            {{/select}}
+          </select>
+        </div>
+        {{/if}}
+    </div>
+
       <div class="roll-button-container">
         {{#each selectOptions as |option|}}
         <button type="submit" class="roll-button" data-value="{{option.value}}">{{option.text}}</button>

templates/sheets/items/rmfrp-weapon-sheet.html

@@ -88,7 +88,15 @@
                 {{selectOptions fumbleTables selected=system.fumble_table nameAttr="key" valueAttr="key" labelAttr="name"}}
               </select>
               <td>
-                <input class="short-input" name="system.fumble_column" type="text" value="{{system.fumble_column}}" data-dtype="String"/>
+                {{#if (eq system.fumble_table "fumble_non_weapon")}}
+                <select class="long-input" name="system.fumble_column" type="text" value="{{system.fumble_column}}" data-dtype="String">
+                  {{selectOptions fumblesNonWeapon selected=system.fumble_column nameAttr="key" valueAttr="key" labelAttr="name"}}
+                </select>
+                {{else}}
+                <select class="long-input" name="system.fumble_column" type="text" value="{{system.fumble_column}}" data-dtype="String">
+                  {{selectOptions fumblesWeapon selected=system.fumble_column nameAttr="key" valueAttr="key" labelAttr="name"}}
+                </select>
+                {{/if}} 
             </td>
           </td>
       </table>