From f8e09ddfc42e26febd5459013cf0c3c0e38ed2bf Mon Sep 17 00:00:00 2001
From: wesbaker <wes@wesbaker.com>
Date: Sun, 20 Dec 2020 10:32:36 -0500
Subject: [PATCH] Change damage die to a text field to provide more flexibility

---
 Old School Essentials - AAC/CHANGELOG.md |  6 ++++++
 Old School Essentials - AAC/OSE-AAC.html | 16 ++++++----------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Old School Essentials - AAC/CHANGELOG.md b/Old School Essentials - AAC/CHANGELOG.md
index 2fdf18cedb..39f6000b4e 100644
--- a/Old School Essentials - AAC/CHANGELOG.md	
+++ b/Old School Essentials - AAC/CHANGELOG.md	
@@ -2,6 +2,12 @@
 
 [GitHub Project Status board](https://github.com/wesbaker/roll20-character-sheets/projects/1)
 
+## 1.8.0
+
+### Changed
+
+- Change damage die to a text field to provide more flexibility
+
 ## 1.7.1
 
 ### Fixed
diff --git a/Old School Essentials - AAC/OSE-AAC.html b/Old School Essentials - AAC/OSE-AAC.html
index 16652c12fa..748e1e3bda 100644
--- a/Old School Essentials - AAC/OSE-AAC.html	
+++ b/Old School Essentials - AAC/OSE-AAC.html	
@@ -472,13 +472,7 @@
           <option value="ranged">Ranged</option>
         </select>
         <input type="number" name="attr_weaponAttackBonus" value="0" />
-        <select name="attr_weaponDamageDie" class="half-input">
-          <option value="d4">d4</option>
-          <option selected value="d6">d6</option>
-          <option value="d8">d8</option>
-          <option value="d10">d10</option>
-          <option value="d12">d12</option>
-        </select>
+        <input type="text" name="attr_weaponDamageDie" value="1d6" class="input-as-number" class="input-as-number" />
         <input type="number" name="attr_weaponDamageBonus" value="0" />
         <input type="number" min="0" name="attr_weaponWeight" value="0" />
       </div>
@@ -917,7 +911,7 @@
           value="&{template:simple} {{roll=Attack with @{weaponName}}} {{attack=[[1d20+@{optionalModQuery}]]}} {{damage=[[@{weaponDamageDie}]]}} {{description=@{weaponDescription}}} {{attackMatrix9=@{monsterAttackMatrix9}}} {{attackMatrix8=@{monsterAttackMatrix8}}} {{attackMatrix7=@{monsterAttackMatrix7}}} {{attackMatrix6=@{monsterAttackMatrix6}}} {{attackMatrix5=@{monsterAttackMatrix5}}} {{attackMatrix4=@{monsterAttackMatrix4}}} {{attackMatrix3=@{monsterAttackMatrix3}}} {{attackMatrix2=@{monsterAttackMatrix2}}} {{attackMatrix1=@{monsterAttackMatrix1}}} {{attackMatrix0=@{monsterAttackMatrix0}}}"></button>
         <input type="number" min="0" name="attr_weaponAttacks" value="1" />
         <input type="text" name="attr_weaponName" placeholder="Weapon" data-i18n-placeholder="weapon" />
-        <input type="text" name="attr_weaponDamageDie" value="1d6+1" />
+        <input type="text" name="attr_weaponDamageDie" value="1d6" class="input-as-number" />
         <input type="text" name="attr_weaponDescription" value="" />
       </div>
     </fieldset>
@@ -1111,12 +1105,14 @@
     {{#result}}
     <span class="sheet-template-result-only">{{result}}</span>
     {{/result}}
-    {{#allprops() roll result description morale reaction attackMatrix9 attackMatrix8 attackMatrix7 attackMatrix6 attackMatrix5 attackMatrix4 attackMatrix3 attackMatrix2 attackMatrix1 attackMatrix0}}
+    {{#allprops() roll result description morale reaction attackMatrix9 attackMatrix8 attackMatrix7 attackMatrix6
+    attackMatrix5 attackMatrix4 attackMatrix3 attackMatrix2 attackMatrix1 attackMatrix0}}
     <div class="sheet-template-row">
       <span class="sheet-template-term">{{key}}:</span>
       <span class="sheet-template-result">{{value}}</span>
     </div>
-    {{/allprops() roll result description morale reaction attackMatrix9 attackMatrix8 attackMatrix7 attackMatrix6 attackMatrix5 attackMatrix4 attackMatrix3 attackMatrix2 attackMatrix1 attackMatrix0}}
+    {{/allprops() roll result description morale reaction attackMatrix9 attackMatrix8 attackMatrix7 attackMatrix6
+    attackMatrix5 attackMatrix4 attackMatrix3 attackMatrix2 attackMatrix1 attackMatrix0}}
     {{#description}}
     <div class="sheet-template-description">{{description}}</div>
     {{/description}}