From 2c57dd689a03ffc1cc19c55967d91dcb74bebd93 Mon Sep 17 00:00:00 2001
From: Peter Bjerg Lidegaard <dbf.black.bull@gmail.com>
Date: Sat, 13 Jan 2024 22:47:59 +0100
Subject: [PATCH] - Added damage description to PO crit 2 system - Added damage
 description for all damage rolls - Added hit description for all hit rolls -
 Moved Weap vs armor to Standard rules. Removed the logic from PO rules

---
 ADnD_2E_Revised/2ESheet.html                  | 241 +++++++++---------
 ADnD_2E_Revised/html/changelog.html           |   2 +
 .../html/tabs/character-tab/weapons-tab.html  |  82 ------
 .../players-option-weapons-tab.html           |  29 ++-
 .../weapons-tab/standard-weapons-tab.html     | 104 +++++++-
 .../html/tabs/sheet-settings-tab.html         |   2 +-
 ADnD_2E_Revised/javascript/sheetWorkers.js    |  22 +-
 7 files changed, 242 insertions(+), 240 deletions(-)

diff --git a/ADnD_2E_Revised/2ESheet.html b/ADnD_2E_Revised/2ESheet.html
index b486d458629f..d3a2273572bc 100644
--- a/ADnD_2E_Revised/2ESheet.html
+++ b/ADnD_2E_Revised/2ESheet.html
@@ -18,6 +18,8 @@ <h2 style="color: black;">Changes in <span name="attr_version"></span></h2>
                 <li>Fixed cast time for <strong>Protection From Evil (Wizard)</strong> from 1 turn to +1 initiative modifier</li>
                 <li>Removed incorrect material components for <strong>Endure Cold/Endure Heat</strong></li>
                 <li>Fixed spell description layout for <strong>Orison</strong></li>
+                <li>Removed Weapon Type vs Armor type modifiers from the Hit roll under the Player's Option ruleset, as the Player's Option: Combat & Tactics has its own set of modifiers that differ from those given in the Player's Handbook</li>
+                <li>Weapon Type vs Armor type is now only visible under the <strong>Standard</strong> tab</li>
             </ul>
             <hr>
             <p>
@@ -1554,88 +1556,6 @@ <h4>Rule set</h4>
                 </tr>
             </table>
             <br>
-    
-            <details>
-                <summary><b>Select armor opponent is wearing for bonuses/penalties</b></summary>
-                <table>
-                    <thead class="sheet-default-header sheet-centering-horizontal">
-                    <tr>
-                        <td>Banded<br>Mail</td>
-                        <td class="sheet-centering-padding-5">|</td>
-                        <td>Brigandine</td>
-                        <td class="sheet-centering-padding-5">|</td>
-                        <td >Chain<br>Mail</td>
-                        <td class="sheet-centering-padding-5">|</td>
-                        <td>Field<br>Plate</td>
-                        <td class="sheet-centering-padding-5">|</td>
-                        <td>Full<br>Plate</td>
-                        <td class="sheet-centering-padding-5">|</td>
-                        <td>Leather, Hide,<br>& Padded</td>
-                        <td class="sheet-centering-padding-5">|</td>
-                        <td>Plate Mail /<br>Bronze Plate Mail</td>
-                        <td class="sheet-centering-padding-5">|</td>
-                        <td>Ring<br>Mail</td>
-                        <td class="sheet-centering-padding-5">|</td>
-                        <td>Scale<br>Mail</td>
-                        <td class="sheet-centering-padding-5">|</td>
-                        <td>Splint<br>Mail</td>
-                        <td class="sheet-centering-padding-5">|</td>
-                        <td>Studded<br>Leather</td>
-                    </tr>
-                    </thead>
-                    <tr class="sheet-centering">
-                        <td><label><input type="checkbox" name="attr_banded-mail" title="@{banded-mail}" value="1"/><span></span></label></td>
-                        <td></td>
-                        <td><label><input type="checkbox" name="attr_brigandine" title="@{brigandine}" value="1"/><span></span></label></td>
-                        <td></td>
-                        <td><label><input type="checkbox" name="attr_chainmail" title="@{chainmail}" value="1"/><span></span></label></td>
-                        <td></td>
-                        <td><label><input type="checkbox" name="attr_field-plate" title="@{field-plate}" value="1"/><span></span></label></td>
-                        <td></td>
-                        <td><label><input type="checkbox" name="attr_full-plate" title="@{full-plate}" value="1"/><span></span></label></td>
-                        <td></td>
-                        <td><label><input type="checkbox" name="attr_leather-hide-padded" title="@{leather-hide-padded}" value="1"/><span></span></label></td>
-                        <td></td>
-                        <td><label><input type="checkbox" name="attr_plate-mail" title="@{plate-mail}" value="1"/><span></span></label></td>
-                        <td></td>
-                        <td><label><input type="checkbox" name="attr_ring-mail" title="@{ring-mail}" value="1"/><span></span></label></td>
-                        <td></td>
-                        <td><label><input type="checkbox" name="attr_scale-mail" title="@{scale-mail}" value="1"/><span></span></label></td>
-                        <td></td>
-                        <td><label><input type="checkbox" name="attr_splint-mail" title="@{splint-mail}" value="1"/><span></span></label></td>
-                        <td></td>
-                        <td><label><input type="checkbox" name="attr_studded-leather" title="@{studded-leather}" value="1"/><span></span></label></td>
-                    </tr>
-                </table>
-                <input style="display: none;" name="attr_armortype-slash" value="
-                    (@{banded-mail}*-2)+
-                    (@{brigandine}*-1)+
-                    (@{chainmail}*-2)+
-                    (@{field-plate}*-3)+
-                    (@{full-plate}*-4)+
-                    (@{plate-mail}*-3)+
-                    (@{ring-mail}*-1)+
-                    (@{studded-leather}*-2)
-                    ">
-                <input style="display: none;" name="attr_armortype-pierce" value="
-                    (@{brigandine}*-1)+
-                    (@{field-plate}*-1)+
-                    (@{full-plate}*-3)+
-                    (@{leather-hide-padded}*2)+
-                    (@{plate-mail}*-1)+
-                    (@{ring-mail}*-1)+
-                    (@{scale-mail}*-1)+
-                    (@{splint-mail}*-1)+
-                    (@{studded-leather}*-1)
-                    ">
-                <input style="display: none;" name="attr_armortype-blunt" value="
-                    (@{banded-mail}*-1)+
-                    (@{chainmail}*2)+
-                    (@{splint-mail}*-2)
-                    ">
-            </details>
-            <br>
-    
             <div style="display: none;">
                 <button type="roll" name="roll_acid-hit" value="/em rolls [[2d4]] acid damage using their Acid! (Direct hit)"></button>
                 <button type="roll" name="roll_acid-splash" value="/em rolls [[1]] acid damage using their Acid! (Splash)"></button>
@@ -1652,6 +1572,86 @@ <h4>Rule set</h4>
             </div>
     
             <div class="sheet-tab-content sheet-section-weapon-standard">
+                <details>
+                        <summary><b>Select armor opponent is wearing for bonuses/penalties</b></summary>
+                        <table>
+                            <thead class="sheet-default-header sheet-centering-horizontal">
+                            <tr>
+                                <td>Banded<br>Mail</td>
+                                <td class="sheet-centering-padding-5">|</td>
+                                <td>Brigandine</td>
+                                <td class="sheet-centering-padding-5">|</td>
+                                <td >Chain<br>Mail</td>
+                                <td class="sheet-centering-padding-5">|</td>
+                                <td>Field<br>Plate</td>
+                                <td class="sheet-centering-padding-5">|</td>
+                                <td>Full<br>Plate</td>
+                                <td class="sheet-centering-padding-5">|</td>
+                                <td>Leather, Hide,<br>& Padded</td>
+                                <td class="sheet-centering-padding-5">|</td>
+                                <td>Plate Mail /<br>Bronze Plate Mail</td>
+                                <td class="sheet-centering-padding-5">|</td>
+                                <td>Ring<br>Mail</td>
+                                <td class="sheet-centering-padding-5">|</td>
+                                <td>Scale<br>Mail</td>
+                                <td class="sheet-centering-padding-5">|</td>
+                                <td>Splint<br>Mail</td>
+                                <td class="sheet-centering-padding-5">|</td>
+                                <td>Studded<br>Leather</td>
+                            </tr>
+                            </thead>
+                            <tr class="sheet-centering">
+                                <td><label><input type="checkbox" name="attr_banded-mail" title="@{banded-mail}" value="1"/><span></span></label></td>
+                                <td></td>
+                                <td><label><input type="checkbox" name="attr_brigandine" title="@{brigandine}" value="1"/><span></span></label></td>
+                                <td></td>
+                                <td><label><input type="checkbox" name="attr_chainmail" title="@{chainmail}" value="1"/><span></span></label></td>
+                                <td></td>
+                                <td><label><input type="checkbox" name="attr_field-plate" title="@{field-plate}" value="1"/><span></span></label></td>
+                                <td></td>
+                                <td><label><input type="checkbox" name="attr_full-plate" title="@{full-plate}" value="1"/><span></span></label></td>
+                                <td></td>
+                                <td><label><input type="checkbox" name="attr_leather-hide-padded" title="@{leather-hide-padded}" value="1"/><span></span></label></td>
+                                <td></td>
+                                <td><label><input type="checkbox" name="attr_plate-mail" title="@{plate-mail}" value="1"/><span></span></label></td>
+                                <td></td>
+                                <td><label><input type="checkbox" name="attr_ring-mail" title="@{ring-mail}" value="1"/><span></span></label></td>
+                                <td></td>
+                                <td><label><input type="checkbox" name="attr_scale-mail" title="@{scale-mail}" value="1"/><span></span></label></td>
+                                <td></td>
+                                <td><label><input type="checkbox" name="attr_splint-mail" title="@{splint-mail}" value="1"/><span></span></label></td>
+                                <td></td>
+                                <td><label><input type="checkbox" name="attr_studded-leather" title="@{studded-leather}" value="1"/><span></span></label></td>
+                            </tr>
+                        </table>
+                        <input style="display: none;" name="attr_armortype-slash" value="
+                            (@{banded-mail}*-2)+
+                            (@{brigandine}*-1)+
+                            (@{chainmail}*-2)+
+                            (@{field-plate}*-3)+
+                            (@{full-plate}*-4)+
+                            (@{plate-mail}*-3)+
+                            (@{ring-mail}*-1)+
+                            (@{studded-leather}*-2)
+                            ">
+                        <input style="display: none;" name="attr_armortype-pierce" value="
+                            (@{brigandine}*-1)+
+                            (@{field-plate}*-1)+
+                            (@{full-plate}*-3)+
+                            (@{leather-hide-padded}*2)+
+                            (@{plate-mail}*-1)+
+                            (@{ring-mail}*-1)+
+                            (@{scale-mail}*-1)+
+                            (@{splint-mail}*-1)+
+                            (@{studded-leather}*-1)
+                            ">
+                        <input style="display: none;" name="attr_armortype-blunt" value="
+                            (@{banded-mail}*-1)+
+                            (@{chainmail}*2)+
+                            (@{splint-mail}*-2)
+                            ">
+                    </details>
+                <br>
                 <input type="radio" name="attr_tab70" class="sheet-tab sheet-tab70" value="1" checked/><span class="sheet-tab sheet-tab70">Melee</span>&nbsp;
                 <input type="radio" name="attr_tab70" class="sheet-tab sheet-tab71" value="2"/><span class="sheet-tab sheet-tab71">Ranged</span>
                 <br>
@@ -1743,7 +1743,7 @@ <h4>Rule set</h4>
                             <td><input type="text" name="attr_attacknum" title="@{repeating_weapons_$X_attacknum}" class="sheet-table-dynamic" value="1"></td>
                             <td><input type="text" name="attr_attackadj" title="@{repeating_weapons_$X_attackadj}" class="sheet-table-dynamic" value="0"></td>
                             <td><input type="text" name="attr_ThAC0" title="@{repeating_weapons_$X_ThAC0}" class="sheet-small" value="20"></td>
-                            <td><button type="roll" name="roll_hit1" title="%{repeating_weapons_$X_hit1}" value="/em hits an AC of [[ [[@{ThAC0}]]-(1d20cs>@{crit-thresh}+([[(@{attackadj})+(@{prof-level})+((@{strengthhit})*@{strbonus})+(@{weaptype-slash}*(@{armortype-slash}))+(@{weaptype-pierce}*(@{armortype-pierce}))+(@{weaptype-blunt}*(@{armortype-blunt}))+(@{temp-attackadj})+(@{misc-mod})]]))]] using their @{weaponname}">Hit</button></td>
+                            <td><button type="roll" name="roll_hit1" title="%{repeating_weapons_$X_hit1}" value="/em hits an AC of [[ [[@{ThAC0}]]-(1d20cs>@{crit-thresh}+([[(@{strengthhit})*@{strbonus}]] [Strength])+(@{prof-level} [Proficiency])+(@{attackadj} [Atk Adj])+([[(@{weaptype-slash}*(@{armortype-slash}))+(@{weaptype-pierce}*(@{armortype-pierce}))+(@{weaptype-blunt}*(@{armortype-blunt}))]] [Weapon vs Armor])+(@{temp-attackadj} [Temp buff])+(@{misc-mod}))]] using their @{weaponname}">Hit</button></td>
                             <td><input type="text" name="attr_crit-thresh" title="@{repeating_weapons_$X_crit-thresh}" class="sheet-small" value="20"></td>
                             <td><input type="text" name="attr_range" title="@{repeating_weapons_$X_range}" class="sheet-short"></td>
                             <td><input type="text" name="attr_size" title="@{repeating_weapons_$X_size}" class="sheet-table-dynamic"></td>
@@ -1751,7 +1751,7 @@ <h4>Rule set</h4>
                             <td><label><input type="checkbox" name="attr_weaptype-pierce" title="@{repeating_weapons_$X_weaptype-pierce}" value="1"/><span></span></label></td>
                             <td><label><input type="checkbox" name="attr_weaptype-blunt" title="@{repeating_weapons_$X_weaptype-blunt}" value="1"/><span></span></label></td>
                             <td><input type="text" name="attr_weapspeed" title="@{repeating_weapons_$X_weapspeed}" class="sheet-small"></td>
-                            <td><button type="roll" name="roll_init" title="%{repeating_weapons_$X_init}" value="/gmroll [[{1d10+[[@{weapspeed}-(@{temp-speedadj})-(@{misc-mod})]], {1}}kh1]] [Initiative (@{weaponname})]&{tracker}">Initiative</button></td>
+                            <td><button type="roll" name="roll_init" title="%{repeating_weapons_$X_init}" value="/gmroll [[{1d10+(@{weapspeed} [Weapon])-(@{temp-speedadj} [Temp buff])-(@{misc-mod}), {1}}kh1]] [Initiative (@{weaponname})]&{tracker}">Initiative</button></td>
                         </tr>
                     </table>
                     </fieldset>
@@ -1799,11 +1799,11 @@ <h4>Melee Damage</h4>
                             <td><label><input type="checkbox" name="attr_specialist-damage" title="@{repeating_weapons-damage_$X_specialist-damage}" value="2"/><span></span></label></td>
                             <td><input type="text" name="attr_damadj" title="@{repeating_weapons-damage_$X_damadj}" class="sheet-table-dynamic" value="0"></td>
                             <td><input type="text" name="attr_damsm" title="@{repeating_weapons-damage_$X_damsm}" class="sheet-short"></td>
-                            <td><button type="roll" name="roll_attacksm" title="%{repeating_weapons-damage_$X_attacksm}" value="/em rolls [[@{damsm}+([[(@{damadj})+(@{specialist-damage})+((@{strengthdmg})*@{strbonus1})+(@{temp-damadj})+(@{misc-mod})]])]] damage using their @{weaponname1}! (vs. Small/Medium)"></button></td>
-                            <td><button type="roll" name="roll_critsm" title="%{repeating_weapons-damage_$X_critsm}" value="/em rolls [[(@{damsm})+(@{damsm})+([[(@{damadj})+(@{specialist-damage})+((@{strengthdmg})*@{strbonus1})+(@{temp-damadj})+(@{misc-mod})]])]] critical damage using their @{weaponname1}! (vs. Small/Medium)">Crit</button></td>
+                            <td><button type="roll" name="roll_attacksm" title="%{repeating_weapons-damage_$X_attacksm}" value="/em rolls [[(@{damsm})([[(@{strengthdmg})*@{strbonus1}]] [Strength])+(@{specialist-damage} [Specialization])+(@{damadj} [Dmg Adj])+(@{temp-damadj} [Temp buff])+(@{misc-mod})]] damage using their @{weaponname1}! (vs. Small/Medium)"></button></td>
+                            <td><button type="roll" name="roll_critsm" title="%{repeating_weapons-damage_$X_critsm}" value="/em rolls [[(@{damsm})+(@{damsm})([[(@{strengthdmg})*@{strbonus1}]] [Strength])+(@{specialist-damage} [Specialization])+(@{damadj} [Dmg Adj])+(@{temp-damadj} [Temp buff])+(@{misc-mod})]] critical damage using their @{weaponname1}! (vs. Small/Medium)">Crit</button></td>
                             <td><input type="text" name="attr_daml" title="@{repeating_weapons-damage_$X_daml}" class="sheet-short"></td>
-                            <td><button type="roll" name="roll_attackl" title="%{repeating_weapons-damage_$X_attackl}" value="/em rolls [[@{daml}+([[(@{damadj})+(@{specialist-damage})+((@{strengthdmg})*@{strbonus1})+(@{temp-damadj})+(@{misc-mod})]])]] damage using their @{weaponname1}! (vs. Large)"></button></td>
-                            <td><button type="roll" name="roll_critl" title="%{repeating_weapons-damage_$X_critl}" value="/em rolls [[(@{daml})+(@{daml})+([[(@{damadj})+(@{specialist-damage})+((@{strengthdmg})*@{strbonus1})+(@{temp-damadj})+(@{misc-mod})]])]] critical damage using their @{weaponname1}! (vs. Large)">Crit</button></td>
+                            <td><button type="roll" name="roll_attackl" title="%{repeating_weapons-damage_$X_attackl}" value="/em rolls [[(@{daml})([[(@{strengthdmg})*@{strbonus1}]] [Strength])+(@{specialist-damage} [Specialization])+(@{damadj} [Dmg Adj])+(@{temp-damadj} [Temp buff])+(@{misc-mod})]] damage using their @{weaponname1}! (vs. Large)"></button></td>
+                            <td><button type="roll" name="roll_critl" title="%{repeating_weapons-damage_$X_critl}" value="/em rolls [[(@{daml})+(@{daml})([[(@{strengthdmg})*@{strbonus1}]] [Strength])+(@{specialist-damage} [Specialization])+(@{damadj} [Dmg Adj])+(@{temp-damadj} [Temp buff])+(@{misc-mod})]] critical damage using their @{weaponname1}! (vs. Large)">Crit</button></td>
                         </tr>
                     </table>
                     </fieldset>
@@ -1921,7 +1921,7 @@ <h4>Weapon Notes</h4>
                             <td><input type="text" name="attr_attacknum2" title="@{repeating_weapons2_$X_attacknum2}" class="sheet-cent" value="1"></td>
                             <td><input type="text" name="attr_attackadj2" title="@{repeating_weapons2_$X_attackadj2}" class="sheet-table-dynamic" value="0"></td>
                             <td><input type="text" name="attr_ThAC02" title="@{repeating_weapons2_$X_ThAC02}" class="sheet-small" value="20"></td>
-                            <td><button type="roll" name="roll_hit12" title="%{repeating_weapons2_$X_hit12}" value="/em hits an AC of [[ [[@{ThAC02}]]-(1d20cs>@{crit-thresh2}+([[(@{attackadj2})+((@{strengthhit})*@{strbonus2})+((@{dexmissile})*@{dexbonus2})+(@{prof-level2})+(@{range-mod-attack})+(@{weaptype-slash2}*(@{armortype-slash}))+(@{weaptype-pierce2}*(@{armortype-pierce}))+(@{weaptype-blunt2}*(@{armortype-blunt}))+(@{temp-attackadj})+(@{misc-mod})]]))]] using their @{weaponname2}">Hit</button></td>
+                            <td><button type="roll" name="roll_hit12" title="%{repeating_weapons2_$X_hit12}" value="/em hits an AC of [[ [[@{ThAC02}]]-(1d20cs>@{crit-thresh2}+([[(@{strengthhit})*@{strbonus2}]] [Strength])+([[(@{dexmissile})*@{dexbonus2}]] [Dexterity])+(@{prof-level2} [Proficiency])+(@{range-mod-attack} [Range mod])+(@{attackadj2} [Atk Adj])+([[(@{weaptype-slash2}*(@{armortype-slash}))+(@{weaptype-pierce2}*(@{armortype-pierce}))+(@{weaptype-blunt2}*(@{armortype-blunt}))]] [Weapon vs Armor])+(@{temp-attackadj} [Temp buff])+(@{misc-mod}))]] using their @{weaponname2}">Hit</button></td>
                             <td><input type="text" name="attr_crit-thresh2" title="@{repeating_weapons2_$X_crit-thresh2}" class="sheet-small" value="20"></td>
                             <td><input type="text" name="attr_range2" title="@{repeating_weapons2_$X_range2}" class="sheet-mintext"></td>
                             <td><input type="text" name="attr_size2" title="@{repeating_weapons2_$X_size2}" class="sheet-table-dynamic"></td>
@@ -1929,7 +1929,7 @@ <h4>Weapon Notes</h4>
                             <td><label><input type="checkbox" name="attr_weaptype-pierce2" title="@{repeating_weapons2_$X_weaptype-pierce2}" value="1"/><span></span></label></td>
                             <td><label><input type="checkbox" name="attr_weaptype-blunt2" title="@{repeating_weapons2_$X_weaptype-blunt2}" value="1"/><span></span></label></td>
                             <td><input type="text" name="attr_weapspeed2" title="@{repeating_weapons2_$X_weapspeed2}" class="sheet-small"></td>
-                            <td><button type="roll" name="roll_init2" title="%{repeating_weapons2_$X_init2}" value="/gmroll [[{1d10+[[@{weapspeed2}-(@{temp-speedadj})-(@{misc-mod})]], {1}}kh1]] [Initiative (@{weaponname2})]&{tracker}">Initiative</button></td>
+                            <td><button type="roll" name="roll_init2" title="%{repeating_weapons2_$X_init2}" value="/gmroll [[{1d10+((@{weapspeed2} [Weapon])-(@{temp-speedadj} [Temp buff])-(@{misc-mod})), {1}}kh1]] [Initiative (@{weaponname2})]&{tracker}">Initiative</button></td>
                         </tr>
                     </table>
                     </fieldset>
@@ -1979,11 +1979,11 @@ <h4>Ammunition</h4>
                             </td>
                             <td><input type="text" name="attr_damadj2" title="@{repeating_ammo_$X_damadj2}" class="sheet-table-dynamic" value="0"></td>
                             <td><input type="text" name="attr_damsm2" title="@{repeating_ammo_$X_damsm2}" class="sheet-short"></td>
-                            <td><button type="roll" name="roll_attacksm2" title="%{repeating_ammo_$X_attacksm2}" value="/em rolls [[@{damsm2}+([[(@{damadj2})+((@{strengthdmg})*@{strbonus3})+(@{temp-damadj})+(@{misc-mod})]])]] damage using their @{ammoname}! (vs. Small/Medium)"></button></td>
-                            <td><button type="roll" name="roll_critsm2" title="%{repeating_ammo_$X_critsm2}" value="/em rolls [[(@{damsm2})+(@{damsm2})+([[(@{damadj2})+((@{strengthdmg})*@{strbonus3})+(@{temp-damadj})+(@{misc-mod})]])]] critical damage using their @{ammoname}! (vs. Small/Medium)">Crit</button></td>
+                            <td><button type="roll" name="roll_attacksm2" title="%{repeating_ammo_$X_attacksm2}" value="/em rolls [[(@{damsm2})+([[(@{strengthdmg})*@{strbonus3}]] [Strength])+(@{damadj2} [Dmg Adj])+(@{temp-damadj} [Temp buff])+(@{misc-mod})]] damage using their @{ammoname}! (vs. Small/Medium)"></button></td>
+                            <td><button type="roll" name="roll_critsm2" title="%{repeating_ammo_$X_critsm2}" value="/em rolls [[(@{damsm2})+(@{damsm2})+([[(@{strengthdmg})*@{strbonus3}]] [Strength])+(@{damadj2} [Dmg Adj])+(@{temp-damadj} [Temp buff])+(@{misc-mod})]] critical damage using their @{ammoname}! (vs. Small/Medium)">Crit</button></td>
                             <td><input type="text" name="attr_daml2" title="@{repeating_ammo_$X_daml2}" class="sheet-short"></td>
-                            <td><button type="roll" name="roll_attackl2" title="%{repeating_ammo_$X_attackl2}" value="/em rolls [[@{daml2}+([[(@{damadj2})+((@{strengthdmg})*@{strbonus3})+(@{temp-damadj})+(@{misc-mod})]])]] damage using their @{ammoname}! (vs. Large)"></button></td>
-                            <td><button type="roll" name="roll_critl2" title="%{repeating_ammo_$X_critl2}" value="/em rolls [[(@{daml2})+(@{daml2})+([[(@{damadj2})+((@{strengthdmg})*@{strbonus3})+(@{temp-damadj})+(@{misc-mod})]])]] critical damage using their @{ammoname}! (vs. Large)">Crit</button></td>
+                            <td><button type="roll" name="roll_attackl2" title="%{repeating_ammo_$X_attackl2}" value="/em rolls [[(@{daml2})+([[(@{strengthdmg})*@{strbonus3}]] [Strength])+(@{damadj2} [Dmg Adj])+(@{temp-damadj} [Temp buff])+(@{misc-mod})]] damage using their @{ammoname}! (vs. Large)"></button></td>
+                            <td><button type="roll" name="roll_critl2" title="%{repeating_ammo_$X_critl2}" value="/em rolls [[(@{daml2})+(@{daml2})+([[(@{strengthdmg})*@{strbonus3}]] [Strength])+(@{damadj2} [Dmg Adj])+(@{temp-damadj} [Temp buff])+(@{misc-mod})]] critical damage using their @{ammoname}! (vs. Large)">Crit</button></td>
                             <td><input type="number" name="attr_ammoremain" title="@{repeating_ammo_$X_ammoremain}" class="sheet-table-dynamic"></td>
                         </tr>
                     </table>
@@ -1996,6 +1996,7 @@ <h4>Weapon Notes</h4>
                 </div>
             </div>
             <div class="sheet-tab-content sheet-section-weapon-player-option">
+                <br>
                 <input type="radio" name="attr_tab83" class="sheet-tab sheet-tab83" value="1" checked/><span class="sheet-tab sheet-tab83">Melee</span>&nbsp;
                 <input type="radio" name="attr_tab83" class="sheet-tab sheet-tab84" value="2"/><span class="sheet-tab sheet-tab84">Ranged</span>
                 <br>
@@ -2093,7 +2094,7 @@ <h4>Weapon Notes</h4>
                             <td><input type="text" name="attr_attacknum" title="@{repeating_weapons_$X_attacknum}" class="sheet-table-dynamic" value="1"></td>
                             <td><input type="text" name="attr_attackadj" title="@{repeating_weapons_$X_attackadj}" class="sheet-table-dynamic" value="0"></td>
                             <td><input type="text" name="attr_ThAC0" title="@{repeating_weapons_$X_ThAC0}" class="sheet-small" value="20"></td>
-                            <td><button type="roll" name="roll_hit" title="%{repeating_weapons_$X_hit}" value="/em hits an AC of [[ [[@{ThAC0}]]-(1d20cs>@{crit-thresh}+([[(@{attackadj})+(@{prof-level})+((@{strengthhit})*@{strbonus})+((@{dexmissile})*@{dexbonus})+(@{weaptype-slash}*(@{armortype-slash}))+(@{weaptype-pierce}*(@{armortype-pierce}))+(@{weaptype-blunt}*(@{armortype-blunt}))+(@{temp-attackadj})+(@{misc-mod})]]))]] using their @{weaponname}">Hit</button></td>
+                            <td><button type="roll" name="roll_hit" title="%{repeating_weapons_$X_hit}" value="/em hits an AC of [[ [[@{ThAC0}]]-(1d20cs>@{crit-thresh}+([[(@{strengthhit})*@{strbonus}]] [Strength])+([[(@{dexmissile})*@{dexbonus}]] [Dexterity])+(@{prof-level} [Proficiency])+(@{attackadj} [Atk Adj])+(@{temp-attackadj} [Temp buff])+(@{misc-mod}))]] using their @{weaponname}">Hit</button></td>
                             <td><input type="text" name="attr_crit-thresh" title="@{repeating_weapons_$X_crit-thresh}" class="sheet-small" value="20"></td>
                             <td><input type="text" name="attr_range" title="@{repeating_weapons_$X_range}" class="sheet-short"></td>
                             <td><input type="text" name="attr_size" title="@{repeating_weapons_$X_size}" class="sheet-table-dynamic"></td>
@@ -2101,7 +2102,7 @@ <h4>Weapon Notes</h4>
                             <td><label><input type="checkbox" name="attr_weaptype-pierce" title="@{repeating_weapons_$X_weaptype-pierce}" value="1"/><span></span></label></td>
                             <td><label><input type="checkbox" name="attr_weaptype-blunt" title="@{repeating_weapons_$X_weaptype-blunt}" value="1"/><span></span></label></td>
                             <td><input type="text" name="attr_weapspeed" title="@{repeating_weapons_$X_weapspeed}" class="sheet-small"></td>
-                            <td><button type="roll" name="roll_init" title="%{repeating_weapons_$X_init}" value="/gmroll [[{1d10+[[@{weapspeed}-(@{temp-speedadj})-(@{misc-mod})]], {1}}kh1]] [Initiative (@{weaponname})]&{tracker}">Initiative</button></td>
+                            <td><button type="roll" name="roll_init" title="%{repeating_weapons_$X_init}" value="/gmroll [[{1d10+(@{weapspeed} [Weapon])-(@{temp-speedadj} [Temp buff])-(@{misc-mod}), {1}}kh1]] [Initiative (@{weaponname})]&{tracker}">Initiative</button></td>
                         </tr>
                     </table>
                     </fieldset>
@@ -2169,13 +2170,13 @@ <h4>Melee Damage</h4>
                                 <td><label><input type="checkbox" name="attr_mastery-damage" title="@{repeating_weapons-damage_$X_mastery-damage}" value="3"/><span></span></label></td>
                                 <td><input type="text" name="attr_damadj" title="@{repeating_weapons-damage_$X_damadj}" class="sheet-table-dynamic" value="0"></td>
                                 <td><input type="text" name="attr_damsm" title="@{repeating_weapons-damage_$X_damsm}" class="sheet-short"></td>
-                                <td><button type="roll" name="roll_attacksm" title="%{repeating_weapons-damage_$X_attacksm}" value="/em rolls [[@{damsm}+([[(@{damadj})+({{@{specialist-damage},@{mastery-damage}}kh1})+((@{strengthdmg})*@{strbonus1})+((@{dexmissile})*@{dexbonus1})+(@{temp-damadj})+(@{misc-mod})]])]] damage using their @{weaponname1}! (vs. Small/Medium)"></button></td>
-                                <td><button type="roll" name="roll_critsm" title="%{repeating_weapons-damage_$X_critsm}" value="/em rolls [[(@{damsm})*2+([[(@{damadj})+({{@{specialist-damage},@{mastery-damage}}kh1})+((@{strengthdmg})*@{strbonus1})+((@{dexmissile})*@{dexbonus1})+(@{temp-damadj})+(@{misc-mod})]])]] critical damage using their @{weaponname1}! (vs. Small/Medium)">Crit</button></td>
+                                <td><button type="roll" name="roll_attacksm" title="%{repeating_weapons-damage_$X_attacksm}" value="/em rolls [[(@{damsm})+([[(@{strengthdmg})*@{strbonus1}]] [Strength])+([[(@{dexmissile})*@{dexbonus1}]] [Dexterity])+([[{@{specialist-damage},@{mastery-damage}}kh1]] [Proficiency])+(@{damadj} [Dmg Adj])+(@{temp-damadj} [Temp buff])+(@{misc-mod})]] damage using their @{weaponname1}! (vs. Small/Medium)"></button></td>
+                                <td><button type="roll" name="roll_critsm" title="%{repeating_weapons-damage_$X_critsm}" value="/em rolls [[(@{damsm})*2+([[(@{strengthdmg})*@{strbonus1}]] [Strength])+([[(@{dexmissile})*@{dexbonus1}]] [Dexterity])+([[{@{specialist-damage},@{mastery-damage}}kh1]] [Proficiency])+(@{damadj} [Dmg Adj])+(@{temp-damadj} [Temp buff])+(@{misc-mod})]] critical damage using their @{weaponname1}! (vs. Small/Medium)">Crit</button></td>
                                 <td><input type="text" name="attr_daml" title="@{repeating_weapons-damage_$X_daml}" class="sheet-short"></td>
-                                <td><button type="roll" name="roll_attackl" title="%{repeating_weapons-damage_$X_attackl}" value="/em rolls [[@{daml}+([[(@{damadj})+({{@{specialist-damage},@{mastery-damage}}kh1})+((@{strengthdmg})*@{strbonus1})+((@{dexmissile})*@{dexbonus1})+(@{temp-damadj})+(@{misc-mod})]])]] damage using their @{weaponname1}! (vs. Large)"></button></td>
-                                <td><button type="roll" name="roll_critl" title="%{repeating_weapons-damage_$X_critl}" value="/em rolls [[(@{daml})*2+([[(@{damadj})+({{@{specialist-damage},@{mastery-damage}}kh1})+((@{strengthdmg})*@{strbonus1})+((@{dexmissile})*@{dexbonus1})+(@{temp-damadj})+(@{misc-mod})]])]] critical damage using their @{weaponname1}! (vs. Large)">Crit</button></td>
+                                <td><button type="roll" name="roll_attackl" title="%{repeating_weapons-damage_$X_attackl}" value="/em rolls [[(@{daml})+([[(@{strengthdmg})*@{strbonus1}]] [Strength])+([[(@{dexmissile})*@{dexbonus1}]] [Dexterity])+([[{@{specialist-damage},@{mastery-damage}}kh1]] [Proficiency])+(@{damadj} [Dmg Adj])+(@{temp-damadj} [Temp buff])+(@{misc-mod})]] damage using their @{weaponname1}! (vs. Large)"></button></td>
+                                <td><button type="roll" name="roll_critl" title="%{repeating_weapons-damage_$X_critl}" value="/em rolls [[(@{daml})*2+([[(@{strengthdmg})*@{strbonus1}]] [Strength])+([[(@{dexmissile})*@{dexbonus1}]] [Dexterity])+([[{@{specialist-damage},@{mastery-damage}}kh1]] [Proficiency])+(@{damadj} [Dmg Adj])+(@{temp-damadj} [Temp buff])+(@{misc-mod})]] critical damage using their @{weaponname1}! (vs. Large)">Crit</button></td>
                                 <td><input type="text" name="attr_knockdown1" title="@{repeating_weapons-damage_$X_knockdown1}" class="sheet-shortish"></td>
-                                <td><button type="roll" name="roll_knockdown1" title="%{repeating_weapons-damage_$X_knockdown1}" value="/em roll [[@{knockdown1}+(@{misc-mod})]]&GreaterEqual;[[?{Target Size?|Tiny,3|Small,5|Medium,7|Large,9|Huge,11}]] knockdown using their @{weaponname1}!"></button></td>
+                                <td><button type="roll" name="roll_knockdown1" title="%{repeating_weapons-damage_$X_knockdown1}" value="/em roll [[@{knockdown1}+(@{misc-mod})]]&GreaterEqual;[[?{Target Size?|Medium,7|Tiny,3|Small,5|Medium,7|Large,9|Huge,11}]] knockdown using their @{weaponname1}!"></button></td>
                                 <td><input type="text" name="attr_size" title="@{repeating_weapons-damage_$X_size}" class="sheet-table-dynamic"></td>
                                 <td><input type="text" name="attr_type" title="@{repeating_weapons-damage_$X_type}" class="sheet-table-dynamic"></td>
                                 <td><button type="action" name="act_crit2" class="btn sheet-action-button" title="%{repeating_weapons-damage_$X_crit2}">Crit II</button></td>
@@ -2303,7 +2304,7 @@ <h4>Weapon Notes</h4>
                             <td><input type="text" name="attr_attacknum2" title="@{repeating_weapons2_$X_attacknum2}" class="sheet-cent" value="1"></td>
                             <td><input type="text" name="attr_attackadj2" title="@{repeating_weapons2_$X_attackadj2}" class="sheet-table-dynamic" value="0"></td>
                             <td><input type="text" name="attr_ThAC02" title="@{repeating_weapons2_$X_ThAC02}" class="sheet-small" value="20"></td>
-                            <td><button type="roll" name="roll_hit12" title="%{repeating_weapons2_$X_hit12}" value="/em hits an AC of [[ [[@{ThAC02}]]-(1d20cs>@{crit-thresh2}+([[(@{attackadj2})+((@{strengthhit})*@{strbonus2})+((@{dexmissile})*@{dexbonus2})+(@{prof-level2})+(@{range-mod-attack})+(@{weaptype-slash2}*(@{armortype-slash}))+(@{weaptype-pierce2}*(@{armortype-pierce}))+(@{weaptype-blunt2}*(@{armortype-blunt}))+(@{temp-attackadj})+(@{misc-mod})]]))]] using their @{weaponname2}">Hit</button></td>
+                            <td><button type="roll" name="roll_hit12" title="%{repeating_weapons2_$X_hit12}" value="/em hits an AC of [[ [[@{ThAC02}]]-(1d20cs>@{crit-thresh2}+([[(@{strengthhit})*@{strbonus2}]] [Strength])+([[(@{dexmissile})*@{dexbonus2}]] [Dexterity])+(@{prof-level2} [Proficiency])+(@{range-mod-attack} [Range mod])+(@{attackadj2} [Atk Adj])+(@{temp-attackadj} [Temp buff])+(@{misc-mod}))]] using their @{weaponname2}">Hit</button></td>
                             <td><input type="text" name="attr_crit-thresh2" title="@{repeating_weapons2_$X_crit-thresh2}" class="sheet-small" value="20"></td>
                             <td><input type="text" name="attr_range2" title="@{repeating_weapons2_$X_range2}" class="sheet-mintext"></td>
                             <td><input type="text" name="attr_size2" title="@{repeating_weapons2_$X_size2}" class="sheet-table-dynamic"></td>
@@ -2311,7 +2312,7 @@ <h4>Weapon Notes</h4>
                             <td><label><input type="checkbox" name="attr_weaptype-pierce2" title="@{repeating_weapons2_$X_weaptype-pierce2}" value="1"/><span></span></label></td>
                             <td><label><input type="checkbox" name="attr_weaptype-blunt2" title="@{repeating_weapons2_$X_weaptype-blunt2}" value="1"/><span></span></label></td>
                             <td><input type="text" name="attr_weapspeed2" title="@{repeating_weapons2_$X_weapspeed2}" class="sheet-small"></td>
-                            <td><button type="roll" name="roll_init2" title="%{repeating_weapons2_$X_init2}" value="/gmroll [[{1d10+[[@{weapspeed2}-(@{temp-speedadj})-(@{misc-mod})]], {1}}kh1]] [Initiative (@{weaponname2})]&{tracker}">Initiative</button></td>
+                            <td><button type="roll" name="roll_init2" title="%{repeating_weapons2_$X_init2}" value="/gmroll [[{1d10+(@{weapspeed2} [Weapon])-(@{temp-speedadj} [Temp buff])-(@{misc-mod}), {1}}kh1]] [Initiative (@{weaponname2})]&{tracker}">Initiative</button></td>
                         </tr>
                     </table>
                     </fieldset>
@@ -2395,13 +2396,13 @@ <h4>Ammunition</h4>
                                 <td><label><input type='checkbox' name='attr_mastery-damage2' title="@{repeating_ammo_$X_mastery-damage2}" value='3'/><span></span></label></td>
                                 <td><input type="text" name="attr_damadj2" title="@{repeating_ammo_$X_damadj2}" class="sheet-table-dynamic" value="0"></td>
                                 <td><input type="text" name="attr_damsm2" title="@{repeating_ammo_$X_damsm2}" class="sheet-short"></td>
-                                <td><button type="roll" name="roll_attacksm2" title="%{repeating_ammo_$X_attacksm2}" value="/em rolls [[@{damsm2}+([[(@{damadj2})+((@{strengthdmg})*@{strbonus3})+((@{dexmissile})*@{dexbonus3})+({{@{specialist-damage2},@{mastery-damage2}}kh1})+(@{temp-damadj})+(@{misc-mod})]])]] damage using their @{ammoname}! (vs. Small/Medium)"></button></td>
-                                <td><button type="roll" name="roll_critsm2" title="%{repeating_ammo_$X_critsm2}" value="/em rolls [[(@{damsm2})*2+([[(@{damadj2})+((@{strengthdmg})*@{strbonus3})+((@{dexmissile})*@{dexbonus3})+({{@{specialist-damage2},@{mastery-damage2}}kh1})+(@{temp-damadj})+(@{misc-mod})]])]] critical damage using their @{ammoname}! (vs. Small/Medium)">Crit</button></td>
+                                <td><button type="roll" name="roll_attacksm2" title="%{repeating_ammo_$X_attacksm2}" value="/em rolls [[(@{damsm2})+([[(@{strengthdmg})*@{strbonus3}]] [Strength])+([[(@{dexmissile})*@{dexbonus3}]] [Dexterity])+([[{@{specialist-damage2},@{mastery-damage2}}kh1]] [Proficiency])+(@{damadj2} [Dmg Adj])+(@{temp-damadj} [Temp buff])+(@{misc-mod})]] damage using their @{ammoname}! (vs. Small/Medium)"></button></td>
+                                <td><button type="roll" name="roll_critsm2" title="%{repeating_ammo_$X_critsm2}" value="/em rolls [[(@{damsm2})*2+([[(@{strengthdmg})*@{strbonus3}]] [Strength])+([[(@{dexmissile})*@{dexbonus3}]] [Dexterity])+([[{@{specialist-damage2},@{mastery-damage2}}kh1]] [Proficiency])+(@{damadj2} [Dmg Adj])+(@{temp-damadj} [Temp buff])+(@{misc-mod})]] critical damage using their @{ammoname}! (vs. Small/Medium)">Crit</button></td>
                                 <td><input type="text" name="attr_daml2" title="@{repeating_ammo_$X_daml2}" class="sheet-short"></td>
-                                <td><button type="roll" name="roll_attackl2" title="%{repeating_ammo_$X_attackl2}" value="/em rolls [[@{daml2}+([[(@{damadj2})+((@{strengthdmg})*@{strbonus3})+((@{dexmissile})*@{dexbonus3})+({{@{specialist-damage2},@{mastery-damage2}}kh1})+(@{temp-damadj})+(@{misc-mod})]])]] damage using their @{ammoname}! (vs. Large)"></button></td>
-                                <td><button type="roll" name="roll_critl2" title="%{repeating_ammo_$X_critl2}" value="/em rolls [[(@{daml2})*2+([[(@{damadj2})+((@{strengthdmg})*@{strbonus3})+((@{dexmissile})*@{dexbonus3})+({{@{specialist-damage2},@{mastery-damage2}}kh1})+(@{temp-damadj})+(@{misc-mod})]])]] critical damage using their @{ammoname}! (vs. Large)">Crit</button></td>
+                                <td><button type="roll" name="roll_attackl2" title="%{repeating_ammo_$X_attackl2}" value="/em rolls [[(@{daml2})+([[(@{strengthdmg})*@{strbonus3}]] [Strength])+([[(@{dexmissile})*@{dexbonus3}]] [Dexterity])+([[{@{specialist-damage2},@{mastery-damage2}}kh1]] [Proficiency])+(@{damadj2} [Dmg Adj])+(@{temp-damadj} [Temp buff])+(@{misc-mod})]] damage using their @{ammoname}! (vs. Large)"></button></td>
+                                <td><button type="roll" name="roll_critl2" title="%{repeating_ammo_$X_critl2}" value="/em rolls [[(@{daml2})*2+([[(@{strengthdmg})*@{strbonus3}]] [Strength])+([[(@{dexmissile})*@{dexbonus3}]] [Dexterity])+([[{@{specialist-damage2},@{mastery-damage2}}kh1]] [Proficiency])+(@{damadj2} [Dmg Adj])+(@{temp-damadj} [Temp buff])+(@{misc-mod})]] critical damage using their @{ammoname}! (vs. Large)">Crit</button></td>
                                 <td><input type="text" name="attr_knockdown2" title="@{repeating_ammo_$X_knockdown2}" class="sheet-shortish"></td>
-                                <td><button type="roll" name="roll_knockdown2" title="%{repeating_ammo_$X_knockdown2}" value="/em roll [[@{knockdown2}+(@{misc-mod})]]&GreaterEqual;[[?{Target Size?|Tiny,3|Small,5|Medium,7|Large,9|Huge,11}]] knockdown using their @{ammoname}!"></button></td>
+                                <td><button type="roll" name="roll_knockdown2" title="%{repeating_ammo_$X_knockdown2}" value="/em roll [[@{knockdown2}+(@{misc-mod})]]&GreaterEqual;[[?{Target Size?|Medium,7|Tiny,3|Small,5|Medium,7|Large,9|Huge,11}]] knockdown using their @{ammoname}!"></button></td>
                                 <td><input type="number" name="attr_ammoremain" title="@{repeating_ammo_$X_ammoremain}" class="sheet-table-dynamic"></td>
                                 <td><input type="text" name="attr_size" title="@{repeating_ammo_$X_size}" class="sheet-table-dynamic"></td>
                                 <td><input type="text" name="attr_type" title="@{repeating_ammo_$X_type}" class="sheet-table-dynamic"></td>
@@ -21917,7 +21918,7 @@ <h4>Miscellaneous modifier popup on rolls</h4>
     </p>
     <label>Should rolls ask for a Miscellaneous modifier?</label>
     <select name="attr_misc-mod" title="@{misc-mod}">
-        <option value="?{Misc. modifier?|0}">Popup on rolls</option>
+        <option value="?{Misc. modifier? (+ for bonus, - for penalty|0} [Misc mod]">Popup on rolls</option>
         <option value="0">No popup</option>
     </select>
     <br>
@@ -71272,11 +71273,11 @@ <h2>Monster Sheet specific</h2>
         ? values[prefix+'damsm']
         : values[prefix+'daml'];
     let damageAdjFunc = (values) => [
-        `(${values[prefix+'damadj']})`,
-        `({${values[prefix+'specialist-damage']},${values[prefix+'mastery-damage']}}kh1)`,
-        `((@{strengthdmg})*${values[prefix+'strbonus1']})`,
-        `((@{dexmissile})*${values[prefix+'dexbonus1']})`,
-        '(@{temp-damadj})',
+        `([[(@{strengthdmg})*${values[prefix+'strbonus1']}]] [Strength])`,
+        `([[(@{dexmissile})*${values[prefix+'dexbonus1']}]] [Dexterity])`,
+        `([[{${values[prefix+'specialist-damage']},${values[prefix+'mastery-damage']}}kh1]] [Proficiency])`,
+        `(${values[prefix+'damadj']} [Dmg Adj])`,
+        '(@{temp-damadj} [Temp buff])',
         '(@{misc-mod})'
     ].join('+');
 
@@ -71297,11 +71298,11 @@ <h2>Monster Sheet specific</h2>
         ? values[prefix+'damsm2']
         : values[prefix+'daml2'];
     let damageAdjFunc = (values) => [
-        `(${values[prefix+'damadj2']})`,
-        `((@{strengthdmg})*${values[prefix+'strbonus3']})`,
-        `((@{dexmissile})*${values[prefix+'dexbonus3']})`,
-        `({${values[prefix+'specialist-damage2']},${values[prefix+'mastery-damage2']}}kh1)`,
-        '(@{temp-damadj})',
+        `([[(@{strengthdmg})*${values[prefix+'strbonus3']}]] [Strength])`,
+        `([[(@{dexmissile})*${values[prefix+'dexbonus3']}]] [Dexterity])`,
+        `([[{${values[prefix+'specialist-damage2']},${values[prefix+'mastery-damage2']}}kh1]] [Proficiency])`,
+        `(${values[prefix+'damadj2']} [Dmg Adj])`,
+        '(@{temp-damadj} [Temp buff])',
         '(@{misc-mod})'
     ].join('+');
 
@@ -71779,7 +71780,7 @@ <h2>Monster Sheet specific</h2>
                 rollBuilder.push(`multiplier=(Double)`);
                 damage = `(${weaponDamage})*2`;
             }
-            rollBuilder.push(`damage=[[${damage}+[[${damageAdjFunc(values)}]] ]]`);
+            rollBuilder.push(`damage=[[${damage}+${damageAdjFunc(values)} ]]`);
         }
 
         if (errors.length > 0)
diff --git a/ADnD_2E_Revised/html/changelog.html b/ADnD_2E_Revised/html/changelog.html
index ee41eaceb888..a504261e495e 100644
--- a/ADnD_2E_Revised/html/changelog.html
+++ b/ADnD_2E_Revised/html/changelog.html
@@ -13,6 +13,8 @@ <h2 style="color: black;">Changes in <span name="attr_version"></span></h2>
                 <li>Fixed cast time for <strong>Protection From Evil (Wizard)</strong> from 1 turn to +1 initiative modifier</li>
                 <li>Removed incorrect material components for <strong>Endure Cold/Endure Heat</strong></li>
                 <li>Fixed spell description layout for <strong>Orison</strong></li>
+                <li>Removed Weapon Type vs Armor type modifiers from the Hit roll under the Player's Option ruleset, as the Player's Option: Combat & Tactics has its own set of modifiers that differ from those given in the Player's Handbook</li>
+                <li>Weapon Type vs Armor type is now only visible under the <strong>Standard</strong> tab</li>
             </ul>
             <hr>
             <p>
diff --git a/ADnD_2E_Revised/html/tabs/character-tab/weapons-tab.html b/ADnD_2E_Revised/html/tabs/character-tab/weapons-tab.html
index 091eea7dffbf..c77547d57030 100644
--- a/ADnD_2E_Revised/html/tabs/character-tab/weapons-tab.html
+++ b/ADnD_2E_Revised/html/tabs/character-tab/weapons-tab.html
@@ -54,88 +54,6 @@ <h4>Rule set</h4>
             </tr>
         </table>
         <br>
-
-        <details>
-            <summary><b>Select armor opponent is wearing for bonuses/penalties</b></summary>
-            <table>
-                <thead class="sheet-default-header sheet-centering-horizontal">
-                <tr>
-                    <td>Banded<br>Mail</td>
-                    <td class="sheet-centering-padding-5">|</td>
-                    <td>Brigandine</td>
-                    <td class="sheet-centering-padding-5">|</td>
-                    <td >Chain<br>Mail</td>
-                    <td class="sheet-centering-padding-5">|</td>
-                    <td>Field<br>Plate</td>
-                    <td class="sheet-centering-padding-5">|</td>
-                    <td>Full<br>Plate</td>
-                    <td class="sheet-centering-padding-5">|</td>
-                    <td>Leather, Hide,<br>& Padded</td>
-                    <td class="sheet-centering-padding-5">|</td>
-                    <td>Plate Mail /<br>Bronze Plate Mail</td>
-                    <td class="sheet-centering-padding-5">|</td>
-                    <td>Ring<br>Mail</td>
-                    <td class="sheet-centering-padding-5">|</td>
-                    <td>Scale<br>Mail</td>
-                    <td class="sheet-centering-padding-5">|</td>
-                    <td>Splint<br>Mail</td>
-                    <td class="sheet-centering-padding-5">|</td>
-                    <td>Studded<br>Leather</td>
-                </tr>
-                </thead>
-                <tr class="sheet-centering">
-                    <td><label><input type="checkbox" name="attr_banded-mail" title="@{banded-mail}" value="1"/><span></span></label></td>
-                    <td></td>
-                    <td><label><input type="checkbox" name="attr_brigandine" title="@{brigandine}" value="1"/><span></span></label></td>
-                    <td></td>
-                    <td><label><input type="checkbox" name="attr_chainmail" title="@{chainmail}" value="1"/><span></span></label></td>
-                    <td></td>
-                    <td><label><input type="checkbox" name="attr_field-plate" title="@{field-plate}" value="1"/><span></span></label></td>
-                    <td></td>
-                    <td><label><input type="checkbox" name="attr_full-plate" title="@{full-plate}" value="1"/><span></span></label></td>
-                    <td></td>
-                    <td><label><input type="checkbox" name="attr_leather-hide-padded" title="@{leather-hide-padded}" value="1"/><span></span></label></td>
-                    <td></td>
-                    <td><label><input type="checkbox" name="attr_plate-mail" title="@{plate-mail}" value="1"/><span></span></label></td>
-                    <td></td>
-                    <td><label><input type="checkbox" name="attr_ring-mail" title="@{ring-mail}" value="1"/><span></span></label></td>
-                    <td></td>
-                    <td><label><input type="checkbox" name="attr_scale-mail" title="@{scale-mail}" value="1"/><span></span></label></td>
-                    <td></td>
-                    <td><label><input type="checkbox" name="attr_splint-mail" title="@{splint-mail}" value="1"/><span></span></label></td>
-                    <td></td>
-                    <td><label><input type="checkbox" name="attr_studded-leather" title="@{studded-leather}" value="1"/><span></span></label></td>
-                </tr>
-            </table>
-            <input style="display: none;" name="attr_armortype-slash" value="
-                (@{banded-mail}*-2)+
-                (@{brigandine}*-1)+
-                (@{chainmail}*-2)+
-                (@{field-plate}*-3)+
-                (@{full-plate}*-4)+
-                (@{plate-mail}*-3)+
-                (@{ring-mail}*-1)+
-                (@{studded-leather}*-2)
-                ">
-            <input style="display: none;" name="attr_armortype-pierce" value="
-                (@{brigandine}*-1)+
-                (@{field-plate}*-1)+
-                (@{full-plate}*-3)+
-                (@{leather-hide-padded}*2)+
-                (@{plate-mail}*-1)+
-                (@{ring-mail}*-1)+
-                (@{scale-mail}*-1)+
-                (@{splint-mail}*-1)+
-                (@{studded-leather}*-1)
-                ">
-            <input style="display: none;" name="attr_armortype-blunt" value="
-                (@{banded-mail}*-1)+
-                (@{chainmail}*2)+
-                (@{splint-mail}*-2)
-                ">
-        </details>
-        <br>
-
         <div style="display: none;">
             <button type="roll" name="roll_acid-hit" value="/em rolls [[2d4]] acid damage using their Acid! (Direct hit)"></button>
             <button type="roll" name="roll_acid-splash" value="/em rolls [[1]] acid damage using their Acid! (Splash)"></button>
diff --git a/ADnD_2E_Revised/html/tabs/character-tab/weapons-tab/players-option-weapons-tab.html b/ADnD_2E_Revised/html/tabs/character-tab/weapons-tab/players-option-weapons-tab.html
index 31522dc30a2c..95a700039c6f 100644
--- a/ADnD_2E_Revised/html/tabs/character-tab/weapons-tab/players-option-weapons-tab.html
+++ b/ADnD_2E_Revised/html/tabs/character-tab/weapons-tab/players-option-weapons-tab.html
@@ -1,4 +1,5 @@
 <div class="sheet-tab-content sheet-section-weapon-player-option">
+    <br>
     <input type="radio" name="attr_tab83" class="sheet-tab sheet-tab83" value="1" checked/><span class="sheet-tab sheet-tab83">Melee</span>&nbsp;
     <input type="radio" name="attr_tab83" class="sheet-tab sheet-tab84" value="2"/><span class="sheet-tab sheet-tab84">Ranged</span>
     <br>
@@ -96,7 +97,7 @@
                 <td><input type="text" name="attr_attacknum" title="@{repeating_weapons_$X_attacknum}" class="sheet-table-dynamic" value="1"></td>
                 <td><input type="text" name="attr_attackadj" title="@{repeating_weapons_$X_attackadj}" class="sheet-table-dynamic" value="0"></td>
                 <td><input type="text" name="attr_ThAC0" title="@{repeating_weapons_$X_ThAC0}" class="sheet-small" value="20"></td>
-                <td><button type="roll" name="roll_hit" title="%{repeating_weapons_$X_hit}" value="/em hits an AC of [[ [[@{ThAC0}]]-(1d20cs>@{crit-thresh}+([[(@{attackadj})+(@{prof-level})+((@{strengthhit})*@{strbonus})+((@{dexmissile})*@{dexbonus})+(@{weaptype-slash}*(@{armortype-slash}))+(@{weaptype-pierce}*(@{armortype-pierce}))+(@{weaptype-blunt}*(@{armortype-blunt}))+(@{temp-attackadj})+(@{misc-mod})]]))]] using their @{weaponname}">Hit</button></td>
+                <td><button type="roll" name="roll_hit" title="%{repeating_weapons_$X_hit}" value="/em hits an AC of [[ [[@{ThAC0}]]-(1d20cs>@{crit-thresh}+([[(@{strengthhit})*@{strbonus}]] [Strength])+([[(@{dexmissile})*@{dexbonus}]] [Dexterity])+(@{prof-level} [Proficiency])+(@{attackadj} [Atk Adj])+(@{temp-attackadj} [Temp buff])+(@{misc-mod}))]] using their @{weaponname}">Hit</button></td>
                 <td><input type="text" name="attr_crit-thresh" title="@{repeating_weapons_$X_crit-thresh}" class="sheet-small" value="20"></td>
                 <td><input type="text" name="attr_range" title="@{repeating_weapons_$X_range}" class="sheet-short"></td>
                 <td><input type="text" name="attr_size" title="@{repeating_weapons_$X_size}" class="sheet-table-dynamic"></td>
@@ -104,7 +105,7 @@
                 <td><label><input type="checkbox" name="attr_weaptype-pierce" title="@{repeating_weapons_$X_weaptype-pierce}" value="1"/><span></span></label></td>
                 <td><label><input type="checkbox" name="attr_weaptype-blunt" title="@{repeating_weapons_$X_weaptype-blunt}" value="1"/><span></span></label></td>
                 <td><input type="text" name="attr_weapspeed" title="@{repeating_weapons_$X_weapspeed}" class="sheet-small"></td>
-                <td><button type="roll" name="roll_init" title="%{repeating_weapons_$X_init}" value="/gmroll [[{1d10+[[@{weapspeed}-(@{temp-speedadj})-(@{misc-mod})]], {1}}kh1]] [Initiative (@{weaponname})]&{tracker}">Initiative</button></td>
+                <td><button type="roll" name="roll_init" title="%{repeating_weapons_$X_init}" value="/gmroll [[{1d10+(@{weapspeed} [Weapon])-(@{temp-speedadj} [Temp buff])-(@{misc-mod}), {1}}kh1]] [Initiative (@{weaponname})]&{tracker}">Initiative</button></td>
             </tr>
         </table>
         </fieldset>
@@ -172,13 +173,13 @@ <h4>Melee Damage</h4>
                     <td><label><input type="checkbox" name="attr_mastery-damage" title="@{repeating_weapons-damage_$X_mastery-damage}" value="3"/><span></span></label></td>
                     <td><input type="text" name="attr_damadj" title="@{repeating_weapons-damage_$X_damadj}" class="sheet-table-dynamic" value="0"></td>
                     <td><input type="text" name="attr_damsm" title="@{repeating_weapons-damage_$X_damsm}" class="sheet-short"></td>
-                    <td><button type="roll" name="roll_attacksm" title="%{repeating_weapons-damage_$X_attacksm}" value="/em rolls [[@{damsm}+([[(@{damadj})+({{@{specialist-damage},@{mastery-damage}}kh1})+((@{strengthdmg})*@{strbonus1})+((@{dexmissile})*@{dexbonus1})+(@{temp-damadj})+(@{misc-mod})]])]] damage using their @{weaponname1}! (vs. Small/Medium)"></button></td>
-                    <td><button type="roll" name="roll_critsm" title="%{repeating_weapons-damage_$X_critsm}" value="/em rolls [[(@{damsm})*2+([[(@{damadj})+({{@{specialist-damage},@{mastery-damage}}kh1})+((@{strengthdmg})*@{strbonus1})+((@{dexmissile})*@{dexbonus1})+(@{temp-damadj})+(@{misc-mod})]])]] critical damage using their @{weaponname1}! (vs. Small/Medium)">Crit</button></td>
+                    <td><button type="roll" name="roll_attacksm" title="%{repeating_weapons-damage_$X_attacksm}" value="/em rolls [[(@{damsm})+([[(@{strengthdmg})*@{strbonus1}]] [Strength])+([[(@{dexmissile})*@{dexbonus1}]] [Dexterity])+([[{@{specialist-damage},@{mastery-damage}}kh1]] [Proficiency])+(@{damadj} [Dmg Adj])+(@{temp-damadj} [Temp buff])+(@{misc-mod})]] damage using their @{weaponname1}! (vs. Small/Medium)"></button></td>
+                    <td><button type="roll" name="roll_critsm" title="%{repeating_weapons-damage_$X_critsm}" value="/em rolls [[(@{damsm})*2+([[(@{strengthdmg})*@{strbonus1}]] [Strength])+([[(@{dexmissile})*@{dexbonus1}]] [Dexterity])+([[{@{specialist-damage},@{mastery-damage}}kh1]] [Proficiency])+(@{damadj} [Dmg Adj])+(@{temp-damadj} [Temp buff])+(@{misc-mod})]] critical damage using their @{weaponname1}! (vs. Small/Medium)">Crit</button></td>
                     <td><input type="text" name="attr_daml" title="@{repeating_weapons-damage_$X_daml}" class="sheet-short"></td>
-                    <td><button type="roll" name="roll_attackl" title="%{repeating_weapons-damage_$X_attackl}" value="/em rolls [[@{daml}+([[(@{damadj})+({{@{specialist-damage},@{mastery-damage}}kh1})+((@{strengthdmg})*@{strbonus1})+((@{dexmissile})*@{dexbonus1})+(@{temp-damadj})+(@{misc-mod})]])]] damage using their @{weaponname1}! (vs. Large)"></button></td>
-                    <td><button type="roll" name="roll_critl" title="%{repeating_weapons-damage_$X_critl}" value="/em rolls [[(@{daml})*2+([[(@{damadj})+({{@{specialist-damage},@{mastery-damage}}kh1})+((@{strengthdmg})*@{strbonus1})+((@{dexmissile})*@{dexbonus1})+(@{temp-damadj})+(@{misc-mod})]])]] critical damage using their @{weaponname1}! (vs. Large)">Crit</button></td>
+                    <td><button type="roll" name="roll_attackl" title="%{repeating_weapons-damage_$X_attackl}" value="/em rolls [[(@{daml})+([[(@{strengthdmg})*@{strbonus1}]] [Strength])+([[(@{dexmissile})*@{dexbonus1}]] [Dexterity])+([[{@{specialist-damage},@{mastery-damage}}kh1]] [Proficiency])+(@{damadj} [Dmg Adj])+(@{temp-damadj} [Temp buff])+(@{misc-mod})]] damage using their @{weaponname1}! (vs. Large)"></button></td>
+                    <td><button type="roll" name="roll_critl" title="%{repeating_weapons-damage_$X_critl}" value="/em rolls [[(@{daml})*2+([[(@{strengthdmg})*@{strbonus1}]] [Strength])+([[(@{dexmissile})*@{dexbonus1}]] [Dexterity])+([[{@{specialist-damage},@{mastery-damage}}kh1]] [Proficiency])+(@{damadj} [Dmg Adj])+(@{temp-damadj} [Temp buff])+(@{misc-mod})]] critical damage using their @{weaponname1}! (vs. Large)">Crit</button></td>
                     <td><input type="text" name="attr_knockdown1" title="@{repeating_weapons-damage_$X_knockdown1}" class="sheet-shortish"></td>
-                    <td><button type="roll" name="roll_knockdown1" title="%{repeating_weapons-damage_$X_knockdown1}" value="/em roll [[@{knockdown1}+(@{misc-mod})]]&GreaterEqual;[[?{Target Size?|Tiny,3|Small,5|Medium,7|Large,9|Huge,11}]] knockdown using their @{weaponname1}!"></button></td>
+                    <td><button type="roll" name="roll_knockdown1" title="%{repeating_weapons-damage_$X_knockdown1}" value="/em roll [[@{knockdown1}+(@{misc-mod})]]&GreaterEqual;[[?{Target Size?|Medium,7|Tiny,3|Small,5|Medium,7|Large,9|Huge,11}]] knockdown using their @{weaponname1}!"></button></td>
                     <td><input type="text" name="attr_size" title="@{repeating_weapons-damage_$X_size}" class="sheet-table-dynamic"></td>
                     <td><input type="text" name="attr_type" title="@{repeating_weapons-damage_$X_type}" class="sheet-table-dynamic"></td>
                     <td><button type="action" name="act_crit2" class="btn sheet-action-button" title="%{repeating_weapons-damage_$X_crit2}">Crit II</button></td>
@@ -306,7 +307,7 @@ <h4>Weapon Notes</h4>
                 <td><input type="text" name="attr_attacknum2" title="@{repeating_weapons2_$X_attacknum2}" class="sheet-cent" value="1"></td>
                 <td><input type="text" name="attr_attackadj2" title="@{repeating_weapons2_$X_attackadj2}" class="sheet-table-dynamic" value="0"></td>
                 <td><input type="text" name="attr_ThAC02" title="@{repeating_weapons2_$X_ThAC02}" class="sheet-small" value="20"></td>
-                <td><button type="roll" name="roll_hit12" title="%{repeating_weapons2_$X_hit12}" value="/em hits an AC of [[ [[@{ThAC02}]]-(1d20cs>@{crit-thresh2}+([[(@{attackadj2})+((@{strengthhit})*@{strbonus2})+((@{dexmissile})*@{dexbonus2})+(@{prof-level2})+(@{range-mod-attack})+(@{weaptype-slash2}*(@{armortype-slash}))+(@{weaptype-pierce2}*(@{armortype-pierce}))+(@{weaptype-blunt2}*(@{armortype-blunt}))+(@{temp-attackadj})+(@{misc-mod})]]))]] using their @{weaponname2}">Hit</button></td>
+                <td><button type="roll" name="roll_hit12" title="%{repeating_weapons2_$X_hit12}" value="/em hits an AC of [[ [[@{ThAC02}]]-(1d20cs>@{crit-thresh2}+([[(@{strengthhit})*@{strbonus2}]] [Strength])+([[(@{dexmissile})*@{dexbonus2}]] [Dexterity])+(@{prof-level2} [Proficiency])+(@{range-mod-attack} [Range mod])+(@{attackadj2} [Atk Adj])+(@{temp-attackadj} [Temp buff])+(@{misc-mod}))]] using their @{weaponname2}">Hit</button></td>
                 <td><input type="text" name="attr_crit-thresh2" title="@{repeating_weapons2_$X_crit-thresh2}" class="sheet-small" value="20"></td>
                 <td><input type="text" name="attr_range2" title="@{repeating_weapons2_$X_range2}" class="sheet-mintext"></td>
                 <td><input type="text" name="attr_size2" title="@{repeating_weapons2_$X_size2}" class="sheet-table-dynamic"></td>
@@ -314,7 +315,7 @@ <h4>Weapon Notes</h4>
                 <td><label><input type="checkbox" name="attr_weaptype-pierce2" title="@{repeating_weapons2_$X_weaptype-pierce2}" value="1"/><span></span></label></td>
                 <td><label><input type="checkbox" name="attr_weaptype-blunt2" title="@{repeating_weapons2_$X_weaptype-blunt2}" value="1"/><span></span></label></td>
                 <td><input type="text" name="attr_weapspeed2" title="@{repeating_weapons2_$X_weapspeed2}" class="sheet-small"></td>
-                <td><button type="roll" name="roll_init2" title="%{repeating_weapons2_$X_init2}" value="/gmroll [[{1d10+[[@{weapspeed2}-(@{temp-speedadj})-(@{misc-mod})]], {1}}kh1]] [Initiative (@{weaponname2})]&{tracker}">Initiative</button></td>
+                <td><button type="roll" name="roll_init2" title="%{repeating_weapons2_$X_init2}" value="/gmroll [[{1d10+(@{weapspeed2} [Weapon])-(@{temp-speedadj} [Temp buff])-(@{misc-mod}), {1}}kh1]] [Initiative (@{weaponname2})]&{tracker}">Initiative</button></td>
             </tr>
         </table>
         </fieldset>
@@ -398,13 +399,13 @@ <h4>Ammunition</h4>
                     <td><label><input type='checkbox' name='attr_mastery-damage2' title="@{repeating_ammo_$X_mastery-damage2}" value='3'/><span></span></label></td>
                     <td><input type="text" name="attr_damadj2" title="@{repeating_ammo_$X_damadj2}" class="sheet-table-dynamic" value="0"></td>
                     <td><input type="text" name="attr_damsm2" title="@{repeating_ammo_$X_damsm2}" class="sheet-short"></td>
-                    <td><button type="roll" name="roll_attacksm2" title="%{repeating_ammo_$X_attacksm2}" value="/em rolls [[@{damsm2}+([[(@{damadj2})+((@{strengthdmg})*@{strbonus3})+((@{dexmissile})*@{dexbonus3})+({{@{specialist-damage2},@{mastery-damage2}}kh1})+(@{temp-damadj})+(@{misc-mod})]])]] damage using their @{ammoname}! (vs. Small/Medium)"></button></td>
-                    <td><button type="roll" name="roll_critsm2" title="%{repeating_ammo_$X_critsm2}" value="/em rolls [[(@{damsm2})*2+([[(@{damadj2})+((@{strengthdmg})*@{strbonus3})+((@{dexmissile})*@{dexbonus3})+({{@{specialist-damage2},@{mastery-damage2}}kh1})+(@{temp-damadj})+(@{misc-mod})]])]] critical damage using their @{ammoname}! (vs. Small/Medium)">Crit</button></td>
+                    <td><button type="roll" name="roll_attacksm2" title="%{repeating_ammo_$X_attacksm2}" value="/em rolls [[(@{damsm2})+([[(@{strengthdmg})*@{strbonus3}]] [Strength])+([[(@{dexmissile})*@{dexbonus3}]] [Dexterity])+([[{@{specialist-damage2},@{mastery-damage2}}kh1]] [Proficiency])+(@{damadj2} [Dmg Adj])+(@{temp-damadj} [Temp buff])+(@{misc-mod})]] damage using their @{ammoname}! (vs. Small/Medium)"></button></td>
+                    <td><button type="roll" name="roll_critsm2" title="%{repeating_ammo_$X_critsm2}" value="/em rolls [[(@{damsm2})*2+([[(@{strengthdmg})*@{strbonus3}]] [Strength])+([[(@{dexmissile})*@{dexbonus3}]] [Dexterity])+([[{@{specialist-damage2},@{mastery-damage2}}kh1]] [Proficiency])+(@{damadj2} [Dmg Adj])+(@{temp-damadj} [Temp buff])+(@{misc-mod})]] critical damage using their @{ammoname}! (vs. Small/Medium)">Crit</button></td>
                     <td><input type="text" name="attr_daml2" title="@{repeating_ammo_$X_daml2}" class="sheet-short"></td>
-                    <td><button type="roll" name="roll_attackl2" title="%{repeating_ammo_$X_attackl2}" value="/em rolls [[@{daml2}+([[(@{damadj2})+((@{strengthdmg})*@{strbonus3})+((@{dexmissile})*@{dexbonus3})+({{@{specialist-damage2},@{mastery-damage2}}kh1})+(@{temp-damadj})+(@{misc-mod})]])]] damage using their @{ammoname}! (vs. Large)"></button></td>
-                    <td><button type="roll" name="roll_critl2" title="%{repeating_ammo_$X_critl2}" value="/em rolls [[(@{daml2})*2+([[(@{damadj2})+((@{strengthdmg})*@{strbonus3})+((@{dexmissile})*@{dexbonus3})+({{@{specialist-damage2},@{mastery-damage2}}kh1})+(@{temp-damadj})+(@{misc-mod})]])]] critical damage using their @{ammoname}! (vs. Large)">Crit</button></td>
+                    <td><button type="roll" name="roll_attackl2" title="%{repeating_ammo_$X_attackl2}" value="/em rolls [[(@{daml2})+([[(@{strengthdmg})*@{strbonus3}]] [Strength])+([[(@{dexmissile})*@{dexbonus3}]] [Dexterity])+([[{@{specialist-damage2},@{mastery-damage2}}kh1]] [Proficiency])+(@{damadj2} [Dmg Adj])+(@{temp-damadj} [Temp buff])+(@{misc-mod})]] damage using their @{ammoname}! (vs. Large)"></button></td>
+                    <td><button type="roll" name="roll_critl2" title="%{repeating_ammo_$X_critl2}" value="/em rolls [[(@{daml2})*2+([[(@{strengthdmg})*@{strbonus3}]] [Strength])+([[(@{dexmissile})*@{dexbonus3}]] [Dexterity])+([[{@{specialist-damage2},@{mastery-damage2}}kh1]] [Proficiency])+(@{damadj2} [Dmg Adj])+(@{temp-damadj} [Temp buff])+(@{misc-mod})]] critical damage using their @{ammoname}! (vs. Large)">Crit</button></td>
                     <td><input type="text" name="attr_knockdown2" title="@{repeating_ammo_$X_knockdown2}" class="sheet-shortish"></td>
-                    <td><button type="roll" name="roll_knockdown2" title="%{repeating_ammo_$X_knockdown2}" value="/em roll [[@{knockdown2}+(@{misc-mod})]]&GreaterEqual;[[?{Target Size?|Tiny,3|Small,5|Medium,7|Large,9|Huge,11}]] knockdown using their @{ammoname}!"></button></td>
+                    <td><button type="roll" name="roll_knockdown2" title="%{repeating_ammo_$X_knockdown2}" value="/em roll [[@{knockdown2}+(@{misc-mod})]]&GreaterEqual;[[?{Target Size?|Medium,7|Tiny,3|Small,5|Medium,7|Large,9|Huge,11}]] knockdown using their @{ammoname}!"></button></td>
                     <td><input type="number" name="attr_ammoremain" title="@{repeating_ammo_$X_ammoremain}" class="sheet-table-dynamic"></td>
                     <td><input type="text" name="attr_size" title="@{repeating_ammo_$X_size}" class="sheet-table-dynamic"></td>
                     <td><input type="text" name="attr_type" title="@{repeating_ammo_$X_type}" class="sheet-table-dynamic"></td>
diff --git a/ADnD_2E_Revised/html/tabs/character-tab/weapons-tab/standard-weapons-tab.html b/ADnD_2E_Revised/html/tabs/character-tab/weapons-tab/standard-weapons-tab.html
index 93d61744aa9c..db20fc005f59 100644
--- a/ADnD_2E_Revised/html/tabs/character-tab/weapons-tab/standard-weapons-tab.html
+++ b/ADnD_2E_Revised/html/tabs/character-tab/weapons-tab/standard-weapons-tab.html
@@ -1,4 +1,84 @@
 <div class="sheet-tab-content sheet-section-weapon-standard">
+    <details>
+            <summary><b>Select armor opponent is wearing for bonuses/penalties</b></summary>
+            <table>
+                <thead class="sheet-default-header sheet-centering-horizontal">
+                <tr>
+                    <td>Banded<br>Mail</td>
+                    <td class="sheet-centering-padding-5">|</td>
+                    <td>Brigandine</td>
+                    <td class="sheet-centering-padding-5">|</td>
+                    <td >Chain<br>Mail</td>
+                    <td class="sheet-centering-padding-5">|</td>
+                    <td>Field<br>Plate</td>
+                    <td class="sheet-centering-padding-5">|</td>
+                    <td>Full<br>Plate</td>
+                    <td class="sheet-centering-padding-5">|</td>
+                    <td>Leather, Hide,<br>& Padded</td>
+                    <td class="sheet-centering-padding-5">|</td>
+                    <td>Plate Mail /<br>Bronze Plate Mail</td>
+                    <td class="sheet-centering-padding-5">|</td>
+                    <td>Ring<br>Mail</td>
+                    <td class="sheet-centering-padding-5">|</td>
+                    <td>Scale<br>Mail</td>
+                    <td class="sheet-centering-padding-5">|</td>
+                    <td>Splint<br>Mail</td>
+                    <td class="sheet-centering-padding-5">|</td>
+                    <td>Studded<br>Leather</td>
+                </tr>
+                </thead>
+                <tr class="sheet-centering">
+                    <td><label><input type="checkbox" name="attr_banded-mail" title="@{banded-mail}" value="1"/><span></span></label></td>
+                    <td></td>
+                    <td><label><input type="checkbox" name="attr_brigandine" title="@{brigandine}" value="1"/><span></span></label></td>
+                    <td></td>
+                    <td><label><input type="checkbox" name="attr_chainmail" title="@{chainmail}" value="1"/><span></span></label></td>
+                    <td></td>
+                    <td><label><input type="checkbox" name="attr_field-plate" title="@{field-plate}" value="1"/><span></span></label></td>
+                    <td></td>
+                    <td><label><input type="checkbox" name="attr_full-plate" title="@{full-plate}" value="1"/><span></span></label></td>
+                    <td></td>
+                    <td><label><input type="checkbox" name="attr_leather-hide-padded" title="@{leather-hide-padded}" value="1"/><span></span></label></td>
+                    <td></td>
+                    <td><label><input type="checkbox" name="attr_plate-mail" title="@{plate-mail}" value="1"/><span></span></label></td>
+                    <td></td>
+                    <td><label><input type="checkbox" name="attr_ring-mail" title="@{ring-mail}" value="1"/><span></span></label></td>
+                    <td></td>
+                    <td><label><input type="checkbox" name="attr_scale-mail" title="@{scale-mail}" value="1"/><span></span></label></td>
+                    <td></td>
+                    <td><label><input type="checkbox" name="attr_splint-mail" title="@{splint-mail}" value="1"/><span></span></label></td>
+                    <td></td>
+                    <td><label><input type="checkbox" name="attr_studded-leather" title="@{studded-leather}" value="1"/><span></span></label></td>
+                </tr>
+            </table>
+            <input style="display: none;" name="attr_armortype-slash" value="
+                (@{banded-mail}*-2)+
+                (@{brigandine}*-1)+
+                (@{chainmail}*-2)+
+                (@{field-plate}*-3)+
+                (@{full-plate}*-4)+
+                (@{plate-mail}*-3)+
+                (@{ring-mail}*-1)+
+                (@{studded-leather}*-2)
+                ">
+            <input style="display: none;" name="attr_armortype-pierce" value="
+                (@{brigandine}*-1)+
+                (@{field-plate}*-1)+
+                (@{full-plate}*-3)+
+                (@{leather-hide-padded}*2)+
+                (@{plate-mail}*-1)+
+                (@{ring-mail}*-1)+
+                (@{scale-mail}*-1)+
+                (@{splint-mail}*-1)+
+                (@{studded-leather}*-1)
+                ">
+            <input style="display: none;" name="attr_armortype-blunt" value="
+                (@{banded-mail}*-1)+
+                (@{chainmail}*2)+
+                (@{splint-mail}*-2)
+                ">
+        </details>
+    <br>
     <input type="radio" name="attr_tab70" class="sheet-tab sheet-tab70" value="1" checked/><span class="sheet-tab sheet-tab70">Melee</span>&nbsp;
     <input type="radio" name="attr_tab70" class="sheet-tab sheet-tab71" value="2"/><span class="sheet-tab sheet-tab71">Ranged</span>
     <br>
@@ -90,7 +170,7 @@
                 <td><input type="text" name="attr_attacknum" title="@{repeating_weapons_$X_attacknum}" class="sheet-table-dynamic" value="1"></td>
                 <td><input type="text" name="attr_attackadj" title="@{repeating_weapons_$X_attackadj}" class="sheet-table-dynamic" value="0"></td>
                 <td><input type="text" name="attr_ThAC0" title="@{repeating_weapons_$X_ThAC0}" class="sheet-small" value="20"></td>
-                <td><button type="roll" name="roll_hit1" title="%{repeating_weapons_$X_hit1}" value="/em hits an AC of [[ [[@{ThAC0}]]-(1d20cs>@{crit-thresh}+([[(@{attackadj})+(@{prof-level})+((@{strengthhit})*@{strbonus})+(@{weaptype-slash}*(@{armortype-slash}))+(@{weaptype-pierce}*(@{armortype-pierce}))+(@{weaptype-blunt}*(@{armortype-blunt}))+(@{temp-attackadj})+(@{misc-mod})]]))]] using their @{weaponname}">Hit</button></td>
+                <td><button type="roll" name="roll_hit1" title="%{repeating_weapons_$X_hit1}" value="/em hits an AC of [[ [[@{ThAC0}]]-(1d20cs>@{crit-thresh}+([[(@{strengthhit})*@{strbonus}]] [Strength])+(@{prof-level} [Proficiency])+(@{attackadj} [Atk Adj])+([[(@{weaptype-slash}*(@{armortype-slash}))+(@{weaptype-pierce}*(@{armortype-pierce}))+(@{weaptype-blunt}*(@{armortype-blunt}))]] [Weapon vs Armor])+(@{temp-attackadj} [Temp buff])+(@{misc-mod}))]] using their @{weaponname}">Hit</button></td>
                 <td><input type="text" name="attr_crit-thresh" title="@{repeating_weapons_$X_crit-thresh}" class="sheet-small" value="20"></td>
                 <td><input type="text" name="attr_range" title="@{repeating_weapons_$X_range}" class="sheet-short"></td>
                 <td><input type="text" name="attr_size" title="@{repeating_weapons_$X_size}" class="sheet-table-dynamic"></td>
@@ -98,7 +178,7 @@
                 <td><label><input type="checkbox" name="attr_weaptype-pierce" title="@{repeating_weapons_$X_weaptype-pierce}" value="1"/><span></span></label></td>
                 <td><label><input type="checkbox" name="attr_weaptype-blunt" title="@{repeating_weapons_$X_weaptype-blunt}" value="1"/><span></span></label></td>
                 <td><input type="text" name="attr_weapspeed" title="@{repeating_weapons_$X_weapspeed}" class="sheet-small"></td>
-                <td><button type="roll" name="roll_init" title="%{repeating_weapons_$X_init}" value="/gmroll [[{1d10+[[@{weapspeed}-(@{temp-speedadj})-(@{misc-mod})]], {1}}kh1]] [Initiative (@{weaponname})]&{tracker}">Initiative</button></td>
+                <td><button type="roll" name="roll_init" title="%{repeating_weapons_$X_init}" value="/gmroll [[{1d10+(@{weapspeed} [Weapon])-(@{temp-speedadj} [Temp buff])-(@{misc-mod}), {1}}kh1]] [Initiative (@{weaponname})]&{tracker}">Initiative</button></td>
             </tr>
         </table>
         </fieldset>
@@ -146,11 +226,11 @@ <h4>Melee Damage</h4>
                 <td><label><input type="checkbox" name="attr_specialist-damage" title="@{repeating_weapons-damage_$X_specialist-damage}" value="2"/><span></span></label></td>
                 <td><input type="text" name="attr_damadj" title="@{repeating_weapons-damage_$X_damadj}" class="sheet-table-dynamic" value="0"></td>
                 <td><input type="text" name="attr_damsm" title="@{repeating_weapons-damage_$X_damsm}" class="sheet-short"></td>
-                <td><button type="roll" name="roll_attacksm" title="%{repeating_weapons-damage_$X_attacksm}" value="/em rolls [[@{damsm}+([[(@{damadj})+(@{specialist-damage})+((@{strengthdmg})*@{strbonus1})+(@{temp-damadj})+(@{misc-mod})]])]] damage using their @{weaponname1}! (vs. Small/Medium)"></button></td>
-                <td><button type="roll" name="roll_critsm" title="%{repeating_weapons-damage_$X_critsm}" value="/em rolls [[(@{damsm})+(@{damsm})+([[(@{damadj})+(@{specialist-damage})+((@{strengthdmg})*@{strbonus1})+(@{temp-damadj})+(@{misc-mod})]])]] critical damage using their @{weaponname1}! (vs. Small/Medium)">Crit</button></td>
+                <td><button type="roll" name="roll_attacksm" title="%{repeating_weapons-damage_$X_attacksm}" value="/em rolls [[(@{damsm})([[(@{strengthdmg})*@{strbonus1}]] [Strength])+(@{specialist-damage} [Specialization])+(@{damadj} [Dmg Adj])+(@{temp-damadj} [Temp buff])+(@{misc-mod})]] damage using their @{weaponname1}! (vs. Small/Medium)"></button></td>
+                <td><button type="roll" name="roll_critsm" title="%{repeating_weapons-damage_$X_critsm}" value="/em rolls [[(@{damsm})+(@{damsm})([[(@{strengthdmg})*@{strbonus1}]] [Strength])+(@{specialist-damage} [Specialization])+(@{damadj} [Dmg Adj])+(@{temp-damadj} [Temp buff])+(@{misc-mod})]] critical damage using their @{weaponname1}! (vs. Small/Medium)">Crit</button></td>
                 <td><input type="text" name="attr_daml" title="@{repeating_weapons-damage_$X_daml}" class="sheet-short"></td>
-                <td><button type="roll" name="roll_attackl" title="%{repeating_weapons-damage_$X_attackl}" value="/em rolls [[@{daml}+([[(@{damadj})+(@{specialist-damage})+((@{strengthdmg})*@{strbonus1})+(@{temp-damadj})+(@{misc-mod})]])]] damage using their @{weaponname1}! (vs. Large)"></button></td>
-                <td><button type="roll" name="roll_critl" title="%{repeating_weapons-damage_$X_critl}" value="/em rolls [[(@{daml})+(@{daml})+([[(@{damadj})+(@{specialist-damage})+((@{strengthdmg})*@{strbonus1})+(@{temp-damadj})+(@{misc-mod})]])]] critical damage using their @{weaponname1}! (vs. Large)">Crit</button></td>
+                <td><button type="roll" name="roll_attackl" title="%{repeating_weapons-damage_$X_attackl}" value="/em rolls [[(@{daml})([[(@{strengthdmg})*@{strbonus1}]] [Strength])+(@{specialist-damage} [Specialization])+(@{damadj} [Dmg Adj])+(@{temp-damadj} [Temp buff])+(@{misc-mod})]] damage using their @{weaponname1}! (vs. Large)"></button></td>
+                <td><button type="roll" name="roll_critl" title="%{repeating_weapons-damage_$X_critl}" value="/em rolls [[(@{daml})+(@{daml})([[(@{strengthdmg})*@{strbonus1}]] [Strength])+(@{specialist-damage} [Specialization])+(@{damadj} [Dmg Adj])+(@{temp-damadj} [Temp buff])+(@{misc-mod})]] critical damage using their @{weaponname1}! (vs. Large)">Crit</button></td>
             </tr>
         </table>
         </fieldset>
@@ -268,7 +348,7 @@ <h4>Weapon Notes</h4>
                 <td><input type="text" name="attr_attacknum2" title="@{repeating_weapons2_$X_attacknum2}" class="sheet-cent" value="1"></td>
                 <td><input type="text" name="attr_attackadj2" title="@{repeating_weapons2_$X_attackadj2}" class="sheet-table-dynamic" value="0"></td>
                 <td><input type="text" name="attr_ThAC02" title="@{repeating_weapons2_$X_ThAC02}" class="sheet-small" value="20"></td>
-                <td><button type="roll" name="roll_hit12" title="%{repeating_weapons2_$X_hit12}" value="/em hits an AC of [[ [[@{ThAC02}]]-(1d20cs>@{crit-thresh2}+([[(@{attackadj2})+((@{strengthhit})*@{strbonus2})+((@{dexmissile})*@{dexbonus2})+(@{prof-level2})+(@{range-mod-attack})+(@{weaptype-slash2}*(@{armortype-slash}))+(@{weaptype-pierce2}*(@{armortype-pierce}))+(@{weaptype-blunt2}*(@{armortype-blunt}))+(@{temp-attackadj})+(@{misc-mod})]]))]] using their @{weaponname2}">Hit</button></td>
+                <td><button type="roll" name="roll_hit12" title="%{repeating_weapons2_$X_hit12}" value="/em hits an AC of [[ [[@{ThAC02}]]-(1d20cs>@{crit-thresh2}+([[(@{strengthhit})*@{strbonus2}]] [Strength])+([[(@{dexmissile})*@{dexbonus2}]] [Dexterity])+(@{prof-level2} [Proficiency])+(@{range-mod-attack} [Range mod])+(@{attackadj2} [Atk Adj])+([[(@{weaptype-slash2}*(@{armortype-slash}))+(@{weaptype-pierce2}*(@{armortype-pierce}))+(@{weaptype-blunt2}*(@{armortype-blunt}))]] [Weapon vs Armor])+(@{temp-attackadj} [Temp buff])+(@{misc-mod}))]] using their @{weaponname2}">Hit</button></td>
                 <td><input type="text" name="attr_crit-thresh2" title="@{repeating_weapons2_$X_crit-thresh2}" class="sheet-small" value="20"></td>
                 <td><input type="text" name="attr_range2" title="@{repeating_weapons2_$X_range2}" class="sheet-mintext"></td>
                 <td><input type="text" name="attr_size2" title="@{repeating_weapons2_$X_size2}" class="sheet-table-dynamic"></td>
@@ -276,7 +356,7 @@ <h4>Weapon Notes</h4>
                 <td><label><input type="checkbox" name="attr_weaptype-pierce2" title="@{repeating_weapons2_$X_weaptype-pierce2}" value="1"/><span></span></label></td>
                 <td><label><input type="checkbox" name="attr_weaptype-blunt2" title="@{repeating_weapons2_$X_weaptype-blunt2}" value="1"/><span></span></label></td>
                 <td><input type="text" name="attr_weapspeed2" title="@{repeating_weapons2_$X_weapspeed2}" class="sheet-small"></td>
-                <td><button type="roll" name="roll_init2" title="%{repeating_weapons2_$X_init2}" value="/gmroll [[{1d10+[[@{weapspeed2}-(@{temp-speedadj})-(@{misc-mod})]], {1}}kh1]] [Initiative (@{weaponname2})]&{tracker}">Initiative</button></td>
+                <td><button type="roll" name="roll_init2" title="%{repeating_weapons2_$X_init2}" value="/gmroll [[{1d10+(@{weapspeed2} [Weapon])-(@{temp-speedadj} [Temp buff])-(@{misc-mod}), {1}}kh1]] [Initiative (@{weaponname2})]&{tracker}">Initiative</button></td>
             </tr>
         </table>
         </fieldset>
@@ -326,11 +406,11 @@ <h4>Ammunition</h4>
                 </td>
                 <td><input type="text" name="attr_damadj2" title="@{repeating_ammo_$X_damadj2}" class="sheet-table-dynamic" value="0"></td>
                 <td><input type="text" name="attr_damsm2" title="@{repeating_ammo_$X_damsm2}" class="sheet-short"></td>
-                <td><button type="roll" name="roll_attacksm2" title="%{repeating_ammo_$X_attacksm2}" value="/em rolls [[@{damsm2}+([[(@{damadj2})+((@{strengthdmg})*@{strbonus3})+(@{temp-damadj})+(@{misc-mod})]])]] damage using their @{ammoname}! (vs. Small/Medium)"></button></td>
-                <td><button type="roll" name="roll_critsm2" title="%{repeating_ammo_$X_critsm2}" value="/em rolls [[(@{damsm2})+(@{damsm2})+([[(@{damadj2})+((@{strengthdmg})*@{strbonus3})+(@{temp-damadj})+(@{misc-mod})]])]] critical damage using their @{ammoname}! (vs. Small/Medium)">Crit</button></td>
+                <td><button type="roll" name="roll_attacksm2" title="%{repeating_ammo_$X_attacksm2}" value="/em rolls [[(@{damsm2})+([[(@{strengthdmg})*@{strbonus3}]] [Strength])+(@{damadj2} [Dmg Adj])+(@{temp-damadj} [Temp buff])+(@{misc-mod})]] damage using their @{ammoname}! (vs. Small/Medium)"></button></td>
+                <td><button type="roll" name="roll_critsm2" title="%{repeating_ammo_$X_critsm2}" value="/em rolls [[(@{damsm2})+(@{damsm2})+([[(@{strengthdmg})*@{strbonus3}]] [Strength])+(@{damadj2} [Dmg Adj])+(@{temp-damadj} [Temp buff])+(@{misc-mod})]] critical damage using their @{ammoname}! (vs. Small/Medium)">Crit</button></td>
                 <td><input type="text" name="attr_daml2" title="@{repeating_ammo_$X_daml2}" class="sheet-short"></td>
-                <td><button type="roll" name="roll_attackl2" title="%{repeating_ammo_$X_attackl2}" value="/em rolls [[@{daml2}+([[(@{damadj2})+((@{strengthdmg})*@{strbonus3})+(@{temp-damadj})+(@{misc-mod})]])]] damage using their @{ammoname}! (vs. Large)"></button></td>
-                <td><button type="roll" name="roll_critl2" title="%{repeating_ammo_$X_critl2}" value="/em rolls [[(@{daml2})+(@{daml2})+([[(@{damadj2})+((@{strengthdmg})*@{strbonus3})+(@{temp-damadj})+(@{misc-mod})]])]] critical damage using their @{ammoname}! (vs. Large)">Crit</button></td>
+                <td><button type="roll" name="roll_attackl2" title="%{repeating_ammo_$X_attackl2}" value="/em rolls [[(@{daml2})+([[(@{strengthdmg})*@{strbonus3}]] [Strength])+(@{damadj2} [Dmg Adj])+(@{temp-damadj} [Temp buff])+(@{misc-mod})]] damage using their @{ammoname}! (vs. Large)"></button></td>
+                <td><button type="roll" name="roll_critl2" title="%{repeating_ammo_$X_critl2}" value="/em rolls [[(@{daml2})+(@{daml2})+([[(@{strengthdmg})*@{strbonus3}]] [Strength])+(@{damadj2} [Dmg Adj])+(@{temp-damadj} [Temp buff])+(@{misc-mod})]] critical damage using their @{ammoname}! (vs. Large)">Crit</button></td>
                 <td><input type="number" name="attr_ammoremain" title="@{repeating_ammo_$X_ammoremain}" class="sheet-table-dynamic"></td>
             </tr>
         </table>
diff --git a/ADnD_2E_Revised/html/tabs/sheet-settings-tab.html b/ADnD_2E_Revised/html/tabs/sheet-settings-tab.html
index 1631fa08217e..219ecc674677 100644
--- a/ADnD_2E_Revised/html/tabs/sheet-settings-tab.html
+++ b/ADnD_2E_Revised/html/tabs/sheet-settings-tab.html
@@ -196,7 +196,7 @@ <h4>Miscellaneous modifier popup on rolls</h4>
     </p>
     <label>Should rolls ask for a Miscellaneous modifier?</label>
     <select name="attr_misc-mod" title="@{misc-mod}">
-        <option value="?{Misc. modifier?|0}">Popup on rolls</option>
+        <option value="?{Misc. modifier? (+ for bonus, - for penalty|0} [Misc mod]">Popup on rolls</option>
         <option value="0">No popup</option>
     </select>
     <br>
diff --git a/ADnD_2E_Revised/javascript/sheetWorkers.js b/ADnD_2E_Revised/javascript/sheetWorkers.js
index 5a1fa8d7fa6e..645769b7d588 100644
--- a/ADnD_2E_Revised/javascript/sheetWorkers.js
+++ b/ADnD_2E_Revised/javascript/sheetWorkers.js
@@ -1939,11 +1939,11 @@ on('clicked:repeating_weapons-damage:crit2', function(eventInfo) {
         ? values[prefix+'damsm']
         : values[prefix+'daml'];
     let damageAdjFunc = (values) => [
-        `(${values[prefix+'damadj']})`,
-        `({${values[prefix+'specialist-damage']},${values[prefix+'mastery-damage']}}kh1)`,
-        `((@{strengthdmg})*${values[prefix+'strbonus1']})`,
-        `((@{dexmissile})*${values[prefix+'dexbonus1']})`,
-        '(@{temp-damadj})',
+        `([[(@{strengthdmg})*${values[prefix+'strbonus1']}]] [Strength])`,
+        `([[(@{dexmissile})*${values[prefix+'dexbonus1']}]] [Dexterity])`,
+        `([[{${values[prefix+'specialist-damage']},${values[prefix+'mastery-damage']}}kh1]] [Proficiency])`,
+        `(${values[prefix+'damadj']} [Dmg Adj])`,
+        '(@{temp-damadj} [Temp buff])',
         '(@{misc-mod})'
     ].join('+');
 
@@ -1964,11 +1964,11 @@ on('clicked:repeating_ammo:crit2', function (eventInfo) {
         ? values[prefix+'damsm2']
         : values[prefix+'daml2'];
     let damageAdjFunc = (values) => [
-        `(${values[prefix+'damadj2']})`,
-        `((@{strengthdmg})*${values[prefix+'strbonus3']})`,
-        `((@{dexmissile})*${values[prefix+'dexbonus3']})`,
-        `({${values[prefix+'specialist-damage2']},${values[prefix+'mastery-damage2']}}kh1)`,
-        '(@{temp-damadj})',
+        `([[(@{strengthdmg})*${values[prefix+'strbonus3']}]] [Strength])`,
+        `([[(@{dexmissile})*${values[prefix+'dexbonus3']}]] [Dexterity])`,
+        `([[{${values[prefix+'specialist-damage2']},${values[prefix+'mastery-damage2']}}kh1]] [Proficiency])`,
+        `(${values[prefix+'damadj2']} [Dmg Adj])`,
+        '(@{temp-damadj} [Temp buff])',
         '(@{misc-mod})'
     ].join('+');
 
@@ -2446,7 +2446,7 @@ function weaponPoCritTemplate(prefix, fields, nameFunc, baseDamageFunc, damageAd
                 rollBuilder.push(`multiplier=(Double)`);
                 damage = `(${weaponDamage})*2`;
             }
-            rollBuilder.push(`damage=[[${damage}+[[${damageAdjFunc(values)}]] ]]`);
+            rollBuilder.push(`damage=[[${damage}+${damageAdjFunc(values)} ]]`);
         }
 
         if (errors.length > 0)