Merge pull request #13740 from DBFBlackbull/ADnD_2E_Revised-Player_op…

…tion_qol [ADnD_2E_Revised] New Feature - Special conditions, Spell corrections
Roll20 · Feb 4, 2025 · 62ee257 · 62ee257
2 parents 413c889 + 0b1137b
commit 62ee257
Show file tree

Hide file tree

Showing 24 changed files with 2,055 additions and 616 deletions.
diff --git a/ADnD_2E_Revised/2ESheet.html b/ADnD_2E_Revised/2ESheet.html
diff --git a/ADnD_2E_Revised/2EStyle.css b/ADnD_2E_Revised/2EStyle.css
@@ -1348,6 +1348,12 @@ input.sheet-toast-error:checked ~ .sheet-toast-content {
     font-size: 9pt;
     text-align: left;
 }
+.sheet-rolltemplate-2Edefault td.sheet-template-default-desc.sheet-justify {
+    text-align: justify;
+}
+.sheet-rolltemplate-2Edefault td.sheet-template-default-desc.sheet-center {
+    text-align: center;
+}
 
 /*#endregion*/
 /*#region Styles for the 2Eattack Template /*/

diff --git a/ADnD_2E_Revised/css/rolltemplates.css b/ADnD_2E_Revised/css/rolltemplates.css
@@ -307,6 +307,12 @@
     font-size: 9pt;
     text-align: left;
 }
+.sheet-rolltemplate-2Edefault td.sheet-template-default-desc.sheet-justify {
+    text-align: justify;
+}
+.sheet-rolltemplate-2Edefault td.sheet-template-default-desc.sheet-center {
+    text-align: center;
+}
 
 /*#endregion*/
 /*#region Styles for the 2Eattack Template /*/

diff --git a/ADnD_2E_Revised/futureIdeas.txt b/ADnD_2E_Revised/futureIdeas.txt
@@ -6,8 +6,7 @@ New weapon section that combines hit and damage
 - Implement backstab
 - Implement special maneuvers as written in the Fighters handbook
 
-Add reversible spells to the list of memorized spells. Do not change the content or template.
-
+Tome of Magic                               1991 May
 Add 8th, 9th, and 10th level Priest spells (Psionic enchantments) from Dark Sun Dragon Kings
 
 Add True Dweomers from DMGR: High-Level Campaign

diff --git a/ADnD_2E_Revised/html/2ESheet-base.html b/ADnD_2E_Revised/html/2ESheet-base.html
@@ -38,6 +38,7 @@
 insert_weaponProficiencies.js
 insert_nonweaponProficiencies.js
 
+insert_specialConditions.js
 insert_wizardSpells.js
 insert_priestSpells.js
 insert_psionicPowers.js

diff --git a/ADnD_2E_Revised/html/changelog.html b/ADnD_2E_Revised/html/changelog.html
@@ -4,8 +4,9 @@
         <h2 style="color: black;">Changes in <span name="attr_version"></span></h2>
         <div class="sheet-announce-items">
             <ul style="font-style:italic">
-                <li>Increase the input field for monster size to hold more than the size category</li>
-                <li>All roll templates use a standardized 'title' and 'subtitle' to populate the template heading</li>
+                <li>Standardised the effects of blindness, deafness, invisibility, continuing damage, magical aging, charm, and touch attacks with DM buttons</li>
+                <li>Added DM buttons to wizard spells level 1-3</li>
+                <li>Updated wizard spells level 1-3 with errata</li>
             </ul>
             <hr>
             <p>

diff --git a/ADnD_2E_Revised/html/components/dynamicDatalists.html b/ADnD_2E_Revised/html/components/dynamicDatalists.html
@@ -118,7 +118,7 @@
   <option value="Protection From Cantrips"></option>
   <option value="Pyrotechnics"></option>
   <option value="Ray of Enfeeblement"></option>
-  <option value="Rope Tricks"></option>
+  <option value="Rope Trick"></option>
   <option value="Scare"></option>
   <option value="Shatter"></option>
   <option value="Spectral Hand"></option>
@@ -166,6 +166,7 @@
   <option value="Clairvoyance"></option>
   <option value="Delude"></option>
   <option value="Dispel Magic"></option>
+  <option value="Dispel Magic (expanded)"></option>
   <option value="Explosive Runes"></option>
   <option value="Feign Death"></option>
   <option value="Fireball"></option>
@@ -695,7 +696,7 @@
   <option value="Protection From Cantrips">2nd level</option>
   <option value="Pyrotechnics">2nd level</option>
   <option value="Ray of Enfeeblement">2nd level</option>
-  <option value="Rope Tricks">2nd level</option>
+  <option value="Rope Trick">2nd level</option>
   <option value="Scare">2nd level</option>
   <option value="Shatter">2nd level</option>
   <option value="Spectral Hand">2nd level</option>
@@ -741,6 +742,7 @@
   <option value="Clairvoyance">3rd level</option>
   <option value="Delude">3rd level</option>
   <option value="Dispel Magic">3rd level</option>
+  <option value="Dispel Magic (expanded)">3rd level</option>
   <option value="Explosive Runes">3rd level</option>
   <option value="Feign Death">3rd level</option>
   <option value="Fireball">3rd level</option>
@@ -1260,7 +1262,7 @@
   <option value="Protection From Cantrips"></option>
   <option value="Pyrotechnics"></option>
   <option value="Ray of Enfeeblement"></option>
-  <option value="Rope Tricks"></option>
+  <option value="Rope Trick"></option>
   <option value="Scare"></option>
   <option value="Shatter"></option>
   <option value="Spectral Hand"></option>
@@ -1308,6 +1310,7 @@
   <option value="Clairvoyance"></option>
   <option value="Delude"></option>
   <option value="Dispel Magic"></option>
+  <option value="Dispel Magic (expanded)"></option>
   <option value="Explosive Runes"></option>
   <option value="Feign Death"></option>
   <option value="Fireball"></option>
@@ -1837,7 +1840,7 @@
   <option value="Protection From Cantrips"></option>
   <option value="Pyrotechnics"></option>
   <option value="Ray of Enfeeblement"></option>
-  <option value="Rope Tricks"></option>
+  <option value="Rope Trick"></option>
   <option value="Scare"></option>
   <option value="Shatter"></option>
   <option value="Spectral Hand"></option>
@@ -1883,6 +1886,7 @@
   <option value="Clairvoyance"></option>
   <option value="Delude"></option>
   <option value="Dispel Magic"></option>
+  <option value="Dispel Magic (expanded)"></option>
   <option value="Explosive Runes"></option>
   <option value="Feign Death"></option>
   <option value="Fireball"></option>
@@ -2443,6 +2447,7 @@
   <option value="Cure Disease"></option>
   <option value="Cause Disease (Reverse of Cure Disease)"></option>
   <option value="Dispel Magic"></option>
+  <option value="Dispel Magic (expanded)"></option>
   <option value="Feign Death"></option>
   <option value="Flame Walk"></option>
   <option value="Glyph of Warding"></option>
@@ -2966,6 +2971,7 @@
   <option value="Cure Disease">3rd level</option>
   <option value="Cause Disease (Reverse of Cure Disease)">3rd level</option>
   <option value="Dispel Magic">3rd level</option>
+  <option value="Dispel Magic (expanded)">3rd level</option>
   <option value="Feign Death">3rd level</option>
   <option value="Flame Walk">3rd level</option>
   <option value="Glyph of Warding">3rd level</option>
@@ -3483,6 +3489,7 @@
   <option value="Cure Disease"></option>
   <option value="Cause Disease (Reverse of Cure Disease)"></option>
   <option value="Dispel Magic"></option>
+  <option value="Dispel Magic (expanded)"></option>
   <option value="Feign Death"></option>
   <option value="Flame Walk"></option>
   <option value="Glyph of Warding"></option>
@@ -4006,6 +4013,7 @@
   <option value="Cure Disease"></option>
   <option value="Cause Disease (Reverse of Cure Disease)"></option>
   <option value="Dispel Magic"></option>
+  <option value="Dispel Magic (expanded)"></option>
   <option value="Feign Death"></option>
   <option value="Flame Walk"></option>
   <option value="Glyph of Warding"></option>
@@ -4480,7 +4488,7 @@
   <option value="Protection From Cantrips scroll">2nd level Wizard</option>
   <option value="Pyrotechnics scroll">2nd level Wizard</option>
   <option value="Ray of Enfeeblement scroll">2nd level Wizard</option>
-  <option value="Rope Tricks scroll">2nd level Wizard</option>
+  <option value="Rope Trick scroll">2nd level Wizard</option>
   <option value="Scare scroll">2nd level Wizard</option>
   <option value="Shatter scroll">2nd level Wizard</option>
   <option value="Spectral Hand scroll">2nd level Wizard</option>
@@ -4526,6 +4534,7 @@
   <option value="Clairvoyance scroll">3rd level Wizard</option>
   <option value="Delude scroll">3rd level Wizard</option>
   <option value="Dispel Magic scroll">3rd level Wizard</option>
+  <option value="Dispel Magic (expanded) scroll">3rd level Wizard</option>
   <option value="Explosive Runes scroll">3rd level Wizard</option>
   <option value="Feign Death scroll">3rd level Wizard</option>
   <option value="Fireball scroll">3rd level Wizard</option>
@@ -5080,6 +5089,7 @@
   <option value="Cure Disease scroll">3rd level Priest</option>
   <option value="Cause Disease (Reverse of Cure Disease) scroll">3rd level Priest</option>
   <option value="Dispel Magic scroll">3rd level Priest</option>
+  <option value="Dispel Magic (expanded) scroll">3rd level Priest</option>
   <option value="Feign Death scroll">3rd level Priest</option>
   <option value="Flame Walk scroll">3rd level Priest</option>
   <option value="Glyph of Warding scroll">3rd level Priest</option>
@@ -5554,7 +5564,7 @@
   <option value="Protection From Cantrips scroll"></option>
   <option value="Pyrotechnics scroll"></option>
   <option value="Ray of Enfeeblement scroll"></option>
-  <option value="Rope Tricks scroll"></option>
+  <option value="Rope Trick scroll"></option>
   <option value="Scare scroll"></option>
   <option value="Shatter scroll"></option>
   <option value="Spectral Hand scroll"></option>
@@ -5600,6 +5610,7 @@
   <option value="Clairvoyance scroll"></option>
   <option value="Delude scroll"></option>
   <option value="Dispel Magic scroll"></option>
+  <option value="Dispel Magic (expanded) scroll"></option>
   <option value="Explosive Runes scroll"></option>
   <option value="Feign Death scroll"></option>
   <option value="Fireball scroll"></option>

diff --git a/ADnD_2E_Revised/html/components/rolltemplate-buttons.html b/ADnD_2E_Revised/html/components/rolltemplate-buttons.html
@@ -0,0 +1,40 @@
+{{#blindness}}
+<tr>
+    <td colspan="6" class="sheet-spell-c1">[Blindness](~{{character}}|blindness)</td>
+</tr>
+{{/blindness}}
+{{#deafness}}
+<tr>
+    <td colspan="6" class="sheet-spell-c1">[Deafness](~{{character}}|deafness)</td>
+</tr>
+{{/deafness}}
+{{#invisibility}}
+<tr>
+    <td colspan="6" class="sheet-spell-c1">[Invisibility](~{{character}}|invisibility) [Detect Invisibility](~{{character}}|detect-invisibility)</td>
+</tr>
+{{/invisibility}}
+{{#continuing-damage}}
+<tr>
+    <td colspan="6" class="sheet-spell-c1">[Continuing Damage](~{{character}}|continuing-damage)</td>
+</tr>
+{{/continuing-damage}}
+{{#magical-aging}}
+<tr>
+    <td colspan="6" class="sheet-spell-c1">[Magical aging](~{{character}}|magical-aging)</td>
+</tr>
+{{/magical-aging}}
+{{#charm}}
+<tr>
+    <td colspan="6" class="sheet-spell-c1">[Charm](~{{character}}|charm) [Breaking Charm](~{{character}}|breaking-charm)</td>
+</tr>
+{{/charm}}
+{{#touch-attacks}}
+<tr>
+    <td colspan="6" class="sheet-spell-c1">[Touch Attacks](~{{character}}|touch-attacks)</td>
+</tr>
+{{/touch-attacks}}
+{{#grenade-miss}}
+<tr>
+    <td colspan="6" class="sheet-spell-c1">[Grenade-like Miss](~{{character}}|grenade-miss)</td>
+</tr>
+{{/grenade-miss}}
diff --git a/ADnD_2E_Revised/html/components/rolltemplate-effects.html b/ADnD_2E_Revised/html/components/rolltemplate-effects.html
@@ -516,9 +516,7 @@
             {{/c30-1}}
         </table>
         {{/c1-1}}
-        {{#effects2}}
-        <br>
-        {{effects2}}
-        {{/effects2}}
+        {{#effects2}}<br>{{effects2}}{{/effects2}}
+        {{#psionics}}<br>&emsp;**Psionics:** {{psionics}}{{/psionics}}
     </td>
 </tr>
diff --git a/ADnD_2E_Revised/html/components/rolltemplates.html b/ADnD_2E_Revised/html/components/rolltemplates.html
@@ -21,25 +21,25 @@
         </div>
         <div class="sheet-template-body">
             <table>
-                {{#allprops() desc desc1 desc2 name title subtitle color}}
+                {{#allprops() desc desc1 desc2 align align1 align2 name title subtitle color}}
                 <tr>
                     <td class="sheet-template-default-key">{{key}}</td>
                     <td class="sheet-template-default-value">{{value}}</td>
                 </tr>
-                {{/allprops() desc desc1 desc2 name title subtitle color}}
+                {{/allprops() desc desc1 desc2 align align1 align2 name title subtitle color}}
                 {{#desc}}
                 <tr>
-                    <td class="sheet-template-default-desc" colspan="2">{{desc}}</td>
+                    <td class="sheet-template-default-desc {{align}}" colspan="2">{{desc}}</td>
                 </tr>
                 {{/desc}}
                 {{#desc1}}
                 <tr>
-                    <td class="sheet-template-default-desc" colspan="2">{{desc1}}</td>
+                    <td class="sheet-template-default-desc {{align1}}" colspan="2">{{desc1}}</td>
                 </tr>
                 {{/desc1}}
                 {{#desc2}}
                 <tr>
-                    <td class="sheet-template-default-desc" colspan="2">{{desc2}}</td>
+                    <td class="sheet-template-default-desc {{align2}}" colspan="2">{{desc2}}</td>
                 </tr>
                 {{/desc2}}
             </table>
@@ -261,6 +261,7 @@
                 {{#effects}}
                 insert_rolltemplate-effects.html
                 {{/effects}}
+                insert_rolltemplate-buttons.html
             </table>
         </div>
     </div>

diff --git a/ADnD_2E_Revised/html/shared/priest-spell-template.html b/ADnD_2E_Revised/html/shared/priest-spell-template.html
@@ -27,7 +27,7 @@
           <button type="roll" name="roll_spell-init" title="@{repeating_spells-#REPLACE0#_$X_spell-init}" value="/gmroll [[{1d10cs1cf10+(@{spell-cast-time} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spell-name})]&{tracker}">Initiative</button>
         </td>
         <td>
-          <button type="roll" name="roll_spell-template" title="%{repeating_spells-#REPLACE0#_$X_spell-template}" value="#REPLACE1#&{template:2Espell}{{title=@{spell-name}}}{{splevel=@{spell-level}}}{{school=@{spell-school}}}{{sphere=@{spell-sphere}}}{{components=@{spell-components}}}{{time=@{spell-cast-time}}}{{range=@{spell-range}}}{{duration=@{spell-duration}}}{{aoe=@{spell-aoe}}}{{save=@{spell-saving-throw}}}{{subtlety=@{spell-subtlety}}}{{sensory=@{spell-sensory}}}{{knockdown=@{spell-knockdown}}}{{crit=@{spell-crit-size}}}{{damage=@{spell-damage}}}{{damagetype=@{spell-damage-type}}}{{healing=@{spell-healing}}}{{reference=@{spell-reference}}}{{materials=@{spell-materials}}}{{checkroll=[[1d100]]%}}{{checktarget=#REPLACE2#}}{{fail=The spell is expended with absolutely no effect whatsoever.}}{{effects=@{spell-effect}}}">T</button>
+          <button type="roll" name="roll_spell-template" title="%{repeating_spells-#REPLACE0#_$X_spell-template}" value="#REPLACE1#&{template:2Espell}{{title=@{spell-name}}}{{splevel=@{spell-level}}}{{school=@{spell-school}}}{{sphere=@{spell-sphere}}}{{components=@{spell-components}}}{{time=@{spell-cast-time}}}{{range=@{spell-range}}}{{duration=@{spell-duration}}}{{aoe=@{spell-aoe}}}{{save=@{spell-saving-throw}}}{{subtlety=@{spell-subtlety}}}{{sensory=@{spell-sensory}}}{{knockdown=@{spell-knockdown}}}{{crit=@{spell-crit-size}}}{{damage=@{spell-damage}}}{{damagetype=@{spell-damage-type}}}{{healing=@{spell-healing}}}{{reference=@{spell-reference}}}{{materials=@{spell-materials}}}{{checkroll=[[1d100]]%}}{{checktarget=#REPLACE2#}}{{fail=The spell is expended with absolutely no effect whatsoever.}}{{character=@{character_name}}}{{effects=@{spell-effect}}}">T</button>
         </td>
         insert_fold-button.html
       </tr>
@@ -91,7 +91,7 @@
         <tr>
           <th>Duration:</th>
           <td>
-            <input class="sheet-spell-half" type="text" name="attr_spell-duration" title="@{repeating_spells-#REPLACE0#_$X_spell-duration}" placeholder="Duration"/>
+            <textarea class="sheet-spell-half sheet-input-like" name="attr_spell-duration" title="@{repeating_spells-#REPLACE0#_$X_spell-duration}" placeholder="Duration"></textarea>
           </td>
           <th>Components:</th>
           <td>
@@ -146,7 +146,7 @@
         <tr>
           <th>Reference:</th>
           <td colspan="3">
-            <input class="sheet-table-dynamic" type="text" name="attr_spell-reference" title="@{repeating_spells-#REPLACE0#_$X_spell-reference}" placeholder="Book Reference"/>
+            <textarea class="sheet-table-dynamic sheet-input-like" name="attr_spell-reference" title="@{repeating_spells-#REPLACE0#_$X_spell-reference}" placeholder="Book Reference"></textarea>
           </td>
         </tr>
         <tr>

diff --git a/ADnD_2E_Revised/html/shared/wizard-spell-template.html b/ADnD_2E_Revised/html/shared/wizard-spell-template.html
@@ -27,7 +27,7 @@
           <button type="roll" name="roll_spell-init" title="@{repeating_spells-#REPLACE0#_$X_spell-init}" value="/gmroll [[{1d10cs1cf10+(@{spell-cast-time} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spell-name})]&{tracker}">Initiative</button>
         </td>
         <td>
-          <button type="roll" name="roll_spell-template" title="%{repeating_spells-#REPLACE0#_$X_spell-template}" value="#REPLACE1#&{template:2Espell}{{title=@{spell-name}}}{{splevel=@{spell-level}}}{{school=@{spell-school}}}{{sphere=@{spell-sphere}}}{{components=@{spell-components}}}{{time=@{spell-cast-time}}}{{range=@{spell-range}}}{{duration=@{spell-duration}}}{{aoe=@{spell-aoe}}}{{save=@{spell-saving-throw}}}{{subtlety=@{spell-subtlety}}}{{sensory=@{spell-sensory}}}{{knockdown=@{spell-knockdown}}}{{crit=@{spell-crit-size}}}{{damage=@{spell-damage}}}{{damagetype=@{spell-damage-type}}}{{healing=@{spell-healing}}}{{reference=@{spell-reference}}}{{materials=@{spell-materials}}}{{effects=@{spell-effect}}}">T</button>
+          <button type="roll" name="roll_spell-template" title="%{repeating_spells-#REPLACE0#_$X_spell-template}" value="#REPLACE1#&{template:2Espell}{{title=@{spell-name}}}{{splevel=@{spell-level}}}{{school=@{spell-school}}}{{sphere=@{spell-sphere}}}{{components=@{spell-components}}}{{time=@{spell-cast-time}}}{{range=@{spell-range}}}{{duration=@{spell-duration}}}{{aoe=@{spell-aoe}}}{{save=@{spell-saving-throw}}}{{subtlety=@{spell-subtlety}}}{{sensory=@{spell-sensory}}}{{knockdown=@{spell-knockdown}}}{{crit=@{spell-crit-size}}}{{damage=@{spell-damage}}}{{damagetype=@{spell-damage-type}}}{{healing=@{spell-healing}}}{{reference=@{spell-reference}}}{{materials=@{spell-materials}}}{{character=@{character_name}}}{{effects=@{spell-effect}}}">T</button>
         </td>
         insert_fold-button.html
       </tr>
@@ -91,7 +91,7 @@
         <tr>
           <th>Duration:</th>
           <td>
-            <input class="sheet-spell-half" type="text" name="attr_spell-duration" title="@{repeating_spells-#REPLACE0#_$X_spell-duration}" placeholder="Duration"/>
+            <textarea class="sheet-spell-half sheet-input-like" name="attr_spell-duration" title="@{repeating_spells-#REPLACE0#_$X_spell-duration}" placeholder="Duration"></textarea>
           </td>
           <th>Components:</th>
           <td>
@@ -146,7 +146,7 @@
         <tr>
           <th>Reference:</th>
           <td colspan="3">
-            <input class="sheet-table-dynamic" type="text" name="attr_spell-reference" title="@{repeating_spells-#REPLACE0#_$X_spell-reference}" placeholder="Book Reference"/>
+            <textarea class="sheet-table-dynamic sheet-input-like" name="attr_spell-reference" title="@{repeating_spells-#REPLACE0#_$X_spell-reference}" placeholder="Book Reference"></textarea>
           </td>
         </tr>
         <tr>

diff --git a/ADnD_2E_Revised/html/tabs/character-tab/rogue-tab.html b/ADnD_2E_Revised/html/tabs/character-tab/rogue-tab.html
@@ -385,7 +385,6 @@ <h4>Skills & Powers / Dark Sun / Sages & Specialists</h4>
                 </li>
             </ul>
         </div>
-
         <br>
         <details>
             <summary>Thieving Skill Dexterity (Aim, Balance) Adjustments</summary>
@@ -574,6 +573,7 @@ <h4>Skills & Powers / Dark Sun / Sages & Specialists</h4>
                     <td>—</td>
                 </tr>
             </table>
+            <br>
         </details>
         <details>
             <summary>Bard Armor information</summary>
@@ -716,6 +716,7 @@ <h4>Skills & Powers / Dark Sun / Sages & Specialists</h4>
                     <td>—</td>
                 </tr>
             </table>
+            <br>
         </details>
         <details>
             <summary>Ranger Armor information</summary>