From 247ccd91c4fa992d039befc5b4673427ba7cf8ff Mon Sep 17 00:00:00 2001
From: Peter Bjerg Lidegaard <dbf.black.bull@gmail.com>
Date: Fri, 8 Apr 2022 22:33:56 +0200
Subject: [PATCH] Monster magic resist now output with roll template

---
 ADnD_2E_Revised/2ESheet.html                     | 16 +++++++++++-----
 ADnD_2E_Revised/html/changelog.html              | 12 +++++++++---
 .../character-info-tracker.html                  |  2 +-
 ADnD_2E_Revised/html/tabs/monster-tab.html       |  2 +-
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/ADnD_2E_Revised/2ESheet.html b/ADnD_2E_Revised/2ESheet.html
index 5f096eaefc..878f4d231f 100644
--- a/ADnD_2E_Revised/2ESheet.html
+++ b/ADnD_2E_Revised/2ESheet.html
@@ -11,12 +11,18 @@
             <ul style="font-style:italic">
                 <li>Changed character saving throws to output with roll template</li>
                 <li>Changed character magic resistance to output with roll template</li>
-
+                <li>Changed followers saving throws to output with roll template</li>
+                <li>Changed Monster saving throws to output with roll template</li>
+                <li>Changed Monster magic resistance to output with roll template</li>
                 <li>Added the new header colors to all roll templates: red, yellow, blue, dark-blue, green, orange, gray, brown, purple, dark-purple</li>
-                <li>No longer always adds the Poison save bonus from high consistion to the save vs poison, as this modifier is not always applied. Dwarves, gnomes and halflings have a different modifier</li>
                 <li>The 2Echeck roll template no longer adds "Check vs." to the {{checkvs}} attribute. You can add it yourself if you still want it</li>
                 <li>The 2Einversecheck roll template no longer adds "Check vs." to the {{checkvs}} attribute. You can add it yourself if you still want it</li>
-                <li>No longer always adds the Poison save bonus from high consistion to the save vs poison, as this modifier is not always applied. Dwarves, gnomes and halflings have a different modifier</li>
+                <li>No longer stealthily adds the Poison save bonus from high constitution (19 or more) to the save vs poison, as this modifier is not always applied.
+                    <ul>
+                        <li>Dwarves and halflings have a different modifier, and therefore do not use the poison save modifier</li>
+                        <li>You can add the bonus yourself to the modifier field next to Poison save, if applicable</li>
+                    </ul>
+                </li>
             </ul>
             <hr>
             <p>
@@ -815,7 +821,7 @@
                                     <td><input type="text" name="attr_magrestar" title="@{repeating_magicres_$X_magrestar}" class="sheet-short" placeholder="Target"/></td>
                                     <td><input type="text" name="attr_magresmod" title="@{repeating_magicres_$X_magresmod}" class="sheet-table-dynamic" value="0"/></td>
                                     <td><input type="text" name="attr_magresnotes" title="@{repeating_magicres_$X_magresnotes}" placeholder="Situational Modifiers"/></td>
-                                    <td><button type="roll" name="roll_magressave" title="%{repeating_magicres_$X_magressave}" value="/w gm &{template:2Echeck} {{checkvs=Save with @{magresname}}} {{character=@{character_name}}} {{checkroll=[[1d100cs1cf100+(@{magresmod})+(@{misc-mod})]]}} {{checktarget=[[@{magrestar}]]}} {{color=orange}}"></button></td>
+                                    <td><button type="roll" name="roll_magressave" title="%{repeating_magicres_$X_magressave}" value="/w gm &{template:2Echeck} {{checkvs=Save with @{magresname}}} {{character=@{character_name}}} {{checkroll=[[1d100cs1cf100+(@{magresmod})+(@{misc-mod})]]%}} {{checktarget=[[@{magrestar}]]%}} {{color=orange}}"></button></td>
                                 </tr>
                             </table>
                         </fieldset>
@@ -17872,7 +17878,7 @@
                         <td><label>Magic Res:</label></td>
                         <td>
                             <input type="text" name="attr_monstermagicresist" title="@{monstermagicresist}" class="sheet-short"><label>%</label>
-                            <button type="roll" name="roll_monstermagicresist" title="%{monstermagicresist}" value="/gmroll {1d100+(@{misc-mod})}<@{monstermagicresist} [@{character_name} Save with Magic resistance]">Roll</button>
+                            <button type="roll" name="roll_monstermagicresist" title="%{monstermagicresist}" value="/w gm &{template:2Echeck} {{checkvs=Save with Magic Resistance}} {{character=@{character_name}}} {{checkroll=[[1d100cs1cf100+(@{misc-mod})]]%}} {{checktarget=[[@{monstermagicresist}]]%}} {{color=orange}}">Roll</button>
                         </td>
                     </tr>
                     <tr>
diff --git a/ADnD_2E_Revised/html/changelog.html b/ADnD_2E_Revised/html/changelog.html
index fa1c382f3b..17fb20b600 100644
--- a/ADnD_2E_Revised/html/changelog.html
+++ b/ADnD_2E_Revised/html/changelog.html
@@ -6,12 +6,18 @@
             <ul style="font-style:italic">
                 <li>Changed character saving throws to output with roll template</li>
                 <li>Changed character magic resistance to output with roll template</li>
-
+                <li>Changed followers saving throws to output with roll template</li>
+                <li>Changed Monster saving throws to output with roll template</li>
+                <li>Changed Monster magic resistance to output with roll template</li>
                 <li>Added the new header colors to all roll templates: red, yellow, blue, dark-blue, green, orange, gray, brown, purple, dark-purple</li>
-                <li>No longer always adds the Poison save bonus from high consistion to the save vs poison, as this modifier is not always applied. Dwarves, gnomes and halflings have a different modifier</li>
                 <li>The 2Echeck roll template no longer adds "Check vs." to the {{checkvs}} attribute. You can add it yourself if you still want it</li>
                 <li>The 2Einversecheck roll template no longer adds "Check vs." to the {{checkvs}} attribute. You can add it yourself if you still want it</li>
-                <li>No longer always adds the Poison save bonus from high consistion to the save vs poison, as this modifier is not always applied. Dwarves, gnomes and halflings have a different modifier</li>
+                <li>No longer stealthily adds the Poison save bonus from high constitution (19 or more) to the save vs poison, as this modifier is not always applied.
+                    <ul>
+                        <li>Dwarves and halflings have a different modifier, and therefore do not use the poison save modifier</li>
+                        <li>You can add the bonus yourself to the modifier field next to Poison save, if applicable</li>
+                    </ul>
+                </li>
             </ul>
             <hr>
             <p>
diff --git a/ADnD_2E_Revised/html/tabs/character-tab/character-info-tab/character-info-tracker.html b/ADnD_2E_Revised/html/tabs/character-tab/character-info-tab/character-info-tracker.html
index ccd39c1310..c12d896124 100644
--- a/ADnD_2E_Revised/html/tabs/character-tab/character-info-tab/character-info-tracker.html
+++ b/ADnD_2E_Revised/html/tabs/character-tab/character-info-tab/character-info-tracker.html
@@ -623,7 +623,7 @@
                             <td><input type="text" name="attr_magrestar" title="@{repeating_magicres_$X_magrestar}" class="sheet-short" placeholder="Target"/></td>
                             <td><input type="text" name="attr_magresmod" title="@{repeating_magicres_$X_magresmod}" class="sheet-table-dynamic" value="0"/></td>
                             <td><input type="text" name="attr_magresnotes" title="@{repeating_magicres_$X_magresnotes}" placeholder="Situational Modifiers"/></td>
-                            <td><button type="roll" name="roll_magressave" title="%{repeating_magicres_$X_magressave}" value="/w gm &{template:2Echeck} {{checkvs=Save with @{magresname}}} {{character=@{character_name}}} {{checkroll=[[1d100cs1cf100+(@{magresmod})+(@{misc-mod})]]}} {{checktarget=[[@{magrestar}]]}} {{color=orange}}"></button></td>
+                            <td><button type="roll" name="roll_magressave" title="%{repeating_magicres_$X_magressave}" value="/w gm &{template:2Echeck} {{checkvs=Save with @{magresname}}} {{character=@{character_name}}} {{checkroll=[[1d100cs1cf100+(@{magresmod})+(@{misc-mod})]]%}} {{checktarget=[[@{magrestar}]]%}} {{color=orange}}"></button></td>
                         </tr>
                     </table>
                 </fieldset>
diff --git a/ADnD_2E_Revised/html/tabs/monster-tab.html b/ADnD_2E_Revised/html/tabs/monster-tab.html
index 748060d041..f2ba65bd8d 100644
--- a/ADnD_2E_Revised/html/tabs/monster-tab.html
+++ b/ADnD_2E_Revised/html/tabs/monster-tab.html
@@ -118,7 +118,7 @@
                         <td><label>Magic Res:</label></td>
                         <td>
                             <input type="text" name="attr_monstermagicresist" title="@{monstermagicresist}" class="sheet-short"><label>%</label>
-                            <button type="roll" name="roll_monstermagicresist" title="%{monstermagicresist}" value="/gmroll {1d100+(@{misc-mod})}<@{monstermagicresist} [@{character_name} Save with Magic resistance]">Roll</button>
+                            <button type="roll" name="roll_monstermagicresist" title="%{monstermagicresist}" value="/w gm &{template:2Echeck} {{checkvs=Save with Magic Resistance}} {{character=@{character_name}}} {{checkroll=[[1d100cs1cf100+(@{misc-mod})]]%}} {{checktarget=[[@{monstermagicresist}]]%}} {{color=orange}}">Roll</button>
                         </td>
                     </tr>
                     <tr>