From b939027c67a3970a9d5f46b49d74e4dba619149f Mon Sep 17 00:00:00 2001
From: Rob <kitsucoon@gmail.com>
Date: Wed, 15 Aug 2018 08:31:14 -0500
Subject: [PATCH] Fixing attribute roll error

* Strength was always used as first modifier.
* Added a "None" option in the dropdown to allow for untrained skill use
---
 ShadowrunAnarchy/SR Anarchy.html | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ShadowrunAnarchy/SR Anarchy.html b/ShadowrunAnarchy/SR Anarchy.html
index 9f8bf25061..da9ae697e5 100644
--- a/ShadowrunAnarchy/SR Anarchy.html	
+++ b/ShadowrunAnarchy/SR Anarchy.html	
@@ -19,32 +19,32 @@
 	<!-- ~~~~~~~~ Attribute  ~~~~~~~~ -->
 		<div class="tan attribute">
 			<div class="sheet-col">
-				<button type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Strength}}{{attr=Attribute}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{strength}+(?{Attribute|Strength,@{strength}|Agility,@{agility}|Willpower,@{willpower}|Logic,@{logic}|Charisma,@{charisma}|Edge,@{edge}})+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}]]}}" title="Strength Roll"><h1 data-i18n="strength">STRENGTH</h1></button>
+				<button type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Strength}}{{attr=Attribute}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{strength}+(?{Attribute|Strength,@{strength}|Agility,@{agility}|Willpower,@{willpower}|Logic,@{logic}|Charisma,@{charisma}|Edge,@{edge}|None,0})+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}]]}}" title="Strength Roll"><h1 data-i18n="strength">STRENGTH</h1></button>
 				<input type="number" name="attr_strength" value="1" title="@{strength}" />
 			</div>
 			<div class="vertdeco"></div>
 			<div class="sheet-col">
-				<button type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Agility}}{{attr=Attribute}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{strength}+(?{Attribute|Strength,@{strength}|Agility,@{agility}|Willpower,@{willpower}|Logic,@{logic}|Charisma,@{charisma}|Edge,@{edge}})+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}]]}}" title="Agility Roll"><h1 data-i18n="agility">AGILITY</h1></button>
+				<button type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Agility}}{{attr=Attribute}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{agility}+(?{Attribute|Strength,@{strength}|Agility,@{agility}|Willpower,@{willpower}|Logic,@{logic}|Charisma,@{charisma}|Edge,@{edge}|None,0})+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}]]}}" title="Agility Roll"><h1 data-i18n="agility">AGILITY</h1></button>
 				<input type="number" name="attr_agility" value="1" title="@{agility}" />
 			</div>
 			<div class="vertdeco"></div>
 			<div class="sheet-col">
-				<button type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Willpower}}{{attr=Attribute}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{strength}+(?{Attribute|Strength,@{strength}|Agility,@{agility}|Willpower,@{willpower}|Logic,@{logic}|Charisma,@{charisma}|Edge,@{edge}})+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}]]}}" title="Willpower Roll"><h1 data-i18n="willpower">WILLPOWER</h1></button>
+				<button type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Willpower}}{{attr=Attribute}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{willpower}+(?{Attribute|Strength,@{strength}|Agility,@{agility}|Willpower,@{willpower}|Logic,@{logic}|Charisma,@{charisma}|Edge,@{edge}|None,0})+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}]]}}" title="Willpower Roll"><h1 data-i18n="willpower">WILLPOWER</h1></button>
 				<input type="number" name="attr_willpower" value="1" title="@{willpower}" />
 			</div>
 			<div class="vertdeco"></div>
 			<div class="sheet-col">
-				<button type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Logic}}{{attr=Attribute}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{strength}+(?{Attribute|Strength,@{strength}|Agility,@{agility}|Willpower,@{willpower}|Logic,@{logic}|Charisma,@{charisma}|Edge,@{edge}})+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}]]}}" title="Logic Roll"><h1 data-i18n="logic">LOGIC</h1></button>
+				<button type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Logic}}{{attr=Attribute}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{logic}+(?{Attribute|Strength,@{strength}|Agility,@{agility}|Willpower,@{willpower}|Logic,@{logic}|Charisma,@{charisma}|Edge,@{edge}|None,0})+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}]]}}" title="Logic Roll"><h1 data-i18n="logic">LOGIC</h1></button>
 				<input type="number" name="attr_logic" value="1" title="@{logic}" />
 			</div>
 			<div class="vertdeco"></div>
 			<div class="sheet-col">
-				<button type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Charisma}}{{attr=Attribute}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{strength}+(?{Attribute|Strength,@{strength}|Agility,@{agility}|Willpower,@{willpower}|Logic,@{logic}|Charisma,@{charisma}|Edge,@{edge}})+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}]]}}" title="Charisma Roll"><h1 data-i18n="charisma">CHARISMA</h1></button>
+				<button type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Charisma}}{{attr=Attribute}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{charisma}+(?{Attribute|Strength,@{strength}|Agility,@{agility}|Willpower,@{willpower}|Logic,@{logic}|Charisma,@{charisma}|Edge,@{edge}|None,0})+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}]]}}" title="Charisma Roll"><h1 data-i18n="charisma">CHARISMA</h1></button>
 				<input type="number" name="attr_charisma" value="1" title="@{charisma}" />
 			</div>
 			<div class="vertdeco"></div>
 			<div class="sheet-col">
-				<button type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Edge}}{{attr=Attribute}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{strength}+(?{Attribute|Strength,@{strength}|Agility,@{agility}|Willpower,@{willpower}|Logic,@{logic}|Charisma,@{charisma}|Edge,@{edge}})+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}]]}}" title="Edge Roll"><h1 data-i18n="edge">EDGE</h1></button>
+				<button type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Edge}}{{attr=Attribute}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{edge}+(?{Attribute|Strength,@{strength}|Agility,@{agility}|Willpower,@{willpower}|Logic,@{logic}|Charisma,@{charisma}|Edge,@{edge}|None,0})+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}]]}}" title="Edge Roll"><h1 data-i18n="edge">EDGE</h1></button>
 				<input type="number" name="attr_edge" value="1" title="@{edge}" />
 			</div>
 		</div><!--End Attributes-->
@@ -1323,4 +1323,4 @@ on("change:repeating_skills", function() {
 });
 
 
-</script>
\ No newline at end of file
+</script>