From a611838d6c62f1b416720dcfa7af1407ecc60c67 Mon Sep 17 00:00:00 2001
From: The Happy Anarchist <no-reply@donotemail.com>
Date: Sat, 5 Sep 2020 14:20:42 -1000
Subject: [PATCH] Add Melee and Missile Damage bonus to tweaks

Melee and Missile Damage bonuses added to tweaks. Also fixed a bug in OSE code where AAC bonus was not working.
---
 src/lang/en.json                                |  6 ++++--
 src/module/actor/entity.js                      |  9 +++++++++
 src/template.json                               |  6 ++++++
 src/templates/actors/dialogs/tweaks-dialog.html | 16 ++++++++++++++--
 4 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/src/lang/en.json b/src/lang/en.json
index 97a6e02..f77d377 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -123,10 +123,12 @@
   "ACKS.AB": "Throw",
   "ACKS.MeleeShort": "MEL",
   "ACKS.Melee": "Melee",
-  "ACKS.MeleeBonus": "Melee Bonus",
+  "ACKS.MeleeBonus": "Melee Throw Bonus",
+  "ACKS.MeleeDamageBonus": "Melee Damage Bonus",
   "ACKS.MissileShort": "MIS",
   "ACKS.Missile": "Missile",
-  "ACKS.MissileBonus": "Missile Bonus",
+  "ACKS.MissileBonus": "Missile Throw Bonus",
+  "ACKS.MissileDamageBonus": "Missile Damage Bonus",
   "ACKS.Initiative": "Initiative",
   "ACKS.InitiativeBonus": "Initiative Bonus",
   "ACKS.InitiativeShort": "INIT",
diff --git a/src/module/actor/entity.js b/src/module/actor/entity.js
index 639784e..d1e490f 100644
--- a/src/module/actor/entity.js
+++ b/src/module/actor/entity.js
@@ -383,6 +383,11 @@ export class AcksActor extends Actor {
       dmgParts.push(data.scores.str.mod);
     }
 
+    // Add Melee mod to damage
+    if (attData.roll.type == "melee") {
+      dmgParts.push(data.damage.mod.melee);
+    }
+
     // Damage roll
     AcksDice.Roll({
       event: options.event,
@@ -447,6 +452,10 @@ export class AcksActor extends Actor {
     if (options.type == "melee") {
       dmgParts.push(data.scores.str.mod);
     }
+    // Add Melee mod to damage
+    if (options.type == "melee") {
+      dmgParts.push(data.damage.mod.melee);
+    }
     const rollData = {
       actor: this.data,
       item: attData.item,
diff --git a/src/template.json b/src/template.json
index e42fbb3..0ab0fa2 100644
--- a/src/template.json
+++ b/src/template.json
@@ -21,6 +21,12 @@
           "value": 0,
           "mod": 0
         },
+        "damage": {
+            "mod": {
+                "missile": 0
+                "melee": 0
+            }
+        },
         "thac0": {
           "value": 19,
           "bba": 0,
diff --git a/src/templates/actors/dialogs/tweaks-dialog.html b/src/templates/actors/dialogs/tweaks-dialog.html
index 051ba25..88947b5 100644
--- a/src/templates/actors/dialogs/tweaks-dialog.html
+++ b/src/templates/actors/dialogs/tweaks-dialog.html
@@ -45,6 +45,12 @@
       <input type="text" name="data.thac0.mod.melee" id="melee" value="{{data.thac0.mod.melee}}" data-dtype="Number" />
     </div>
   </div>
+  <div class="form-group">
+    <label>{{localize "ACKS.MeleeDamageBonus"}}</label>
+    <div class="form-fields">
+      <input type="text" name="data.damage.mod.melee" id="meleedmg" value="{{data.damage.mod.melee}}" data-dtype="Number" />
+    </div>
+  </div>
   <div class="form-group">
     <label>{{localize "ACKS.MissileBonus"}}</label>
     <div class="form-fields">
@@ -52,11 +58,17 @@
         data-dtype="Number" />
     </div>
   </div>
+  <div class="form-group">
+    <label>{{localize "ACKS.MissileDamageBonus"}}</label>
+    <div class="form-fields">
+      <input type="text" name="data.damage.mod.missile" id="missiledmg" value="{{data.damage.mod.missile}}" data-dtype="Number" />
+    </div>
+  </div>
   <div class="form-group">
     <label>{{localize "ACKS.ArmorClassBonus"}}</label>
     <div class="form-fields">
-      {{#if config.ascending}}
-      <input type="text" name="data.aac.mod" id="ac" value="{{data.aac.mod}}"
+      {{#if config.ascendingAC}}
+      <input type="text" name="data.aac.mod" id="aac" value="{{data.aac.mod}}"
         data-dtype="Number" />
       {{else}}
       <input type="text" name="data.ac.mod" id="ac" value="{{data.ac.mod}}"