From fd1d222e7335644c048fc436bfc594a5e4533afe Mon Sep 17 00:00:00 2001
From: Peter Bjerg Lidegaard <dbf.black.bull@gmail.com>
Date: Sat, 20 Jan 2024 09:45:42 +0100
Subject: [PATCH] Updated potion, dust, scrolls

---
 ADnD_2E_Revised/2ESheet.html                              | 8 +++++---
 ADnD_2E_Revised/html/changelog.html                       | 2 ++
 .../html/tabs/character-tab/equipment-tab.html            | 6 +++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ADnD_2E_Revised/2ESheet.html b/ADnD_2E_Revised/2ESheet.html
index c5a00719450..ac334c72308 100644
--- a/ADnD_2E_Revised/2ESheet.html
+++ b/ADnD_2E_Revised/2ESheet.html
@@ -15,6 +15,8 @@ <h2 style="color: black;">Changes in <span name="attr_version"></span></h2>
                 <li>Added notes for Touch-delivered spells</li>
                 <li>Added notes for wishing for ability scores</li>
                 <li>Added reverse spells. All data related to the reverse spell is exactly the same as the original spell. I.e. no special changes have been made specific to the reverse spell.</li>
+                <li>Added inline labels for modifiers to attack, damage, and initiative rolls</li>
+                <li>Corrected color for initiative rolls. Now a roll of 1 will have a green boarder (crit) and a roll of 10 will have a red boarder (fumble)</li>
                 <li>Improved the layout for Player's Option critical hits a bit</li>
                 <li>Fixed cast time for <strong>Protection From Evil (Wizard)</strong> from 1 turn to +1 initiative modifier</li>
                 <li>Removed incorrect material components for <strong>Endure Cold/Endure Heat</strong></li>
@@ -13769,7 +13771,7 @@ <h4>Potions, Philters, Elixirs, and Poisons</h4>
                                     </td>
                                     <td><input type="text" name="attr_potionqty" title="@{repeating_potions_$X_potionqty}" class="sheet-small" placeholder="#"></td>
                                     <td><input type="text" name="attr_potion-speed" title="@{repeating_potions_$X_potion-speed}" class="sheet-small" value="4"></td>
-                                    <td><button type="roll" name="attr_potion-initiative" title="%{repeating_potions_$X_potion-initiative}" value="/gmroll [[{([[1d10]]+[[(@{potion-speed})-(@{misc-mod})]]), 1}kh1]] [Initiative (@{potion})]&{tracker}">Initiative</button></td>
+                                    <td><button type="roll" name="attr_potion-initiative" title="%{repeating_potions_$X_potion-initiative}" value="/gmroll [[{1d10cs1cf10+(@{potion-speed} [Potion])-(@{misc-mod}), {1}}kh1]] [Initiative (@{potion})]&{tracker}">Initiative</button></td>
                                     <td><button type="roll" name="attr_potion-roll" title="%{repeating_potions_$X_potion-roll}" value="@{potion-macro}">T</button></td>
                                     <td><button type="action" name="act_show" class="btn sheet-hidden sheet-fold sheet-show">▼</button><button type="action" name="act_hide" class="btn sheet-hidden sheet-fold">▲</button></td>
                                 </tr>
@@ -13808,7 +13810,7 @@ <h4>Dusts, Powders, and Solvents</h4>
                                     </td>
                                     <td><input type="text" name="attr_dustqty" title="@{repeating_dusts_$X_dustqty}" class="sheet-small" placeholder="#"></td>
                                     <td><input type="text" name="attr_dust-speed" title="@{repeating_dusts_$X_dust-speed}" class="sheet-small" value="3"></td>
-                                    <td><button type="roll" name="attr_dust-initiative" title="%{repeating_dusts_$X_dust-initiative}" value="/gmroll [[{([[1d10]]+[[@{dust-speed}-(@{misc-mod})]]), 1}kh1]] [Initiative (@{dust})]&{tracker}">Initiative</button></td>
+                                    <td><button type="roll" name="attr_dust-initiative" title="%{repeating_dusts_$X_dust-initiative}" value="/gmroll [[{1d10cs1cf10+(@{dust-speed} [Dust])-(@{misc-mod}), {1}}kh1]] [Initiative (@{dust})]&{tracker}">Initiative</button></td>
                                     <td><button type="roll" name="attr_dust-roll" title="%{repeating_dusts_$X_dust-roll}" value="@{dust-macro}">T</button></td>
                                     <td><button type="action" name="act_show" class="btn sheet-hidden sheet-fold sheet-show">▼</button><button type="action" name="act_hide" class="btn sheet-hidden sheet-fold">▲</button></td>
                                 </tr>
@@ -13836,7 +13838,7 @@ <h4>Scrolls</h4>
                                     <td><input type="number" name="attr_scroll-level" title="@{repeating_scrolls_$X_scroll-level}" class="sheet-minish" value="6"></td>
                                     <td><input type="number" name="attr_scrollqty" title="@{repeating_scrolls_$X_scrollqty}" class="sheet-minish" placeholder="#"></td>
                                     <td><input type="text" name="attr_scroll-speed" title="@{repeating_scrolls_$X_scroll-speed}" class="sheet-small" value="3"></td>
-                                    <td><button type="roll" name="attr_scroll-initiative" title="%{repeating_scrolls_$X_scroll-initiative}" value="/gmroll [[{([[1d10]]+[[@{scroll-speed}-(@{misc-mod})]]), 1}kh1]] [Initiative (@{scroll})]&{tracker}">Initiative</button></td>
+                                    <td><button type="roll" name="attr_scroll-initiative" title="%{repeating_scrolls_$X_scroll-initiative}" value="/gmroll [[{1d10cs1cf10+(@{scroll-speed} [Scroll])-(@{misc-mod}), {1}}kh1]] [Initiative (@{scroll})]&{tracker}">Initiative</button></td>
                                     <td><button type="roll" name="attr_scroll-roll" title="%{repeating_scrolls_$X_scroll-roll}" value="@{scroll-macro}">T</button></td>
                                     <td><button type="action" name="act_show" class="btn sheet-hidden sheet-fold sheet-show">▼</button><button type="action" name="act_hide" class="btn sheet-hidden sheet-fold">▲</button></td>
                                 </tr>
diff --git a/ADnD_2E_Revised/html/changelog.html b/ADnD_2E_Revised/html/changelog.html
index 54ee09bbabb..74be33f5350 100644
--- a/ADnD_2E_Revised/html/changelog.html
+++ b/ADnD_2E_Revised/html/changelog.html
@@ -10,6 +10,8 @@ <h2 style="color: black;">Changes in <span name="attr_version"></span></h2>
                 <li>Added notes for Touch-delivered spells</li>
                 <li>Added notes for wishing for ability scores</li>
                 <li>Added reverse spells. All data related to the reverse spell is exactly the same as the original spell. I.e. no special changes have been made specific to the reverse spell.</li>
+                <li>Added inline labels for modifiers to attack, damage, and initiative rolls</li>
+                <li>Corrected color for initiative rolls. Now a roll of 1 will have a green boarder (crit) and a roll of 10 will have a red boarder (fumble)</li>
                 <li>Improved the layout for Player's Option critical hits a bit</li>
                 <li>Fixed cast time for <strong>Protection From Evil (Wizard)</strong> from 1 turn to +1 initiative modifier</li>
                 <li>Removed incorrect material components for <strong>Endure Cold/Endure Heat</strong></li>
diff --git a/ADnD_2E_Revised/html/tabs/character-tab/equipment-tab.html b/ADnD_2E_Revised/html/tabs/character-tab/equipment-tab.html
index 4e7b49b286d..54ebe471cfa 100644
--- a/ADnD_2E_Revised/html/tabs/character-tab/equipment-tab.html
+++ b/ADnD_2E_Revised/html/tabs/character-tab/equipment-tab.html
@@ -390,7 +390,7 @@ <h4>Potions, Philters, Elixirs, and Poisons</h4>
                                 </td>
                                 <td><input type="text" name="attr_potionqty" title="@{repeating_potions_$X_potionqty}" class="sheet-small" placeholder="#"></td>
                                 <td><input type="text" name="attr_potion-speed" title="@{repeating_potions_$X_potion-speed}" class="sheet-small" value="4"></td>
-                                <td><button type="roll" name="attr_potion-initiative" title="%{repeating_potions_$X_potion-initiative}" value="/gmroll [[{([[1d10]]+[[(@{potion-speed})-(@{misc-mod})]]), 1}kh1]] [Initiative (@{potion})]&{tracker}">Initiative</button></td>
+                                <td><button type="roll" name="attr_potion-initiative" title="%{repeating_potions_$X_potion-initiative}" value="/gmroll [[{1d10cs1cf10+(@{potion-speed} [Potion])-(@{misc-mod}), {1}}kh1]] [Initiative (@{potion})]&{tracker}">Initiative</button></td>
                                 <td><button type="roll" name="attr_potion-roll" title="%{repeating_potions_$X_potion-roll}" value="@{potion-macro}">T</button></td>
                                 insert_fold-button.html
                             </tr>
@@ -429,7 +429,7 @@ <h4>Dusts, Powders, and Solvents</h4>
                                 </td>
                                 <td><input type="text" name="attr_dustqty" title="@{repeating_dusts_$X_dustqty}" class="sheet-small" placeholder="#"></td>
                                 <td><input type="text" name="attr_dust-speed" title="@{repeating_dusts_$X_dust-speed}" class="sheet-small" value="3"></td>
-                                <td><button type="roll" name="attr_dust-initiative" title="%{repeating_dusts_$X_dust-initiative}" value="/gmroll [[{([[1d10]]+[[@{dust-speed}-(@{misc-mod})]]), 1}kh1]] [Initiative (@{dust})]&{tracker}">Initiative</button></td>
+                                <td><button type="roll" name="attr_dust-initiative" title="%{repeating_dusts_$X_dust-initiative}" value="/gmroll [[{1d10cs1cf10+(@{dust-speed} [Dust])-(@{misc-mod}), {1}}kh1]] [Initiative (@{dust})]&{tracker}">Initiative</button></td>
                                 <td><button type="roll" name="attr_dust-roll" title="%{repeating_dusts_$X_dust-roll}" value="@{dust-macro}">T</button></td>
                                 insert_fold-button.html
                             </tr>
@@ -457,7 +457,7 @@ <h4>Scrolls</h4>
                                 <td><input type="number" name="attr_scroll-level" title="@{repeating_scrolls_$X_scroll-level}" class="sheet-minish" value="6"></td>
                                 <td><input type="number" name="attr_scrollqty" title="@{repeating_scrolls_$X_scrollqty}" class="sheet-minish" placeholder="#"></td>
                                 <td><input type="text" name="attr_scroll-speed" title="@{repeating_scrolls_$X_scroll-speed}" class="sheet-small" value="3"></td>
-                                <td><button type="roll" name="attr_scroll-initiative" title="%{repeating_scrolls_$X_scroll-initiative}" value="/gmroll [[{([[1d10]]+[[@{scroll-speed}-(@{misc-mod})]]), 1}kh1]] [Initiative (@{scroll})]&{tracker}">Initiative</button></td>
+                                <td><button type="roll" name="attr_scroll-initiative" title="%{repeating_scrolls_$X_scroll-initiative}" value="/gmroll [[{1d10cs1cf10+(@{scroll-speed} [Scroll])-(@{misc-mod}), {1}}kh1]] [Initiative (@{scroll})]&{tracker}">Initiative</button></td>
                                 <td><button type="roll" name="attr_scroll-roll" title="%{repeating_scrolls_$X_scroll-roll}" value="@{scroll-macro}">T</button></td>
                                 insert_fold-button.html
                             </tr>