From 8f9d7d3cbe21ece429d06e76d601e49dee3f1035 Mon Sep 17 00:00:00 2001
From: Thomas Young <35073576+DrakeRichards@users.noreply.github.com>
Date: Wed, 7 Sep 2022 11:41:30 -0500
Subject: [PATCH] Corrected more uppercare attributes

---
 Infinity-2d20/Infinity 2d20.html | 164 +++++++++++++++++++------------
 Infinity-2d20/attributes_new.csv |  20 ++--
 2 files changed, 111 insertions(+), 73 deletions(-)

diff --git a/Infinity-2d20/Infinity 2d20.html b/Infinity-2d20/Infinity 2d20.html
index bf53d4d58b..d08bbb3a0b 100644
--- a/Infinity-2d20/Infinity 2d20.html	
+++ b/Infinity-2d20/Infinity 2d20.html	
@@ -472,7 +472,7 @@
 						<td colspan="3">AGILITY</td>
 						<td><input type="number" value="7" name="attr_agility" /></td>
 						<td> 
-							<button type="roll" name="roll_Agility" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Agility Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{attribute=@{agility}}} {{roll=[[{{ceil(([[@{agility}]]-d20cs<[[@{agility}]]cf<0cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{agility}]])),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{agility}]]-d20cs<[[@{agility}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{agility}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{agility}]]-d20cs<[[@{agility}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{agility}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{agility}]]-d20cs<[[@{agility}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{agility}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{agility}]]-d20cs<[[@{agility}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{agility}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{agility}]]-d20cs<[[@{agility}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{agility}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{agility}]]-d20cs<[[@{agility}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{agility}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{agility}]]-d20cs<[[@{agility}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{agility}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{agility}]]-d20cs<[[@{agility}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{agility}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{agility}]]-d20cs<[[@{agility}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{agility}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{agility}]]-d20cs<[[@{agility}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{agility}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
+							<button type="roll" name="roll_agility" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Agility Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{attribute=@{agility}}} {{roll=[[{{ceil(([[@{agility}]]-d20cs<[[@{agility}]]cf<0cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{agility}]])),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{agility}]]-d20cs<[[@{agility}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{agility}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{agility}]]-d20cs<[[@{agility}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{agility}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{agility}]]-d20cs<[[@{agility}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{agility}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{agility}]]-d20cs<[[@{agility}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{agility}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{agility}]]-d20cs<[[@{agility}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{agility}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{agility}]]-d20cs<[[@{agility}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{agility}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{agility}]]-d20cs<[[@{agility}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{agility}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{agility}]]-d20cs<[[@{agility}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{agility}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{agility}]]-d20cs<[[@{agility}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{agility}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{agility}]]-d20cs<[[@{agility}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{agility}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
 							</button>
 						</td>
 					</tr>
@@ -489,17 +489,17 @@
 						<td><input type="number" value="0" name="attr_skill_acrobatics_exp" /></td>
 						<td><input type="number" value="0" name="attr_skill_acrobatics_foc" /></td>
 						<td> 
-							<button type="roll" name="roll_Acrobatics" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Acrobatics Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Acrobatics}} {{skill_EXP=@{skill_acrobatics_exp}}} {{skill_FOC=@{skill_acrobatics_foc}}} {{attribute=?{Attribute|Agility, @{agility}|Awareness, @{awareness}|Brawn, @{brawn}|Coordination, @{coordination}|Intelligence, @{intelligence}|Personality, @{personality}|Willpower, @{willpower}}}} {{roll=[[{{ceil(([[@{skill_acrobatics_exp}+?{Attribute}]]-d20cs<[[@{skill_acrobatics_exp}+?{Attribute}]]cf<@{skill_acrobatics_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_acrobatics_exp}+?{Attribute}]]-@{skill_acrobatics_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]cf<@{skill_acrobatics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]-@{skill_acrobatics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]cf<@{skill_acrobatics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]-@{skill_acrobatics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]cf<@{skill_acrobatics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]-@{skill_acrobatics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]cf<@{skill_acrobatics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]-@{skill_acrobatics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]cf<@{skill_acrobatics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]-@{skill_acrobatics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]cf<@{skill_acrobatics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]-@{skill_acrobatics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]cf<@{skill_acrobatics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]-@{skill_acrobatics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]cf<@{skill_acrobatics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]-@{skill_acrobatics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]cf<@{skill_acrobatics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]-@{skill_acrobatics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]cf<@{skill_acrobatics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]-@{skill_acrobatics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
+							<button type="roll" name="roll_acrobatics" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Acrobatics Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Acrobatics}} {{skill_exp=@{skill_acrobatics_exp}}} {{skill_foc=@{skill_acrobatics_foc}}} {{attribute=?{Attribute|Agility, @{agility}|Awareness, @{awareness}|Brawn, @{brawn}|Coordination, @{coordination}|Intelligence, @{intelligence}|Personality, @{personality}|Willpower, @{willpower}}}} {{roll=[[{{ceil(([[@{skill_acrobatics_exp}+?{Attribute}]]-d20cs<[[@{skill_acrobatics_exp}+?{Attribute}]]cf<@{skill_acrobatics_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_acrobatics_exp}+?{Attribute}]]-@{skill_acrobatics_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]cf<@{skill_acrobatics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]-@{skill_acrobatics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]cf<@{skill_acrobatics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]-@{skill_acrobatics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]cf<@{skill_acrobatics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]-@{skill_acrobatics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]cf<@{skill_acrobatics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]-@{skill_acrobatics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]cf<@{skill_acrobatics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]-@{skill_acrobatics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]cf<@{skill_acrobatics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]-@{skill_acrobatics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]cf<@{skill_acrobatics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]-@{skill_acrobatics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]cf<@{skill_acrobatics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]-@{skill_acrobatics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]cf<@{skill_acrobatics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]-@{skill_acrobatics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]cf<@{skill_acrobatics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_acrobatics_exp}+?{Attribute&amp;#125;]]-@{skill_acrobatics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
 							</button>
 						</td>
 					</tr>
 					<tr class="sheet-Skill">
 						<td>Close Combat</td>
-						<td><input type="checkbox" name="attr_Skill_Close_Combat_Sig" /></td>
-						<td><input type="number" value="0" name="attr_Skill_Close_Combat_EXP" /></td>
-						<td><input type="number" value="0" name="attr_Skill_Close_Combat_FOC" /></td>
+						<td><input type="checkbox" name="attr_skill_close_combat_sig" /></td>
+						<td><input type="number" value="0" name="attr_skill_close_combat_exp" /></td>
+						<td><input type="number" value="0" name="attr_skill_close_combat_foc" /></td>
 						<td>
-							<button type="roll" name="roll_Close-Combat" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Close Combat Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Close Combat}} {{skill_EXP=@{Skill_Close-Combat_EXP}}} {{skill_FOC=@{Skill_Close-Combat_FOC}}} {{attribute=?{Attribute|Agility, @{agility}|Awareness, @{awareness}|Brawn, @{brawn}|Coordination, @{coordination}|Intelligence, @{intelligence}|Personality, @{personality}|Willpower, @{willpower}}}} {{roll=[[{{ceil(([[@{Skill_Close-Combat_EXP}+?{Attribute}]]-d20cs<[[@{Skill_Close-Combat_EXP}+?{Attribute}]]cf<@{Skill_Close-Combat_FOC}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{Skill_Close-Combat_EXP}+?{Attribute}]]-@{Skill_Close-Combat_FOC})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{Skill_Close-Combat_EXP}+?{Attribute&amp;#125;]]-d20cs<[[@{Skill_Close-Combat_EXP}+?{Attribute&amp;#125;]]cf<@{Skill_Close-Combat_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{Skill_Close-Combat_EXP}+?{Attribute&amp;#125;]]-@{Skill_Close-Combat_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{Skill_Close-Combat_EXP}+?{Attribute&amp;#125;]]-d20cs<[[@{Skill_Close-Combat_EXP}+?{Attribute&amp;#125;]]cf<@{Skill_Close-Combat_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{Skill_Close-Combat_EXP}+?{Attribute&amp;#125;]]-@{Skill_Close-Combat_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{Skill_Close-Combat_EXP}+?{Attribute&amp;#125;]]-d20cs<[[@{Skill_Close-Combat_EXP}+?{Attribute&amp;#125;]]cf<@{Skill_Close-Combat_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{Skill_Close-Combat_EXP}+?{Attribute&amp;#125;]]-@{Skill_Close-Combat_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{Skill_Close-Combat_EXP}+?{Attribute&amp;#125;]]-d20cs<[[@{Skill_Close-Combat_EXP}+?{Attribute&amp;#125;]]cf<@{Skill_Close-Combat_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{Skill_Close-Combat_EXP}+?{Attribute&amp;#125;]]-@{Skill_Close-Combat_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{Skill_Close-Combat_EXP}+?{Attribute&amp;#125;]]-d20cs<[[@{Skill_Close-Combat_EXP}+?{Attribute&amp;#125;]]cf<@{Skill_Close-Combat_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{Skill_Close-Combat_EXP}+?{Attribute&amp;#125;]]-@{Skill_Close-Combat_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{Skill_Close-Combat_EXP}+?{Attribute&amp;#125;]]-d20cs<[[@{Skill_Close-Combat_EXP}+?{Attribute&amp;#125;]]cf<@{Skill_Close-Combat_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{Skill_Close-Combat_EXP}+?{Attribute&amp;#125;]]-@{Skill_Close-Combat_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{Skill_Close-Combat_EXP}+?{Attribute&amp;#125;]]-d20cs<[[@{Skill_Close-Combat_EXP}+?{Attribute&amp;#125;]]cf<@{Skill_Close-Combat_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{Skill_Close-Combat_EXP}+?{Attribute&amp;#125;]]-@{Skill_Close-Combat_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{Skill_Close-Combat_EXP}+?{Attribute&amp;#125;]]-d20cs<[[@{Skill_Close-Combat_EXP}+?{Attribute&amp;#125;]]cf<@{Skill_Close-Combat_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{Skill_Close-Combat_EXP}+?{Attribute&amp;#125;]]-@{Skill_Close-Combat_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{Skill_Close-Combat_EXP}+?{Attribute&amp;#125;]]-d20cs<[[@{Skill_Close-Combat_EXP}+?{Attribute&amp;#125;]]cf<@{Skill_Close-Combat_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{Skill_Close-Combat_EXP}+?{Attribute&amp;#125;]]-@{Skill_Close-Combat_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{Skill_Close-Combat_EXP}+?{Attribute&amp;#125;]]-d20cs<[[@{Skill_Close-Combat_EXP}+?{Attribute&amp;#125;]]cf<@{Skill_Close-Combat_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{Skill_Close-Combat_EXP}+?{Attribute&amp;#125;]]-@{Skill_Close-Combat_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
+							<button type="roll" name="roll_close_combat" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Close Combat Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Close Combat}} {{skill_exp=@{skill_close_combat_exp}}} {{skill_foc=@{skill_close_combat_foc}}} {{attribute=?{Attribute|Agility, @{agility}|Awareness, @{awareness}|Brawn, @{brawn}|Coordination, @{coordination}|Intelligence, @{intelligence}|Personality, @{personality}|Willpower, @{willpower}}}} {{roll=[[{{ceil(([[@{skill_close_combat_exp}+?{Attribute}]]-d20cs<[[@{skill_close_combat_exp}+?{Attribute}]]cf<@{skill_close_combat_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_close_combat_exp}+?{Attribute}]]-@{skill_close_combat_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_close_combat_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_close_combat_exp}+?{Attribute&amp;#125;]]cf<@{skill_close_combat_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_close_combat_exp}+?{Attribute&amp;#125;]]-@{skill_close_combat_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_close_combat_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_close_combat_exp}+?{Attribute&amp;#125;]]cf<@{skill_close_combat_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_close_combat_exp}+?{Attribute&amp;#125;]]-@{skill_close_combat_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_close_combat_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_close_combat_exp}+?{Attribute&amp;#125;]]cf<@{skill_close_combat_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_close_combat_exp}+?{Attribute&amp;#125;]]-@{skill_close_combat_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_close_combat_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_close_combat_exp}+?{Attribute&amp;#125;]]cf<@{skill_close_combat_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_close_combat_exp}+?{Attribute&amp;#125;]]-@{skill_close_combat_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_close_combat_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_close_combat_exp}+?{Attribute&amp;#125;]]cf<@{skill_close_combat_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_close_combat_exp}+?{Attribute&amp;#125;]]-@{skill_close_combat_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_close_combat_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_close_combat_exp}+?{Attribute&amp;#125;]]cf<@{skill_close_combat_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_close_combat_exp}+?{Attribute&amp;#125;]]-@{skill_close_combat_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_close_combat_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_close_combat_exp}+?{Attribute&amp;#125;]]cf<@{skill_close_combat_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_close_combat_exp}+?{Attribute&amp;#125;]]-@{skill_close_combat_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_close_combat_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_close_combat_exp}+?{Attribute&amp;#125;]]cf<@{skill_close_combat_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_close_combat_exp}+?{Attribute&amp;#125;]]-@{skill_close_combat_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_close_combat_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_close_combat_exp}+?{Attribute&amp;#125;]]cf<@{skill_close_combat_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_close_combat_exp}+?{Attribute&amp;#125;]]-@{skill_close_combat_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_close_combat_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_close_combat_exp}+?{Attribute&amp;#125;]]cf<@{skill_close_combat_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_close_combat_exp}+?{Attribute&amp;#125;]]-@{skill_close_combat_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
 							</button>
 						</td>
 					</tr>
@@ -509,7 +509,7 @@
 						<td><input type="number" value="0" name="attr_skill_stealth_exp" /></td>
 						<td><input type="number" value="0" name="attr_skill_stealth_foc" /></td>
 						<td>
-							<button type="roll" name="roll_Stealth" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Stealth Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Stealth}} {{skill_EXP=@{skill_stealth_exp}}} {{skill_FOC=@{skill_stealth_foc}}} {{attribute=?{Attribute|Agility, @{agility}|Awareness, @{awareness}|Brawn, @{brawn}|Coordination, @{coordination}|Intelligence, @{intelligence}|Personality, @{personality}|Willpower, @{willpower}}}} {{roll=[[{{ceil(([[@{skill_stealth_exp}+?{Attribute}]]-d20cs<[[@{skill_stealth_exp}+?{Attribute}]]cf<@{skill_stealth_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_stealth_exp}+?{Attribute}]]-@{skill_stealth_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_stealth_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_stealth_exp}+?{Attribute&amp;#125;]]cf<@{skill_stealth_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_stealth_exp}+?{Attribute&amp;#125;]]-@{skill_stealth_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_stealth_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_stealth_exp}+?{Attribute&amp;#125;]]cf<@{skill_stealth_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_stealth_exp}+?{Attribute&amp;#125;]]-@{skill_stealth_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_stealth_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_stealth_exp}+?{Attribute&amp;#125;]]cf<@{skill_stealth_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_stealth_exp}+?{Attribute&amp;#125;]]-@{skill_stealth_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_stealth_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_stealth_exp}+?{Attribute&amp;#125;]]cf<@{skill_stealth_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_stealth_exp}+?{Attribute&amp;#125;]]-@{skill_stealth_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_stealth_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_stealth_exp}+?{Attribute&amp;#125;]]cf<@{skill_stealth_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_stealth_exp}+?{Attribute&amp;#125;]]-@{skill_stealth_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_stealth_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_stealth_exp}+?{Attribute&amp;#125;]]cf<@{skill_stealth_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_stealth_exp}+?{Attribute&amp;#125;]]-@{skill_stealth_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_stealth_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_stealth_exp}+?{Attribute&amp;#125;]]cf<@{skill_stealth_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_stealth_exp}+?{Attribute&amp;#125;]]-@{skill_stealth_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_stealth_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_stealth_exp}+?{Attribute&amp;#125;]]cf<@{skill_stealth_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_stealth_exp}+?{Attribute&amp;#125;]]-@{skill_stealth_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_stealth_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_stealth_exp}+?{Attribute&amp;#125;]]cf<@{skill_stealth_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_stealth_exp}+?{Attribute&amp;#125;]]-@{skill_stealth_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_stealth_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_stealth_exp}+?{Attribute&amp;#125;]]cf<@{skill_stealth_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_stealth_exp}+?{Attribute&amp;#125;]]-@{skill_stealth_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
+							<button type="roll" name="roll_stealth" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Stealth Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Stealth}} {{skill_exp=@{skill_stealth_exp}}} {{skill_foc=@{skill_stealth_foc}}} {{attribute=?{Attribute|Agility, @{agility}|Awareness, @{awareness}|Brawn, @{brawn}|Coordination, @{coordination}|Intelligence, @{intelligence}|Personality, @{personality}|Willpower, @{willpower}}}} {{roll=[[{{ceil(([[@{skill_stealth_exp}+?{Attribute}]]-d20cs<[[@{skill_stealth_exp}+?{Attribute}]]cf<@{skill_stealth_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_stealth_exp}+?{Attribute}]]-@{skill_stealth_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_stealth_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_stealth_exp}+?{Attribute&amp;#125;]]cf<@{skill_stealth_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_stealth_exp}+?{Attribute&amp;#125;]]-@{skill_stealth_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_stealth_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_stealth_exp}+?{Attribute&amp;#125;]]cf<@{skill_stealth_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_stealth_exp}+?{Attribute&amp;#125;]]-@{skill_stealth_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_stealth_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_stealth_exp}+?{Attribute&amp;#125;]]cf<@{skill_stealth_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_stealth_exp}+?{Attribute&amp;#125;]]-@{skill_stealth_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_stealth_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_stealth_exp}+?{Attribute&amp;#125;]]cf<@{skill_stealth_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_stealth_exp}+?{Attribute&amp;#125;]]-@{skill_stealth_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_stealth_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_stealth_exp}+?{Attribute&amp;#125;]]cf<@{skill_stealth_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_stealth_exp}+?{Attribute&amp;#125;]]-@{skill_stealth_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_stealth_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_stealth_exp}+?{Attribute&amp;#125;]]cf<@{skill_stealth_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_stealth_exp}+?{Attribute&amp;#125;]]-@{skill_stealth_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_stealth_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_stealth_exp}+?{Attribute&amp;#125;]]cf<@{skill_stealth_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_stealth_exp}+?{Attribute&amp;#125;]]-@{skill_stealth_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_stealth_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_stealth_exp}+?{Attribute&amp;#125;]]cf<@{skill_stealth_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_stealth_exp}+?{Attribute&amp;#125;]]-@{skill_stealth_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_stealth_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_stealth_exp}+?{Attribute&amp;#125;]]cf<@{skill_stealth_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_stealth_exp}+?{Attribute&amp;#125;]]-@{skill_stealth_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_stealth_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_stealth_exp}+?{Attribute&amp;#125;]]cf<@{skill_stealth_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_stealth_exp}+?{Attribute&amp;#125;]]-@{skill_stealth_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
 							</button>
 						</td>
 					</tr>
@@ -520,7 +520,7 @@
 						<td colspan="3">AWARENESS</td>
 						<td><input type="number" value="7" name="attr_awareness" /></td>
 						<td>
-							<button type="roll" name="roll_Awareness" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Awareness Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{attribute=@{awareness}}} {{roll=[[{{ceil(([[@{awareness}]]-d20cs<[[@{awareness}]]cf<0cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{awareness}]])),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{awareness}]]-d20cs<[[@{awareness}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{awareness}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{awareness}]]-d20cs<[[@{awareness}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{awareness}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{awareness}]]-d20cs<[[@{awareness}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{awareness}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{awareness}]]-d20cs<[[@{awareness}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{awareness}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{awareness}]]-d20cs<[[@{awareness}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{awareness}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{awareness}]]-d20cs<[[@{awareness}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{awareness}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{awareness}]]-d20cs<[[@{awareness}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{awareness}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{awareness}]]-d20cs<[[@{awareness}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{awareness}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{awareness}]]-d20cs<[[@{awareness}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{awareness}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{awareness}]]-d20cs<[[@{awareness}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{awareness}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
+							<button type="roll" name="roll_awareness" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Awareness Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{attribute=@{awareness}}} {{roll=[[{{ceil(([[@{awareness}]]-d20cs<[[@{awareness}]]cf<0cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{awareness}]])),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{awareness}]]-d20cs<[[@{awareness}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{awareness}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{awareness}]]-d20cs<[[@{awareness}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{awareness}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{awareness}]]-d20cs<[[@{awareness}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{awareness}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{awareness}]]-d20cs<[[@{awareness}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{awareness}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{awareness}]]-d20cs<[[@{awareness}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{awareness}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{awareness}]]-d20cs<[[@{awareness}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{awareness}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{awareness}]]-d20cs<[[@{awareness}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{awareness}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{awareness}]]-d20cs<[[@{awareness}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{awareness}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{awareness}]]-d20cs<[[@{awareness}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{awareness}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{awareness}]]-d20cs<[[@{awareness}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{awareness}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
 							</button>
 						</td>
 					</tr>
@@ -537,7 +537,7 @@
 						<td><input type="number" value="0" name="attr_skill_analysis_exp" /></td>
 						<td><input type="number" value="0" name="attr_skill_analysis_foc" /></td>
 						<td>
-							<button type="roll" name="roll_Analysis" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Analysis Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Analysis}} {{skill_EXP=@{skill_analysis_exp}}} {{skill_FOC=@{skill_analysis_foc}}} {{attribute=?{Attribute|Awareness, @{awareness}|Agility, @{agility}|Brawn, @{brawn}|Coordination, @{coordination}|Intelligence, @{intelligence}|Personality, @{personality}|Willpower, @{willpower}}}} {{roll=[[{{ceil(([[@{skill_analysis_exp}+?{Attribute}]]-d20cs<[[@{skill_analysis_exp}+?{Attribute}]]cf<@{skill_analysis_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_analysis_exp}+?{Attribute}]]-@{skill_analysis_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_analysis_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_analysis_exp}+?{Attribute&amp;#125;]]cf<@{skill_analysis_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_analysis_exp}+?{Attribute&amp;#125;]]-@{skill_analysis_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_analysis_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_analysis_exp}+?{Attribute&amp;#125;]]cf<@{skill_analysis_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_analysis_exp}+?{Attribute&amp;#125;]]-@{skill_analysis_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_analysis_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_analysis_exp}+?{Attribute&amp;#125;]]cf<@{skill_analysis_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_analysis_exp}+?{Attribute&amp;#125;]]-@{skill_analysis_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_analysis_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_analysis_exp}+?{Attribute&amp;#125;]]cf<@{skill_analysis_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_analysis_exp}+?{Attribute&amp;#125;]]-@{skill_analysis_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_analysis_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_analysis_exp}+?{Attribute&amp;#125;]]cf<@{skill_analysis_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_analysis_exp}+?{Attribute&amp;#125;]]-@{skill_analysis_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_analysis_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_analysis_exp}+?{Attribute&amp;#125;]]cf<@{skill_analysis_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_analysis_exp}+?{Attribute&amp;#125;]]-@{skill_analysis_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_analysis_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_analysis_exp}+?{Attribute&amp;#125;]]cf<@{skill_analysis_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_analysis_exp}+?{Attribute&amp;#125;]]-@{skill_analysis_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_analysis_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_analysis_exp}+?{Attribute&amp;#125;]]cf<@{skill_analysis_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_analysis_exp}+?{Attribute&amp;#125;]]-@{skill_analysis_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_analysis_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_analysis_exp}+?{Attribute&amp;#125;]]cf<@{skill_analysis_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_analysis_exp}+?{Attribute&amp;#125;]]-@{skill_analysis_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_analysis_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_analysis_exp}+?{Attribute&amp;#125;]]cf<@{skill_analysis_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_analysis_exp}+?{Attribute&amp;#125;]]-@{skill_analysis_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
+							<button type="roll" name="roll_analysis" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Analysis Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Analysis}} {{skill_exp=@{skill_analysis_exp}}} {{skill_foc=@{skill_analysis_foc}}} {{attribute=?{Attribute|Awareness, @{awareness}|Agility, @{agility}|Brawn, @{brawn}|Coordination, @{coordination}|Intelligence, @{intelligence}|Personality, @{personality}|Willpower, @{willpower}}}} {{roll=[[{{ceil(([[@{skill_analysis_exp}+?{Attribute}]]-d20cs<[[@{skill_analysis_exp}+?{Attribute}]]cf<@{skill_analysis_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_analysis_exp}+?{Attribute}]]-@{skill_analysis_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_analysis_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_analysis_exp}+?{Attribute&amp;#125;]]cf<@{skill_analysis_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_analysis_exp}+?{Attribute&amp;#125;]]-@{skill_analysis_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_analysis_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_analysis_exp}+?{Attribute&amp;#125;]]cf<@{skill_analysis_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_analysis_exp}+?{Attribute&amp;#125;]]-@{skill_analysis_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_analysis_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_analysis_exp}+?{Attribute&amp;#125;]]cf<@{skill_analysis_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_analysis_exp}+?{Attribute&amp;#125;]]-@{skill_analysis_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_analysis_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_analysis_exp}+?{Attribute&amp;#125;]]cf<@{skill_analysis_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_analysis_exp}+?{Attribute&amp;#125;]]-@{skill_analysis_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_analysis_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_analysis_exp}+?{Attribute&amp;#125;]]cf<@{skill_analysis_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_analysis_exp}+?{Attribute&amp;#125;]]-@{skill_analysis_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_analysis_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_analysis_exp}+?{Attribute&amp;#125;]]cf<@{skill_analysis_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_analysis_exp}+?{Attribute&amp;#125;]]-@{skill_analysis_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_analysis_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_analysis_exp}+?{Attribute&amp;#125;]]cf<@{skill_analysis_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_analysis_exp}+?{Attribute&amp;#125;]]-@{skill_analysis_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_analysis_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_analysis_exp}+?{Attribute&amp;#125;]]cf<@{skill_analysis_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_analysis_exp}+?{Attribute&amp;#125;]]-@{skill_analysis_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_analysis_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_analysis_exp}+?{Attribute&amp;#125;]]cf<@{skill_analysis_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_analysis_exp}+?{Attribute&amp;#125;]]-@{skill_analysis_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_analysis_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_analysis_exp}+?{Attribute&amp;#125;]]cf<@{skill_analysis_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_analysis_exp}+?{Attribute&amp;#125;]]-@{skill_analysis_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
 							</button>
 						</td>
 					</tr>
@@ -547,7 +547,7 @@
 						<td><input type="number" value="0" name="attr_skill_extraplanetary_exp" /></td>
 						<td><input type="number" value="0" name="attr_skill_extraplanetary_foc" /></td>
 						<td>
-							<button type="roll" name="roll_Extraplanetary" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Extraplanetary Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Extraplanetary}} {{skill_EXP=@{skill_extraplanetary_exp}}} {{skill_FOC=@{skill_extraplanetary_foc}}} {{attribute=?{Attribute|Awareness, @{awareness}|Agility, @{agility}|Brawn, @{brawn}|Coordination, @{coordination}|Intelligence, @{intelligence}|Personality, @{personality}|Willpower, @{willpower}}}} {{roll=[[{{ceil(([[@{skill_extraplanetary_exp}+?{Attribute}]]-d20cs<[[@{skill_extraplanetary_exp}+?{Attribute}]]cf<@{skill_extraplanetary_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_extraplanetary_exp}+?{Attribute}]]-@{skill_extraplanetary_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]cf<@{skill_extraplanetary_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]-@{skill_extraplanetary_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]cf<@{skill_extraplanetary_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]-@{skill_extraplanetary_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]cf<@{skill_extraplanetary_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]-@{skill_extraplanetary_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]cf<@{skill_extraplanetary_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]-@{skill_extraplanetary_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]cf<@{skill_extraplanetary_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]-@{skill_extraplanetary_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]cf<@{skill_extraplanetary_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]-@{skill_extraplanetary_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]cf<@{skill_extraplanetary_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]-@{skill_extraplanetary_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]cf<@{skill_extraplanetary_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]-@{skill_extraplanetary_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]cf<@{skill_extraplanetary_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]-@{skill_extraplanetary_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]cf<@{skill_extraplanetary_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]-@{skill_extraplanetary_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
+							<button type="roll" name="roll_extraplanetary" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Extraplanetary Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Extraplanetary}} {{skill_exp=@{skill_extraplanetary_exp}}} {{skill_foc=@{skill_extraplanetary_foc}}} {{attribute=?{Attribute|Awareness, @{awareness}|Agility, @{agility}|Brawn, @{brawn}|Coordination, @{coordination}|Intelligence, @{intelligence}|Personality, @{personality}|Willpower, @{willpower}}}} {{roll=[[{{ceil(([[@{skill_extraplanetary_exp}+?{Attribute}]]-d20cs<[[@{skill_extraplanetary_exp}+?{Attribute}]]cf<@{skill_extraplanetary_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_extraplanetary_exp}+?{Attribute}]]-@{skill_extraplanetary_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]cf<@{skill_extraplanetary_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]-@{skill_extraplanetary_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]cf<@{skill_extraplanetary_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]-@{skill_extraplanetary_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]cf<@{skill_extraplanetary_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]-@{skill_extraplanetary_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]cf<@{skill_extraplanetary_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]-@{skill_extraplanetary_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]cf<@{skill_extraplanetary_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]-@{skill_extraplanetary_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]cf<@{skill_extraplanetary_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]-@{skill_extraplanetary_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]cf<@{skill_extraplanetary_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]-@{skill_extraplanetary_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]cf<@{skill_extraplanetary_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]-@{skill_extraplanetary_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]cf<@{skill_extraplanetary_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]-@{skill_extraplanetary_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]cf<@{skill_extraplanetary_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_extraplanetary_exp}+?{Attribute&amp;#125;]]-@{skill_extraplanetary_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
 							</button>
 						</td>
 					</tr>
@@ -557,7 +557,7 @@
 						<td><input type="number" value="0" name="attr_skill_observation_exp" /></td>
 						<td><input type="number" value="0" name="attr_skill_observation_foc" /></td>
 						<td>
-							<button type="roll" name="roll_Observation" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Observation Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Observation}} {{skill_EXP=@{skill_observation_exp}}} {{skill_FOC=@{skill_observation_foc}}} {{attribute=?{Attribute|Awareness, @{awareness}|Agility, @{agility}|Brawn, @{brawn}|Coordination, @{coordination}|Intelligence, @{intelligence}|Personality, @{personality}|Willpower, @{willpower}}}} {{roll=[[{{ceil(([[@{skill_observation_exp}+?{Attribute}]]-d20cs<[[@{skill_observation_exp}+?{Attribute}]]cf<@{skill_observation_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_observation_exp}+?{Attribute}]]-@{skill_observation_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_observation_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_observation_exp}+?{Attribute&amp;#125;]]cf<@{skill_observation_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_observation_exp}+?{Attribute&amp;#125;]]-@{skill_observation_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_observation_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_observation_exp}+?{Attribute&amp;#125;]]cf<@{skill_observation_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_observation_exp}+?{Attribute&amp;#125;]]-@{skill_observation_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_observation_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_observation_exp}+?{Attribute&amp;#125;]]cf<@{skill_observation_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_observation_exp}+?{Attribute&amp;#125;]]-@{skill_observation_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_observation_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_observation_exp}+?{Attribute&amp;#125;]]cf<@{skill_observation_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_observation_exp}+?{Attribute&amp;#125;]]-@{skill_observation_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_observation_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_observation_exp}+?{Attribute&amp;#125;]]cf<@{skill_observation_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_observation_exp}+?{Attribute&amp;#125;]]-@{skill_observation_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_observation_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_observation_exp}+?{Attribute&amp;#125;]]cf<@{skill_observation_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_observation_exp}+?{Attribute&amp;#125;]]-@{skill_observation_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_observation_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_observation_exp}+?{Attribute&amp;#125;]]cf<@{skill_observation_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_observation_exp}+?{Attribute&amp;#125;]]-@{skill_observation_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_observation_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_observation_exp}+?{Attribute&amp;#125;]]cf<@{skill_observation_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_observation_exp}+?{Attribute&amp;#125;]]-@{skill_observation_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_observation_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_observation_exp}+?{Attribute&amp;#125;]]cf<@{skill_observation_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_observation_exp}+?{Attribute&amp;#125;]]-@{skill_observation_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_observation_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_observation_exp}+?{Attribute&amp;#125;]]cf<@{skill_observation_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_observation_exp}+?{Attribute&amp;#125;]]-@{skill_observation_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
+							<button type="roll" name="roll_observation" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Observation Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Observation}} {{skill_exp=@{skill_observation_exp}}} {{skill_foc=@{skill_observation_foc}}} {{attribute=?{Attribute|Awareness, @{awareness}|Agility, @{agility}|Brawn, @{brawn}|Coordination, @{coordination}|Intelligence, @{intelligence}|Personality, @{personality}|Willpower, @{willpower}}}} {{roll=[[{{ceil(([[@{skill_observation_exp}+?{Attribute}]]-d20cs<[[@{skill_observation_exp}+?{Attribute}]]cf<@{skill_observation_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_observation_exp}+?{Attribute}]]-@{skill_observation_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_observation_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_observation_exp}+?{Attribute&amp;#125;]]cf<@{skill_observation_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_observation_exp}+?{Attribute&amp;#125;]]-@{skill_observation_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_observation_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_observation_exp}+?{Attribute&amp;#125;]]cf<@{skill_observation_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_observation_exp}+?{Attribute&amp;#125;]]-@{skill_observation_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_observation_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_observation_exp}+?{Attribute&amp;#125;]]cf<@{skill_observation_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_observation_exp}+?{Attribute&amp;#125;]]-@{skill_observation_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_observation_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_observation_exp}+?{Attribute&amp;#125;]]cf<@{skill_observation_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_observation_exp}+?{Attribute&amp;#125;]]-@{skill_observation_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_observation_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_observation_exp}+?{Attribute&amp;#125;]]cf<@{skill_observation_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_observation_exp}+?{Attribute&amp;#125;]]-@{skill_observation_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_observation_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_observation_exp}+?{Attribute&amp;#125;]]cf<@{skill_observation_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_observation_exp}+?{Attribute&amp;#125;]]-@{skill_observation_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_observation_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_observation_exp}+?{Attribute&amp;#125;]]cf<@{skill_observation_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_observation_exp}+?{Attribute&amp;#125;]]-@{skill_observation_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_observation_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_observation_exp}+?{Attribute&amp;#125;]]cf<@{skill_observation_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_observation_exp}+?{Attribute&amp;#125;]]-@{skill_observation_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_observation_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_observation_exp}+?{Attribute&amp;#125;]]cf<@{skill_observation_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_observation_exp}+?{Attribute&amp;#125;]]-@{skill_observation_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_observation_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_observation_exp}+?{Attribute&amp;#125;]]cf<@{skill_observation_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_observation_exp}+?{Attribute&amp;#125;]]-@{skill_observation_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
 							</button>
 						</td>
 					</tr>
@@ -567,7 +567,7 @@
 						<td><input type="number" value="0" name="attr_skill_survival_exp" /></td>
 						<td><input type="number" value="0" name="attr_skill_survival_foc" /></td>
 						<td>
-							<button type="roll" name="roll_Survival" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Survival Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Survival}} {{skill_EXP=@{skill_survival_exp}}} {{skill_FOC=@{skill_survival_foc}}} {{attribute=?{Attribute|Awareness, @{awareness}|Agility, @{agility}|Brawn, @{brawn}|Coordination, @{coordination}|Intelligence, @{intelligence}|Personality, @{personality}|Willpower, @{willpower}}}} {{roll=[[{{ceil(([[@{skill_survival_exp}+?{Attribute}]]-d20cs<[[@{skill_survival_exp}+?{Attribute}]]cf<@{skill_survival_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_survival_exp}+?{Attribute}]]-@{skill_survival_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_survival_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_survival_exp}+?{Attribute&amp;#125;]]cf<@{skill_survival_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_survival_exp}+?{Attribute&amp;#125;]]-@{skill_survival_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_survival_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_survival_exp}+?{Attribute&amp;#125;]]cf<@{skill_survival_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_survival_exp}+?{Attribute&amp;#125;]]-@{skill_survival_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_survival_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_survival_exp}+?{Attribute&amp;#125;]]cf<@{skill_survival_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_survival_exp}+?{Attribute&amp;#125;]]-@{skill_survival_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_survival_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_survival_exp}+?{Attribute&amp;#125;]]cf<@{skill_survival_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_survival_exp}+?{Attribute&amp;#125;]]-@{skill_survival_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_survival_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_survival_exp}+?{Attribute&amp;#125;]]cf<@{skill_survival_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_survival_exp}+?{Attribute&amp;#125;]]-@{skill_survival_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_survival_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_survival_exp}+?{Attribute&amp;#125;]]cf<@{skill_survival_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_survival_exp}+?{Attribute&amp;#125;]]-@{skill_survival_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_survival_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_survival_exp}+?{Attribute&amp;#125;]]cf<@{skill_survival_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_survival_exp}+?{Attribute&amp;#125;]]-@{skill_survival_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_survival_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_survival_exp}+?{Attribute&amp;#125;]]cf<@{skill_survival_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_survival_exp}+?{Attribute&amp;#125;]]-@{skill_survival_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_survival_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_survival_exp}+?{Attribute&amp;#125;]]cf<@{skill_survival_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_survival_exp}+?{Attribute&amp;#125;]]-@{skill_survival_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_survival_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_survival_exp}+?{Attribute&amp;#125;]]cf<@{skill_survival_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_survival_exp}+?{Attribute&amp;#125;]]-@{skill_survival_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
+							<button type="roll" name="roll_survival" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Survival Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Survival}} {{skill_exp=@{skill_survival_exp}}} {{skill_foc=@{skill_survival_foc}}} {{attribute=?{Attribute|Awareness, @{awareness}|Agility, @{agility}|Brawn, @{brawn}|Coordination, @{coordination}|Intelligence, @{intelligence}|Personality, @{personality}|Willpower, @{willpower}}}} {{roll=[[{{ceil(([[@{skill_survival_exp}+?{Attribute}]]-d20cs<[[@{skill_survival_exp}+?{Attribute}]]cf<@{skill_survival_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_survival_exp}+?{Attribute}]]-@{skill_survival_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_survival_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_survival_exp}+?{Attribute&amp;#125;]]cf<@{skill_survival_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_survival_exp}+?{Attribute&amp;#125;]]-@{skill_survival_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_survival_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_survival_exp}+?{Attribute&amp;#125;]]cf<@{skill_survival_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_survival_exp}+?{Attribute&amp;#125;]]-@{skill_survival_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_survival_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_survival_exp}+?{Attribute&amp;#125;]]cf<@{skill_survival_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_survival_exp}+?{Attribute&amp;#125;]]-@{skill_survival_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_survival_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_survival_exp}+?{Attribute&amp;#125;]]cf<@{skill_survival_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_survival_exp}+?{Attribute&amp;#125;]]-@{skill_survival_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_survival_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_survival_exp}+?{Attribute&amp;#125;]]cf<@{skill_survival_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_survival_exp}+?{Attribute&amp;#125;]]-@{skill_survival_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_survival_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_survival_exp}+?{Attribute&amp;#125;]]cf<@{skill_survival_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_survival_exp}+?{Attribute&amp;#125;]]-@{skill_survival_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_survival_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_survival_exp}+?{Attribute&amp;#125;]]cf<@{skill_survival_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_survival_exp}+?{Attribute&amp;#125;]]-@{skill_survival_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_survival_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_survival_exp}+?{Attribute&amp;#125;]]cf<@{skill_survival_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_survival_exp}+?{Attribute&amp;#125;]]-@{skill_survival_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_survival_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_survival_exp}+?{Attribute&amp;#125;]]cf<@{skill_survival_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_survival_exp}+?{Attribute&amp;#125;]]-@{skill_survival_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_survival_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_survival_exp}+?{Attribute&amp;#125;]]cf<@{skill_survival_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_survival_exp}+?{Attribute&amp;#125;]]-@{skill_survival_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
 							</button>
 						</td>
 					</tr>
@@ -577,7 +577,7 @@
 						<td><input type="number" value="0" name="attr_skill_thievery_exp" /></td>
 						<td><input type="number" value="0" name="attr_skill_thievery_foc" /></td>
 						<td>
-							<button type="roll" name="roll_Thievery" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Thievery Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Thievery}} {{skill_EXP=@{skill_thievery_exp}}} {{skill_FOC=@{skill_thievery_foc}}} {{attribute=?{Attribute|Awareness, @{awareness}|Agility, @{agility}|Brawn, @{brawn}|Coordination, @{coordination}|Intelligence, @{intelligence}|Personality, @{personality}|Willpower, @{willpower}}}} {{roll=[[{{ceil(([[@{skill_thievery_exp}+?{Attribute}]]-d20cs<[[@{skill_thievery_exp}+?{Attribute}]]cf<@{skill_thievery_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_thievery_exp}+?{Attribute}]]-@{skill_thievery_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_thievery_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_thievery_exp}+?{Attribute&amp;#125;]]cf<@{skill_thievery_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_thievery_exp}+?{Attribute&amp;#125;]]-@{skill_thievery_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_thievery_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_thievery_exp}+?{Attribute&amp;#125;]]cf<@{skill_thievery_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_thievery_exp}+?{Attribute&amp;#125;]]-@{skill_thievery_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_thievery_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_thievery_exp}+?{Attribute&amp;#125;]]cf<@{skill_thievery_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_thievery_exp}+?{Attribute&amp;#125;]]-@{skill_thievery_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_thievery_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_thievery_exp}+?{Attribute&amp;#125;]]cf<@{skill_thievery_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_thievery_exp}+?{Attribute&amp;#125;]]-@{skill_thievery_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_thievery_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_thievery_exp}+?{Attribute&amp;#125;]]cf<@{skill_thievery_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_thievery_exp}+?{Attribute&amp;#125;]]-@{skill_thievery_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_thievery_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_thievery_exp}+?{Attribute&amp;#125;]]cf<@{skill_thievery_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_thievery_exp}+?{Attribute&amp;#125;]]-@{skill_thievery_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_thievery_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_thievery_exp}+?{Attribute&amp;#125;]]cf<@{skill_thievery_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_thievery_exp}+?{Attribute&amp;#125;]]-@{skill_thievery_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_thievery_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_thievery_exp}+?{Attribute&amp;#125;]]cf<@{skill_thievery_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_thievery_exp}+?{Attribute&amp;#125;]]-@{skill_thievery_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_thievery_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_thievery_exp}+?{Attribute&amp;#125;]]cf<@{skill_thievery_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_thievery_exp}+?{Attribute&amp;#125;]]-@{skill_thievery_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_thievery_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_thievery_exp}+?{Attribute&amp;#125;]]cf<@{skill_thievery_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_thievery_exp}+?{Attribute&amp;#125;]]-@{skill_thievery_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
+							<button type="roll" name="roll_thievery" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Thievery Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Thievery}} {{skill_exp=@{skill_thievery_exp}}} {{skill_foc=@{skill_thievery_foc}}} {{attribute=?{Attribute|Awareness, @{awareness}|Agility, @{agility}|Brawn, @{brawn}|Coordination, @{coordination}|Intelligence, @{intelligence}|Personality, @{personality}|Willpower, @{willpower}}}} {{roll=[[{{ceil(([[@{skill_thievery_exp}+?{Attribute}]]-d20cs<[[@{skill_thievery_exp}+?{Attribute}]]cf<@{skill_thievery_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_thievery_exp}+?{Attribute}]]-@{skill_thievery_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_thievery_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_thievery_exp}+?{Attribute&amp;#125;]]cf<@{skill_thievery_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_thievery_exp}+?{Attribute&amp;#125;]]-@{skill_thievery_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_thievery_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_thievery_exp}+?{Attribute&amp;#125;]]cf<@{skill_thievery_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_thievery_exp}+?{Attribute&amp;#125;]]-@{skill_thievery_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_thievery_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_thievery_exp}+?{Attribute&amp;#125;]]cf<@{skill_thievery_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_thievery_exp}+?{Attribute&amp;#125;]]-@{skill_thievery_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_thievery_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_thievery_exp}+?{Attribute&amp;#125;]]cf<@{skill_thievery_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_thievery_exp}+?{Attribute&amp;#125;]]-@{skill_thievery_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_thievery_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_thievery_exp}+?{Attribute&amp;#125;]]cf<@{skill_thievery_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_thievery_exp}+?{Attribute&amp;#125;]]-@{skill_thievery_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_thievery_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_thievery_exp}+?{Attribute&amp;#125;]]cf<@{skill_thievery_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_thievery_exp}+?{Attribute&amp;#125;]]-@{skill_thievery_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_thievery_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_thievery_exp}+?{Attribute&amp;#125;]]cf<@{skill_thievery_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_thievery_exp}+?{Attribute&amp;#125;]]-@{skill_thievery_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_thievery_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_thievery_exp}+?{Attribute&amp;#125;]]cf<@{skill_thievery_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_thievery_exp}+?{Attribute&amp;#125;]]-@{skill_thievery_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_thievery_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_thievery_exp}+?{Attribute&amp;#125;]]cf<@{skill_thievery_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_thievery_exp}+?{Attribute&amp;#125;]]-@{skill_thievery_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_thievery_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_thievery_exp}+?{Attribute&amp;#125;]]cf<@{skill_thievery_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_thievery_exp}+?{Attribute&amp;#125;]]-@{skill_thievery_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
 							</button>
 						</td>
 					</tr>
@@ -588,7 +588,7 @@
 						<td colspan="3">Brawn</td>
 						<td><input type="number" value="7" name="attr_brawn" /></td>
 						<td>
-							<button type="roll" name="roll_Brawn" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Brawn Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{attribute=@{brawn}}} {{roll=[[{{ceil(([[@{brawn}]]-d20cs<[[@{brawn}]]cf<0cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{brawn}]])),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{brawn}]]-d20cs<[[@{brawn}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{brawn}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{brawn}]]-d20cs<[[@{brawn}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{brawn}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{brawn}]]-d20cs<[[@{brawn}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{brawn}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{brawn}]]-d20cs<[[@{brawn}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{brawn}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{brawn}]]-d20cs<[[@{brawn}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{brawn}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{brawn}]]-d20cs<[[@{brawn}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{brawn}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{brawn}]]-d20cs<[[@{brawn}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{brawn}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{brawn}]]-d20cs<[[@{brawn}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{brawn}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{brawn}]]-d20cs<[[@{brawn}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{brawn}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{brawn}]]-d20cs<[[@{brawn}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{brawn}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
+							<button type="roll" name="roll_brawn" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Brawn Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{attribute=@{brawn}}} {{roll=[[{{ceil(([[@{brawn}]]-d20cs<[[@{brawn}]]cf<0cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{brawn}]])),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{brawn}]]-d20cs<[[@{brawn}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{brawn}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{brawn}]]-d20cs<[[@{brawn}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{brawn}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{brawn}]]-d20cs<[[@{brawn}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{brawn}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{brawn}]]-d20cs<[[@{brawn}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{brawn}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{brawn}]]-d20cs<[[@{brawn}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{brawn}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{brawn}]]-d20cs<[[@{brawn}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{brawn}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{brawn}]]-d20cs<[[@{brawn}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{brawn}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{brawn}]]-d20cs<[[@{brawn}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{brawn}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{brawn}]]-d20cs<[[@{brawn}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{brawn}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{brawn}]]-d20cs<[[@{brawn}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{brawn}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
 							</button>
 						</td>
 					</tr>
@@ -605,7 +605,7 @@
 						<td><input type="number" value="0" name="attr_skill_athletics_exp" /></td>
 						<td><input type="number" value="0" name="attr_skill_athletics_foc" /></td>
 						<td>
-							<button type="roll" name="roll_Athletics" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Athletics Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Athletics}} {{skill_EXP=@{skill_athletics_exp}}} {{skill_FOC=@{skill_athletics_foc}}} {{attribute=?{Attribute|Brawn, @{brawn}|Agility, @{agility}|Awareness, @{awareness}|Coordination, @{coordination}|Intelligence, @{intelligence}|Personality, @{personality}|Willpower, @{willpower}}}} {{roll=[[{{ceil(([[@{skill_athletics_exp}+?{Attribute}]]-d20cs<[[@{skill_athletics_exp}+?{Attribute}]]cf<@{skill_athletics_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_athletics_exp}+?{Attribute}]]-@{skill_athletics_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_athletics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_athletics_exp}+?{Attribute&amp;#125;]]cf<@{skill_athletics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_athletics_exp}+?{Attribute&amp;#125;]]-@{skill_athletics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_athletics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_athletics_exp}+?{Attribute&amp;#125;]]cf<@{skill_athletics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_athletics_exp}+?{Attribute&amp;#125;]]-@{skill_athletics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_athletics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_athletics_exp}+?{Attribute&amp;#125;]]cf<@{skill_athletics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_athletics_exp}+?{Attribute&amp;#125;]]-@{skill_athletics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_athletics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_athletics_exp}+?{Attribute&amp;#125;]]cf<@{skill_athletics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_athletics_exp}+?{Attribute&amp;#125;]]-@{skill_athletics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_athletics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_athletics_exp}+?{Attribute&amp;#125;]]cf<@{skill_athletics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_athletics_exp}+?{Attribute&amp;#125;]]-@{skill_athletics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_athletics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_athletics_exp}+?{Attribute&amp;#125;]]cf<@{skill_athletics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_athletics_exp}+?{Attribute&amp;#125;]]-@{skill_athletics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_athletics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_athletics_exp}+?{Attribute&amp;#125;]]cf<@{skill_athletics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_athletics_exp}+?{Attribute&amp;#125;]]-@{skill_athletics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_athletics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_athletics_exp}+?{Attribute&amp;#125;]]cf<@{skill_athletics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_athletics_exp}+?{Attribute&amp;#125;]]-@{skill_athletics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_athletics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_athletics_exp}+?{Attribute&amp;#125;]]cf<@{skill_athletics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_athletics_exp}+?{Attribute&amp;#125;]]-@{skill_athletics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_athletics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_athletics_exp}+?{Attribute&amp;#125;]]cf<@{skill_athletics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_athletics_exp}+?{Attribute&amp;#125;]]-@{skill_athletics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
+							<button type="roll" name="roll_athletics" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Athletics Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Athletics}} {{skill_exp=@{skill_athletics_exp}}} {{skill_foc=@{skill_athletics_foc}}} {{attribute=?{Attribute|Brawn, @{brawn}|Agility, @{agility}|Awareness, @{awareness}|Coordination, @{coordination}|Intelligence, @{intelligence}|Personality, @{personality}|Willpower, @{willpower}}}} {{roll=[[{{ceil(([[@{skill_athletics_exp}+?{Attribute}]]-d20cs<[[@{skill_athletics_exp}+?{Attribute}]]cf<@{skill_athletics_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_athletics_exp}+?{Attribute}]]-@{skill_athletics_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_athletics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_athletics_exp}+?{Attribute&amp;#125;]]cf<@{skill_athletics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_athletics_exp}+?{Attribute&amp;#125;]]-@{skill_athletics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_athletics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_athletics_exp}+?{Attribute&amp;#125;]]cf<@{skill_athletics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_athletics_exp}+?{Attribute&amp;#125;]]-@{skill_athletics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_athletics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_athletics_exp}+?{Attribute&amp;#125;]]cf<@{skill_athletics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_athletics_exp}+?{Attribute&amp;#125;]]-@{skill_athletics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_athletics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_athletics_exp}+?{Attribute&amp;#125;]]cf<@{skill_athletics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_athletics_exp}+?{Attribute&amp;#125;]]-@{skill_athletics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_athletics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_athletics_exp}+?{Attribute&amp;#125;]]cf<@{skill_athletics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_athletics_exp}+?{Attribute&amp;#125;]]-@{skill_athletics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_athletics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_athletics_exp}+?{Attribute&amp;#125;]]cf<@{skill_athletics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_athletics_exp}+?{Attribute&amp;#125;]]-@{skill_athletics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_athletics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_athletics_exp}+?{Attribute&amp;#125;]]cf<@{skill_athletics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_athletics_exp}+?{Attribute&amp;#125;]]-@{skill_athletics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_athletics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_athletics_exp}+?{Attribute&amp;#125;]]cf<@{skill_athletics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_athletics_exp}+?{Attribute&amp;#125;]]-@{skill_athletics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_athletics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_athletics_exp}+?{Attribute&amp;#125;]]cf<@{skill_athletics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_athletics_exp}+?{Attribute&amp;#125;]]-@{skill_athletics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_athletics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_athletics_exp}+?{Attribute&amp;#125;]]cf<@{skill_athletics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_athletics_exp}+?{Attribute&amp;#125;]]-@{skill_athletics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
 							</button>
 						</td>
 					</tr>
@@ -615,7 +615,7 @@
 						<td><input type="number" value="0" name="attr_skill_resistance_exp" /></td>
 						<td><input type="number" value="0" name="attr_skill_resistance_foc" /></td>
 						<td>
-							<button type="roll" name="roll_Resistance" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Resistance Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Resistance}} {{skill_EXP=@{skill_resistance_exp}}} {{skill_FOC=@{skill_resistance_foc}}} {{attribute=?{Attribute|Brawn, @{brawn}|Agility, @{agility}|Awareness, @{awareness}|Coordination, @{coordination}|Intelligence, @{intelligence}|Personality, @{personality}|Willpower, @{willpower}}}} {{roll=[[{{ceil(([[@{skill_resistance_exp}+?{Attribute}]]-d20cs<[[@{skill_resistance_exp}+?{Attribute}]]cf<@{skill_resistance_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_resistance_exp}+?{Attribute}]]-@{skill_resistance_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_resistance_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_resistance_exp}+?{Attribute&amp;#125;]]cf<@{skill_resistance_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_resistance_exp}+?{Attribute&amp;#125;]]-@{skill_resistance_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_resistance_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_resistance_exp}+?{Attribute&amp;#125;]]cf<@{skill_resistance_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_resistance_exp}+?{Attribute&amp;#125;]]-@{skill_resistance_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_resistance_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_resistance_exp}+?{Attribute&amp;#125;]]cf<@{skill_resistance_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_resistance_exp}+?{Attribute&amp;#125;]]-@{skill_resistance_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_resistance_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_resistance_exp}+?{Attribute&amp;#125;]]cf<@{skill_resistance_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_resistance_exp}+?{Attribute&amp;#125;]]-@{skill_resistance_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_resistance_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_resistance_exp}+?{Attribute&amp;#125;]]cf<@{skill_resistance_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_resistance_exp}+?{Attribute&amp;#125;]]-@{skill_resistance_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_resistance_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_resistance_exp}+?{Attribute&amp;#125;]]cf<@{skill_resistance_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_resistance_exp}+?{Attribute&amp;#125;]]-@{skill_resistance_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_resistance_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_resistance_exp}+?{Attribute&amp;#125;]]cf<@{skill_resistance_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_resistance_exp}+?{Attribute&amp;#125;]]-@{skill_resistance_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_resistance_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_resistance_exp}+?{Attribute&amp;#125;]]cf<@{skill_resistance_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_resistance_exp}+?{Attribute&amp;#125;]]-@{skill_resistance_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_resistance_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_resistance_exp}+?{Attribute&amp;#125;]]cf<@{skill_resistance_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_resistance_exp}+?{Attribute&amp;#125;]]-@{skill_resistance_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_resistance_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_resistance_exp}+?{Attribute&amp;#125;]]cf<@{skill_resistance_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_resistance_exp}+?{Attribute&amp;#125;]]-@{skill_resistance_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
+							<button type="roll" name="roll_resistance" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Resistance Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Resistance}} {{skill_exp=@{skill_resistance_exp}}} {{skill_foc=@{skill_resistance_foc}}} {{attribute=?{Attribute|Brawn, @{brawn}|Agility, @{agility}|Awareness, @{awareness}|Coordination, @{coordination}|Intelligence, @{intelligence}|Personality, @{personality}|Willpower, @{willpower}}}} {{roll=[[{{ceil(([[@{skill_resistance_exp}+?{Attribute}]]-d20cs<[[@{skill_resistance_exp}+?{Attribute}]]cf<@{skill_resistance_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_resistance_exp}+?{Attribute}]]-@{skill_resistance_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_resistance_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_resistance_exp}+?{Attribute&amp;#125;]]cf<@{skill_resistance_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_resistance_exp}+?{Attribute&amp;#125;]]-@{skill_resistance_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_resistance_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_resistance_exp}+?{Attribute&amp;#125;]]cf<@{skill_resistance_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_resistance_exp}+?{Attribute&amp;#125;]]-@{skill_resistance_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_resistance_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_resistance_exp}+?{Attribute&amp;#125;]]cf<@{skill_resistance_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_resistance_exp}+?{Attribute&amp;#125;]]-@{skill_resistance_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_resistance_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_resistance_exp}+?{Attribute&amp;#125;]]cf<@{skill_resistance_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_resistance_exp}+?{Attribute&amp;#125;]]-@{skill_resistance_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_resistance_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_resistance_exp}+?{Attribute&amp;#125;]]cf<@{skill_resistance_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_resistance_exp}+?{Attribute&amp;#125;]]-@{skill_resistance_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_resistance_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_resistance_exp}+?{Attribute&amp;#125;]]cf<@{skill_resistance_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_resistance_exp}+?{Attribute&amp;#125;]]-@{skill_resistance_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_resistance_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_resistance_exp}+?{Attribute&amp;#125;]]cf<@{skill_resistance_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_resistance_exp}+?{Attribute&amp;#125;]]-@{skill_resistance_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_resistance_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_resistance_exp}+?{Attribute&amp;#125;]]cf<@{skill_resistance_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_resistance_exp}+?{Attribute&amp;#125;]]-@{skill_resistance_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_resistance_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_resistance_exp}+?{Attribute&amp;#125;]]cf<@{skill_resistance_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_resistance_exp}+?{Attribute&amp;#125;]]-@{skill_resistance_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_resistance_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_resistance_exp}+?{Attribute&amp;#125;]]cf<@{skill_resistance_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_resistance_exp}+?{Attribute&amp;#125;]]-@{skill_resistance_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
 							</button>
 						</td>
 					</tr>
@@ -626,7 +626,7 @@
 						<td colspan="3">Coordination</td>
 						<td><input type="number" value="7" name="attr_coordination" /></td>
 						<td>
-							<button type="roll" name="roll_Coordination" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Coordination Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{attribute=@{coordination}}} {{roll=[[{{ceil(([[@{coordination}]]-d20cs<[[@{coordination}]]cf<0cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{coordination}]])),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{coordination}]]-d20cs<[[@{coordination}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{coordination}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{coordination}]]-d20cs<[[@{coordination}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{coordination}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{coordination}]]-d20cs<[[@{coordination}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{coordination}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{coordination}]]-d20cs<[[@{coordination}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{coordination}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{coordination}]]-d20cs<[[@{coordination}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{coordination}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{coordination}]]-d20cs<[[@{coordination}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{coordination}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{coordination}]]-d20cs<[[@{coordination}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{coordination}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{coordination}]]-d20cs<[[@{coordination}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{coordination}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{coordination}]]-d20cs<[[@{coordination}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{coordination}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{coordination}]]-d20cs<[[@{coordination}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{coordination}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
+							<button type="roll" name="roll_coordination" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Coordination Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{attribute=@{coordination}}} {{roll=[[{{ceil(([[@{coordination}]]-d20cs<[[@{coordination}]]cf<0cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{coordination}]])),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{coordination}]]-d20cs<[[@{coordination}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{coordination}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{coordination}]]-d20cs<[[@{coordination}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{coordination}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{coordination}]]-d20cs<[[@{coordination}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{coordination}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{coordination}]]-d20cs<[[@{coordination}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{coordination}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{coordination}]]-d20cs<[[@{coordination}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{coordination}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{coordination}]]-d20cs<[[@{coordination}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{coordination}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{coordination}]]-d20cs<[[@{coordination}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{coordination}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{coordination}]]-d20cs<[[@{coordination}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{coordination}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{coordination}]]-d20cs<[[@{coordination}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{coordination}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{coordination}]]-d20cs<[[@{coordination}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{coordination}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
 							</button>
 						</td>
 					</tr>
@@ -643,7 +643,7 @@
 						<td><input type="number" value="0" name="attr_skill_ballistics_exp" /></td>
 						<td><input type="number" value="0" name="attr_skill_ballistics_foc" /></td>
 						<td>
-							<button type="roll" name="roll_Ballistics" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Ballistics Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Ballistics}} {{skill_EXP=@{skill_ballistics_exp}}} {{skill_FOC=@{skill_ballistics_foc}}} {{attribute=?{Attribute|Coordination, @{coordination}|Agility, @{agility}|Awareness, @{awareness}|Brawn, @{brawn}|Intelligence, @{intelligence}|Personality, @{personality}|Willpower, @{willpower}}}} {{roll=[[{{ceil(([[@{skill_ballistics_exp}+?{Attribute}]]-d20cs<[[@{skill_ballistics_exp}+?{Attribute}]]cf<@{skill_ballistics_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_ballistics_exp}+?{Attribute}]]-@{skill_ballistics_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]cf<@{skill_ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]-@{skill_ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]cf<@{skill_ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]-@{skill_ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]cf<@{skill_ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]-@{skill_ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]cf<@{skill_ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]-@{skill_ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]cf<@{skill_ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]-@{skill_ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]cf<@{skill_ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]-@{skill_ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]cf<@{skill_ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]-@{skill_ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]cf<@{skill_ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]-@{skill_ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]cf<@{skill_ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]-@{skill_ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]cf<@{skill_ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]-@{skill_ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
+							<button type="roll" name="roll_ballistics" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Ballistics Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Ballistics}} {{skill_exp=@{skill_ballistics_exp}}} {{skill_foc=@{skill_ballistics_foc}}} {{attribute=?{Attribute|Coordination, @{coordination}|Agility, @{agility}|Awareness, @{awareness}|Brawn, @{brawn}|Intelligence, @{intelligence}|Personality, @{personality}|Willpower, @{willpower}}}} {{roll=[[{{ceil(([[@{skill_ballistics_exp}+?{Attribute}]]-d20cs<[[@{skill_ballistics_exp}+?{Attribute}]]cf<@{skill_ballistics_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_ballistics_exp}+?{Attribute}]]-@{skill_ballistics_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]cf<@{skill_ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]-@{skill_ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]cf<@{skill_ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]-@{skill_ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]cf<@{skill_ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]-@{skill_ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]cf<@{skill_ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]-@{skill_ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]cf<@{skill_ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]-@{skill_ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]cf<@{skill_ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]-@{skill_ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]cf<@{skill_ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]-@{skill_ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]cf<@{skill_ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]-@{skill_ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]cf<@{skill_ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]-@{skill_ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]cf<@{skill_ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_ballistics_exp}+?{Attribute&amp;#125;]]-@{skill_ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
 							</button>
 						</td>
 					</tr>
@@ -653,7 +653,7 @@
 						<td><input type="number" value="0" name="attr_skill_pilot_exp" /></td>
 						<td><input type="number" value="0" name="attr_skill_pilot_foc" /></td>
 						<td>
-							<button type="roll" name="roll_Pilot" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Pilot Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Pilot}} {{skill_EXP=@{skill_pilot_exp}}} {{skill_FOC=@{skill_pilot_foc}}} {{attribute=?{Attribute|Coordination, @{coordination}|Agility, @{agility}|Awareness, @{awareness}|Brawn, @{brawn}|Intelligence, @{intelligence}|Personality, @{personality}|Willpower, @{willpower}}}} {{roll=[[{{ceil(([[@{skill_pilot_exp}+?{Attribute}]]-d20cs<[[@{skill_pilot_exp}+?{Attribute}]]cf<@{skill_pilot_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_pilot_exp}+?{Attribute}]]-@{skill_pilot_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_pilot_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_pilot_exp}+?{Attribute&amp;#125;]]cf<@{skill_pilot_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_pilot_exp}+?{Attribute&amp;#125;]]-@{skill_pilot_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_pilot_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_pilot_exp}+?{Attribute&amp;#125;]]cf<@{skill_pilot_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_pilot_exp}+?{Attribute&amp;#125;]]-@{skill_pilot_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_pilot_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_pilot_exp}+?{Attribute&amp;#125;]]cf<@{skill_pilot_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_pilot_exp}+?{Attribute&amp;#125;]]-@{skill_pilot_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_pilot_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_pilot_exp}+?{Attribute&amp;#125;]]cf<@{skill_pilot_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_pilot_exp}+?{Attribute&amp;#125;]]-@{skill_pilot_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_pilot_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_pilot_exp}+?{Attribute&amp;#125;]]cf<@{skill_pilot_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_pilot_exp}+?{Attribute&amp;#125;]]-@{skill_pilot_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_pilot_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_pilot_exp}+?{Attribute&amp;#125;]]cf<@{skill_pilot_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_pilot_exp}+?{Attribute&amp;#125;]]-@{skill_pilot_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_pilot_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_pilot_exp}+?{Attribute&amp;#125;]]cf<@{skill_pilot_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_pilot_exp}+?{Attribute&amp;#125;]]-@{skill_pilot_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_pilot_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_pilot_exp}+?{Attribute&amp;#125;]]cf<@{skill_pilot_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_pilot_exp}+?{Attribute&amp;#125;]]-@{skill_pilot_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_pilot_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_pilot_exp}+?{Attribute&amp;#125;]]cf<@{skill_pilot_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_pilot_exp}+?{Attribute&amp;#125;]]-@{skill_pilot_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_pilot_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_pilot_exp}+?{Attribute&amp;#125;]]cf<@{skill_pilot_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_pilot_exp}+?{Attribute&amp;#125;]]-@{skill_pilot_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
+							<button type="roll" name="roll_pilot" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Pilot Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Pilot}} {{skill_exp=@{skill_pilot_exp}}} {{skill_foc=@{skill_pilot_foc}}} {{attribute=?{Attribute|Coordination, @{coordination}|Agility, @{agility}|Awareness, @{awareness}|Brawn, @{brawn}|Intelligence, @{intelligence}|Personality, @{personality}|Willpower, @{willpower}}}} {{roll=[[{{ceil(([[@{skill_pilot_exp}+?{Attribute}]]-d20cs<[[@{skill_pilot_exp}+?{Attribute}]]cf<@{skill_pilot_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_pilot_exp}+?{Attribute}]]-@{skill_pilot_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_pilot_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_pilot_exp}+?{Attribute&amp;#125;]]cf<@{skill_pilot_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_pilot_exp}+?{Attribute&amp;#125;]]-@{skill_pilot_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_pilot_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_pilot_exp}+?{Attribute&amp;#125;]]cf<@{skill_pilot_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_pilot_exp}+?{Attribute&amp;#125;]]-@{skill_pilot_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_pilot_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_pilot_exp}+?{Attribute&amp;#125;]]cf<@{skill_pilot_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_pilot_exp}+?{Attribute&amp;#125;]]-@{skill_pilot_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_pilot_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_pilot_exp}+?{Attribute&amp;#125;]]cf<@{skill_pilot_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_pilot_exp}+?{Attribute&amp;#125;]]-@{skill_pilot_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_pilot_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_pilot_exp}+?{Attribute&amp;#125;]]cf<@{skill_pilot_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_pilot_exp}+?{Attribute&amp;#125;]]-@{skill_pilot_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_pilot_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_pilot_exp}+?{Attribute&amp;#125;]]cf<@{skill_pilot_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_pilot_exp}+?{Attribute&amp;#125;]]-@{skill_pilot_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_pilot_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_pilot_exp}+?{Attribute&amp;#125;]]cf<@{skill_pilot_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_pilot_exp}+?{Attribute&amp;#125;]]-@{skill_pilot_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_pilot_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_pilot_exp}+?{Attribute&amp;#125;]]cf<@{skill_pilot_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_pilot_exp}+?{Attribute&amp;#125;]]-@{skill_pilot_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_pilot_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_pilot_exp}+?{Attribute&amp;#125;]]cf<@{skill_pilot_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_pilot_exp}+?{Attribute&amp;#125;]]-@{skill_pilot_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_pilot_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_pilot_exp}+?{Attribute&amp;#125;]]cf<@{skill_pilot_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_pilot_exp}+?{Attribute&amp;#125;]]-@{skill_pilot_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
 							</button>
 						</td>
 					</tr>
@@ -663,7 +663,7 @@
 						<td><input type="number" value="0" name="attr_skill_spacecraft_exp" /></td>
 						<td><input type="number" value="0" name="attr_skill_spacecraft_foc" /></td>
 						<td>
-							<button type="roll" name="roll_Spacecraft" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Spacecraft Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Spacecraft}} {{skill_EXP=@{skill_spacecraft_exp}}} {{skill_FOC=@{skill_spacecraft_foc}}} {{attribute=?{Attribute|Coordination, @{coordination}|Agility, @{agility}|Awareness, @{awareness}|Brawn, @{brawn}|Intelligence, @{intelligence}|Personality, @{personality}|Willpower, @{willpower}}}} {{roll=[[{{ceil(([[@{skill_spacecraft_exp}+?{Attribute}]]-d20cs<[[@{skill_spacecraft_exp}+?{Attribute}]]cf<@{skill_spacecraft_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_spacecraft_exp}+?{Attribute}]]-@{skill_spacecraft_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]cf<@{skill_spacecraft_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]-@{skill_spacecraft_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]cf<@{skill_spacecraft_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]-@{skill_spacecraft_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]cf<@{skill_spacecraft_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]-@{skill_spacecraft_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]cf<@{skill_spacecraft_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]-@{skill_spacecraft_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]cf<@{skill_spacecraft_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]-@{skill_spacecraft_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]cf<@{skill_spacecraft_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]-@{skill_spacecraft_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]cf<@{skill_spacecraft_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]-@{skill_spacecraft_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]cf<@{skill_spacecraft_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]-@{skill_spacecraft_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]cf<@{skill_spacecraft_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]-@{skill_spacecraft_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]cf<@{skill_spacecraft_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]-@{skill_spacecraft_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
+							<button type="roll" name="roll_spacecraft" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Spacecraft Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Spacecraft}} {{skill_exp=@{skill_spacecraft_exp}}} {{skill_foc=@{skill_spacecraft_foc}}} {{attribute=?{Attribute|Coordination, @{coordination}|Agility, @{agility}|Awareness, @{awareness}|Brawn, @{brawn}|Intelligence, @{intelligence}|Personality, @{personality}|Willpower, @{willpower}}}} {{roll=[[{{ceil(([[@{skill_spacecraft_exp}+?{Attribute}]]-d20cs<[[@{skill_spacecraft_exp}+?{Attribute}]]cf<@{skill_spacecraft_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_spacecraft_exp}+?{Attribute}]]-@{skill_spacecraft_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]cf<@{skill_spacecraft_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]-@{skill_spacecraft_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]cf<@{skill_spacecraft_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]-@{skill_spacecraft_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]cf<@{skill_spacecraft_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]-@{skill_spacecraft_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]cf<@{skill_spacecraft_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]-@{skill_spacecraft_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]cf<@{skill_spacecraft_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]-@{skill_spacecraft_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]cf<@{skill_spacecraft_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]-@{skill_spacecraft_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]cf<@{skill_spacecraft_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]-@{skill_spacecraft_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]cf<@{skill_spacecraft_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]-@{skill_spacecraft_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]cf<@{skill_spacecraft_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]-@{skill_spacecraft_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]cf<@{skill_spacecraft_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_spacecraft_exp}+?{Attribute&amp;#125;]]-@{skill_spacecraft_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
 							</button>
 						</td>
 					</tr>
@@ -674,7 +674,7 @@
 						<td colspan="3">Intelligence</td>
 						<td><input type="number" value="7" name="attr_intelligence" /></td>
 						<td>
-							<button type="roll" name="roll_Intelligence" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Intelligence Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{attribute=@{intelligence}}} {{roll=[[{{ceil(([[@{intelligence}]]-d20cs<[[@{intelligence}]]cf<0cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{intelligence}]])),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{intelligence}]]-d20cs<[[@{intelligence}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{intelligence}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{intelligence}]]-d20cs<[[@{intelligence}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{intelligence}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{intelligence}]]-d20cs<[[@{intelligence}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{intelligence}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{intelligence}]]-d20cs<[[@{intelligence}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{intelligence}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{intelligence}]]-d20cs<[[@{intelligence}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{intelligence}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{intelligence}]]-d20cs<[[@{intelligence}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{intelligence}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{intelligence}]]-d20cs<[[@{intelligence}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{intelligence}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{intelligence}]]-d20cs<[[@{intelligence}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{intelligence}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{intelligence}]]-d20cs<[[@{intelligence}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{intelligence}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{intelligence}]]-d20cs<[[@{intelligence}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{intelligence}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
+							<button type="roll" name="roll_intelligence" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Intelligence Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{attribute=@{intelligence}}} {{roll=[[{{ceil(([[@{intelligence}]]-d20cs<[[@{intelligence}]]cf<0cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{intelligence}]])),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{intelligence}]]-d20cs<[[@{intelligence}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{intelligence}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{intelligence}]]-d20cs<[[@{intelligence}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{intelligence}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{intelligence}]]-d20cs<[[@{intelligence}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{intelligence}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{intelligence}]]-d20cs<[[@{intelligence}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{intelligence}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{intelligence}]]-d20cs<[[@{intelligence}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{intelligence}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{intelligence}]]-d20cs<[[@{intelligence}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{intelligence}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{intelligence}]]-d20cs<[[@{intelligence}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{intelligence}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{intelligence}]]-d20cs<[[@{intelligence}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{intelligence}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{intelligence}]]-d20cs<[[@{intelligence}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{intelligence}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{intelligence}]]-d20cs<[[@{intelligence}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{intelligence}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
 							</button>
 						</td>
 					</tr>
@@ -691,7 +691,7 @@
 						<td><input type="number" value="0" name="attr_skill_education_exp" /></td>
 						<td><input type="number" value="0" name="attr_skill_education_foc" /></td>
 						<td>
-							<button type="roll" name="roll_Education" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Education Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Education}} {{skill_EXP=@{skill_education_exp}}} {{skill_FOC=@{skill_education_foc}}} {{attribute=?{Attribute|Intelligence, @{intelligence}|Agility, @{agility}|Awareness, @{awareness}|Brawn, @{brawn}|Coordination, @{coordination}|Personality, @{personality}|Willpower, @{willpower}}}} {{roll=[[{{ceil(([[@{skill_education_exp}+?{Attribute}]]-d20cs<[[@{skill_education_exp}+?{Attribute}]]cf<@{skill_education_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_education_exp}+?{Attribute}]]-@{skill_education_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_education_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_education_exp}+?{Attribute&amp;#125;]]cf<@{skill_education_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_education_exp}+?{Attribute&amp;#125;]]-@{skill_education_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_education_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_education_exp}+?{Attribute&amp;#125;]]cf<@{skill_education_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_education_exp}+?{Attribute&amp;#125;]]-@{skill_education_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_education_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_education_exp}+?{Attribute&amp;#125;]]cf<@{skill_education_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_education_exp}+?{Attribute&amp;#125;]]-@{skill_education_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_education_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_education_exp}+?{Attribute&amp;#125;]]cf<@{skill_education_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_education_exp}+?{Attribute&amp;#125;]]-@{skill_education_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_education_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_education_exp}+?{Attribute&amp;#125;]]cf<@{skill_education_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_education_exp}+?{Attribute&amp;#125;]]-@{skill_education_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_education_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_education_exp}+?{Attribute&amp;#125;]]cf<@{skill_education_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_education_exp}+?{Attribute&amp;#125;]]-@{skill_education_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_education_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_education_exp}+?{Attribute&amp;#125;]]cf<@{skill_education_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_education_exp}+?{Attribute&amp;#125;]]-@{skill_education_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_education_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_education_exp}+?{Attribute&amp;#125;]]cf<@{skill_education_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_education_exp}+?{Attribute&amp;#125;]]-@{skill_education_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_education_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_education_exp}+?{Attribute&amp;#125;]]cf<@{skill_education_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_education_exp}+?{Attribute&amp;#125;]]-@{skill_education_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_education_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_education_exp}+?{Attribute&amp;#125;]]cf<@{skill_education_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_education_exp}+?{Attribute&amp;#125;]]-@{skill_education_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
+							<button type="roll" name="roll_education" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Education Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Education}} {{skill_exp=@{skill_education_exp}}} {{skill_foc=@{skill_education_foc}}} {{attribute=?{Attribute|Intelligence, @{intelligence}|Agility, @{agility}|Awareness, @{awareness}|Brawn, @{brawn}|Coordination, @{coordination}|Personality, @{personality}|Willpower, @{willpower}}}} {{roll=[[{{ceil(([[@{skill_education_exp}+?{Attribute}]]-d20cs<[[@{skill_education_exp}+?{Attribute}]]cf<@{skill_education_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_education_exp}+?{Attribute}]]-@{skill_education_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_education_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_education_exp}+?{Attribute&amp;#125;]]cf<@{skill_education_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_education_exp}+?{Attribute&amp;#125;]]-@{skill_education_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_education_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_education_exp}+?{Attribute&amp;#125;]]cf<@{skill_education_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_education_exp}+?{Attribute&amp;#125;]]-@{skill_education_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_education_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_education_exp}+?{Attribute&amp;#125;]]cf<@{skill_education_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_education_exp}+?{Attribute&amp;#125;]]-@{skill_education_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_education_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_education_exp}+?{Attribute&amp;#125;]]cf<@{skill_education_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_education_exp}+?{Attribute&amp;#125;]]-@{skill_education_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_education_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_education_exp}+?{Attribute&amp;#125;]]cf<@{skill_education_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_education_exp}+?{Attribute&amp;#125;]]-@{skill_education_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_education_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_education_exp}+?{Attribute&amp;#125;]]cf<@{skill_education_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_education_exp}+?{Attribute&amp;#125;]]-@{skill_education_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_education_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_education_exp}+?{Attribute&amp;#125;]]cf<@{skill_education_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_education_exp}+?{Attribute&amp;#125;]]-@{skill_education_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_education_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_education_exp}+?{Attribute&amp;#125;]]cf<@{skill_education_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_education_exp}+?{Attribute&amp;#125;]]-@{skill_education_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_education_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_education_exp}+?{Attribute&amp;#125;]]cf<@{skill_education_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_education_exp}+?{Attribute&amp;#125;]]-@{skill_education_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_education_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_education_exp}+?{Attribute&amp;#125;]]cf<@{skill_education_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_education_exp}+?{Attribute&amp;#125;]]-@{skill_education_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
 							</button>
 						</td>
 					</tr>
@@ -701,7 +701,7 @@
 						<td><input type="number" value="0" name="attr_skill_hacking_exp" /></td>
 						<td><input type="number" value="0" name="attr_skill_hacking_foc" /></td>
 						<td>
-							<button type="roll" name="roll_Hacking" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Hacking Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Hacking}} {{skill_EXP=@{skill_hacking_exp}}} {{skill_FOC=@{skill_hacking_foc}}} {{attribute=?{Attribute|Intelligence, @{intelligence}|Agility, @{agility}|Awareness, @{awareness}|Brawn, @{brawn}|Coordination, @{coordination}|Personality, @{personality}|Willpower, @{willpower}}}} {{roll=[[{{ceil(([[@{skill_hacking_exp}+?{Attribute}]]-d20cs<[[@{skill_hacking_exp}+?{Attribute}]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_hacking_exp}+?{Attribute}]]-@{skill_hacking_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_hacking_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_hacking_exp}+?{Attribute&amp;#125;]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+?{Attribute&amp;#125;]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_hacking_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_hacking_exp}+?{Attribute&amp;#125;]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+?{Attribute&amp;#125;]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_hacking_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_hacking_exp}+?{Attribute&amp;#125;]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+?{Attribute&amp;#125;]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_hacking_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_hacking_exp}+?{Attribute&amp;#125;]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+?{Attribute&amp;#125;]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_hacking_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_hacking_exp}+?{Attribute&amp;#125;]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+?{Attribute&amp;#125;]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_hacking_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_hacking_exp}+?{Attribute&amp;#125;]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+?{Attribute&amp;#125;]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_hacking_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_hacking_exp}+?{Attribute&amp;#125;]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+?{Attribute&amp;#125;]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_hacking_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_hacking_exp}+?{Attribute&amp;#125;]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+?{Attribute&amp;#125;]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_hacking_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_hacking_exp}+?{Attribute&amp;#125;]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+?{Attribute&amp;#125;]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_hacking_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_hacking_exp}+?{Attribute&amp;#125;]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+?{Attribute&amp;#125;]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
+							<button type="roll" name="roll_hacking" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Hacking Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Hacking}} {{skill_exp=@{skill_hacking_exp}}} {{skill_foc=@{skill_hacking_foc}}} {{attribute=?{Attribute|Intelligence, @{intelligence}|Agility, @{agility}|Awareness, @{awareness}|Brawn, @{brawn}|Coordination, @{coordination}|Personality, @{personality}|Willpower, @{willpower}}}} {{roll=[[{{ceil(([[@{skill_hacking_exp}+?{Attribute}]]-d20cs<[[@{skill_hacking_exp}+?{Attribute}]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_hacking_exp}+?{Attribute}]]-@{skill_hacking_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_hacking_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_hacking_exp}+?{Attribute&amp;#125;]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+?{Attribute&amp;#125;]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_hacking_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_hacking_exp}+?{Attribute&amp;#125;]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+?{Attribute&amp;#125;]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_hacking_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_hacking_exp}+?{Attribute&amp;#125;]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+?{Attribute&amp;#125;]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_hacking_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_hacking_exp}+?{Attribute&amp;#125;]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+?{Attribute&amp;#125;]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_hacking_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_hacking_exp}+?{Attribute&amp;#125;]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+?{Attribute&amp;#125;]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_hacking_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_hacking_exp}+?{Attribute&amp;#125;]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+?{Attribute&amp;#125;]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_hacking_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_hacking_exp}+?{Attribute&amp;#125;]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+?{Attribute&amp;#125;]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_hacking_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_hacking_exp}+?{Attribute&amp;#125;]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+?{Attribute&amp;#125;]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_hacking_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_hacking_exp}+?{Attribute&amp;#125;]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+?{Attribute&amp;#125;]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_hacking_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_hacking_exp}+?{Attribute&amp;#125;]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+?{Attribute&amp;#125;]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
 							</button>
 						</td>
 					</tr>
@@ -711,7 +711,7 @@
 						<td><input type="number" value="0" name="attr_skill_medicine_exp" /></td>
 						<td><input type="number" value="0" name="attr_skill_medicine_foc" /></td>
 						<td>
-							<button type="roll" name="roll_Medicine" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Medicine Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Medicine}} {{skill_EXP=@{skill_medicine_exp}}} {{skill_FOC=@{skill_medicine_foc}}} {{attribute=?{Attribute|Intelligence, @{intelligence}|Agility, @{agility}|Awareness, @{awareness}|Brawn, @{brawn}|Coordination, @{coordination}|Personality, @{personality}|Willpower, @{willpower}}}} {{roll=[[{{ceil(([[@{skill_medicine_exp}+?{Attribute}]]-d20cs<[[@{skill_medicine_exp}+?{Attribute}]]cf<@{skill_medicine_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_medicine_exp}+?{Attribute}]]-@{skill_medicine_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_medicine_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_medicine_exp}+?{Attribute&amp;#125;]]cf<@{skill_medicine_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_medicine_exp}+?{Attribute&amp;#125;]]-@{skill_medicine_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_medicine_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_medicine_exp}+?{Attribute&amp;#125;]]cf<@{skill_medicine_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_medicine_exp}+?{Attribute&amp;#125;]]-@{skill_medicine_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_medicine_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_medicine_exp}+?{Attribute&amp;#125;]]cf<@{skill_medicine_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_medicine_exp}+?{Attribute&amp;#125;]]-@{skill_medicine_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_medicine_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_medicine_exp}+?{Attribute&amp;#125;]]cf<@{skill_medicine_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_medicine_exp}+?{Attribute&amp;#125;]]-@{skill_medicine_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_medicine_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_medicine_exp}+?{Attribute&amp;#125;]]cf<@{skill_medicine_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_medicine_exp}+?{Attribute&amp;#125;]]-@{skill_medicine_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_medicine_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_medicine_exp}+?{Attribute&amp;#125;]]cf<@{skill_medicine_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_medicine_exp}+?{Attribute&amp;#125;]]-@{skill_medicine_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_medicine_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_medicine_exp}+?{Attribute&amp;#125;]]cf<@{skill_medicine_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_medicine_exp}+?{Attribute&amp;#125;]]-@{skill_medicine_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_medicine_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_medicine_exp}+?{Attribute&amp;#125;]]cf<@{skill_medicine_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_medicine_exp}+?{Attribute&amp;#125;]]-@{skill_medicine_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_medicine_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_medicine_exp}+?{Attribute&amp;#125;]]cf<@{skill_medicine_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_medicine_exp}+?{Attribute&amp;#125;]]-@{skill_medicine_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_medicine_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_medicine_exp}+?{Attribute&amp;#125;]]cf<@{skill_medicine_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_medicine_exp}+?{Attribute&amp;#125;]]-@{skill_medicine_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
+							<button type="roll" name="roll_medicine" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Medicine Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Medicine}} {{skill_exp=@{skill_medicine_exp}}} {{skill_foc=@{skill_medicine_foc}}} {{attribute=?{Attribute|Intelligence, @{intelligence}|Agility, @{agility}|Awareness, @{awareness}|Brawn, @{brawn}|Coordination, @{coordination}|Personality, @{personality}|Willpower, @{willpower}}}} {{roll=[[{{ceil(([[@{skill_medicine_exp}+?{Attribute}]]-d20cs<[[@{skill_medicine_exp}+?{Attribute}]]cf<@{skill_medicine_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_medicine_exp}+?{Attribute}]]-@{skill_medicine_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_medicine_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_medicine_exp}+?{Attribute&amp;#125;]]cf<@{skill_medicine_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_medicine_exp}+?{Attribute&amp;#125;]]-@{skill_medicine_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_medicine_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_medicine_exp}+?{Attribute&amp;#125;]]cf<@{skill_medicine_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_medicine_exp}+?{Attribute&amp;#125;]]-@{skill_medicine_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_medicine_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_medicine_exp}+?{Attribute&amp;#125;]]cf<@{skill_medicine_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_medicine_exp}+?{Attribute&amp;#125;]]-@{skill_medicine_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_medicine_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_medicine_exp}+?{Attribute&amp;#125;]]cf<@{skill_medicine_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_medicine_exp}+?{Attribute&amp;#125;]]-@{skill_medicine_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_medicine_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_medicine_exp}+?{Attribute&amp;#125;]]cf<@{skill_medicine_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_medicine_exp}+?{Attribute&amp;#125;]]-@{skill_medicine_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_medicine_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_medicine_exp}+?{Attribute&amp;#125;]]cf<@{skill_medicine_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_medicine_exp}+?{Attribute&amp;#125;]]-@{skill_medicine_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_medicine_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_medicine_exp}+?{Attribute&amp;#125;]]cf<@{skill_medicine_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_medicine_exp}+?{Attribute&amp;#125;]]-@{skill_medicine_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_medicine_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_medicine_exp}+?{Attribute&amp;#125;]]cf<@{skill_medicine_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_medicine_exp}+?{Attribute&amp;#125;]]-@{skill_medicine_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_medicine_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_medicine_exp}+?{Attribute&amp;#125;]]cf<@{skill_medicine_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_medicine_exp}+?{Attribute&amp;#125;]]-@{skill_medicine_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_medicine_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_medicine_exp}+?{Attribute&amp;#125;]]cf<@{skill_medicine_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_medicine_exp}+?{Attribute&amp;#125;]]-@{skill_medicine_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
 							</button>
 						</td>
 					</tr>
@@ -721,7 +721,7 @@
 						<td><input type="number" value="0" name="attr_skill_psychology_exp" /></td>
 						<td><input type="number" value="0" name="attr_skill_psychology_foc" /></td>
 						<td>
-							<button type="roll" name="roll_Psychology" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Psychology Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Psychology}} {{skill_EXP=@{skill_psychology_exp}}} {{skill_FOC=@{skill_psychology_foc}}} {{attribute=?{Attribute|Intelligence, @{intelligence}|Agility, @{agility}|Awareness, @{awareness}|Brawn, @{brawn}|Coordination, @{coordination}|Personality, @{personality}|Willpower, @{willpower}}}} {{roll=[[{{ceil(([[@{skill_psychology_exp}+?{Attribute}]]-d20cs<[[@{skill_psychology_exp}+?{Attribute}]]cf<@{skill_psychology_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_psychology_exp}+?{Attribute}]]-@{skill_psychology_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_psychology_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_psychology_exp}+?{Attribute&amp;#125;]]cf<@{skill_psychology_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_psychology_exp}+?{Attribute&amp;#125;]]-@{skill_psychology_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_psychology_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_psychology_exp}+?{Attribute&amp;#125;]]cf<@{skill_psychology_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_psychology_exp}+?{Attribute&amp;#125;]]-@{skill_psychology_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_psychology_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_psychology_exp}+?{Attribute&amp;#125;]]cf<@{skill_psychology_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_psychology_exp}+?{Attribute&amp;#125;]]-@{skill_psychology_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_psychology_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_psychology_exp}+?{Attribute&amp;#125;]]cf<@{skill_psychology_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_psychology_exp}+?{Attribute&amp;#125;]]-@{skill_psychology_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_psychology_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_psychology_exp}+?{Attribute&amp;#125;]]cf<@{skill_psychology_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_psychology_exp}+?{Attribute&amp;#125;]]-@{skill_psychology_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_psychology_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_psychology_exp}+?{Attribute&amp;#125;]]cf<@{skill_psychology_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_psychology_exp}+?{Attribute&amp;#125;]]-@{skill_psychology_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_psychology_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_psychology_exp}+?{Attribute&amp;#125;]]cf<@{skill_psychology_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_psychology_exp}+?{Attribute&amp;#125;]]-@{skill_psychology_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_psychology_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_psychology_exp}+?{Attribute&amp;#125;]]cf<@{skill_psychology_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_psychology_exp}+?{Attribute&amp;#125;]]-@{skill_psychology_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_psychology_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_psychology_exp}+?{Attribute&amp;#125;]]cf<@{skill_psychology_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_psychology_exp}+?{Attribute&amp;#125;]]-@{skill_psychology_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_psychology_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_psychology_exp}+?{Attribute&amp;#125;]]cf<@{skill_psychology_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_psychology_exp}+?{Attribute&amp;#125;]]-@{skill_psychology_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
+							<button type="roll" name="roll_psychology" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Psychology Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Psychology}} {{skill_exp=@{skill_psychology_exp}}} {{skill_foc=@{skill_psychology_foc}}} {{attribute=?{Attribute|Intelligence, @{intelligence}|Agility, @{agility}|Awareness, @{awareness}|Brawn, @{brawn}|Coordination, @{coordination}|Personality, @{personality}|Willpower, @{willpower}}}} {{roll=[[{{ceil(([[@{skill_psychology_exp}+?{Attribute}]]-d20cs<[[@{skill_psychology_exp}+?{Attribute}]]cf<@{skill_psychology_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_psychology_exp}+?{Attribute}]]-@{skill_psychology_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_psychology_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_psychology_exp}+?{Attribute&amp;#125;]]cf<@{skill_psychology_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_psychology_exp}+?{Attribute&amp;#125;]]-@{skill_psychology_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_psychology_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_psychology_exp}+?{Attribute&amp;#125;]]cf<@{skill_psychology_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_psychology_exp}+?{Attribute&amp;#125;]]-@{skill_psychology_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_psychology_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_psychology_exp}+?{Attribute&amp;#125;]]cf<@{skill_psychology_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_psychology_exp}+?{Attribute&amp;#125;]]-@{skill_psychology_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_psychology_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_psychology_exp}+?{Attribute&amp;#125;]]cf<@{skill_psychology_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_psychology_exp}+?{Attribute&amp;#125;]]-@{skill_psychology_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_psychology_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_psychology_exp}+?{Attribute&amp;#125;]]cf<@{skill_psychology_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_psychology_exp}+?{Attribute&amp;#125;]]-@{skill_psychology_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_psychology_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_psychology_exp}+?{Attribute&amp;#125;]]cf<@{skill_psychology_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_psychology_exp}+?{Attribute&amp;#125;]]-@{skill_psychology_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_psychology_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_psychology_exp}+?{Attribute&amp;#125;]]cf<@{skill_psychology_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_psychology_exp}+?{Attribute&amp;#125;]]-@{skill_psychology_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_psychology_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_psychology_exp}+?{Attribute&amp;#125;]]cf<@{skill_psychology_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_psychology_exp}+?{Attribute&amp;#125;]]-@{skill_psychology_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_psychology_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_psychology_exp}+?{Attribute&amp;#125;]]cf<@{skill_psychology_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_psychology_exp}+?{Attribute&amp;#125;]]-@{skill_psychology_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_psychology_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_psychology_exp}+?{Attribute&amp;#125;]]cf<@{skill_psychology_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_psychology_exp}+?{Attribute&amp;#125;]]-@{skill_psychology_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
 							</button>
 						</td>
 					</tr>
@@ -731,7 +731,7 @@
 						<td><input type="number" value="0" name="attr_skill_science_exp" /></td>
 						<td><input type="number" value="0" name="attr_skill_science_foc" /></td>
 						<td>
-							<button type="roll" name="roll_Science" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Science Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Science}} {{skill_EXP=@{skill_science_exp}}} {{skill_FOC=@{skill_science_foc}}} {{attribute=?{Attribute|Intelligence, @{intelligence}|Agility, @{agility}|Awareness, @{awareness}|Brawn, @{brawn}|Coordination, @{coordination}|Personality, @{personality}|Willpower, @{willpower}}}} {{roll=[[{{ceil(([[@{skill_science_exp}+?{Attribute}]]-d20cs<[[@{skill_science_exp}+?{Attribute}]]cf<@{skill_science_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_science_exp}+?{Attribute}]]-@{skill_science_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_science_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_science_exp}+?{Attribute&amp;#125;]]cf<@{skill_science_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_science_exp}+?{Attribute&amp;#125;]]-@{skill_science_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_science_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_science_exp}+?{Attribute&amp;#125;]]cf<@{skill_science_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_science_exp}+?{Attribute&amp;#125;]]-@{skill_science_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_science_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_science_exp}+?{Attribute&amp;#125;]]cf<@{skill_science_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_science_exp}+?{Attribute&amp;#125;]]-@{skill_science_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_science_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_science_exp}+?{Attribute&amp;#125;]]cf<@{skill_science_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_science_exp}+?{Attribute&amp;#125;]]-@{skill_science_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_science_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_science_exp}+?{Attribute&amp;#125;]]cf<@{skill_science_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_science_exp}+?{Attribute&amp;#125;]]-@{skill_science_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_science_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_science_exp}+?{Attribute&amp;#125;]]cf<@{skill_science_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_science_exp}+?{Attribute&amp;#125;]]-@{skill_science_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_science_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_science_exp}+?{Attribute&amp;#125;]]cf<@{skill_science_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_science_exp}+?{Attribute&amp;#125;]]-@{skill_science_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_science_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_science_exp}+?{Attribute&amp;#125;]]cf<@{skill_science_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_science_exp}+?{Attribute&amp;#125;]]-@{skill_science_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_science_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_science_exp}+?{Attribute&amp;#125;]]cf<@{skill_science_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_science_exp}+?{Attribute&amp;#125;]]-@{skill_science_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_science_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_science_exp}+?{Attribute&amp;#125;]]cf<@{skill_science_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_science_exp}+?{Attribute&amp;#125;]]-@{skill_science_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
+							<button type="roll" name="roll_science" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Science Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Science}} {{skill_exp=@{skill_science_exp}}} {{skill_foc=@{skill_science_foc}}} {{attribute=?{Attribute|Intelligence, @{intelligence}|Agility, @{agility}|Awareness, @{awareness}|Brawn, @{brawn}|Coordination, @{coordination}|Personality, @{personality}|Willpower, @{willpower}}}} {{roll=[[{{ceil(([[@{skill_science_exp}+?{Attribute}]]-d20cs<[[@{skill_science_exp}+?{Attribute}]]cf<@{skill_science_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_science_exp}+?{Attribute}]]-@{skill_science_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_science_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_science_exp}+?{Attribute&amp;#125;]]cf<@{skill_science_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_science_exp}+?{Attribute&amp;#125;]]-@{skill_science_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_science_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_science_exp}+?{Attribute&amp;#125;]]cf<@{skill_science_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_science_exp}+?{Attribute&amp;#125;]]-@{skill_science_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_science_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_science_exp}+?{Attribute&amp;#125;]]cf<@{skill_science_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_science_exp}+?{Attribute&amp;#125;]]-@{skill_science_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_science_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_science_exp}+?{Attribute&amp;#125;]]cf<@{skill_science_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_science_exp}+?{Attribute&amp;#125;]]-@{skill_science_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_science_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_science_exp}+?{Attribute&amp;#125;]]cf<@{skill_science_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_science_exp}+?{Attribute&amp;#125;]]-@{skill_science_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_science_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_science_exp}+?{Attribute&amp;#125;]]cf<@{skill_science_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_science_exp}+?{Attribute&amp;#125;]]-@{skill_science_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_science_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_science_exp}+?{Attribute&amp;#125;]]cf<@{skill_science_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_science_exp}+?{Attribute&amp;#125;]]-@{skill_science_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_science_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_science_exp}+?{Attribute&amp;#125;]]cf<@{skill_science_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_science_exp}+?{Attribute&amp;#125;]]-@{skill_science_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_science_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_science_exp}+?{Attribute&amp;#125;]]cf<@{skill_science_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_science_exp}+?{Attribute&amp;#125;]]-@{skill_science_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_science_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_science_exp}+?{Attribute&amp;#125;]]cf<@{skill_science_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_science_exp}+?{Attribute&amp;#125;]]-@{skill_science_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
 							</button>
 						</td>
 					</tr>
@@ -741,7 +741,7 @@
 						<td><input type="number" value="0" name="attr_skill_tech_exp" /></td>
 						<td><input type="number" value="0" name="attr_skill_tech_foc" /></td>
 						<td>
-							<button type="roll" name="roll_Tech" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Tech Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Tech}} {{skill_EXP=@{skill_tech_exp}}} {{skill_FOC=@{skill_tech_foc}}} {{attribute=?{Attribute|Intelligence, @{intelligence}|Agility, @{agility}|Awareness, @{awareness}|Brawn, @{brawn}|Coordination, @{coordination}|Personality, @{personality}|Willpower, @{willpower}}}} {{roll=[[{{ceil(([[@{skill_tech_exp}+?{Attribute}]]-d20cs<[[@{skill_tech_exp}+?{Attribute}]]cf<@{skill_tech_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_tech_exp}+?{Attribute}]]-@{skill_tech_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_tech_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_tech_exp}+?{Attribute&amp;#125;]]cf<@{skill_tech_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_tech_exp}+?{Attribute&amp;#125;]]-@{skill_tech_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_tech_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_tech_exp}+?{Attribute&amp;#125;]]cf<@{skill_tech_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_tech_exp}+?{Attribute&amp;#125;]]-@{skill_tech_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_tech_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_tech_exp}+?{Attribute&amp;#125;]]cf<@{skill_tech_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_tech_exp}+?{Attribute&amp;#125;]]-@{skill_tech_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_tech_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_tech_exp}+?{Attribute&amp;#125;]]cf<@{skill_tech_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_tech_exp}+?{Attribute&amp;#125;]]-@{skill_tech_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_tech_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_tech_exp}+?{Attribute&amp;#125;]]cf<@{skill_tech_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_tech_exp}+?{Attribute&amp;#125;]]-@{skill_tech_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_tech_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_tech_exp}+?{Attribute&amp;#125;]]cf<@{skill_tech_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_tech_exp}+?{Attribute&amp;#125;]]-@{skill_tech_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_tech_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_tech_exp}+?{Attribute&amp;#125;]]cf<@{skill_tech_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_tech_exp}+?{Attribute&amp;#125;]]-@{skill_tech_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_tech_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_tech_exp}+?{Attribute&amp;#125;]]cf<@{skill_tech_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_tech_exp}+?{Attribute&amp;#125;]]-@{skill_tech_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_tech_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_tech_exp}+?{Attribute&amp;#125;]]cf<@{skill_tech_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_tech_exp}+?{Attribute&amp;#125;]]-@{skill_tech_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_tech_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_tech_exp}+?{Attribute&amp;#125;]]cf<@{skill_tech_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_tech_exp}+?{Attribute&amp;#125;]]-@{skill_tech_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
+							<button type="roll" name="roll_tech" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Tech Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Tech}} {{skill_exp=@{skill_tech_exp}}} {{skill_foc=@{skill_tech_foc}}} {{attribute=?{Attribute|Intelligence, @{intelligence}|Agility, @{agility}|Awareness, @{awareness}|Brawn, @{brawn}|Coordination, @{coordination}|Personality, @{personality}|Willpower, @{willpower}}}} {{roll=[[{{ceil(([[@{skill_tech_exp}+?{Attribute}]]-d20cs<[[@{skill_tech_exp}+?{Attribute}]]cf<@{skill_tech_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_tech_exp}+?{Attribute}]]-@{skill_tech_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_tech_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_tech_exp}+?{Attribute&amp;#125;]]cf<@{skill_tech_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_tech_exp}+?{Attribute&amp;#125;]]-@{skill_tech_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_tech_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_tech_exp}+?{Attribute&amp;#125;]]cf<@{skill_tech_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_tech_exp}+?{Attribute&amp;#125;]]-@{skill_tech_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_tech_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_tech_exp}+?{Attribute&amp;#125;]]cf<@{skill_tech_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_tech_exp}+?{Attribute&amp;#125;]]-@{skill_tech_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_tech_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_tech_exp}+?{Attribute&amp;#125;]]cf<@{skill_tech_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_tech_exp}+?{Attribute&amp;#125;]]-@{skill_tech_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_tech_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_tech_exp}+?{Attribute&amp;#125;]]cf<@{skill_tech_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_tech_exp}+?{Attribute&amp;#125;]]-@{skill_tech_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_tech_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_tech_exp}+?{Attribute&amp;#125;]]cf<@{skill_tech_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_tech_exp}+?{Attribute&amp;#125;]]-@{skill_tech_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_tech_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_tech_exp}+?{Attribute&amp;#125;]]cf<@{skill_tech_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_tech_exp}+?{Attribute&amp;#125;]]-@{skill_tech_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_tech_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_tech_exp}+?{Attribute&amp;#125;]]cf<@{skill_tech_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_tech_exp}+?{Attribute&amp;#125;]]-@{skill_tech_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_tech_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_tech_exp}+?{Attribute&amp;#125;]]cf<@{skill_tech_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_tech_exp}+?{Attribute&amp;#125;]]-@{skill_tech_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_tech_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_tech_exp}+?{Attribute&amp;#125;]]cf<@{skill_tech_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_tech_exp}+?{Attribute&amp;#125;]]-@{skill_tech_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
 							</button>
 						</td>
 					</tr>
@@ -752,7 +752,7 @@
 						<td colspan="3">Personality</td>
 						<td><input type="number" value="7" name="attr_personality" /></td>
 						<td>
-							<button type="roll" name="roll_Personality" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Personality Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{attribute=@{personality}}} {{roll=[[{{ceil(([[@{personality}]]-d20cs<[[@{personality}]]cf<0cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{personality}]])),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{personality}]]-d20cs<[[@{personality}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{personality}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{personality}]]-d20cs<[[@{personality}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{personality}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{personality}]]-d20cs<[[@{personality}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{personality}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{personality}]]-d20cs<[[@{personality}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{personality}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{personality}]]-d20cs<[[@{personality}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{personality}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{personality}]]-d20cs<[[@{personality}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{personality}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{personality}]]-d20cs<[[@{personality}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{personality}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{personality}]]-d20cs<[[@{personality}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{personality}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{personality}]]-d20cs<[[@{personality}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{personality}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{personality}]]-d20cs<[[@{personality}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{personality}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
+							<button type="roll" name="roll_personality" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Personality Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{attribute=@{personality}}} {{roll=[[{{ceil(([[@{personality}]]-d20cs<[[@{personality}]]cf<0cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{personality}]])),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{personality}]]-d20cs<[[@{personality}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{personality}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{personality}]]-d20cs<[[@{personality}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{personality}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{personality}]]-d20cs<[[@{personality}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{personality}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{personality}]]-d20cs<[[@{personality}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{personality}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{personality}]]-d20cs<[[@{personality}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{personality}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{personality}]]-d20cs<[[@{personality}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{personality}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{personality}]]-d20cs<[[@{personality}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{personality}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{personality}]]-d20cs<[[@{personality}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{personality}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{personality}]]-d20cs<[[@{personality}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{personality}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{personality}]]-d20cs<[[@{personality}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{personality}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
 							</button>
 						</td>
 					</tr>
@@ -765,11 +765,11 @@
 					</tr>
 					<tr class="sheet-Skill">
 						<td>Animal Handling</td>
-						<td><input type="checkbox" name="attr_skill_animal_handling_Sig" /></td>
-						<td><input type="number" value="0" name="attr_skill_animal_handling_EXP" /></td>
-						<td><input type="number" value="0" name="attr_skill_animal_handling_FOC" /></td>
+						<td><input type="checkbox" name="attr_skill_animal_handling_sig" /></td>
+						<td><input type="number" value="0" name="attr_skill_animal_handling_exp" /></td>
+						<td><input type="number" value="0" name="attr_skill_animal_handling_foc" /></td>
 						<td>
-							<button type="roll" name="roll_Animal-Handling" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Animal Handling Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Animal Handling}} {{skill_EXP=@{skill_animal_handling_EXP}}} {{skill_FOC=@{skill_animal_handling_FOC}}} {{attribute=?{Attribute|Personality, @{personality}|Agility, @{agility}|Awareness, @{awareness}|Brawn, @{brawn}|Coordination, @{coordination}|Intelligence, @{intelligence}|Willpower, @{willpower}}}} {{roll=[[{{ceil(([[@{skill_animal_handling_EXP}+?{Attribute}]]-d20cs<[[@{skill_animal_handling_EXP}+?{Attribute}]]cf<@{skill_animal_handling_FOC}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_animal_handling_EXP}+?{Attribute}]]-@{skill_animal_handling_FOC})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_animal_handling_EXP}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_animal_handling_EXP}+?{Attribute&amp;#125;]]cf<@{skill_animal_handling_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_animal_handling_EXP}+?{Attribute&amp;#125;]]-@{skill_animal_handling_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_animal_handling_EXP}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_animal_handling_EXP}+?{Attribute&amp;#125;]]cf<@{skill_animal_handling_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_animal_handling_EXP}+?{Attribute&amp;#125;]]-@{skill_animal_handling_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_animal_handling_EXP}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_animal_handling_EXP}+?{Attribute&amp;#125;]]cf<@{skill_animal_handling_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_animal_handling_EXP}+?{Attribute&amp;#125;]]-@{skill_animal_handling_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_animal_handling_EXP}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_animal_handling_EXP}+?{Attribute&amp;#125;]]cf<@{skill_animal_handling_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_animal_handling_EXP}+?{Attribute&amp;#125;]]-@{skill_animal_handling_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_animal_handling_EXP}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_animal_handling_EXP}+?{Attribute&amp;#125;]]cf<@{skill_animal_handling_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_animal_handling_EXP}+?{Attribute&amp;#125;]]-@{skill_animal_handling_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_animal_handling_EXP}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_animal_handling_EXP}+?{Attribute&amp;#125;]]cf<@{skill_animal_handling_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_animal_handling_EXP}+?{Attribute&amp;#125;]]-@{skill_animal_handling_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_animal_handling_EXP}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_animal_handling_EXP}+?{Attribute&amp;#125;]]cf<@{skill_animal_handling_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_animal_handling_EXP}+?{Attribute&amp;#125;]]-@{skill_animal_handling_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_animal_handling_EXP}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_animal_handling_EXP}+?{Attribute&amp;#125;]]cf<@{skill_animal_handling_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_animal_handling_EXP}+?{Attribute&amp;#125;]]-@{skill_animal_handling_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_animal_handling_EXP}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_animal_handling_EXP}+?{Attribute&amp;#125;]]cf<@{skill_animal_handling_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_animal_handling_EXP}+?{Attribute&amp;#125;]]-@{skill_animal_handling_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_animal_handling_EXP}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_animal_handling_EXP}+?{Attribute&amp;#125;]]cf<@{skill_animal_handling_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_animal_handling_EXP}+?{Attribute&amp;#125;]]-@{skill_animal_handling_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
+							<button type="roll" name="roll_animal_handling" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Animal Handling Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Animal Handling}} {{skill_exp=@{skill_animal_handling_exp}}} {{skill_foc=@{skill_animal_handling_foc}}} {{attribute=?{Attribute|Personality, @{personality}|Agility, @{agility}|Awareness, @{awareness}|Brawn, @{brawn}|Coordination, @{coordination}|Intelligence, @{intelligence}|Willpower, @{willpower}}}} {{roll=[[{{ceil(([[@{skill_animal_handling_exp}+?{Attribute}]]-d20cs<[[@{skill_animal_handling_exp}+?{Attribute}]]cf<@{skill_animal_handling_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_animal_handling_exp}+?{Attribute}]]-@{skill_animal_handling_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_animal_handling_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_animal_handling_exp}+?{Attribute&amp;#125;]]cf<@{skill_animal_handling_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_animal_handling_exp}+?{Attribute&amp;#125;]]-@{skill_animal_handling_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_animal_handling_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_animal_handling_exp}+?{Attribute&amp;#125;]]cf<@{skill_animal_handling_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_animal_handling_exp}+?{Attribute&amp;#125;]]-@{skill_animal_handling_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_animal_handling_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_animal_handling_exp}+?{Attribute&amp;#125;]]cf<@{skill_animal_handling_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_animal_handling_exp}+?{Attribute&amp;#125;]]-@{skill_animal_handling_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_animal_handling_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_animal_handling_exp}+?{Attribute&amp;#125;]]cf<@{skill_animal_handling_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_animal_handling_exp}+?{Attribute&amp;#125;]]-@{skill_animal_handling_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_animal_handling_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_animal_handling_exp}+?{Attribute&amp;#125;]]cf<@{skill_animal_handling_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_animal_handling_exp}+?{Attribute&amp;#125;]]-@{skill_animal_handling_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_animal_handling_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_animal_handling_exp}+?{Attribute&amp;#125;]]cf<@{skill_animal_handling_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_animal_handling_exp}+?{Attribute&amp;#125;]]-@{skill_animal_handling_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_animal_handling_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_animal_handling_exp}+?{Attribute&amp;#125;]]cf<@{skill_animal_handling_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_animal_handling_exp}+?{Attribute&amp;#125;]]-@{skill_animal_handling_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_animal_handling_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_animal_handling_exp}+?{Attribute&amp;#125;]]cf<@{skill_animal_handling_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_animal_handling_exp}+?{Attribute&amp;#125;]]-@{skill_animal_handling_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_animal_handling_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_animal_handling_exp}+?{Attribute&amp;#125;]]cf<@{skill_animal_handling_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_animal_handling_exp}+?{Attribute&amp;#125;]]-@{skill_animal_handling_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_animal_handling_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_animal_handling_exp}+?{Attribute&amp;#125;]]cf<@{skill_animal_handling_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_animal_handling_exp}+?{Attribute&amp;#125;]]-@{skill_animal_handling_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
 							</button>
 						</td>
 					</tr>
@@ -779,7 +779,7 @@
 						<td><input type="number" value="0" name="attr_skill_command_exp" /></td>
 						<td><input type="number" value="0" name="attr_skill_command_foc" /></td>
 						<td>
-							<button type="roll" name="roll_Command" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Command Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Command}} {{skill_EXP=@{skill_command_exp}}} {{skill_FOC=@{skill_command_foc}}} {{attribute=?{Attribute|Personality, @{personality}|Agility, @{agility}|Awareness, @{awareness}|Brawn, @{brawn}|Coordination, @{coordination}|Intelligence, @{intelligence}|Willpower, @{willpower}}}} {{roll=[[{{ceil(([[@{skill_command_exp}+?{Attribute}]]-d20cs<[[@{skill_command_exp}+?{Attribute}]]cf<@{skill_command_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_command_exp}+?{Attribute}]]-@{skill_command_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_command_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_command_exp}+?{Attribute&amp;#125;]]cf<@{skill_command_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_command_exp}+?{Attribute&amp;#125;]]-@{skill_command_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_command_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_command_exp}+?{Attribute&amp;#125;]]cf<@{skill_command_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_command_exp}+?{Attribute&amp;#125;]]-@{skill_command_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_command_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_command_exp}+?{Attribute&amp;#125;]]cf<@{skill_command_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_command_exp}+?{Attribute&amp;#125;]]-@{skill_command_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_command_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_command_exp}+?{Attribute&amp;#125;]]cf<@{skill_command_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_command_exp}+?{Attribute&amp;#125;]]-@{skill_command_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_command_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_command_exp}+?{Attribute&amp;#125;]]cf<@{skill_command_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_command_exp}+?{Attribute&amp;#125;]]-@{skill_command_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_command_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_command_exp}+?{Attribute&amp;#125;]]cf<@{skill_command_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_command_exp}+?{Attribute&amp;#125;]]-@{skill_command_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_command_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_command_exp}+?{Attribute&amp;#125;]]cf<@{skill_command_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_command_exp}+?{Attribute&amp;#125;]]-@{skill_command_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_command_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_command_exp}+?{Attribute&amp;#125;]]cf<@{skill_command_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_command_exp}+?{Attribute&amp;#125;]]-@{skill_command_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_command_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_command_exp}+?{Attribute&amp;#125;]]cf<@{skill_command_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_command_exp}+?{Attribute&amp;#125;]]-@{skill_command_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_command_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_command_exp}+?{Attribute&amp;#125;]]cf<@{skill_command_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_command_exp}+?{Attribute&amp;#125;]]-@{skill_command_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
+							<button type="roll" name="roll_command" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Command Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Command}} {{skill_exp=@{skill_command_exp}}} {{skill_foc=@{skill_command_foc}}} {{attribute=?{Attribute|Personality, @{personality}|Agility, @{agility}|Awareness, @{awareness}|Brawn, @{brawn}|Coordination, @{coordination}|Intelligence, @{intelligence}|Willpower, @{willpower}}}} {{roll=[[{{ceil(([[@{skill_command_exp}+?{Attribute}]]-d20cs<[[@{skill_command_exp}+?{Attribute}]]cf<@{skill_command_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_command_exp}+?{Attribute}]]-@{skill_command_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_command_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_command_exp}+?{Attribute&amp;#125;]]cf<@{skill_command_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_command_exp}+?{Attribute&amp;#125;]]-@{skill_command_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_command_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_command_exp}+?{Attribute&amp;#125;]]cf<@{skill_command_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_command_exp}+?{Attribute&amp;#125;]]-@{skill_command_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_command_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_command_exp}+?{Attribute&amp;#125;]]cf<@{skill_command_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_command_exp}+?{Attribute&amp;#125;]]-@{skill_command_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_command_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_command_exp}+?{Attribute&amp;#125;]]cf<@{skill_command_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_command_exp}+?{Attribute&amp;#125;]]-@{skill_command_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_command_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_command_exp}+?{Attribute&amp;#125;]]cf<@{skill_command_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_command_exp}+?{Attribute&amp;#125;]]-@{skill_command_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_command_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_command_exp}+?{Attribute&amp;#125;]]cf<@{skill_command_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_command_exp}+?{Attribute&amp;#125;]]-@{skill_command_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_command_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_command_exp}+?{Attribute&amp;#125;]]cf<@{skill_command_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_command_exp}+?{Attribute&amp;#125;]]-@{skill_command_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_command_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_command_exp}+?{Attribute&amp;#125;]]cf<@{skill_command_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_command_exp}+?{Attribute&amp;#125;]]-@{skill_command_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_command_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_command_exp}+?{Attribute&amp;#125;]]cf<@{skill_command_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_command_exp}+?{Attribute&amp;#125;]]-@{skill_command_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_command_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_command_exp}+?{Attribute&amp;#125;]]cf<@{skill_command_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_command_exp}+?{Attribute&amp;#125;]]-@{skill_command_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
 							</button>
 						</td>
 					</tr>
@@ -789,7 +789,7 @@
 						<td><input type="number" value="0" name="attr_skill_lifestyle_exp" /></td>
 						<td><input type="number" value="0" name="attr_skill_lifestyle_foc" /></td>
 						<td>
-							<button type="roll" name="roll_Lifestyle" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Lifestyle Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Lifestyle}} {{skill_EXP=@{skill_lifestyle_exp}}} {{skill_FOC=@{skill_lifestyle_foc}}} {{attribute=?{Attribute|Personality, @{personality}|Agility, @{agility}|Awareness, @{awareness}|Brawn, @{brawn}|Coordination, @{coordination}|Intelligence, @{intelligence}|Willpower, @{willpower}}}} {{roll=[[{{ceil(([[@{skill_lifestyle_exp}+?{Attribute}]]-d20cs<[[@{skill_lifestyle_exp}+?{Attribute}]]cf<@{skill_lifestyle_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_lifestyle_exp}+?{Attribute}]]-@{skill_lifestyle_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]cf<@{skill_lifestyle_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]-@{skill_lifestyle_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]cf<@{skill_lifestyle_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]-@{skill_lifestyle_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]cf<@{skill_lifestyle_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]-@{skill_lifestyle_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]cf<@{skill_lifestyle_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]-@{skill_lifestyle_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]cf<@{skill_lifestyle_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]-@{skill_lifestyle_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]cf<@{skill_lifestyle_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]-@{skill_lifestyle_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]cf<@{skill_lifestyle_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]-@{skill_lifestyle_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]cf<@{skill_lifestyle_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]-@{skill_lifestyle_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]cf<@{skill_lifestyle_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]-@{skill_lifestyle_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]cf<@{skill_lifestyle_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]-@{skill_lifestyle_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
+							<button type="roll" name="roll_lifestyle" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Lifestyle Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Lifestyle}} {{skill_exp=@{skill_lifestyle_exp}}} {{skill_foc=@{skill_lifestyle_foc}}} {{attribute=?{Attribute|Personality, @{personality}|Agility, @{agility}|Awareness, @{awareness}|Brawn, @{brawn}|Coordination, @{coordination}|Intelligence, @{intelligence}|Willpower, @{willpower}}}} {{roll=[[{{ceil(([[@{skill_lifestyle_exp}+?{Attribute}]]-d20cs<[[@{skill_lifestyle_exp}+?{Attribute}]]cf<@{skill_lifestyle_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_lifestyle_exp}+?{Attribute}]]-@{skill_lifestyle_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]cf<@{skill_lifestyle_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]-@{skill_lifestyle_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]cf<@{skill_lifestyle_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]-@{skill_lifestyle_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]cf<@{skill_lifestyle_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]-@{skill_lifestyle_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]cf<@{skill_lifestyle_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]-@{skill_lifestyle_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]cf<@{skill_lifestyle_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]-@{skill_lifestyle_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]cf<@{skill_lifestyle_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]-@{skill_lifestyle_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]cf<@{skill_lifestyle_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]-@{skill_lifestyle_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]cf<@{skill_lifestyle_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]-@{skill_lifestyle_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]cf<@{skill_lifestyle_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]-@{skill_lifestyle_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]cf<@{skill_lifestyle_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_lifestyle_exp}+?{Attribute&amp;#125;]]-@{skill_lifestyle_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
 							</button>
 						</td>
 					</tr>
@@ -799,7 +799,7 @@
 						<td><input type="number" value="0" name="attr_skill_persuade_exp" /></td>
 						<td><input type="number" value="0" name="attr_skill_persuade_foc" /></td>
 						<td>
-							<button type="roll" name="roll_Persuade" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Persuade Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Persuade}} {{skill_EXP=@{skill_persuade_exp}}} {{skill_FOC=@{skill_persuade_foc}}} {{attribute=?{Attribute|Personality, @{personality}|Agility, @{agility}|Awareness, @{awareness}|Brawn, @{brawn}|Coordination, @{coordination}|Intelligence, @{intelligence}|Willpower, @{willpower}}}} {{roll=[[{{ceil(([[@{skill_persuade_exp}+?{Attribute}]]-d20cs<[[@{skill_persuade_exp}+?{Attribute}]]cf<@{skill_persuade_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_persuade_exp}+?{Attribute}]]-@{skill_persuade_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_persuade_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_persuade_exp}+?{Attribute&amp;#125;]]cf<@{skill_persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_persuade_exp}+?{Attribute&amp;#125;]]-@{skill_persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_persuade_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_persuade_exp}+?{Attribute&amp;#125;]]cf<@{skill_persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_persuade_exp}+?{Attribute&amp;#125;]]-@{skill_persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_persuade_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_persuade_exp}+?{Attribute&amp;#125;]]cf<@{skill_persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_persuade_exp}+?{Attribute&amp;#125;]]-@{skill_persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_persuade_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_persuade_exp}+?{Attribute&amp;#125;]]cf<@{skill_persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_persuade_exp}+?{Attribute&amp;#125;]]-@{skill_persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_persuade_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_persuade_exp}+?{Attribute&amp;#125;]]cf<@{skill_persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_persuade_exp}+?{Attribute&amp;#125;]]-@{skill_persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_persuade_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_persuade_exp}+?{Attribute&amp;#125;]]cf<@{skill_persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_persuade_exp}+?{Attribute&amp;#125;]]-@{skill_persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_persuade_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_persuade_exp}+?{Attribute&amp;#125;]]cf<@{skill_persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_persuade_exp}+?{Attribute&amp;#125;]]-@{skill_persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_persuade_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_persuade_exp}+?{Attribute&amp;#125;]]cf<@{skill_persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_persuade_exp}+?{Attribute&amp;#125;]]-@{skill_persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_persuade_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_persuade_exp}+?{Attribute&amp;#125;]]cf<@{skill_persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_persuade_exp}+?{Attribute&amp;#125;]]-@{skill_persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_persuade_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_persuade_exp}+?{Attribute&amp;#125;]]cf<@{skill_persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_persuade_exp}+?{Attribute&amp;#125;]]-@{skill_persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
+							<button type="roll" name="roll_persuade" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Persuade Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Persuade}} {{skill_exp=@{skill_persuade_exp}}} {{skill_foc=@{skill_persuade_foc}}} {{attribute=?{Attribute|Personality, @{personality}|Agility, @{agility}|Awareness, @{awareness}|Brawn, @{brawn}|Coordination, @{coordination}|Intelligence, @{intelligence}|Willpower, @{willpower}}}} {{roll=[[{{ceil(([[@{skill_persuade_exp}+?{Attribute}]]-d20cs<[[@{skill_persuade_exp}+?{Attribute}]]cf<@{skill_persuade_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_persuade_exp}+?{Attribute}]]-@{skill_persuade_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_persuade_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_persuade_exp}+?{Attribute&amp;#125;]]cf<@{skill_persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_persuade_exp}+?{Attribute&amp;#125;]]-@{skill_persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_persuade_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_persuade_exp}+?{Attribute&amp;#125;]]cf<@{skill_persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_persuade_exp}+?{Attribute&amp;#125;]]-@{skill_persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_persuade_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_persuade_exp}+?{Attribute&amp;#125;]]cf<@{skill_persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_persuade_exp}+?{Attribute&amp;#125;]]-@{skill_persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_persuade_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_persuade_exp}+?{Attribute&amp;#125;]]cf<@{skill_persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_persuade_exp}+?{Attribute&amp;#125;]]-@{skill_persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_persuade_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_persuade_exp}+?{Attribute&amp;#125;]]cf<@{skill_persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_persuade_exp}+?{Attribute&amp;#125;]]-@{skill_persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_persuade_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_persuade_exp}+?{Attribute&amp;#125;]]cf<@{skill_persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_persuade_exp}+?{Attribute&amp;#125;]]-@{skill_persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_persuade_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_persuade_exp}+?{Attribute&amp;#125;]]cf<@{skill_persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_persuade_exp}+?{Attribute&amp;#125;]]-@{skill_persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_persuade_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_persuade_exp}+?{Attribute&amp;#125;]]cf<@{skill_persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_persuade_exp}+?{Attribute&amp;#125;]]-@{skill_persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_persuade_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_persuade_exp}+?{Attribute&amp;#125;]]cf<@{skill_persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_persuade_exp}+?{Attribute&amp;#125;]]-@{skill_persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_persuade_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_persuade_exp}+?{Attribute&amp;#125;]]cf<@{skill_persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_persuade_exp}+?{Attribute&amp;#125;]]-@{skill_persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
 							</button>
 						</td>
 					</tr>
@@ -810,7 +810,7 @@
 						<td colspan="3">Willpower</td>
 						<td><input type="number" value="7" name="attr_willpower" /></td>
 						<td>
-							<button type="roll" name="roll_Willpower" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Willpower Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{attribute=@{willpower}}} {{roll=[[{{ceil(([[@{willpower}]]-d20cs<[[@{willpower}]]cf<0cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{willpower}]])),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{willpower}]]-d20cs<[[@{willpower}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{willpower}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{willpower}]]-d20cs<[[@{willpower}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{willpower}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{willpower}]]-d20cs<[[@{willpower}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{willpower}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{willpower}]]-d20cs<[[@{willpower}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{willpower}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{willpower}]]-d20cs<[[@{willpower}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{willpower}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{willpower}]]-d20cs<[[@{willpower}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{willpower}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{willpower}]]-d20cs<[[@{willpower}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{willpower}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{willpower}]]-d20cs<[[@{willpower}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{willpower}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{willpower}]]-d20cs<[[@{willpower}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{willpower}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{willpower}]]-d20cs<[[@{willpower}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{willpower}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
+							<button type="roll" name="roll_willpower" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Willpower Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{attribute=@{willpower}}} {{roll=[[{{ceil(([[@{willpower}]]-d20cs<[[@{willpower}]]cf<0cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{willpower}]])),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{willpower}]]-d20cs<[[@{willpower}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{willpower}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{willpower}]]-d20cs<[[@{willpower}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{willpower}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{willpower}]]-d20cs<[[@{willpower}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{willpower}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{willpower}]]-d20cs<[[@{willpower}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{willpower}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{willpower}]]-d20cs<[[@{willpower}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{willpower}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{willpower}]]-d20cs<[[@{willpower}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{willpower}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{willpower}]]-d20cs<[[@{willpower}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{willpower}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{willpower}]]-d20cs<[[@{willpower}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{willpower}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{willpower}]]-d20cs<[[@{willpower}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{willpower}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{willpower}]]-d20cs<[[@{willpower}]]cf<0cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{willpower}]]))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
 							</button>
 						</td>
 					</tr>
@@ -827,7 +827,7 @@
 						<td><input type="number" value="0" name="attr_skill_discipline_exp" /></td>
 						<td><input type="number" value="0" name="attr_skill_discipline_foc" /></td>
 						<td>
-							<button type="roll" name="roll_Discipline" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Discipline Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Discipline}} {{skill_EXP=@{skill_discipline_exp}}} {{skill_FOC=@{skill_discipline_foc}}} {{attribute=?{Attribute|Willpower, @{willpower}|Agility, @{agility}|Awareness, @{awareness}|Brawn, @{brawn}|Coordination, @{coordination}|Intelligence, @{intelligence}|Personality, @{personality}}}} {{roll=[[{{ceil(([[@{skill_discipline_exp}+?{Attribute}]]-d20cs<[[@{skill_discipline_exp}+?{Attribute}]]cf<@{skill_discipline_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_discipline_exp}+?{Attribute}]]-@{skill_discipline_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_discipline_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_discipline_exp}+?{Attribute&amp;#125;]]cf<@{skill_discipline_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_discipline_exp}+?{Attribute&amp;#125;]]-@{skill_discipline_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_discipline_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_discipline_exp}+?{Attribute&amp;#125;]]cf<@{skill_discipline_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_discipline_exp}+?{Attribute&amp;#125;]]-@{skill_discipline_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_discipline_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_discipline_exp}+?{Attribute&amp;#125;]]cf<@{skill_discipline_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_discipline_exp}+?{Attribute&amp;#125;]]-@{skill_discipline_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_discipline_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_discipline_exp}+?{Attribute&amp;#125;]]cf<@{skill_discipline_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_discipline_exp}+?{Attribute&amp;#125;]]-@{skill_discipline_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_discipline_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_discipline_exp}+?{Attribute&amp;#125;]]cf<@{skill_discipline_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_discipline_exp}+?{Attribute&amp;#125;]]-@{skill_discipline_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_discipline_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_discipline_exp}+?{Attribute&amp;#125;]]cf<@{skill_discipline_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_discipline_exp}+?{Attribute&amp;#125;]]-@{skill_discipline_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_discipline_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_discipline_exp}+?{Attribute&amp;#125;]]cf<@{skill_discipline_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_discipline_exp}+?{Attribute&amp;#125;]]-@{skill_discipline_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_discipline_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_discipline_exp}+?{Attribute&amp;#125;]]cf<@{skill_discipline_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_discipline_exp}+?{Attribute&amp;#125;]]-@{skill_discipline_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_discipline_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_discipline_exp}+?{Attribute&amp;#125;]]cf<@{skill_discipline_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_discipline_exp}+?{Attribute&amp;#125;]]-@{skill_discipline_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_discipline_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_discipline_exp}+?{Attribute&amp;#125;]]cf<@{skill_discipline_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_discipline_exp}+?{Attribute&amp;#125;]]-@{skill_discipline_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
+							<button type="roll" name="roll_discipline" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=Discipline Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Discipline}} {{skill_exp=@{skill_discipline_exp}}} {{skill_foc=@{skill_discipline_foc}}} {{attribute=?{Attribute|Willpower, @{willpower}|Agility, @{agility}|Awareness, @{awareness}|Brawn, @{brawn}|Coordination, @{coordination}|Intelligence, @{intelligence}|Personality, @{personality}}}} {{roll=[[{{ceil(([[@{skill_discipline_exp}+?{Attribute}]]-d20cs<[[@{skill_discipline_exp}+?{Attribute}]]cf<@{skill_discipline_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_discipline_exp}+?{Attribute}]]-@{skill_discipline_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_discipline_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_discipline_exp}+?{Attribute&amp;#125;]]cf<@{skill_discipline_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_discipline_exp}+?{Attribute&amp;#125;]]-@{skill_discipline_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_discipline_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_discipline_exp}+?{Attribute&amp;#125;]]cf<@{skill_discipline_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_discipline_exp}+?{Attribute&amp;#125;]]-@{skill_discipline_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_discipline_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_discipline_exp}+?{Attribute&amp;#125;]]cf<@{skill_discipline_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_discipline_exp}+?{Attribute&amp;#125;]]-@{skill_discipline_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_discipline_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_discipline_exp}+?{Attribute&amp;#125;]]cf<@{skill_discipline_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_discipline_exp}+?{Attribute&amp;#125;]]-@{skill_discipline_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_discipline_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_discipline_exp}+?{Attribute&amp;#125;]]cf<@{skill_discipline_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_discipline_exp}+?{Attribute&amp;#125;]]-@{skill_discipline_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_discipline_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_discipline_exp}+?{Attribute&amp;#125;]]cf<@{skill_discipline_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_discipline_exp}+?{Attribute&amp;#125;]]-@{skill_discipline_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_discipline_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_discipline_exp}+?{Attribute&amp;#125;]]cf<@{skill_discipline_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_discipline_exp}+?{Attribute&amp;#125;]]-@{skill_discipline_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_discipline_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_discipline_exp}+?{Attribute&amp;#125;]]cf<@{skill_discipline_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_discipline_exp}+?{Attribute&amp;#125;]]-@{skill_discipline_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_discipline_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_discipline_exp}+?{Attribute&amp;#125;]]cf<@{skill_discipline_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_discipline_exp}+?{Attribute&amp;#125;]]-@{skill_discipline_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_discipline_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{skill_discipline_exp}+?{Attribute&amp;#125;]]cf<@{skill_discipline_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_discipline_exp}+?{Attribute&amp;#125;]]-@{skill_discipline_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
 							</button>
 						</td>
 					</tr>
@@ -933,7 +933,7 @@
 						</tr>
 						<tr>
 							<td class="sheet-StatInput"><input type="text" name="attr_weapon_range" /></td>
-							<td class="sheet-StatInput"><input type="text" name="attr_Weapon_Damage_Fixed"/></td>
+							<td class="sheet-StatInput"><input type="text" name="attr_weapon_damage_fixed"/></td>
 							<td class="sheet-StatInput" style="width:1%"><span class="sheet-InputText">+</span></td>
 							<td class="sheet-StatInput"><input type="text" name="attr_weapon_damage_dice" style="width:50%"/><img class="sheet-icon-N-small" src="https://svgshare.com/i/5ZJ.svg" /></td>
 							<td class="sheet-StatInput"><input type="text" name="attr_weapon_burst" /></td>
@@ -955,10 +955,10 @@
 								<input type="radio" name="attr_weapon_type" value="Psywar" class="sheet-weapon-tab sheet-weapon-tab-2" /><span class="sheet-weapon-tab sheet-weapon-tab-2"><span style="font-family:'Pictos'">U</span>PSY</span>
 								<input type="radio" name="attr_weapon_type" value="Melee" class="sheet-weapon-tab sheet-weapon-tab-3" /><span class="sheet-weapon-tab sheet-weapon-tab-3"><span style="font-family:'Pictos'">J</span>MEL</span>
 								<input type="radio" name="attr_weapon_type" value="Ranged" class="sheet-weapon-tab sheet-weapon-tab-4" /><span class="sheet-weapon-tab sheet-weapon-tab-4"><span style="font-family:'Pictos Custom'">[</span>RAN</span>
-								<button type="roll" class="sheet-button-damage sheet-button-infowar" name="attr_weapon_infowar_roll" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=@{weapon_name} Attack}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Hacking}} {{skill_EXP=@{skill_hacking_exp}}} {{skill_FOC=@{skill_hacking_foc}}} {{attribute=Intelligence, @{intelligence}}} {{ammo=@{weapon_ammo}}} {{qualities=@{weapon_qualities}}} {{roll=[[{{ceil(([[@{skill_hacking_exp}+@{intelligence}]]-d20cs<[[@{skill_hacking_exp}+@{intelligence}]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_hacking_exp}+@{intelligence}]]-@{skill_hacking_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_hacking_exp}+@{intelligence}]]-d20cs<[[@{skill_hacking_exp}+@{intelligence}]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+@{intelligence}]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_hacking_exp}+@{intelligence}]]-d20cs<[[@{skill_hacking_exp}+@{intelligence}]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+@{intelligence}]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_hacking_exp}+@{intelligence}]]-d20cs<[[@{skill_hacking_exp}+@{intelligence}]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+@{intelligence}]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_hacking_exp}+@{intelligence}]]-d20cs<[[@{skill_hacking_exp}+@{intelligence}]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+@{intelligence}]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_hacking_exp}+@{intelligence}]]-d20cs<[[@{skill_hacking_exp}+@{intelligence}]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+@{intelligence}]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_hacking_exp}+@{intelligence}]]-d20cs<[[@{skill_hacking_exp}+@{intelligence}]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+@{intelligence}]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_hacking_exp}+@{intelligence}]]-d20cs<[[@{skill_hacking_exp}+@{intelligence}]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+@{intelligence}]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_hacking_exp}+@{intelligence}]]-d20cs<[[@{skill_hacking_exp}+@{intelligence}]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+@{intelligence}]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_hacking_exp}+@{intelligence}]]-d20cs<[[@{skill_hacking_exp}+@{intelligence}]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+@{intelligence}]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_hacking_exp}+@{intelligence}]]-d20cs<[[@{skill_hacking_exp}+@{intelligence}]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+@{intelligence}]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}} {{damage_roll=[Roll Damage](!&#13;/em rolls damage for @{weapon_name} &#13;/r ?{Fixed damage|@{weapon_damage_fixed}}+[[?{Variable damage|@{weapon_damage_dice}}+@{damage_bonus_infowar}]]t[Combat-Dice])}}"></button>
-								<button type="roll" class="sheet-button-damage sheet-button-psywar" name="attr_weapon_psywar_roll" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=@{weapon_name} Attack}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Persuade}} {{skill_EXP=@{skill_persuade_exp}}} {{skill_FOC=@{skill_persuade_foc}}} {{attribute=Personality, @{personality}}} {{ammo=@{weapon_ammo}}} {{qualities=@{weapon_qualities}}} {{roll=[[{{ceil(([[@{skill_persuade_exp}+@{personality}]]-d20cs<[[@{skill_persuade_exp}+@{personality}]]cf<@{skill_persuade_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_persuade_exp}+@{personality}]]-@{skill_persuade_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_persuade_exp}+@{personality}]]-d20cs<[[@{skill_persuade_exp}+@{personality}]]cf<@{skill_persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_persuade_exp}+@{personality}]]-@{skill_persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_persuade_exp}+@{personality}]]-d20cs<[[@{skill_persuade_exp}+@{personality}]]cf<@{skill_persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_persuade_exp}+@{personality}]]-@{skill_persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_persuade_exp}+@{personality}]]-d20cs<[[@{skill_persuade_exp}+@{personality}]]cf<@{skill_persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_persuade_exp}+@{personality}]]-@{skill_persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_persuade_exp}+@{personality}]]-d20cs<[[@{skill_persuade_exp}+@{personality}]]cf<@{skill_persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_persuade_exp}+@{personality}]]-@{skill_persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_persuade_exp}+@{personality}]]-d20cs<[[@{skill_persuade_exp}+@{personality}]]cf<@{skill_persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_persuade_exp}+@{personality}]]-@{skill_persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_persuade_exp}+@{personality}]]-d20cs<[[@{skill_persuade_exp}+@{personality}]]cf<@{skill_persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_persuade_exp}+@{personality}]]-@{skill_persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_persuade_exp}+@{personality}]]-d20cs<[[@{skill_persuade_exp}+@{personality}]]cf<@{skill_persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_persuade_exp}+@{personality}]]-@{skill_persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_persuade_exp}+@{personality}]]-d20cs<[[@{skill_persuade_exp}+@{personality}]]cf<@{skill_persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_persuade_exp}+@{personality}]]-@{skill_persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_persuade_exp}+@{personality}]]-d20cs<[[@{skill_persuade_exp}+@{personality}]]cf<@{skill_persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_persuade_exp}+@{personality}]]-@{skill_persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_persuade_exp}+@{personality}]]-d20cs<[[@{skill_persuade_exp}+@{personality}]]cf<@{skill_persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_persuade_exp}+@{personality}]]-@{skill_persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}} {{damage_roll=[Roll Damage](!&#13;/em rolls damage for @{weapon_name} &#13;/r ?{Fixed damage|@{weapon_damage_fixed}}+[[?{Variable damage|@{weapon_damage_dice}}+@{damage_bonus_psywar}]]t[Combat-Dice])}}"></button>
-								<button type="roll" class="sheet-button-damage sheet-button-melee" name="attr_weapon_melee_roll" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=@{weapon_name} Attack}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Close Combat}} {{skill_EXP=@{Skill_Close-Combat_EXP}}} {{skill_FOC=@{Skill_Close-Combat_FOC}}} {{attribute=Brawn, @{brawn}}} {{ammo=@{weapon_ammo}}} {{qualities=@{weapon_qualities}}} {{roll=[[{{ceil(([[@{Skill_Close-Combat_EXP}+@{brawn}]]-d20cs<[[@{Skill_Close-Combat_EXP}+@{brawn}]]cf<@{Skill_Close-Combat_FOC}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{Skill_Close-Combat_EXP}+@{brawn}]]-@{Skill_Close-Combat_FOC})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{Skill_Close-Combat_EXP}+@{brawn}]]-d20cs<[[@{Skill_Close-Combat_EXP}+@{brawn}]]cf<@{Skill_Close-Combat_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{Skill_Close-Combat_EXP}+@{brawn}]]-@{Skill_Close-Combat_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{Skill_Close-Combat_EXP}+@{brawn}]]-d20cs<[[@{Skill_Close-Combat_EXP}+@{brawn}]]cf<@{Skill_Close-Combat_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{Skill_Close-Combat_EXP}+@{brawn}]]-@{Skill_Close-Combat_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{Skill_Close-Combat_EXP}+@{brawn}]]-d20cs<[[@{Skill_Close-Combat_EXP}+@{brawn}]]cf<@{Skill_Close-Combat_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{Skill_Close-Combat_EXP}+@{brawn}]]-@{Skill_Close-Combat_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{Skill_Close-Combat_EXP}+@{brawn}]]-d20cs<[[@{Skill_Close-Combat_EXP}+@{brawn}]]cf<@{Skill_Close-Combat_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{Skill_Close-Combat_EXP}+@{brawn}]]-@{Skill_Close-Combat_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{Skill_Close-Combat_EXP}+@{brawn}]]-d20cs<[[@{Skill_Close-Combat_EXP}+@{brawn}]]cf<@{Skill_Close-Combat_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{Skill_Close-Combat_EXP}+@{brawn}]]-@{Skill_Close-Combat_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{Skill_Close-Combat_EXP}+@{brawn}]]-d20cs<[[@{Skill_Close-Combat_EXP}+@{brawn}]]cf<@{Skill_Close-Combat_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{Skill_Close-Combat_EXP}+@{brawn}]]-@{Skill_Close-Combat_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{Skill_Close-Combat_EXP}+@{brawn}]]-d20cs<[[@{Skill_Close-Combat_EXP}+@{brawn}]]cf<@{Skill_Close-Combat_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{Skill_Close-Combat_EXP}+@{brawn}]]-@{Skill_Close-Combat_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{Skill_Close-Combat_EXP}+@{brawn}]]-d20cs<[[@{Skill_Close-Combat_EXP}+@{brawn}]]cf<@{Skill_Close-Combat_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{Skill_Close-Combat_EXP}+@{brawn}]]-@{Skill_Close-Combat_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{Skill_Close-Combat_EXP}+@{brawn}]]-d20cs<[[@{Skill_Close-Combat_EXP}+@{brawn}]]cf<@{Skill_Close-Combat_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{Skill_Close-Combat_EXP}+@{brawn}]]-@{Skill_Close-Combat_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{Skill_Close-Combat_EXP}+@{brawn}]]-d20cs<[[@{Skill_Close-Combat_EXP}+@{brawn}]]cf<@{Skill_Close-Combat_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{Skill_Close-Combat_EXP}+@{brawn}]]-@{Skill_Close-Combat_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}} {{damage_roll=[Roll Damage](!&#13;/em rolls damage for @{weapon_name} &#13;/r ?{Fixed damage|@{weapon_damage_fixed}}+[[?{Variable damage|@{weapon_damage_dice}}+@{damage_bonus_melee}]]t[Combat-Dice])}}"></button>
-								<button type="roll" class="sheet-button-damage sheet-button-ranged" name="attr_weapon_ranged_roll" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=@{weapon_name} Attack}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Ballistics}} {{skill_EXP=@{skill_ballistics_exp}}} {{skill_FOC=@{skill_ballistics_foc}}} {{attribute=Coordination, @{coordination}}} {{ammo=@{weapon_ammo}}} {{qualities=@{weapon_qualities}}} {{roll=[[{{ceil(([[@{skill_ballistics_exp}+@{coordination}]]-d20cs<[[@{skill_ballistics_exp}+@{coordination}]]cf<@{skill_ballistics_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_ballistics_exp}+@{coordination}]]-@{skill_ballistics_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_ballistics_exp}+@{coordination}]]-d20cs<[[@{skill_ballistics_exp}+@{coordination}]]cf<@{skill_ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_ballistics_exp}+@{coordination}]]-@{skill_ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_ballistics_exp}+@{coordination}]]-d20cs<[[@{skill_ballistics_exp}+@{coordination}]]cf<@{skill_ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_ballistics_exp}+@{coordination}]]-@{skill_ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_ballistics_exp}+@{coordination}]]-d20cs<[[@{skill_ballistics_exp}+@{coordination}]]cf<@{skill_ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_ballistics_exp}+@{coordination}]]-@{skill_ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_ballistics_exp}+@{coordination}]]-d20cs<[[@{skill_ballistics_exp}+@{coordination}]]cf<@{skill_ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_ballistics_exp}+@{coordination}]]-@{skill_ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_ballistics_exp}+@{coordination}]]-d20cs<[[@{skill_ballistics_exp}+@{coordination}]]cf<@{skill_ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_ballistics_exp}+@{coordination}]]-@{skill_ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_ballistics_exp}+@{coordination}]]-d20cs<[[@{skill_ballistics_exp}+@{coordination}]]cf<@{skill_ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_ballistics_exp}+@{coordination}]]-@{skill_ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_ballistics_exp}+@{coordination}]]-d20cs<[[@{skill_ballistics_exp}+@{coordination}]]cf<@{skill_ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_ballistics_exp}+@{coordination}]]-@{skill_ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_ballistics_exp}+@{coordination}]]-d20cs<[[@{skill_ballistics_exp}+@{coordination}]]cf<@{skill_ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_ballistics_exp}+@{coordination}]]-@{skill_ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_ballistics_exp}+@{coordination}]]-d20cs<[[@{skill_ballistics_exp}+@{coordination}]]cf<@{skill_ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_ballistics_exp}+@{coordination}]]-@{skill_ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_ballistics_exp}+@{coordination}]]-d20cs<[[@{skill_ballistics_exp}+@{coordination}]]cf<@{skill_ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_ballistics_exp}+@{coordination}]]-@{skill_ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}} {{damage_roll=[Roll Damage](!&#13;/em rolls damage for @{weapon_name} &#13;/r ?{Fixed damage|@{weapon_damage_fixed}}+[[?{Variable damage|@{weapon_damage_dice}}+@{damage_bonus_ranged}]]t[Combat-Dice])}}"></button>
+								<button type="roll" class="sheet-button-damage sheet-button-infowar" name="attr_weapon_infowar_roll" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=@{weapon_name} Attack}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Hacking}} {{skill_exp=@{skill_hacking_exp}}} {{skill_foc=@{skill_hacking_foc}}} {{attribute=Intelligence, @{intelligence}}} {{ammo=@{weapon_ammo}}} {{qualities=@{weapon_qualities}}} {{roll=[[{{ceil(([[@{skill_hacking_exp}+@{intelligence}]]-d20cs<[[@{skill_hacking_exp}+@{intelligence}]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_hacking_exp}+@{intelligence}]]-@{skill_hacking_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_hacking_exp}+@{intelligence}]]-d20cs<[[@{skill_hacking_exp}+@{intelligence}]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+@{intelligence}]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_hacking_exp}+@{intelligence}]]-d20cs<[[@{skill_hacking_exp}+@{intelligence}]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+@{intelligence}]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_hacking_exp}+@{intelligence}]]-d20cs<[[@{skill_hacking_exp}+@{intelligence}]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+@{intelligence}]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_hacking_exp}+@{intelligence}]]-d20cs<[[@{skill_hacking_exp}+@{intelligence}]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+@{intelligence}]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_hacking_exp}+@{intelligence}]]-d20cs<[[@{skill_hacking_exp}+@{intelligence}]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+@{intelligence}]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_hacking_exp}+@{intelligence}]]-d20cs<[[@{skill_hacking_exp}+@{intelligence}]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+@{intelligence}]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_hacking_exp}+@{intelligence}]]-d20cs<[[@{skill_hacking_exp}+@{intelligence}]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+@{intelligence}]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_hacking_exp}+@{intelligence}]]-d20cs<[[@{skill_hacking_exp}+@{intelligence}]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+@{intelligence}]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_hacking_exp}+@{intelligence}]]-d20cs<[[@{skill_hacking_exp}+@{intelligence}]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+@{intelligence}]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_hacking_exp}+@{intelligence}]]-d20cs<[[@{skill_hacking_exp}+@{intelligence}]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+@{intelligence}]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}} {{damage_roll=[Roll Damage](!&#13;/em rolls damage for @{weapon_name} &#13;/r ?{Fixed damage|@{weapon_damage_fixed}}+[[?{Variable damage|@{weapon_damage_dice}}+@{damage_bonus_infowar}]]t[Combat-Dice])}}"></button>
+								<button type="roll" class="sheet-button-damage sheet-button-psywar" name="attr_weapon_psywar_roll" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=@{weapon_name} Attack}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Persuade}} {{skill_exp=@{skill_persuade_exp}}} {{skill_foc=@{skill_persuade_foc}}} {{attribute=Personality, @{personality}}} {{ammo=@{weapon_ammo}}} {{qualities=@{weapon_qualities}}} {{roll=[[{{ceil(([[@{skill_persuade_exp}+@{personality}]]-d20cs<[[@{skill_persuade_exp}+@{personality}]]cf<@{skill_persuade_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_persuade_exp}+@{personality}]]-@{skill_persuade_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_persuade_exp}+@{personality}]]-d20cs<[[@{skill_persuade_exp}+@{personality}]]cf<@{skill_persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_persuade_exp}+@{personality}]]-@{skill_persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_persuade_exp}+@{personality}]]-d20cs<[[@{skill_persuade_exp}+@{personality}]]cf<@{skill_persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_persuade_exp}+@{personality}]]-@{skill_persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_persuade_exp}+@{personality}]]-d20cs<[[@{skill_persuade_exp}+@{personality}]]cf<@{skill_persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_persuade_exp}+@{personality}]]-@{skill_persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_persuade_exp}+@{personality}]]-d20cs<[[@{skill_persuade_exp}+@{personality}]]cf<@{skill_persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_persuade_exp}+@{personality}]]-@{skill_persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_persuade_exp}+@{personality}]]-d20cs<[[@{skill_persuade_exp}+@{personality}]]cf<@{skill_persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_persuade_exp}+@{personality}]]-@{skill_persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_persuade_exp}+@{personality}]]-d20cs<[[@{skill_persuade_exp}+@{personality}]]cf<@{skill_persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_persuade_exp}+@{personality}]]-@{skill_persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_persuade_exp}+@{personality}]]-d20cs<[[@{skill_persuade_exp}+@{personality}]]cf<@{skill_persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_persuade_exp}+@{personality}]]-@{skill_persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_persuade_exp}+@{personality}]]-d20cs<[[@{skill_persuade_exp}+@{personality}]]cf<@{skill_persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_persuade_exp}+@{personality}]]-@{skill_persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_persuade_exp}+@{personality}]]-d20cs<[[@{skill_persuade_exp}+@{personality}]]cf<@{skill_persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_persuade_exp}+@{personality}]]-@{skill_persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_persuade_exp}+@{personality}]]-d20cs<[[@{skill_persuade_exp}+@{personality}]]cf<@{skill_persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_persuade_exp}+@{personality}]]-@{skill_persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}} {{damage_roll=[Roll Damage](!&#13;/em rolls damage for @{weapon_name} &#13;/r ?{Fixed damage|@{weapon_damage_fixed}}+[[?{Variable damage|@{weapon_damage_dice}}+@{damage_bonus_psywar}]]t[Combat-Dice])}}"></button>
+								<button type="roll" class="sheet-button-damage sheet-button-melee" name="attr_weapon_melee_roll" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=@{weapon_name} Attack}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Close Combat}} {{skill_exp=@{skill_close_combat_exp}}} {{skill_foc=@{skill_close_combat_foc}}} {{attribute=Brawn, @{brawn}}} {{ammo=@{weapon_ammo}}} {{qualities=@{weapon_qualities}}} {{roll=[[{{ceil(([[@{skill_close_combat_exp}+@{brawn}]]-d20cs<[[@{skill_close_combat_exp}+@{brawn}]]cf<@{skill_close_combat_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_close_combat_exp}+@{brawn}]]-@{skill_close_combat_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_close_combat_exp}+@{brawn}]]-d20cs<[[@{skill_close_combat_exp}+@{brawn}]]cf<@{skill_close_combat_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_close_combat_exp}+@{brawn}]]-@{skill_close_combat_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_close_combat_exp}+@{brawn}]]-d20cs<[[@{skill_close_combat_exp}+@{brawn}]]cf<@{skill_close_combat_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_close_combat_exp}+@{brawn}]]-@{skill_close_combat_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_close_combat_exp}+@{brawn}]]-d20cs<[[@{skill_close_combat_exp}+@{brawn}]]cf<@{skill_close_combat_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_close_combat_exp}+@{brawn}]]-@{skill_close_combat_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_close_combat_exp}+@{brawn}]]-d20cs<[[@{skill_close_combat_exp}+@{brawn}]]cf<@{skill_close_combat_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_close_combat_exp}+@{brawn}]]-@{skill_close_combat_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_close_combat_exp}+@{brawn}]]-d20cs<[[@{skill_close_combat_exp}+@{brawn}]]cf<@{skill_close_combat_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_close_combat_exp}+@{brawn}]]-@{skill_close_combat_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_close_combat_exp}+@{brawn}]]-d20cs<[[@{skill_close_combat_exp}+@{brawn}]]cf<@{skill_close_combat_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_close_combat_exp}+@{brawn}]]-@{skill_close_combat_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_close_combat_exp}+@{brawn}]]-d20cs<[[@{skill_close_combat_exp}+@{brawn}]]cf<@{skill_close_combat_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_close_combat_exp}+@{brawn}]]-@{skill_close_combat_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_close_combat_exp}+@{brawn}]]-d20cs<[[@{skill_close_combat_exp}+@{brawn}]]cf<@{skill_close_combat_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_close_combat_exp}+@{brawn}]]-@{skill_close_combat_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_close_combat_exp}+@{brawn}]]-d20cs<[[@{skill_close_combat_exp}+@{brawn}]]cf<@{skill_close_combat_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_close_combat_exp}+@{brawn}]]-@{skill_close_combat_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_close_combat_exp}+@{brawn}]]-d20cs<[[@{skill_close_combat_exp}+@{brawn}]]cf<@{skill_close_combat_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_close_combat_exp}+@{brawn}]]-@{skill_close_combat_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}} {{damage_roll=[Roll Damage](!&#13;/em rolls damage for @{weapon_name} &#13;/r ?{Fixed damage|@{weapon_damage_fixed}}+[[?{Variable damage|@{weapon_damage_dice}}+@{damage_bonus_melee}]]t[Combat-Dice])}}"></button>
+								<button type="roll" class="sheet-button-damage sheet-button-ranged" name="attr_weapon_ranged_roll" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=@{weapon_name} Attack}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Ballistics}} {{skill_exp=@{skill_ballistics_exp}}} {{skill_foc=@{skill_ballistics_foc}}} {{attribute=Coordination, @{coordination}}} {{ammo=@{weapon_ammo}}} {{qualities=@{weapon_qualities}}} {{roll=[[{{ceil(([[@{skill_ballistics_exp}+@{coordination}]]-d20cs<[[@{skill_ballistics_exp}+@{coordination}]]cf<@{skill_ballistics_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_ballistics_exp}+@{coordination}]]-@{skill_ballistics_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_ballistics_exp}+@{coordination}]]-d20cs<[[@{skill_ballistics_exp}+@{coordination}]]cf<@{skill_ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_ballistics_exp}+@{coordination}]]-@{skill_ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_ballistics_exp}+@{coordination}]]-d20cs<[[@{skill_ballistics_exp}+@{coordination}]]cf<@{skill_ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_ballistics_exp}+@{coordination}]]-@{skill_ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_ballistics_exp}+@{coordination}]]-d20cs<[[@{skill_ballistics_exp}+@{coordination}]]cf<@{skill_ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_ballistics_exp}+@{coordination}]]-@{skill_ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_ballistics_exp}+@{coordination}]]-d20cs<[[@{skill_ballistics_exp}+@{coordination}]]cf<@{skill_ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_ballistics_exp}+@{coordination}]]-@{skill_ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_ballistics_exp}+@{coordination}]]-d20cs<[[@{skill_ballistics_exp}+@{coordination}]]cf<@{skill_ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_ballistics_exp}+@{coordination}]]-@{skill_ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_ballistics_exp}+@{coordination}]]-d20cs<[[@{skill_ballistics_exp}+@{coordination}]]cf<@{skill_ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_ballistics_exp}+@{coordination}]]-@{skill_ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_ballistics_exp}+@{coordination}]]-d20cs<[[@{skill_ballistics_exp}+@{coordination}]]cf<@{skill_ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_ballistics_exp}+@{coordination}]]-@{skill_ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_ballistics_exp}+@{coordination}]]-d20cs<[[@{skill_ballistics_exp}+@{coordination}]]cf<@{skill_ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_ballistics_exp}+@{coordination}]]-@{skill_ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_ballistics_exp}+@{coordination}]]-d20cs<[[@{skill_ballistics_exp}+@{coordination}]]cf<@{skill_ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_ballistics_exp}+@{coordination}]]-@{skill_ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_ballistics_exp}+@{coordination}]]-d20cs<[[@{skill_ballistics_exp}+@{coordination}]]cf<@{skill_ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_ballistics_exp}+@{coordination}]]-@{skill_ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}} {{damage_roll=[Roll Damage](!&#13;/em rolls damage for @{weapon_name} &#13;/r ?{Fixed damage|@{weapon_damage_fixed}}+[[?{Variable damage|@{weapon_damage_dice}}+@{damage_bonus_ranged}]]t[Combat-Dice])}}"></button>
 							</td>
 							<td class="sheet-StatLabelSub">Reloads</td>
 							<td class="sheet-StatInput" style="width:10%"><input type="number" name="attr_weapon_reloads" value="0" /></td>
@@ -987,7 +987,7 @@
 						<td class="sheet-StatInput"><input type="number" name="attr_cashflow" /><span> / </span><input type="text" name="attr_cashflow_max" value="(@{earnings}+@{skill_lifestyle_exp}+5)" disabled></td>
 						<td class="sheet-StatInput"><input type="number" name="attr_shortfalls" /></td>
 						<td style="background-color:white;text-align:center">
-							<button type="roll" style="display:inline" value="&amp;{template:skillroll} {{header=?{Item name} Acquisition}} {{character_name=@{character_name}}} {{subheader=Difficulty [[?{Restriction rating|0}+@{shortfalls}+?{Bulk difficulty|0}]]}} {{skill=Lifestyle}} {{skill_EXP=@{skill_lifestyle_exp}}} {{skill_FOC=@{skill_lifestyle_foc}}} {{attribute=Personality, [[@{personality}]]}} {{roll=[[{{ceil(([[@{skill_lifestyle_exp}+@{personality}]]-d20cs<[[@{skill_lifestyle_exp}+@{personality}]]cf<@{skill_lifestyle_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_lifestyle_exp}+@{personality}]]-@{skill_lifestyle_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_lifestyle_exp}+@{personality}]]-d20cs<[[@{skill_lifestyle_exp}+@{personality}]]cf<@{skill_lifestyle_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_lifestyle_exp}+@{personality}]]-@{skill_lifestyle_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_lifestyle_exp}+@{personality}]]-d20cs<[[@{skill_lifestyle_exp}+@{personality}]]cf<@{skill_lifestyle_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_lifestyle_exp}+@{personality}]]-@{skill_lifestyle_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_lifestyle_exp}+@{personality}]]-d20cs<[[@{skill_lifestyle_exp}+@{personality}]]cf<@{skill_lifestyle_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_lifestyle_exp}+@{personality}]]-@{skill_lifestyle_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_lifestyle_exp}+@{personality}]]-d20cs<[[@{skill_lifestyle_exp}+@{personality}]]cf<@{skill_lifestyle_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_lifestyle_exp}+@{personality}]]-@{skill_lifestyle_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_lifestyle_exp}+@{personality}]]-d20cs<[[@{skill_lifestyle_exp}+@{personality}]]cf<@{skill_lifestyle_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_lifestyle_exp}+@{personality}]]-@{skill_lifestyle_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_lifestyle_exp}+@{personality}]]-d20cs<[[@{skill_lifestyle_exp}+@{personality}]]cf<@{skill_lifestyle_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_lifestyle_exp}+@{personality}]]-@{skill_lifestyle_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_lifestyle_exp}+@{personality}]]-d20cs<[[@{skill_lifestyle_exp}+@{personality}]]cf<@{skill_lifestyle_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_lifestyle_exp}+@{personality}]]-@{skill_lifestyle_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_lifestyle_exp}+@{personality}]]-d20cs<[[@{skill_lifestyle_exp}+@{personality}]]cf<@{skill_lifestyle_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_lifestyle_exp}+@{personality}]]-@{skill_lifestyle_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_lifestyle_exp}+@{personality}]]-d20cs<[[@{skill_lifestyle_exp}+@{personality}]]cf<@{skill_lifestyle_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_lifestyle_exp}+@{personality}]]-@{skill_lifestyle_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_lifestyle_exp}+@{personality}]]-d20cs<[[@{skill_lifestyle_exp}+@{personality}]]cf<@{skill_lifestyle_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_lifestyle_exp}+@{personality}]]-@{skill_lifestyle_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}} {{damage_roll=[Roll Cost](!&#13;/em Rolling for item cost. Tariff: ?{Tariff|0} &#13;/r ?{Fixed cost|1}+?{Variable cost|1}t[Combat-Dice])}}" ></button>
+							<button type="roll" style="display:inline" value="&amp;{template:skillroll} {{header=?{Item name} Acquisition}} {{character_name=@{character_name}}} {{subheader=Difficulty [[?{Restriction rating|0}+@{shortfalls}+?{Bulk difficulty|0}]]}} {{skill=Lifestyle}} {{skill_exp=@{skill_lifestyle_exp}}} {{skill_foc=@{skill_lifestyle_foc}}} {{attribute=Personality, [[@{personality}]]}} {{roll=[[{{ceil(([[@{skill_lifestyle_exp}+@{personality}]]-d20cs<[[@{skill_lifestyle_exp}+@{personality}]]cf<@{skill_lifestyle_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_lifestyle_exp}+@{personality}]]-@{skill_lifestyle_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_lifestyle_exp}+@{personality}]]-d20cs<[[@{skill_lifestyle_exp}+@{personality}]]cf<@{skill_lifestyle_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_lifestyle_exp}+@{personality}]]-@{skill_lifestyle_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_lifestyle_exp}+@{personality}]]-d20cs<[[@{skill_lifestyle_exp}+@{personality}]]cf<@{skill_lifestyle_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_lifestyle_exp}+@{personality}]]-@{skill_lifestyle_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_lifestyle_exp}+@{personality}]]-d20cs<[[@{skill_lifestyle_exp}+@{personality}]]cf<@{skill_lifestyle_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_lifestyle_exp}+@{personality}]]-@{skill_lifestyle_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_lifestyle_exp}+@{personality}]]-d20cs<[[@{skill_lifestyle_exp}+@{personality}]]cf<@{skill_lifestyle_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_lifestyle_exp}+@{personality}]]-@{skill_lifestyle_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_lifestyle_exp}+@{personality}]]-d20cs<[[@{skill_lifestyle_exp}+@{personality}]]cf<@{skill_lifestyle_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_lifestyle_exp}+@{personality}]]-@{skill_lifestyle_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_lifestyle_exp}+@{personality}]]-d20cs<[[@{skill_lifestyle_exp}+@{personality}]]cf<@{skill_lifestyle_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_lifestyle_exp}+@{personality}]]-@{skill_lifestyle_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_lifestyle_exp}+@{personality}]]-d20cs<[[@{skill_lifestyle_exp}+@{personality}]]cf<@{skill_lifestyle_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_lifestyle_exp}+@{personality}]]-@{skill_lifestyle_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_lifestyle_exp}+@{personality}]]-d20cs<[[@{skill_lifestyle_exp}+@{personality}]]cf<@{skill_lifestyle_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_lifestyle_exp}+@{personality}]]-@{skill_lifestyle_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_lifestyle_exp}+@{personality}]]-d20cs<[[@{skill_lifestyle_exp}+@{personality}]]cf<@{skill_lifestyle_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_lifestyle_exp}+@{personality}]]-@{skill_lifestyle_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_lifestyle_exp}+@{personality}]]-d20cs<[[@{skill_lifestyle_exp}+@{personality}]]cf<@{skill_lifestyle_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_lifestyle_exp}+@{personality}]]-@{skill_lifestyle_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}} {{damage_roll=[Roll Cost](!&#13;/em Rolling for item cost. Tariff: ?{Tariff|0} &#13;/r ?{Fixed cost|1}+?{Variable cost|1}t[Combat-Dice])}}" ></button>
 						</td>
 					</tr>
 				</table>
@@ -1110,7 +1110,7 @@
 						<td style="width:2%;background-color:white;text-align:center;border-left-style:none;border-right-style:none;"><span class="sheet-InputText">+</span></td>
 						<td class="sheet-StatInput" style="width:5%;border-left-style:none"><input type="text" name="attr_hacking_program_damage_dice" style="width:50%"/><img class="sheet-icon-N-small" src="https://svgshare.com/i/5ZJ.svg" /></td>
 						<td class="sheet-StatInput" style="width:50%"><input type="text" name="attr_hacking_program_qualities" /></td>
-						<td style="background-color:white;text-align:center;width:5%"><button type="roll" name="attr_weapon_infowar_roll" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=@{hacking_program_name} Attack}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Hacking}} {{skill_EXP=@{skill_hacking_exp}}} {{skill_FOC=@{skill_hacking_foc}}} {{attribute=Intelligence, @{intelligence}}} {{qualities=@{hacking_program_qualities}}} {{roll=[[{{ceil(([[@{skill_hacking_exp}+@{intelligence}]]-d20cs<[[@{skill_hacking_exp}+@{intelligence}]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_hacking_exp}+@{intelligence}]]-@{skill_hacking_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_hacking_exp}+@{intelligence}]]-d20cs<[[@{skill_hacking_exp}+@{intelligence}]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+@{intelligence}]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_hacking_exp}+@{intelligence}]]-d20cs<[[@{skill_hacking_exp}+@{intelligence}]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+@{intelligence}]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_hacking_exp}+@{intelligence}]]-d20cs<[[@{skill_hacking_exp}+@{intelligence}]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+@{intelligence}]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_hacking_exp}+@{intelligence}]]-d20cs<[[@{skill_hacking_exp}+@{intelligence}]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+@{intelligence}]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_hacking_exp}+@{intelligence}]]-d20cs<[[@{skill_hacking_exp}+@{intelligence}]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+@{intelligence}]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_hacking_exp}+@{intelligence}]]-d20cs<[[@{skill_hacking_exp}+@{intelligence}]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+@{intelligence}]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_hacking_exp}+@{intelligence}]]-d20cs<[[@{skill_hacking_exp}+@{intelligence}]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+@{intelligence}]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_hacking_exp}+@{intelligence}]]-d20cs<[[@{skill_hacking_exp}+@{intelligence}]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+@{intelligence}]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_hacking_exp}+@{intelligence}]]-d20cs<[[@{skill_hacking_exp}+@{intelligence}]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+@{intelligence}]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_hacking_exp}+@{intelligence}]]-d20cs<[[@{skill_hacking_exp}+@{intelligence}]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+@{intelligence}]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}} {{damage_roll=[Roll Damage](!&#13;/em rolls damage for @{hacking_program_name} &#13;/r ?{Fixed damage|@{hacking_program_damage_fixed}}+[[?{Variable damage|@{hacking_program_damage_dice}}+@{damage_bonus_infowar}]]t[Combat-Dice])}}"></button></td>
+						<td style="background-color:white;text-align:center;width:5%"><button type="roll" name="attr_weapon_infowar_roll" value="&amp;{template:skillroll} {{character_name=@{character_name}}} {{header=@{hacking_program_name} Attack}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Hacking}} {{skill_exp=@{skill_hacking_exp}}} {{skill_foc=@{skill_hacking_foc}}} {{attribute=Intelligence, @{intelligence}}} {{qualities=@{hacking_program_qualities}}} {{roll=[[{{ceil(([[@{skill_hacking_exp}+@{intelligence}]]-d20cs<[[@{skill_hacking_exp}+@{intelligence}]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{skill_hacking_exp}+@{intelligence}]]-@{skill_hacking_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{skill_hacking_exp}+@{intelligence}]]-d20cs<[[@{skill_hacking_exp}+@{intelligence}]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+@{intelligence}]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{skill_hacking_exp}+@{intelligence}]]-d20cs<[[@{skill_hacking_exp}+@{intelligence}]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+@{intelligence}]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_hacking_exp}+@{intelligence}]]-d20cs<[[@{skill_hacking_exp}+@{intelligence}]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+@{intelligence}]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{skill_hacking_exp}+@{intelligence}]]-d20cs<[[@{skill_hacking_exp}+@{intelligence}]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+@{intelligence}]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_hacking_exp}+@{intelligence}]]-d20cs<[[@{skill_hacking_exp}+@{intelligence}]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+@{intelligence}]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_hacking_exp}+@{intelligence}]]-d20cs<[[@{skill_hacking_exp}+@{intelligence}]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+@{intelligence}]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{skill_hacking_exp}+@{intelligence}]]-d20cs<[[@{skill_hacking_exp}+@{intelligence}]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+@{intelligence}]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_hacking_exp}+@{intelligence}]]-d20cs<[[@{skill_hacking_exp}+@{intelligence}]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+@{intelligence}]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_hacking_exp}+@{intelligence}]]-d20cs<[[@{skill_hacking_exp}+@{intelligence}]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+@{intelligence}]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{skill_hacking_exp}+@{intelligence}]]-d20cs<[[@{skill_hacking_exp}+@{intelligence}]]cf<@{skill_hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{skill_hacking_exp}+@{intelligence}]]-@{skill_hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}} {{damage_roll=[Roll Damage](!&#13;/em rolls damage for @{hacking_program_name} &#13;/r ?{Fixed damage|@{hacking_program_damage_fixed}}+[[?{Variable damage|@{hacking_program_damage_dice}}+@{damage_bonus_infowar}]]t[Combat-Dice])}}"></button></td>
 					</tr>
 				</table>
 			</fieldset>
@@ -1399,10 +1399,10 @@
 					</tr>
 					<tr>
 						<td rowspan="2" class="sheet-left sheet-StatLabelSub">Extended Family</td>
-						<td class="sheet-StatInput"><input class="sheet-left" type="text" name="attr_Extended_Family_1" /></td>
+						<td class="sheet-StatInput"><input class="sheet-left" type="text" name="attr_extended_family_1" /></td>
 					</tr>
 					<tr>
-						<td class="sheet-StatInput"><input class="sheet-left" type="text" name="attr_Extended_Family_2" /></td>
+						<td class="sheet-StatInput"><input class="sheet-left" type="text" name="attr_extended_family_2" /></td>
 					</tr>
 				</table>
 				<table style="width:100%;margin-bottom:0">
@@ -1708,7 +1708,7 @@
 								<td style="width:30px" class="sheet-StatInput"><input type="number" name="attr_geist_skill_exp" value="0" /></td>
 								<td style="width:30px" class="sheet-StatInput"><input type="number" name="attr_geist_skill_foc" value="0" /></td>
 								<td style="width:30px;background-color:white;text-align:center">
-									<button type="roll" name="attr_geist_skill_roll" value="&amp;{template:skillroll} {{character_name=@{geist_name}}} {{header=@{geist_skill_name} Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=@{geist_skill_name}}} {{skill_EXP=@{geist_skill_exp}}} {{skill_FOC=@{geist_skill_foc}}} {{attribute=?{Attribute|Agility, @{geist_agility}|Awareness, @{geist_awareness}|Brawn, @{geist_brawn}|Coordination, @{geist_coordination}|Intelligence, @{geist_intelligence}|Personality, @{geist_personality}|Willpower, @{geist_willpower}}}} {{roll=[[{{ceil(([[@{geist_skill_exp}+?{Attribute}]]-d20cs<[[@{geist_skill_exp}+?{Attribute}]]cf<@{geist_skill_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{geist_skill_exp}+?{Attribute}]]-@{geist_skill_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{geist_skill_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{geist_skill_exp}+?{Attribute&amp;#125;]]cf<@{geist_skill_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{geist_skill_exp}+?{Attribute&amp;#125;]]-@{geist_skill_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{geist_skill_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{geist_skill_exp}+?{Attribute&amp;#125;]]cf<@{geist_skill_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{geist_skill_exp}+?{Attribute&amp;#125;]]-@{geist_skill_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{geist_skill_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{geist_skill_exp}+?{Attribute&amp;#125;]]cf<@{geist_skill_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{geist_skill_exp}+?{Attribute&amp;#125;]]-@{geist_skill_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{geist_skill_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{geist_skill_exp}+?{Attribute&amp;#125;]]cf<@{geist_skill_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{geist_skill_exp}+?{Attribute&amp;#125;]]-@{geist_skill_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{geist_skill_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{geist_skill_exp}+?{Attribute&amp;#125;]]cf<@{geist_skill_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{geist_skill_exp}+?{Attribute&amp;#125;]]-@{geist_skill_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{geist_skill_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{geist_skill_exp}+?{Attribute&amp;#125;]]cf<@{geist_skill_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{geist_skill_exp}+?{Attribute&amp;#125;]]-@{geist_skill_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{geist_skill_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{geist_skill_exp}+?{Attribute&amp;#125;]]cf<@{geist_skill_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{geist_skill_exp}+?{Attribute&amp;#125;]]-@{geist_skill_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{geist_skill_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{geist_skill_exp}+?{Attribute&amp;#125;]]cf<@{geist_skill_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{geist_skill_exp}+?{Attribute&amp;#125;]]-@{geist_skill_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{geist_skill_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{geist_skill_exp}+?{Attribute&amp;#125;]]cf<@{geist_skill_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{geist_skill_exp}+?{Attribute&amp;#125;]]-@{geist_skill_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{geist_skill_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{geist_skill_exp}+?{Attribute&amp;#125;]]cf<@{geist_skill_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{geist_skill_exp}+?{Attribute&amp;#125;]]-@{geist_skill_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
+									<button type="roll" name="attr_geist_skill_roll" value="&amp;{template:skillroll} {{character_name=@{geist_name}}} {{header=@{geist_skill_name} Test}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=@{geist_skill_name}}} {{skill_exp=@{geist_skill_exp}}} {{skill_foc=@{geist_skill_foc}}} {{attribute=?{Attribute|Agility, @{geist_agility}|Awareness, @{geist_awareness}|Brawn, @{geist_brawn}|Coordination, @{geist_coordination}|Intelligence, @{geist_intelligence}|Personality, @{geist_personality}|Willpower, @{geist_willpower}}}} {{roll=[[{{ceil(([[@{geist_skill_exp}+?{Attribute}]]-d20cs<[[@{geist_skill_exp}+?{Attribute}]]cf<@{geist_skill_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{geist_skill_exp}+?{Attribute}]]-@{geist_skill_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{geist_skill_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{geist_skill_exp}+?{Attribute&amp;#125;]]cf<@{geist_skill_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{geist_skill_exp}+?{Attribute&amp;#125;]]-@{geist_skill_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{geist_skill_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{geist_skill_exp}+?{Attribute&amp;#125;]]cf<@{geist_skill_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{geist_skill_exp}+?{Attribute&amp;#125;]]-@{geist_skill_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{geist_skill_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{geist_skill_exp}+?{Attribute&amp;#125;]]cf<@{geist_skill_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{geist_skill_exp}+?{Attribute&amp;#125;]]-@{geist_skill_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{geist_skill_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{geist_skill_exp}+?{Attribute&amp;#125;]]cf<@{geist_skill_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{geist_skill_exp}+?{Attribute&amp;#125;]]-@{geist_skill_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{geist_skill_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{geist_skill_exp}+?{Attribute&amp;#125;]]cf<@{geist_skill_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{geist_skill_exp}+?{Attribute&amp;#125;]]-@{geist_skill_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{geist_skill_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{geist_skill_exp}+?{Attribute&amp;#125;]]cf<@{geist_skill_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{geist_skill_exp}+?{Attribute&amp;#125;]]-@{geist_skill_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{geist_skill_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{geist_skill_exp}+?{Attribute&amp;#125;]]cf<@{geist_skill_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{geist_skill_exp}+?{Attribute&amp;#125;]]-@{geist_skill_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{geist_skill_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{geist_skill_exp}+?{Attribute&amp;#125;]]cf<@{geist_skill_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{geist_skill_exp}+?{Attribute&amp;#125;]]-@{geist_skill_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{geist_skill_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{geist_skill_exp}+?{Attribute&amp;#125;]]cf<@{geist_skill_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{geist_skill_exp}+?{Attribute&amp;#125;]]-@{geist_skill_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{geist_skill_exp}+?{Attribute&amp;#125;]]-d20cs<[[@{geist_skill_exp}+?{Attribute&amp;#125;]]cf<@{geist_skill_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{geist_skill_exp}+?{Attribute&amp;#125;]]-@{geist_skill_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}}">
 									</button>
 								</td>
 							</tr>
@@ -2106,10 +2106,10 @@
 							<input type="radio" name="attr_vehicle_attack_type" value="Psywar" class="sheet-weapon-tab sheet-weapon-tab-2" /><span class="sheet-weapon-tab sheet-weapon-tab-2"><span style="font-family:'Pictos'">U</span>PSY</span>
 							<input type="radio" name="attr_vehicle_attack_type" value="Melee" class="sheet-weapon-tab sheet-weapon-tab-3" /><span class="sheet-weapon-tab sheet-weapon-tab-3"><span style="font-family:'Pictos'">J</span>MEL</span>
 							<input type="radio" name="attr_vehicle_attack_type" value="Ranged" class="sheet-weapon-tab sheet-weapon-tab-4" /><span class="sheet-weapon-tab sheet-weapon-tab-4"><span style="font-family:'Pictos Custom'">[</span>RAN</span>
-							<button type="roll" class="sheet-button-damage sheet-button-infowar" name="attr_vehicle_attack_infowar_roll" value="&amp;{template:skillroll} {{vehicle_name=@{target|vehicle_name}}} {{header=@{vehicle_name}'s @{attack_name} Attack}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Hacking}} {{EXP=@{target|Skill_Hacking_EXP}}} {{FOC=@{target|Skill_Hacking_FOC}}} {{attribute=Intelligence, @{target|Intelligence}}} {{ammo=@{attack_ammo}}} {{qualities=@{attack_qualities}}} {{roll=[[{{ceil(([[@{target|Skill_Hacking_EXP}+@{target|Intelligence}]]-d20cs<[[@{target|Skill_Hacking_EXP}+@{target|Intelligence}]]cf<@{target|Skill_Hacking_FOC}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{target|Skill_Hacking_EXP}+@{target|Intelligence}]]-@{target|Skill_Hacking_FOC})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{target|Skill_Hacking_EXP}+@{target|Intelligence}]]-d20cs<[[@{target|Skill_Hacking_EXP}+@{target|Intelligence}]]cf<@{target|Skill_Hacking_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|Skill_Hacking_EXP}+@{target|Intelligence}]]-@{target|Skill_Hacking_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{target|Skill_Hacking_EXP}+@{target|Intelligence}]]-d20cs<[[@{target|Skill_Hacking_EXP}+@{target|Intelligence}]]cf<@{target|Skill_Hacking_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|Skill_Hacking_EXP}+@{target|Intelligence}]]-@{target|Skill_Hacking_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|Skill_Hacking_EXP}+@{target|Intelligence}]]-d20cs<[[@{target|Skill_Hacking_EXP}+@{target|Intelligence}]]cf<@{target|Skill_Hacking_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|Skill_Hacking_EXP}+@{target|Intelligence}]]-@{target|Skill_Hacking_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{target|Skill_Hacking_EXP}+@{target|Intelligence}]]-d20cs<[[@{target|Skill_Hacking_EXP}+@{target|Intelligence}]]cf<@{target|Skill_Hacking_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|Skill_Hacking_EXP}+@{target|Intelligence}]]-@{target|Skill_Hacking_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|Skill_Hacking_EXP}+@{target|Intelligence}]]-d20cs<[[@{target|Skill_Hacking_EXP}+@{target|Intelligence}]]cf<@{target|Skill_Hacking_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|Skill_Hacking_EXP}+@{target|Intelligence}]]-@{target|Skill_Hacking_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|Skill_Hacking_EXP}+@{target|Intelligence}]]-d20cs<[[@{target|Skill_Hacking_EXP}+@{target|Intelligence}]]cf<@{target|Skill_Hacking_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|Skill_Hacking_EXP}+@{target|Intelligence}]]-@{target|Skill_Hacking_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{target|Skill_Hacking_EXP}+@{target|Intelligence}]]-d20cs<[[@{target|Skill_Hacking_EXP}+@{target|Intelligence}]]cf<@{target|Skill_Hacking_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|Skill_Hacking_EXP}+@{target|Intelligence}]]-@{target|Skill_Hacking_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|Skill_Hacking_EXP}+@{target|Intelligence}]]-d20cs<[[@{target|Skill_Hacking_EXP}+@{target|Intelligence}]]cf<@{target|Skill_Hacking_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|Skill_Hacking_EXP}+@{target|Intelligence}]]-@{target|Skill_Hacking_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|Skill_Hacking_EXP}+@{target|Intelligence}]]-d20cs<[[@{target|Skill_Hacking_EXP}+@{target|Intelligence}]]cf<@{target|Skill_Hacking_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|Skill_Hacking_EXP}+@{target|Intelligence}]]-@{target|Skill_Hacking_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|Skill_Hacking_EXP}+@{target|Intelligence}]]-d20cs<[[@{target|Skill_Hacking_EXP}+@{target|Intelligence}]]cf<@{target|Skill_Hacking_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|Skill_Hacking_EXP}+@{target|Intelligence}]]-@{target|Skill_Hacking_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}} {{damage_roll=[Roll Damage](!&#13;/em rolls damage for @{attack_name} &#13;/r ?{Fixed damage|@{attack_damage_fixed}}+[[?{Variable damage|@{attack_damage_dice}}+@{target|Damage_Bonus_Infowar}]]t[Combat-Dice])}}"></button>
-							<button type="roll" class="sheet-button-damage sheet-button-psywar" name="attr_vehicle_attack_psywar_roll" value="&amp;{template:skillroll} {{vehicle_name=@{target|vehicle_name}}} {{header=@{vehicle_name}'s @{attack_name} Attack}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Persuade}} {{EXP=@{target|Skill_Persuade_EXP}}} {{FOC=@{target|Skill_Persuade_FOC}}} {{attribute=Personality, @{target|Personality}}} {{ammo=@{attack_ammo}}} {{qualities=@{attack_qualities}}} {{roll=[[{{ceil(([[@{target|Skill_Persuade_EXP}+@{target|Personality}]]-d20cs<[[@{target|Skill_Persuade_EXP}+@{target|Personality}]]cf<@{target|Skill_Persuade_FOC}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{target|Skill_Persuade_EXP}+@{target|Personality}]]-@{target|Skill_Persuade_FOC})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{target|Skill_Persuade_EXP}+@{target|Personality}]]-d20cs<[[@{target|Skill_Persuade_EXP}+@{target|Personality}]]cf<@{target|Skill_Persuade_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|Skill_Persuade_EXP}+@{target|Personality}]]-@{target|Skill_Persuade_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{target|Skill_Persuade_EXP}+@{target|Personality}]]-d20cs<[[@{target|Skill_Persuade_EXP}+@{target|Personality}]]cf<@{target|Skill_Persuade_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|Skill_Persuade_EXP}+@{target|Personality}]]-@{target|Skill_Persuade_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|Skill_Persuade_EXP}+@{target|Personality}]]-d20cs<[[@{target|Skill_Persuade_EXP}+@{target|Personality}]]cf<@{target|Skill_Persuade_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|Skill_Persuade_EXP}+@{target|Personality}]]-@{target|Skill_Persuade_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{target|Skill_Persuade_EXP}+@{target|Personality}]]-d20cs<[[@{target|Skill_Persuade_EXP}+@{target|Personality}]]cf<@{target|Skill_Persuade_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|Skill_Persuade_EXP}+@{target|Personality}]]-@{target|Skill_Persuade_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|Skill_Persuade_EXP}+@{target|Personality}]]-d20cs<[[@{target|Skill_Persuade_EXP}+@{target|Personality}]]cf<@{target|Skill_Persuade_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|Skill_Persuade_EXP}+@{target|Personality}]]-@{target|Skill_Persuade_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|Skill_Persuade_EXP}+@{target|Personality}]]-d20cs<[[@{target|Skill_Persuade_EXP}+@{target|Personality}]]cf<@{target|Skill_Persuade_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|Skill_Persuade_EXP}+@{target|Personality}]]-@{target|Skill_Persuade_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{target|Skill_Persuade_EXP}+@{target|Personality}]]-d20cs<[[@{target|Skill_Persuade_EXP}+@{target|Personality}]]cf<@{target|Skill_Persuade_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|Skill_Persuade_EXP}+@{target|Personality}]]-@{target|Skill_Persuade_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|Skill_Persuade_EXP}+@{target|Personality}]]-d20cs<[[@{target|Skill_Persuade_EXP}+@{target|Personality}]]cf<@{target|Skill_Persuade_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|Skill_Persuade_EXP}+@{target|Personality}]]-@{target|Skill_Persuade_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|Skill_Persuade_EXP}+@{target|Personality}]]-d20cs<[[@{target|Skill_Persuade_EXP}+@{target|Personality}]]cf<@{target|Skill_Persuade_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|Skill_Persuade_EXP}+@{target|Personality}]]-@{target|Skill_Persuade_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|Skill_Persuade_EXP}+@{target|Personality}]]-d20cs<[[@{target|Skill_Persuade_EXP}+@{target|Personality}]]cf<@{target|Skill_Persuade_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|Skill_Persuade_EXP}+@{target|Personality}]]-@{target|Skill_Persuade_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}} {{damage_roll=[Roll Damage](!&#13;/em rolls damage for @{attack_name} &#13;/r ?{Fixed damage|@{attack_damage_fixed}}+[[?{Variable damage|@{attack_damage_dice}}+@{target|Damage_Bonus_Psywar}]]t[Combat-Dice])}}"></button>
-							<button type="roll" class="sheet-button-damage sheet-button-melee" name="attr_vehicle_attack_melee_roll" value="&amp;{template:skillroll} {{vehicle_name=@{target|vehicle_name}}} {{header=@{vehicle_name}'s @{attack_name} Attack}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Close Combat}} {{EXP=@{target|Skill_Close-Combat_EXP}}} {{FOC=@{target|Skill_Close-Combat_FOC}}} {{attribute=Brawn, @{brawn}}} {{ammo=@{attack_ammo}}} {{qualities=@{attack_qualities}}} {{roll=[[{{ceil(([[@{target|Skill_Close-Combat_EXP}+@{target|Brawn}]]-d20cs<[[@{target|Skill_Close-Combat_EXP}+@{target|Brawn}]]cf<@{target|Skill_Close-Combat_FOC}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{target|Skill_Close-Combat_EXP}+@{target|Brawn}]]-@{target|Skill_Close-Combat_FOC})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{target|Skill_Close-Combat_EXP}+@{target|Brawn}]]-d20cs<[[@{target|Skill_Close-Combat_EXP}+@{target|Brawn}]]cf<@{target|Skill_Close-Combat_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|Skill_Close-Combat_EXP}+@{target|Brawn}]]-@{target|Skill_Close-Combat_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{target|Skill_Close-Combat_EXP}+@{target|Brawn}]]-d20cs<[[@{target|Skill_Close-Combat_EXP}+@{target|Brawn}]]cf<@{target|Skill_Close-Combat_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|Skill_Close-Combat_EXP}+@{target|Brawn}]]-@{target|Skill_Close-Combat_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|Skill_Close-Combat_EXP}+@{target|Brawn}]]-d20cs<[[@{target|Skill_Close-Combat_EXP}+@{target|Brawn}]]cf<@{target|Skill_Close-Combat_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|Skill_Close-Combat_EXP}+@{target|Brawn}]]-@{target|Skill_Close-Combat_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{target|Skill_Close-Combat_EXP}+@{target|Brawn}]]-d20cs<[[@{target|Skill_Close-Combat_EXP}+@{target|Brawn}]]cf<@{target|Skill_Close-Combat_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|Skill_Close-Combat_EXP}+@{target|Brawn}]]-@{target|Skill_Close-Combat_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|Skill_Close-Combat_EXP}+@{target|Brawn}]]-d20cs<[[@{target|Skill_Close-Combat_EXP}+@{target|Brawn}]]cf<@{target|Skill_Close-Combat_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|Skill_Close-Combat_EXP}+@{target|Brawn}]]-@{target|Skill_Close-Combat_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|Skill_Close-Combat_EXP}+@{target|Brawn}]]-d20cs<[[@{target|Skill_Close-Combat_EXP}+@{target|Brawn}]]cf<@{target|Skill_Close-Combat_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|Skill_Close-Combat_EXP}+@{target|Brawn}]]-@{target|Skill_Close-Combat_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{target|Skill_Close-Combat_EXP}+@{target|Brawn}]]-d20cs<[[@{target|Skill_Close-Combat_EXP}+@{target|Brawn}]]cf<@{target|Skill_Close-Combat_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|Skill_Close-Combat_EXP}+@{target|Brawn}]]-@{target|Skill_Close-Combat_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|Skill_Close-Combat_EXP}+@{target|Brawn}]]-d20cs<[[@{target|Skill_Close-Combat_EXP}+@{target|Brawn}]]cf<@{target|Skill_Close-Combat_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|Skill_Close-Combat_EXP}+@{target|Brawn}]]-@{target|Skill_Close-Combat_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|Skill_Close-Combat_EXP}+@{target|Brawn}]]-d20cs<[[@{target|Skill_Close-Combat_EXP}+@{target|Brawn}]]cf<@{target|Skill_Close-Combat_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|Skill_Close-Combat_EXP}+@{target|Brawn}]]-@{target|Skill_Close-Combat_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|Skill_Close-Combat_EXP}+@{target|Brawn}]]-d20cs<[[@{target|Skill_Close-Combat_EXP}+@{target|Brawn}]]cf<@{target|Skill_Close-Combat_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|Skill_Close-Combat_EXP}+@{target|Brawn}]]-@{target|Skill_Close-Combat_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}} {{damage_roll=[Roll Damage](!&#13;/em rolls damage for @{attack_name} &#13;/r ?{Fixed damage|@{attack_damage_fixed}}+[[?{Variable damage|@{attack_damage_dice}}+@{target|Damage_Bonus_Melee}]]t[Combat-Dice])}}"></button>
-							<button type="roll" class="sheet-button-damage sheet-button-ranged" name="attr_vehicle_attack_ranged_roll" value="&amp;{template:skillroll} {{vehicle_name=@{target|vehicle_name}}} {{header=@{vehicle_name}'s @{attack_name} Attack}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Ballistics}} {{EXP=@{target|Skill_Ballistics_EXP}}} {{FOC=@{target|Skill_Ballistics_FOC}}} {{attribute=Coordination, @{target|Coordination}}} {{ammo=@{attack_ammo}}} {{qualities=@{attack_qualities}}} {{roll=[[{{ceil(([[@{target|Skill_Ballistics_EXP}+@{target|Coordination}]]-d20cs<[[@{target|Skill_Ballistics_EXP}+@{target|Coordination}]]cf<@{target|Skill_Ballistics_FOC}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{target|Skill_Ballistics_EXP}+@{target|Coordination}]]-@{target|Skill_Ballistics_FOC})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{target|Skill_Ballistics_EXP}+@{target|Coordination}]]-d20cs<[[@{target|Skill_Ballistics_EXP}+@{target|Coordination}]]cf<@{target|Skill_Ballistics_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|Skill_Ballistics_EXP}+@{target|Coordination}]]-@{target|Skill_Ballistics_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{target|Skill_Ballistics_EXP}+@{target|Coordination}]]-d20cs<[[@{target|Skill_Ballistics_EXP}+@{target|Coordination}]]cf<@{target|Skill_Ballistics_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|Skill_Ballistics_EXP}+@{target|Coordination}]]-@{target|Skill_Ballistics_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|Skill_Ballistics_EXP}+@{target|Coordination}]]-d20cs<[[@{target|Skill_Ballistics_EXP}+@{target|Coordination}]]cf<@{target|Skill_Ballistics_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|Skill_Ballistics_EXP}+@{target|Coordination}]]-@{target|Skill_Ballistics_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{target|Skill_Ballistics_EXP}+@{target|Coordination}]]-d20cs<[[@{target|Skill_Ballistics_EXP}+@{target|Coordination}]]cf<@{target|Skill_Ballistics_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|Skill_Ballistics_EXP}+@{target|Coordination}]]-@{target|Skill_Ballistics_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|Skill_Ballistics_EXP}+@{target|Coordination}]]-d20cs<[[@{target|Skill_Ballistics_EXP}+@{target|Coordination}]]cf<@{target|Skill_Ballistics_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|Skill_Ballistics_EXP}+@{target|Coordination}]]-@{target|Skill_Ballistics_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|Skill_Ballistics_EXP}+@{target|Coordination}]]-d20cs<[[@{target|Skill_Ballistics_EXP}+@{target|Coordination}]]cf<@{target|Skill_Ballistics_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|Skill_Ballistics_EXP}+@{target|Coordination}]]-@{target|Skill_Ballistics_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{target|Skill_Ballistics_EXP}+@{target|Coordination}]]-d20cs<[[@{target|Skill_Ballistics_EXP}+@{target|Coordination}]]cf<@{target|Skill_Ballistics_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|Skill_Ballistics_EXP}+@{target|Coordination}]]-@{target|Skill_Ballistics_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|Skill_Ballistics_EXP}+@{target|Coordination}]]-d20cs<[[@{target|Skill_Ballistics_EXP}+@{target|Coordination}]]cf<@{target|Skill_Ballistics_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|Skill_Ballistics_EXP}+@{target|Coordination}]]-@{target|Skill_Ballistics_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|Skill_Ballistics_EXP}+@{target|Coordination}]]-d20cs<[[@{target|Skill_Ballistics_EXP}+@{target|Coordination}]]cf<@{target|Skill_Ballistics_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|Skill_Ballistics_EXP}+@{target|Coordination}]]-@{target|Skill_Ballistics_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|Skill_Ballistics_EXP}+@{target|Coordination}]]-d20cs<[[@{target|Skill_Ballistics_EXP}+@{target|Coordination}]]cf<@{target|Skill_Ballistics_FOC}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|Skill_Ballistics_EXP}+@{target|Coordination}]]-@{target|Skill_Ballistics_FOC}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}} {{damage_roll=[Roll Damage](!&#13;/em rolls damage for @{attack_name} &#13;/r ?{Fixed damage|@{attack_damage_fixed}}+[[?{Variable damage|@{attack_damage_dice}}+@{target|Damage_Bonus_Ranged}]]t[Combat-Dice])}}"></button>
+							<button type="roll" class="sheet-button-damage sheet-button-infowar" name="attr_vehicle_attack_infowar_roll" value="&amp;{template:skillroll} {{vehicle_name=@{target|vehicle_name}}} {{header=@{vehicle_name}'s @{attack_name} Attack}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Hacking}} {{EXP=@{target|skill_Hacking_exp}}} {{FOC=@{target|skill_Hacking_foc}}} {{attribute=Intelligence, @{target|Intelligence}}} {{ammo=@{attack_ammo}}} {{qualities=@{attack_qualities}}} {{roll=[[{{ceil(([[@{target|skill_Hacking_exp}+@{target|Intelligence}]]-d20cs<[[@{target|skill_Hacking_exp}+@{target|Intelligence}]]cf<@{target|skill_Hacking_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{target|skill_Hacking_exp}+@{target|Intelligence}]]-@{target|skill_Hacking_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{target|skill_Hacking_exp}+@{target|Intelligence}]]-d20cs<[[@{target|skill_Hacking_exp}+@{target|Intelligence}]]cf<@{target|skill_Hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|skill_Hacking_exp}+@{target|Intelligence}]]-@{target|skill_Hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{target|skill_Hacking_exp}+@{target|Intelligence}]]-d20cs<[[@{target|skill_Hacking_exp}+@{target|Intelligence}]]cf<@{target|skill_Hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|skill_Hacking_exp}+@{target|Intelligence}]]-@{target|skill_Hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|skill_Hacking_exp}+@{target|Intelligence}]]-d20cs<[[@{target|skill_Hacking_exp}+@{target|Intelligence}]]cf<@{target|skill_Hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|skill_Hacking_exp}+@{target|Intelligence}]]-@{target|skill_Hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{target|skill_Hacking_exp}+@{target|Intelligence}]]-d20cs<[[@{target|skill_Hacking_exp}+@{target|Intelligence}]]cf<@{target|skill_Hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|skill_Hacking_exp}+@{target|Intelligence}]]-@{target|skill_Hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|skill_Hacking_exp}+@{target|Intelligence}]]-d20cs<[[@{target|skill_Hacking_exp}+@{target|Intelligence}]]cf<@{target|skill_Hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|skill_Hacking_exp}+@{target|Intelligence}]]-@{target|skill_Hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|skill_Hacking_exp}+@{target|Intelligence}]]-d20cs<[[@{target|skill_Hacking_exp}+@{target|Intelligence}]]cf<@{target|skill_Hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|skill_Hacking_exp}+@{target|Intelligence}]]-@{target|skill_Hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{target|skill_Hacking_exp}+@{target|Intelligence}]]-d20cs<[[@{target|skill_Hacking_exp}+@{target|Intelligence}]]cf<@{target|skill_Hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|skill_Hacking_exp}+@{target|Intelligence}]]-@{target|skill_Hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|skill_Hacking_exp}+@{target|Intelligence}]]-d20cs<[[@{target|skill_Hacking_exp}+@{target|Intelligence}]]cf<@{target|skill_Hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|skill_Hacking_exp}+@{target|Intelligence}]]-@{target|skill_Hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|skill_Hacking_exp}+@{target|Intelligence}]]-d20cs<[[@{target|skill_Hacking_exp}+@{target|Intelligence}]]cf<@{target|skill_Hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|skill_Hacking_exp}+@{target|Intelligence}]]-@{target|skill_Hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|skill_Hacking_exp}+@{target|Intelligence}]]-d20cs<[[@{target|skill_Hacking_exp}+@{target|Intelligence}]]cf<@{target|skill_Hacking_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|skill_Hacking_exp}+@{target|Intelligence}]]-@{target|skill_Hacking_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}} {{damage_roll=[Roll Damage](!&#13;/em rolls damage for @{attack_name} &#13;/r ?{Fixed damage|@{attack_damage_fixed}}+[[?{Variable damage|@{attack_damage_dice}}+@{target|Damage_Bonus_Infowar}]]t[Combat-Dice])}}"></button>
+							<button type="roll" class="sheet-button-damage sheet-button-psywar" name="attr_vehicle_attack_psywar_roll" value="&amp;{template:skillroll} {{vehicle_name=@{target|vehicle_name}}} {{header=@{vehicle_name}'s @{attack_name} Attack}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Persuade}} {{EXP=@{target|skill_Persuade_exp}}} {{FOC=@{target|skill_Persuade_foc}}} {{attribute=Personality, @{target|Personality}}} {{ammo=@{attack_ammo}}} {{qualities=@{attack_qualities}}} {{roll=[[{{ceil(([[@{target|skill_Persuade_exp}+@{target|Personality}]]-d20cs<[[@{target|skill_Persuade_exp}+@{target|Personality}]]cf<@{target|skill_Persuade_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{target|skill_Persuade_exp}+@{target|Personality}]]-@{target|skill_Persuade_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{target|skill_Persuade_exp}+@{target|Personality}]]-d20cs<[[@{target|skill_Persuade_exp}+@{target|Personality}]]cf<@{target|skill_Persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|skill_Persuade_exp}+@{target|Personality}]]-@{target|skill_Persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{target|skill_Persuade_exp}+@{target|Personality}]]-d20cs<[[@{target|skill_Persuade_exp}+@{target|Personality}]]cf<@{target|skill_Persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|skill_Persuade_exp}+@{target|Personality}]]-@{target|skill_Persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|skill_Persuade_exp}+@{target|Personality}]]-d20cs<[[@{target|skill_Persuade_exp}+@{target|Personality}]]cf<@{target|skill_Persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|skill_Persuade_exp}+@{target|Personality}]]-@{target|skill_Persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{target|skill_Persuade_exp}+@{target|Personality}]]-d20cs<[[@{target|skill_Persuade_exp}+@{target|Personality}]]cf<@{target|skill_Persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|skill_Persuade_exp}+@{target|Personality}]]-@{target|skill_Persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|skill_Persuade_exp}+@{target|Personality}]]-d20cs<[[@{target|skill_Persuade_exp}+@{target|Personality}]]cf<@{target|skill_Persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|skill_Persuade_exp}+@{target|Personality}]]-@{target|skill_Persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|skill_Persuade_exp}+@{target|Personality}]]-d20cs<[[@{target|skill_Persuade_exp}+@{target|Personality}]]cf<@{target|skill_Persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|skill_Persuade_exp}+@{target|Personality}]]-@{target|skill_Persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{target|skill_Persuade_exp}+@{target|Personality}]]-d20cs<[[@{target|skill_Persuade_exp}+@{target|Personality}]]cf<@{target|skill_Persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|skill_Persuade_exp}+@{target|Personality}]]-@{target|skill_Persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|skill_Persuade_exp}+@{target|Personality}]]-d20cs<[[@{target|skill_Persuade_exp}+@{target|Personality}]]cf<@{target|skill_Persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|skill_Persuade_exp}+@{target|Personality}]]-@{target|skill_Persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|skill_Persuade_exp}+@{target|Personality}]]-d20cs<[[@{target|skill_Persuade_exp}+@{target|Personality}]]cf<@{target|skill_Persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|skill_Persuade_exp}+@{target|Personality}]]-@{target|skill_Persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|skill_Persuade_exp}+@{target|Personality}]]-d20cs<[[@{target|skill_Persuade_exp}+@{target|Personality}]]cf<@{target|skill_Persuade_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|skill_Persuade_exp}+@{target|Personality}]]-@{target|skill_Persuade_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}} {{damage_roll=[Roll Damage](!&#13;/em rolls damage for @{attack_name} &#13;/r ?{Fixed damage|@{attack_damage_fixed}}+[[?{Variable damage|@{attack_damage_dice}}+@{target|Damage_Bonus_Psywar}]]t[Combat-Dice])}}"></button>
+							<button type="roll" class="sheet-button-damage sheet-button-melee" name="attr_vehicle_attack_melee_roll" value="&amp;{template:skillroll} {{vehicle_name=@{target|vehicle_name}}} {{header=@{vehicle_name}'s @{attack_name} Attack}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Close Combat}} {{EXP=@{target|skill_close_combat_exp}}} {{FOC=@{target|skill_close_combat_foc}}} {{attribute=Brawn, @{brawn}}} {{ammo=@{attack_ammo}}} {{qualities=@{attack_qualities}}} {{roll=[[{{ceil(([[@{target|skill_close_combat_exp}+@{target|Brawn}]]-d20cs<[[@{target|skill_close_combat_exp}+@{target|Brawn}]]cf<@{target|skill_close_combat_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{target|skill_close_combat_exp}+@{target|Brawn}]]-@{target|skill_close_combat_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{target|skill_close_combat_exp}+@{target|Brawn}]]-d20cs<[[@{target|skill_close_combat_exp}+@{target|Brawn}]]cf<@{target|skill_close_combat_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|skill_close_combat_exp}+@{target|Brawn}]]-@{target|skill_close_combat_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{target|skill_close_combat_exp}+@{target|Brawn}]]-d20cs<[[@{target|skill_close_combat_exp}+@{target|Brawn}]]cf<@{target|skill_close_combat_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|skill_close_combat_exp}+@{target|Brawn}]]-@{target|skill_close_combat_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|skill_close_combat_exp}+@{target|Brawn}]]-d20cs<[[@{target|skill_close_combat_exp}+@{target|Brawn}]]cf<@{target|skill_close_combat_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|skill_close_combat_exp}+@{target|Brawn}]]-@{target|skill_close_combat_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{target|skill_close_combat_exp}+@{target|Brawn}]]-d20cs<[[@{target|skill_close_combat_exp}+@{target|Brawn}]]cf<@{target|skill_close_combat_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|skill_close_combat_exp}+@{target|Brawn}]]-@{target|skill_close_combat_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|skill_close_combat_exp}+@{target|Brawn}]]-d20cs<[[@{target|skill_close_combat_exp}+@{target|Brawn}]]cf<@{target|skill_close_combat_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|skill_close_combat_exp}+@{target|Brawn}]]-@{target|skill_close_combat_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|skill_close_combat_exp}+@{target|Brawn}]]-d20cs<[[@{target|skill_close_combat_exp}+@{target|Brawn}]]cf<@{target|skill_close_combat_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|skill_close_combat_exp}+@{target|Brawn}]]-@{target|skill_close_combat_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{target|skill_close_combat_exp}+@{target|Brawn}]]-d20cs<[[@{target|skill_close_combat_exp}+@{target|Brawn}]]cf<@{target|skill_close_combat_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|skill_close_combat_exp}+@{target|Brawn}]]-@{target|skill_close_combat_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|skill_close_combat_exp}+@{target|Brawn}]]-d20cs<[[@{target|skill_close_combat_exp}+@{target|Brawn}]]cf<@{target|skill_close_combat_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|skill_close_combat_exp}+@{target|Brawn}]]-@{target|skill_close_combat_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|skill_close_combat_exp}+@{target|Brawn}]]-d20cs<[[@{target|skill_close_combat_exp}+@{target|Brawn}]]cf<@{target|skill_close_combat_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|skill_close_combat_exp}+@{target|Brawn}]]-@{target|skill_close_combat_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|skill_close_combat_exp}+@{target|Brawn}]]-d20cs<[[@{target|skill_close_combat_exp}+@{target|Brawn}]]cf<@{target|skill_close_combat_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|skill_close_combat_exp}+@{target|Brawn}]]-@{target|skill_close_combat_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}} {{damage_roll=[Roll Damage](!&#13;/em rolls damage for @{attack_name} &#13;/r ?{Fixed damage|@{attack_damage_fixed}}+[[?{Variable damage|@{attack_damage_dice}}+@{target|Damage_Bonus_Melee}]]t[Combat-Dice])}}"></button>
+							<button type="roll" class="sheet-button-damage sheet-button-ranged" name="attr_vehicle_attack_ranged_roll" value="&amp;{template:skillroll} {{vehicle_name=@{target|vehicle_name}}} {{header=@{vehicle_name}'s @{attack_name} Attack}} {{subheader=Difficulty ?{Difficulty|1}}} {{skill=Ballistics}} {{EXP=@{target|skill_Ballistics_exp}}} {{FOC=@{target|skill_Ballistics_foc}}} {{attribute=Coordination, @{target|Coordination}}} {{ammo=@{attack_ammo}}} {{qualities=@{attack_qualities}}} {{roll=[[{{ceil(([[@{target|skill_Ballistics_exp}+@{target|Coordination}]]-d20cs<[[@{target|skill_Ballistics_exp}+@{target|Coordination}]]cf<@{target|skill_Ballistics_foc}cf>[[21-?{Complication Range|1}]]+1e-2)/([[@{target|skill_Ballistics_exp}+@{target|Coordination}]]-@{target|skill_Ballistics_foc})),{2}}kl1,{0}}kh1]]?{Dice Pool|1d20, |2d20, + [[{{ceil(([[@{target|skill_Ballistics_exp}+@{target|Coordination}]]-d20cs<[[@{target|skill_Ballistics_exp}+@{target|Coordination}]]cf<@{target|skill_Ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|skill_Ballistics_exp}+@{target|Coordination}]]-@{target|skill_Ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|3d20, + [[{{ceil(([[@{target|skill_Ballistics_exp}+@{target|Coordination}]]-d20cs<[[@{target|skill_Ballistics_exp}+@{target|Coordination}]]cf<@{target|skill_Ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|skill_Ballistics_exp}+@{target|Coordination}]]-@{target|skill_Ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|skill_Ballistics_exp}+@{target|Coordination}]]-d20cs<[[@{target|skill_Ballistics_exp}+@{target|Coordination}]]cf<@{target|skill_Ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|skill_Ballistics_exp}+@{target|Coordination}]]-@{target|skill_Ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|4d20, + [[{{ceil(([[@{target|skill_Ballistics_exp}+@{target|Coordination}]]-d20cs<[[@{target|skill_Ballistics_exp}+@{target|Coordination}]]cf<@{target|skill_Ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|skill_Ballistics_exp}+@{target|Coordination}]]-@{target|skill_Ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|skill_Ballistics_exp}+@{target|Coordination}]]-d20cs<[[@{target|skill_Ballistics_exp}+@{target|Coordination}]]cf<@{target|skill_Ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|skill_Ballistics_exp}+@{target|Coordination}]]-@{target|skill_Ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|skill_Ballistics_exp}+@{target|Coordination}]]-d20cs<[[@{target|skill_Ballistics_exp}+@{target|Coordination}]]cf<@{target|skill_Ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|skill_Ballistics_exp}+@{target|Coordination}]]-@{target|skill_Ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]|5d20, + [[{{ceil(([[@{target|skill_Ballistics_exp}+@{target|Coordination}]]-d20cs<[[@{target|skill_Ballistics_exp}+@{target|Coordination}]]cf<@{target|skill_Ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|skill_Ballistics_exp}+@{target|Coordination}]]-@{target|skill_Ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|skill_Ballistics_exp}+@{target|Coordination}]]-d20cs<[[@{target|skill_Ballistics_exp}+@{target|Coordination}]]cf<@{target|skill_Ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|skill_Ballistics_exp}+@{target|Coordination}]]-@{target|skill_Ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|skill_Ballistics_exp}+@{target|Coordination}]]-d20cs<[[@{target|skill_Ballistics_exp}+@{target|Coordination}]]cf<@{target|skill_Ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|skill_Ballistics_exp}+@{target|Coordination}]]-@{target|skill_Ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]] + [[{{ceil(([[@{target|skill_Ballistics_exp}+@{target|Coordination}]]-d20cs<[[@{target|skill_Ballistics_exp}+@{target|Coordination}]]cf<@{target|skill_Ballistics_foc}cf>[[21-?{Complication Range&amp;#125;]]+1e-2)/([[@{target|skill_Ballistics_exp}+@{target|Coordination}]]-@{target|skill_Ballistics_foc}))&amp;#44;{2&amp;#125;&amp;#125;kl1&amp;#44;{0&amp;#125;&amp;#125;kh1]]}}} {{damage_roll=[Roll Damage](!&#13;/em rolls damage for @{attack_name} &#13;/r ?{Fixed damage|@{attack_damage_fixed}}+[[?{Variable damage|@{attack_damage_dice}}+@{target|Damage_Bonus_Ranged}]]t[Combat-Dice])}}"></button>
 							<span style="font-size:10px;color:black;padding-left:5px">Select token as gunner.</span>
 						</td>
 					</tr>
@@ -2134,6 +2134,7 @@
 		</div>
 	</div>
 </div>
+<input type="hidden" name="attr_sheet_version" value="1.0.0" />
 
 <!-- Roll Templates -->
 <rolltemplate class="sheet-rolltemplate-skillroll">
@@ -2149,7 +2150,7 @@
 		{{#skill}}
 		<tr class="sheet-rolltemplate-body">
 			<td class="sheet-rolltemplate-label">Skill:</td>
-			<td>{{skill}}{{#skill_EXP}}, EXP <span class="sheet-rolltemplate-greenborder">{{skill_EXP}}</span>{{/skill_EXP}}{{#skill_FOC}} FOC <span class="sheet-rolltemplate-blueborder">{{skill_FOC}}</span>{{/skill_FOC}}</td>
+			<td>{{skill}}{{#skill_exp}}, EXP <span class="sheet-rolltemplate-greenborder">{{skill_exp}}</span>{{/skill_exp}}{{#skill_foc}} FOC <span class="sheet-rolltemplate-blueborder">{{skill_foc}}</span>{{/skill_foc}}</td>
 		</tr>
 		{{/skill}}
 		{{#attribute}}
@@ -2184,17 +2185,54 @@
 	</table>
 </rolltemplate>
 
+<!-- Sheet workers -->
 <script type="text/worker">
-	var versioning = function() {
-		getAttrs(["version"], function (v) {
-			console.log("CURRENT VERSION IS: ".concat(v.version));
-			if (!v["version"] || v["version"] === "" ) {
-				update_to_2_0();
-			} else {
-				setAttrs({"version": "2.0.0"});
-				setAttrs({"character_sheet": "Infinity 2d20 version " + v.version});
-				console.log("Infinity 2d20 version " + v.version);
-				}
+ </script>
+
+ <script type="text/javascript">
+
+	const newVersion = "1.0.0";
+
+	function getSheetVersion(attributeNameArray) {
+		const v = attributeNameArray.sheet_version;
+		if (v != undefined) {
+			return v;
+		} else {
+			return 0;
+		}
+	}
+
+	function setSheetVersion(newVersion) {
+		setAttrs({
+			sheet_version: newVersion
 		});
-	};
+	}
+
+	function updateSheetVersion(newVersion) {
+		// Check if the sheet's sheet_version attribute matches the currentVersion.
+		const attributeNameArray = getAttrs(["sheet_version"]);
+		const sheetVersion = getSheetVersion(attributeNameArray);
+		const isCurrentVersion = (sheetVersion === newVersion);
+		
+		// If so, don't do anything.
+
+		if (!isCurrentVersion) {
+			// If not, see how much migration needs to be done.
+			// If sheet_version doesn't exist (is 0), then the sheet is the oldest version and will need to be migrated.
+			// If sheet_version does exist but is older, the new attributes should apply with no problems. Just update the version number.
+			switch(sheetVersion) {
+				case 0:
+					migrateSheet(newVersion);
+					break;
+				default:
+					setSheetVersion(newVersion);
+					break;
+			}
+		} 
+
+	}
+
+	function migrateSheet(newVersion) {
+
+	}
  </script>
\ No newline at end of file
diff --git a/Infinity-2d20/attributes_new.csv b/Infinity-2d20/attributes_new.csv
index 17f671734e..75a179f715 100644
--- a/Infinity-2d20/attributes_new.csv
+++ b/Infinity-2d20/attributes_new.csv
@@ -54,9 +54,9 @@ attr_agility
 attr_skill_acrobatics_sig
 attr_skill_acrobatics_exp
 attr_skill_acrobatics_foc
-attr_Skill_Close_Combat_Sig
-attr_Skill_Close_Combat_EXP
-attr_Skill_Close_Combat_FOC
+attr_skill_close_combat_sig
+attr_skill_close_combat_exp
+attr_skill_close_combat_foc
 attr_skill_stealth_sig
 attr_skill_stealth_exp
 attr_skill_stealth_foc
@@ -113,9 +113,9 @@ attr_skill_tech_sig
 attr_skill_tech_exp
 attr_skill_tech_foc
 attr_personality
-attr_skill_animal_handling_Sig
-attr_skill_animal_handling_EXP
-attr_skill_animal_handling_FOC
+attr_skill_animal_handling_sig
+attr_skill_animal_handling_exp
+attr_skill_animal_handling_foc
 attr_skill_command_sig
 attr_skill_command_exp
 attr_skill_command_foc
@@ -147,7 +147,7 @@ attr_talent_ranks
 attr_talent_effect
 attr_weapon_name
 attr_weapon_range
-attr_Weapon_Damage_Fixed
+attr_weapon_damage_fixed
 attr_weapon_damage_dice
 attr_weapon_burst
 attr_weapon_size
@@ -234,12 +234,12 @@ attr_sibling_1
 attr_sibling_2
 attr_child_1
 attr_child_2
-attr_Extended_Family_1
-attr_Extended_Family_2
+attr_extended_family_1
+attr_extended_family_2
 attr_id_name
 attr_id_rating
 attr_npc_name
-attr_npc_agility
+attr_npc_agility[
 attr_npc_awareness
 attr_npc_brawn
 attr_npc_coordination