From 85132ea0cb4132d30ef67579a836c275b525d4d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=88=87ince?= <vince-roll20@users.noreply.github.com>
Date: Sun, 24 Nov 2024 19:50:17 -0800
Subject: [PATCH 1/7] Updated some of the sheet's font settings.

---
 ADnD_1E_Revised/1ESheet.css  | 18 +++++++++++-------
 ADnD_1E_Revised/1ESheet.html | 11 ++++++++++-
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/ADnD_1E_Revised/1ESheet.css b/ADnD_1E_Revised/1ESheet.css
index e5888e7baa88..c6f0dd9217ae 100644
--- a/ADnD_1E_Revised/1ESheet.css
+++ b/ADnD_1E_Revised/1ESheet.css
@@ -1,9 +1,9 @@
 @import url('https://fonts.googleapis.com/css2?family=Material+Icons&display=swap');
-@import url('https://fonts.googleapis.com/css2?family=Raleway:wght@400;600&display=swap');
-@import url('https://fonts.googleapis.com/css2?family=Poppins:wght@400;500;600&display=swap');
-@import url('https://fonts.googleapis.com/css2?family=Caladea:wght@400;700&display=swap');
-/* @import url('https://fonts.googleapis.com/css2?family=Rye:wght@400;600&display=swap');
-@import url('https://fonts.googleapis.com/css2?family=Fira+Sans:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap'); */
+@import url('https://fonts.googleapis.com/css2?family=Caladea:ital,wght@0,400;0,700;1,400;1,700&family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&family=Raleway:ital,wght@0,100..900;1,100..900&display=swap');
+/*
+@import url('https://fonts.googleapis.com/css2?family=Rye:wght@400;600&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Fira+Sans:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap');
+*/
 
 /* Misc variables Custom colors for Roll Template */
 :root,
@@ -25,7 +25,7 @@
   --font-base: 'Poppins', system-ui;
   --font-headers: 'Caladea', serif;
   --font-inputs: 'Poppins', system-ui;
-  --font-monster: 'Raleway', sans-serif;
+  --font-monster: 'Raleway', serif;
   --green: rgb(17, 180, 0);
   --grey: rgb(163, 163, 163);
   --link-hover: #005ea2;
@@ -44,10 +44,15 @@
 
   --font-buttons1: 'Poppins', system-ui;
   --font-buttons2: 'Caladea', serif;
+  --text-wt100: 100;
+  --text-wt200: 200;
+  --text-wt300: 300;
   --text-wt400: 400;
   --text-wt500: 500;
   --text-wt600: 600;
   --text-wt700: 700;
+  --text-wt800: 800;
+  --text-wt900: 900;
   --color-white1: #f5f5f5;
   --color-white2: #e1e1e1;
   --color-white3: #b3b3b3;
@@ -1115,7 +1120,6 @@ summary::-webkit-details-marker {
   margin: -2em 0 0 0;
   position: relative;
   width: 102%;
-  z-index: 1;
 }
 
 .charsheet .npc-toggle {
diff --git a/ADnD_1E_Revised/1ESheet.html b/ADnD_1E_Revised/1ESheet.html
index 936a9ff79b7b..289df58a06e4 100644
--- a/ADnD_1E_Revised/1ESheet.html
+++ b/ADnD_1E_Revised/1ESheet.html
@@ -63,9 +63,18 @@ <h5 class="right two-columns">
             <span class="left">
               <span>v<span name="attr_sheet_version">
             </span>
-            <span class="right"> • 11/10/24'</span>
+            <span class="right"> • 11/24/24'</span>
           </h5>
           <ul>
+            <li>
+              <span>Updated some of the sheet's font settings.</span><br>
+              <details style="max-width:98%;">
+                <summary><h3>Sheet Fonts</h3></summary>
+                  <h5 style="font-family: Raleway; font-weight: normal;"><span>Raleway,</span> <b style="font-weight: 100;">Raleway 100,</b> <b style="font-weight: 200;">Raleway 200,</b> <b style="font-weight: 300;">Raleway 300,</b> <b style="font-weight: 400;">Raleway 400,</b> <b style="font-weight: 500;">Raleway 500,</b> <b style="font-weight: 600;">Raleway 600,</b> <b style="font-weight: 700;">Raleway 700,</b> <b style="font-weight: 800;">Raleway 800,</b> <b style="font-weight: 900;">Raleway 900,</b> <i>Raleway Italic</i></h5>
+                  <h5 style="font-family: Poppins; font-weight: normal;"><span>Poppins,</span> <b style="font-weight: 100;">Poppins 100,</b> <b style="font-weight: 200;">Poppins 200,</b> <b style="font-weight: 300;">Poppins 300,</b> <b style="font-weight: 400;">Poppins 400,</b> <b style="font-weight: 500;">Poppins 500,</b> <b style="font-weight: 600;">Poppins 600,</b> <b style="font-weight: 700;">Poppins 700,</b> <b style="font-weight: 800;">Poppins 800,</b> <b style="font-weight: 900;">Poppins 900,</b> <i>Poppins Italic</i></h5>
+                  <h5 style="font-family: Caladea; font-weight: normal;"><span>Caladea,</span> <b style="font-weight: 100;">Caladea 100,</b> <b style="font-weight: 200;">Caladea 200,</b> <b style="font-weight: 300;">Caladea 300,</b> <b style="font-weight: 400;">Caladea 400,</b> <b style="font-weight: 500;">Caladea 500,</b> <b style="font-weight: 600;">Caladea 600,</b> <b style="font-weight: 700;">Caladea 700,</b> <b style="font-weight: 800;">Caladea 800,</b> <b style="font-weight: 900;">Caladea 900,</b> <i>Caladea Italic</i></h5>
+              </details>
+            </li>
             <li>Small adjustment to hide the +/- flippers on number fields.</li>
             <li>Autofill base value for saves has been added to the Monster page.</li>
             <li>Height and Weight fields have been added to the Monster page.</li>

From 2a66f10185631d0d38cf217b028b3701095e2cab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=88=87ince?= <vince-roll20@users.noreply.github.com>
Date: Sun, 24 Nov 2024 23:05:23 -0800
Subject: [PATCH 2/7] trying to substitute chat menu damage buttons with auto
 damage to rolls

---
 ADnD_1E_Revised/1ESheet.html | 173 +++++++++++++++++++----------------
 1 file changed, 94 insertions(+), 79 deletions(-)

diff --git a/ADnD_1E_Revised/1ESheet.html b/ADnD_1E_Revised/1ESheet.html
index 289df58a06e4..815f6a048d9f 100644
--- a/ADnD_1E_Revised/1ESheet.html
+++ b/ADnD_1E_Revised/1ESheet.html
@@ -4504,6 +4504,10 @@ <h4>Misc. Options:</h4>
             <span>Use THAC0:</span>
             <input type="checkbox" name="attr_toggle_to_hit_table" value="1" />
           </label>
+          <label title="@{toggle_auto_damage} | Auto roll weapon damage for regardless of the attack roll.">
+            <span>Auto Roll Damage:</span>
+            <input type="checkbox" name="attr_toggle_auto_damage" value="1" />
+          </label>
           <label title="@{toggle_critdamage} | Use crit damage rolls on natural 20. Defaults to weapon damage x2. Crit damage handling can be adjusted per attack.">
             <span>Use Crit Damage:</span>
             <input type="checkbox" name="attr_toggle_critdamage" value="1" />
@@ -5435,7 +5439,6 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
   };
 
   // during version updates, we need to check that an attribute exists and is not equal to its default, before updating it.
-  // changed != to !==   ie eslint suggestion
   const doUpdate = (stat, def = 0) => typeof stat !== 'undefined' && stat !== def;
 
   // handles regex for testing and replacing macrotext attributes
@@ -5449,17 +5452,17 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
   };
 
   // Character Name Validation
-const isAlphaNumericWithSpaces = (attr) => {
-  // Check for alpha-numeric characters and spaces
-  if (/^[a-zA-Z0-9\s]+$/.test(attr)) {
+  const isAlphaNumericWithSpaces = (attr) => {
+    // Check for alpha-numeric characters and spaces
+    if (/^[a-zA-Z0-9\s]+$/.test(attr)) {
+      return true;
+    }
+    // Check for specific characters that can break a macro
+    if (/[),|\}]/.test(attr)) {
+      return false;
+    }
     return true;
-  }
-  // Check for specific characters that can break a macro
-  if (/[),|\}]/.test(attr)) {
-    return false;
-  }
-  return true;
-};
+  };
 
   // Number Validation
   const numbersOnly = (attr) => {
@@ -5481,7 +5484,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
     return generated;
   };
 
-  // Validate input for illegal characters
+  // Validate character name for illegal characters
   on('change:character_name', (eventInfo) => {
     // clog(`Change Detected:${eventInfo.sourceAttribute}`);
     getAttrs(['character_name'], (v) => {
@@ -5537,9 +5540,9 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
           output[`${eventInfo.sourceAttribute}_error`] = isNumber;
           // output[`${eventInfo.sourceAttribute}`] = isNumber === 0 ? 0 : attr;
           setAttrs(output, {silent: true});
-        }
+        },
       );
-    }
+    },
   );
 
   // Global Variables
@@ -5677,7 +5680,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
     'armorother6_mod',
   ];
 
-  // use in getSectionIds to separate repeating attribute names
+  // used in getSectionIds to separate a repeating attribute names into 3 components
   const section_attribute = (section, id, field) => `repeating_${section}_${id}_${field}`;
 
   // VERSIONATOR example
@@ -5759,7 +5762,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
           if (v[section_attribute('nonweaponproficiencies', id, 'macro-text')]) {
             output[section_attribute('nonweaponproficiencies', id, 'macro-text')] = v[section_attribute('nonweaponproficiencies', id, 'macro-text')].replace(
               replacements.nwp_old,
-              replacements.nwp_new
+              replacements.nwp_new,
             );
           }
         });
@@ -6093,7 +6096,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
                 if (v[section_attribute('nonweaponproficiencies', id, 'nwp_macro_text')]) {
                   output[section_attribute('nonweaponproficiencies', id, 'nwp_macro_text')] = v[section_attribute('nonweaponproficiencies', id, 'nwp_macro_text')].replace(
                     replacements.nwp_old,
-                    replacements.nwp_new
+                    replacements.nwp_new,
                   );
                   clog(`VERSION UPDATE: colorUpdate completed`);
                 }
@@ -6102,7 +6105,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
                 if (v[section_attribute('weapon', id, 'weapon_macro_text')]) {
                   output[section_attribute('weapon', id, 'weapon_macro_text')] = v[section_attribute('weapon', id, 'weapon_macro_text')].replace(
                     replacements.wpn_old,
-                    replacements.wpn_new
+                    replacements.wpn_new,
                   );
                   clog(`VERSION UPDATE: colorUpdate completed`);
                 }
@@ -6111,7 +6114,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
                 if (v[section_attribute('ability', id, 'ability_macro_text')]) {
                   output[section_attribute('ability', id, 'ability_macro_text')] = v[section_attribute('ability', id, 'ability_macro_text')].replace(
                     replacements.abl_old,
-                    replacements.abl_new
+                    replacements.abl_new,
                   );
                   clog(`VERSION UPDATE: colorUpdate completed`);
                 }
@@ -6120,7 +6123,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
                 if (v[section_attribute('spells', id, 'spell_macro_text')]) {
                   output[section_attribute('spells', id, 'spell_macro_text')] = v[section_attribute('spells', id, 'spell_macro_text')].replace(
                     replacements.spl_old,
-                    replacements.spl_new
+                    replacements.spl_new,
                   );
                   clog(`VERSION UPDATE: colorUpdate completed`);
                 }
@@ -6299,32 +6302,32 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
           if (v[section_attribute('weapon', id, 'weapon_macro_text')] === replacements.weapon_old_v6) {
             output[section_attribute('weapon', id, 'weapon_macro_text')] = v[section_attribute('weapon', id, 'weapon_macro_text')].replace(
               replacements.weapon_old_v6,
-              replacements.weapon_current
+              replacements.weapon_current,
             );
           } else if (v[section_attribute('weapon', id, 'weapon_macro_text')] === replacements.weapon_old_v5) {
             output[section_attribute('weapon', id, 'weapon_macro_text')] = v[section_attribute('weapon', id, 'weapon_macro_text')].replace(
               replacements.weapon_old_v5,
-              replacements.weapon_current
+              replacements.weapon_current,
             );
           } else if (v[section_attribute('weapon', id, 'weapon_macro_text')] === replacements.weapon_old_v4) {
             output[section_attribute('weapon', id, 'weapon_macro_text')] = v[section_attribute('weapon', id, 'weapon_macro_text')].replace(
               replacements.weapon_old_v4,
-              replacements.weapon_current
+              replacements.weapon_current,
             );
           } else if (v[section_attribute('weapon', id, 'weapon_macro_text')] === replacements.weapon_old_v3) {
             output[section_attribute('weapon', id, 'weapon_macro_text')] = v[section_attribute('weapon', id, 'weapon_macro_text')].replace(
               replacements.weapon_old_v3,
-              replacements.weapon_current
+              replacements.weapon_current,
             );
           } else if (v[section_attribute('weapon', id, 'weapon_macro_text')] === replacements.weapon_old_v2) {
             output[section_attribute('weapon', id, 'weapon_macro_text')] = v[section_attribute('weapon', id, 'weapon_macro_text')].replace(
               replacements.weapon_old_v2,
-              replacements.weapon_current
+              replacements.weapon_current,
             );
           } else if (v[section_attribute('weapon', id, 'weapon_macro_text')] === replacements.weapon_old) {
             output[section_attribute('weapon', id, 'weapon_macro_text')] = v[section_attribute('weapon', id, 'weapon_macro_text')].replace(
               replacements.weapon_old,
-              replacements.weapon_current
+              replacements.weapon_current,
             );
           }
         });
@@ -6362,31 +6365,31 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
           if (v[section_attribute('ability', id, 'ability_macro_text')] === replacements.ability_old_v5) {
             output[section_attribute('ability', id, 'ability_macro_text')] = v[section_attribute('ability', id, 'ability_macro_text')].replace(
               replacements.ability_old_v5,
-              replacements.ability_current
+              replacements.ability_current,
             );
           }
           if (v[section_attribute('ability', id, 'ability_macro_text')] === replacements.ability_old_v4) {
             output[section_attribute('ability', id, 'ability_macro_text')] = v[section_attribute('ability', id, 'ability_macro_text')].replace(
               replacements.ability_old_v4,
-              replacements.ability_current
+              replacements.ability_current,
             );
           }
           if (v[section_attribute('ability', id, 'ability_macro_text')] === replacements.ability_old_v3) {
             output[section_attribute('ability', id, 'ability_macro_text')] = v[section_attribute('ability', id, 'ability_macro_text')].replace(
               replacements.ability_old_v3,
-              replacements.ability_current
+              replacements.ability_current,
             );
           }
           if (v[section_attribute('ability', id, 'ability_macro_text')] === replacements.ability_old_v2) {
             output[section_attribute('ability', id, 'ability_macro_text')] = v[section_attribute('ability', id, 'ability_macro_text')].replace(
               replacements.ability_old_v2,
-              replacements.ability_current
+              replacements.ability_current,
             );
           }
           if (v[section_attribute('ability', id, 'ability_macro_text')] === replacements.ability_old) {
             output[section_attribute('ability', id, 'ability_macro_text')] = v[section_attribute('ability', id, 'ability_macro_text')].replace(
               replacements.ability_old,
-              replacements.ability_current
+              replacements.ability_current,
             );
           }
         });
@@ -6418,13 +6421,13 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
           if (v[section_attribute('nonweaponproficiencies', id, 'nwp_macro_text')] === replacements.nwp_old_2) {
             output[section_attribute('nonweaponproficiencies', id, 'nwp_macro_text')] = v[section_attribute('nonweaponproficiencies', id, 'nwp_macro_text')].replace(
               replacements.nwp_old_2,
-              replacements.nwp_current
+              replacements.nwp_current,
             );
           }
           if (v[section_attribute('nonweaponproficiencies', id, 'nwp_macro_text')] === replacements.nwp_old) {
             output[section_attribute('nonweaponproficiencies', id, 'nwp_macro_text')] = v[section_attribute('nonweaponproficiencies', id, 'nwp_macro_text')].replace(
               replacements.nwp_old,
-              replacements.nwp_current
+              replacements.nwp_current,
             );
           }
         });
@@ -6458,19 +6461,19 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
           if (v[section_attribute('spells', id, 'spell_macro_text')] === replacements.spell_old_v3) {
             output[section_attribute('spells', id, 'spell_macro_text')] = v[section_attribute('spells', id, 'spell_macro_text')].replace(
               replacements.spell_old_v3,
-              replacements.spell_current
+              replacements.spell_current,
             );
           }
           if (v[section_attribute('spells', id, 'spell_macro_text')] === replacements.spell_old_v2) {
             output[section_attribute('spells', id, 'spell_macro_text')] = v[section_attribute('spells', id, 'spell_macro_text')].replace(
               replacements.spell_old_v2,
-              replacements.spell_current
+              replacements.spell_current,
             );
           }
           if (v[section_attribute('spells', id, 'spell_macro_text')] === replacements.spell_old) {
             output[section_attribute('spells', id, 'spell_macro_text')] = v[section_attribute('spells', id, 'spell_macro_text')].replace(
               replacements.spell_old,
-              replacements.spell_current
+              replacements.spell_current,
             );
           }
         });
@@ -6500,7 +6503,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
           if (v[section_attribute('equipment', id, 'equipment_macro_text')] === replacements.equipment_old) {
             output[section_attribute('equipment', id, 'equipment_macro_text')] = v[section_attribute('equipment', id, 'equipment_macro_text')].replace(
               replacements.equipment_old,
-              replacements.equipment_current
+              replacements.equipment_current,
             );
           }
         });
@@ -7717,7 +7720,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
               } else if (equipmentWeightsArray[nameIndex] === '0' && equipmentCostsArray[nameIndex] === '0') {
                 // weight & cost are being tracked on weapons
                 clog(
-                  `MATCH w/weight & cost tracked on weapons. || UPDATE ROW || name:${weaponName} weight:${equipmentWeightsArray[nameIndex]} cost:${equipmentCostsArray[nameIndex]} at index:${nameIndex} id:${equipmentIdsArray[nameIndex]}`
+                  `MATCH w/weight & cost tracked on weapons. || UPDATE ROW || name:${weaponName} weight:${equipmentWeightsArray[nameIndex]} cost:${equipmentCostsArray[nameIndex]} at index:${nameIndex} id:${equipmentIdsArray[nameIndex]}`,
                 );
                 // update existing row
                 newID = equipmentIdsArray[nameIndex];
@@ -7729,7 +7732,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
               } else if (equipmentWeightsArray[nameIndex] !== '0' && equipmentCostsArray[nameIndex] === '0') {
                 // weight is being tracked on equipment but costs are not
                 clog(
-                  `MATCH w/weight tracked on equipment. || UPDATE ROW || name:${weaponName} weight:${equipmentWeightsArray[nameIndex]} cost:${equipmentCostsArray[nameIndex]} at index:${nameIndex} id:${equipmentIdsArray[nameIndex]}`
+                  `MATCH w/weight tracked on equipment. || UPDATE ROW || name:${weaponName} weight:${equipmentWeightsArray[nameIndex]} cost:${equipmentCostsArray[nameIndex]} at index:${nameIndex} id:${equipmentIdsArray[nameIndex]}`,
                 );
                 // update existing row
                 newID = equipmentIdsArray[nameIndex];
@@ -7738,7 +7741,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
               } else if (equipmentWeightsArray[nameIndex] === '0' && equipmentCostsArray[nameIndex] !== '0') {
                 // weight is not being tracked on equipment but costs are
                 clog(
-                  `MATCH w/cost tracked on equipment. || UPDATE ROW || name:${weaponName} weight:${equipmentWeightsArray[nameIndex]} cost:${equipmentCostsArray[nameIndex]} at index:${nameIndex} id:${equipmentIdsArray[nameIndex]}`
+                  `MATCH w/cost tracked on equipment. || UPDATE ROW || name:${weaponName} weight:${equipmentWeightsArray[nameIndex]} cost:${equipmentCostsArray[nameIndex]} at index:${nameIndex} id:${equipmentIdsArray[nameIndex]}`,
                 );
                 // update existing row
                 newID = equipmentIdsArray[nameIndex];
@@ -7746,7 +7749,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
                 output[`repeating_equipment_${newID}_equipment_weight`] = weaponWeight;
               } else if (equipmentWeightsArray[nameIndex] !== '0' && equipmentCostsArray[nameIndex] !== '0') {
                 clog(
-                  `100% MATCH weight & cost tracked on equipment. || IGNORE ROW || name:${weaponName} weight: ${equipmentWeightsArray[nameIndex]} cost:${equipmentCostsArray[nameIndex]} at index:${nameIndex}`
+                  `100% MATCH weight & cost tracked on equipment. || IGNORE ROW || name:${weaponName} weight: ${equipmentWeightsArray[nameIndex]} cost:${equipmentCostsArray[nameIndex]} at index:${nameIndex}`,
                 );
               } else {
                 // ignore
@@ -8087,7 +8090,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
     (eventInfo) => {
       // clog(`Change Detected:${eventInfo.sourceAttribute}`);
       sumEquipmentWeight();
-    }
+    },
   );
 
   // Coin Weight
@@ -8173,7 +8176,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
         output.max_load = max + 1;
         setAttrs(output, {silent: true}, setCurrentEncumbranceFlag());
       });
-    }
+    },
   );
 
   // Movement Calcs
@@ -8259,7 +8262,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
             clog(`>> failure in bulk calculation <<`);
         }
         setAttrs(output);
-      }
+      },
     );
   }
 
@@ -8268,7 +8271,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
     (eventInfo) => {
       // clog(`Change Detected:${eventInfo.sourceAttribute}`);
       setCurrentBulk();
-    }
+    },
   );
 
   // type/carry jumps to follow unless Show All or same type/carry tab
@@ -8812,7 +8815,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
         // Once done, call the provided callback
         if (callback) callback();
         setAttrs(output, calcAC(recalc));
-      }
+      },
     );
   }
 
@@ -8852,7 +8855,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
         output[`repeating_weapon_${newID}_weapon_notes`] = v[`repeating_equipment_${id}_equipment_description`];
         setAttrs(output, {silent: true});
         damageMacro(newID);
-      }
+      },
     );
   }
 
@@ -8930,7 +8933,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
           fillArmorDetails(id);
         }
       });
-    }
+    },
   );
 
   // sync armor button - fill armor details row with repeating attr values
@@ -9129,7 +9132,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
             : '{{ToHitACadj2to10}}';
         setAttrs(output, {silent: true});
       });
-    }
+    },
   );
 
   // Matrix or THAC0 Toggle for repeating_weapon
@@ -9590,18 +9593,18 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
             armorOther3_base +
             armorOther4_base +
             armorOther5_base +
-            armorOther6_base
+            armorOther6_base,
         );
         const baseAC_best = int(
-          Math.min(armorType_ac, armorType2_ac, armorOther_ac, unarmored_ac) + (armorShield_ac + armorOther2_ac + armorOther3_ac + armorOther4_ac + armorOther5_ac + armorOther6_ac)
+          Math.min(armorType_ac, armorType2_ac, armorOther_ac, unarmored_ac) + (armorShield_ac + armorOther2_ac + armorOther3_ac + armorOther4_ac + armorOther5_ac + armorOther6_ac),
         );
         const baseAR = int(
           Math.min(armorType_baseValue, armorType2_baseValue, armorOther_baseValue, unArmored_baseValue) +
-            (armorShield_baseValue + armorOther2_baseValue + armorOther3_baseValue + armorOther4_baseValue + armorOther5_baseValue + armorOther6_baseValue)
+            (armorShield_baseValue + armorOther2_baseValue + armorOther3_baseValue + armorOther4_baseValue + armorOther5_baseValue + armorOther6_baseValue),
         );
         const baseAC = int(
           Math.min(armorType_acValue, armorType2_acValue, armorOther_acValue, unArmored_acValue) +
-            (armorOther2_acValue + armorOther3_acValue + armorOther4_acValue + armorOther5_acValue + armorOther6_acValue)
+            (armorOther2_acValue + armorOther3_acValue + armorOther4_acValue + armorOther5_acValue + armorOther6_acValue),
         );
         const armorMagicAC_total = int(
           armorType_magic +
@@ -9613,7 +9616,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
             armorOther4_magic +
             armorOther5_magic +
             armorOther6_magic +
-            armorShield_magic
+            armorShield_magic,
         );
         const armorMagicAC = int(
           armorType_worn * armorType_magic +
@@ -9624,7 +9627,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
             armorOther3_worn * armorOther3_magic +
             armorOther4_worn * armorOther4_magic +
             armorOther5_worn * armorOther5_magic +
-            armorOther6_worn * armorOther6_magic
+            armorOther6_worn * armorOther6_magic,
         );
         const armorModAC_total = int(armorOther_mod + armorOther2_mod + armorOther3_mod + armorOther4_mod + armorOther5_mod + armorOther6_mod + armorShield_mod) || 0;
         const armorModAC = int(
@@ -9633,7 +9636,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
             armorOther3_worn * armorOther3_mod +
             armorOther4_worn * armorOther4_mod +
             armorOther5_worn * armorOther5_mod +
-            armorOther6_worn * armorOther6_mod
+            armorOther6_worn * armorOther6_mod,
         );
         const combinedModMagic = int(armorModAC + armorMagicAC);
         const rearAC = int(baseAC + armorModAC + armorMagicAC);
@@ -9672,7 +9675,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
         output.armorclass_total = totalAC;
         output.armorclass = syncAcFlag ? totalAC : armorClass;
         setAttrs(output, {silent: true});
-      }
+      },
     );
   };
 
@@ -9683,7 +9686,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
       const recalc = 0;
       // clog(`AC change detected by: ${eventInfo.sourceType}`);
       calcAC(recalc);
-    }
+    },
   );
 
   on('clicked:calcac', (eventInfo) => {
@@ -9692,17 +9695,29 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
     calcAC(recalc);
   });
 
+  // Creates the chat menu buttons or auto rolls damage with the attack based on settings
   damageMacro = (id) => {
-    const output = {};
-    output[`repeating_weapon_${id}_weapon_damagesmallmedium_chat_menu`] = `[Roll Damage](~@{character_id}|repeating_weapon_${id}_weapon_damagesmallmedium_roll)`;
-    output[`repeating_weapon_${id}_weapon_damagelarge_chat_menu`] = `[Roll Damage vs LG](~@{character_id}|repeating_weapon_${id}_weapon_damagelarge_roll)`;
-    output[`repeating_weapon_${id}_weapon_damagesmallmedium_npc_chat_menu`] = `[Damage](~@{character_id}|repeating_weapon_${id}_weapon_damagesmallmedium_npc_roll)`;
-    output[`repeating_weapon_${id}_weapon_damagelarge_npc_chat_menu`] = `[Damage vs LG](~@{character_id}|repeating_weapon_${id}_weapon_damagelarge_npc_roll)`;
-    output[`repeating_weapon_${id}_weapon_critdamagesmallmedium_chat_menu`] = `[Roll Damage](~@{character_id}|repeating_weapon_${id}_weapon_critdamagesmallmedium_roll)`;
-    output[`repeating_weapon_${id}_weapon_critdamagelarge_chat_menu`] = `[Roll Damage vs LG](~@{character_id}|repeating_weapon_${id}_weapon_critdamagelarge_roll)`;
-    output[`repeating_weapon_${id}_weapon_critdamagesmallmedium_npc_chat_menu`] = `[Damage](~@{character_id}|repeating_weapon_${id}_weapon_critdamagesmallmedium_npc_roll)`;
-    output[`repeating_weapon_${id}_weapon_critdamagelarge_npc_chat_menu`] = `[Damage vs LG](~@{character_id}|repeating_weapon_${id}_weapon_critdamagelarge_npc_roll)`;
-    setAttrs(output, {silent: true});
+    getAttrs(['toggle_auto_damage'], (v) => {
+      const output = {};
+      const autoDamage = +v.toggle_auto_damage;
+      const damageSmallMedium = `}} {{damage1vsSM=[[ (@{repeating_weapon_${id}_weapon_damagesmallmedium}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]}} {{damagetype=@{repeating_weapon_${id}_weapon_attackdmgtype}`;
+      const damageLarge = `}} {{damage1vsL=[[ (@{repeating_weapon_${id}_weapon_damagelarge}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]}} {{damagetype=@{repeating_weapon_${id}_weapon_attackdmgtype}`;
+      const damageSmallMediumNpc = `}} {{damage1vsSM=[[ (@{repeating_weapon_${id}_weapon_damagesmallmedium}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]}} {{damagetype=@{repeating_weapon_${id}_weapon_attackdmgtype}`;
+      const damageLargeNPC = `}} {{damage1vsL=[[ (@{repeating_weapon_${id}_weapon_damagelarge}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]}} {{damagetype=@{repeating_weapon_${id}_weapon_attackdmgtype}`;
+      const damageSmallMediumCrit = `}} {{damage1vsSM=[[ (@{repeating_weapon_${id}_weapon_critdamagesmallmedium}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]}} {{damagetype=@{repeating_weapon_${id}_weapon_attackdmgtype}}} {{crit=[[ @{repeating_weapon_${id}_toggle_critdamage} ]]`;
+      const damageLargeCrit = `}} {{damage1vsL=[[ (@{repeating_weapon_${id}_weapon_critdamagelarge}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]}} {{damagetype=@{repeating_weapon_${id}_weapon_attackdmgtype}}} {{crit=[[ @{repeating_weapon_${id}_toggle_critdamage} ]]`;
+      const damageSmallMediumNpcCrit = `}} {{damage1vsSM=[[ (@{repeating_weapon_${id}_weapon_critdamagesmallmedium}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]}} {{damagetype=@{repeating_weapon_${id}_weapon_attackdmgtype}}} {{crit=[[ @{repeating_weapon_${id}_toggle_critdamage} ]]`;
+      const damageLargeNpcCrit = `}} {{damage1vsL=[[ (@{repeating_weapon_${id}_weapon_critdamagelarge}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]}} {{damagetype=@{repeating_weapon_${id}_weapon_attackdmgtype}}} {{crit=[[ @{repeating_weapon_${id}_toggle_critdamage} ]]`;
+      output[`@{repeating_weapon_${id}_weapon_damagesmallmedium_chat_menu`] = autoDamage === 0 ? `[Roll Damage](~@{character_id}|@{repeating_weapon_${id}_weapon_damagesmallmedium_roll)` : damageSmallMedium;
+      output[`repeating_weapon_${id}_weapon_damagelarge_chat_menu`] = autoDamage === 0 ? `[Roll Damage vs LG](~@{character_id}|repeating_weapon_${id}_weapon_damagelarge_roll)` : damageLarge;
+      output[`repeating_weapon_${id}_weapon_damagesmallmedium_npc_chat_menu`] = autoDamage === 0 ? `[Damage](~@{character_id}|repeating_weapon_${id}_weapon_damagesmallmedium_npc_roll)` : damageSmallMediumNpc;
+      output[`repeating_weapon_${id}_weapon_damagelarge_npc_chat_menu`] = autoDamage === 0 ? `[Damage vs LG](~@{character_id}|repeating_weapon_${id}_weapon_damagelarge_npc_roll)` : damageLargeNPC;
+      output[`repeating_weapon_${id}_weapon_critdamagesmallmedium_chat_menu`] = autoDamage === 0 ? `[Roll Damage](~@{character_id}|repeating_weapon_${id}_weapon_critdamagesmallmedium_roll)` : damageSmallMediumCrit;
+      output[`repeating_weapon_${id}_weapon_critdamagelarge_chat_menu`] = autoDamage === 0 ? `[Roll Damage vs LG](~@{character_id}|repeating_weapon_${id}_weapon_critdamagelarge_roll)` : damageLargeCrit;
+      output[`repeating_weapon_${id}_weapon_critdamagesmallmedium_npc_chat_menu`] = autoDamage === 0 ? `[Damage](~@{character_id}|repeating_weapon_${id}_weapon_critdamagesmallmedium_npc_roll)` : damageSmallMediumNpcCrit;
+      output[`repeating_weapon_${id}_weapon_critdamagelarge_npc_chat_menu`] = autoDamage === 0 ? `[Damage vs LG](~@{character_id}|repeating_weapon_${id}_weapon_critdamagelarge_npc_roll)` : damageLargeNpcCrit;
+      setAttrs(output, {silent: true});
+    });
   };
 
   // Ensures Chat Menu Buttons have updated Damage Rolls
@@ -9712,7 +9727,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
       // clog(`Change Detected:${eventInfo.sourceAttribute}`);
       const id = eventInfo.sourceAttribute.split('_')[2];
       damageMacro(id);
-    }
+    },
   );
 
   on('change:toggle_critdamage', (eventInfo) => {
@@ -10582,7 +10597,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
         const tempSaveparalysispoisondeath = +v.saveparalysispoisondeath_temp_mod || 0;
         const oldSave = +v.saveparalysispoisondeath || 0;
         const newSave = int(
-          baseSaveparalysispoisondeath + racialSaveparalysispoisondeath + abilitySaveparalysispoisondeath + miscSaveparalysispoisondeath + tempSaveparalysispoisondeath
+          baseSaveparalysispoisondeath + racialSaveparalysispoisondeath + abilitySaveparalysispoisondeath + miscSaveparalysispoisondeath + tempSaveparalysispoisondeath,
         );
         // clog(`oldSave: ${oldSave} newSave: ${newSave}`);
         if (migrate === 1) {
@@ -10596,7 +10611,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
           output.saveparalysispoisondeath = newSave;
         }
         setAttrs(output, {silent: true});
-      }
+      },
     );
   };
 
@@ -10619,7 +10634,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
         const tempSavepetrificationpolymorph = +v.savepetrificationpolymorph_temp_mod || 0;
         const oldSave = +v.savepetrificationpolymorph || 0;
         const newSave = int(
-          baseSavepetrificationpolymorph + racialSavepetrificationpolymorph + abilitySavepetrificationpolymorph + miscSavepetrificationpolymorph + tempSavepetrificationpolymorph
+          baseSavepetrificationpolymorph + racialSavepetrificationpolymorph + abilitySavepetrificationpolymorph + miscSavepetrificationpolymorph + tempSavepetrificationpolymorph,
         );
         // clog(`oldSave: ${oldSave} newSave: ${newSave}`);
         if (migrate === 1) {
@@ -10633,7 +10648,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
           output.savepetrificationpolymorph = newSave;
         }
         setAttrs(output, {silent: true});
-      }
+      },
     );
   };
 
@@ -10668,7 +10683,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
           output.saverodsstaveswands = newSave;
         }
         setAttrs(output, {silent: true});
-      }
+      },
     );
   };
 
@@ -10696,7 +10711,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
           output.savebreathweapons = newSave;
         }
         setAttrs(output, {silent: true});
-      }
+      },
     );
   };
 
@@ -10775,28 +10790,28 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
     (eventInfo) => {
       // clog(`Change Detected:${eventInfo.sourceAttribute}`);
       saveparalysispoisondeathCalc();
-    }
+    },
   );
   on(
     'change:savepetrificationpolymorph_base change:savepetrificationpolymorph_racial_mod change:savepetrificationpolymorph_ability_mod change:savepetrificationpolymorph_misc_mod change:savepetrificationpolymorph_temp_mod',
     (eventInfo) => {
       // clog(`Change Detected:${eventInfo.sourceAttribute}`);
       savepetrificationpolymorphCalc();
-    }
+    },
   );
   on(
     'change:saverodsstaveswands_base change:saverodsstaveswands_racial_mod change:saverodsstaveswands_ability_mod change:saverodsstaveswands_misc_mod change:saverodsstaveswands_temp_mod',
     (eventInfo) => {
       // clog(`Change Detected:${eventInfo.sourceAttribute}`);
       saverodsstaveswandsCalc();
-    }
+    },
   );
   on(
     'change:savebreathweapons_base change:savebreathweapons_racial_mod change:savebreathweapons_ability_mod change:savebreathweapons_misc_mod change:savebreathweapons_temp_mod',
     (eventInfo) => {
       // clog(`Change Detected:${eventInfo.sourceAttribute}`);
       savebreathweaponsCalc();
-    }
+    },
   );
   on('change:savespells_base change:savespells_racial_mod change:savespells_ability_mod change:savespells_misc_mod change:savespells_temp_mod', (eventInfo) => {
     // clog(`Change Detected:${eventInfo.sourceAttribute}`);

From f857fbb18a1732651ca10c625214c72e17bcb90f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=88=87ince?= <vince-roll20@users.noreply.github.com>
Date: Sun, 24 Nov 2024 23:07:24 -0800
Subject: [PATCH 3/7] linter complaints

---
 ADnD_1E_Revised/1ESheet.html | 132 +++++++++++++++++------------------
 1 file changed, 66 insertions(+), 66 deletions(-)

diff --git a/ADnD_1E_Revised/1ESheet.html b/ADnD_1E_Revised/1ESheet.html
index 289df58a06e4..09889083f592 100644
--- a/ADnD_1E_Revised/1ESheet.html
+++ b/ADnD_1E_Revised/1ESheet.html
@@ -5449,17 +5449,17 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
   };
 
   // Character Name Validation
-const isAlphaNumericWithSpaces = (attr) => {
-  // Check for alpha-numeric characters and spaces
-  if (/^[a-zA-Z0-9\s]+$/.test(attr)) {
+  const isAlphaNumericWithSpaces = (attr) => {
+    // Check for alpha-numeric characters and spaces
+    if (/^[a-zA-Z0-9\s]+$/.test(attr)) {
+      return true;
+    }
+    // Check for specific characters that can break a macro
+    if (/[),|\}]/.test(attr)) {
+      return false;
+    }
     return true;
-  }
-  // Check for specific characters that can break a macro
-  if (/[),|\}]/.test(attr)) {
-    return false;
-  }
-  return true;
-};
+  };
 
   // Number Validation
   const numbersOnly = (attr) => {
@@ -5537,9 +5537,9 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
           output[`${eventInfo.sourceAttribute}_error`] = isNumber;
           // output[`${eventInfo.sourceAttribute}`] = isNumber === 0 ? 0 : attr;
           setAttrs(output, {silent: true});
-        }
+        },
       );
-    }
+    },
   );
 
   // Global Variables
@@ -5759,7 +5759,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
           if (v[section_attribute('nonweaponproficiencies', id, 'macro-text')]) {
             output[section_attribute('nonweaponproficiencies', id, 'macro-text')] = v[section_attribute('nonweaponproficiencies', id, 'macro-text')].replace(
               replacements.nwp_old,
-              replacements.nwp_new
+              replacements.nwp_new,
             );
           }
         });
@@ -6093,7 +6093,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
                 if (v[section_attribute('nonweaponproficiencies', id, 'nwp_macro_text')]) {
                   output[section_attribute('nonweaponproficiencies', id, 'nwp_macro_text')] = v[section_attribute('nonweaponproficiencies', id, 'nwp_macro_text')].replace(
                     replacements.nwp_old,
-                    replacements.nwp_new
+                    replacements.nwp_new,
                   );
                   clog(`VERSION UPDATE: colorUpdate completed`);
                 }
@@ -6102,7 +6102,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
                 if (v[section_attribute('weapon', id, 'weapon_macro_text')]) {
                   output[section_attribute('weapon', id, 'weapon_macro_text')] = v[section_attribute('weapon', id, 'weapon_macro_text')].replace(
                     replacements.wpn_old,
-                    replacements.wpn_new
+                    replacements.wpn_new,
                   );
                   clog(`VERSION UPDATE: colorUpdate completed`);
                 }
@@ -6111,7 +6111,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
                 if (v[section_attribute('ability', id, 'ability_macro_text')]) {
                   output[section_attribute('ability', id, 'ability_macro_text')] = v[section_attribute('ability', id, 'ability_macro_text')].replace(
                     replacements.abl_old,
-                    replacements.abl_new
+                    replacements.abl_new,
                   );
                   clog(`VERSION UPDATE: colorUpdate completed`);
                 }
@@ -6120,7 +6120,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
                 if (v[section_attribute('spells', id, 'spell_macro_text')]) {
                   output[section_attribute('spells', id, 'spell_macro_text')] = v[section_attribute('spells', id, 'spell_macro_text')].replace(
                     replacements.spl_old,
-                    replacements.spl_new
+                    replacements.spl_new,
                   );
                   clog(`VERSION UPDATE: colorUpdate completed`);
                 }
@@ -6299,32 +6299,32 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
           if (v[section_attribute('weapon', id, 'weapon_macro_text')] === replacements.weapon_old_v6) {
             output[section_attribute('weapon', id, 'weapon_macro_text')] = v[section_attribute('weapon', id, 'weapon_macro_text')].replace(
               replacements.weapon_old_v6,
-              replacements.weapon_current
+              replacements.weapon_current,
             );
           } else if (v[section_attribute('weapon', id, 'weapon_macro_text')] === replacements.weapon_old_v5) {
             output[section_attribute('weapon', id, 'weapon_macro_text')] = v[section_attribute('weapon', id, 'weapon_macro_text')].replace(
               replacements.weapon_old_v5,
-              replacements.weapon_current
+              replacements.weapon_current,
             );
           } else if (v[section_attribute('weapon', id, 'weapon_macro_text')] === replacements.weapon_old_v4) {
             output[section_attribute('weapon', id, 'weapon_macro_text')] = v[section_attribute('weapon', id, 'weapon_macro_text')].replace(
               replacements.weapon_old_v4,
-              replacements.weapon_current
+              replacements.weapon_current,
             );
           } else if (v[section_attribute('weapon', id, 'weapon_macro_text')] === replacements.weapon_old_v3) {
             output[section_attribute('weapon', id, 'weapon_macro_text')] = v[section_attribute('weapon', id, 'weapon_macro_text')].replace(
               replacements.weapon_old_v3,
-              replacements.weapon_current
+              replacements.weapon_current,
             );
           } else if (v[section_attribute('weapon', id, 'weapon_macro_text')] === replacements.weapon_old_v2) {
             output[section_attribute('weapon', id, 'weapon_macro_text')] = v[section_attribute('weapon', id, 'weapon_macro_text')].replace(
               replacements.weapon_old_v2,
-              replacements.weapon_current
+              replacements.weapon_current,
             );
           } else if (v[section_attribute('weapon', id, 'weapon_macro_text')] === replacements.weapon_old) {
             output[section_attribute('weapon', id, 'weapon_macro_text')] = v[section_attribute('weapon', id, 'weapon_macro_text')].replace(
               replacements.weapon_old,
-              replacements.weapon_current
+              replacements.weapon_current,
             );
           }
         });
@@ -6362,31 +6362,31 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
           if (v[section_attribute('ability', id, 'ability_macro_text')] === replacements.ability_old_v5) {
             output[section_attribute('ability', id, 'ability_macro_text')] = v[section_attribute('ability', id, 'ability_macro_text')].replace(
               replacements.ability_old_v5,
-              replacements.ability_current
+              replacements.ability_current,
             );
           }
           if (v[section_attribute('ability', id, 'ability_macro_text')] === replacements.ability_old_v4) {
             output[section_attribute('ability', id, 'ability_macro_text')] = v[section_attribute('ability', id, 'ability_macro_text')].replace(
               replacements.ability_old_v4,
-              replacements.ability_current
+              replacements.ability_current,
             );
           }
           if (v[section_attribute('ability', id, 'ability_macro_text')] === replacements.ability_old_v3) {
             output[section_attribute('ability', id, 'ability_macro_text')] = v[section_attribute('ability', id, 'ability_macro_text')].replace(
               replacements.ability_old_v3,
-              replacements.ability_current
+              replacements.ability_current,
             );
           }
           if (v[section_attribute('ability', id, 'ability_macro_text')] === replacements.ability_old_v2) {
             output[section_attribute('ability', id, 'ability_macro_text')] = v[section_attribute('ability', id, 'ability_macro_text')].replace(
               replacements.ability_old_v2,
-              replacements.ability_current
+              replacements.ability_current,
             );
           }
           if (v[section_attribute('ability', id, 'ability_macro_text')] === replacements.ability_old) {
             output[section_attribute('ability', id, 'ability_macro_text')] = v[section_attribute('ability', id, 'ability_macro_text')].replace(
               replacements.ability_old,
-              replacements.ability_current
+              replacements.ability_current,
             );
           }
         });
@@ -6418,13 +6418,13 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
           if (v[section_attribute('nonweaponproficiencies', id, 'nwp_macro_text')] === replacements.nwp_old_2) {
             output[section_attribute('nonweaponproficiencies', id, 'nwp_macro_text')] = v[section_attribute('nonweaponproficiencies', id, 'nwp_macro_text')].replace(
               replacements.nwp_old_2,
-              replacements.nwp_current
+              replacements.nwp_current,
             );
           }
           if (v[section_attribute('nonweaponproficiencies', id, 'nwp_macro_text')] === replacements.nwp_old) {
             output[section_attribute('nonweaponproficiencies', id, 'nwp_macro_text')] = v[section_attribute('nonweaponproficiencies', id, 'nwp_macro_text')].replace(
               replacements.nwp_old,
-              replacements.nwp_current
+              replacements.nwp_current,
             );
           }
         });
@@ -6458,19 +6458,19 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
           if (v[section_attribute('spells', id, 'spell_macro_text')] === replacements.spell_old_v3) {
             output[section_attribute('spells', id, 'spell_macro_text')] = v[section_attribute('spells', id, 'spell_macro_text')].replace(
               replacements.spell_old_v3,
-              replacements.spell_current
+              replacements.spell_current,
             );
           }
           if (v[section_attribute('spells', id, 'spell_macro_text')] === replacements.spell_old_v2) {
             output[section_attribute('spells', id, 'spell_macro_text')] = v[section_attribute('spells', id, 'spell_macro_text')].replace(
               replacements.spell_old_v2,
-              replacements.spell_current
+              replacements.spell_current,
             );
           }
           if (v[section_attribute('spells', id, 'spell_macro_text')] === replacements.spell_old) {
             output[section_attribute('spells', id, 'spell_macro_text')] = v[section_attribute('spells', id, 'spell_macro_text')].replace(
               replacements.spell_old,
-              replacements.spell_current
+              replacements.spell_current,
             );
           }
         });
@@ -6500,7 +6500,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
           if (v[section_attribute('equipment', id, 'equipment_macro_text')] === replacements.equipment_old) {
             output[section_attribute('equipment', id, 'equipment_macro_text')] = v[section_attribute('equipment', id, 'equipment_macro_text')].replace(
               replacements.equipment_old,
-              replacements.equipment_current
+              replacements.equipment_current,
             );
           }
         });
@@ -7717,7 +7717,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
               } else if (equipmentWeightsArray[nameIndex] === '0' && equipmentCostsArray[nameIndex] === '0') {
                 // weight & cost are being tracked on weapons
                 clog(
-                  `MATCH w/weight & cost tracked on weapons. || UPDATE ROW || name:${weaponName} weight:${equipmentWeightsArray[nameIndex]} cost:${equipmentCostsArray[nameIndex]} at index:${nameIndex} id:${equipmentIdsArray[nameIndex]}`
+                  `MATCH w/weight & cost tracked on weapons. || UPDATE ROW || name:${weaponName} weight:${equipmentWeightsArray[nameIndex]} cost:${equipmentCostsArray[nameIndex]} at index:${nameIndex} id:${equipmentIdsArray[nameIndex]}`,
                 );
                 // update existing row
                 newID = equipmentIdsArray[nameIndex];
@@ -7729,7 +7729,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
               } else if (equipmentWeightsArray[nameIndex] !== '0' && equipmentCostsArray[nameIndex] === '0') {
                 // weight is being tracked on equipment but costs are not
                 clog(
-                  `MATCH w/weight tracked on equipment. || UPDATE ROW || name:${weaponName} weight:${equipmentWeightsArray[nameIndex]} cost:${equipmentCostsArray[nameIndex]} at index:${nameIndex} id:${equipmentIdsArray[nameIndex]}`
+                  `MATCH w/weight tracked on equipment. || UPDATE ROW || name:${weaponName} weight:${equipmentWeightsArray[nameIndex]} cost:${equipmentCostsArray[nameIndex]} at index:${nameIndex} id:${equipmentIdsArray[nameIndex]}`,
                 );
                 // update existing row
                 newID = equipmentIdsArray[nameIndex];
@@ -7738,7 +7738,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
               } else if (equipmentWeightsArray[nameIndex] === '0' && equipmentCostsArray[nameIndex] !== '0') {
                 // weight is not being tracked on equipment but costs are
                 clog(
-                  `MATCH w/cost tracked on equipment. || UPDATE ROW || name:${weaponName} weight:${equipmentWeightsArray[nameIndex]} cost:${equipmentCostsArray[nameIndex]} at index:${nameIndex} id:${equipmentIdsArray[nameIndex]}`
+                  `MATCH w/cost tracked on equipment. || UPDATE ROW || name:${weaponName} weight:${equipmentWeightsArray[nameIndex]} cost:${equipmentCostsArray[nameIndex]} at index:${nameIndex} id:${equipmentIdsArray[nameIndex]}`,
                 );
                 // update existing row
                 newID = equipmentIdsArray[nameIndex];
@@ -7746,7 +7746,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
                 output[`repeating_equipment_${newID}_equipment_weight`] = weaponWeight;
               } else if (equipmentWeightsArray[nameIndex] !== '0' && equipmentCostsArray[nameIndex] !== '0') {
                 clog(
-                  `100% MATCH weight & cost tracked on equipment. || IGNORE ROW || name:${weaponName} weight: ${equipmentWeightsArray[nameIndex]} cost:${equipmentCostsArray[nameIndex]} at index:${nameIndex}`
+                  `100% MATCH weight & cost tracked on equipment. || IGNORE ROW || name:${weaponName} weight: ${equipmentWeightsArray[nameIndex]} cost:${equipmentCostsArray[nameIndex]} at index:${nameIndex}`,
                 );
               } else {
                 // ignore
@@ -8087,7 +8087,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
     (eventInfo) => {
       // clog(`Change Detected:${eventInfo.sourceAttribute}`);
       sumEquipmentWeight();
-    }
+    },
   );
 
   // Coin Weight
@@ -8173,7 +8173,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
         output.max_load = max + 1;
         setAttrs(output, {silent: true}, setCurrentEncumbranceFlag());
       });
-    }
+    },
   );
 
   // Movement Calcs
@@ -8259,7 +8259,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
             clog(`>> failure in bulk calculation <<`);
         }
         setAttrs(output);
-      }
+      },
     );
   }
 
@@ -8268,7 +8268,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
     (eventInfo) => {
       // clog(`Change Detected:${eventInfo.sourceAttribute}`);
       setCurrentBulk();
-    }
+    },
   );
 
   // type/carry jumps to follow unless Show All or same type/carry tab
@@ -8812,7 +8812,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
         // Once done, call the provided callback
         if (callback) callback();
         setAttrs(output, calcAC(recalc));
-      }
+      },
     );
   }
 
@@ -8852,7 +8852,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
         output[`repeating_weapon_${newID}_weapon_notes`] = v[`repeating_equipment_${id}_equipment_description`];
         setAttrs(output, {silent: true});
         damageMacro(newID);
-      }
+      },
     );
   }
 
@@ -8930,7 +8930,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
           fillArmorDetails(id);
         }
       });
-    }
+    },
   );
 
   // sync armor button - fill armor details row with repeating attr values
@@ -9129,7 +9129,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
             : '{{ToHitACadj2to10}}';
         setAttrs(output, {silent: true});
       });
-    }
+    },
   );
 
   // Matrix or THAC0 Toggle for repeating_weapon
@@ -9590,18 +9590,18 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
             armorOther3_base +
             armorOther4_base +
             armorOther5_base +
-            armorOther6_base
+            armorOther6_base,
         );
         const baseAC_best = int(
-          Math.min(armorType_ac, armorType2_ac, armorOther_ac, unarmored_ac) + (armorShield_ac + armorOther2_ac + armorOther3_ac + armorOther4_ac + armorOther5_ac + armorOther6_ac)
+          Math.min(armorType_ac, armorType2_ac, armorOther_ac, unarmored_ac) + (armorShield_ac + armorOther2_ac + armorOther3_ac + armorOther4_ac + armorOther5_ac + armorOther6_ac),
         );
         const baseAR = int(
           Math.min(armorType_baseValue, armorType2_baseValue, armorOther_baseValue, unArmored_baseValue) +
-            (armorShield_baseValue + armorOther2_baseValue + armorOther3_baseValue + armorOther4_baseValue + armorOther5_baseValue + armorOther6_baseValue)
+            (armorShield_baseValue + armorOther2_baseValue + armorOther3_baseValue + armorOther4_baseValue + armorOther5_baseValue + armorOther6_baseValue),
         );
         const baseAC = int(
           Math.min(armorType_acValue, armorType2_acValue, armorOther_acValue, unArmored_acValue) +
-            (armorOther2_acValue + armorOther3_acValue + armorOther4_acValue + armorOther5_acValue + armorOther6_acValue)
+            (armorOther2_acValue + armorOther3_acValue + armorOther4_acValue + armorOther5_acValue + armorOther6_acValue),
         );
         const armorMagicAC_total = int(
           armorType_magic +
@@ -9613,7 +9613,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
             armorOther4_magic +
             armorOther5_magic +
             armorOther6_magic +
-            armorShield_magic
+            armorShield_magic,
         );
         const armorMagicAC = int(
           armorType_worn * armorType_magic +
@@ -9624,7 +9624,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
             armorOther3_worn * armorOther3_magic +
             armorOther4_worn * armorOther4_magic +
             armorOther5_worn * armorOther5_magic +
-            armorOther6_worn * armorOther6_magic
+            armorOther6_worn * armorOther6_magic,
         );
         const armorModAC_total = int(armorOther_mod + armorOther2_mod + armorOther3_mod + armorOther4_mod + armorOther5_mod + armorOther6_mod + armorShield_mod) || 0;
         const armorModAC = int(
@@ -9633,7 +9633,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
             armorOther3_worn * armorOther3_mod +
             armorOther4_worn * armorOther4_mod +
             armorOther5_worn * armorOther5_mod +
-            armorOther6_worn * armorOther6_mod
+            armorOther6_worn * armorOther6_mod,
         );
         const combinedModMagic = int(armorModAC + armorMagicAC);
         const rearAC = int(baseAC + armorModAC + armorMagicAC);
@@ -9672,7 +9672,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
         output.armorclass_total = totalAC;
         output.armorclass = syncAcFlag ? totalAC : armorClass;
         setAttrs(output, {silent: true});
-      }
+      },
     );
   };
 
@@ -9683,7 +9683,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
       const recalc = 0;
       // clog(`AC change detected by: ${eventInfo.sourceType}`);
       calcAC(recalc);
-    }
+    },
   );
 
   on('clicked:calcac', (eventInfo) => {
@@ -9712,7 +9712,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
       // clog(`Change Detected:${eventInfo.sourceAttribute}`);
       const id = eventInfo.sourceAttribute.split('_')[2];
       damageMacro(id);
-    }
+    },
   );
 
   on('change:toggle_critdamage', (eventInfo) => {
@@ -10582,7 +10582,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
         const tempSaveparalysispoisondeath = +v.saveparalysispoisondeath_temp_mod || 0;
         const oldSave = +v.saveparalysispoisondeath || 0;
         const newSave = int(
-          baseSaveparalysispoisondeath + racialSaveparalysispoisondeath + abilitySaveparalysispoisondeath + miscSaveparalysispoisondeath + tempSaveparalysispoisondeath
+          baseSaveparalysispoisondeath + racialSaveparalysispoisondeath + abilitySaveparalysispoisondeath + miscSaveparalysispoisondeath + tempSaveparalysispoisondeath,
         );
         // clog(`oldSave: ${oldSave} newSave: ${newSave}`);
         if (migrate === 1) {
@@ -10596,7 +10596,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
           output.saveparalysispoisondeath = newSave;
         }
         setAttrs(output, {silent: true});
-      }
+      },
     );
   };
 
@@ -10619,7 +10619,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
         const tempSavepetrificationpolymorph = +v.savepetrificationpolymorph_temp_mod || 0;
         const oldSave = +v.savepetrificationpolymorph || 0;
         const newSave = int(
-          baseSavepetrificationpolymorph + racialSavepetrificationpolymorph + abilitySavepetrificationpolymorph + miscSavepetrificationpolymorph + tempSavepetrificationpolymorph
+          baseSavepetrificationpolymorph + racialSavepetrificationpolymorph + abilitySavepetrificationpolymorph + miscSavepetrificationpolymorph + tempSavepetrificationpolymorph,
         );
         // clog(`oldSave: ${oldSave} newSave: ${newSave}`);
         if (migrate === 1) {
@@ -10633,7 +10633,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
           output.savepetrificationpolymorph = newSave;
         }
         setAttrs(output, {silent: true});
-      }
+      },
     );
   };
 
@@ -10668,7 +10668,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
           output.saverodsstaveswands = newSave;
         }
         setAttrs(output, {silent: true});
-      }
+      },
     );
   };
 
@@ -10696,7 +10696,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
           output.savebreathweapons = newSave;
         }
         setAttrs(output, {silent: true});
-      }
+      },
     );
   };
 
@@ -10775,28 +10775,28 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
     (eventInfo) => {
       // clog(`Change Detected:${eventInfo.sourceAttribute}`);
       saveparalysispoisondeathCalc();
-    }
+    },
   );
   on(
     'change:savepetrificationpolymorph_base change:savepetrificationpolymorph_racial_mod change:savepetrificationpolymorph_ability_mod change:savepetrificationpolymorph_misc_mod change:savepetrificationpolymorph_temp_mod',
     (eventInfo) => {
       // clog(`Change Detected:${eventInfo.sourceAttribute}`);
       savepetrificationpolymorphCalc();
-    }
+    },
   );
   on(
     'change:saverodsstaveswands_base change:saverodsstaveswands_racial_mod change:saverodsstaveswands_ability_mod change:saverodsstaveswands_misc_mod change:saverodsstaveswands_temp_mod',
     (eventInfo) => {
       // clog(`Change Detected:${eventInfo.sourceAttribute}`);
       saverodsstaveswandsCalc();
-    }
+    },
   );
   on(
     'change:savebreathweapons_base change:savebreathweapons_racial_mod change:savebreathweapons_ability_mod change:savebreathweapons_misc_mod change:savebreathweapons_temp_mod',
     (eventInfo) => {
       // clog(`Change Detected:${eventInfo.sourceAttribute}`);
       savebreathweaponsCalc();
-    }
+    },
   );
   on('change:savespells_base change:savespells_racial_mod change:savespells_ability_mod change:savespells_misc_mod change:savespells_temp_mod', (eventInfo) => {
     // clog(`Change Detected:${eventInfo.sourceAttribute}`);

From 32aad4361c4c0e5a16a3020a7e6b7d88b370a670 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=88=87ince?= <vince-roll20@users.noreply.github.com>
Date: Mon, 25 Nov 2024 13:30:13 -0800
Subject: [PATCH 4/7] working on auto-damage roll option

---
 ADnD_1E_Revised/1ESheet.html | 57 +++++++++++++++++++++++++-----------
 1 file changed, 40 insertions(+), 17 deletions(-)

diff --git a/ADnD_1E_Revised/1ESheet.html b/ADnD_1E_Revised/1ESheet.html
index 815f6a048d9f..db714b172431 100644
--- a/ADnD_1E_Revised/1ESheet.html
+++ b/ADnD_1E_Revised/1ESheet.html
@@ -9700,22 +9700,33 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
     getAttrs(['toggle_auto_damage'], (v) => {
       const output = {};
       const autoDamage = +v.toggle_auto_damage;
-      const damageSmallMedium = `}} {{damage1vsSM=[[ (@{repeating_weapon_${id}_weapon_damagesmallmedium}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]}} {{damagetype=@{repeating_weapon_${id}_weapon_attackdmgtype}`;
-      const damageLarge = `}} {{damage1vsL=[[ (@{repeating_weapon_${id}_weapon_damagelarge}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]}} {{damagetype=@{repeating_weapon_${id}_weapon_attackdmgtype}`;
-      const damageSmallMediumNpc = `}} {{damage1vsSM=[[ (@{repeating_weapon_${id}_weapon_damagesmallmedium}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]}} {{damagetype=@{repeating_weapon_${id}_weapon_attackdmgtype}`;
-      const damageLargeNPC = `}} {{damage1vsL=[[ (@{repeating_weapon_${id}_weapon_damagelarge}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]}} {{damagetype=@{repeating_weapon_${id}_weapon_attackdmgtype}`;
-      const damageSmallMediumCrit = `}} {{damage1vsSM=[[ (@{repeating_weapon_${id}_weapon_critdamagesmallmedium}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]}} {{damagetype=@{repeating_weapon_${id}_weapon_attackdmgtype}}} {{crit=[[ @{repeating_weapon_${id}_toggle_critdamage} ]]`;
-      const damageLargeCrit = `}} {{damage1vsL=[[ (@{repeating_weapon_${id}_weapon_critdamagelarge}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]}} {{damagetype=@{repeating_weapon_${id}_weapon_attackdmgtype}}} {{crit=[[ @{repeating_weapon_${id}_toggle_critdamage} ]]`;
-      const damageSmallMediumNpcCrit = `}} {{damage1vsSM=[[ (@{repeating_weapon_${id}_weapon_critdamagesmallmedium}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]}} {{damagetype=@{repeating_weapon_${id}_weapon_attackdmgtype}}} {{crit=[[ @{repeating_weapon_${id}_toggle_critdamage} ]]`;
-      const damageLargeNpcCrit = `}} {{damage1vsL=[[ (@{repeating_weapon_${id}_weapon_critdamagelarge}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]}} {{damagetype=@{repeating_weapon_${id}_weapon_attackdmgtype}}} {{crit=[[ @{repeating_weapon_${id}_toggle_critdamage} ]]`;
-      output[`@{repeating_weapon_${id}_weapon_damagesmallmedium_chat_menu`] = autoDamage === 0 ? `[Roll Damage](~@{character_id}|@{repeating_weapon_${id}_weapon_damagesmallmedium_roll)` : damageSmallMedium;
-      output[`repeating_weapon_${id}_weapon_damagelarge_chat_menu`] = autoDamage === 0 ? `[Roll Damage vs LG](~@{character_id}|repeating_weapon_${id}_weapon_damagelarge_roll)` : damageLarge;
-      output[`repeating_weapon_${id}_weapon_damagesmallmedium_npc_chat_menu`] = autoDamage === 0 ? `[Damage](~@{character_id}|repeating_weapon_${id}_weapon_damagesmallmedium_npc_roll)` : damageSmallMediumNpc;
-      output[`repeating_weapon_${id}_weapon_damagelarge_npc_chat_menu`] = autoDamage === 0 ? `[Damage vs LG](~@{character_id}|repeating_weapon_${id}_weapon_damagelarge_npc_roll)` : damageLargeNPC;
-      output[`repeating_weapon_${id}_weapon_critdamagesmallmedium_chat_menu`] = autoDamage === 0 ? `[Roll Damage](~@{character_id}|repeating_weapon_${id}_weapon_critdamagesmallmedium_roll)` : damageSmallMediumCrit;
-      output[`repeating_weapon_${id}_weapon_critdamagelarge_chat_menu`] = autoDamage === 0 ? `[Roll Damage vs LG](~@{character_id}|repeating_weapon_${id}_weapon_critdamagelarge_roll)` : damageLargeCrit;
-      output[`repeating_weapon_${id}_weapon_critdamagesmallmedium_npc_chat_menu`] = autoDamage === 0 ? `[Damage](~@{character_id}|repeating_weapon_${id}_weapon_critdamagesmallmedium_npc_roll)` : damageSmallMediumNpcCrit;
-      output[`repeating_weapon_${id}_weapon_critdamagelarge_npc_chat_menu`] = autoDamage === 0 ? `[Damage vs LG](~@{character_id}|repeating_weapon_${id}_weapon_critdamagelarge_npc_roll)` : damageLargeNpcCrit;
+      clog(`auto damage toggle:${autoDamage}`);
+      // note that these macros use '}}' to close/hide the chatmenu keys and also use the chatmenu closing '}}'
+      const damageSmallMedium = `}} {{damage1vsSM=[[ (@{repeating_weapon_${id}_weapon_damagesmallmedium}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]}}`;
+      const damageLarge = `}} {{damage1vsL=[[ (@{repeating_weapon_${id}_weapon_damagelarge}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]}}`;
+      const damageSmallMediumNpc = `}} {{damage1vsSM=[[ (@{repeating_weapon_${id}_weapon_damagesmallmedium}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]}}`;
+      const damageLargeNPC = `}} {{damage1vsL=[[ (@{repeating_weapon_${id}_weapon_damagelarge}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]}}`;
+      const damageSmallMediumCrit = `}} {{damage1vsSM=[[ (@{repeating_weapon_${id}_weapon_damagesmallmedium}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]/[[ (@{repeating_weapon_${id}_weapon_critdamagesmallmedium}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]}} {{crit=[[ @{toggle_critdamage} ]]`;
+      const damageLargeCrit = `}} {{damage1vsL=[[ (@{repeating_weapon_${id}_weapon_damagelarge}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]/[[ (@{repeating_weapon_${id}_weapon_critdamagelarge}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]}} {{crit=[[ @{toggle_critdamage} ]]`;
+      const damageSmallMediumNpcCrit = `}} {{damage1vsSM=[[ (@{repeating_weapon_${id}_weapon_damagesmallmedium}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]/[[ (@{repeating_weapon_${id}_weapon_critdamagesmallmedium}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]}} {{crit=[[ @{toggle_critdamage} ]]`;
+      const damageLargeNpcCrit = `}} {{damage1vsL=[[ (@{repeating_weapon_${id}_weapon_damagelarge}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]/[[ (@{repeating_weapon_${id}_weapon_critdamagelarge}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]}} {{crit=[[ @{toggle_critdamage} ]]`;
+
+      output[`@{repeating_weapon_${id}_weapon_damagesmallmedium_chat_menu`] =
+        autoDamage === 0 ? `[Roll Damage](~@{character_id}|@{repeating_weapon_${id}_weapon_damagesmallmedium_roll)` : damageSmallMedium;
+      output[`repeating_weapon_${id}_weapon_damagelarge_chat_menu`] =
+        autoDamage === 0 ? `[Roll Damage vs LG](~@{character_id}|repeating_weapon_${id}_weapon_damagelarge_roll)` : damageLarge;
+      output[`repeating_weapon_${id}_weapon_damagesmallmedium_npc_chat_menu`] =
+        autoDamage === 0 ? `[Damage](~@{character_id}|repeating_weapon_${id}_weapon_damagesmallmedium_npc_roll)` : damageSmallMediumNpc;
+      output[`repeating_weapon_${id}_weapon_damagelarge_npc_chat_menu`] =
+        autoDamage === 0 ? `[Damage vs LG](~@{character_id}|repeating_weapon_${id}_weapon_damagelarge_npc_roll)` : damageLargeNPC;
+      output[`repeating_weapon_${id}_weapon_critdamagesmallmedium_chat_menu`] =
+        autoDamage === 0 ? `[Roll Damage](~@{character_id}|repeating_weapon_${id}_weapon_critdamagesmallmedium_roll)` : damageSmallMediumCrit;
+      output[`repeating_weapon_${id}_weapon_critdamagelarge_chat_menu`] =
+        autoDamage === 0 ? `[Roll Damage vs LG](~@{character_id}|repeating_weapon_${id}_weapon_critdamagelarge_roll)` : damageLargeCrit;
+      output[`repeating_weapon_${id}_weapon_critdamagesmallmedium_npc_chat_menu`] =
+        autoDamage === 0 ? `[Damage](~@{character_id}|repeating_weapon_${id}_weapon_critdamagesmallmedium_npc_roll)` : damageSmallMediumNpcCrit;
+      output[`repeating_weapon_${id}_weapon_critdamagelarge_npc_chat_menu`] =
+        autoDamage === 0 ? `[Damage vs LG](~@{character_id}|repeating_weapon_${id}_weapon_critdamagelarge_npc_roll)` : damageLargeNpcCrit;
       setAttrs(output, {silent: true});
     });
   };
@@ -9724,7 +9735,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
   on(
     'change:repeating_weapon:weapon_name change:repeating_weapon:weapon_damagesmallmedium change:repeating_weapon:weapon_damagelarge change:repeating_weapon:weapon_critdamagesmallmedium change:repeating_weapon:weapon_critdamagelarge change:repeating_weapon:weapon_attackdmgbonus change:repeating_weapon:weapon_critdamage_flag',
     (eventInfo) => {
-      // clog(`Change Detected:${eventInfo.sourceAttribute}`);
+      clog(`Change Detected:${eventInfo.sourceAttribute}`);
       const id = eventInfo.sourceAttribute.split('_')[2];
       damageMacro(id);
     },
@@ -9748,6 +9759,18 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
     });
   });
 
+  on('change:toggle_auto_damage change:toggle_critdamage', (eventInfo) => {
+    clog(`Change Detected:${eventInfo.sourceAttribute}`);
+    getSectionIDs('repeating_weapon', (idArray) => {
+      const fields = [];
+      getAttrs(fields, (v) => {
+        idArray.forEach((id) => {
+          damageMacro(id);
+        });
+      });
+    });
+  });
+
   function setWeapons(id) {
     const output = {};
     const fields = [

From 3da78cdd0f8b5d9b5023ff9fb75f9b34a5f7d0f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=88=87ince?= <vince-roll20@users.noreply.github.com>
Date: Mon, 25 Nov 2024 16:15:26 -0800
Subject: [PATCH 5/7] the font imports need to be on separate lines to work
 properly with the API

---
 ADnD_1E_Revised/1ESheet.css | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ADnD_1E_Revised/1ESheet.css b/ADnD_1E_Revised/1ESheet.css
index c6f0dd9217ae..795efbb26b0d 100644
--- a/ADnD_1E_Revised/1ESheet.css
+++ b/ADnD_1E_Revised/1ESheet.css
@@ -1,5 +1,7 @@
 @import url('https://fonts.googleapis.com/css2?family=Material+Icons&display=swap');
-@import url('https://fonts.googleapis.com/css2?family=Caladea:ital,wght@0,400;0,700;1,400;1,700&family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&family=Raleway:ital,wght@0,100..900;1,100..900&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Caladea:ital,wght@0,400;0,700;1,400;1,700&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Raleway:ital,wght@0,100..900;1,100..900&display=swap');
 /*
 @import url('https://fonts.googleapis.com/css2?family=Rye:wght@400;600&display=swap');
 @import url('https://fonts.googleapis.com/css2?family=Fira+Sans:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap');

From 4139f7a1b36f8ae9540ba9fff40f6dee7e9c7538 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=88=87ince?= <vince-roll20@users.noreply.github.com>
Date: Mon, 25 Nov 2024 22:51:37 -0800
Subject: [PATCH 6/7] auto damage is working but crit toggle always shows crit
 damage

---
 ADnD_1E_Revised/1ESheet.html | 55 +++++++++++++++++++-----------------
 1 file changed, 29 insertions(+), 26 deletions(-)

diff --git a/ADnD_1E_Revised/1ESheet.html b/ADnD_1E_Revised/1ESheet.html
index db714b172431..b0aaeabfd9b3 100644
--- a/ADnD_1E_Revised/1ESheet.html
+++ b/ADnD_1E_Revised/1ESheet.html
@@ -9701,32 +9701,35 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
       const output = {};
       const autoDamage = +v.toggle_auto_damage;
       clog(`auto damage toggle:${autoDamage}`);
-      // note that these macros use '}}' to close/hide the chatmenu keys and also use the chatmenu closing '}}'
-      const damageSmallMedium = `}} {{damage1vsSM=[[ (@{repeating_weapon_${id}_weapon_damagesmallmedium}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]}}`;
-      const damageLarge = `}} {{damage1vsL=[[ (@{repeating_weapon_${id}_weapon_damagelarge}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]}}`;
-      const damageSmallMediumNpc = `}} {{damage1vsSM=[[ (@{repeating_weapon_${id}_weapon_damagesmallmedium}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]}}`;
-      const damageLargeNPC = `}} {{damage1vsL=[[ (@{repeating_weapon_${id}_weapon_damagelarge}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]}}`;
-      const damageSmallMediumCrit = `}} {{damage1vsSM=[[ (@{repeating_weapon_${id}_weapon_damagesmallmedium}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]/[[ (@{repeating_weapon_${id}_weapon_critdamagesmallmedium}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]}} {{crit=[[ @{toggle_critdamage} ]]`;
-      const damageLargeCrit = `}} {{damage1vsL=[[ (@{repeating_weapon_${id}_weapon_damagelarge}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]/[[ (@{repeating_weapon_${id}_weapon_critdamagelarge}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]}} {{crit=[[ @{toggle_critdamage} ]]`;
-      const damageSmallMediumNpcCrit = `}} {{damage1vsSM=[[ (@{repeating_weapon_${id}_weapon_damagesmallmedium}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]/[[ (@{repeating_weapon_${id}_weapon_critdamagesmallmedium}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]}} {{crit=[[ @{toggle_critdamage} ]]`;
-      const damageLargeNpcCrit = `}} {{damage1vsL=[[ (@{repeating_weapon_${id}_weapon_damagelarge}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]/[[ (@{repeating_weapon_${id}_weapon_critdamagelarge}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]}} {{crit=[[ @{toggle_critdamage} ]]`;
-
-      output[`@{repeating_weapon_${id}_weapon_damagesmallmedium_chat_menu`] =
-        autoDamage === 0 ? `[Roll Damage](~@{character_id}|@{repeating_weapon_${id}_weapon_damagesmallmedium_roll)` : damageSmallMedium;
-      output[`repeating_weapon_${id}_weapon_damagelarge_chat_menu`] =
-        autoDamage === 0 ? `[Roll Damage vs LG](~@{character_id}|repeating_weapon_${id}_weapon_damagelarge_roll)` : damageLarge;
-      output[`repeating_weapon_${id}_weapon_damagesmallmedium_npc_chat_menu`] =
-        autoDamage === 0 ? `[Damage](~@{character_id}|repeating_weapon_${id}_weapon_damagesmallmedium_npc_roll)` : damageSmallMediumNpc;
-      output[`repeating_weapon_${id}_weapon_damagelarge_npc_chat_menu`] =
-        autoDamage === 0 ? `[Damage vs LG](~@{character_id}|repeating_weapon_${id}_weapon_damagelarge_npc_roll)` : damageLargeNPC;
-      output[`repeating_weapon_${id}_weapon_critdamagesmallmedium_chat_menu`] =
-        autoDamage === 0 ? `[Roll Damage](~@{character_id}|repeating_weapon_${id}_weapon_critdamagesmallmedium_roll)` : damageSmallMediumCrit;
-      output[`repeating_weapon_${id}_weapon_critdamagelarge_chat_menu`] =
-        autoDamage === 0 ? `[Roll Damage vs LG](~@{character_id}|repeating_weapon_${id}_weapon_critdamagelarge_roll)` : damageLargeCrit;
-      output[`repeating_weapon_${id}_weapon_critdamagesmallmedium_npc_chat_menu`] =
-        autoDamage === 0 ? `[Damage](~@{character_id}|repeating_weapon_${id}_weapon_critdamagesmallmedium_npc_roll)` : damageSmallMediumNpcCrit;
-      output[`repeating_weapon_${id}_weapon_critdamagelarge_npc_chat_menu`] =
-        autoDamage === 0 ? `[Damage vs LG](~@{character_id}|repeating_weapon_${id}_weapon_critdamagelarge_npc_roll)` : damageLargeNpcCrit;
+      // NOTE: these macros use '}}' to close/hide the chatmenu key and also use the chatmenu's closing '}}'
+      // PROBLEM: crit damages are being shown 100% if 'use crit' is enabled.  should only show on nat 20!
+      const damageSmallMedium = `}} {{damage1vsSM=[[ (@{repeating_weapon_${id}_weapon_damagesmallmedium}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]`;
+      const damageLarge = `}} {{damage1vsL=[[ (@{repeating_weapon_${id}_weapon_damagelarge}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]`;
+      const damageSmallMediumNpc = `}} {{damage1vsSM=[[ (@{repeating_weapon_${id}_weapon_damagesmallmedium}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]`;
+      const damageLargeNPC = `}} {{damage1vsL=[[ (@{repeating_weapon_${id}_weapon_damagelarge}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]`;
+      const damageSmallMediumCrit = `}} {{damage1vsSM=[[ (@{repeating_weapon_${id}_weapon_critdamagesmallmedium}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]}} {{crit=[[ @{toggle_critdamage} ]]`;
+      const damageLargeCrit = `}} {{damage1vsL=[[ (@{repeating_weapon_${id}_weapon_critdamagelarge}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]}} {{crit=[[ @{toggle_critdamage} ]]`;
+      const damageSmallMediumNpcCrit = `}} {{damage1vsSM=[[ (@{repeating_weapon_${id}_weapon_critdamagesmallmedium}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]}} {{crit=[[ @{toggle_critdamage} ]]`;
+      const damageLargeNpcCrit = `}} {{damage1vsL=[[ (@{repeating_weapon_${id}_weapon_critdamagelarge}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]}} {{crit=[[ @{toggle_critdamage} ]]`;
+      if (autoDamage === 0) {
+        output[`repeating_weapon_${id}_weapon_damagesmallmedium_chat_menu`] = `[Roll Damage](~@{character_id}|repeating_weapon_${id}_weapon_damagesmallmedium_roll)`;
+        output[`repeating_weapon_${id}_weapon_damagelarge_chat_menu`] = `[Roll Damage vs LG](~@{character_id}|repeating_weapon_${id}_weapon_damagelarge_roll)`;
+        output[`repeating_weapon_${id}_weapon_damagesmallmedium_npc_chat_menu`] = `[Damage](~@{character_id}|repeating_weapon_${id}_weapon_damagesmallmedium_npc_roll)`;
+        output[`repeating_weapon_${id}_weapon_damagelarge_npc_chat_menu`] = `[Damage vs LG](~@{character_id}|repeating_weapon_${id}_weapon_damagelarge_npc_roll)`;
+        output[`repeating_weapon_${id}_weapon_critdamagesmallmedium_chat_menu`] = `[Roll Damage](~@{character_id}|repeating_weapon_${id}_weapon_critdamagesmallmedium_roll)`;
+        output[`repeating_weapon_${id}_weapon_critdamagelarge_chat_menu`] = `[Roll Damage vs LG](~@{character_id}|repeating_weapon_${id}_weapon_critdamagelarge_roll)`;
+        output[`repeating_weapon_${id}_weapon_critdamagesmallmedium_npc_chat_menu`] = `[Damage](~@{character_id}|repeating_weapon_${id}_weapon_critdamagesmallmedium_npc_roll)`;
+        output[`repeating_weapon_${id}_weapon_critdamagelarge_npc_chat_menu`] = `[Damage vs LG](~@{character_id}|repeating_weapon_${id}_weapon_critdamagelarge_npc_roll)`;
+      } else {
+        output[`repeating_weapon_${id}_weapon_damagesmallmedium_chat_menu`] = damageSmallMedium;
+        output[`repeating_weapon_${id}_weapon_damagelarge_chat_menu`] = damageLarge;
+        output[`repeating_weapon_${id}_weapon_damagesmallmedium_npc_chat_menu`] = damageSmallMediumNpc;
+        output[`repeating_weapon_${id}_weapon_damagelarge_npc_chat_menu`] = damageLargeNPC;
+        output[`repeating_weapon_${id}_weapon_critdamagesmallmedium_chat_menu`] = damageSmallMediumCrit;
+        output[`repeating_weapon_${id}_weapon_critdamagelarge_chat_menu`] = damageLargeCrit;
+        output[`repeating_weapon_${id}_weapon_critdamagesmallmedium_npc_chat_menu`] = damageSmallMediumNpcCrit;
+        output[`repeating_weapon_${id}_weapon_critdamagelarge_npc_chat_menu`] = damageLargeNpcCrit;
+      }
       setAttrs(output, {silent: true});
     });
   };

From dd5c45beae69a34a1b7e9341ee4bf9c89278dfee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=88=87ince?= <vince-roll20@users.noreply.github.com>
Date: Tue, 26 Nov 2024 00:30:28 -0800
Subject: [PATCH 7/7] updated sheet json to include the auto-roll damage
 option.

---
 ADnD_1E_Revised/1ESheet.css  |  8 ++++--
 ADnD_1E_Revised/1ESheet.html | 42 +++++++++++++--------------
 ADnD_1E_Revised/sheet.json   | 55 +++++++++---------------------------
 3 files changed, 40 insertions(+), 65 deletions(-)

diff --git a/ADnD_1E_Revised/1ESheet.css b/ADnD_1E_Revised/1ESheet.css
index c6f0dd9217ae..a99f7e80af46 100644
--- a/ADnD_1E_Revised/1ESheet.css
+++ b/ADnD_1E_Revised/1ESheet.css
@@ -1,5 +1,7 @@
 @import url('https://fonts.googleapis.com/css2?family=Material+Icons&display=swap');
-@import url('https://fonts.googleapis.com/css2?family=Caladea:ital,wght@0,400;0,700;1,400;1,700&family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&family=Raleway:ital,wght@0,100..900;1,100..900&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Caladea:ital,wght@0,400;0,700;1,400;1,700&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Raleway:ital,wght@0,100..900;1,100..900&display=swap');
 /*
 @import url('https://fonts.googleapis.com/css2?family=Rye:wght@400;600&display=swap');
 @import url('https://fonts.googleapis.com/css2?family=Fira+Sans:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap');
@@ -2322,9 +2324,8 @@ details[open].thac0-box {
   display: grid;
   grid-template-columns: auto minmax(8em, 1fr) 3fr 8em;
   grid-template-rows: 1.5em 2em;
-  margin: -1.85em 0 -0.5em auto;
+  margin: 0 auto 0 auto;
   position: relative;
-  top: -0.75em;
   width: 75%;
   z-index: 1;
 }
@@ -3705,6 +3706,7 @@ details[open].thac0-box {
   color: initial;
   cursor: pointer;
   display: inline-block;
+  font-family: var(--font-buttons1);
   font-size: var(--text-med);
   font-weight: normal;
   margin: 0 2px 2px 2px;
diff --git a/ADnD_1E_Revised/1ESheet.html b/ADnD_1E_Revised/1ESheet.html
index b0aaeabfd9b3..b9d506ba9ecb 100644
--- a/ADnD_1E_Revised/1ESheet.html
+++ b/ADnD_1E_Revised/1ESheet.html
@@ -63,9 +63,10 @@ <h5 class="right two-columns">
             <span class="left">
               <span>v<span name="attr_sheet_version">
             </span>
-            <span class="right"> • 11/24/24'</span>
+            <span class="right"> • 11/25/24'</span>
           </h5>
           <ul>
+            <li>Added an option in the Sheet settings to auto-roll weapon damage regardless of the attack roll.</li>
             <li>
               <span>Updated some of the sheet's font settings.</span><br>
               <details style="max-width:98%;">
@@ -4504,7 +4505,7 @@ <h4>Misc. Options:</h4>
             <span>Use THAC0:</span>
             <input type="checkbox" name="attr_toggle_to_hit_table" value="1" />
           </label>
-          <label title="@{toggle_auto_damage} | Auto roll weapon damage for regardless of the attack roll.">
+          <label title="@{toggle_auto_damage} | Auto roll damage regardless of the attack roll.">
             <span>Auto Roll Damage:</span>
             <input type="checkbox" name="attr_toggle_auto_damage" value="1" />
           </label>
@@ -4812,7 +4813,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
           {{#crit}}
             {{#damagevsSMchatmenu}}{{#damagevsLchatmenu}}
                 <span class="sheet-row">
-                  <span class="sheet-span-two sheet-center">
+                  <span class="sheet-span-two sheet-center sheet-tcat">
                     {{damagevsSMchatmenu}}{{damagevsLchatmenu}}
                   </span>
                 </span>
@@ -4825,7 +4826,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
             {{#^rollWasCrit() attack1}}
               {{#damagevsSMchatmenu}}{{#damagevsLchatmenu}}
                   <span class="sheet-row">
-                    <span class="sheet-span-two sheet-center">
+                    <span class="sheet-span-two sheet-center sheet-tcat">
                       {{damagevsSMchatmenu}}{{damagevsLchatmenu}}
                     </span>
                   </span>
@@ -4834,7 +4835,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
             {{#rollWasCrit() attack1}}
               {{#critdamagevsSMchatmenu}}{{#critdamagevsLchatmenu}}
                   <span class="sheet-row">
-                    <span class="sheet-span-two sheet-center">
+                    <span class="sheet-span-two sheet-center sheet-tcat">
                       {{critdamagevsSMchatmenu}}{{critdamagevsLchatmenu}}
                     </span>
                   </span>
@@ -4860,7 +4861,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
             {{#^rollWasCrit() attack2}}
               {{#damagevsSMchatmenu}}{{#damagevsLchatmenu}}
                   <span class="sheet-row">
-                    <span class="sheet-span-two sheet-center">
+                    <span class="sheet-span-two sheet-center sheet-tcat">
                       {{damagevsSMchatmenu}}{{damagevsLchatmenu}}
                     </span>
                   </span>
@@ -4869,7 +4870,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
             {{#rollWasCrit() attack2}}
               {{#critdamagevsSMchatmenu}}{{#critdamagevsLchatmenu}}
                   <span class="sheet-row">
-                    <span class="sheet-span-two sheet-center">
+                    <span class="sheet-span-two sheet-center sheet-tcat">
                       {{critdamagevsSMchatmenu}}{{critdamagevsLchatmenu}}
                     </span>
                   </span>
@@ -4895,7 +4896,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
             {{#^rollWasCrit() attack3}}
               {{#damagevsSMchatmenu}}{{#damagevsLchatmenu}}
                   <span class="sheet-row">
-                    <span class="sheet-span-two sheet-center">
+                    <span class="sheet-span-two sheet-center sheet-tcat">
                       {{damagevsSMchatmenu}}{{damagevsLchatmenu}}
                     </span>
                   </span>
@@ -4904,7 +4905,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
             {{#rollWasCrit() attack3}}
               {{#critdamagevsSMchatmenu}}{{#critdamagevsLchatmenu}}
                   <span class="sheet-row">
-                    <span class="sheet-span-two sheet-center">
+                    <span class="sheet-span-two sheet-center sheet-tcat">
                       {{critdamagevsSMchatmenu}}{{critdamagevsLchatmenu}}
                     </span>
                   </span>
@@ -4930,7 +4931,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
             {{#^rollWasCrit() attack4}}
               {{#damagevsSMchatmenu}}{{#damagevsLchatmenu}}
                   <span class="sheet-row">
-                    <span class="sheet-span-two sheet-center">
+                    <span class="sheet-span-two sheet-center sheet-tcat">
                       {{damagevsSMchatmenu}}{{damagevsLchatmenu}}
                     </span>
                   </span>
@@ -4939,7 +4940,7 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
             {{#rollWasCrit() attack4}}
               {{#critdamagevsSMchatmenu}}{{#critdamagevsLchatmenu}}
                   <span class="sheet-row">
-                    <span class="sheet-span-two sheet-center">
+                    <span class="sheet-span-two sheet-center sheet-tcat">
                       {{critdamagevsSMchatmenu}}{{critdamagevsLchatmenu}}
                     </span>
                   </span>
@@ -9701,16 +9702,15 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
       const output = {};
       const autoDamage = +v.toggle_auto_damage;
       clog(`auto damage toggle:${autoDamage}`);
-      // NOTE: these macros use '}}' to close/hide the chatmenu key and also use the chatmenu's closing '}}'
-      // PROBLEM: crit damages are being shown 100% if 'use crit' is enabled.  should only show on nat 20!
-      const damageSmallMedium = `}} {{damage1vsSM=[[ (@{repeating_weapon_${id}_weapon_damagesmallmedium}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]`;
-      const damageLarge = `}} {{damage1vsL=[[ (@{repeating_weapon_${id}_weapon_damagelarge}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]`;
-      const damageSmallMediumNpc = `}} {{damage1vsSM=[[ (@{repeating_weapon_${id}_weapon_damagesmallmedium}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]`;
-      const damageLargeNPC = `}} {{damage1vsL=[[ (@{repeating_weapon_${id}_weapon_damagelarge}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]`;
-      const damageSmallMediumCrit = `}} {{damage1vsSM=[[ (@{repeating_weapon_${id}_weapon_critdamagesmallmedium}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]}} {{crit=[[ @{toggle_critdamage} ]]`;
-      const damageLargeCrit = `}} {{damage1vsL=[[ (@{repeating_weapon_${id}_weapon_critdamagelarge}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]}} {{crit=[[ @{toggle_critdamage} ]]`;
-      const damageSmallMediumNpcCrit = `}} {{damage1vsSM=[[ (@{repeating_weapon_${id}_weapon_critdamagesmallmedium}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]}} {{crit=[[ @{toggle_critdamage} ]]`;
-      const damageLargeNpcCrit = `}} {{damage1vsL=[[ (@{repeating_weapon_${id}_weapon_critdamagelarge}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}} {{backstab=[[ @{repeating_weapon_${id}_weapon_backstab_mult} ]]}} {{crit=[[ @{toggle_critdamage} ]]`;
+      // NOTE: these macros substitute the damage rolls for the chatmenu buttons directly to support crit logic
+      const damageSmallMedium = `Damage vs S/M [[ (@{repeating_weapon_${id}_weapon_damagesmallmedium}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]`;
+      const damageLarge = ` vs LG [[ (@{repeating_weapon_${id}_weapon_damagelarge}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]`;
+      const damageSmallMediumNpc = `Damage vs S/M [[ (@{repeating_weapon_${id}_weapon_damagesmallmedium}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]`;
+      const damageLargeNPC = ` vs LG [[ (@{repeating_weapon_${id}_weapon_damagelarge}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]`;
+      const damageSmallMediumCrit = `Damage vs S/M [[ (@{repeating_weapon_${id}_weapon_critdamagesmallmedium}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]`;
+      const damageLargeCrit = ` vs LG [[ (@{repeating_weapon_${id}_weapon_critdamagelarge}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]`;
+      const damageSmallMediumNpcCrit = `Damage vs S/M [[ (@{repeating_weapon_${id}_weapon_critdamagesmallmedium}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]}}`;
+      const damageLargeNpcCrit = ` vs LG [[ (@{repeating_weapon_${id}_weapon_critdamagelarge}) * @{repeating_weapon_${id}_weapon_backstab_mult}[MULT] + ( @{repeating_weapon_${id}_weapon_attackdmgbonus}[DMG_BON] ) + ( @{repeating_weapon_${id}_weapon_magicbonus}[MAG_BON] ) + ( ?{Damage Modifier?|0}[MISC_MOD] ) ]]`;
       if (autoDamage === 0) {
         output[`repeating_weapon_${id}_weapon_damagesmallmedium_chat_menu`] = `[Roll Damage](~@{character_id}|repeating_weapon_${id}_weapon_damagesmallmedium_roll)`;
         output[`repeating_weapon_${id}_weapon_damagelarge_chat_menu`] = `[Roll Damage vs LG](~@{character_id}|repeating_weapon_${id}_weapon_damagelarge_roll)`;
diff --git a/ADnD_1E_Revised/sheet.json b/ADnD_1E_Revised/sheet.json
index 7e13524fe4c8..e3d9c9eb5b4b 100644
--- a/ADnD_1E_Revised/sheet.json
+++ b/ADnD_1E_Revised/sheet.json
@@ -3,7 +3,7 @@
   "css": "1ESheet.css",
   "authors": "Vince",
   "roll20userid": "463088",
-  "preview": "1ESheet.jpg", 
+  "preview": "1ESheet.jpg",
   "instructions": "The **AD&D 1e Revised Sheet** includes all of the basic stats from the existing **AD&D 1st Edition Sheet** on Roll20 and should also be compatible with other OSR-style systems such as **OSRIC**. The **AD&D 1e Revised Sheet** may continue to change as needed/requested by the Roll20 community.\n**NOTE:** Updating an existing **AD&D 1st Edition Sheet** character with the **AD&D 1e Revised Sheet** should automatically migrate most attributes. That said, there are some sheet changes, newer attributes, and features that may require minimal, manual editing/updating in order to get full sheet functionality. I highly suggest testing the **AD&D 1e Revised Sheet** template on a copy of any existing **AD&D 1st Edition Sheet** game to see how the migration may effect your game. Simply change the character sheet template to the game settings to the **AD&D 1e Revised Sheet**.\n**Sheet Highlights:**\n - Sheet roll buttons for Ability-based skills, Saves, Thief Skills, Attacks, Spells, Special Abilities, and more.\n - Repeatable Weapons, Equipment, Spells, Special Abilities, Non Weapon Proficiencies.\n - Subcategories for Equipment.\n - Armor Details section that is linked to Equipment|Armor \n - Hover over fields and buttons to view the associated attributes name and descriptive text.\n - Roll templates for Attacks, &{template:attacks} and a General &{template:general} for custom macro {key}={value}\n - Monster sheet statblock\n**Sheet Auto-Calculations:**\n - Ability row attributes auto-fill according to the PHB.\n - Hit Points and AC.\n - Saves and Thief Skills\n - Total Armor bulk, Encumbrance, and Movement\n - Encumbrance and costs for Equipment, Armor, Weapons, and Coins.\n**Sheet Options:**\n - to-Hit Matrix or THAC0 table whispered to the DM when using the attack button.\n - Background Options (parchment, goldenrod, moldvay, etc.).\n - Hide/Show various sections of the sheet as desired. \n - Nearly all sheet macros are customizable. Attacks, Surprise, Initiative\n----------\nPlease post suggestions/questions/comments to the Roll20 Character Forum.\nhttps://app.roll20.net/forum/category/277980",
   "useroptions": [
     {
@@ -24,14 +24,7 @@
       "attribute": "background",
       "displayname": "Background",
       "type": "select",
-      "options": [
-        "Default|1",
-        "Parchment|2",
-        "Goldenrod|3",
-        "Moldvay|4",
-        "Light Greyhawk|5",
-        "Greyhawk|6"
-      ],
+      "options": ["Default|1", "Parchment|2", "Goldenrod|3", "Moldvay|4", "Light Greyhawk|5", "Greyhawk|6"],
       "default": "1",
       "description": "Choose a sheet background. note: Using Roll20's dark mode option will override this option."
     },
@@ -39,14 +32,7 @@
       "attribute": "surprise_die",
       "displayname": "Surprise Die",
       "type": "select",
-      "options": [
-        "1d6|6",
-        "1d8|8",
-        "1d10|10",
-        "1d12|12",
-        "1d20|20",
-        "1d100|100"
-      ],
+      "options": ["1d6|6", "1d8|8", "1d10|10", "1d12|12", "1d20|20", "1d100|100"],
       "default": "6",
       "description": "Choose the dice used for Surprise Rolls."
     },
@@ -61,14 +47,7 @@
       "attribute": "surprise_others_die",
       "displayname": "Surprise Others Die",
       "type": "select",
-      "options": [
-        "1d6|6",
-        "1d8|8",
-        "1d10|10",
-        "1d12|12",
-        "1d20|20",
-        "1d100|100"
-      ],
+      "options": ["1d6|6", "1d8|8", "1d10|10", "1d12|12", "1d20|20", "1d100|100"],
       "default": "6",
       "description": "Choose the dice used for the Surprise Others Rolls."
     },
@@ -83,14 +62,7 @@
       "attribute": "initiative_die",
       "displayname": "Initiative Die",
       "type": "select",
-      "options": [
-        "1d6|6",
-        "1d8|8",
-        "1d10|10",
-        "1d12|12",
-        "1d20|20",
-        "1d100|100"
-      ],
+      "options": ["1d6|6", "1d8|8", "1d10|10", "1d12|12", "1d20|20", "1d100|100"],
       "default": "6",
       "description": "Choose the dice used for Initiative Rolls."
     },
@@ -108,6 +80,13 @@
       "default": "1d20",
       "description": "Die/Dice vs Ability Score. ie 1d20, 4d6, 3d6, etc."
     },
+    {
+      "attribute": "toggle_auto_damage",
+      "displayname": "Toggle Auto Damage",
+      "type": "checkbox",
+      "value": "1",
+      "description": "Auto roll damage regardless of the attack roll."
+    },
     {
       "attribute": "toggle_critdamage",
       "displayname": "Use Crit Damage",
@@ -210,10 +189,7 @@
       "attribute": "whisper_pc",
       "displayname": "Whisper PC Rolls",
       "type": "select",
-      "options": [
-        "Open Rolls| ",
-        "Whisper Rolls|/w gm"
-      ],
+      "options": ["Open Rolls| ", "Whisper Rolls|/w gm"],
       "default": " ",
       "description": "Whisper rolls made from the PC portion of the sheet."
     },
@@ -221,10 +197,7 @@
       "attribute": "whisper_npc",
       "displayname": "Whisper NPC Rolls",
       "type": "select",
-      "options": [
-        "Open Rolls| ",
-        "Whisper Rolls|/w gm"
-      ],
+      "options": ["Open Rolls| ", "Whisper Rolls|/w gm"],
       "default": " ",
       "description": "Whisper rolls made from the NPC portion of the sheet."
     },