From 3b7d14e56ce93a1cd2193d8fe2a342456996f7f4 Mon Sep 17 00:00:00 2001
From: Meduna <kiyorawr@hotmail.com>
Date: Wed, 3 May 2017 09:42:21 -0700
Subject: [PATCH] Removed Targetting

Targetting has been removed from all attacks, abilities and spells. This
means you will no longer need to stat up every monster in roll20,
however, it also means you will have to look up/memorize the
armor/m.armor values of characters. This will also affect macros that
reference your target's eva/m.eva to determine your CoS. I'm considering
uploading an alternate version of the sheet with targetting intact for
those who prefer it, once I figure out how to resolve damage
automatically.
---
 FFRPG Third Edition/FFRPG_3e.html | 57 +++++++++----------------------
 1 file changed, 17 insertions(+), 40 deletions(-)

diff --git a/FFRPG Third Edition/FFRPG_3e.html b/FFRPG Third Edition/FFRPG_3e.html
index ba0faa01d0..13330c78a1 100644
--- a/FFRPG Third Edition/FFRPG_3e.html	
+++ b/FFRPG Third Edition/FFRPG_3e.html	
@@ -1345,7 +1345,6 @@
 		
 		<div class="sheet-row sheet-padb sheet-spell-macro-output-options">
 					<div class="sheet-col-1-8 sheet-vert-middle sheet-small-label sheet-padl">Macro Display Options</div>
-					<div class="sheet-col-1-12 sheet-center sheet-small-label">Target<br/><input type="checkbox" name="attr_actionshowtarget" value="{{actionshowtarget=1}} {{target=@{target|token_name}}} {{targetarmor=[[(@{target|armor})]]}} {{targetmarmor=[[(@{target|marmor})]]}}" /></div>
 					<div class="sheet-col-1-12 sheet-center sheet-small-label">Attack Roll<br/><input type="checkbox" name="attr_actionshowattack" value="{{actionshowattack=1}} {{actionattack=@{actionattackroll}}}" /></div>
 					<div class="sheet-col-1-12 sheet-center sheet-small-label">Threshold<br/><input type="checkbox" name="attr_actionshowthreshold" value="{{actionshowthreshold=1}} {{actionthreshold=@{actionthreshold}}}" /></div>
 					<div class="sheet-col-1-12 sheet-center sheet-small-label">Healing<br/><input type="checkbox" name="attr_actionshowhealing" value="{{actionshowhealing=1}} {{actionhealing=@{actionhealmacro}}}" /></div>
@@ -1355,7 +1354,7 @@
 					<div class="sheet-col-1-12 sheet-center sheet-small-label">Effect 2<br/><input type="checkbox" name="attr_actionshoweffect2" value="{{actionshoweffect2=1}} {{actioneffectname2=@{actioneffectname2}}} {{actioneffectduration2=@{actioneffectduration2}}} {{actioneffectcos2=@{actioneffect2}}} {{actioneffectroll2=[[{1d100cf>95}]]}}" /></div>
 					<div class="sheet-col-1-12 sheet-center sheet-small-label">Effect 3<br/><input type="checkbox" name="attr_actionshoweffect3" value="{{actionshoweffect3=1}} {{actioneffectname3=@{actioneffectname3}}} {{actioneffectduration3=@{actioneffectduration3}}} {{actioneffectcos3=@{actioneffect3}}} {{actioneffectroll3=[[{1d100cf>95}]]}}" /></div>
 					<div class="sheet-col-1-12 sheet-center sheet-small-label">Effect 4<br/><input type="checkbox" name="attr_actionshoweffect4" value="{{actionshoweffect4=1}} {{actioneffectname4=@{actioneffectname4}}} {{actioneffectduration4=@{actioneffectduration4}}} {{actioneffectcos4=@{actioneffect4}}} {{actioneffectroll4=[[{1d100cf>95}]]}}" /></div>
-					<input type="hidden" name="attr_actionmacrooptions" value="@{actionshowinfo} @{actionshowtarget} @{actionshowattack} @{actionshowthreshold} @{actionshowhealing} @{actionshowstatuscancel} @{actionshowdamage} @{actionshowspecial} @{actionshoweffect1} @{actionshoweffect2} @{actionshoweffect3} @{actionshoweffect4}" />
+					<input type="hidden" name="attr_actionmacrooptions" value="@{actionshowinfo} @{actionshowattack} @{actionshowthreshold} @{actionshowhealing} @{actionshowstatuscancel} @{actionshowdamage} @{actionshowspecial} @{actionshoweffect1} @{actionshoweffect2} @{actionshoweffect3} @{actionshoweffect4}" />
 				</div>
 				
 				<span class="sheet-spacer"></span>
@@ -1520,7 +1519,6 @@
 		
 		<div class="sheet-row sheet-padb sheet-spell-macro-output-options">
 					<div class="sheet-col-1-8 sheet-vert-middle sheet-small-label sheet-padl">Macro Display Options</div>
-					<div class="sheet-col-1-12 sheet-center sheet-small-label">Target<br/><input type="checkbox" name="attr_actionshowtarget" value="{{actionshowtarget=1}} {{target=@{target|token_name}}} {{targetarmor=[[(@{target|armor})]]}} {{targetmarmor=[[(@{target|marmor})]]}}" /></div>
 					<div class="sheet-col-1-12 sheet-center sheet-small-label">Attack Roll<br/><input type="checkbox" name="attr_actionshowattack" value="{{actionshowattack=1}} {{actionattack=@{actionattackroll}}}" /></div>
 					<div class="sheet-col-1-12 sheet-center sheet-small-label">Threshold<br/><input type="checkbox" name="attr_actionshowthreshold" value="{{actionshowthreshold=1}} {{actionthreshold=@{actionthreshold}}}" /></div>
 					<div class="sheet-col-1-12 sheet-center sheet-small-label">Healing<br/><input type="checkbox" name="attr_actionshowhealing" value="{{actionshowhealing=1}} {{actionhealing=@{actionhealmacro}}}" /></div>
@@ -1530,7 +1528,7 @@
 					<div class="sheet-col-1-12 sheet-center sheet-small-label">Effect 2<br/><input type="checkbox" name="attr_actionshoweffect2" value="{{actionshoweffect2=1}} {{actioneffectname2=@{actioneffectname2}}} {{actioneffectduration2=@{actioneffectduration2}}} {{actioneffectcos2=@{actioneffect2}}} {{actioneffectroll2=[[{1d100cf>95}]]}}" /></div>
 					<div class="sheet-col-1-12 sheet-center sheet-small-label">Effect 3<br/><input type="checkbox" name="attr_actionshoweffect3" value="{{actionshoweffect3=1}} {{actioneffectname3=@{actioneffectname3}}} {{actioneffectduration3=@{actioneffectduration3}}} {{actioneffectcos3=@{actioneffect3}}} {{actioneffectroll3=[[{1d100cf>95}]]}}" /></div>
 					<div class="sheet-col-1-12 sheet-center sheet-small-label">Effect 4<br/><input type="checkbox" name="attr_actionshoweffect4" value="{{actionshoweffect4=1}} {{actioneffectname4=@{actioneffectname4}}} {{actioneffectduration4=@{actioneffectduration4}}} {{actioneffectcos4=@{actioneffect4}}} {{actioneffectroll4=[[{1d100cf>95}]]}}" /></div>
-					<input type="hidden" name="attr_actionmacrooptions" value="@{actionshowinfo} @{actionshowtarget} @{actionshowattack} @{actionshowthreshold} @{actionshowhealing} @{actionshowstatuscancel} @{actionshowdamage} @{actionshowspecial} @{actionshoweffect1} @{actionshoweffect2} @{actionshoweffect3} @{actionshoweffect4}" />
+					<input type="hidden" name="attr_actionmacrooptions" value="@{actionshowinfo} @{actionshowattack} @{actionshowthreshold} @{actionshowhealing} @{actionshowstatuscancel} @{actionshowdamage} @{actionshowspecial} @{actionshoweffect1} @{actionshoweffect2} @{actionshoweffect3} @{actionshoweffect4}" />
 				</div>
 				
 				<span class="sheet-spacer"></span>
@@ -1694,7 +1692,6 @@
 		
 		<div class="sheet-row sheet-padb sheet-spell-macro-output-options">
 					<div class="sheet-col-1-8 sheet-vert-middle sheet-small-label sheet-padl">Macro Display Options</div>
-					<div class="sheet-col-1-12 sheet-center sheet-small-label">Target<br/><input type="checkbox" name="attr_actionshowtarget" value="{{actionshowtarget=1}} {{target=@{target|token_name}}} {{targetarmor=[[(@{target|armor})]]}} {{targetmarmor=[[(@{target|marmor})]]}}" /></div>
 					<div class="sheet-col-1-12 sheet-center sheet-small-label">Attack Roll<br/><input type="checkbox" name="attr_actionshowattack" value="{{actionshowattack=1}} {{actionattack=@{actionattackroll}}}" /></div>
 					<div class="sheet-col-1-12 sheet-center sheet-small-label">Threshold<br/><input type="checkbox" name="attr_actionshowthreshold" value="{{actionshowthreshold=1}} {{actionthreshold=@{actionthreshold}}}" /></div>
 					<div class="sheet-col-1-12 sheet-center sheet-small-label">Healing<br/><input type="checkbox" name="attr_actionshowhealing" value="{{actionshowhealing=1}} {{actionhealing=@{actionhealmacro}}}" /></div>
@@ -1704,7 +1701,7 @@
 					<div class="sheet-col-1-12 sheet-center sheet-small-label">Effect 2<br/><input type="checkbox" name="attr_actionshoweffect2" value="{{actionshoweffect2=1}} {{actioneffectname2=@{actioneffectname2}}} {{actioneffectduration2=@{actioneffectduration2}}} {{actioneffectcos2=@{actioneffect2}}} {{actioneffectroll2=[[{1d100cf>95}]]}}" /></div>
 					<div class="sheet-col-1-12 sheet-center sheet-small-label">Effect 3<br/><input type="checkbox" name="attr_actionshoweffect3" value="{{actionshoweffect3=1}} {{actioneffectname3=@{actioneffectname3}}} {{actioneffectduration3=@{actioneffectduration3}}} {{actioneffectcos3=@{actioneffect3}}} {{actioneffectroll3=[[{1d100cf>95}]]}}" /></div>
 					<div class="sheet-col-1-12 sheet-center sheet-small-label">Effect 4<br/><input type="checkbox" name="attr_actionshoweffect4" value="{{actionshoweffect4=1}} {{actioneffectname4=@{actioneffectname4}}} {{actioneffectduration4=@{actioneffectduration4}}} {{actioneffectcos4=@{actioneffect4}}} {{actioneffectroll4=[[{1d100cf>95}]]}}" /></div>
-					<input type="hidden" name="attr_actionmacrooptions" value="@{actionshowinfo} @{actionshowtarget} @{actionshowattack} @{actionshowthreshold} @{actionshowhealing} @{actionshowstatuscancel} @{actionshowdamage} @{actionshowspecial} @{actionshoweffect1} @{actionshoweffect2} @{actionshoweffect3} @{actionshoweffect4}" />
+					<input type="hidden" name="attr_actionmacrooptions" value="@{actionshowinfo} @{actionshowattack} @{actionshowthreshold} @{actionshowhealing} @{actionshowstatuscancel} @{actionshowdamage} @{actionshowspecial} @{actionshoweffect1} @{actionshoweffect2} @{actionshoweffect3} @{actionshoweffect4}" />
 				</div>
 				
 				<span class="sheet-spacer"></span>
@@ -1864,7 +1861,6 @@
 		
 		<div class="sheet-row sheet-padb sheet-spell-macro-output-options">
 					<div class="sheet-col-1-8 sheet-vert-middle sheet-small-label sheet-padl">Macro Display Options</div>
-					<div class="sheet-col-1-12 sheet-center sheet-small-label">Target<br/><input type="checkbox" name="attr_limitshowtarget" value="{{limitshowtarget=1}} {{target=@{target|token_name}}} {{targetarmor=[[(@{target|armor})]]}} {{targetmarmor=[[(@{target|marmor})]]}}" /></div>
 					<div class="sheet-col-1-12 sheet-center sheet-small-label">Attack Roll<br/><input type="checkbox" name="attr_limitshowattack" value="{{limitshowattack=1}} {{limitattack=@{limitattackroll}}}" /></div>
 					<div class="sheet-col-1-12 sheet-center sheet-small-label">Threshold<br/><input type="checkbox" name="attr_limitshowthreshold" value="{{limitshowthreshold=1}} {{limitthreshold=@{limitthreshold}}}" /></div>
 					<div class="sheet-col-1-12 sheet-center sheet-small-label">Healing<br/><input type="checkbox" name="attr_limitshowhealing" value="{{limitshowhealing=1}} {{limithealing=@{limithealmacro}}}" /></div>
@@ -1874,7 +1870,7 @@
 					<div class="sheet-col-1-12 sheet-center sheet-small-label">Effect 2<br/><input type="checkbox" name="attr_limitshoweffect2" value="{{limitshoweffect2=1}} {{limiteffectname2=@{limiteffectname2}}} {{limiteffectduration2=@{limiteffectduration2}}} {{limiteffectcos2=@{limiteffect2}}} {{limiteffectroll2=[[{1d100cf>95}]]}}" /></div>
 					<div class="sheet-col-1-12 sheet-center sheet-small-label">Effect 3<br/><input type="checkbox" name="attr_limitshoweffect3" value="{{limitshoweffect3=1}} {{limiteffectname3=@{limiteffectname3}}} {{limiteffectduration3=@{limiteffectduration3}}} {{limiteffectcos3=@{limiteffect3}}} {{limiteffectroll3=[[{1d100cf>95}]]}}" /></div>
 					<div class="sheet-col-1-12 sheet-center sheet-small-label">Effect 4<br/><input type="checkbox" name="attr_limitshoweffect4" value="{{limitshoweffect4=1}} {{limiteffectname4=@{limiteffectname4}}} {{limiteffectduration4=@{limiteffectduration4}}} {{limiteffectcos4=@{limiteffect4}}} {{limiteffectroll4=[[{1d100cf>95}]]}}" /></div>
-					<input type="hidden" name="attr_limitmacrooptions" value="@{limitshowinfo} @{limitshowtarget} @{limitshowattack} @{limitshowthreshold} @{limitshowhealing} @{limitshowstatuscancel} @{limitshowdamage} @{limitshowspecial} @{limitshoweffect1} @{limitshoweffect2} @{limitshoweffect3} @{limitshoweffect4}" />
+					<input type="hidden" name="attr_limitmacrooptions" value="@{limitshowinfo} @{limitshowattack} @{limitshowthreshold} @{limitshowhealing} @{limitshowstatuscancel} @{limitshowdamage} @{limitshowspecial} @{limitshoweffect1} @{limitshoweffect2} @{limitshoweffect3} @{limitshoweffect4}" />
 				</div>
 				
 				<span class="sheet-spacer"></span>
@@ -2042,7 +2038,7 @@
 			</div>
 			<div class="sheet-col-1-12 sheet-center"><input type="text" class="sheet-center" name="attr_weaponrange" value="1"></div>
 			<div class="sheet-col-1-12 sheet-padr sheet-center"><input type="text" class="sheet-center" name="attr_weaponskill"></div>
-			<div class="sheet-col-1-12 sheet-center"><button type="roll" class="sheet-roll" name="roll_Action" value="&{template:FFRPG} {{title=@{weapon_name}}} {{subheader=@{character_name}}} {{subheaderright=@{weapon_type}}} {{emote=@{weapon_description}}} {{weaponshowtarget=1}} {{target=@{target|token_name}}} {{targetarmor=[[(@{target|armor})]]}} {{targetmarmor=[[(@{target|marmor})]]}} {{weaponshowrange=1}} {{weaponrange=@{weaponrange}}} {{weaponshowthreshold=1}} {{weaponthreshold=@{weaponthreshold}}} {{weaponshowattack=1}} {{weaponattack=@{weaponattackroll}}} @{weaponmacrooptions}" >Attack</button></div>
+			<div class="sheet-col-1-12 sheet-center"><button type="roll" class="sheet-roll" name="roll_Action" value="&{template:FFRPG} {{title=@{weapon_name}}} {{subheader=@{character_name}}} {{subheaderright=@{weapon_type}}} {{emote=@{weapon_description}}} {{weaponshowrange=1}} {{weaponrange=@{weaponrange}}} {{weaponshowthreshold=1}} {{weaponthreshold=@{weaponthreshold}}} {{weaponshowattack=1}} {{weaponattack=@{weaponattackroll}}} @{weaponmacrooptions}" >Attack</button></div>
 		</div>
 		
 		<div class="sheet-row sheet-padb sheet-spell-macro-output-options">
@@ -2554,7 +2550,6 @@
 		</div>
 		<div class="sheet-row sheet-padb sheet-spell-macro-output-options">
 			<div class="sheet-col-1-8 sheet-vert-middle sheet-small-label sheet-padl">Macro Display Options</div>
-			<div class="sheet-col-1-12 sheet-center sheet-small-label">Target<br/><input type="checkbox" name="attr_spellshowtarget" value="{{spellshowtarget=1}} {{target=@{target|token_name}}} {{targetarmor=[[(@{target|armor})]]}} {{targetmarmor=[[(@{target|marmor})]]}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Attack Roll<br/><input type="checkbox" name="attr_spellshowattack" value="{{spellshowattack=1}} {{spellattack=@{spellattackroll}}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Threshold<br/><input type="checkbox" name="attr_spellshowthreshold" value="{{spellshowthreshold=1}} {{spellthreshold=@{spellthreshold}}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Healing<br/><input type="checkbox" name="attr_spellshowhealing" value="{{spellshowhealing=1}} {{spellhealing=@{spellhealmacro}}}" /></div>
@@ -2564,7 +2559,7 @@
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Effect 2<br/><input type="checkbox" name="attr_spellshoweffect2" value="{{spellshoweffect2=1}} {{spelleffectname2=@{spelleffectname2}}} {{spelleffectduration2=@{spelleffectduration2}}} {{spelleffectcos2=@{spelleffect2}}} {{spelleffectroll2=[[{1d100cf>95}]]}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Effect 3<br/><input type="checkbox" name="attr_spellshoweffect3" value="{{spellshoweffect3=1}} {{spelleffectname3=@{spelleffectname3}}} {{spelleffectduration3=@{spelleffectduration3}}} {{spelleffectcos3=@{spelleffect3}}} {{spelleffectroll3=[[{1d100cf>95}]]}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Effect 4<br/><input type="checkbox" name="attr_spellshoweffect4" value="{{spellshoweffect4=1}} {{spelleffectname4=@{spelleffectname4}}} {{spelleffectduration4=@{spelleffectduration4}}} {{spelleffectcos4=@{spelleffect4}}} {{spelleffectroll4=[[{1d100cf>95}]]}}" /></div>
-			<input type="hidden" name="attr_spellmacrooptions" value="@{spellshowinfo} @{spellshowtarget} @{spellshowattack} @{spellshowthreshold} @{spellshowhealing} @{spellshowstatuscancel} @{spellshowdamage} @{spellshowspecial} @{spellshoweffect1} @{spellshoweffect2} @{spellshoweffect3} @{spellshoweffect4}" />
+			<input type="hidden" name="attr_spellmacrooptions" value="@{spellshowinfo}  @{spellshowattack} @{spellshowthreshold} @{spellshowhealing} @{spellshowstatuscancel} @{spellshowdamage} @{spellshowspecial} @{spellshoweffect1} @{spellshoweffect2} @{spellshoweffect3} @{spellshoweffect4}" />
 		</div>
 		
 		<span class="sheet-spacer"></span>
@@ -2741,7 +2736,6 @@
 		</div>
 		<div class="sheet-row sheet-padb sheet-spell-macro-output-options">
 			<div class="sheet-col-1-8 sheet-vert-middle sheet-small-label sheet-padl">Macro Display Options</div>
-			<div class="sheet-col-1-12 sheet-center sheet-small-label">Target<br/><input type="checkbox" name="attr_spellshowtarget" value="{{spellshowtarget=1}} {{target=@{target|token_name}}} {{targetarmor=[[(@{target|armor})]]}} {{targetmarmor=[[(@{target|marmor})]]}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Attack Roll<br/><input type="checkbox" name="attr_spellshowattack" value="{{spellshowattack=1}} {{spellattack=@{spellattackroll}}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Threshold<br/><input type="checkbox" name="attr_spellshowthreshold" value="{{spellshowthreshold=1}} {{spellthreshold=@{spellthreshold}}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Healing<br/><input type="checkbox" name="attr_spellshowhealing" value="{{spellshowhealing=1}} {{spellhealing=@{spellhealmacro}}}" /></div>
@@ -2751,7 +2745,7 @@
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Effect 2<br/><input type="checkbox" name="attr_spellshoweffect2" value="{{spellshoweffect2=1}} {{spelleffectname2=@{spelleffectname2}}} {{spelleffectduration2=@{spelleffectduration2}}} {{spelleffectcos2=@{spelleffect2}}} {{spelleffectroll2=[[{1d100cf>95}]]}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Effect 3<br/><input type="checkbox" name="attr_spellshoweffect3" value="{{spellshoweffect3=1}} {{spelleffectname3=@{spelleffectname3}}} {{spelleffectduration3=@{spelleffectduration3}}} {{spelleffectcos3=@{spelleffect3}}} {{spelleffectroll3=[[{1d100cf>95}]]}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Effect 4<br/><input type="checkbox" name="attr_spellshoweffect4" value="{{spellshoweffect4=1}} {{spelleffectname4=@{spelleffectname4}}} {{spelleffectduration4=@{spelleffectduration4}}} {{spelleffectcos4=@{spelleffect4}}} {{spelleffectroll4=[[{1d100cf>95}]]}}" /></div>
-			<input type="hidden" name="attr_spellmacrooptions" value="@{spellshowinfo} @{spellshowtarget} @{spellshowattack} @{spellshowthreshold} @{spellshowhealing} @{spellshowstatuscancel} @{spellshowdamage} @{spellshowspecial} @{spellshoweffect1} @{spellshoweffect2} @{spellshoweffect3} @{spellshoweffect4}" />
+			<input type="hidden" name="attr_spellmacrooptions" value="@{spellshowinfo}  @{spellshowattack} @{spellshowthreshold} @{spellshowhealing} @{spellshowstatuscancel} @{spellshowdamage} @{spellshowspecial} @{spellshoweffect1} @{spellshoweffect2} @{spellshoweffect3} @{spellshoweffect4}" />
 		</div>
 		
 		<span class="sheet-spacer"></span>
@@ -2928,7 +2922,6 @@
 		</div>
 		<div class="sheet-row sheet-padb sheet-spell-macro-output-options">
 			<div class="sheet-col-1-8 sheet-vert-middle sheet-small-label sheet-padl">Macro Display Options</div>
-			<div class="sheet-col-1-12 sheet-center sheet-small-label">Target<br/><input type="checkbox" name="attr_spellshowtarget" value="{{spellshowtarget=1}} {{target=@{target|token_name}}} {{targetarmor=[[(@{target|armor})]]}} {{targetmarmor=[[(@{target|marmor})]]}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Attack Roll<br/><input type="checkbox" name="attr_spellshowattack" value="{{spellshowattack=1}} {{spellattack=@{spellattackroll}}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Threshold<br/><input type="checkbox" name="attr_spellshowthreshold" value="{{spellshowthreshold=1}} {{spellthreshold=@{spellthreshold}}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Healing<br/><input type="checkbox" name="attr_spellshowhealing" value="{{spellshowhealing=1}} {{spellhealing=@{spellhealmacro}}}" /></div>
@@ -2938,7 +2931,7 @@
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Effect 2<br/><input type="checkbox" name="attr_spellshoweffect2" value="{{spellshoweffect2=1}} {{spelleffectname2=@{spelleffectname2}}} {{spelleffectduration2=@{spelleffectduration2}}} {{spelleffectcos2=@{spelleffect2}}} {{spelleffectroll2=[[{1d100cf>95}]]}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Effect 3<br/><input type="checkbox" name="attr_spellshoweffect3" value="{{spellshoweffect3=1}} {{spelleffectname3=@{spelleffectname3}}} {{spelleffectduration3=@{spelleffectduration3}}} {{spelleffectcos3=@{spelleffect3}}} {{spelleffectroll3=[[{1d100cf>95}]]}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Effect 4<br/><input type="checkbox" name="attr_spellshoweffect4" value="{{spellshoweffect4=1}} {{spelleffectname4=@{spelleffectname4}}} {{spelleffectduration4=@{spelleffectduration4}}} {{spelleffectcos4=@{spelleffect4}}} {{spelleffectroll4=[[{1d100cf>95}]]}}" /></div>
-			<input type="hidden" name="attr_spellmacrooptions" value="@{spellshowinfo} @{spellshowtarget} @{spellshowattack} @{spellshowthreshold} @{spellshowhealing} @{spellshowstatuscancel} @{spellshowdamage} @{spellshowspecial} @{spellshoweffect1} @{spellshoweffect2} @{spellshoweffect3} @{spellshoweffect4}" />
+			<input type="hidden" name="attr_spellmacrooptions" value="@{spellshowinfo}  @{spellshowattack} @{spellshowthreshold} @{spellshowhealing} @{spellshowstatuscancel} @{spellshowdamage} @{spellshowspecial} @{spellshoweffect1} @{spellshoweffect2} @{spellshoweffect3} @{spellshoweffect4}" />
 		</div>
 		
 		<span class="sheet-spacer"></span>
@@ -3115,7 +3108,6 @@
 		</div>
 		<div class="sheet-row sheet-padb sheet-spell-macro-output-options">
 			<div class="sheet-col-1-8 sheet-vert-middle sheet-small-label sheet-padl">Macro Display Options</div>
-			<div class="sheet-col-1-12 sheet-center sheet-small-label">Target<br/><input type="checkbox" name="attr_spellshowtarget" value="{{spellshowtarget=1}} {{target=@{target|token_name}}} {{targetarmor=[[(@{target|armor})]]}} {{targetmarmor=[[(@{target|marmor})]]}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Attack Roll<br/><input type="checkbox" name="attr_spellshowattack" value="{{spellshowattack=1}} {{spellattack=@{spellattackroll}}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Threshold<br/><input type="checkbox" name="attr_spellshowthreshold" value="{{spellshowthreshold=1}} {{spellthreshold=@{spellthreshold}}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Healing<br/><input type="checkbox" name="attr_spellshowhealing" value="{{spellshowhealing=1}} {{spellhealing=@{spellhealmacro}}}" /></div>
@@ -3125,7 +3117,7 @@
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Effect 2<br/><input type="checkbox" name="attr_spellshoweffect2" value="{{spellshoweffect2=1}} {{spelleffectname2=@{spelleffectname2}}} {{spelleffectduration2=@{spelleffectduration2}}} {{spelleffectcos2=@{spelleffect2}}} {{spelleffectroll2=[[{1d100cf>95}]]}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Effect 3<br/><input type="checkbox" name="attr_spellshoweffect3" value="{{spellshoweffect3=1}} {{spelleffectname3=@{spelleffectname3}}} {{spelleffectduration3=@{spelleffectduration3}}} {{spelleffectcos3=@{spelleffect3}}} {{spelleffectroll3=[[{1d100cf>95}]]}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Effect 4<br/><input type="checkbox" name="attr_spellshoweffect4" value="{{spellshoweffect4=1}} {{spelleffectname4=@{spelleffectname4}}} {{spelleffectduration4=@{spelleffectduration4}}} {{spelleffectcos4=@{spelleffect4}}} {{spelleffectroll4=[[{1d100cf>95}]]}}" /></div>
-			<input type="hidden" name="attr_spellmacrooptions" value="@{spellshowinfo} @{spellshowtarget} @{spellshowattack} @{spellshowthreshold} @{spellshowhealing} @{spellshowstatuscancel} @{spellshowdamage} @{spellshowspecial} @{spellshoweffect1} @{spellshoweffect2} @{spellshoweffect3} @{spellshoweffect4}" />
+			<input type="hidden" name="attr_spellmacrooptions" value="@{spellshowinfo}  @{spellshowattack} @{spellshowthreshold} @{spellshowhealing} @{spellshowstatuscancel} @{spellshowdamage} @{spellshowspecial} @{spellshoweffect1} @{spellshoweffect2} @{spellshoweffect3} @{spellshoweffect4}" />
 		</div>
 		
 		<span class="sheet-spacer"></span>
@@ -3303,7 +3295,6 @@
 		</div>
 		<div class="sheet-row sheet-padb sheet-spell-macro-output-options">
 			<div class="sheet-col-1-8 sheet-vert-middle sheet-small-label sheet-padl">Macro Display Options</div>
-			<div class="sheet-col-1-12 sheet-center sheet-small-label">Target<br/><input type="checkbox" name="attr_spellshowtarget" value="{{spellshowtarget=1}} {{target=@{target|token_name}}} {{targetarmor=[[(@{target|armor})]]}} {{targetmarmor=[[(@{target|marmor})]]}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Attack Roll<br/><input type="checkbox" name="attr_spellshowattack" value="{{spellshowattack=1}} {{spellattack=@{spellattackroll}}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Threshold<br/><input type="checkbox" name="attr_spellshowthreshold" value="{{spellshowthreshold=1}} {{spellthreshold=@{spellthreshold}}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Healing<br/><input type="checkbox" name="attr_spellshowhealing" value="{{spellshowhealing=1}} {{spellhealing=@{spellhealmacro}}}" /></div>
@@ -3313,7 +3304,7 @@
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Effect 2<br/><input type="checkbox" name="attr_spellshoweffect2" value="{{spellshoweffect2=1}} {{spelleffectname2=@{spelleffectname2}}} {{spelleffectduration2=@{spelleffectduration2}}} {{spelleffectcos2=@{spelleffect2}}} {{spelleffectroll2=[[{1d100cf>95}]]}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Effect 3<br/><input type="checkbox" name="attr_spellshoweffect3" value="{{spellshoweffect3=1}} {{spelleffectname3=@{spelleffectname3}}} {{spelleffectduration3=@{spelleffectduration3}}} {{spelleffectcos3=@{spelleffect3}}} {{spelleffectroll3=[[{1d100cf>95}]]}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Effect 4<br/><input type="checkbox" name="attr_spellshoweffect4" value="{{spellshoweffect4=1}} {{spelleffectname4=@{spelleffectname4}}} {{spelleffectduration4=@{spelleffectduration4}}} {{spelleffectcos4=@{spelleffect4}}} {{spelleffectroll4=[[{1d100cf>95}]]}}" /></div>
-			<input type="hidden" name="attr_spellmacrooptions" value="@{spellshowinfo} @{spellshowtarget} @{spellshowattack} @{spellshowthreshold} @{spellshowhealing} @{spellshowstatuscancel} @{spellshowdamage} @{spellshowspecial} @{spellshoweffect1} @{spellshoweffect2} @{spellshoweffect3} @{spellshoweffect4}" />
+			<input type="hidden" name="attr_spellmacrooptions" value="@{spellshowinfo}  @{spellshowattack} @{spellshowthreshold} @{spellshowhealing} @{spellshowstatuscancel} @{spellshowdamage} @{spellshowspecial} @{spellshoweffect1} @{spellshoweffect2} @{spellshoweffect3} @{spellshoweffect4}" />
 		</div>
 		
 		<span class="sheet-spacer"></span>
@@ -3490,7 +3481,6 @@
 		</div>
 		<div class="sheet-row sheet-padb sheet-spell-macro-output-options">
 			<div class="sheet-col-1-8 sheet-vert-middle sheet-small-label sheet-padl">Macro Display Options</div>
-			<div class="sheet-col-1-12 sheet-center sheet-small-label">Target<br/><input type="checkbox" name="attr_spellshowtarget" value="{{spellshowtarget=1}} {{target=@{target|token_name}}} {{targetarmor=[[(@{target|armor})]]}} {{targetmarmor=[[(@{target|marmor})]]}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Attack Roll<br/><input type="checkbox" name="attr_spellshowattack" value="{{spellshowattack=1}} {{spellattack=@{spellattackroll}}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Threshold<br/><input type="checkbox" name="attr_spellshowthreshold" value="{{spellshowthreshold=1}} {{spellthreshold=@{spellthreshold}}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Healing<br/><input type="checkbox" name="attr_spellshowhealing" value="{{spellshowhealing=1}} {{spellhealing=@{spellhealmacro}}}" /></div>
@@ -3500,7 +3490,7 @@
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Effect 2<br/><input type="checkbox" name="attr_spellshoweffect2" value="{{spellshoweffect2=1}} {{spelleffectname2=@{spelleffectname2}}} {{spelleffectduration2=@{spelleffectduration2}}} {{spelleffectcos2=@{spelleffect2}}} {{spelleffectroll2=[[{1d100cf>95}]]}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Effect 3<br/><input type="checkbox" name="attr_spellshoweffect3" value="{{spellshoweffect3=1}} {{spelleffectname3=@{spelleffectname3}}} {{spelleffectduration3=@{spelleffectduration3}}} {{spelleffectcos3=@{spelleffect3}}} {{spelleffectroll3=[[{1d100cf>95}]]}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Effect 4<br/><input type="checkbox" name="attr_spellshoweffect4" value="{{spellshoweffect4=1}} {{spelleffectname4=@{spelleffectname4}}} {{spelleffectduration4=@{spelleffectduration4}}} {{spelleffectcos4=@{spelleffect4}}} {{spelleffectroll4=[[{1d100cf>95}]]}}" /></div>
-			<input type="hidden" name="attr_spellmacrooptions" value="@{spellshowinfo} @{spellshowtarget} @{spellshowattack} @{spellshowthreshold} @{spellshowhealing} @{spellshowstatuscancel} @{spellshowdamage} @{spellshowspecial} @{spellshoweffect1} @{spellshoweffect2} @{spellshoweffect3} @{spellshoweffect4}" />
+			<input type="hidden" name="attr_spellmacrooptions" value="@{spellshowinfo}  @{spellshowattack} @{spellshowthreshold} @{spellshowhealing} @{spellshowstatuscancel} @{spellshowdamage} @{spellshowspecial} @{spellshoweffect1} @{spellshoweffect2} @{spellshoweffect3} @{spellshoweffect4}" />
 		</div>
 		
 		<span class="sheet-spacer"></span>
@@ -3677,7 +3667,6 @@
 		</div>
 		<div class="sheet-row sheet-padb sheet-spell-macro-output-options">
 			<div class="sheet-col-1-8 sheet-vert-middle sheet-small-label sheet-padl">Macro Display Options</div>
-			<div class="sheet-col-1-12 sheet-center sheet-small-label">Target<br/><input type="checkbox" name="attr_spellshowtarget" value="{{spellshowtarget=1}} {{target=@{target|token_name}}} {{targetarmor=[[(@{target|armor})]]}} {{targetmarmor=[[(@{target|marmor})]]}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Attack Roll<br/><input type="checkbox" name="attr_spellshowattack" value="{{spellshowattack=1}} {{spellattack=@{spellattackroll}}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Threshold<br/><input type="checkbox" name="attr_spellshowthreshold" value="{{spellshowthreshold=1}} {{spellthreshold=@{spellthreshold}}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Healing<br/><input type="checkbox" name="attr_spellshowhealing" value="{{spellshowhealing=1}} {{spellhealing=@{spellhealmacro}}}" /></div>
@@ -3687,7 +3676,7 @@
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Effect 2<br/><input type="checkbox" name="attr_spellshoweffect2" value="{{spellshoweffect2=1}} {{spelleffectname2=@{spelleffectname2}}} {{spelleffectduration2=@{spelleffectduration2}}} {{spelleffectcos2=@{spelleffect2}}} {{spelleffectroll2=[[{1d100cf>95}]]}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Effect 3<br/><input type="checkbox" name="attr_spellshoweffect3" value="{{spellshoweffect3=1}} {{spelleffectname3=@{spelleffectname3}}} {{spelleffectduration3=@{spelleffectduration3}}} {{spelleffectcos3=@{spelleffect3}}} {{spelleffectroll3=[[{1d100cf>95}]]}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Effect 4<br/><input type="checkbox" name="attr_spellshoweffect4" value="{{spellshoweffect4=1}} {{spelleffectname4=@{spelleffectname4}}} {{spelleffectduration4=@{spelleffectduration4}}} {{spelleffectcos4=@{spelleffect4}}} {{spelleffectroll4=[[{1d100cf>95}]]}}" /></div>
-			<input type="hidden" name="attr_spellmacrooptions" value="@{spellshowinfo} @{spellshowtarget} @{spellshowattack} @{spellshowthreshold} @{spellshowhealing} @{spellshowstatuscancel} @{spellshowdamage} @{spellshowspecial} @{spellshoweffect1} @{spellshoweffect2} @{spellshoweffect3} @{spellshoweffect4}" />
+			<input type="hidden" name="attr_spellmacrooptions" value="@{spellshowinfo}  @{spellshowattack} @{spellshowthreshold} @{spellshowhealing} @{spellshowstatuscancel} @{spellshowdamage} @{spellshowspecial} @{spellshoweffect1} @{spellshoweffect2} @{spellshoweffect3} @{spellshoweffect4}" />
 		</div>
 		
 		<span class="sheet-spacer"></span>
@@ -3864,7 +3853,6 @@
 		</div>
 		<div class="sheet-row sheet-padb sheet-spell-macro-output-options">
 			<div class="sheet-col-1-8 sheet-vert-middle sheet-small-label sheet-padl">Macro Display Options</div>
-			<div class="sheet-col-1-12 sheet-center sheet-small-label">Target<br/><input type="checkbox" name="attr_spellshowtarget" value="{{spellshowtarget=1}} {{target=@{target|token_name}}} {{targetarmor=[[(@{target|armor})]]}} {{targetmarmor=[[(@{target|marmor})]]}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Attack Roll<br/><input type="checkbox" name="attr_spellshowattack" value="{{spellshowattack=1}} {{spellattack=@{spellattackroll}}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Threshold<br/><input type="checkbox" name="attr_spellshowthreshold" value="{{spellshowthreshold=1}} {{spellthreshold=@{spellthreshold}}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Healing<br/><input type="checkbox" name="attr_spellshowhealing" value="{{spellshowhealing=1}} {{spellhealing=@{spellhealmacro}}}" /></div>
@@ -3874,7 +3862,7 @@
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Effect 2<br/><input type="checkbox" name="attr_spellshoweffect2" value="{{spellshoweffect2=1}} {{spelleffectname2=@{spelleffectname2}}} {{spelleffectduration2=@{spelleffectduration2}}} {{spelleffectcos2=@{spelleffect2}}} {{spelleffectroll2=[[{1d100cf>95}]]}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Effect 3<br/><input type="checkbox" name="attr_spellshoweffect3" value="{{spellshoweffect3=1}} {{spelleffectname3=@{spelleffectname3}}} {{spelleffectduration3=@{spelleffectduration3}}} {{spelleffectcos3=@{spelleffect3}}} {{spelleffectroll3=[[{1d100cf>95}]]}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Effect 4<br/><input type="checkbox" name="attr_spellshoweffect4" value="{{spellshoweffect4=1}} {{spelleffectname4=@{spelleffectname4}}} {{spelleffectduration4=@{spelleffectduration4}}} {{spelleffectcos4=@{spelleffect4}}} {{spelleffectroll4=[[{1d100cf>95}]]}}" /></div>
-			<input type="hidden" name="attr_spellmacrooptions" value="@{spellshowinfo} @{spellshowtarget} @{spellshowattack} @{spellshowthreshold} @{spellshowhealing} @{spellshowstatuscancel} @{spellshowdamage} @{spellshowspecial} @{spellshoweffect1} @{spellshoweffect2} @{spellshoweffect3} @{spellshoweffect4}" />
+			<input type="hidden" name="attr_spellmacrooptions" value="@{spellshowinfo}  @{spellshowattack} @{spellshowthreshold} @{spellshowhealing} @{spellshowstatuscancel} @{spellshowdamage} @{spellshowspecial} @{spellshoweffect1} @{spellshoweffect2} @{spellshoweffect3} @{spellshoweffect4}" />
 		</div>
 		
 		<span class="sheet-spacer"></span>
@@ -4051,7 +4039,6 @@
 		</div>
 		<div class="sheet-row sheet-padb sheet-spell-macro-output-options">
 			<div class="sheet-col-1-8 sheet-vert-middle sheet-small-label sheet-padl">Macro Display Options</div>
-			<div class="sheet-col-1-12 sheet-center sheet-small-label">Target<br/><input type="checkbox" name="attr_spellshowtarget" value="{{spellshowtarget=1}} {{target=@{target|token_name}}} {{targetarmor=[[(@{target|armor})]]}} {{targetmarmor=[[(@{target|marmor})]]}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Attack Roll<br/><input type="checkbox" name="attr_spellshowattack" value="{{spellshowattack=1}} {{spellattack=@{spellattackroll}}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Threshold<br/><input type="checkbox" name="attr_spellshowthreshold" value="{{spellshowthreshold=1}} {{spellthreshold=@{spellthreshold}}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Healing<br/><input type="checkbox" name="attr_spellshowhealing" value="{{spellshowhealing=1}} {{spellhealing=@{spellhealmacro}}}" /></div>
@@ -4061,7 +4048,7 @@
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Effect 2<br/><input type="checkbox" name="attr_spellshoweffect2" value="{{spellshoweffect2=1}} {{spelleffectname2=@{spelleffectname2}}} {{spelleffectduration2=@{spelleffectduration2}}} {{spelleffectcos2=@{spelleffect2}}} {{spelleffectroll2=[[{1d100cf>95}]]}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Effect 3<br/><input type="checkbox" name="attr_spellshoweffect3" value="{{spellshoweffect3=1}} {{spelleffectname3=@{spelleffectname3}}} {{spelleffectduration3=@{spelleffectduration3}}} {{spelleffectcos3=@{spelleffect3}}} {{spelleffectroll3=[[{1d100cf>95}]]}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Effect 4<br/><input type="checkbox" name="attr_spellshoweffect4" value="{{spellshoweffect4=1}} {{spelleffectname4=@{spelleffectname4}}} {{spelleffectduration4=@{spelleffectduration4}}} {{spelleffectcos4=@{spelleffect4}}} {{spelleffectroll4=[[{1d100cf>95}]]}}" /></div>
-			<input type="hidden" name="attr_spellmacrooptions" value="@{spellshowinfo} @{spellshowtarget} @{spellshowattack} @{spellshowthreshold} @{spellshowhealing} @{spellshowstatuscancel} @{spellshowdamage} @{spellshowspecial} @{spellshoweffect1} @{spellshoweffect2} @{spellshoweffect3} @{spellshoweffect4}" />
+			<input type="hidden" name="attr_spellmacrooptions" value="@{spellshowinfo}  @{spellshowattack} @{spellshowthreshold} @{spellshowhealing} @{spellshowstatuscancel} @{spellshowdamage} @{spellshowspecial} @{spellshoweffect1} @{spellshoweffect2} @{spellshoweffect3} @{spellshoweffect4}" />
 		</div>
 		
 		<span class="sheet-spacer"></span>
@@ -4237,7 +4224,6 @@
 		</div>
 		<div class="sheet-row sheet-padb sheet-spell-macro-output-options">
 			<div class="sheet-col-1-8 sheet-vert-middle sheet-small-label sheet-padl">Macro Display Options</div>
-			<div class="sheet-col-1-12 sheet-center sheet-small-label">Target<br/><input type="checkbox" name="attr_spellshowtarget" value="{{spellshowtarget=1}} {{target=@{target|token_name}}} {{targetarmor=[[(@{target|armor})]]}} {{targetmarmor=[[(@{target|marmor})]]}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Attack Roll<br/><input type="checkbox" name="attr_spellshowattack" value="{{spellshowattack=1}} {{spellattack=@{spellattackroll}}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Threshold<br/><input type="checkbox" name="attr_spellshowthreshold" value="{{spellshowthreshold=1}} {{spellthreshold=@{spellthreshold}}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Healing<br/><input type="checkbox" name="attr_spellshowhealing" value="{{spellshowhealing=1}} {{spellhealing=@{spellhealmacro}}}" /></div>
@@ -4247,7 +4233,7 @@
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Effect 2<br/><input type="checkbox" name="attr_spellshoweffect2" value="{{spellshoweffect2=1}} {{spelleffectname2=@{spelleffectname2}}} {{spelleffectduration2=@{spelleffectduration2}}} {{spelleffectcos2=@{spelleffect2}}} {{spelleffectroll2=[[{1d100cf>95}]]}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Effect 3<br/><input type="checkbox" name="attr_spellshoweffect3" value="{{spellshoweffect3=1}} {{spelleffectname3=@{spelleffectname3}}} {{spelleffectduration3=@{spelleffectduration3}}} {{spelleffectcos3=@{spelleffect3}}} {{spelleffectroll3=[[{1d100cf>95}]]}}" /></div>
 			<div class="sheet-col-1-12 sheet-center sheet-small-label">Effect 4<br/><input type="checkbox" name="attr_spellshoweffect4" value="{{spellshoweffect4=1}} {{spelleffectname4=@{spelleffectname4}}} {{spelleffectduration4=@{spelleffectduration4}}} {{spelleffectcos4=@{spelleffect4}}} {{spelleffectroll4=[[{1d100cf>95}]]}}" /></div>
-			<input type="hidden" name="attr_spellmacrooptions" value="@{spellshowinfo} @{spellshowtarget} @{spellshowattack} @{spellshowthreshold} @{spellshowhealing} @{spellshowstatuscancel} @{spellshowdamage} @{spellshowspecial} @{spellshoweffect1} @{spellshoweffect2} @{spellshoweffect3} @{spellshoweffect4}" />
+			<input type="hidden" name="attr_spellmacrooptions" value="@{spellshowinfo}  @{spellshowattack} @{spellshowthreshold} @{spellshowhealing} @{spellshowstatuscancel} @{spellshowdamage} @{spellshowspecial} @{spellshoweffect1} @{spellshoweffect2} @{spellshoweffect3} @{spellshoweffect4}" />
 		</div>
 		
 		<span class="sheet-spacer"></span>
@@ -5518,7 +5504,7 @@
 		
 		<div class="sheet-row sheet-padb sheet-spell-macro-output-options">
 					<div class="sheet-col-1-8 sheet-vert-middle sheet-small-label sheet-padl">Macro Display Options</div>
-					<div class="sheet-col-1-12 sheet-center sheet-small-label">Target<br/><input type="checkbox" name="attr_actionshowtarget" value="{{actionshowtarget=1}} {{target=@{target|token_name}}} {{targetarmor=[[(@{target|armor})]]}} {{targetmarmor=[[(@{target|marmor})]]}}" /></div>
+					
 					<div class="sheet-col-1-12 sheet-center sheet-small-label">Attack Roll<br/><input type="checkbox" name="attr_actionshowattack" value="{{actionshowattack=1}} {{actionattack=@{actionattackroll}}}" /></div>
 					<div class="sheet-col-1-12 sheet-center sheet-small-label">Threshold<br/><input type="checkbox" name="attr_actionshowthreshold" value="{{actionshowthreshold=1}} {{actionthreshold=@{actionthreshold}}}" /></div>
 					<div class="sheet-col-1-12 sheet-center sheet-small-label">Healing<br/><input type="checkbox" name="attr_actionshowhealing" value="{{actionshowhealing=1}} {{actionhealing=@{actionhealmacro}}}" /></div>
@@ -5528,7 +5514,7 @@
 					<div class="sheet-col-1-12 sheet-center sheet-small-label">Effect 2<br/><input type="checkbox" name="attr_actionshoweffect2" value="{{actionshoweffect2=1}} {{actioneffectname2=@{actioneffectname2}}} {{actioneffectduration2=@{actioneffectduration2}}} {{actioneffectcos2=@{actioneffect2}}} {{actioneffectroll2=[[{1d100cf>95}]]}}" /></div>
 					<div class="sheet-col-1-12 sheet-center sheet-small-label">Effect 3<br/><input type="checkbox" name="attr_actionshoweffect3" value="{{actionshoweffect3=1}} {{actioneffectname3=@{actioneffectname3}}} {{actioneffectduration3=@{actioneffectduration3}}} {{actioneffectcos3=@{actioneffect3}}} {{actioneffectroll3=[[{1d100cf>95}]]}}" /></div>
 					<div class="sheet-col-1-12 sheet-center sheet-small-label">Effect 4<br/><input type="checkbox" name="attr_actionshoweffect4" value="{{actionshoweffect4=1}} {{actioneffectname4=@{actioneffectname4}}} {{actioneffectduration4=@{actioneffectduration4}}} {{actioneffectcos4=@{actioneffect4}}} {{actioneffectroll4=[[{1d100cf>95}]]}}" /></div>
-					<input type="hidden" name="attr_actionmacrooptions" value="@{actionshowinfo} @{actionshowtarget} @{actionshowattack} @{actionshowthreshold} @{actionshowhealing} @{actionshowstatuscancel} @{actionshowdamage} @{actionshowspecial} @{actionshoweffect1} @{actionshoweffect2} @{actionshoweffect3} @{actionshoweffect4}" />
+					<input type="hidden" name="attr_actionmacrooptions" value="@{actionshowinfo} @{actionshowattack} @{actionshowthreshold} @{actionshowhealing} @{actionshowstatuscancel} @{actionshowdamage} @{actionshowspecial} @{actionshoweffect1} @{actionshoweffect2} @{actionshoweffect3} @{actionshoweffect4}" />
 				</div>
 				
 				<span class="sheet-spacer"></span>
@@ -5663,15 +5649,6 @@
 			<p class="sheet-rt-emote">{{character_name}} {{emote}}</p>
 			{{/emote}}
 			
-			{{#target}}
-				<div class="sheet-row">
-					<div class="sheet-col-5-12 sheet-padl sheet-padr sheet-rt-key">Target</div>
-					<div class="sheet-col-7-12 sheet-padr sheet-rt-value">{{target}}</div>
-					<div class="sheet-col-1-2 sheet-padl sheet-padr sheet-center sheet-border-right-dotted"><span class="sheet-rt-key">ARM</span><br/><span class="sheet-rt-value">{{targetarmor}}</span></div>
-					<div class="sheet-col-1-2 sheet-padl sheet-padr sheet-center sheet-border-left-dotted"><span class="sheet-rt-key">M.ARM</span><br/><span class="sheet-rt-value">{{targetmarmor}}</span></div>
-				</div>
-			{{/target}}
-			
 			{{#threshold}}
 				<div class="sheet-row">
 					<div class="sheet-col-7-12 sheet-padl sheet-padr sheet-rt-key">Threshold</div>