From 273c19f07e64cd1f8b950433bc08e53fc96bf78c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=88=87ince?= <vince-roll20@users.noreply.github.com>
Date: Mon, 11 Nov 2024 20:58:12 -0800
Subject: [PATCH] aliging fbl with myz crp handling

---
 Forbidden_Lands/Forbidden_Lands.css  |  24 +-
 Forbidden_Lands/Forbidden_Lands.html | 362 ++++++++++++++-------------
 2 files changed, 190 insertions(+), 196 deletions(-)

diff --git a/Forbidden_Lands/Forbidden_Lands.css b/Forbidden_Lands/Forbidden_Lands.css
index 23566ed6ff..c83681172d 100644
--- a/Forbidden_Lands/Forbidden_Lands.css
+++ b/Forbidden_Lands/Forbidden_Lands.css
@@ -3279,25 +3279,11 @@ button[title*="torches}"].roll-button-textonly.header-h1:hover::after {
 }
 
 .charsheet .dice-rolls {
-	display: flex;
-	flex-flow: row;
-	grid-area: dice-rolls;
-	grid-template-areas: "dice-rolls-roll dice-rolls-push dice-rolls-d66";
-	grid-template-columns: 1fr 1fr 1fr;
-	justify-content: space-evenly;
-	margin-top: 10px;
-}
-
-.charsheet .dice-rolls-roll {
-	grid-area: dice-rolls-roll;
-}
-
-.charsheet .dice-rolls-push {
-	grid-area: dice-rolls-push;
-}
-
-.charsheet .dice-rolls-d66 {
-	grid-area: dice-rolls-d66;
+  margin-top: 10px;
+  grid-area: dice-rolls;
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  justify-items: center;
 }
 
 .charsheet .dice-preset {
diff --git a/Forbidden_Lands/Forbidden_Lands.html b/Forbidden_Lands/Forbidden_Lands.html
index 79b085d034..402e3a8244 100644
--- a/Forbidden_Lands/Forbidden_Lands.html
+++ b/Forbidden_Lands/Forbidden_Lands.html
@@ -8,6 +8,7 @@
 <input type="checkbox" class="hidden display-cart" name="attr_display_cart_flag" value="1" />
 <input type="checkbox" class="hidden display-beasts" name="attr_display_beasts_flag" value="1" />
 <input type="checkbox" class="hidden display-spells" name="attr_display_spells_flag" value="1"checked />
+<button class="hidden" type="action" name="act_push"></button>
 <!--background image/color-->
 <!--none-->
 <input type="checkbox" class="hidden background-selected" name="attr_background" value="1" checked />
@@ -528,7 +529,7 @@
       <div class="box toggle-monster-only character-details">
         <div class="details-grid">
           <div class="details-box1">
-            <button class="roll-button-textonly font-color-initial" type="roll" name="roll_pride" title="%{roll_pride}" value="@{whisper_option} &{template:forbiddenlands} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=^{pride-roll}}} {{subtitle=&ldquo;@{pride}&rdquo;}} {{artifact_die_twelve=[[1]]}} {{artifact_roll_twelve=[[1d12]]}} {{pride-flag=1}}">
+            <button class="roll-button-textonly font-color-initial" type="roll" name="roll_pride" title="%{roll_pride}" value="@{whisper_option} &{template:forbiddenlands} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=^{pride-roll}}} {{subtitle=&ldquo;@{pride}&rdquo;}} {{artifact_die_twelve=[[1]]}} {{artifact-roll-twelve=[[1d12]]}} {{pride-flag=1}}">
               <span data-i18n="pride">Pride</span>
             </button>
           </div>
@@ -906,6 +907,7 @@
         <input type="hidden" name="attr_skill_bonus_misc_gear_selected" value="" readonly />
         <input type="hidden" name="attr_skill_only_selected" value="" readonly />
         <input type="hidden" name="attr_skill_notes_selected" value="" readonly />
+        <!-- Skills -->
         <div class="box character-skills">
           <input type="checkbox" class="skill-order-group hidden" name="attr_skill_order_group" value="1" />
           <div class="skills-grid" data-i18n-list="skills-list">
@@ -2040,6 +2042,7 @@
             </span>
           </div>
         </div>
+        <!-- DICE POOL GRID-->
         <div class="box character-dice_pool">
           <div class="dice_pool-grid">
             <div class="dice-header dice_pool-box1 header-top">
@@ -2169,14 +2172,17 @@
             </div>
             <div class="dice-rolls">
               <input class="hidden api-toggle-show" type="checkbox" name="attr_api_toggle" value="1" />
+              <input class="hidden" type="number" name="attr_pushable" value="1" />
+              <input class="hidden" type="text" name="attr_push_latest" value="" />
+              <input class="hidden" name="attr_api_dice_command" value="@{whisper_option_api} [[(@{skill})d6]] [[(@{attribute})d6]] [[(@{gear})d6]] [[(@{artifact_die_eight})d8+(@{artifact_die_ocho})d8+(@{artifact_die_ten})d10+(@{artifact_die_twelve})d12]] --Character|@{character_name} --Roll|@{current_preset}" readonly />
+
               <div class="template-roll dice-rolls-roll">
                 <input class="hidden roll-indicator" type="checkbox" name="attr_roll_the_dice_flag" value="1" />
                 <span class="box-indicator">
-                  <button class="dice-pool" type="roll" name="roll_the_dice" value="@{the_dice}" data-i18n-title="roll-dice" title="Roll the Dice!">&nbsp;
-                    <span data-i18n="roll">Roll</span>&nbsp;
+                  <button class="dice-pool" type="action" name="act_roll_the_dice" data-i18n-title="roll-dice" title="Roll the Dice!">
+                    &nbsp;<span data-i18n="roll">Roll</span>&nbsp;
                   </button>
-                  <input type="hidden" name="attr_the_dice" value="" />
-                  <button class="hidden dice-pool" type="action" name="act_the_dice-button"></button>
+                  <button class="hidden dice-pool" type="roll" name="roll_the_dice" value="@{whisper_option} &{template:forbiddenlands} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=^{dice-pool}}} {{subtitle=@{current_preset}}} {{subtitle2=@{subtitle2}}} {{free-text}} {{footer}} {{attribute_die_one=[[ @{attribute_die_one} ]]}} {{attribute-roll-one=[[1d6]]}} {{attribute_die_two=[[ @{attribute_die_two} ]]}} {{attribute-roll-two=[[1d6]]}} {{attribute_die_three=[[ @{attribute_die_three} ]]}} {{attribute-roll-three=[[1d6]]}} {{attribute_die_four=[[ @{attribute_die_four} ]]}} {{attribute-roll-four=[[1d6]]}} {{attribute_die_five=[[ @{attribute_die_five} ]]}} {{attribute-roll-five=[[1d6]]}} {{attribute_die_six=[[ @{attribute_die_six} ]]}} {{attribute-roll-six=[[1d6]]}} {{attribute_die_seven=[[ @{attribute_die_seven} ]]}} {{attribute-roll-seven=[[1d6]]}} {{attribute_die_eight=[[ @{attribute_die_eight} ]]}} {{attribute-roll-eight=[[1d6]]}} {{attribute_die_nine=[[ @{attribute_die_nine} ]]}} {{attribute-roll-nine=[[1d6]]}} {{attribute_die_ten=[[ @{attribute_die_ten} ]]}} {{attribute-roll-ten=[[1d6]]}} {{attribute_die_eleven=[[ @{attribute_die_eleven} ]]}} {{attribute-roll-eleven=[[1d6]]}} {{attribute_die_twelve=[[ @{attribute_die_twelve} ]]}} {{attribute-roll-twelve=[[1d6]]}} {{skill_die_one=[[ @{skill_die_one} ]]}} {{skill-roll-one=[[1d6]]}} {{skill_die_two=[[ @{skill_die_two} ]]}} {{skill-roll-two=[[1d6]]}} {{skill_die_three=[[ @{skill_die_three} ]]}} {{skill-roll-three=[[1d6]]}} {{skill_die_four=[[ @{skill_die_four} ]]}} {{skill-roll-four=[[1d6]]}} {{skill_die_five=[[ @{skill_die_five} ]]}} {{skill-roll-five=[[1d6]]}} {{skill_die_six=[[ @{skill_die_six} ]]}} {{skill-roll-six=[[1d6]]}} {{skill_die_seven=[[ @{skill_die_seven} ]]}} {{skill-roll-seven=[[1d6]]}} {{skill_die_eight=[[ @{skill_die_eight} ]]}} {{skill-roll-eight=[[1d6]]}} {{skill_die_nine=[[ @{skill_die_nine} ]]}} {{skill-roll-nine=[[1d6]]}} {{skill_die_ten=[[ @{skill_die_ten} ]]}} {{skill-roll-ten=[[1d6]]}} {{negative_die_one=[[ @{negative_die_one} ]]}} {{negative-roll-one=[[1d6]]}} {{negative_die_two=[[ @{negative_die_two} ]]}} {{negative-roll-two=[[1d6]]}} {{negative_die_three=[[ @{negative_die_three} ]]}} {{negative-roll-three=[[1d6]]}} {{gear_die_one=[[ @{gear_die_one} ]]}} {{gear-roll-one=[[1d6]]}} {{gear_die_two=[[ @{gear_die_two} ]]}} {{gear-roll-two=[[1d6]]}} {{gear_die_three=[[ @{gear_die_three} ]]}} {{gear-roll-three=[[1d6]]}} {{gear_die_four=[[ @{gear_die_four} ]]}} {{gear-roll-four=[[1d6]]}} {{gear_die_five=[[ @{gear_die_five} ]]}} {{gear-roll-five=[[1d6]]}} {{gear_die_six=[[ @{gear_die_six} ]]}} {{gear-roll-six=[[1d6]]}} {{gear_die_seven=[[ @{gear_die_seven} ]]}} {{gear-roll-seven=[[1d6]]}} {{gear_die_eight=[[ @{gear_die_eight} ]]}} {{gear-roll-eight=[[1d6]]}} {{gear_die_nine=[[ @{gear_die_nine} ]]}} {{gear-roll-nine=[[1d6]]}} {{gear_die_ten=[[ @{gear_die_ten} ]]}} {{gear-roll-ten=[[1d6]]}} {{gear_die_eleven=[[ @{gear_die_eleven} ]]}} {{gear-roll-eleven=[[1d6]]}} {{gear_die_twelve=[[ @{gear_die_twelve} ]]}} {{gear-roll-twelve=[[1d6]]}} {{artifact_die_eight=[[ @{artifact_die_eight} ]]}} {{artifact-roll-eight=[[1d8]]}} {{artifact_die_ocho=[[ @{artifact_die_ocho} ]]}} {{artifact-roll-ocho=[[1d8]]}} {{artifact_die_ten=[[ @{artifact_die_ten} ]]}} {{artifact-roll-ten=[[1d10]]}} {{artifact_die_twelve=[[ @{artifact_die_twelve} ]]}} {{artifact-roll-twelve=[[1d12]]}} {{dice-pool-flag=[[@{attribute_die_one} + @{skill_die_one} + @{gear_die_one}]]}} @{include_with_roll}" data-i18n-title="roll-dice" title="Roll the Dice!"></button>
                 </span>
               </div>
               <div class="grid-item api-roll">
@@ -2187,14 +2193,15 @@
                   </button>
                 </span>
               </div>
+              <!--
               <div class="template-roll dice-rolls-push">
-                <button class="dice-pool font-color-initial" type="roll" name="roll_a_push" value="@{a_push}" data-i18n-title="push-dice" title="Push the Dice!">&nbsp;
+                <button class="dice-pool font-color-initial" type="roll" name="roll_a_push" value="@{whisper_option} &{template:forbiddenlands} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=^{pushes-the-roll}}} {{subtitle=@{current_preset}}} {{subtitle2=@{subtitle2}}} {{free-text}} {{footer}} {{attribute_die_one=[[ @{attribute_die_one} ]]}} {{attribute-roll-one=[[1d6]]}} {{attribute_die_two=[[ @{attribute_die_two} ]]}} {{attribute-roll-two=[[1d6]]}} {{attribute_die_three=[[ @{attribute_die_three} ]]}} {{attribute-roll-three=[[1d6]]}} {{attribute_die_four=[[ @{attribute_die_four} ]]}} {{attribute-roll-four=[[1d6]]}} {{attribute_die_five=[[ @{attribute_die_five} ]]}} {{attribute-roll-five=[[1d6]]}} {{attribute_die_six=[[ @{attribute_die_six} ]]}} {{attribute-roll-six=[[1d6]]}} {{attribute_die_seven=[[ @{attribute_die_seven} ]]}} {{attribute-roll-seven=[[1d6]]}} {{attribute_die_eight=[[ @{attribute_die_eight} ]]}} {{attribute-roll-eight=[[1d6]]}} {{attribute_die_nine=[[ @{attribute_die_nine} ]]}} {{attribute-roll-nine=[[1d6]]}} {{attribute_die_ten=[[ @{attribute_die_ten} ]]}} {{attribute-roll-ten=[[1d6]]}} {{attribute_die_eleven=[[ @{attribute_die_eleven} ]]}} {{attribute-roll-eleven=[[1d6]]}} {{attribute_die_twelve=[[ @{attribute_die_twelve} ]]}} {{attribute-roll-twelve=[[1d6]]}} {{skill_die_one=[[ @{skill_die_one} ]]}} {{skill-roll-one=[[1d6]]}} {{skill_die_two=[[ @{skill_die_two} ]]}} {{skill-roll-two=[[1d6]]}} {{skill_die_three=[[ @{skill_die_three} ]]}} {{skill-roll-three=[[1d6]]}} {{skill_die_four=[[ @{skill_die_four} ]]}} {{skill-roll-four=[[1d6]]}} {{skill_die_five=[[ @{skill_die_five} ]]}} {{skill-roll-five=[[1d6]]}} {{skill_die_six=[[ @{skill_die_six} ]]}} {{skill-roll-six=[[1d6]]}} {{skill_die_seven=[[ @{skill_die_seven} ]]}} {{skill-roll-seven=[[1d6]]}} {{skill_die_eight=[[ @{skill_die_eight} ]]}} {{skill-roll-eight=[[1d6]]}} {{skill_die_nine=[[ @{skill_die_nine} ]]}} {{skill-roll-nine=[[1d6]]}} {{skill_die_ten=[[ @{skill_die_ten} ]]}} {{skill-roll-ten=[[1d6]]}} {{negative_die_one=[[ @{negative_die_one} ]]}} {{negative-roll-one=[[1d6]]}} {{negative_die_two=[[ @{negative_die_two} ]]}} {{negative-roll-two=[[1d6]]}} {{negative_die_three=[[ @{negative_die_three} ]]}} {{negative-roll-three=[[1d6]]}} {{gear_die_one=[[ @{gear_die_one} ]]}} {{gear-roll-one=[[1d6]]}} {{gear_die_two=[[ @{gear_die_two} ]]}} {{gear-roll-two=[[1d6]]}} {{gear_die_three=[[ @{gear_die_three} ]]}} {{gear-roll-three=[[1d6]]}} {{gear_die_four=[[ @{gear_die_four} ]]}} {{gear-roll-four=[[1d6]]}} {{gear_die_five=[[ @{gear_die_five} ]]}} {{gear-roll-five=[[1d6]]}} {{gear_die_six=[[ @{gear_die_six} ]]}} {{gear-roll-six=[[1d6]]}} {{gear_die_seven=[[ @{gear_die_seven} ]]}} {{gear-roll-seven=[[1d6]]}} {{gear_die_eight=[[ @{gear_die_eight} ]]}} {{gear-roll-eight=[[1d6]]}} {{gear_die_nine=[[ @{gear_die_nine} ]]}} {{gear-roll-nine=[[1d6]]}} {{gear_die_ten=[[ @{gear_die_ten} ]]}} {{gear-roll-ten=[[1d6]]}} {{gear_die_eleven=[[ @{gear_die_eleven} ]]}} {{gear-roll-eleven=[[1d6]]}} {{gear_die_twelve=[[ @{gear_die_twelve} ]]}} {{gear-roll-twelve=[[1d6]]}} {{artifact_die_eight=[[ @{artifact_die_eight} ]]}} {{artifact-roll-eight=[[1d8]]}} {{artifact_die_ocho=[[ @{artifact_die_ocho} ]]}} {{artifact-roll-ocho=[[1d8]]}} {{artifact_die_ten=[[ @{artifact_die_ten} ]]}} {{artifact-roll-ten=[[1d10]]}} {{artifact_die_twelve=[[ @{artifact_die_twelve} ]]}} {{artifact-roll-twelve=[[1d12]]}} {{push-query=?{@{translation_push_query}} }} {{dice-pool-flag=[[@{attribute_die_one} + @{skill_die_one} + @{gear_die_one}]]}} @{include_with_roll}" data-i18n-title="push-dice" title="Push the Dice!">&nbsp;
                   <span data-i18n="push">Push</span>&nbsp;
                 </button>
-                <input type="hidden" name="attr_a_push" value="" />
                 <button class="hidden dice-pool" type="action" name="act_a_push-button"></button>
                 <input type="hidden" name="attr_translation_push_query" value="push-query" />
               </div>
+              -->
               <div class="dice-rolls-d66">
                 <button class="dice-pool font-color-initial" type="roll" name="roll_d66" value="@{whisper_option} &{template:forbiddenlands} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=^{d66-roll}}} {{subtitle}} {{free-text}} {{d66-die-one=[[ 1 ]]}} {{d66-roll-one=[[ 1d6 ]]}} {{d66-die-two=[[ 1 ]]}} {{d66-roll-two=[[ 1d6 ]]}} {{footer}}" data-i18n-title="roll-dice-66" title="Roll d66!">&nbsp;
                   <span class="small-caps" data-i18n="die-66-u">D66</span>&nbsp;
@@ -3586,72 +3593,73 @@
         </div>
       {{/imageInsertTorches}}
     </div>
+
       <!--- DICE POOL -->
       <!--- BEGIN ROW ONE --->
     <div class="template-grid">
       {{#rollTotal() attribute_die_one 1}}
       <div class="template-grid-item template-span-one template-white-dice">
-        {{#rollWasFumble() attribute_roll_one}}
+        {{#rollWasFumble() attribute-roll-one}}
         <img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/bane_skull_black.png" alt="Bane" class="template-bane" />
-        {{/rollWasFumble() attribute_roll_one}} {{#rollBetween() attribute_roll_one 2 5}} {{attribute_roll_one}}
-        {{/rollBetween() attribute_roll_one 2 5}} {{#rollWasCrit() attribute_roll_one}}
+        {{/rollWasFumble() attribute-roll-one}} {{#rollBetween() attribute-roll-one 2 5}} {{attribute-roll-one}}
+        {{/rollBetween() attribute-roll-one 2 5}} {{#rollWasCrit() attribute-roll-one}}
         <img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/success_swords_black.png" alt="Success" class="template-success" />
-        {{/rollWasCrit() attribute_roll_one}}
+        {{/rollWasCrit() attribute-roll-one}}
       </div>
       {{/rollTotal() attribute_die_one 1}} {{#rollTotal() attribute_die_two 1}}
       <div class="template-grid-item template-span-two template-white-dice">
-        {{#rollWasFumble() attribute_roll_two}}
+        {{#rollWasFumble() attribute-roll-two}}
         <img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/bane_skull_black.png" alt="Bane" class="template-bane" />
-        {{/rollWasFumble() attribute_roll_two}} {{#rollBetween() attribute_roll_two 2 5}} {{attribute_roll_two}}
-        {{/rollBetween() attribute_roll_two 2 5}} {{#rollWasCrit() attribute_roll_two}}
+        {{/rollWasFumble() attribute-roll-two}} {{#rollBetween() attribute-roll-two 2 5}} {{attribute-roll-two}}
+        {{/rollBetween() attribute-roll-two 2 5}} {{#rollWasCrit() attribute-roll-two}}
         <img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/success_swords_black.png" alt="Success" class="template-success" />
-        {{/rollWasCrit() attribute_roll_two}}
+        {{/rollWasCrit() attribute-roll-two}}
       </div>
       {{/rollTotal() attribute_die_two 1}} {{#rollTotal() skill_die_one 1}}
       <div class="template-grid-item template-span-three template-maroon-dice">
-        {{#rollBetween() skill_roll_one 1 5}} {{skill_roll_one}} {{/rollBetween() skill_roll_one 1 5}}
-        {{#rollWasCrit() skill_roll_one}}
+        {{#rollBetween() skill-roll-one 1 5}} {{skill-roll-one}} {{/rollBetween() skill-roll-one 1 5}}
+        {{#rollWasCrit() skill-roll-one}}
         <span data-i18n-title="success" title="Success"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/success_swords_white.png" alt="Success" class="template-success" /></span>
-        {{/rollWasCrit() skill_roll_one}}
+        {{/rollWasCrit() skill-roll-one}}
       </div>
       {{/rollTotal() skill_die_one 1}} {{#rollTotal() skill_die_two 1}}
       <div class="template-grid-item template-span-four template-maroon-dice">
-        {{#rollBetween() skill_roll_two 1 5}} {{skill_roll_two}} {{/rollBetween() skill_roll_two 1 5}}
-        {{#rollWasCrit() skill_roll_two}}
+        {{#rollBetween() skill-roll-two 1 5}} {{skill-roll-two}} {{/rollBetween() skill-roll-two 1 5}}
+        {{#rollWasCrit() skill-roll-two}}
         <span data-i18n-title="success" title="Success"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/success_swords_white.png" alt="Success" class="template-success" /></span>
-        {{/rollWasCrit() skill_roll_two}}
+        {{/rollWasCrit() skill-roll-two}}
       </div>
       {{/rollTotal() skill_die_two 1}} {{#rollTotal() negative_die_one 1}}
       <div class="template-grid-item template-span-three template-purple-dice">
-        {{#rollBetween() negative_roll_one 1 5}} {{negative_roll_one}} {{/rollBetween() negative_roll_one 1 5}}
-        {{#rollWasCrit() negative_roll_one}}
+        {{#rollBetween() negative-roll-one 1 5}} {{negative-roll-one}} {{/rollBetween() negative-roll-one 1 5}}
+        {{#rollWasCrit() negative-roll-one}}
         <span data-i18n-title="success" title="Success"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/success_swords_white.png" alt="Success" class="template-success" /></span>
-        {{/rollWasCrit() negative_roll_one}}
+        {{/rollWasCrit() negative-roll-one}}
       </div>
       {{/rollTotal() negative_die_one 1}} {{#rollTotal() negative_die_two 1}}
       <div class="template-grid-item template-span-four template-purple-dice">
-        {{#rollBetween() negative_roll_two 1 5}} {{negative_roll_two}} {{/rollBetween() negative_roll_two 1 5}}
-        {{#rollWasCrit() negative_roll_two}}
+        {{#rollBetween() negative-roll-two 1 5}} {{negative-roll-two}} {{/rollBetween() negative-roll-two 1 5}}
+        {{#rollWasCrit() negative-roll-two}}
         <span data-i18n-title="success" title="Success"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/success_swords_white.png" alt="Success" class="template-success" /></span>
-        {{/rollWasCrit() negative_roll_two}}
+        {{/rollWasCrit() negative-roll-two}}
       </div>
       {{/rollTotal() negative_die_two 1}} {{#rollTotal() gear_die_one 1}}
       <div class="template-grid-item template-span-five template-black-dice">
-        {{#rollWasFumble() gear_roll_one}}
+        {{#rollWasFumble() gear-roll-one}}
         <span data-i18n-title="bane" title="Bane"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/bane_skull_white.png" alt="Bane" class="template-bane" /></span>
-        {{/rollWasFumble() gear_roll_one}} {{#rollBetween() gear_roll_one 2 5}} {{gear_roll_one}}
-        {{/rollBetween() gear_roll_one 2 5}} {{#rollWasCrit() gear_roll_one}}
+        {{/rollWasFumble() gear-roll-one}} {{#rollBetween() gear-roll-one 2 5}} {{gear-roll-one}}
+        {{/rollBetween() gear-roll-one 2 5}} {{#rollWasCrit() gear-roll-one}}
         <span data-i18n-title="success" title="Success"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/success_swords_white.png" alt="Success" class="template-success" /></span>
-        {{/rollWasCrit() gear_roll_one}}
+        {{/rollWasCrit() gear-roll-one}}
       </div>
       {{/rollTotal() gear_die_one 1}} {{#rollTotal() gear_die_two 1}}
       <div class="template-grid-item template-span-shix template-black-dice">
-        {{#rollWasFumble() gear_roll_two}}
+        {{#rollWasFumble() gear-roll-two}}
         <span data-i18n-title="bane" title="Bane"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/bane_skull_white.png" alt="Bane" class="template-bane" /></span>
-        {{/rollWasFumble() gear_roll_two}} {{#rollBetween() gear_roll_two 2 5}} {{gear_roll_two}}
-        {{/rollBetween() gear_roll_two 2 5}} {{#rollWasCrit() gear_roll_two}}
+        {{/rollWasFumble() gear-roll-two}} {{#rollBetween() gear-roll-two 2 5}} {{gear-roll-two}}
+        {{/rollBetween() gear-roll-two 2 5}} {{#rollWasCrit() gear-roll-two}}
         <span data-i18n-title="success" title="Success"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/success_swords_white.png" alt="Success" class="template-success" /></span>
-        {{/rollWasCrit() gear_roll_two}}
+        {{/rollWasCrit() gear-roll-two}}
       </div>
       {{/rollTotal() gear_die_two 1}}
     </div>
@@ -3659,60 +3667,60 @@
     <div class="template-grid">
       {{#rollTotal() attribute_die_three 1}}
       <div class="template-grid-item template-span-one template-white-dice">
-        {{#rollWasFumble() attribute_roll_three}}
+        {{#rollWasFumble() attribute-roll-three}}
         <img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/bane_skull_black.png" alt="Bane" class="template-bane" />
-        {{/rollWasFumble() attribute_roll_three}} {{#rollBetween() attribute_roll_three 2 5}} {{attribute_roll_three}}
-        {{/rollBetween() attribute_roll_three 2 5}} {{#rollWasCrit() attribute_roll_three}}
+        {{/rollWasFumble() attribute-roll-three}} {{#rollBetween() attribute-roll-three 2 5}} {{attribute-roll-three}}
+        {{/rollBetween() attribute-roll-three 2 5}} {{#rollWasCrit() attribute-roll-three}}
         <img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/success_swords_black.png" alt="Success" class="template-success" />
-        {{/rollWasCrit() attribute_roll_three}}
+        {{/rollWasCrit() attribute-roll-three}}
       </div>
       {{/rollTotal() attribute_die_three 1}} {{#rollTotal() attribute_die_four 1}}
       <div class="template-grid-item template-span-two template-white-dice">
-        {{#rollWasFumble() attribute_roll_four}}
+        {{#rollWasFumble() attribute-roll-four}}
         <img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/bane_skull_black.png" alt="Bane" class="template-bane" />
-        {{/rollWasFumble() attribute_roll_four}} {{#rollBetween() attribute_roll_four 2 5}} {{attribute_roll_four}}
-        {{/rollBetween() attribute_roll_four 2 5}} {{#rollWasCrit() attribute_roll_four}}
+        {{/rollWasFumble() attribute-roll-four}} {{#rollBetween() attribute-roll-four 2 5}} {{attribute-roll-four}}
+        {{/rollBetween() attribute-roll-four 2 5}} {{#rollWasCrit() attribute-roll-four}}
         <img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/success_swords_black.png" alt="Success" class="template-success" />
-        {{/rollWasCrit() attribute_roll_four}}
+        {{/rollWasCrit() attribute-roll-four}}
       </div>
       {{/rollTotal() attribute_die_four 1}} {{#rollTotal() skill_die_three 1}}
       <div class="template-grid-item template-span-three template-maroon-dice">
-        {{#rollBetween() skill_roll_three 1 5}} {{skill_roll_three}} {{/rollBetween() skill_roll_three 1 5}}
-        {{#rollWasCrit() skill_roll_three}}
+        {{#rollBetween() skill-roll-three 1 5}} {{skill-roll-three}} {{/rollBetween() skill-roll-three 1 5}}
+        {{#rollWasCrit() skill-roll-three}}
         <span data-i18n-title="success" title="Success"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/success_swords_white.png" alt="Success" class="template-success" /></span>
-        {{/rollWasCrit() skill_roll_three}}
+        {{/rollWasCrit() skill-roll-three}}
       </div>
       {{/rollTotal() skill_die_three 1}} {{#rollTotal() skill_die_four 1}}
       <div class="template-grid-item template-span-four template-maroon-dice">
-        {{#rollBetween() skill_roll_four 1 5}} {{skill_roll_four}} {{/rollBetween() skill_roll_four 1 5}}
-        {{#rollWasCrit() skill_roll_four}}
+        {{#rollBetween() skill-roll-four 1 5}} {{skill-roll-four}} {{/rollBetween() skill-roll-four 1 5}}
+        {{#rollWasCrit() skill-roll-four}}
         <span data-i18n-title="success" title="Success"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/success_swords_white.png" alt="Success" class="template-success" /></span>
-        {{/rollWasCrit() skill_roll_four}}
+        {{/rollWasCrit() skill-roll-four}}
       </div>
       {{/rollTotal() skill_die_four 1}} {{#rollTotal() negative_die_three 1}}
       <div class="template-grid-item template-span-three template-purple-dice">
-        {{#rollBetween() negative_roll_three 1 5}} {{negative_roll_three}} {{/rollBetween() negative_roll_three 1 5}}
-        {{#rollWasCrit() negative_roll_three}}
+        {{#rollBetween() negative-roll-three 1 5}} {{negative-roll-three}} {{/rollBetween() negative-roll-three 1 5}}
+        {{#rollWasCrit() negative-roll-three}}
         <span data-i18n-title="success" title="Success"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/success_swords_white.png" alt="Success" class="template-success" /></span>
-        {{/rollWasCrit() negative_roll_three}}
+        {{/rollWasCrit() negative-roll-three}}
       </div>
       {{/rollTotal() negative_die_three 1}} {{#rollTotal() gear_die_three 1}}
       <div class="template-grid-item template-span-five template-black-dice">
-        {{#rollWasFumble() gear_roll_three}}
+        {{#rollWasFumble() gear-roll-three}}
         <span data-i18n-title="bane" title="Bane"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/bane_skull_white.png" alt="Bane" class="template-bane" /></span>
-        {{/rollWasFumble() gear_roll_three}} {{#rollBetween() gear_roll_three 2 5}} {{gear_roll_three}}
-        {{/rollBetween() gear_roll_three 2 5}} {{#rollWasCrit() gear_roll_three}}
+        {{/rollWasFumble() gear-roll-three}} {{#rollBetween() gear-roll-three 2 5}} {{gear-roll-three}}
+        {{/rollBetween() gear-roll-three 2 5}} {{#rollWasCrit() gear-roll-three}}
         <span data-i18n-title="success" title="Success"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/success_swords_white.png" alt="Success" class="template-success" /></span>
-        {{/rollWasCrit() gear_roll_three}}
+        {{/rollWasCrit() gear-roll-three}}
       </div>
       {{/rollTotal() gear_die_three 1}} {{#rollTotal() gear_die_four 1}}
       <div class="template-grid-item template-span-shix template-black-dice">
-        {{#rollWasFumble() gear_roll_four}}
+        {{#rollWasFumble() gear-roll-four}}
         <span data-i18n-title="bane" title="Bane"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/bane_skull_white.png" alt="Bane" class="template-bane" /></span>
-        {{/rollWasFumble() gear_roll_four}} {{#rollBetween() gear_roll_four 2 5}} {{gear_roll_four}}
-        {{/rollBetween() gear_roll_four 2 5}} {{#rollWasCrit() gear_roll_four}}
+        {{/rollWasFumble() gear-roll-four}} {{#rollBetween() gear-roll-four 2 5}} {{gear-roll-four}}
+        {{/rollBetween() gear-roll-four 2 5}} {{#rollWasCrit() gear-roll-four}}
         <span data-i18n-title="success" title="Success"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/success_swords_white.png" alt="Success" class="template-success" /></span>
-        {{/rollWasCrit() gear_roll_four}}
+        {{/rollWasCrit() gear-roll-four}}
       </div>
       {{/rollTotal() gear_die_four 1}}
     </div>
@@ -3720,53 +3728,53 @@
     <div class="template-grid">
       {{#rollTotal() attribute_die_five 1}}
       <div class="template-grid-item template-span-one template-white-dice">
-        {{#rollWasFumble() attribute_roll_five}}
+        {{#rollWasFumble() attribute-roll-five}}
         <img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/bane_skull_black.png" alt="Bane" class="template-bane" />
-        {{/rollWasFumble() attribute_roll_five}} {{#rollBetween() attribute_roll_five 2 5}} {{attribute_roll_five}}
-        {{/rollBetween() attribute_roll_five 2 5}} {{#rollWasCrit() attribute_roll_five}}
+        {{/rollWasFumble() attribute-roll-five}} {{#rollBetween() attribute-roll-five 2 5}} {{attribute-roll-five}}
+        {{/rollBetween() attribute-roll-five 2 5}} {{#rollWasCrit() attribute-roll-five}}
         <img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/success_swords_black.png" alt="Success" class="template-success" />
-        {{/rollWasCrit() attribute_roll_five}}
+        {{/rollWasCrit() attribute-roll-five}}
       </div>
       {{/rollTotal() attribute_die_five 1}} {{#rollTotal() attribute_die_six 1}}
       <div class="template-grid-item template-span-two template-white-dice">
-        {{#rollWasFumble() attribute_roll_six}}
+        {{#rollWasFumble() attribute-roll-six}}
         <img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/bane_skull_black.png" alt="Bane" class="template-bane" />
-        {{/rollWasFumble() attribute_roll_six}} {{#rollBetween() attribute_roll_six 2 5}} {{attribute_roll_six}}
-        {{/rollBetween() attribute_roll_six 2 5}} {{#rollWasCrit() attribute_roll_six}}
+        {{/rollWasFumble() attribute-roll-six}} {{#rollBetween() attribute-roll-six 2 5}} {{attribute-roll-six}}
+        {{/rollBetween() attribute-roll-six 2 5}} {{#rollWasCrit() attribute-roll-six}}
         <img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/success_swords_black.png" alt="Success" class="template-success" />
-        {{/rollWasCrit() attribute_roll_six}}
+        {{/rollWasCrit() attribute-roll-six}}
       </div>
       {{/rollTotal() attribute_die_six 1}} {{#rollTotal() skill_die_five 1}}
       <div class="template-grid-item template-span-three template-maroon-dice">
-        {{#rollBetween() skill_roll_five 1 5}} {{skill_roll_five}} {{/rollBetween() skill_roll_five 1 5}}
-        {{#rollWasCrit() skill_roll_five}}
+        {{#rollBetween() skill-roll-five 1 5}} {{skill-roll-five}} {{/rollBetween() skill-roll-five 1 5}}
+        {{#rollWasCrit() skill-roll-five}}
         <span data-i18n-title="success" title="Success"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/success_swords_white.png" alt="Success" class="template-success" /></span>
-        {{/rollWasCrit() skill_roll_five}}
+        {{/rollWasCrit() skill-roll-five}}
       </div>
       {{/rollTotal() skill_die_five 1}} {{#rollTotal() skill_die_six 1}}
       <div class="template-grid-item template-span-four template-maroon-dice">
-        {{#rollBetween() skill_roll_six 1 5}} {{skill_roll_six}} {{/rollBetween() skill_roll_six 1 5}}
-        {{#rollWasCrit() skill_roll_six}}
+        {{#rollBetween() skill-roll-six 1 5}} {{skill-roll-six}} {{/rollBetween() skill-roll-six 1 5}}
+        {{#rollWasCrit() skill-roll-six}}
         <span data-i18n-title="success" title="Success"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/success_swords_white.png" alt="Success" class="template-success" /></span>
-        {{/rollWasCrit() skill_roll_six}}
+        {{/rollWasCrit() skill-roll-six}}
       </div>
       {{/rollTotal() skill_die_six 1}} {{#rollTotal() gear_die_five 1}}
       <div class="template-grid-item template-span-five template-black-dice">
-        {{#rollWasFumble() gear_roll_five}}
+        {{#rollWasFumble() gear-roll-five}}
         <span data-i18n-title="bane" title="Bane"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/bane_skull_white.png" alt="Bane" class="template-bane" /></span>
-        {{/rollWasFumble() gear_roll_five}} {{#rollBetween() gear_roll_five 2 5}} {{gear_roll_five}}
-        {{/rollBetween() gear_roll_five 2 5}} {{#rollWasCrit() gear_roll_five}}
+        {{/rollWasFumble() gear-roll-five}} {{#rollBetween() gear-roll-five 2 5}} {{gear-roll-five}}
+        {{/rollBetween() gear-roll-five 2 5}} {{#rollWasCrit() gear-roll-five}}
         <span data-i18n-title="success" title="Success"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/success_swords_white.png" alt="Success" class="template-success" /></span>
-        {{/rollWasCrit() gear_roll_five}}
+        {{/rollWasCrit() gear-roll-five}}
       </div>
       {{/rollTotal() gear_die_five 1}} {{#rollTotal() gear_die_six 1}}
       <div class="template-grid-item template-span-shix template-black-dice">
-        {{#rollWasFumble() gear_roll_six}}
+        {{#rollWasFumble() gear-roll-six}}
         <span data-i18n-title="bane" title="Bane"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/bane_skull_white.png" alt="Bane" class="template-bane" /></span>
-        {{/rollWasFumble() gear_roll_six}} {{#rollBetween() gear_roll_six 2 5}} {{gear_roll_six}}
-        {{/rollBetween() gear_roll_six 2 5}} {{#rollWasCrit() gear_roll_six}}
+        {{/rollWasFumble() gear-roll-six}} {{#rollBetween() gear-roll-six 2 5}} {{gear-roll-six}}
+        {{/rollBetween() gear-roll-six 2 5}} {{#rollWasCrit() gear-roll-six}}
         <span data-i18n-title="success" title="Success"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/success_swords_white.png" alt="Success" class="template-success" /></span>
-        {{/rollWasCrit() gear_roll_six}}
+        {{/rollWasCrit() gear-roll-six}}
       </div>
       {{/rollTotal() gear_die_six 1}}
     </div>
@@ -3774,53 +3782,53 @@
     <div class="template-grid">
       {{#rollTotal() attribute_die_seven 1}}
       <div class="template-grid-item template-span-one template-white-dice">
-        {{#rollWasFumble() attribute_roll_seven}}
+        {{#rollWasFumble() attribute-roll-seven}}
         <img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/bane_skull_black.png" alt="Bane" class="template-bane" />
-        {{/rollWasFumble() attribute_roll_seven}} {{#rollBetween() attribute_roll_seven 2 5}} {{attribute_roll_seven}}
-        {{/rollBetween() attribute_roll_seven 2 5}} {{#rollWasCrit() attribute_roll_seven}}
+        {{/rollWasFumble() attribute-roll-seven}} {{#rollBetween() attribute-roll-seven 2 5}} {{attribute-roll-seven}}
+        {{/rollBetween() attribute-roll-seven 2 5}} {{#rollWasCrit() attribute-roll-seven}}
         <img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/success_swords_black.png" alt="Success" class="template-success" />
-        {{/rollWasCrit() attribute_roll_seven}}
+        {{/rollWasCrit() attribute-roll-seven}}
       </div>
       {{/rollTotal() attribute_die_seven 1}} {{#rollTotal() attribute_die_eight 1}}
       <div class="template-grid-item template-span-two template-white-dice">
-        {{#rollWasFumble() attribute_roll_eight}}
+        {{#rollWasFumble() attribute-roll-eight}}
         <img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/bane_skull_black.png" alt="Bane" class="template-bane" />
-        {{/rollWasFumble() attribute_roll_eight}} {{#rollBetween() attribute_roll_eight 2 5}} {{attribute_roll_eight}}
-        {{/rollBetween() attribute_roll_eight 2 5}} {{#rollWasCrit() attribute_roll_eight}}
+        {{/rollWasFumble() attribute-roll-eight}} {{#rollBetween() attribute-roll-eight 2 5}} {{attribute-roll-eight}}
+        {{/rollBetween() attribute-roll-eight 2 5}} {{#rollWasCrit() attribute-roll-eight}}
         <img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/success_swords_black.png" alt="Success" class="template-success" />
-        {{/rollWasCrit() attribute_roll_eight}}
+        {{/rollWasCrit() attribute-roll-eight}}
       </div>
       {{/rollTotal() attribute_die_eight 1}} {{#rollTotal() skill_die_seven 1}}
       <div class="template-grid-item template-span-three template-maroon-dice">
-        {{#rollBetween() skill_roll_seven 1 5}} {{skill_roll_seven}} {{/rollBetween() skill_roll_seven 1 5}}
-        {{#rollWasCrit() skill_roll_seven}}
+        {{#rollBetween() skill-roll-seven 1 5}} {{skill-roll-seven}} {{/rollBetween() skill-roll-seven 1 5}}
+        {{#rollWasCrit() skill-roll-seven}}
         <span data-i18n-title="success" title="Success"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/success_swords_white.png" alt="Success" class="template-success" /></span>
-        {{/rollWasCrit() skill_roll_seven}}
+        {{/rollWasCrit() skill-roll-seven}}
       </div>
       {{/rollTotal() skill_die_seven 1}} {{#rollTotal() skill_die_eight 1}}
       <div class="template-grid-item template-span-four template-maroon-dice">
-        {{#rollBetween() skill_roll_eight 1 5}} {{skill_roll_eight}} {{/rollBetween() skill_roll_eight 1 5}}
-        {{#rollWasCrit() skill_roll_eight}}
+        {{#rollBetween() skill-roll-eight 1 5}} {{skill-roll-eight}} {{/rollBetween() skill-roll-eight 1 5}}
+        {{#rollWasCrit() skill-roll-eight}}
         <span data-i18n-title="success" title="Success"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/success_swords_white.png" alt="Success" class="template-success" /></span>
-        {{/rollWasCrit() skill_roll_eight}}
+        {{/rollWasCrit() skill-roll-eight}}
       </div>
       {{/rollTotal() skill_die_eight 1}} {{#rollTotal() gear_die_seven 1}}
       <div class="template-grid-item template-span-five template-black-dice">
-        {{#rollWasFumble() gear_roll_seven}}
+        {{#rollWasFumble() gear-roll-seven}}
         <span data-i18n-title="bane" title="Bane"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/bane_skull_white.png" alt="Bane" class="template-bane" /></span>
-        {{/rollWasFumble() gear_roll_seven}} {{#rollBetween() gear_roll_seven 2 5}} {{gear_roll_seven}}
-        {{/rollBetween() gear_roll_seven 2 5}} {{#rollWasCrit() gear_roll_seven}}
+        {{/rollWasFumble() gear-roll-seven}} {{#rollBetween() gear-roll-seven 2 5}} {{gear-roll-seven}}
+        {{/rollBetween() gear-roll-seven 2 5}} {{#rollWasCrit() gear-roll-seven}}
         <span data-i18n-title="success" title="Success"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/success_swords_white.png" alt="Success" class="template-success" /></span>
-        {{/rollWasCrit() gear_roll_seven}}
+        {{/rollWasCrit() gear-roll-seven}}
       </div>
       {{/rollTotal() gear_die_seven 1}} {{#rollTotal() gear_die_eight 1}}
       <div class="template-grid-item template-span-shix template-black-dice">
-        {{#rollWasFumble() gear_roll_eight}}
+        {{#rollWasFumble() gear-roll-eight}}
         <span data-i18n-title="bane" title="Bane"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/bane_skull_white.png" alt="Bane" class="template-bane" /></span>
-        {{/rollWasFumble() gear_roll_eight}} {{#rollBetween() gear_roll_eight 2 5}} {{gear_roll_eight}}
-        {{/rollBetween() gear_roll_eight 2 5}} {{#rollWasCrit() gear_roll_eight}}
+        {{/rollWasFumble() gear-roll-eight}} {{#rollBetween() gear-roll-eight 2 5}} {{gear-roll-eight}}
+        {{/rollBetween() gear-roll-eight 2 5}} {{#rollWasCrit() gear-roll-eight}}
         <span data-i18n-title="success" title="Success"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/success_swords_white.png" alt="Success" class="template-success" /></span>
-        {{/rollWasCrit() gear_roll_eight}}
+        {{/rollWasCrit() gear-roll-eight}}
       </div>
       {{/rollTotal() gear_die_eight 1}}
     </div>
@@ -3828,53 +3836,53 @@
     <div class="template-grid">
       {{#rollTotal() attribute_die_nine 1}}
       <div class="template-grid-item template-span-one template-white-dice">
-        {{#rollWasFumble() attribute_roll_nine}}
+        {{#rollWasFumble() attribute-roll-nine}}
         <img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/bane_skull_black.png" alt="Bane" class="template-bane" />
-        {{/rollWasFumble() attribute_roll_nine}} {{#rollBetween() attribute_roll_nine 2 5}} {{attribute_roll_nine}}
-        {{/rollBetween() attribute_roll_nine 2 5}} {{#rollWasCrit() attribute_roll_nine}}
+        {{/rollWasFumble() attribute-roll-nine}} {{#rollBetween() attribute-roll-nine 2 5}} {{attribute-roll-nine}}
+        {{/rollBetween() attribute-roll-nine 2 5}} {{#rollWasCrit() attribute-roll-nine}}
         <img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/success_swords_black.png" alt="Success" class="template-success" />
-        {{/rollWasCrit() attribute_roll_nine}}
+        {{/rollWasCrit() attribute-roll-nine}}
       </div>
       {{/rollTotal() attribute_die_nine 1}} {{#rollTotal() attribute_die_ten 1}}
       <div class="template-grid-item template-span-two template-white-dice">
-        {{#rollWasFumble() attribute_roll_ten}}
+        {{#rollWasFumble() attribute-roll-ten}}
         <img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/bane_skull_black.png" alt="Bane" class="template-bane" />
-        {{/rollWasFumble() attribute_roll_ten}} {{#rollBetween() attribute_roll_ten 2 5}} {{attribute_roll_ten}}
-        {{/rollBetween() attribute_roll_ten 2 5}} {{#rollWasCrit() attribute_roll_ten}}
+        {{/rollWasFumble() attribute-roll-ten}} {{#rollBetween() attribute-roll-ten 2 5}} {{attribute-roll-ten}}
+        {{/rollBetween() attribute-roll-ten 2 5}} {{#rollWasCrit() attribute-roll-ten}}
         <img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/success_swords_black.png" alt="Success" class="template-success" />
-        {{/rollWasCrit() attribute_roll_ten}}
+        {{/rollWasCrit() attribute-roll-ten}}
       </div>
       {{/rollTotal() attribute_die_ten 1}} {{#rollTotal() skill_die_nine 1}}
       <div class="template-grid-item template-span-three template-maroon-dice">
-        {{#rollBetween() skill_roll_nine 1 5}} {{skill_roll_nine}} {{/rollBetween() skill_roll_nine 1 5}}
-        {{#rollWasCrit() skill_roll_nine}}
+        {{#rollBetween() skill-roll-nine 1 5}} {{skill-roll-nine}} {{/rollBetween() skill-roll-nine 1 5}}
+        {{#rollWasCrit() skill-roll-nine}}
         <span data-i18n-title="success" title="Success"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/success_swords_white.png" alt="Success" class="template-success" /></span>
-        {{/rollWasCrit() skill_roll_nine}}
+        {{/rollWasCrit() skill-roll-nine}}
       </div>
       {{/rollTotal() skill_die_nine 1}} {{#rollTotal() skill_die_ten 1}}
       <div class="template-grid-item template-span-four template-maroon-dice">
-        {{#rollBetween() skill_roll_ten 1 5}} {{skill_roll_ten}} {{/rollBetween() skill_roll_ten 1 5}}
-        {{#rollWasCrit() skill_roll_ten}}
+        {{#rollBetween() skill-roll-ten 1 5}} {{skill-roll-ten}} {{/rollBetween() skill-roll-ten 1 5}}
+        {{#rollWasCrit() skill-roll-ten}}
         <span data-i18n-title="success" title="Success"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/success_swords_white.png" alt="Success" class="template-success" /></span>
-        {{/rollWasCrit() skill_roll_ten}}
+        {{/rollWasCrit() skill-roll-ten}}
       </div>
       {{/rollTotal() skill_die_ten 1}} {{#rollTotal() gear_die_nine 1}}
       <div class="template-grid-item template-span-five template-black-dice">
-        {{#rollWasFumble() gear_roll_nine}}
+        {{#rollWasFumble() gear-roll-nine}}
         <span data-i18n-title="bane" title="Bane"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/bane_skull_white.png" alt="Bane" class="template-bane" /></span>
-        {{/rollWasFumble() gear_roll_nine}} {{#rollBetween() gear_roll_nine 2 5}} {{gear_roll_nine}}
-        {{/rollBetween() gear_roll_nine 2 5}} {{#rollWasCrit() gear_roll_nine}}
+        {{/rollWasFumble() gear-roll-nine}} {{#rollBetween() gear-roll-nine 2 5}} {{gear-roll-nine}}
+        {{/rollBetween() gear-roll-nine 2 5}} {{#rollWasCrit() gear-roll-nine}}
         <span data-i18n-title="success" title="Success"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/success_swords_white.png" alt="Success" class="template-success" /></span>
-        {{/rollWasCrit() gear_roll_nine}}
+        {{/rollWasCrit() gear-roll-nine}}
       </div>
       {{/rollTotal() gear_die_nine 1}} {{#rollTotal() gear_die_ten 1}}
       <div class="template-grid-item template-span-shix template-black-dice">
-        {{#rollWasFumble() gear_roll_ten}}
+        {{#rollWasFumble() gear-roll-ten}}
         <span data-i18n-title="bane" title="Bane"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/bane_skull_white.png" alt="Bane" class="template-bane" /></span>
-        {{/rollWasFumble() gear_roll_ten}} {{#rollBetween() gear_roll_ten 2 5}} {{gear_roll_ten}}
-        {{/rollBetween() gear_roll_ten 2 5}} {{#rollWasCrit() gear_roll_ten}}
+        {{/rollWasFumble() gear-roll-ten}} {{#rollBetween() gear-roll-ten 2 5}} {{gear-roll-ten}}
+        {{/rollBetween() gear-roll-ten 2 5}} {{#rollWasCrit() gear-roll-ten}}
         <span data-i18n-title="success" title="Success"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/success_swords_white.png" alt="Success" class="template-success" /></span>
-        {{/rollWasCrit() gear_roll_ten}}
+        {{/rollWasCrit() gear-roll-ten}}
       </div>
       {{/rollTotal() gear_die_ten 1}}
     </div>
@@ -3882,39 +3890,39 @@
     <div class="template-grid">
       {{#rollTotal() attribute_die_eleven 1}}
       <div class="template-grid-item template-span-one template-white-dice">
-        {{#rollWasFumble() attribute_roll_eleven}}
+        {{#rollWasFumble() attribute-roll-eleven}}
         <img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/bane_skull_black.png" alt="Bane" class="template-bane" />
-        {{/rollWasFumble() attribute_roll_eleven}} {{#rollBetween() attribute_roll_eleven 2 5}}
-        {{attribute_roll_eleven}} {{/rollBetween() attribute_roll_eleven 2 5}} {{#rollWasCrit() attribute_roll_eleven}}
+        {{/rollWasFumble() attribute-roll-eleven}} {{#rollBetween() attribute-roll-eleven 2 5}}
+        {{attribute-roll-eleven}} {{/rollBetween() attribute-roll-eleven 2 5}} {{#rollWasCrit() attribute-roll-eleven}}
         <img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/success_swords_black.png" alt="Success" class="template-success" />
-        {{/rollWasCrit() attribute_roll_eleven}}
+        {{/rollWasCrit() attribute-roll-eleven}}
       </div>
       {{/rollTotal() attribute_die_eleven 1}} {{#rollTotal() attribute_die_twelve 1}}
       <div class="template-grid-item template-span-two template-white-dice">
-        {{#rollWasFumble() attribute_roll_twelve}}
+        {{#rollWasFumble() attribute-roll-twelve}}
         <img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/bane_skull_black.png" alt="Bane" class="template-bane" />
-        {{/rollWasFumble() attribute_roll_twelve}} {{#rollBetween() attribute_roll_twelve 2 5}}
-        {{attribute_roll_twelve}} {{/rollBetween() attribute_roll_twelve 2 5}} {{#rollWasCrit() attribute_roll_twelve}}
+        {{/rollWasFumble() attribute-roll-twelve}} {{#rollBetween() attribute-roll-twelve 2 5}}
+        {{attribute-roll-twelve}} {{/rollBetween() attribute-roll-twelve 2 5}} {{#rollWasCrit() attribute-roll-twelve}}
         <img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/success_swords_black.png" alt="Success" class="template-success" />
-        {{/rollWasCrit() attribute_roll_twelve}}
+        {{/rollWasCrit() attribute-roll-twelve}}
       </div>
       {{/rollTotal() attribute_die_twelve 1}} {{#rollTotal() gear_die_eleven 1}}
       <div class="template-grid-item template-span-five template-black-dice">
-        {{#rollWasFumble() gear_roll_eleven}}
+        {{#rollWasFumble() gear-roll-eleven}}
         <span data-i18n-title="bane" title="Bane"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/bane_skull_white.png" alt="Bane" class="template-bane" /></span>
-        {{/rollWasFumble() gear_roll_eleven}} {{#rollBetween() gear_roll_eleven 2 5}} {{gear_roll_eleven}}
-        {{/rollBetween() gear_roll_eleven 2 5}} {{#rollWasCrit() gear_roll_eleven}}
+        {{/rollWasFumble() gear-roll-eleven}} {{#rollBetween() gear-roll-eleven 2 5}} {{gear-roll-eleven}}
+        {{/rollBetween() gear-roll-eleven 2 5}} {{#rollWasCrit() gear-roll-eleven}}
         <span data-i18n-title="success" title="Success"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/success_swords_white.png" alt="Success" class="template-success" /></span>
-        {{/rollWasCrit() gear_roll_eleven}}
+        {{/rollWasCrit() gear-roll-eleven}}
       </div>
       {{/rollTotal() gear_die_eleven 1}} {{#rollTotal() gear_die_twelve 1}}
       <div class="template-grid-item template-span-shix template-black-dice">
-        {{#rollWasFumble() gear_roll_twelve}}
+        {{#rollWasFumble() gear-roll-twelve}}
         <span data-i18n-title="bane" title="Bane"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/bane_skull_white.png" alt="Bane" class="template-bane" /></span>
-        {{/rollWasFumble() gear_roll_twelve}} {{#rollBetween() gear_roll_twelve 2 5}} {{gear_roll_twelve}}
-        {{/rollBetween() gear_roll_twelve 2 5}} {{#rollWasCrit() gear_roll_twelve}}
+        {{/rollWasFumble() gear-roll-twelve}} {{#rollBetween() gear-roll-twelve 2 5}} {{gear-roll-twelve}}
+        {{/rollBetween() gear-roll-twelve 2 5}} {{#rollWasCrit() gear-roll-twelve}}
         <span data-i18n-title="success" title="Success"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Forbidden_Lands/images/success_swords_white.png" alt="Success" class="template-success" /></span>
-        {{/rollWasCrit() gear_roll_twelve}}
+        {{/rollWasCrit() gear-roll-twelve}}
       </div>
       {{/rollTotal() gear_die_twelve 1}}
     </div>
@@ -3937,69 +3945,69 @@
     <div class="template-grid">
       {{#rollTotal() artifact_die_eight 1}}
       <div class="template-grid-item template-span-five template-green-dice">
-        {{#rollBetween() artifact_roll_eight 1 5}} {{artifact_roll_eight}} {{/rollBetween() artifact_roll_eight 1 5}}
-        {{#rollBetween() artifact_roll_eight 6 7}}
+        {{#rollBetween() artifact-roll-eight 1 5}} {{artifact-roll-eight}} {{/rollBetween() artifact-roll-eight 1 5}}
+        {{#rollBetween() artifact-roll-eight 6 7}}
         <div class="template-artifact-1">
-          <span class="template-inline" data-i18n-title="success-1" title="1 Success">{{artifact_roll_eight}}</span>
+          <span class="template-inline" data-i18n-title="success-1" title="1 Success">{{artifact-roll-eight}}</span>
         </div>
-        {{/rollBetween() artifact_roll_eight 6 7}} {{#rollWasCrit() artifact_roll_eight}}
+        {{/rollBetween() artifact-roll-eight 6 7}} {{#rollWasCrit() artifact-roll-eight}}
         <div class="template-artifact-2">
-          <span class="template-inline" data-i18n-title="success-2" title="2 Successes">{{artifact_roll_eight}}</span>
+          <span class="template-inline" data-i18n-title="success-2" title="2 Successes">{{artifact-roll-eight}}</span>
         </div>
-        {{/rollWasCrit() artifact_roll_eight}}
+        {{/rollWasCrit() artifact-roll-eight}}
       </div>
       {{/rollTotal() artifact_die_eight 1}} {{#rollTotal() artifact_die_ocho 1}}
       <div class="template-grid-item template-span-shix template-green-dice">
-        {{#rollBetween() artifact_roll_ocho 1 5}} {{artifact_roll_ocho}} {{/rollBetween() artifact_roll_ocho 1 5}}
-        {{#rollBetween() artifact_roll_ocho 6 7}}
+        {{#rollBetween() artifact-roll-ocho 1 5}} {{artifact-roll-ocho}} {{/rollBetween() artifact-roll-ocho 1 5}}
+        {{#rollBetween() artifact-roll-ocho 6 7}}
         <div class="template-artifact-1">
-          <span class="template-inline" data-i18n-title="success-1" title="1 Success">{{artifact_roll_ocho}}</span>
+          <span class="template-inline" data-i18n-title="success-1" title="1 Success">{{artifact-roll-ocho}}</span>
         </div>
-        {{/rollBetween() artifact_roll_ocho 6 7}} {{#rollWasCrit() artifact_roll_ocho}}
+        {{/rollBetween() artifact-roll-ocho 6 7}} {{#rollWasCrit() artifact-roll-ocho}}
         <div class="template-artifact-2">
-          <span class="template-inline" data-i18n-title="success-2" title="2 Successes">{{artifact_roll_ocho}}</span>
+          <span class="template-inline" data-i18n-title="success-2" title="2 Successes">{{artifact-roll-ocho}}</span>
         </div>
-        {{/rollWasCrit() artifact_roll_ocho}}
+        {{/rollWasCrit() artifact-roll-ocho}}
       </div>
       {{/rollTotal() artifact_die_ocho 1}}
       <!--- BEGIN ROW EIGHT -->
       {{#rollTotal() artifact_die_ten 1}}
       <div class="template-grid-item template-span-five template-blue-dice">
-        {{#rollBetween() artifact_roll_ten 1 5}} {{artifact_roll_ten}} {{/rollBetween() artifact_roll_ten 1 5}}
-        {{#rollBetween() artifact_roll_ten 6 7}}
+        {{#rollBetween() artifact-roll-ten 1 5}} {{artifact-roll-ten}} {{/rollBetween() artifact-roll-ten 1 5}}
+        {{#rollBetween() artifact-roll-ten 6 7}}
         <div class="template-artifact-1">
-          <span class="template-inline" data-i18n-title="success-1" title="1 Success">{{artifact_roll_ten}}</span>
+          <span class="template-inline" data-i18n-title="success-1" title="1 Success">{{artifact-roll-ten}}</span>
         </div>
-        {{/rollBetween() artifact_roll_ten 6 7}} {{#rollBetween() artifact_roll_ten 8 9}}
+        {{/rollBetween() artifact-roll-ten 6 7}} {{#rollBetween() artifact-roll-ten 8 9}}
         <div class="template-artifact-2">
-          <span class="template-inline" data-i18n-title="success-2" title="2 Successes">{{artifact_roll_ten}}</span>
+          <span class="template-inline" data-i18n-title="success-2" title="2 Successes">{{artifact-roll-ten}}</span>
         </div>
-        {{/rollBetween() artifact_roll_ten 8 9}} {{#rollWasCrit() artifact_roll_ten}}
+        {{/rollBetween() artifact-roll-ten 8 9}} {{#rollWasCrit() artifact-roll-ten}}
         <div class="template-artifact-3">
-          <span class="template-inline" data-i18n-title="success-3" title="3 Successes">{{artifact_roll_ten}}</span>
+          <span class="template-inline" data-i18n-title="success-3" title="3 Successes">{{artifact-roll-ten}}</span>
         </div>
-        {{/rollWasCrit() artifact_roll_ten}}
+        {{/rollWasCrit() artifact-roll-ten}}
       </div>
       {{/rollTotal() artifact_die_ten 1}} {{#rollTotal() artifact_die_twelve 1}}
       <div class="template-grid-item template-span-shix template-orange-dice">
-        {{#rollBetween() artifact_roll_twelve 1 5}} {{artifact_roll_twelve}} {{/rollBetween() artifact_roll_twelve 1 5}}
-        {{#rollBetween() artifact_roll_twelve 6 7}}
+        {{#rollBetween() artifact-roll-twelve 1 5}} {{artifact-roll-twelve}} {{/rollBetween() artifact-roll-twelve 1 5}}
+        {{#rollBetween() artifact-roll-twelve 6 7}}
           <div class="template-artifact-1">
-            <span class="template-inline" data-i18n-title="success-1" title="1 Success">{{artifact_roll_twelve}}</span>
+            <span class="template-inline" data-i18n-title="success-1" title="1 Success">{{artifact-roll-twelve}}</span>
           </div>
-        {{/rollBetween() artifact_roll_twelve 6 7}} {{#rollBetween() artifact_roll_twelve 8 9}}
+        {{/rollBetween() artifact-roll-twelve 6 7}} {{#rollBetween() artifact-roll-twelve 8 9}}
           <div class="template-artifact-2">
-            <span class="template-inline" data-i18n-title="success-2" title="2 Successes">{{artifact_roll_twelve}}</span>
+            <span class="template-inline" data-i18n-title="success-2" title="2 Successes">{{artifact-roll-twelve}}</span>
           </div>
-        {{/rollBetween() artifact_roll_twelve 8 9}} {{#rollBetween() artifact_roll_twelve 10 11}}
+        {{/rollBetween() artifact-roll-twelve 8 9}} {{#rollBetween() artifact-roll-twelve 10 11}}
           <div class="template-artifact-3">
-            <span class="template-inline" data-i18n-title="success-3" title="3 Successes">{{artifact_roll_twelve}}</span>
+            <span class="template-inline" data-i18n-title="success-3" title="3 Successes">{{artifact-roll-twelve}}</span>
           </div>
-        {{/rollBetween() artifact_roll_twelve 10 11}} {{#rollWasCrit() artifact_roll_twelve}}
+        {{/rollBetween() artifact-roll-twelve 10 11}} {{#rollWasCrit() artifact-roll-twelve}}
           <div class="template-artifact-4">
-            <span class="template-inline" data-i18n-title="success-4" title="4 Successes">{{artifact_roll_twelve}}</span>
+            <span class="template-inline" data-i18n-title="success-4" title="4 Successes">{{artifact-roll-twelve}}</span>
           </div>
-        {{/rollWasCrit() artifact_roll_twelve}}
+        {{/rollWasCrit() artifact-roll-twelve}}
       </div>
       {{/rollTotal() artifact_die_twelve 1}}
     </div>
@@ -4270,14 +4278,14 @@
     </div>
     <!-- ALLPROPS-->
     <div class="template-grid">
-      {{#allprops() character_name name character_id name_link subtitle subtitle2 imageInsert imageInsertFood imageInsertWater imageInsertArrows imageInsertTorches free-text free-text-center free-text-right footer attribute_die_one attribute_die_two attribute_die_three attribute_die_four attribute_die_five attribute_die_six attribute_die_seven attribute_die_eight attribute_die_nine attribute_die_ten attribute_die_eleven attribute_die_twelve skill_die_one skill_die_two skill_die_three skill_die_four skill_die_five skill_die_six skill_die_seven skill_die_eight skill_die_nine skill_die_ten negative_die_one negative_die_two negative_die_three gear_die_one gear_die_two gear_die_three gear_die_four gear_die_five gear_die_six gear_die_seven gear_die_eight gear_die_nine gear_die_ten gear_die_eleven gear_die_twelve artifact_die_eight artifact_die_ocho artifact_die_ten artifact_die_twelve attribute_roll_one attribute_roll_two attribute_roll_three attribute_roll_four attribute_roll_five attribute_roll_six attribute_roll_seven attribute_roll_eight attribute_roll_nine attribute_roll_ten attribute_roll_eleven attribute_roll_twelve skill_roll_one skill_roll_two skill_roll_three skill_roll_four skill_roll_five skill_roll_six skill_roll_seven skill_roll_eight skill_roll_nine skill_roll_ten negative_roll_one negative_roll_two negative_roll_three gear_roll_one gear_roll_two gear_roll_three gear_roll_four gear_roll_five gear_roll_six gear_roll_seven gear_roll_eight gear_roll_nine gear_roll_ten gear_roll_eleven gear_roll_twelve artifact_roll_eight artifact_roll_ocho artifact_roll_ten artifact_roll_twelve consumable-die-six consumable-die-eight d66-die-one d66-roll-one d66-die-two d66-roll-two consumable-die-ten consumable-die-twelve consumable-roll-six consumable-roll-eight consumable-roll-ten consumable-roll-twelve push-query weapon-bonus weapon-bonus-max weapon-bonus-misc weapon-damage weapon-damage-misc attack-features weapon-grip weapon-range weapon-features attack-description spell-rank caster-rank spell-willpower spell-range spell-duration spell-ingredients spell-ingredients-included spell-grimoire spell-description current-willpower basePL armor1-equipped armor1-name armor1-rating armor1-rating-max armor1-rating-total armor1-rating-misc armor2-equipped armor2-name armor2-rating armor2-rating-max armor2-rating-misc armor2-rating-total armor3-equipped armor3-name armor3-rating armor3-rating-max armor3-rating-misc armor3-rating-total armor4-equipped armor4-name armor4-rating armor4-rating-max armor4-rating-misc armor4-rating-total shield1-name shield1-base shield1-skill shield1-bonus shield1-bonus-max shield1-bonus-misc skill-base skill-skill skill-bonus-misc-skill skill-bonus-misc-gear skill-notes dice-label-flag pride-flag consumable-flag dice-pool-flag}}
+      {{#allprops() character_name name character_id name_link subtitle subtitle2 imageInsert imageInsertFood imageInsertWater imageInsertArrows imageInsertTorches free-text free-text-center free-text-right footer attribute_die_one attribute_die_two attribute_die_three attribute_die_four attribute_die_five attribute_die_six attribute_die_seven attribute_die_eight attribute_die_nine attribute_die_ten attribute_die_eleven attribute_die_twelve skill_die_one skill_die_two skill_die_three skill_die_four skill_die_five skill_die_six skill_die_seven skill_die_eight skill_die_nine skill_die_ten negative_die_one negative_die_two negative_die_three gear_die_one gear_die_two gear_die_three gear_die_four gear_die_five gear_die_six gear_die_seven gear_die_eight gear_die_nine gear_die_ten gear_die_eleven gear_die_twelve artifact_die_eight artifact_die_ocho artifact_die_ten artifact_die_twelve attribute-roll-one attribute-roll-two attribute-roll-three attribute-roll-four attribute-roll-five attribute-roll-six attribute-roll-seven attribute-roll-eight attribute-roll-nine attribute-roll-ten attribute-roll-eleven attribute-roll-twelve skill-roll-one skill-roll-two skill-roll-three skill-roll-four skill-roll-five skill-roll-six skill-roll-seven skill-roll-eight skill-roll-nine skill-roll-ten negative-roll-one negative-roll-two negative-roll-three gear-roll-one gear-roll-two gear-roll-three gear-roll-four gear-roll-five gear-roll-six gear-roll-seven gear-roll-eight gear-roll-nine gear-roll-ten gear-roll-eleven gear-roll-twelve artifact-roll-eight artifact-roll-ocho artifact-roll-ten artifact-roll-twelve consumable-die-six consumable-die-eight d66-die-one d66-roll-one d66-die-two d66-roll-two consumable-die-ten consumable-die-twelve consumable-roll-six consumable-roll-eight consumable-roll-ten consumable-roll-twelve push-query weapon-bonus weapon-bonus-max weapon-bonus-misc weapon-damage weapon-damage-misc attack-features weapon-grip weapon-range weapon-features attack-description spell-rank caster-rank spell-willpower spell-range spell-duration spell-ingredients spell-ingredients-included spell-grimoire spell-description current-willpower basePL armor1-equipped armor1-name armor1-rating armor1-rating-max armor1-rating-total armor1-rating-misc armor2-equipped armor2-name armor2-rating armor2-rating-max armor2-rating-misc armor2-rating-total armor3-equipped armor3-name armor3-rating armor3-rating-max armor3-rating-misc armor3-rating-total armor4-equipped armor4-name armor4-rating armor4-rating-max armor4-rating-misc armor4-rating-total shield1-name shield1-base shield1-skill shield1-bonus shield1-bonus-max shield1-bonus-misc skill-base skill-skill skill-bonus-misc-skill skill-bonus-misc-gear skill-notes dice-label-flag pride-flag consumable-flag dice-pool-flag}}
       <div class="template-grid-item template-span-half">
         <span>**{{key}}**:</span>
       </div>
       <div class="template-grid-item template-span-2nd-half">
         <span>{{value}}</span>
       </div>
-      {{/allprops() character_name name character_id name_link subtitle subtitle2 imageInsert imageInsertFood imageInsertWater imageInsertArrows imageInsertTorches free-text free-text-center free-text-right footer attribute_die_one attribute_die_two attribute_die_three attribute_die_four attribute_die_five attribute_die_six attribute_die_seven attribute_die_eight attribute_die_nine attribute_die_ten attribute_die_eleven attribute_die_twelve skill_die_one skill_die_two skill_die_three skill_die_four skill_die_five skill_die_six skill_die_seven skill_die_eight skill_die_nine skill_die_ten negative_die_one negative_die_two negative_die_three gear_die_one gear_die_two gear_die_three gear_die_four gear_die_five gear_die_six gear_die_seven gear_die_eight gear_die_nine gear_die_ten gear_die_eleven gear_die_twelve artifact_die_eight artifact_die_ocho artifact_die_ten artifact_die_twelve attribute_roll_one attribute_roll_two attribute_roll_three attribute_roll_four attribute_roll_five attribute_roll_six attribute_roll_seven attribute_roll_eight attribute_roll_nine attribute_roll_ten attribute_roll_eleven attribute_roll_twelve skill_roll_one skill_roll_two skill_roll_three skill_roll_four skill_roll_five skill_roll_six skill_roll_seven skill_roll_eight skill_roll_nine skill_roll_ten negative_roll_one negative_roll_two negative_roll_three gear_roll_one gear_roll_two gear_roll_three gear_roll_four gear_roll_five gear_roll_six gear_roll_seven gear_roll_eight gear_roll_nine gear_roll_ten gear_roll_eleven gear_roll_twelve artifact_roll_eight artifact_roll_ocho artifact_roll_ten artifact_roll_twelve consumable-die-six consumable-die-eight d66-die-one d66-roll-one d66-die-two d66-roll-two consumable-die-ten consumable-die-twelve consumable-roll-six consumable-roll-eight consumable-roll-ten consumable-roll-twelve push-query weapon-bonus weapon-bonus-max weapon-bonus-misc weapon-damage weapon-damage-misc attack-features weapon-grip weapon-range weapon-features attack-description spell-rank caster-rank spell-willpower spell-range spell-duration spell-ingredients spell-ingredients-included spell-grimoire spell-description current-willpower basePL armor1-equipped armor1-name armor1-rating armor1-rating-max armor1-rating-total armor1-rating-misc armor2-equipped armor2-name armor2-rating armor2-rating-max armor2-rating-misc armor2-rating-total armor3-equipped armor3-name armor3-rating armor3-rating-max armor3-rating-misc armor3-rating-total armor4-equipped armor4-name armor4-rating armor4-rating-max armor4-rating-misc armor4-rating-total shield1-name shield1-base shield1-skill shield1-bonus shield1-bonus-max shield1-bonus-misc skill-base skill-skill skill-bonus-misc-skill skill-bonus-misc-gear skill-notes dice-label-flag pride-flag consumable-flag dice-pool-flag}}
+      {{/allprops() character_name name character_id name_link subtitle subtitle2 imageInsert imageInsertFood imageInsertWater imageInsertArrows imageInsertTorches free-text free-text-center free-text-right footer attribute_die_one attribute_die_two attribute_die_three attribute_die_four attribute_die_five attribute_die_six attribute_die_seven attribute_die_eight attribute_die_nine attribute_die_ten attribute_die_eleven attribute_die_twelve skill_die_one skill_die_two skill_die_three skill_die_four skill_die_five skill_die_six skill_die_seven skill_die_eight skill_die_nine skill_die_ten negative_die_one negative_die_two negative_die_three gear_die_one gear_die_two gear_die_three gear_die_four gear_die_five gear_die_six gear_die_seven gear_die_eight gear_die_nine gear_die_ten gear_die_eleven gear_die_twelve artifact_die_eight artifact_die_ocho artifact_die_ten artifact_die_twelve attribute-roll-one attribute-roll-two attribute-roll-three attribute-roll-four attribute-roll-five attribute-roll-six attribute-roll-seven attribute-roll-eight attribute-roll-nine attribute-roll-ten attribute-roll-eleven attribute-roll-twelve skill-roll-one skill-roll-two skill-roll-three skill-roll-four skill-roll-five skill-roll-six skill-roll-seven skill-roll-eight skill-roll-nine skill-roll-ten negative-roll-one negative-roll-two negative-roll-three gear-roll-one gear-roll-two gear-roll-three gear-roll-four gear-roll-five gear-roll-six gear-roll-seven gear-roll-eight gear-roll-nine gear-roll-ten gear-roll-eleven gear-roll-twelve artifact-roll-eight artifact-roll-ocho artifact-roll-ten artifact-roll-twelve consumable-die-six consumable-die-eight d66-die-one d66-roll-one d66-die-two d66-roll-two consumable-die-ten consumable-die-twelve consumable-roll-six consumable-roll-eight consumable-roll-ten consumable-roll-twelve push-query weapon-bonus weapon-bonus-max weapon-bonus-misc weapon-damage weapon-damage-misc attack-features weapon-grip weapon-range weapon-features attack-description spell-rank caster-rank spell-willpower spell-range spell-duration spell-ingredients spell-ingredients-included spell-grimoire spell-description current-willpower basePL armor1-equipped armor1-name armor1-rating armor1-rating-max armor1-rating-total armor1-rating-misc armor2-equipped armor2-name armor2-rating armor2-rating-max armor2-rating-misc armor2-rating-total armor3-equipped armor3-name armor3-rating armor3-rating-max armor3-rating-misc armor3-rating-total armor4-equipped armor4-name armor4-rating armor4-rating-max armor4-rating-misc armor4-rating-total shield1-name shield1-base shield1-skill shield1-bonus shield1-bonus-max shield1-bonus-misc skill-base skill-skill skill-bonus-misc-skill skill-bonus-misc-gear skill-notes dice-label-flag pride-flag consumable-flag dice-pool-flag}}
     </div>
   </div>
 </rolltemplate>
@@ -6313,16 +6321,16 @@
     clog(`buttonName:${buttonName}`);
     if (buttonName === 'the_dice-button') {
       roll_string =
-        '@{whisper_option} &{template:forbiddenlands} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=^{dice-pool}}} {{subtitle=@{current_preset}}} {{subtitle2=@{subtitle2}}} {{free-text}} {{footer}} {{attribute_die_one=[[ @{attribute_die_one} ]]}} {{attribute_roll_one=[[1d6]]}} {{attribute_die_two=[[ @{attribute_die_two} ]]}} {{attribute_roll_two=[[1d6]]}} {{attribute_die_three=[[ @{attribute_die_three} ]]}} {{attribute_roll_three=[[1d6]]}} {{attribute_die_four=[[ @{attribute_die_four} ]]}} {{attribute_roll_four=[[1d6]]}} {{attribute_die_five=[[ @{attribute_die_five} ]]}} {{attribute_roll_five=[[1d6]]}} {{attribute_die_six=[[ @{attribute_die_six} ]]}} {{attribute_roll_six=[[1d6]]}} {{attribute_die_seven=[[ @{attribute_die_seven} ]]}} {{attribute_roll_seven=[[1d6]]}} {{attribute_die_eight=[[ @{attribute_die_eight} ]]}} {{attribute_roll_eight=[[1d6]]}} {{attribute_die_nine=[[ @{attribute_die_nine} ]]}} {{attribute_roll_nine=[[1d6]]}} {{attribute_die_ten=[[ @{attribute_die_ten} ]]}} {{attribute_roll_ten=[[1d6]]}} {{attribute_die_eleven=[[ @{attribute_die_eleven} ]]}} {{attribute_roll_eleven=[[1d6]]}} {{attribute_die_twelve=[[ @{attribute_die_twelve} ]]}} {{attribute_roll_twelve=[[1d6]]}} {{skill_die_one=[[ @{skill_die_one} ]]}} {{skill_roll_one=[[1d6]]}} {{skill_die_two=[[ @{skill_die_two} ]]}} {{skill_roll_two=[[1d6]]}} {{skill_die_three=[[ @{skill_die_three} ]]}} {{skill_roll_three=[[1d6]]}} {{skill_die_four=[[ @{skill_die_four} ]]}} {{skill_roll_four=[[1d6]]}} {{skill_die_five=[[ @{skill_die_five} ]]}} {{skill_roll_five=[[1d6]]}} {{skill_die_six=[[ @{skill_die_six} ]]}} {{skill_roll_six=[[1d6]]}} {{skill_die_seven=[[ @{skill_die_seven} ]]}} {{skill_roll_seven=[[1d6]]}} {{skill_die_eight=[[ @{skill_die_eight} ]]}} {{skill_roll_eight=[[1d6]]}} {{skill_die_nine=[[ @{skill_die_nine} ]]}} {{skill_roll_nine=[[1d6]]}} {{skill_die_ten=[[ @{skill_die_ten} ]]}} {{skill_roll_ten=[[1d6]]}} {{negative_die_one=[[ @{negative_die_one} ]]}} {{negative_roll_one=[[1d6]]}} {{negative_die_two=[[ @{negative_die_two} ]]}} {{negative_roll_two=[[1d6]]}} {{negative_die_three=[[ @{negative_die_three} ]]}} {{negative_roll_three=[[1d6]]}} {{gear_die_one=[[ @{gear_die_one} ]]}} {{gear_roll_one=[[1d6]]}} {{gear_die_two=[[ @{gear_die_two} ]]}} {{gear_roll_two=[[1d6]]}} {{gear_die_three=[[ @{gear_die_three} ]]}} {{gear_roll_three=[[1d6]]}} {{gear_die_four=[[ @{gear_die_four} ]]}} {{gear_roll_four=[[1d6]]}} {{gear_die_five=[[ @{gear_die_five} ]]}} {{gear_roll_five=[[1d6]]}} {{gear_die_six=[[ @{gear_die_six} ]]}} {{gear_roll_six=[[1d6]]}} {{gear_die_seven=[[ @{gear_die_seven} ]]}} {{gear_roll_seven=[[1d6]]}} {{gear_die_eight=[[ @{gear_die_eight} ]]}} {{gear_roll_eight=[[1d6]]}} {{gear_die_nine=[[ @{gear_die_nine} ]]}} {{gear_roll_nine=[[1d6]]}} {{gear_die_ten=[[ @{gear_die_ten} ]]}} {{gear_roll_ten=[[1d6]]}} {{gear_die_eleven=[[ @{gear_die_eleven} ]]}} {{gear_roll_eleven=[[1d6]]}} {{gear_die_twelve=[[ @{gear_die_twelve} ]]}} {{gear_roll_twelve=[[1d6]]}} {{artifact_die_eight=[[ @{artifact_die_eight} ]]}} {{artifact_roll_eight=[[1d8]]}} {{artifact_die_ocho=[[ @{artifact_die_ocho} ]]}} {{artifact_roll_ocho=[[1d8]]}} {{artifact_die_ten=[[ @{artifact_die_ten} ]]}} {{artifact_roll_ten=[[1d10]]}} {{artifact_die_twelve=[[ @{artifact_die_twelve} ]]}} {{artifact_roll_twelve=[[1d12]]}} {{dice-pool-flag=[[@{attribute_die_one} + @{skill_die_one} + @{gear_die_one}]]}} @{include_with_roll}';
+        '@{whisper_option} &{template:forbiddenlands} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=^{dice-pool}}} {{subtitle=@{current_preset}}} {{subtitle2=@{subtitle2}}} {{free-text}} {{footer}} {{attribute_die_one=[[ @{attribute_die_one} ]]}} {{attribute-roll-one=[[1d6]]}} {{attribute_die_two=[[ @{attribute_die_two} ]]}} {{attribute-roll-two=[[1d6]]}} {{attribute_die_three=[[ @{attribute_die_three} ]]}} {{attribute-roll-three=[[1d6]]}} {{attribute_die_four=[[ @{attribute_die_four} ]]}} {{attribute-roll-four=[[1d6]]}} {{attribute_die_five=[[ @{attribute_die_five} ]]}} {{attribute-roll-five=[[1d6]]}} {{attribute_die_six=[[ @{attribute_die_six} ]]}} {{attribute-roll-six=[[1d6]]}} {{attribute_die_seven=[[ @{attribute_die_seven} ]]}} {{attribute-roll-seven=[[1d6]]}} {{attribute_die_eight=[[ @{attribute_die_eight} ]]}} {{attribute-roll-eight=[[1d6]]}} {{attribute_die_nine=[[ @{attribute_die_nine} ]]}} {{attribute-roll-nine=[[1d6]]}} {{attribute_die_ten=[[ @{attribute_die_ten} ]]}} {{attribute-roll-ten=[[1d6]]}} {{attribute_die_eleven=[[ @{attribute_die_eleven} ]]}} {{attribute-roll-eleven=[[1d6]]}} {{attribute_die_twelve=[[ @{attribute_die_twelve} ]]}} {{attribute-roll-twelve=[[1d6]]}} {{skill_die_one=[[ @{skill_die_one} ]]}} {{skill-roll-one=[[1d6]]}} {{skill_die_two=[[ @{skill_die_two} ]]}} {{skill-roll-two=[[1d6]]}} {{skill_die_three=[[ @{skill_die_three} ]]}} {{skill-roll-three=[[1d6]]}} {{skill_die_four=[[ @{skill_die_four} ]]}} {{skill-roll-four=[[1d6]]}} {{skill_die_five=[[ @{skill_die_five} ]]}} {{skill-roll-five=[[1d6]]}} {{skill_die_six=[[ @{skill_die_six} ]]}} {{skill-roll-six=[[1d6]]}} {{skill_die_seven=[[ @{skill_die_seven} ]]}} {{skill-roll-seven=[[1d6]]}} {{skill_die_eight=[[ @{skill_die_eight} ]]}} {{skill-roll-eight=[[1d6]]}} {{skill_die_nine=[[ @{skill_die_nine} ]]}} {{skill-roll-nine=[[1d6]]}} {{skill_die_ten=[[ @{skill_die_ten} ]]}} {{skill-roll-ten=[[1d6]]}} {{negative_die_one=[[ @{negative_die_one} ]]}} {{negative-roll-one=[[1d6]]}} {{negative_die_two=[[ @{negative_die_two} ]]}} {{negative-roll-two=[[1d6]]}} {{negative_die_three=[[ @{negative_die_three} ]]}} {{negative-roll-three=[[1d6]]}} {{gear_die_one=[[ @{gear_die_one} ]]}} {{gear-roll-one=[[1d6]]}} {{gear_die_two=[[ @{gear_die_two} ]]}} {{gear-roll-two=[[1d6]]}} {{gear_die_three=[[ @{gear_die_three} ]]}} {{gear-roll-three=[[1d6]]}} {{gear_die_four=[[ @{gear_die_four} ]]}} {{gear-roll-four=[[1d6]]}} {{gear_die_five=[[ @{gear_die_five} ]]}} {{gear-roll-five=[[1d6]]}} {{gear_die_six=[[ @{gear_die_six} ]]}} {{gear-roll-six=[[1d6]]}} {{gear_die_seven=[[ @{gear_die_seven} ]]}} {{gear-roll-seven=[[1d6]]}} {{gear_die_eight=[[ @{gear_die_eight} ]]}} {{gear-roll-eight=[[1d6]]}} {{gear_die_nine=[[ @{gear_die_nine} ]]}} {{gear-roll-nine=[[1d6]]}} {{gear_die_ten=[[ @{gear_die_ten} ]]}} {{gear-roll-ten=[[1d6]]}} {{gear_die_eleven=[[ @{gear_die_eleven} ]]}} {{gear-roll-eleven=[[1d6]]}} {{gear_die_twelve=[[ @{gear_die_twelve} ]]}} {{gear-roll-twelve=[[1d6]]}} {{artifact_die_eight=[[ @{artifact_die_eight} ]]}} {{artifact-roll-eight=[[1d8]]}} {{artifact_die_ocho=[[ @{artifact_die_ocho} ]]}} {{artifact-roll-ocho=[[1d8]]}} {{artifact_die_ten=[[ @{artifact_die_ten} ]]}} {{artifact-roll-ten=[[1d10]]}} {{artifact_die_twelve=[[ @{artifact_die_twelve} ]]}} {{artifact-roll-twelve=[[1d12]]}} {{dice-pool-flag=[[@{attribute_die_one} + @{skill_die_one} + @{gear_die_one}]]}} @{include_with_roll}';
     }
     if (buttonName === 'a_push-button') {
       roll_string =
-        '@{whisper_option} &{template:forbiddenlands} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=^{pushes-the-roll}}} {{subtitle=@{current_preset}}} {{subtitle2=@{subtitle2}}} {{free-text}} {{footer}} {{attribute_die_one=[[ @{attribute_die_one} ]]}} {{attribute_roll_one=[[1d6]]}} {{attribute_die_two=[[ @{attribute_die_two} ]]}} {{attribute_roll_two=[[1d6]]}} {{attribute_die_three=[[ @{attribute_die_three} ]]}} {{attribute_roll_three=[[1d6]]}} {{attribute_die_four=[[ @{attribute_die_four} ]]}} {{attribute_roll_four=[[1d6]]}} {{attribute_die_five=[[ @{attribute_die_five} ]]}} {{attribute_roll_five=[[1d6]]}} {{attribute_die_six=[[ @{attribute_die_six} ]]}} {{attribute_roll_six=[[1d6]]}} {{attribute_die_seven=[[ @{attribute_die_seven} ]]}} {{attribute_roll_seven=[[1d6]]}} {{attribute_die_eight=[[ @{attribute_die_eight} ]]}} {{attribute_roll_eight=[[1d6]]}} {{attribute_die_nine=[[ @{attribute_die_nine} ]]}} {{attribute_roll_nine=[[1d6]]}} {{attribute_die_ten=[[ @{attribute_die_ten} ]]}} {{attribute_roll_ten=[[1d6]]}} {{attribute_die_eleven=[[ @{attribute_die_eleven} ]]}} {{attribute_roll_eleven=[[1d6]]}} {{attribute_die_twelve=[[ @{attribute_die_twelve} ]]}} {{attribute_roll_twelve=[[1d6]]}} {{skill_die_one=[[ @{skill_die_one} ]]}} {{skill_roll_one=[[1d6]]}} {{skill_die_two=[[ @{skill_die_two} ]]}} {{skill_roll_two=[[1d6]]}} {{skill_die_three=[[ @{skill_die_three} ]]}} {{skill_roll_three=[[1d6]]}} {{skill_die_four=[[ @{skill_die_four} ]]}} {{skill_roll_four=[[1d6]]}} {{skill_die_five=[[ @{skill_die_five} ]]}} {{skill_roll_five=[[1d6]]}} {{skill_die_six=[[ @{skill_die_six} ]]}} {{skill_roll_six=[[1d6]]}} {{skill_die_seven=[[ @{skill_die_seven} ]]}} {{skill_roll_seven=[[1d6]]}} {{skill_die_eight=[[ @{skill_die_eight} ]]}} {{skill_roll_eight=[[1d6]]}} {{skill_die_nine=[[ @{skill_die_nine} ]]}} {{skill_roll_nine=[[1d6]]}} {{skill_die_ten=[[ @{skill_die_ten} ]]}} {{skill_roll_ten=[[1d6]]}} {{negative_die_one=[[ @{negative_die_one} ]]}} {{negative_roll_one=[[1d6]]}} {{negative_die_two=[[ @{negative_die_two} ]]}} {{negative_roll_two=[[1d6]]}} {{negative_die_three=[[ @{negative_die_three} ]]}} {{negative_roll_three=[[1d6]]}} {{gear_die_one=[[ @{gear_die_one} ]]}} {{gear_roll_one=[[1d6]]}} {{gear_die_two=[[ @{gear_die_two} ]]}} {{gear_roll_two=[[1d6]]}} {{gear_die_three=[[ @{gear_die_three} ]]}} {{gear_roll_three=[[1d6]]}} {{gear_die_four=[[ @{gear_die_four} ]]}} {{gear_roll_four=[[1d6]]}} {{gear_die_five=[[ @{gear_die_five} ]]}} {{gear_roll_five=[[1d6]]}} {{gear_die_six=[[ @{gear_die_six} ]]}} {{gear_roll_six=[[1d6]]}} {{gear_die_seven=[[ @{gear_die_seven} ]]}} {{gear_roll_seven=[[1d6]]}} {{gear_die_eight=[[ @{gear_die_eight} ]]}} {{gear_roll_eight=[[1d6]]}} {{gear_die_nine=[[ @{gear_die_nine} ]]}} {{gear_roll_nine=[[1d6]]}} {{gear_die_ten=[[ @{gear_die_ten} ]]}} {{gear_roll_ten=[[1d6]]}} {{gear_die_eleven=[[ @{gear_die_eleven} ]]}} {{gear_roll_eleven=[[1d6]]}} {{gear_die_twelve=[[ @{gear_die_twelve} ]]}} {{gear_roll_twelve=[[1d6]]}} {{artifact_die_eight=[[ @{artifact_die_eight} ]]}} {{artifact_roll_eight=[[1d8]]}} {{artifact_die_ocho=[[ @{artifact_die_ocho} ]]}} {{artifact_roll_ocho=[[1d8]]}} {{artifact_die_ten=[[ @{artifact_die_ten} ]]}} {{artifact_roll_ten=[[1d10]]}} {{artifact_die_twelve=[[ @{artifact_die_twelve} ]]}} {{artifact_roll_twelve=[[1d12]]}} {{push-query=?{@{translation_push_query}} }} {{dice-pool-flag=[[@{attribute_die_one} + @{skill_die_one} + @{gear_die_one}]]}} @{include_with_roll}';
+        '@{whisper_option} &{template:forbiddenlands} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=^{pushes-the-roll}}} {{subtitle=@{current_preset}}} {{subtitle2=@{subtitle2}}} {{free-text}} {{footer}} {{attribute_die_one=[[ @{attribute_die_one} ]]}} {{attribute-roll-one=[[1d6]]}} {{attribute_die_two=[[ @{attribute_die_two} ]]}} {{attribute-roll-two=[[1d6]]}} {{attribute_die_three=[[ @{attribute_die_three} ]]}} {{attribute-roll-three=[[1d6]]}} {{attribute_die_four=[[ @{attribute_die_four} ]]}} {{attribute-roll-four=[[1d6]]}} {{attribute_die_five=[[ @{attribute_die_five} ]]}} {{attribute-roll-five=[[1d6]]}} {{attribute_die_six=[[ @{attribute_die_six} ]]}} {{attribute-roll-six=[[1d6]]}} {{attribute_die_seven=[[ @{attribute_die_seven} ]]}} {{attribute-roll-seven=[[1d6]]}} {{attribute_die_eight=[[ @{attribute_die_eight} ]]}} {{attribute-roll-eight=[[1d6]]}} {{attribute_die_nine=[[ @{attribute_die_nine} ]]}} {{attribute-roll-nine=[[1d6]]}} {{attribute_die_ten=[[ @{attribute_die_ten} ]]}} {{attribute-roll-ten=[[1d6]]}} {{attribute_die_eleven=[[ @{attribute_die_eleven} ]]}} {{attribute-roll-eleven=[[1d6]]}} {{attribute_die_twelve=[[ @{attribute_die_twelve} ]]}} {{attribute-roll-twelve=[[1d6]]}} {{skill_die_one=[[ @{skill_die_one} ]]}} {{skill-roll-one=[[1d6]]}} {{skill_die_two=[[ @{skill_die_two} ]]}} {{skill-roll-two=[[1d6]]}} {{skill_die_three=[[ @{skill_die_three} ]]}} {{skill-roll-three=[[1d6]]}} {{skill_die_four=[[ @{skill_die_four} ]]}} {{skill-roll-four=[[1d6]]}} {{skill_die_five=[[ @{skill_die_five} ]]}} {{skill-roll-five=[[1d6]]}} {{skill_die_six=[[ @{skill_die_six} ]]}} {{skill-roll-six=[[1d6]]}} {{skill_die_seven=[[ @{skill_die_seven} ]]}} {{skill-roll-seven=[[1d6]]}} {{skill_die_eight=[[ @{skill_die_eight} ]]}} {{skill-roll-eight=[[1d6]]}} {{skill_die_nine=[[ @{skill_die_nine} ]]}} {{skill-roll-nine=[[1d6]]}} {{skill_die_ten=[[ @{skill_die_ten} ]]}} {{skill-roll-ten=[[1d6]]}} {{negative_die_one=[[ @{negative_die_one} ]]}} {{negative-roll-one=[[1d6]]}} {{negative_die_two=[[ @{negative_die_two} ]]}} {{negative-roll-two=[[1d6]]}} {{negative_die_three=[[ @{negative_die_three} ]]}} {{negative-roll-three=[[1d6]]}} {{gear_die_one=[[ @{gear_die_one} ]]}} {{gear-roll-one=[[1d6]]}} {{gear_die_two=[[ @{gear_die_two} ]]}} {{gear-roll-two=[[1d6]]}} {{gear_die_three=[[ @{gear_die_three} ]]}} {{gear-roll-three=[[1d6]]}} {{gear_die_four=[[ @{gear_die_four} ]]}} {{gear-roll-four=[[1d6]]}} {{gear_die_five=[[ @{gear_die_five} ]]}} {{gear-roll-five=[[1d6]]}} {{gear_die_six=[[ @{gear_die_six} ]]}} {{gear-roll-six=[[1d6]]}} {{gear_die_seven=[[ @{gear_die_seven} ]]}} {{gear-roll-seven=[[1d6]]}} {{gear_die_eight=[[ @{gear_die_eight} ]]}} {{gear-roll-eight=[[1d6]]}} {{gear_die_nine=[[ @{gear_die_nine} ]]}} {{gear-roll-nine=[[1d6]]}} {{gear_die_ten=[[ @{gear_die_ten} ]]}} {{gear-roll-ten=[[1d6]]}} {{gear_die_eleven=[[ @{gear_die_eleven} ]]}} {{gear-roll-eleven=[[1d6]]}} {{gear_die_twelve=[[ @{gear_die_twelve} ]]}} {{gear-roll-twelve=[[1d6]]}} {{artifact_die_eight=[[ @{artifact_die_eight} ]]}} {{artifact-roll-eight=[[1d8]]}} {{artifact_die_ocho=[[ @{artifact_die_ocho} ]]}} {{artifact-roll-ocho=[[1d8]]}} {{artifact_die_ten=[[ @{artifact_die_ten} ]]}} {{artifact-roll-ten=[[1d10]]}} {{artifact_die_twelve=[[ @{artifact_die_twelve} ]]}} {{artifact-roll-twelve=[[1d12]]}} {{push-query=?{@{translation_push_query}} }} {{dice-pool-flag=[[@{attribute_die_one} + @{skill_die_one} + @{gear_die_one}]]}} @{include_with_roll}';
     }
 
     startRoll(roll_string, (roll) => {
       console.log(roll);
-      const attributeDice = roll.results.attribute_roll_one.result;
+      const attributeDice = roll.results.attribute-roll-one.result;
       // example to show one of the die results
       console.log(`attribute dice:${attributeDice}`);
       finishRoll(roll.rollId);