From 8bc59d25b6f8bb6a4e8311b07ddd6e50ee737539 Mon Sep 17 00:00:00 2001
From: Djjus <59532170+Djjus@users.noreply.github.com>
Date: Fri, 15 Jan 2021 01:44:56 +0000
Subject: [PATCH] fix melee mod

---
 .../Warhammer 4e Character Sheet.html         | 108 +++++++++++-------
 1 file changed, 64 insertions(+), 44 deletions(-)

diff --git a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html
index 44a9a0da9e..c4819a6887 100644
--- a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html	
+++ b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html	
@@ -449,35 +449,35 @@
 			</div>
 			<div class="sheet-col-1-9 sheet-center">
 				<div class="sheet-col-1 sheet-center">
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Endurance" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[0]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[0]]}} {{poisoned=[[@{PoisonedMod}]]}} {{title=^{ENDURANCE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}}  {{target=[[(@{ConditionMod})+@{Endurance}+?{@{translation_modifier}|0}]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Endurance_modtype1}]]}} {{mod1=@{Endurance_mod1}}} {{mod2type=[[@{Endurance_modtype2}]]}} {{mod2=@{Endurance_mod2}}} {{mod3type=[[@{Endurance_modtype3}]]}} {{mod3=@{Endurance_mod3}}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Endurance" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[0]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[0]]}} {{poisoned=[[@{PoisonedMod}]]}} {{title=^{ENDURANCE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}}  {{target=[[(@{ConditionMod})+@{Endurance}+?{@{translation_modifier}|0}]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Endurance_modtype1}]]}} {{mod1=@{Endurance_mod1}}} {{mod2type=[[@{Endurance_modtype2}]]}} {{mod2=@{Endurance_mod2}}} {{mod3type=[[@{Endurance_modtype3}]]}} {{mod3=@{Endurance_mod3}}} {{reroll=@{RT-reroll}Endurance)}}">
 						<span data-i18n="ENDURANCE">Endurance</span>
 					</button>
 				</div>
 			</div>
 			<div class="sheet-col-1-9 sheet-center">
 				<div class="sheet-col-1 sheet-center">
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Intuition" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{title=^{INTUITION}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}}  {{target=[[(@{ConditionMod})+@{Intuition}+?{@{translation_modifier}|0}]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Intuition_modtype1}]]}} {{mod1=@{Intuition_mod1}}} {{mod2type=[[@{Intuition_modtype2}]]}} {{mod2=@{Intuition_mod2}}} {{mod3type=[[@{Intuition_modtype3}]]}} {{mod3=@{Intuition_mod3}}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Intuition" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{title=^{INTUITION}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}}  {{target=[[(@{ConditionMod})+@{Intuition}+?{@{translation_modifier}|0}]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Intuition_modtype1}]]}} {{mod1=@{Intuition_mod1}}} {{mod2type=[[@{Intuition_modtype2}]]}} {{mod2=@{Intuition_mod2}}} {{mod3type=[[@{Intuition_modtype3}]]}} {{mod3=@{Intuition_mod3}}} {{reroll=@{RT-reroll}Intuition)}}">
 						<span style="white-space: pre;" data-i18n="INTUITION">Intuition</span>
 					</button>
 				</div>
 			</div>
 			<div class="sheet-col-1-9 sheet-center">
 				<div class="sheet-col-1 sheet-center">
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Perception" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{title=^{PERCEPTION}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{target=[[(@{ConditionMod})+@{Perception}+?{@{translation_modifier}|0}]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Perception_modtype1}]]}} {{mod1=@{Perception_mod1}}} {{mod2type=[[@{Perception_modtype2}]]}} {{mod2=@{Perception_mod2}}} {{mod3type=[[@{Perception_modtype3}]]}} {{mod3=@{Perception_mod3}}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Perception" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{title=^{PERCEPTION}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{target=[[(@{ConditionMod})+@{Perception}+?{@{translation_modifier}|0}]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Perception_modtype1}]]}} {{mod1=@{Perception_mod1}}} {{mod2type=[[@{Perception_modtype2}]]}} {{mod2=@{Perception_mod2}}} {{mod3type=[[@{Perception_modtype3}]]}} {{mod3=@{Perception_mod3}}} {{reroll=@{RT-reroll}Perception)}}">
 						<span data-i18n="PERCEPTION">Perception</span>
 					</button>
 				</div>
 			</div>
 			<div class="sheet-col-1-9 sheet-center">
 				<div class="sheet-col-1 sheet-center">
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Cool" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{title=^{COOL}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{target=[[(@{ConditionMod})+@{Cool}+(@{Advantage}*10)+?{Modifier (Adv. already added)|0}]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Cool_modtype1}]]}} {{mod1=@{Cool_mod1}}} {{mod2type=[[@{Cool_modtype2}]]}} {{mod2=@{Cool_mod2}}} {{mod3type=[[@{Cool_modtype3}]]}} {{mod3=@{Cool_mod3}}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Cool" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{title=^{COOL}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{target=[[(@{ConditionMod})+@{Cool}+(@{Advantage}*10)+?{Modifier (Adv. already added)|0}]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Cool_modtype1}]]}} {{mod1=@{Cool_mod1}}} {{mod2type=[[@{Cool_modtype2}]]}} {{mod2=@{Cool_mod2}}} {{mod3type=[[@{Cool_modtype3}]]}} {{mod3=@{Cool_mod3}}} {{reroll=@{RT-reroll}Cool)}}">
 						<span data-i18n="COOL">Cool</span>
 					</button>
 				</div>
 			</div>
 			<div class="sheet-col-1-9 sheet-center">
 				<div class="sheet-col-1 sheet-center">
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Dodge" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{title=^{DODGE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{target=[[([[{[[@{ConditionMod}]],[[@{ConditionMoveMod}]],[[@{ConditionSeeMod}]]}kl1]])+@{Dodge}+(@{Advantage}*10)+?{Modifier (Adv. already added)|0}]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Dodge_modtype1}]]}} {{mod1=@{Dodge_mod1}}} {{mod2type=[[@{Dodge_modtype2}]]}} {{mod2=@{Dodge_mod2}}} {{mod3type=[[@{Dodge_modtype3}]]}} {{mod3=@{Dodge_mod3}}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Dodge" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{title=^{DODGE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{target=[[([[{[[@{ConditionMod}]],[[@{ConditionMoveMod}]],[[@{ConditionSeeMod}]]}kl1]])+@{Dodge}+(@{Advantage}*10)+?{Modifier (Adv. already added)|0}]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Dodge_modtype1}]]}} {{mod1=@{Dodge_mod1}}} {{mod2type=[[@{Dodge_modtype2}]]}} {{mod2=@{Dodge_mod2}}} {{mod3type=[[@{Dodge_modtype3}]]}} {{mod3=@{Dodge_mod3}}} {{reroll=@{RT-reroll}Dodge)}}">
 						<span data-i18n="DODGE">Dodge</span>
 					</button>
 				</div>
@@ -544,7 +544,7 @@
 				</div>
 
 				<div class="sheet-col-1-2 sheet-center inline-block" style="width: 15%;">
-					<button type="roll" class="sheet-combat-actions" name="roll_MeleeAttack"  value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Opposed Attack Roll, Add Modifier (Adv. already added)|0}]]}} {{title=@{Used_MeleeWeapon}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{character_name=@{character_name}}} {{attacktype=^{MELEE}}} {{target=[[([[{[[@{ConditionMod}]],[[@{ConditionMoveMod}]],[[@{ConditionSeeMod}]],[[@{ConditionHearMod}]]}kl1]]) [COND] +@{Used_MeleeWeaponSkill} [SKILL] +@{Used_MeleeBonus} [BONUS] +(@{Advantage}*10) [ADV] +?{Opposed Attack Roll, Add Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{Used_MeleeReach}}} {{rolltype=[[@{Used_MeleeImpale}]]}} {{qualities=@{Used_MeleeQualities}}} {{damage=[[@{Used_MeleeStrengthBonus}+@{Used_MeleeDamageBonus}]]}} {{mod1type=[[@{Used_Melee_modtype1}]]}} {{mod1=@{Used_Melee_mod1}}} {{mod2type=[[@{Used_Melee_modtype2}]]}} {{mod2=@{Used_Melee_mod2}}} {{mod3type=[[@{Used_Melee_modtype3}]]}} {{mod3=@{Used_Melee_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeAttack)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}">
+					<button type="roll" class="sheet-combat-actions" name="roll_MeleeAttack"  value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Opposed Attack Roll, Add Modifier (Adv. already added)|@{Used_MeleeBonus}}]]}} {{title=@{Used_MeleeWeapon}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[@{DeafenedMod}]]}} {{character_name=@{character_name}}} {{attacktype=^{MELEE}}} {{target=[[([[{[[@{ConditionMod}]],[[@{ConditionMoveMod}]],[[@{ConditionSeeMod}]],[[@{ConditionHearMod}]]}kl1]]) [COND] +[[@{Used_MeleeWeaponSkill}]] [SKILL] +?{Opposed Attack Roll, Add Modifier (Adv. already added)|@{Used_MeleeBonus}} [MOD] +(@{Advantage}*10) [ADV] ]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{Used_MeleeReach}}} {{rolltype=[[@{Used_MeleeImpale}]]}} {{qualities=@{Used_MeleeQualities}}} {{damage=[[@{Used_MeleeStrengthBonus}+@{Used_MeleeDamageBonus}]]}} {{mod1type=[[@{Used_Melee_modtype1}]]}} {{mod1=@{Used_Melee_mod1}}} {{mod2type=[[@{Used_Melee_modtype2}]]}} {{mod2=@{Used_Melee_mod2}}} {{mod3type=[[@{Used_Melee_modtype3}]]}} {{mod3=@{Used_Melee_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeAttack)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}">
 						<span></span>
 					</button>
 				</div>
@@ -556,29 +556,25 @@
 					</button>
 				</div>
 				<div class="sheet-col-1-2 sheet-center" style="width: 15%;">
-					<button type="roll" class="sheet-combat-actions" name="roll_MeleeOpposed" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Opposed Defense Roll, Add Modifier (Adv. already added)|0}]]}} {{title=@{Used_DefenseWeapon}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{attacktype=^{OPPOSED}}} {{target=[[([[{[[@{ConditionMod}]],[[@{ConditionMoveMod}]],[[@{ConditionSeeMod}]],[[@{ConditionHearMod}]]}kl1]] [COND] )+@{Used_DefenseWeaponSkill} [SKILL] +@{Used_DefenseBonus} [BONUS] +(@{Advantage}*10) [ADV] +?{Opposed Defense Roll, Add Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}+@{Used_DefenseDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{Used_DefenseReach}}} {{rolltype=[[@{Used_DefenseImpale}]]}} {{qualities=@{Used_DefenseQualities}}} {{armorqualities=@{armorQuality}}} {{mod1type=[[@{Used_Defense_modtype1}]]}} {{mod1=@{Used_Defense_mod1}}} {{mod2type=[[@{Used_Defense_modtype2}]]}} {{mod2=@{Used_Defense_mod2}}} {{mod3type=[[@{Used_Defense_modtype3}]]}} {{mod3=@{Used_Defense_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeOpposed)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}">
+					<button type="roll" class="sheet-combat-actions" name="roll_MeleeOpposed" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Opposed Defense Roll, Add Modifier (Adv. already added)|@{Used_DefenseBonus}}]]}} {{title=@{Used_DefenseWeapon}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[@{DeafenedMod}]]}} {{attacktype=^{OPPOSED}}} {{target=[[([[{[[@{ConditionMod}]],[[@{ConditionMoveMod}]],[[@{ConditionSeeMod}]],[[@{ConditionHearMod}]]}kl1]]) [COND] +[[@{Used_DefenseWeaponSkill}]] [SKILL] +?{Opposed Defense Roll, Add Modifier (Adv. already added)|@{Used_DefenseBonus}} [MOD] +(@{Advantage}*10) [ADV] ]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}+@{Used_DefenseDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{Used_DefenseReach}}} {{rolltype=[[@{Used_DefenseImpale}]]}} {{qualities=@{Used_DefenseQualities}}} {{armorqualities=@{armorQuality}}} {{mod1type=[[@{Used_Defense_modtype1}]]}} {{mod1=@{Used_Defense_mod1}}} {{mod2type=[[@{Used_Defense_modtype2}]]}} {{mod2=@{Used_Defense_mod2}}} {{mod3type=[[@{Used_Defense_modtype3}]]}} {{mod3=@{Used_Defense_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeOpposed)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}">
 						<span></span>
 					</button>
 				</div>
 			</div>
 			
-			
-			
 			<div class="sheet-col-1-5 sheet-center sheet-nowrap">
 				<div class="sheet-col-1-2 sheet-center" style="width: 85%; float: left;">		
 						<input class="sheet-combat-actions-np" type="value" name="attr_CurrRgd" style="height: 24px;padding-bottom: 1px;" value=" Equip in Weapons Tab " readonly />
 					</button>
 				</div>
 				<div class="sheet-col-1-2 sheet-center" style="width: 15%;">
-					<button type="roll" class="sheet-combat-actions" name="roll_RangedAttack" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Ranged Attack Roll, Add Modifier (Adv. already added)|0}]]}} {{title=@{Used_RangedWeaponName}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{attacktype=^{RANGED}}} {{target=[[([[{[[@{ConditionMod}]],[[@{ConditionMoveMod}]],[[@{ConditionSeeMod}]],[[@{ConditionHearMod}]]}kl1]] [COND] )+@{Used_RangedBalisticSkill} [SKILL] +@{Used_RangedBonus} [BONUS] +(@{Advantage}*10) [ADV] +?{Ranged Attack Roll, Add Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{rolltype=[[@{Used_RangedImpale}]]}} {{qualities=@{Used_RangedQualities}}} {{range=@{Used_WeaponRange}}} {{ammo=@{Used_RangedAmmo}}} {{ammotype=@{Used_RangedAmmoType}}} {{damage=[[@{Used_RangedStrengthBonus}+@{Used_RangedDamage}]]}} {{mod1type=[[@{Used_Ranged_modtype1}]]}} {{mod1=@{Used_Ranged_mod1}}} {{mod2type=[[@{Used_Ranged_modtype2}]]}} {{mod2=@{Used_Ranged_mod2}}} {{mod3type=[[@{Used_Ranged_modtype3}]]}} {{mod3=@{Used_Ranged_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedAttack)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}">
+					<button type="roll" class="sheet-combat-actions" name="roll_RangedAttack" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Ranged Attack Roll, Add Modifier (Adv. already added)|0}]]}} {{title=@{Used_RangedWeaponName}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[@{DeafenedMod}]]}} {{attacktype=^{RANGED}}} {{target=[[([[{[[@{ConditionMod}]],[[@{ConditionMoveMod}]],[[@{ConditionSeeMod}]],[[@{ConditionHearMod}]]}kl1]]) [COND] +[[@{Used_RangedBalisticSkill}]] [SKILL] +@{Used_RangedBonus} [BONUS] +(@{Advantage}*10) [ADV] +?{Ranged Attack Roll, Add Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{rolltype=[[@{Used_RangedImpale}]]}} {{qualities=@{Used_RangedQualities}}} {{range=@{Used_WeaponRange}}} {{ammo=@{Used_RangedAmmo}}} {{ammotype=@{Used_RangedAmmoType}}} {{damage=[[@{Used_RangedStrengthBonus}+@{Used_RangedDamage}]]}} {{mod1type=[[@{Used_Ranged_modtype1}]]}} {{mod1=@{Used_Ranged_mod1}}} {{mod2type=[[@{Used_Ranged_modtype2}]]}} {{mod2=@{Used_Ranged_mod2}}} {{mod3type=[[@{Used_Ranged_modtype3}]]}} {{mod3=@{Used_Ranged_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedAttack)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}">
 						<span></span>
 					</button>
 				</div>
 			</div>
-	
 		</div>			
 		</div>		
-		
 
 					<input type="hidden" name="attr_drop_category" accept="Characteristics"/>	
 					<input type="hidden" name="attr_drop_name" accept="Description"/>	
@@ -6608,24 +6604,28 @@
 						<div class="sheet-col-1" style="padding-left: 5px; padding-right: 5px;">
 							<div class="sheet-row">
 								<div class="sheet-row sheet-sub-header">
-									<div class="sheet-col-1-4 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="MOVE">Move</div>
-									<div class="sheet-col-1-4 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="TALENTS">Talents</div>
-									<div class="sheet-col-1-4 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="WALK">Walk (yds)</div>
-									<div class="sheet-col-1-4 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="RUN">Run (yds)</div>
+									<div class="sheet-col-1-5 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="STARTING">Starting</div>
+									<div class="sheet-col-1-5 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="TALENTS">Talents</div>
+									<div class="sheet-col-1-5 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="MOVE">Move</div>
+									<div class="sheet-col-1-5 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="WALK">Walk (yds)</div>
+									<div class="sheet-col-1-5 sheet-center sheet-small-label sheet-vert-middle sheet-pad-r-sm" data-i18n="RUN">Run (yds)</div>
 								</div>
 							</div>
 							<div class="sheet-row">
-								<div class="sheet-col-1-4 sheet-center sheet-pad-r-sm">
+								<div class="sheet-col-1-5 sheet-center sheet-pad-r-sm">
 									<input class="sheet-center" type="number" name="attr_Movement" value="0" />
 								</div>
-								<div class="sheet-col-1-4 sheet-center sheet-pad-r-sm">
+								<div class="sheet-col-1-5 sheet-center sheet-pad-r-sm">
 									<input class="sheet-center" type="number" name="attr_MovementTalents" value="0" />
 								</div>
-								<div class="sheet-col-1-4 sheet-center sheet-pad-r-sm">
-									<input class="sheet-center" type="number" name="attr_Charge" value="(@{Movement}+@{MovementTalents})*2" disabled="true" />
+								<div class="sheet-col-1-5 sheet-center sheet-pad-r-sm">
+									<input class="sheet-center" type="number" name="attr_Movementmod" value="(@{Movement}+@{MovementTalents})-@{encpenalty}" disabled="true" title="Starting + Talent - Encumbrance Penalty" />
 								</div>
-								<div class="sheet-col-1-4 sheet-center sheet-pad-r-sm">
-									<input class="sheet-center" type="number" name="attr_Run" value="(@{Movement}+@{MovementTalents})*4" disabled="true" />
+								<div class="sheet-col-1-5 sheet-center sheet-pad-r-sm">
+									<input class="sheet-center" type="number" name="attr_Charge" value="(@{Movementmod})*2" disabled="true" />
+								</div>
+								<div class="sheet-col-1-5 sheet-center sheet-pad-r-sm">
+									<input class="sheet-center" type="number" name="attr_Run" value="(@{Movementmod})*4" disabled="true" />
 								</div>
 							</div>
 						</div>
@@ -7785,7 +7785,7 @@
 							<input class="sheet-center" type="number" name="attr_Endurance" value="@{EnduranceChar}+@{EnduranceAdv}+@{EnduranceMisc}" disabled="true" />
 						</div>
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Endurance" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[0]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[0]]}} {{poisoned=[[@{PoisonedMod}]]}} {{title=^{ENDURANCE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}}  {{target=[[(@{ConditionMod})+@{Endurance}+?{@{translation_modifier}|0}]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Endurance_modtype1}]]}} {{mod1=@{Endurance_mod1}}} {{mod2type=[[@{Endurance_modtype2}]]}} {{mod2=@{Endurance_mod2}}} {{mod3type=[[@{Endurance_modtype3}]]}} {{mod3=@{Endurance_mod3}}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Endurance" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[0]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[0]]}} {{poisoned=[[@{PoisonedMod}]]}} {{title=^{ENDURANCE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}}  {{target=[[(@{ConditionMod})+@{Endurance}+?{@{translation_modifier}|0}]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Endurance_modtype1}]]}} {{mod1=@{Endurance_mod1}}} {{mod2type=[[@{Endurance_modtype2}]]}} {{mod2=@{Endurance_mod2}}} {{mod3type=[[@{Endurance_modtype3}]]}} {{mod3=@{Endurance_mod3}}} {{reroll=@{RT-reroll}Endurance)}}"></button>
 						</div>
 						
               <label class="sheet-col-1-14 talsetshow-check">
@@ -14516,11 +14516,11 @@
 						<div class="sheet-col-1 sheet-seperator-cap sheet-left sheet-mar-t-lg sheet-mar-l-md">
 							<span  style="font-size: 14px;" data-i18n="MELEE-WEAPONS">MELEE WEAPONS</span>		
 							<div class="sheet-col-1-13 sheet-center"style="float: right; margin-right: 15px;">
-								<button type="roll" class="sheet-combat-actions-rep" name="roll_MeleeOpposed" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Opposed Defense Roll, Add Modifier (Adv. already added)|@{Used_MeleeBonus}}]]}} {{title=@{Used_DefenseWeapon}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{attacktype=^{OPPOSED}}} {{target=[[([[{[[@{ConditionMod}]],[[@{ConditionMoveMod}]],[[@{ConditionSeeMod}]],[[@{ConditionHearMod}]]}kl1]] [COND] )+@{Used_DefenseWeaponSkill} [SKILL] +@{Used_DefenseBonus} [BONUS] +(@{Advantage}*10) [ADV] +?{Opposed Defense Roll, Add Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}+@{Used_DefenseDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{Used_DefenseReach}}} {{rolltype=[[@{Used_DefenseImpale}]]}} {{qualities=@{Used_DefenseQualities}}} {{armorqualities=@{armorQuality}}} {{mod1type=[[@{Used_Defense_modtype1}]]}} {{mod1=@{Used_Defense_mod1}}} {{mod2type=[[@{Used_Defense_modtype2}]]}} {{mod2=@{Used_Defense_mod2}}} {{mod3type=[[@{Used_Defense_modtype3}]]}} {{mod3=@{Used_Defense_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeOpposed)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}">
+								<button type="roll" class="sheet-combat-actions-rep" name="roll_MeleeOpposed" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Opposed Defense Roll, Add Modifier (Adv. already added)|@{Used_MeleeBonus}}]]}} {{title=@{Used_DefenseWeapon}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{deafened=[[@{DeafenedMod}]]}} {{attacktype=^{OPPOSED}}} {{target=[[([[{[[@{ConditionMod}]],[[@{ConditionMoveMod}]],[[@{ConditionSeeMod}]],[[@{ConditionHearMod}]]}kl1]]) [COND] +[[@{Used_DefenseWeaponSkill}]] [SKILL] +(@{Advantage}*10) [ADV] +?{Opposed Defense Roll, Add Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}+@{Used_DefenseDefensive}]]}} {{test=[[@{roll_rule}]]}} {{reach=@{Used_DefenseReach}}} {{rolltype=[[@{Used_DefenseImpale}]]}} {{qualities=@{Used_DefenseQualities}}} {{armorqualities=@{armorQuality}}} {{mod1type=[[@{Used_Defense_modtype1}]]}} {{mod1=@{Used_Defense_mod1}}} {{mod2type=[[@{Used_Defense_modtype2}]]}} {{mod2=@{Used_Defense_mod2}}} {{mod3type=[[@{Used_Defense_modtype3}]]}} {{mod3=@{Used_Defense_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeOpposed)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}">
 								<span>Opposed</span></button>
 							</div>	
 							<div class="sheet-col-1-13 sheet-center" style="float: right;">
-								<button type="roll" class="sheet-combat-actions-rep" name="roll_MeleeAttack"  value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Opposed Attack Roll, Add Modifier (Adv. already added)|@{Used_MeleeBonus}}]]}} {{title=@{Used_MeleeWeapon}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{character_name=@{character_name}}} {{attacktype=^{MELEE}}} {{target=[[([[{[[@{ConditionMod}]],[[@{ConditionMoveMod}]],[[@{ConditionSeeMod}]],[[@{ConditionHearMod}]]}kl1]]) [COND] +@{Used_MeleeWeaponSkill} [SKILL] +@{Used_MeleeBonus} [BONUS] +(@{Advantage}*10) [ADV] +?{Opposed Attack Roll, Add Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{Used_MeleeReach}}} {{rolltype=[[@{Used_MeleeImpale}]]}} {{qualities=@{Used_MeleeQualities}}} {{damage=[[@{Used_MeleeStrengthBonus}+@{Used_MeleeDamageBonus}]]}} {{mod1type=[[@{Used_Melee_modtype1}]]}} {{mod1=@{Used_Melee_mod1}}} {{mod2type=[[@{Used_Melee_modtype2}]]}} {{mod2=@{Used_Melee_mod2}}} {{mod3type=[[@{Used_Melee_modtype3}]]}} {{mod3=@{Used_Melee_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeAttack)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}">
+								<button type="roll" class="sheet-combat-actions-rep" name="roll_MeleeAttack"  value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Opposed Attack Roll, Add Modifier (Adv. already added)|@{Used_MeleeBonus}}]]}} {{title=@{Used_MeleeWeapon}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{deafened=[[@{DeafenedMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{character_name=@{character_name}}} {{attacktype=^{MELEE}}} {{target=[[([[{[[@{ConditionMod}]],[[@{ConditionMoveMod}]],[[@{ConditionSeeMod}]],[[@{ConditionHearMod}]]}kl1]]) [COND] +[[@{Used_MeleeWeaponSkill}]] [SKILL] +?{Opposed Attack Roll, Add Modifier (Adv. already added)|0} [MOD] +(@{Advantage}*10) [ADV]  ]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{reach=@{Used_MeleeReach}}} {{rolltype=[[@{Used_MeleeImpale}]]}} {{qualities=@{Used_MeleeQualities}}} {{damage=[[@{Used_MeleeStrengthBonus}+@{Used_MeleeDamageBonus}]]}} {{mod1type=[[@{Used_Melee_modtype1}]]}} {{mod1=@{Used_Melee_mod1}}} {{mod2type=[[@{Used_Melee_modtype2}]]}} {{mod2=@{Used_Melee_mod2}}} {{mod3type=[[@{Used_Melee_modtype3}]]}} {{mod3=@{Used_Melee_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}MeleeAttack)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}">
 							<span class>Attack</span></button>
 							</div>				
 						</div>						
@@ -14599,11 +14599,11 @@
 							</div>
 							<div class="sheet-col-3-100 sheet-center sheet-vert-middle">
 								<input type="checkbox" name="attr_UsedWeapon" value="1" />
-								<span><button type="hidden" class="sheet-roll sheet-hidden" name="roll_MeleeAttack" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|@{MeleeBonus}}]]}} {{title=@{MeleeWeapon}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{character_name=@{character_name}}} {{attacktype=^{MELEE}}} {{target=[[([[{[[@{ConditionMod}]],[[@{ConditionMoveMod}]],[[@{ConditionSeeMod}]],[[@{ConditionHearMod}]]}kl1]])+@{MeleeWeaponSkill}+@{MeleeBonus}+(@{Advantage}*10)+?{Modifier (Adv. already added)|0}]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{rolltype=[[@{Used_MeleeImpale}]]}} {{qualities=@{MeleeQualities}}} {{damage=[[@{MeleeStrengthBonus}+@{MeleeDamageBonus}]]}} {{NPC=[[0]]}}"></button></span>
+								<span><button type="hidden" class="sheet-roll sheet-hidden" name="roll_MeleeAttack" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|@{MeleeBonus}}]]}} {{title=@{MeleeWeapon}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{character_name=@{character_name}}} {{attacktype=^{MELEE}}} {{target=[[([[{[[@{ConditionMod}]],[[@{ConditionMoveMod}]],[[@{ConditionSeeMod}]],[[@{ConditionHearMod}]]}kl1]])+@{MeleeWeaponSkill}+(@{Advantage}*10)+?{Modifier (Adv. already added)|@{MeleeBonus}}]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{rolltype=[[@{Used_MeleeImpale}]]}} {{qualities=@{MeleeQualities}}} {{damage=[[@{MeleeStrengthBonus}+@{MeleeDamageBonus}]]}} {{NPC=[[0]]}}"></button></span>
 							</div>
 							<div class="sheet-col-3-100 sheet-center  sheet-vert-middle">
 								<input type="checkbox" name="attr_UsedDefense" value="1" />
-								<span><button type="hidden" class="sheet-roll sheet-hidden" name="roll_MeleeOpposed" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|@{MeleeBonus}}]]}} {{title=@{MeleeWeapon}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{attacktype=^{OPPOSED}}} {{target=[[([[{[[@{ConditionMod}]],[[@{ConditionMoveMod}]],[[@{ConditionSeeMod}]],[[@{ConditionHearMod}]]}kl1]])+@{MeleeWeaponSkill}+@{MeleeBonus}+(@{Advantage}*10)+?{Modifier (Adv. already added)|0}]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}+@{MeleeDefensive}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[@{Used_MeleeImpale}]]}} {{qualities=@{MeleeQualities}}} {{armorqualities=@{armorQuality}}}  {{NPC=[[0]]}}"></button></span>
+								<span><button type="hidden" class="sheet-roll sheet-hidden" name="roll_MeleeOpposed" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|@{MeleeBonus}}]]}} {{title=@{MeleeWeapon}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{attacktype=^{OPPOSED}}} {{target=[[([[{[[@{ConditionMod}]],[[@{ConditionMoveMod}]],[[@{ConditionSeeMod}]],[[@{ConditionHearMod}]]}kl1]])+@{MeleeWeaponSkill}+(@{Advantage}*10)+?{Modifier (Adv. already added)|@{MeleeBonus}}]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}+@{MeleeDefensive}]]}} {{test=[[@{roll_rule}]]}} {{rolltype=[[@{Used_MeleeImpale}]]}} {{qualities=@{MeleeQualities}}} {{armorqualities=@{armorQuality}}}  {{NPC=[[0]]}}"></button></span>
 							</div>
 							
               <label class="sheet-col-4-100 sheet-center talsetshow-check">
@@ -14704,9 +14704,8 @@
               </div>							
 							<span class="sheet-spacer"></span>		
            </div>			   
-		</div>	
+		</div>
 						</div>
-	
 					</fieldset>
 				</div>
 			</div>
@@ -14717,8 +14716,7 @@
 							<div class="sheet-col-1 sheet-seperator-cap sheet-left sheet-mar-t-lg sheet-mar-l-md">
 								<span  style="font-size: 14px" data-i18n="RANGED-WEAPONS">RANGED WEAPONS</span>		
 							<div class="sheet-col-1-13 sheet-center"style="float: right; margin-right: 10px;">
-					<button type="roll" class="sheet-combat-actions-rep" name="roll_RangedAttack" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Ranged Attack Roll, Add Modifier (Adv. already added)|@{Used_RangedBonus}}]]}} {{title=@{Used_RangedWeaponName}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{attacktype=^{RANGED}}} {{target=[[([[{[[@{ConditionMod}]],[[@{ConditionMoveMod}]],[[@{ConditionSeeMod}]],[[@{ConditionHearMod}]]}kl1]] [COND] )+@{Used_RangedBalisticSkill} [SKILL] +@{Used_RangedBonus} [BONUS] +(@{Advantage}*10) [ADV] +?{Ranged Attack Roll, Add Modifier (Adv. already added)|0} [MOD] ]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{rolltype=[[@{Used_RangedImpale}]]}} {{qualities=@{Used_RangedQualities}}} {{range=@{Used_WeaponRange}}} {{ammo=@{Used_RangedAmmo}}} {{ammotype=@{Used_RangedAmmoType}}} {{damage=[[@{Used_RangedStrengthBonus}+@{Used_RangedDamage}]]}} {{mod1type=[[@{Used_Ranged_modtype1}]]}} {{mod1=@{Used_Ranged_mod1}}} {{mod2type=[[@{Used_Ranged_modtype2}]]}} {{mod2=@{Used_Ranged_mod2}}} {{mod3type=[[@{Used_Ranged_modtype3}]]}} {{mod3=@{Used_Ranged_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedAttack)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}">
-						<span>Shoot</span>
+					<button type="roll" class="sheet-combat-actions-rep" name="roll_RangedAttack" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Ranged Attack Roll, Add Modifier (Adv. already added)|@{Used_RangedBonus}}]]}} {{title=@{Used_RangedWeaponName}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{deafened=[[@{DeafenedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{attacktype=^{RANGED}}} {{target=[[([[{[[@{ConditionMod}]],[[@{ConditionMoveMod}]],[[@{ConditionSeeMod}]],[[@{ConditionHearMod}]]}kl1]]) [COND] +[[@{Used_RangedBalisticSkill}]] [SKILL] +(@{Advantage}*10) [ADV] +?{Ranged Attack Roll, Add Modifier (Adv. already added)|@{Used_RangedBonus}} [MOD] ]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{rolltype=[[@{Used_RangedImpale}]]}} {{qualities=@{Used_RangedQualities}}} {{range=@{Used_WeaponRange}}} {{ammo=@{Used_RangedAmmo}}} {{ammotype=@{Used_RangedAmmoType}}} {{damage=[[@{Used_RangedStrengthBonus}+@{Used_RangedDamage}]]}} {{mod1type=[[@{Used_Ranged_modtype1}]]}} {{mod1=@{Used_Ranged_mod1}}} {{mod2type=[[@{Used_Ranged_modtype2}]]}} {{mod2=@{Used_Ranged_mod2}}} {{mod3type=[[@{Used_Ranged_modtype3}]]}} {{mod3=@{Used_Ranged_mod3}}} {{NPC=[[0]]}} {{reroll=@{RT-reroll}RangedAttack)}} {{RTcrit=@{RT-crit}}} {{RTfumble=@{RT-fumble}}}"><span>Shoot</span>
 					</button>
 							</div>					
 							</div>	
@@ -14792,7 +14790,7 @@
 							</div>
 							<div class="sheet-col-3-100 sheet-center sheet-pad-r-sm">
 								<input type="checkbox" name="attr_UsedRanged" value="1" />
-								<button type="hidden" class="sheet-roll sheet-hidden" name="roll_RangedAttack" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{title=@{RangedWeaponName}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{attacktype=^{RANGED}}} {{target=[[([[{[[@{ConditionMod}]],[[@{ConditionMoveMod}]],[[@{ConditionSeeMod}]]}kl1]])+@{RangedBalisticSkill}+@{RangedBonus}+(@{Advantage}*10)+?{Modifier (Adv. already added)|0}]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{rolltype=@{RangedImpale}}} {{qualities=@{RangedQualities}}} {{range=@{WeaponRange}}} {{ammo=@{RangedAmmo}}} {{damage=[[@{RangedStrengthBonus}+@{RangedDamage}]]}} {{NPC=[[0]]}}"></button>
+								<button type="hidden" class="sheet-roll sheet-hidden" name="roll_RangedAttack" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|@{RangedBonus}}]]}} {{title=@{RangedWeaponName}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{attacktype=^{RANGED}}} {{target=[[([[{[[@{ConditionMod}]],[[@{ConditionMoveMod}]],[[@{ConditionSeeMod}]]}kl1]])+@{RangedBalisticSkill}+(@{Advantage}*10)+?{Modifier (Adv. already added)|@{RangedBonus}}]]}} {{attacktest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{hitlocation=true}} {{test=[[@{roll_rule}]]}} {{rolltype=@{RangedImpale}}} {{qualities=@{RangedQualities}}} {{range=@{WeaponRange}}} {{ammo=@{RangedAmmo}}} {{damage=[[@{RangedStrengthBonus}+@{RangedDamage}]]}} {{NPC=[[0]]}}"></button>
 							</div>
 							
               <label class="sheet-col-4-100 sheet-center talsetshow-check">
@@ -16325,8 +16323,8 @@
 								<div class="sheet-center sheet-small-label sheet-pad-b-sm">
 									<span data-i18n="CASTING-NUMBER">CN</span>
 								</div>
-								<input type="text" class="sheet-center" name="attr_spellcastingnumber" value="0" />
-								<input type="hidden" class="sheet-center" name="attr_cn-sl-mod" value="@{spellcastingnumber}-" />
+								<input type="number" class="sheet-center" name="attr_spellcastingnumber" value="0" />
+								<input type="hidden" class="sheet-center" name="attr_cn-sl-mod" value="@{spellcastingnumber}" />
 							</div>
 
 							<div class="sheet-col-1-6 sheet-center sheet-vert-middle sheet-pad-r-sm">
@@ -16468,7 +16466,7 @@
 								<div class="sheet-center sheet-small-label sheet-pad-b-sm">
 									<span>Accu Ext SL</span>
 								</div>
-								<input type="text" class="sheet-center" name="attr_spellchannelsl" value="0" />
+								<input type="number" class="sheet-center" name="attr_spellchannelsl" value="0" />
 							</div>
 							<div class="sheet-col-4-100 sheet-center sheet-vert-middle sheet-pad-r-s">
 								<div class="sheet-center sheet-small-label sheet-pad-b-sm">
@@ -16959,10 +16957,20 @@
 			<!-- ENCUMBRANCE -->
 			<div class="sheet-row sheet-pad-t-md">
 				<div class="sheet-col-1">
-							<div class="sheet-col-1 sheet-seperator-cap sheet-left sheet-pad-t-md">
+							<div class="sheet-col-1-2 sheet-seperator-cap sheet-left">
 								<span  style="font-size: 14px" data-i18n="ENCUMBRANCE">ENCUMBRANCE</span>
 						<span class="sheet-pictos">a</span>				
 							</div>	
+					<div class="sheet-col-9-20 sheet-right sheet-pad-t-md">
+						<div class="sheet-col-1-3" style="height: 17px">
+							<input type="hidden" name="attr_encpenalty" value="0" />
+						</div>
+							<span style="padding-right: 10px">Encumbrance Pentalty</span>
+							<span>x1</span>
+							<input type="checkbox" name="attr_encpenalty" value="1" title="-1 movement, -10 Agi" />
+							<span style="padding-left: 10px">x2</span>
+							<input type="checkbox" name="attr_encpenalty" value="2" title="-2 movement, -20 Agi (Min 10)" />
+					</div>
 							<img src="https://github.com/Djjus/Vault/blob/master/Warhammer%204e%20Character%20Sheet/assets/seperator-center-full.png?raw=true">	
 				</div>
 			</div>
@@ -17040,8 +17048,7 @@
 					<input type="hidden" name="attr_OverEncCal" value="[[@{TotalEnc}]]" />			
 					<input type="hidden" name="attr_OverEncCal2" value="[[@{MaxEnc}]]" />	
 					<input type="number" name="attr_OverEnc2" value="((((floor((@{OverEncCal})/(@{OverEncCal2})-0.01)) + 0) + abs((floor((@{OverEncCal})/(@{OverEncCal2})-0.01)) - 0))/2)" disabled="true" />					
-				</div>						
-						
+				</div>	
 			</div>
 			<!-- TRAPPINGS -->
 			<div class="sheet-row sheet-pad-t-md">
@@ -18413,14 +18420,13 @@
 				<div class="sheet-row">
 					<div class="sheet-col-11-24 sheet-pad-l-md sheet-pad-r-md sheet-rt-key">Accu Ext SL</div>
 					<div class="sheet-col-13-24 sheet-pad-r-sm sheet-smaller-letter-spacing sheet-rt-value"><span style="font-weight: bold; padding-left: 4px">{{accuchanexlsl}}</span></div>
-				</div>										
-				{{/accuchanexlsl}}	
-
-				{{#rollGreater() spellcastingnumber accuchanexlsl}}{{#rollBetween{} rolltype 5 6}}
+				</div>				
+				{{#rollGreater() spellcastingnumber accuchanexlsl}}
 				<div class="sheet-row">
 					<div class="sheet-col-1-1 sheet-center sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide sheet-rt-fumble">Note: Insufficient Accu Ext SL</div>
 				</div>	
-				{{/rollBetween{} rolltype 5 6}}{{/rollGreater() spellcastingnumber accuchanexlsl}}		
+				{{/rollGreater() spellcastingnumber accuchanexlsl}}								
+				{{/accuchanexlsl}}	
 
 				{{#rollGreater() advantage 0}}
 				<div class="sheet-row">
@@ -26009,7 +26015,7 @@ on('change:repeating_advancements', function(){
 
 		stats.forEach(stat => {
 
-		on(`sheet:opened change:race change:${stat.toLowerCase()}start change:${stat.toLowerCase()}talents change:${stat.toLowerCase()}adv change:${stat.toLowerCase()}mod change:${stat.toLowerCase()}bonusmod`, function () {
+		on(`sheet:opened change:race change:encpenalty change:${stat.toLowerCase()}start change:${stat.toLowerCase()}talents change:${stat.toLowerCase()}adv change:${stat.toLowerCase()}mod change:${stat.toLowerCase()}bonusmod`, function () {
 		getAttrs([`${stat}Start`, `${stat}Talents`, `${stat}Adv`, `${stat}Mod`, `${stat}BonusMod`], function (v) {
 		const charStart   = +v[`${stat}Start`] || 0;
 		const charTalents = +v[`${stat}Talents`] || 0;
@@ -26026,6 +26032,20 @@ on('change:repeating_advancements', function(){
 		setAttrs({
 		[`${stat}Bonus`]: bonus
 		});
+		
+		
+		getAttrs(['Agility', 'encpenalty'], function (e) {		
+		const agi = +e.Agility || 0;		
+		const pen = +e.encpenalty || 0;
+        if (agi == 10) return;
+		var penmod = agi - pen*10;
+        if (penmod < 10) { var penmod = 10; }
+		
+		setAttrs({
+		Agility: penmod
+		});
+		})
+		
 
 		getAttrs(['StrengthBonus', 'ToughnessBonus', 'WillPowerBonus', 'Race'], function (w) {