From cfd6baf0390056ebe2f44116cb7257559cb34200 Mon Sep 17 00:00:00 2001
From: Peter Bjerg Lidegaard <dbf.black.bull@gmail.com>
Date: Sat, 20 Jan 2024 09:38:27 +0100
Subject: [PATCH] Made initiative to be crit on 1 and fail on 10. Added labels
 for modifiers on spells

---
 ADnD_2E_Revised/2ESheet.html                  | 196 +++++++++---------
 .../html/shared/priest-spell-template.html    |   2 +-
 .../html/shared/wizard-spell-template.html    |   2 +-
 .../spells-tab/components/spells-old.html     |   2 +-
 .../players-option-weapons-tab.html           |   4 +-
 .../weapons-tab/standard-weapons-tab.html     |   4 +-
 ADnD_2E_Revised/pug/spellTemplate.pug         |   2 +-
 7 files changed, 106 insertions(+), 106 deletions(-)

diff --git a/ADnD_2E_Revised/2ESheet.html b/ADnD_2E_Revised/2ESheet.html
index eebe0dada47..c5a00719450 100644
--- a/ADnD_2E_Revised/2ESheet.html
+++ b/ADnD_2E_Revised/2ESheet.html
@@ -1757,7 +1757,7 @@ <h4>Rule set</h4>
                             <td><label><input type="checkbox" name="attr_weaptype-pierce" title="@{repeating_weapons_$X_weaptype-pierce}" value="1"/><span></span></label></td>
                             <td><label><input type="checkbox" name="attr_weaptype-blunt" title="@{repeating_weapons_$X_weaptype-blunt}" value="1"/><span></span></label></td>
                             <td><input type="text" name="attr_weapspeed" title="@{repeating_weapons_$X_weapspeed}" class="sheet-small"></td>
-                            <td><button type="roll" name="roll_init" title="%{repeating_weapons_$X_init}" value="/gmroll [[{1d10+(@{weapspeed} [Weapon])-(@{temp-speedadj} [Temp buff])-(@{misc-mod}), {1}}kh1]] [Initiative (@{weaponname})]&{tracker}">Initiative</button></td>
+                            <td><button type="roll" name="roll_init" title="%{repeating_weapons_$X_init}" value="/gmroll [[{1d10cs1cf10+(@{weapspeed} [Weapon])-(@{temp-speedadj} [Temp buff])-(@{misc-mod}), {1}}kh1]] [Initiative (@{weaponname})]&{tracker}">Initiative</button></td>
                         </tr>
                     </table>
                     </fieldset>
@@ -1935,7 +1935,7 @@ <h4>Weapon Notes</h4>
                             <td><label><input type="checkbox" name="attr_weaptype-pierce2" title="@{repeating_weapons2_$X_weaptype-pierce2}" value="1"/><span></span></label></td>
                             <td><label><input type="checkbox" name="attr_weaptype-blunt2" title="@{repeating_weapons2_$X_weaptype-blunt2}" value="1"/><span></span></label></td>
                             <td><input type="text" name="attr_weapspeed2" title="@{repeating_weapons2_$X_weapspeed2}" class="sheet-small"></td>
-                            <td><button type="roll" name="roll_init2" title="%{repeating_weapons2_$X_init2}" value="/gmroll [[{1d10+(@{weapspeed2} [Weapon])-(@{temp-speedadj} [Temp buff])-(@{misc-mod}), {1}}kh1]] [Initiative (@{weaponname2})]&{tracker}">Initiative</button></td>
+                            <td><button type="roll" name="roll_init2" title="%{repeating_weapons2_$X_init2}" value="/gmroll [[{1d10cs1cf10+(@{weapspeed2} [Weapon])-(@{temp-speedadj} [Temp buff])-(@{misc-mod}), {1}}kh1]] [Initiative (@{weaponname2})]&{tracker}">Initiative</button></td>
                         </tr>
                     </table>
                     </fieldset>
@@ -2108,7 +2108,7 @@ <h4>Weapon Notes</h4>
                             <td><label><input type="checkbox" name="attr_weaptype-pierce" title="@{repeating_weapons_$X_weaptype-pierce}" value="1"/><span></span></label></td>
                             <td><label><input type="checkbox" name="attr_weaptype-blunt" title="@{repeating_weapons_$X_weaptype-blunt}" value="1"/><span></span></label></td>
                             <td><input type="text" name="attr_weapspeed" title="@{repeating_weapons_$X_weapspeed}" class="sheet-small"></td>
-                            <td><button type="roll" name="roll_init" title="%{repeating_weapons_$X_init}" value="/gmroll [[{1d10+(@{weapspeed} [Weapon])-(@{temp-speedadj} [Temp buff])-(@{misc-mod}), {1}}kh1]] [Initiative (@{weaponname})]&{tracker}">Initiative</button></td>
+                            <td><button type="roll" name="roll_init" title="%{repeating_weapons_$X_init}" value="/gmroll [[{1d10cs1cf10+(@{weapspeed} [Weapon])-(@{temp-speedadj} [Temp buff])-(@{misc-mod}), {1}}kh1]] [Initiative (@{weaponname})]&{tracker}">Initiative</button></td>
                         </tr>
                     </table>
                     </fieldset>
@@ -2318,7 +2318,7 @@ <h4>Weapon Notes</h4>
                             <td><label><input type="checkbox" name="attr_weaptype-pierce2" title="@{repeating_weapons2_$X_weaptype-pierce2}" value="1"/><span></span></label></td>
                             <td><label><input type="checkbox" name="attr_weaptype-blunt2" title="@{repeating_weapons2_$X_weaptype-blunt2}" value="1"/><span></span></label></td>
                             <td><input type="text" name="attr_weapspeed2" title="@{repeating_weapons2_$X_weapspeed2}" class="sheet-small"></td>
-                            <td><button type="roll" name="roll_init2" title="%{repeating_weapons2_$X_init2}" value="/gmroll [[{1d10+(@{weapspeed2} [Weapon])-(@{temp-speedadj} [Temp buff])-(@{misc-mod}), {1}}kh1]] [Initiative (@{weaponname2})]&{tracker}">Initiative</button></td>
+                            <td><button type="roll" name="roll_init2" title="%{repeating_weapons2_$X_init2}" value="/gmroll [[{1d10cs1cf10+(@{weapspeed2} [Weapon])-(@{temp-speedadj} [Temp buff])-(@{misc-mod}), {1}}kh1]] [Initiative (@{weaponname2})]&{tracker}">Initiative</button></td>
                         </tr>
                     </table>
                     </fieldset>
@@ -4477,7 +4477,7 @@ <h4>Spells Memorized</h4>
                               <input class="sheet-short" type="text" name="attr_spell-cast-time" title="@{repeating_spells-wiz1_$X_spell-cast-time}" placeholder="Cast time"/>
                             </td>
                             <td>
-                              <button type="roll" name="roll_spell-init" title="@{repeating_spells-wiz1_$X_spell-init}" value="/gmroll [[{[[1d10]]+(@{spell-cast-time})-(@{misc-mod}), 1}kh1]] [Initiative (@{spell-name})]&{tracker}">Initiative</button>
+                              <button type="roll" name="roll_spell-init" title="@{repeating_spells-wiz1_$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-wiz1_$X_spell-template}" value="&{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>
@@ -4636,7 +4636,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime" title="@{repeating_spells_$X_casttime}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell" title="%{repeating_spells_$X_initspell}" value="/gmroll [[{([[1d10]]+@{casttime}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell" title="%{repeating_spells_$X_initspell}" value="/gmroll [[{1d10cs1cf10+(@{casttime} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro" title="@{repeating_spells_$X_cast-macro}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -4670,7 +4670,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime2" title="@{repeating_spells2_$X_casttime2}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell2" title="%{repeating_spells2_$X_initspell2}" value="/gmroll [[{([[1d10]]+@{casttime2}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname2})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell2" title="%{repeating_spells2_$X_initspell2}" value="/gmroll [[{1d10cs1cf10+(@{casttime2} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname2})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro2" title="@{repeating_spells2_$X_cast-macro2}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -4704,7 +4704,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime3" title="@{repeating_spells3_$X_casttime3}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell3" title="%{repeating_spells3_$X_initspell3}" value="/gmroll [[{([[1d10]]+@{casttime3}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname3})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell3" title="%{repeating_spells3_$X_initspell3}" value="/gmroll [[{1d10cs1cf10+(@{casttime3} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname3})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro3" title="@{repeating_spells3_$X_cast-macro3}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -4794,7 +4794,7 @@ <h4>Spells Memorized</h4>
                               <input class="sheet-short" type="text" name="attr_spell-cast-time" title="@{repeating_spells-wiz2_$X_spell-cast-time}" placeholder="Cast time"/>
                             </td>
                             <td>
-                              <button type="roll" name="roll_spell-init" title="@{repeating_spells-wiz2_$X_spell-init}" value="/gmroll [[{[[1d10]]+(@{spell-cast-time})-(@{misc-mod}), 1}kh1]] [Initiative (@{spell-name})]&{tracker}">Initiative</button>
+                              <button type="roll" name="roll_spell-init" title="@{repeating_spells-wiz2_$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-wiz2_$X_spell-template}" value="&{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>
@@ -4953,7 +4953,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime4" title="@{repeating_spells4_$X_casttime4}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell4" title="%{repeating_spells4_$X_initspell4}" value="/gmroll [[{([[1d10]]+@{casttime4}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname4})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell4" title="%{repeating_spells4_$X_initspell4}" value="/gmroll [[{1d10cs1cf10+(@{casttime4} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname4})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro4" title="@{repeating_spells4_$X_cast-macro4}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -4987,7 +4987,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime5" title="@{repeating_spells5_$X_casttime5}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell5" title="%{repeating_spells5_$X_initspell5}" value="/gmroll [[{([[1d10]]+@{casttime5}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname5})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell5" title="%{repeating_spells5_$X_initspell5}" value="/gmroll [[{1d10cs1cf10+(@{casttime5} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname5})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro5" title="@{repeating_spells5_$X_cast-macro5}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -5021,7 +5021,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime6" title="@{repeating_spells6_$X_casttime6}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell6" title="%{repeating_spells6_$X_initspell6}" value="/gmroll [[{([[1d10]]+@{casttime6}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname6})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell6" title="%{repeating_spells6_$X_initspell6}" value="/gmroll [[{1d10cs1cf10+(@{casttime6} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname6})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro6" title="@{repeating_spells6_$X_cast-macro6}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -5111,7 +5111,7 @@ <h4>Spells Memorized</h4>
                               <input class="sheet-short" type="text" name="attr_spell-cast-time" title="@{repeating_spells-wiz3_$X_spell-cast-time}" placeholder="Cast time"/>
                             </td>
                             <td>
-                              <button type="roll" name="roll_spell-init" title="@{repeating_spells-wiz3_$X_spell-init}" value="/gmroll [[{[[1d10]]+(@{spell-cast-time})-(@{misc-mod}), 1}kh1]] [Initiative (@{spell-name})]&{tracker}">Initiative</button>
+                              <button type="roll" name="roll_spell-init" title="@{repeating_spells-wiz3_$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-wiz3_$X_spell-template}" value="&{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>
@@ -5270,7 +5270,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime7" title="@{repeating_spells7_$X_casttime7}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell7" title="%{repeating_spells7_$X_initspell7}" value="/gmroll [[{([[1d10]]+@{casttime7}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname7})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell7" title="%{repeating_spells7_$X_initspell7}" value="/gmroll [[{1d10cs1cf10+(@{casttime7} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname7})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro7" title="@{repeating_spells7_$X_cast-macro7}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -5304,7 +5304,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime8" title="@{repeating_spells8_$X_casttime8}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell8" title="%{repeating_spells8_$X_initspell8}" value="/gmroll [[{([[1d10]]+@{casttime8}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname8})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell8" title="%{repeating_spells8_$X_initspell8}" value="/gmroll [[{1d10cs1cf10+(@{casttime8} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname8})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro8" title="@{repeating_spells8_$X_cast-macro8}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -5338,7 +5338,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime9" title="@{repeating_spells9_$X_casttime9}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell9" title="%{repeating_spells9_$X_initspell9}" value="/gmroll [[{([[1d10]]+@{casttime9}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname9})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell9" title="%{repeating_spells9_$X_initspell9}" value="/gmroll [[{1d10cs1cf10+(@{casttime9} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname9})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro9" title="@{repeating_spells9_$X_cast-macro9}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -5428,7 +5428,7 @@ <h4>Spells Memorized</h4>
                               <input class="sheet-short" type="text" name="attr_spell-cast-time" title="@{repeating_spells-wiz4_$X_spell-cast-time}" placeholder="Cast time"/>
                             </td>
                             <td>
-                              <button type="roll" name="roll_spell-init" title="@{repeating_spells-wiz4_$X_spell-init}" value="/gmroll [[{[[1d10]]+(@{spell-cast-time})-(@{misc-mod}), 1}kh1]] [Initiative (@{spell-name})]&{tracker}">Initiative</button>
+                              <button type="roll" name="roll_spell-init" title="@{repeating_spells-wiz4_$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-wiz4_$X_spell-template}" value="&{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>
@@ -5587,7 +5587,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime10" title="@{repeating_spells10_$X_casttime10}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell10" title="%{repeating_spells10_$X_initspell10}" value="/gmroll [[{([[1d10]]+@{casttime10}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname10})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell10" title="%{repeating_spells10_$X_initspell10}" value="/gmroll [[{1d10cs1cf10+(@{casttime10} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname10})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro10" title="@{repeating_spells10_$X_cast-macro10}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -5621,7 +5621,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime11" title="@{repeating_spells11_$X_casttime11}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell11" title="%{repeating_spells11_$X_initspell11}" value="/gmroll [[{([[1d10]]+@{casttime11}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname11})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell11" title="%{repeating_spells11_$X_initspell11}" value="/gmroll [[{1d10cs1cf10+(@{casttime11} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname11})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro11" title="@{repeating_spells11_$X_cast-macro11}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -5655,7 +5655,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime12" title="@{repeating_spells12_$X_casttime12}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell12" title="%{repeating_spells12_$X_initspell12}" value="/gmroll [[{([[1d10]]+@{casttime12}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname12})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell12" title="%{repeating_spells12_$X_initspell12}" value="/gmroll [[{1d10cs1cf10+(@{casttime12} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname12})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro12" title="@{repeating_spells12_$X_cast-macro12}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -5745,7 +5745,7 @@ <h4>Spells Memorized</h4>
                               <input class="sheet-short" type="text" name="attr_spell-cast-time" title="@{repeating_spells-wiz5_$X_spell-cast-time}" placeholder="Cast time"/>
                             </td>
                             <td>
-                              <button type="roll" name="roll_spell-init" title="@{repeating_spells-wiz5_$X_spell-init}" value="/gmroll [[{[[1d10]]+(@{spell-cast-time})-(@{misc-mod}), 1}kh1]] [Initiative (@{spell-name})]&{tracker}">Initiative</button>
+                              <button type="roll" name="roll_spell-init" title="@{repeating_spells-wiz5_$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-wiz5_$X_spell-template}" value="&{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>
@@ -5904,7 +5904,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime70" title="@{repeating_spells70_$X_casttime70}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell70" title="%{repeating_spells70_$X_initspell70}" value="/gmroll [[{([[1d10]]+@{casttime70}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname70})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell70" title="%{repeating_spells70_$X_initspell70}" value="/gmroll [[{1d10cs1cf10+(@{casttime70} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname70})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro70" title="@{repeating_spells70_$X_cast-macro70}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -5938,7 +5938,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime71" title="@{repeating_spells71_$X_casttime71}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell71" title="%{repeating_spells71_$X_initspell71}" value="/gmroll [[{([[1d10]]+@{casttime71}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname71})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell71" title="%{repeating_spells71_$X_initspell71}" value="/gmroll [[{1d10cs1cf10+(@{casttime71} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname71})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro71" title="@{repeating_spells71_$X_cast-macro71}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -5972,7 +5972,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime72" title="@{repeating_spells72_$X_casttime72}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell72" title="%{repeating_spells72_$X_initspell72}" value="/gmroll [[{([[1d10]]+@{casttime72}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname72})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell72" title="%{repeating_spells72_$X_initspell72}" value="/gmroll [[{1d10cs1cf10+(@{casttime72} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname72})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro72" title="@{repeating_spells72_$X_cast-macro72}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -6062,7 +6062,7 @@ <h4>Spells Memorized</h4>
                               <input class="sheet-short" type="text" name="attr_spell-cast-time" title="@{repeating_spells-wiz6_$X_spell-cast-time}" placeholder="Cast time"/>
                             </td>
                             <td>
-                              <button type="roll" name="roll_spell-init" title="@{repeating_spells-wiz6_$X_spell-init}" value="/gmroll [[{[[1d10]]+(@{spell-cast-time})-(@{misc-mod}), 1}kh1]] [Initiative (@{spell-name})]&{tracker}">Initiative</button>
+                              <button type="roll" name="roll_spell-init" title="@{repeating_spells-wiz6_$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-wiz6_$X_spell-template}" value="&{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>
@@ -6221,7 +6221,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime13" title="@{repeating_spells13_$X_casttime13}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell13" title="%{repeating_spells13_$X_initspell13}" value="/gmroll [[{([[1d10]]+@{casttime13}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname13})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell13" title="%{repeating_spells13_$X_initspell13}" value="/gmroll [[{1d10cs1cf10+(@{casttime13} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname13})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro13" title="@{repeating_spells13_$X_cast-macro13}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -6255,7 +6255,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime14" title="@{repeating_spells14_$X_casttime14}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell14" title="%{repeating_spells14_$X_initspell14}" value="/gmroll [[{([[1d10]]+@{casttime14}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname14})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell14" title="%{repeating_spells14_$X_initspell14}" value="/gmroll [[{1d10cs1cf10+(@{casttime14} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname14})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro14" title="@{repeating_spells14_$X_cast-macro14}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -6289,7 +6289,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime15" title="@{repeating_spells15_$X_casttime15}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell15" title="%{repeating_spells15_$X_initspell15}" value="/gmroll [[{([[1d10]]+@{casttime15}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname15})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell15" title="%{repeating_spells15_$X_initspell15}" value="/gmroll [[{1d10cs1cf10+(@{casttime15} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname15})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro15" title="@{repeating_spells15_$X_cast-macro15}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -6379,7 +6379,7 @@ <h4>Spells Memorized</h4>
                               <input class="sheet-short" type="text" name="attr_spell-cast-time" title="@{repeating_spells-wiz7_$X_spell-cast-time}" placeholder="Cast time"/>
                             </td>
                             <td>
-                              <button type="roll" name="roll_spell-init" title="@{repeating_spells-wiz7_$X_spell-init}" value="/gmroll [[{[[1d10]]+(@{spell-cast-time})-(@{misc-mod}), 1}kh1]] [Initiative (@{spell-name})]&{tracker}">Initiative</button>
+                              <button type="roll" name="roll_spell-init" title="@{repeating_spells-wiz7_$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-wiz7_$X_spell-template}" value="&{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>
@@ -6538,7 +6538,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime16" title="@{repeating_spells16_$X_casttime16}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell16" title="%{repeating_spells16_$X_initspell16}" value="/gmroll [[{([[1d10]]+@{casttime16}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname16})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell16" title="%{repeating_spells16_$X_initspell16}" value="/gmroll [[{1d10cs1cf10+(@{casttime16} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname16})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro16" title="@{repeating_spells16_$X_cast-macro16}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -6572,7 +6572,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime17" title="@{repeating_spells17_$X_casttime17}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell17" title="%{repeating_spells17_$X_initspell17}" value="/gmroll [[{([[1d10]]+@{casttime17}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname17})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell17" title="%{repeating_spells17_$X_initspell17}" value="/gmroll [[{1d10cs1cf10+(@{casttime17} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname17})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro17" title="@{repeating_spells17_$X_cast-macro17}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -6606,7 +6606,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime18" title="@{repeating_spells18_$X_casttime18}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell18" title="%{repeating_spells18_$X_initspell18}" value="/gmroll [[{([[1d10]]+@{casttime18}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname18})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell18" title="%{repeating_spells18_$X_initspell18}" value="/gmroll [[{1d10cs1cf10+(@{casttime18} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname18})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro18" title="@{repeating_spells18_$X_cast-macro18}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -6696,7 +6696,7 @@ <h4>Spells Memorized</h4>
                               <input class="sheet-short" type="text" name="attr_spell-cast-time" title="@{repeating_spells-wiz8_$X_spell-cast-time}" placeholder="Cast time"/>
                             </td>
                             <td>
-                              <button type="roll" name="roll_spell-init" title="@{repeating_spells-wiz8_$X_spell-init}" value="/gmroll [[{[[1d10]]+(@{spell-cast-time})-(@{misc-mod}), 1}kh1]] [Initiative (@{spell-name})]&{tracker}">Initiative</button>
+                              <button type="roll" name="roll_spell-init" title="@{repeating_spells-wiz8_$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-wiz8_$X_spell-template}" value="&{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>
@@ -6855,7 +6855,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime19" title="@{repeating_spells19_$X_casttime19}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell19" title="%{repeating_spells19_$X_initspell19}" value="/gmroll [[{([[1d10]]+@{casttime19}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname19})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell19" title="%{repeating_spells19_$X_initspell19}" value="/gmroll [[{1d10cs1cf10+(@{casttime19} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname19})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro19" title="@{repeating_spells19_$X_cast-macro19}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -6889,7 +6889,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime20" title="@{repeating_spells20_$X_casttime20}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell20" title="%{repeating_spells20_$X_initspell20}" value="/gmroll [[{([[1d10]]+@{casttime20}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname20})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell20" title="%{repeating_spells20_$X_initspell20}" value="/gmroll [[{1d10cs1cf10+(@{casttime20} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname20})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro20" title="@{repeating_spells20_$X_cast-macro20}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -6923,7 +6923,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime21" title="@{repeating_spells21_$X_casttime21}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell21" title="%{repeating_spells21_$X_initspell21}" value="/gmroll [[{([[1d10]]+@{casttime21}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname21})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell21" title="%{repeating_spells21_$X_initspell21}" value="/gmroll [[{1d10cs1cf10+(@{casttime21} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname21})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro21" title="@{repeating_spells21_$X_cast-macro21}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -7013,7 +7013,7 @@ <h4>Spells Memorized</h4>
                               <input class="sheet-short" type="text" name="attr_spell-cast-time" title="@{repeating_spells-wiz9_$X_spell-cast-time}" placeholder="Cast time"/>
                             </td>
                             <td>
-                              <button type="roll" name="roll_spell-init" title="@{repeating_spells-wiz9_$X_spell-init}" value="/gmroll [[{[[1d10]]+(@{spell-cast-time})-(@{misc-mod}), 1}kh1]] [Initiative (@{spell-name})]&{tracker}">Initiative</button>
+                              <button type="roll" name="roll_spell-init" title="@{repeating_spells-wiz9_$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-wiz9_$X_spell-template}" value="&{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>
@@ -7172,7 +7172,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime22" title="@{repeating_spells22_$X_casttime22}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell22" title="%{repeating_spells22_$X_initspell22}" value="/gmroll [[{([[1d10]]+@{casttime22}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname22})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell22" title="%{repeating_spells22_$X_initspell22}" value="/gmroll [[{1d10cs1cf10+(@{casttime22} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname22})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro22" title="@{repeating_spells22_$X_cast-macro22}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -7206,7 +7206,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime23" title="@{repeating_spells23_$X_casttime23}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell23" title="%{repeating_spells23_$X_initspell23}" value="/gmroll [[{([[1d10]]+@{casttime23}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname23})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell23" title="%{repeating_spells23_$X_initspell23}" value="/gmroll [[{1d10cs1cf10+(@{casttime23} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname23})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro23" title="@{repeating_spells23_$X_cast-macro23}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -7240,7 +7240,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime24" title="@{repeating_spells24_$X_casttime24}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell24" title="%{repeating_spells24_$X_initspell24}" value="/gmroll [[{([[1d10]]+@{casttime24}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname24})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell24" title="%{repeating_spells24_$X_initspell24}" value="/gmroll [[{1d10cs1cf10+(@{casttime24} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname24})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro24" title="@{repeating_spells24_$X_cast-macro24}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -7330,7 +7330,7 @@ <h4>Spells Memorized</h4>
                               <input class="sheet-short" type="text" name="attr_spell-cast-time" title="@{repeating_spells-wiz10_$X_spell-cast-time}" placeholder="Cast time"/>
                             </td>
                             <td>
-                              <button type="roll" name="roll_spell-init" title="@{repeating_spells-wiz10_$X_spell-init}" value="/gmroll [[{[[1d10]]+(@{spell-cast-time})-(@{misc-mod}), 1}kh1]] [Initiative (@{spell-name})]&{tracker}">Initiative</button>
+                              <button type="roll" name="roll_spell-init" title="@{repeating_spells-wiz10_$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-wiz10_$X_spell-template}" value="&{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>
@@ -7489,7 +7489,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime25" title="@{repeating_spells25_$X_casttime25}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell25" title="%{repeating_spells25_$X_initspell25}" value="/gmroll [[{([[1d10]]+@{casttime25}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname25})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell25" title="%{repeating_spells25_$X_initspell25}" value="/gmroll [[{1d10cs1cf10+(@{casttime25} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname25})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro25" title="@{repeating_spells25_$X_cast-macro25}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -7523,7 +7523,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime26" title="@{repeating_spells26_$X_casttime26}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell26" title="%{repeating_spells26_$X_initspell26}" value="/gmroll [[{([[1d10]]+@{casttime26}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname26})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell26" title="%{repeating_spells26_$X_initspell26}" value="/gmroll [[{1d10cs1cf10+(@{casttime26} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname26})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro26" title="@{repeating_spells26_$X_cast-macro26}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -7557,7 +7557,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime27" title="@{repeating_spells27_$X_casttime27}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell27" title="%{repeating_spells27_$X_initspell27}" value="/gmroll [[{([[1d10]]+@{casttime27}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname27})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell27" title="%{repeating_spells27_$X_initspell27}" value="/gmroll [[{1d10cs1cf10+(@{casttime27} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname27})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro27" title="@{repeating_spells27_$X_cast-macro27}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -7647,7 +7647,7 @@ <h4>Spells Memorized</h4>
                               <input class="sheet-short" type="text" name="attr_spell-cast-time" title="@{repeating_spells-wiz11_$X_spell-cast-time}" placeholder="Cast time"/>
                             </td>
                             <td>
-                              <button type="roll" name="roll_spell-init" title="@{repeating_spells-wiz11_$X_spell-init}" value="/gmroll [[{[[1d10]]+(@{spell-cast-time})-(@{misc-mod}), 1}kh1]] [Initiative (@{spell-name})]&{tracker}">Initiative</button>
+                              <button type="roll" name="roll_spell-init" title="@{repeating_spells-wiz11_$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-wiz11_$X_spell-template}" value="&{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>
@@ -7806,7 +7806,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime52" title="@{repeating_spells52_$X_casttime52}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell52" title="%{repeating_spells52_$X_initspell52}" value="/gmroll [[{([[1d10]]+@{casttime52}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname52})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell52" title="%{repeating_spells52_$X_initspell52}" value="/gmroll [[{1d10cs1cf10+(@{casttime52} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname52})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro52" title="@{repeating_spells52_$X_cast-macro52}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -7840,7 +7840,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime53" title="@{repeating_spells53_$X_casttime53}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell53" title="%{repeating_spells53_$X_initspell53}" value="/gmroll [[{([[1d10]]+@{casttime53}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname53})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell53" title="%{repeating_spells53_$X_initspell53}" value="/gmroll [[{1d10cs1cf10+(@{casttime53} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname53})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro53" title="@{repeating_spells53_$X_cast-macro53}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -7874,7 +7874,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime54" title="@{repeating_spells54_$X_casttime54}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell54" title="%{repeating_spells54_$X_initspell54}" value="/gmroll [[{([[1d10]]+@{casttime54}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname54})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell54" title="%{repeating_spells54_$X_initspell54}" value="/gmroll [[{1d10cs1cf10+(@{casttime54} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname54})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro54" title="@{repeating_spells54_$X_cast-macro54}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -7964,7 +7964,7 @@ <h4>Spells Memorized</h4>
                               <input class="sheet-short" type="text" name="attr_spell-cast-time" title="@{repeating_spells-wiz12_$X_spell-cast-time}" placeholder="Cast time"/>
                             </td>
                             <td>
-                              <button type="roll" name="roll_spell-init" title="@{repeating_spells-wiz12_$X_spell-init}" value="/gmroll [[{[[1d10]]+(@{spell-cast-time})-(@{misc-mod}), 1}kh1]] [Initiative (@{spell-name})]&{tracker}">Initiative</button>
+                              <button type="roll" name="roll_spell-init" title="@{repeating_spells-wiz12_$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-wiz12_$X_spell-template}" value="&{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>
@@ -8123,7 +8123,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime55" title="@{repeating_spells55_$X_casttime55}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell55" title="%{repeating_spells55_$X_initspell55}" value="/gmroll [[{([[1d10]]+@{casttime55}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname55})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell55" title="%{repeating_spells55_$X_initspell55}" value="/gmroll [[{1d10cs1cf10+(@{casttime55} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname55})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro55" title="@{repeating_spells55_$X_cast-macro55}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -8157,7 +8157,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime56" title="@{repeating_spells56_$X_casttime56}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell56" title="%{repeating_spells56_$X_initspell56}" value="/gmroll [[{([[1d10]]+@{casttime56}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname56})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell56" title="%{repeating_spells56_$X_initspell56}" value="/gmroll [[{1d10cs1cf10+(@{casttime56} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname56})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro56" title="@{repeating_spells56_$X_cast-macro56}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -8191,7 +8191,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime57" title="@{repeating_spells57_$X_casttime57}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell57" title="%{repeating_spells57_$X_initspell57}" value="/gmroll [[{([[1d10]]+@{casttime57}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname57})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell57" title="%{repeating_spells57_$X_initspell57}" value="/gmroll [[{1d10cs1cf10+(@{casttime57} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname57})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro57" title="@{repeating_spells57_$X_cast-macro57}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -8281,7 +8281,7 @@ <h4>Spells Memorized</h4>
                               <input class="sheet-short" type="text" name="attr_spell-cast-time" title="@{repeating_spells-wiz13_$X_spell-cast-time}" placeholder="Cast time"/>
                             </td>
                             <td>
-                              <button type="roll" name="roll_spell-init" title="@{repeating_spells-wiz13_$X_spell-init}" value="/gmroll [[{[[1d10]]+(@{spell-cast-time})-(@{misc-mod}), 1}kh1]] [Initiative (@{spell-name})]&{tracker}">Initiative</button>
+                              <button type="roll" name="roll_spell-init" title="@{repeating_spells-wiz13_$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-wiz13_$X_spell-template}" value="&{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>
@@ -8440,7 +8440,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime58" title="@{repeating_spells58_$X_casttime58}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell58" title="%{repeating_spells58_$X_initspell58}" value="/gmroll [[{([[1d10]]+@{casttime58}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname58})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell58" title="%{repeating_spells58_$X_initspell58}" value="/gmroll [[{1d10cs1cf10+(@{casttime58} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname58})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro58" title="@{repeating_spells58_$X_cast-macro58}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -8474,7 +8474,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime59" title="@{repeating_spells59_$X_casttime59}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell59" title="%{repeating_spells59_$X_initspell59}" value="/gmroll [[{([[1d10]]+@{casttime59}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname59})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell59" title="%{repeating_spells59_$X_initspell59}" value="/gmroll [[{1d10cs1cf10+(@{casttime59} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname59})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro59" title="@{repeating_spells59_$X_cast-macro59}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -8508,7 +8508,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime60" title="@{repeating_spells60_$X_casttime60}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell60" title="%{repeating_spells60_$X_initspell60}" value="/gmroll [[{([[1d10]]+@{casttime60}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname60})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell60" title="%{repeating_spells60_$X_initspell60}" value="/gmroll [[{1d10cs1cf10+(@{casttime60} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname60})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro60" title="@{repeating_spells60_$X_cast-macro60}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -8598,7 +8598,7 @@ <h4>Spells Memorized</h4>
                               <input class="sheet-short" type="text" name="attr_spell-cast-time" title="@{repeating_spells-wiz14_$X_spell-cast-time}" placeholder="Cast time"/>
                             </td>
                             <td>
-                              <button type="roll" name="roll_spell-init" title="@{repeating_spells-wiz14_$X_spell-init}" value="/gmroll [[{[[1d10]]+(@{spell-cast-time})-(@{misc-mod}), 1}kh1]] [Initiative (@{spell-name})]&{tracker}">Initiative</button>
+                              <button type="roll" name="roll_spell-init" title="@{repeating_spells-wiz14_$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-wiz14_$X_spell-template}" value="&{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>
@@ -8757,7 +8757,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime61" title="@{repeating_spells61_$X_casttime61}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell61" title="%{repeating_spells61_$X_initspell61}" value="/gmroll [[{([[1d10]]+@{casttime61}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname61})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell61" title="%{repeating_spells61_$X_initspell61}" value="/gmroll [[{1d10cs1cf10+(@{casttime61} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname61})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro61" title="@{repeating_spells61_$X_cast-macro61}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -8791,7 +8791,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime62" title="@{repeating_spells62_$X_casttime62}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell62" title="%{repeating_spells62_$X_initspell62}" value="/gmroll [[{([[1d10]]+@{casttime62}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname62})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell62" title="%{repeating_spells62_$X_initspell62}" value="/gmroll [[{1d10cs1cf10+(@{casttime62} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname62})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro62" title="@{repeating_spells62_$X_cast-macro62}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -8825,7 +8825,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime63" title="@{repeating_spells63_$X_casttime63}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell63" title="%{repeating_spells63_$X_initspell63}" value="/gmroll [[{([[1d10]]+@{casttime63}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname63})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell63" title="%{repeating_spells63_$X_initspell63}" value="/gmroll [[{1d10cs1cf10+(@{casttime63} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname63})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro63" title="@{repeating_spells63_$X_cast-macro63}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -8915,7 +8915,7 @@ <h4>Spells Memorized</h4>
                               <input class="sheet-short" type="text" name="attr_spell-cast-time" title="@{repeating_spells-wiz15_$X_spell-cast-time}" placeholder="Cast time"/>
                             </td>
                             <td>
-                              <button type="roll" name="roll_spell-init" title="@{repeating_spells-wiz15_$X_spell-init}" value="/gmroll [[{[[1d10]]+(@{spell-cast-time})-(@{misc-mod}), 1}kh1]] [Initiative (@{spell-name})]&{tracker}">Initiative</button>
+                              <button type="roll" name="roll_spell-init" title="@{repeating_spells-wiz15_$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-wiz15_$X_spell-template}" value="&{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>
@@ -9074,7 +9074,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime64" title="@{repeating_spells64_$X_casttime64}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell64" title="%{repeating_spells64_$X_initspell64}" value="/gmroll [[{([[1d10]]+@{casttime64}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname64})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell64" title="%{repeating_spells64_$X_initspell64}" value="/gmroll [[{1d10cs1cf10+(@{casttime64} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname64})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro64" title="@{repeating_spells64_$X_cast-macro64}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -9108,7 +9108,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime65" title="@{repeating_spells65_$X_casttime65}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell65" title="%{repeating_spells65_$X_initspell65}" value="/gmroll [[{([[1d10]]+@{casttime65}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname65})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell65" title="%{repeating_spells65_$X_initspell65}" value="/gmroll [[{1d10cs1cf10+(@{casttime65} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname65})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro65" title="@{repeating_spells65_$X_cast-macro65}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -9142,7 +9142,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime66" title="@{repeating_spells66_$X_casttime66}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell66" title="%{repeating_spells66_$X_initspell66}" value="/gmroll [[{([[1d10]]+@{casttime66}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname66})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell66" title="%{repeating_spells66_$X_initspell66}" value="/gmroll [[{1d10cs1cf10+(@{casttime66} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname66})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro66" title="@{repeating_spells66_$X_cast-macro66}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -9336,7 +9336,7 @@ <h4>Spells Memorized</h4>
                               <input class="sheet-short" type="text" name="attr_spell-cast-time" title="@{repeating_spells-pri1_$X_spell-cast-time}" placeholder="Cast time"/>
                             </td>
                             <td>
-                              <button type="roll" name="roll_spell-init" title="@{repeating_spells-pri1_$X_spell-init}" value="/gmroll [[{[[1d10]]+(@{spell-cast-time})-(@{misc-mod}), 1}kh1]] [Initiative (@{spell-name})]&{tracker}">Initiative</button>
+                              <button type="roll" name="roll_spell-init" title="@{repeating_spells-pri1_$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-pri1_$X_spell-template}" value="&{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=[[@{wisfail}]]%}}{{fail=The spell is expended with absolutely no effect whatsoever.}}{{effects=@{spell-effect}}}">T</button>
@@ -9495,7 +9495,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime28" title="@{repeating_spells28_$X_casttime28}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell28" title="%{repeating_spells28_$X_initspell28}" value="/gmroll [[{([[1d10]]+@{casttime28}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname28})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell28" title="%{repeating_spells28_$X_initspell28}" value="/gmroll [[{1d10cs1cf10+(@{casttime28} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname28})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro28" title="@{repeating_spells28_$X_cast-macro28}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -9529,7 +9529,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime29" title="@{repeating_spells29_$X_casttime29}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell29" title="%{repeating_spells29_$X_initspell29}" value="/gmroll [[{([[1d10]]+@{casttime29}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname29})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell29" title="%{repeating_spells29_$X_initspell29}" value="/gmroll [[{1d10cs1cf10+(@{casttime29} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname29})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro29" title="@{repeating_spells29_$X_cast-macro29}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -9563,7 +9563,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime30" title="@{repeating_spells30_$X_casttime30}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell30" title="%{repeating_spells30_$X_initspell30}" value="/gmroll [[{([[1d10]]+@{casttime30}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname30})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell30" title="%{repeating_spells30_$X_initspell30}" value="/gmroll [[{1d10cs1cf10+(@{casttime30} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname30})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro30" title="@{repeating_spells30_$X_cast-macro30}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -9649,7 +9649,7 @@ <h4>Spells Memorized</h4>
                               <input class="sheet-short" type="text" name="attr_spell-cast-time" title="@{repeating_spells-pri2_$X_spell-cast-time}" placeholder="Cast time"/>
                             </td>
                             <td>
-                              <button type="roll" name="roll_spell-init" title="@{repeating_spells-pri2_$X_spell-init}" value="/gmroll [[{[[1d10]]+(@{spell-cast-time})-(@{misc-mod}), 1}kh1]] [Initiative (@{spell-name})]&{tracker}">Initiative</button>
+                              <button type="roll" name="roll_spell-init" title="@{repeating_spells-pri2_$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-pri2_$X_spell-template}" value="&{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=[[@{wisfail}]]%}}{{fail=The spell is expended with absolutely no effect whatsoever.}}{{effects=@{spell-effect}}}">T</button>
@@ -9808,7 +9808,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime31" title="@{repeating_spells31_$X_casttime31}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell31" title="%{repeating_spells31_$X_initspell31}" value="/gmroll [[{([[1d10]]+@{casttime31}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname31})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell31" title="%{repeating_spells31_$X_initspell31}" value="/gmroll [[{1d10cs1cf10+(@{casttime31} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname31})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro31" title="@{repeating_spells31_$X_cast-macro31}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -9842,7 +9842,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime32" title="@{repeating_spells32_$X_casttime32}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell32" title="%{repeating_spells32_$X_initspell32}" value="/gmroll [[{([[1d10]]+@{casttime32}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname32})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell32" title="%{repeating_spells32_$X_initspell32}" value="/gmroll [[{1d10cs1cf10+(@{casttime32} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname32})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro32" title="@{repeating_spells32_$X_cast-macro32}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -9876,7 +9876,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime33" title="@{repeating_spells33_$X_casttime33}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell33" title="%{repeating_spells33_$X_initspell33}" value="/gmroll [[{([[1d10]]+@{casttime33}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname33})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell33" title="%{repeating_spells33_$X_initspell33}" value="/gmroll [[{1d10cs1cf10+(@{casttime33} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname33})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro33" title="@{repeating_spells33_$X_cast-macro33}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -9962,7 +9962,7 @@ <h4>Spells Memorized</h4>
                               <input class="sheet-short" type="text" name="attr_spell-cast-time" title="@{repeating_spells-pri3_$X_spell-cast-time}" placeholder="Cast time"/>
                             </td>
                             <td>
-                              <button type="roll" name="roll_spell-init" title="@{repeating_spells-pri3_$X_spell-init}" value="/gmroll [[{[[1d10]]+(@{spell-cast-time})-(@{misc-mod}), 1}kh1]] [Initiative (@{spell-name})]&{tracker}">Initiative</button>
+                              <button type="roll" name="roll_spell-init" title="@{repeating_spells-pri3_$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-pri3_$X_spell-template}" value="&{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=[[@{wisfail}]]%}}{{fail=The spell is expended with absolutely no effect whatsoever.}}{{effects=@{spell-effect}}}">T</button>
@@ -10121,7 +10121,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime34" title="@{repeating_spells34_$X_casttime34}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell34" title="%{repeating_spells34_$X_initspell34}" value="/gmroll [[{([[1d10]]+@{casttime34}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname34})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell34" title="%{repeating_spells34_$X_initspell34}" value="/gmroll [[{1d10cs1cf10+(@{casttime34} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname34})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro34" title="@{repeating_spells34_$X_cast-macro34}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -10155,7 +10155,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime35" title="@{repeating_spells35_$X_casttime35}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell35" title="%{repeating_spells35_$X_initspell35}" value="/gmroll [[{([[1d10]]+@{casttime35}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname35})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell35" title="%{repeating_spells35_$X_initspell35}" value="/gmroll [[{1d10cs1cf10+(@{casttime35} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname35})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro35" title="@{repeating_spells35_$X_cast-macro35}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -10189,7 +10189,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime36" title="@{repeating_spells36_$X_casttime36}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell36" title="%{repeating_spells36_$X_initspell36}" value="/gmroll [[{([[1d10]]+@{casttime36}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname36})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell36" title="%{repeating_spells36_$X_initspell36}" value="/gmroll [[{1d10cs1cf10+(@{casttime36} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname36})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro36" title="@{repeating_spells36_$X_cast-macro36}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -10275,7 +10275,7 @@ <h4>Spells Memorized</h4>
                               <input class="sheet-short" type="text" name="attr_spell-cast-time" title="@{repeating_spells-pri4_$X_spell-cast-time}" placeholder="Cast time"/>
                             </td>
                             <td>
-                              <button type="roll" name="roll_spell-init" title="@{repeating_spells-pri4_$X_spell-init}" value="/gmroll [[{[[1d10]]+(@{spell-cast-time})-(@{misc-mod}), 1}kh1]] [Initiative (@{spell-name})]&{tracker}">Initiative</button>
+                              <button type="roll" name="roll_spell-init" title="@{repeating_spells-pri4_$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-pri4_$X_spell-template}" value="&{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=[[@{wisfail}]]%}}{{fail=The spell is expended with absolutely no effect whatsoever.}}{{effects=@{spell-effect}}}">T</button>
@@ -10434,7 +10434,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime37" title="@{repeating_spells37_$X_casttime37}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell37" title="%{repeating_spells37_$X_initspell37}" value="/gmroll [[{([[1d10]]+@{casttime37}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname37})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell37" title="%{repeating_spells37_$X_initspell37}" value="/gmroll [[{1d10cs1cf10+(@{casttime37} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname37})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro37" title="@{repeating_spells37_$X_cast-macro37}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -10468,7 +10468,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime38" title="@{repeating_spells38_$X_casttime38}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell38" title="%{repeating_spells38_$X_initspell38}" value="/gmroll [[{([[1d10]]+@{casttime38}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname38})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell38" title="%{repeating_spells38_$X_initspell38}" value="/gmroll [[{1d10cs1cf10+(@{casttime38} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname38})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro38" title="@{repeating_spells38_$X_cast-macro38}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -10502,7 +10502,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime39" title="@{repeating_spells39_$X_casttime39}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell39" title="%{repeating_spells39_$X_initspell39}" value="/gmroll [[{([[1d10]]+@{casttime39}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname39})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell39" title="%{repeating_spells39_$X_initspell39}" value="/gmroll [[{1d10cs1cf10+(@{casttime39} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname39})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro39" title="@{repeating_spells39_$X_cast-macro39}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -10588,7 +10588,7 @@ <h4>Spells Memorized</h4>
                               <input class="sheet-short" type="text" name="attr_spell-cast-time" title="@{repeating_spells-pri5_$X_spell-cast-time}" placeholder="Cast time"/>
                             </td>
                             <td>
-                              <button type="roll" name="roll_spell-init" title="@{repeating_spells-pri5_$X_spell-init}" value="/gmroll [[{[[1d10]]+(@{spell-cast-time})-(@{misc-mod}), 1}kh1]] [Initiative (@{spell-name})]&{tracker}">Initiative</button>
+                              <button type="roll" name="roll_spell-init" title="@{repeating_spells-pri5_$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-pri5_$X_spell-template}" value="&{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=[[@{wisfail}]]%}}{{fail=The spell is expended with absolutely no effect whatsoever.}}{{effects=@{spell-effect}}}">T</button>
@@ -10747,7 +10747,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime40" title="@{repeating_spells40_$X_casttime40}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell40" title="%{repeating_spells40_$X_initspell40}" value="/gmroll [[{([[1d10]]+@{casttime40}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname40})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell40" title="%{repeating_spells40_$X_initspell40}" value="/gmroll [[{1d10cs1cf10+(@{casttime40} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname40})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro40" title="@{repeating_spells40_$X_cast-macro40}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -10781,7 +10781,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime41" title="@{repeating_spells41_$X_casttime41}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell41" title="%{repeating_spells41_$X_initspell41}" value="/gmroll [[{([[1d10]]+@{casttime41}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname41})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell41" title="%{repeating_spells41_$X_initspell41}" value="/gmroll [[{1d10cs1cf10+(@{casttime41} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname41})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro41" title="@{repeating_spells41_$X_cast-macro41}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -10815,7 +10815,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime42" title="@{repeating_spells42_$X_casttime42}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell42" title="%{repeating_spells42_$X_initspell42}" value="/gmroll [[{([[1d10]]+@{casttime42}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname42})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell42" title="%{repeating_spells42_$X_initspell42}" value="/gmroll [[{1d10cs1cf10+(@{casttime42} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname42})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro42" title="@{repeating_spells42_$X_cast-macro42}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -10901,7 +10901,7 @@ <h4>Spells Memorized</h4>
                               <input class="sheet-short" type="text" name="attr_spell-cast-time" title="@{repeating_spells-pri6_$X_spell-cast-time}" placeholder="Cast time"/>
                             </td>
                             <td>
-                              <button type="roll" name="roll_spell-init" title="@{repeating_spells-pri6_$X_spell-init}" value="/gmroll [[{[[1d10]]+(@{spell-cast-time})-(@{misc-mod}), 1}kh1]] [Initiative (@{spell-name})]&{tracker}">Initiative</button>
+                              <button type="roll" name="roll_spell-init" title="@{repeating_spells-pri6_$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-pri6_$X_spell-template}" value="&{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=[[@{wisfail}]]%}}{{fail=The spell is expended with absolutely no effect whatsoever.}}{{effects=@{spell-effect}}}">T</button>
@@ -11060,7 +11060,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime43" title="@{repeating_spells43_$X_casttime43}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell43" title="%{repeating_spells43_$X_initspell43}" value="/gmroll [[{([[1d10]]+@{casttime43}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname43})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell43" title="%{repeating_spells43_$X_initspell43}" value="/gmroll [[{1d10cs1cf10+(@{casttime43} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname43})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro43" title="@{repeating_spells43_$X_cast-macro43}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -11094,7 +11094,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime44" title="@{repeating_spells44_$X_casttime44}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell44" title="%{repeating_spells44_$X_initspell44}" value="/gmroll [[{([[1d10]]+@{casttime44}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname44})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell44" title="%{repeating_spells44_$X_initspell44}" value="/gmroll [[{1d10cs1cf10+(@{casttime44} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname44})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro44" title="@{repeating_spells44_$X_cast-macro44}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -11128,7 +11128,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime45" title="@{repeating_spells45_$X_casttime45}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell45" title="%{repeating_spells45_$X_initspell45}" value="/gmroll [[{([[1d10]]+@{casttime45}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname45})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell45" title="%{repeating_spells45_$X_initspell45}" value="/gmroll [[{1d10cs1cf10+(@{casttime45} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname45})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro45" title="@{repeating_spells45_$X_cast-macro45}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -11214,7 +11214,7 @@ <h4>Spells Memorized</h4>
                               <input class="sheet-short" type="text" name="attr_spell-cast-time" title="@{repeating_spells-pri7_$X_spell-cast-time}" placeholder="Cast time"/>
                             </td>
                             <td>
-                              <button type="roll" name="roll_spell-init" title="@{repeating_spells-pri7_$X_spell-init}" value="/gmroll [[{[[1d10]]+(@{spell-cast-time})-(@{misc-mod}), 1}kh1]] [Initiative (@{spell-name})]&{tracker}">Initiative</button>
+                              <button type="roll" name="roll_spell-init" title="@{repeating_spells-pri7_$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-pri7_$X_spell-template}" value="&{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=[[@{wisfail}]]%}}{{fail=The spell is expended with absolutely no effect whatsoever.}}{{effects=@{spell-effect}}}">T</button>
@@ -11373,7 +11373,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime46" title="@{repeating_spells46_$X_casttime46}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell46" title="%{repeating_spells46_$X_initspell46}" value="/gmroll [[{([[1d10]]+@{casttime46}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname46})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell46" title="%{repeating_spells46_$X_initspell46}" value="/gmroll [[{1d10cs1cf10+(@{casttime46} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname46})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro46" title="@{repeating_spells46_$X_cast-macro46}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -11407,7 +11407,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime47" title="@{repeating_spells47_$X_casttime47}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell47" title="%{repeating_spells47_$X_initspell47}" value="/gmroll [[{([[1d10]]+@{casttime47}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname47})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell47" title="%{repeating_spells47_$X_initspell47}" value="/gmroll [[{1d10cs1cf10+(@{casttime47} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname47})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro47" title="@{repeating_spells47_$X_cast-macro47}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -11441,7 +11441,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime48" title="@{repeating_spells48_$X_casttime48}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell48" title="%{repeating_spells48_$X_initspell48}" value="/gmroll [[{([[1d10]]+@{casttime48}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname48})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell48" title="%{repeating_spells48_$X_initspell48}" value="/gmroll [[{1d10cs1cf10+(@{casttime48} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname48})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro48" title="@{repeating_spells48_$X_cast-macro48}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -11527,7 +11527,7 @@ <h4>Spells Memorized</h4>
                               <input class="sheet-short" type="text" name="attr_spell-cast-time" title="@{repeating_spells-priq_$X_spell-cast-time}" placeholder="Cast time"/>
                             </td>
                             <td>
-                              <button type="roll" name="roll_spell-init" title="@{repeating_spells-priq_$X_spell-init}" value="/gmroll [[{[[1d10]]+(@{spell-cast-time})-(@{misc-mod}), 1}kh1]] [Initiative (@{spell-name})]&{tracker}">Initiative</button>
+                              <button type="roll" name="roll_spell-init" title="@{repeating_spells-priq_$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-priq_$X_spell-template}" value="&{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=[[@{wisfail}]]%}}{{fail=The spell is expended with absolutely no effect whatsoever.}}{{effects=@{spell-effect}}}">T</button>
@@ -11686,7 +11686,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime49" title="@{repeating_spells49_$X_casttime49}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell49" title="%{repeating_spells49_$X_initspell49}" value="/gmroll [[{([[1d10]]+@{casttime49}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname49})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell49" title="%{repeating_spells49_$X_initspell49}" value="/gmroll [[{1d10cs1cf10+(@{casttime49} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname49})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro49" title="@{repeating_spells49_$X_cast-macro49}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -11720,7 +11720,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime50" title="@{repeating_spells50_$X_casttime50}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell50" title="%{repeating_spells50_$X_initspell50}" value="/gmroll [[{([[1d10]]+@{casttime50}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname50})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell50" title="%{repeating_spells50_$X_initspell50}" value="/gmroll [[{1d10cs1cf10+(@{casttime50} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname50})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro50" title="@{repeating_spells50_$X_cast-macro50}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -11754,7 +11754,7 @@ <h4>Spells Memorized</h4>
                                         <td><label>Casting Time: </label></td>
                                         <td><input type="text" name="attr_casttime51" title="@{repeating_spells51_$X_casttime51}" class="sheet-short"></td>
                                         <td></td>
-                                        <td><button type="roll" style="margin: 0;" name="roll_initspell51" title="%{repeating_spells51_$X_initspell51}" value="/gmroll [[{([[1d10]]+@{casttime51}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname51})]&{tracker}">Initiative</button></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell51" title="%{repeating_spells51_$X_initspell51}" value="/gmroll [[{1d10cs1cf10+(@{casttime51} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname51})]&{tracker}">Initiative</button></td>
                                     </tr>
                                     <tr>
                                         <td colspan="4"><textarea name="attr_cast-macro51" title="@{repeating_spells51_$X_cast-macro51}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
@@ -21372,7 +21372,7 @@ <h4>Additional Monster attacks</h4>
                       <input class="sheet-short" type="text" name="attr_spell-cast-time" title="@{repeating_spells-wizmonster_$X_spell-cast-time}" placeholder="Cast time"/>
                     </td>
                     <td>
-                      <button type="roll" name="roll_spell-init" title="@{repeating_spells-wizmonster_$X_spell-init}" value="/gmroll [[{[[1d10]]+(@{spell-cast-time})-(@{misc-mod}), 1}kh1]] [Initiative (@{spell-name})]&{tracker}">Initiative</button>
+                      <button type="roll" name="roll_spell-init" title="@{repeating_spells-wizmonster_$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-wizmonster_$X_spell-template}" value="@{wtype} &{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>
@@ -21546,7 +21546,7 @@ <h4>Additional Monster attacks</h4>
                       <input class="sheet-short" type="text" name="attr_spell-cast-time" title="@{repeating_spells-primonster_$X_spell-cast-time}" placeholder="Cast time"/>
                     </td>
                     <td>
-                      <button type="roll" name="roll_spell-init" title="@{repeating_spells-primonster_$X_spell-init}" value="/gmroll [[{[[1d10]]+(@{spell-cast-time})-(@{misc-mod}), 1}kh1]] [Initiative (@{spell-name})]&{tracker}">Initiative</button>
+                      <button type="roll" name="roll_spell-init" title="@{repeating_spells-primonster_$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-primonster_$X_spell-template}" value="@{wtype} &{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=}}{{fail=The spell is expended with absolutely no effect whatsoever.}}{{effects=@{spell-effect}}}">T</button>
diff --git a/ADnD_2E_Revised/html/shared/priest-spell-template.html b/ADnD_2E_Revised/html/shared/priest-spell-template.html
index b336be891de..7b1640f828f 100644
--- a/ADnD_2E_Revised/html/shared/priest-spell-template.html
+++ b/ADnD_2E_Revised/html/shared/priest-spell-template.html
@@ -24,7 +24,7 @@
           <input class="sheet-short" type="text" name="attr_spell-cast-time" title="@{repeating_spells-#REPLACE0#_$X_spell-cast-time}" placeholder="Cast time"/>
         </td>
         <td>
-          <button type="roll" name="roll_spell-init" title="@{repeating_spells-#REPLACE0#_$X_spell-init}" value="/gmroll [[{[[1d10]]+(@{spell-cast-time})-(@{misc-mod}), 1}kh1]] [Initiative (@{spell-name})]&{tracker}">Initiative</button>
+          <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>
diff --git a/ADnD_2E_Revised/html/shared/wizard-spell-template.html b/ADnD_2E_Revised/html/shared/wizard-spell-template.html
index f624a9568a3..1e27fd20b25 100644
--- a/ADnD_2E_Revised/html/shared/wizard-spell-template.html
+++ b/ADnD_2E_Revised/html/shared/wizard-spell-template.html
@@ -24,7 +24,7 @@
           <input class="sheet-short" type="text" name="attr_spell-cast-time" title="@{repeating_spells-#REPLACE0#_$X_spell-cast-time}" placeholder="Cast time"/>
         </td>
         <td>
-          <button type="roll" name="roll_spell-init" title="@{repeating_spells-#REPLACE0#_$X_spell-init}" value="/gmroll [[{[[1d10]]+(@{spell-cast-time})-(@{misc-mod}), 1}kh1]] [Initiative (@{spell-name})]&{tracker}">Initiative</button>
+          <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>
diff --git a/ADnD_2E_Revised/html/tabs/character-tab/spells-tab/components/spells-old.html b/ADnD_2E_Revised/html/tabs/character-tab/spells-tab/components/spells-old.html
index bb7e9deef26..434f5bca938 100644
--- a/ADnD_2E_Revised/html/tabs/character-tab/spells-tab/components/spells-old.html
+++ b/ADnD_2E_Revised/html/tabs/character-tab/spells-tab/components/spells-old.html
@@ -20,7 +20,7 @@
                 <td><label>Casting Time: </label></td>
                 <td><input type="text" name="attr_casttime#REPLACE0#" title="@{repeating_spells#REPLACE0#_$X_casttime#REPLACE0#}" class="sheet-short"></td>
                 <td></td>
-                <td><button type="roll" style="margin: 0;" name="roll_initspell#REPLACE0#" title="%{repeating_spells#REPLACE0#_$X_initspell#REPLACE0#}" value="/gmroll [[{([[1d10]]+@{casttime#REPLACE0#}-(@{misc-mod})), 1}kh1]] [Initiative (@{spellname#REPLACE0#})]&{tracker}">Initiative</button></td>
+                <td><button type="roll" style="margin: 0;" name="roll_initspell#REPLACE0#" title="%{repeating_spells#REPLACE0#_$X_initspell#REPLACE0#}" value="/gmroll [[{1d10cs1cf10+(@{casttime#REPLACE0#} [Spell])-(@{misc-mod}), {1}}kh1]] [Initiative (@{spellname#REPLACE0#})]&{tracker}">Initiative</button></td>
             </tr>
             <tr>
                 <td colspan="4"><textarea name="attr_cast-macro#REPLACE0#" title="@{repeating_spells#REPLACE0#_$X_cast-macro#REPLACE0#}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
diff --git a/ADnD_2E_Revised/html/tabs/character-tab/weapons-tab/players-option-weapons-tab.html b/ADnD_2E_Revised/html/tabs/character-tab/weapons-tab/players-option-weapons-tab.html
index 95a700039c6..49df397d694 100644
--- a/ADnD_2E_Revised/html/tabs/character-tab/weapons-tab/players-option-weapons-tab.html
+++ b/ADnD_2E_Revised/html/tabs/character-tab/weapons-tab/players-option-weapons-tab.html
@@ -105,7 +105,7 @@
                 <td><label><input type="checkbox" name="attr_weaptype-pierce" title="@{repeating_weapons_$X_weaptype-pierce}" value="1"/><span></span></label></td>
                 <td><label><input type="checkbox" name="attr_weaptype-blunt" title="@{repeating_weapons_$X_weaptype-blunt}" value="1"/><span></span></label></td>
                 <td><input type="text" name="attr_weapspeed" title="@{repeating_weapons_$X_weapspeed}" class="sheet-small"></td>
-                <td><button type="roll" name="roll_init" title="%{repeating_weapons_$X_init}" value="/gmroll [[{1d10+(@{weapspeed} [Weapon])-(@{temp-speedadj} [Temp buff])-(@{misc-mod}), {1}}kh1]] [Initiative (@{weaponname})]&{tracker}">Initiative</button></td>
+                <td><button type="roll" name="roll_init" title="%{repeating_weapons_$X_init}" value="/gmroll [[{1d10cs1cf10+(@{weapspeed} [Weapon])-(@{temp-speedadj} [Temp buff])-(@{misc-mod}), {1}}kh1]] [Initiative (@{weaponname})]&{tracker}">Initiative</button></td>
             </tr>
         </table>
         </fieldset>
@@ -315,7 +315,7 @@ <h4>Weapon Notes</h4>
                 <td><label><input type="checkbox" name="attr_weaptype-pierce2" title="@{repeating_weapons2_$X_weaptype-pierce2}" value="1"/><span></span></label></td>
                 <td><label><input type="checkbox" name="attr_weaptype-blunt2" title="@{repeating_weapons2_$X_weaptype-blunt2}" value="1"/><span></span></label></td>
                 <td><input type="text" name="attr_weapspeed2" title="@{repeating_weapons2_$X_weapspeed2}" class="sheet-small"></td>
-                <td><button type="roll" name="roll_init2" title="%{repeating_weapons2_$X_init2}" value="/gmroll [[{1d10+(@{weapspeed2} [Weapon])-(@{temp-speedadj} [Temp buff])-(@{misc-mod}), {1}}kh1]] [Initiative (@{weaponname2})]&{tracker}">Initiative</button></td>
+                <td><button type="roll" name="roll_init2" title="%{repeating_weapons2_$X_init2}" value="/gmroll [[{1d10cs1cf10+(@{weapspeed2} [Weapon])-(@{temp-speedadj} [Temp buff])-(@{misc-mod}), {1}}kh1]] [Initiative (@{weaponname2})]&{tracker}">Initiative</button></td>
             </tr>
         </table>
         </fieldset>
diff --git a/ADnD_2E_Revised/html/tabs/character-tab/weapons-tab/standard-weapons-tab.html b/ADnD_2E_Revised/html/tabs/character-tab/weapons-tab/standard-weapons-tab.html
index db20fc005f5..4088ebd1f82 100644
--- a/ADnD_2E_Revised/html/tabs/character-tab/weapons-tab/standard-weapons-tab.html
+++ b/ADnD_2E_Revised/html/tabs/character-tab/weapons-tab/standard-weapons-tab.html
@@ -178,7 +178,7 @@
                 <td><label><input type="checkbox" name="attr_weaptype-pierce" title="@{repeating_weapons_$X_weaptype-pierce}" value="1"/><span></span></label></td>
                 <td><label><input type="checkbox" name="attr_weaptype-blunt" title="@{repeating_weapons_$X_weaptype-blunt}" value="1"/><span></span></label></td>
                 <td><input type="text" name="attr_weapspeed" title="@{repeating_weapons_$X_weapspeed}" class="sheet-small"></td>
-                <td><button type="roll" name="roll_init" title="%{repeating_weapons_$X_init}" value="/gmroll [[{1d10+(@{weapspeed} [Weapon])-(@{temp-speedadj} [Temp buff])-(@{misc-mod}), {1}}kh1]] [Initiative (@{weaponname})]&{tracker}">Initiative</button></td>
+                <td><button type="roll" name="roll_init" title="%{repeating_weapons_$X_init}" value="/gmroll [[{1d10cs1cf10+(@{weapspeed} [Weapon])-(@{temp-speedadj} [Temp buff])-(@{misc-mod}), {1}}kh1]] [Initiative (@{weaponname})]&{tracker}">Initiative</button></td>
             </tr>
         </table>
         </fieldset>
@@ -356,7 +356,7 @@ <h4>Weapon Notes</h4>
                 <td><label><input type="checkbox" name="attr_weaptype-pierce2" title="@{repeating_weapons2_$X_weaptype-pierce2}" value="1"/><span></span></label></td>
                 <td><label><input type="checkbox" name="attr_weaptype-blunt2" title="@{repeating_weapons2_$X_weaptype-blunt2}" value="1"/><span></span></label></td>
                 <td><input type="text" name="attr_weapspeed2" title="@{repeating_weapons2_$X_weapspeed2}" class="sheet-small"></td>
-                <td><button type="roll" name="roll_init2" title="%{repeating_weapons2_$X_init2}" value="/gmroll [[{1d10+(@{weapspeed2} [Weapon])-(@{temp-speedadj} [Temp buff])-(@{misc-mod}), {1}}kh1]] [Initiative (@{weaponname2})]&{tracker}">Initiative</button></td>
+                <td><button type="roll" name="roll_init2" title="%{repeating_weapons2_$X_init2}" value="/gmroll [[{1d10cs1cf10+(@{weapspeed2} [Weapon])-(@{temp-speedadj} [Temp buff])-(@{misc-mod}), {1}}kh1]] [Initiative (@{weaponname2})]&{tracker}">Initiative</button></td>
             </tr>
         </table>
         </fieldset>
diff --git a/ADnD_2E_Revised/pug/spellTemplate.pug b/ADnD_2E_Revised/pug/spellTemplate.pug
index dd140d15cca..9998db708fe 100644
--- a/ADnD_2E_Revised/pug/spellTemplate.pug
+++ b/ADnD_2E_Revised/pug/spellTemplate.pug
@@ -24,7 +24,7 @@ fieldset(name="repeating_spells-#REPLACE0#" class="repeating_spells-#REPLACE0#")
                 td
                     input(type="text" name="attr_spell-cast-time" title="@{repeating_spells-#REPLACE0#_$X_spell-cast-time}" class="sheet-short" placeholder="Cast time")
                 td
-                    button(type="roll" name="roll_spell-init" title="@{repeating_spells-#REPLACE0#_$X_spell-init}" value!="/gmroll [[{[[1d10]]+(@{spell-cast-time})-(@{misc-mod}), 1}kh1]] [Initiative (@{spell-name})]&{tracker}") Initiative
+                    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
                 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}}}"+failureCheck+"{{effects=@{spell-effect}}}") T
                 |