From 6ba42a0c3959c388f662805c427f5c06f736bbb4 Mon Sep 17 00:00:00 2001
From: Andreas J <2890634+Anduh@users.noreply.github.com>
Date: Mon, 11 May 2020 18:19:33 +0300
Subject: [PATCH] Star Wars D6 v2.16: bugfixes (#6444)

---
 D6StarWars/CHANGELOG.md    |   7 ++
 D6StarWars/D6StarWars.css  |   2 +-
 D6StarWars/D6StarWars.html | 148 ++++++++++++++++++-------------------
 D6StarWars/logo.png        | Bin 0 -> 4375 bytes
 4 files changed, 81 insertions(+), 76 deletions(-)
 create mode 100644 D6StarWars/logo.png

diff --git a/D6StarWars/CHANGELOG.md b/D6StarWars/CHANGELOG.md
index d931c8b909..29aa376fb9 100644
--- a/D6StarWars/CHANGELOG.md
+++ b/D6StarWars/CHANGELOG.md
@@ -1,3 +1,10 @@
+### Version 2.16 (2020-05-13):
+
+- add roll button names to attrs/skills
+- fix roll button names for rest
+- remove broken images
+
+
 ### Version 2.15 (2020-01-07):
 
 - Fix the Ship's weapons
diff --git a/D6StarWars/D6StarWars.css b/D6StarWars/D6StarWars.css
index 61b327e9bb..0f30aacb99 100644
--- a/D6StarWars/D6StarWars.css
+++ b/D6StarWars/D6StarWars.css
@@ -9,7 +9,7 @@
 }
 
 .charsheet .sheet-version::after {
-    content: '2.15';
+    content: '2.16';
 }
 
 .charsheet label, h1, h2, h3{
diff --git a/D6StarWars/D6StarWars.html b/D6StarWars/D6StarWars.html
index f0ad39b6af..42951c6209 100644
--- a/D6StarWars/D6StarWars.html
+++ b/D6StarWars/D6StarWars.html
@@ -30,9 +30,7 @@
 <!--  LOGO and dice images -->
 
 	<div style="display:inline-block;position:absolute;left: 150px;padding-bottom:50px"> 
-		<img src="http://rs8.pbsrc.com/albums/a35/VPP3/d62_zpstllyo5ds.png?w=480&h=480&fit=clip" style="max-height: 50px;"/>
 		<img src="http://a.dilcdn.com/bl/wp-content/uploads/sites/6/2012/11/sw_logo_lg_default-small.jpg" style="max-height: 80px;" title="This is where the fun begins."/>
-		<img src="http://rs8.pbsrc.com/albums/a35/VPP3/d61_zps5ef1qprz.png?w=480&h=480&fit=clip" style="max-height: 50px;"/>
 	</div>
 
 <!-- --------------------------------------------------------- SETTINGS MENU --------------------------------------- -->
@@ -151,9 +149,9 @@
 					<label>Force Points <input type="number" name="attr_forcePoints" class="smallshortnumber" min="0" value="1"/></label> <!---On char creation everyone starts with 1 FP --->
 					<label>Dark Side Points <input type="number" name="attr_darkSidePoints" class="smallshortnumber" min="0" value="0"/></label>
 					<label>Character Points <input type="number" name="attr_characterPoints" class="smallshortnumber" min="0" value="0"/></label> <!---On char creation everyone starts with 5 CP --->
-					<button class="d6-dice gmroll-hide" type="roll" name="rollg_customroll" value="/w gm &{template:black} {{name=?{Roll Name}}} {{Roll=[[{(?{Number of dice|0} - 1)d6cf0cs7 + ?{Number of pip|0},1d6@{wilddie}}]]}}"><span class="redtxt">(GM)</span>Custom Roll</button>
-					<button class="d6-dice gmroll-hide" type="roll" name="rollg_extraroll" value="/w gm &{template:black} {{name=Extra Dice}} {{Roll=[[{?{Number of  extra dice|0}d6cf0cs7}]]}}"><span class="redtxt">(GM)</span>Extra Dice</button>
-					<button class="d6-dice gmroll-hide" type="roll" name="rollg_charproll" value="/w gm &{template:black} {{name=Character points roll}} {{Roll=[[?{Number of char points to spend on roll|1|2|3|4|5}d6!cf0cs6]]}}"><span class="redtxt">(GM)</span>Char pt</button>
+					<button class="d6-dice gmroll-hide" type="roll" name="roll_customroll-w" value="/w gm &{template:black} {{name=?{Roll Name}}} {{Roll=[[{(?{Number of dice|0} - 1)d6cf0cs7 + ?{Number of pip|0},1d6@{wilddie}}]]}}"><span class="redtxt">(GM)</span>Custom Roll</button>
+					<button class="d6-dice gmroll-hide" type="roll" name="roll_extraroll-w" value="/w gm &{template:black} {{name=Extra Dice}} {{Roll=[[{?{Number of  extra dice|0}d6cf0cs7}]]}}"><span class="redtxt">(GM)</span>Extra Dice</button>
+					<button class="d6-dice gmroll-hide" type="roll" name="roll_charptroll-w" value="/w gm &{template:black} {{name=Character points roll}} {{Roll=[[?{Number of char points to spend on roll|1|2|3|4|5}d6!cf0cs6]]}}"><span class="redtxt">(GM)</span>Char pt</button>
 				</div>         
 				<div class='col'>
 					<label style="text-decoration:underline;">Wound Level
@@ -173,7 +171,7 @@
 					<button class="d6-dice rollmod-no" type="roll" name="roll_initnomod" value="&{template:black} {{name=Initiative}} {{Roll=[[(@{perception} + @{initiative} -@{WoundMod} + @{Force_Up} -1)d6cf0cs7 + @{perceptionpip} + @{initiativepip} + 1d6@{wilddie} &{tracker}]]}}">Initiative</button>
 					<button class="d6-dice" type="roll" name="roll_customroll" value="&{template:black} {{name=?{Roll Name}}} {{Roll=[[{(?{Number of dice|0} - 1)d6cf0cs7 + ?{Number of pip|0},1d6@{wilddie}}]]}}">Custom Roll(no modifiers)</button>
 					<button class="d6-dice" type="roll" name="roll_extraroll" value="&{template:black} {{name=Extra Dice}} {{Roll=[[{?{Number of  extra dice|0}d6cf0cs7}]]}}">Extra Dice(no wild die)</button>
-					<button class="d6-dice" type="roll" name="roll_charproll" value="&{template:black} {{name=Character points roll}} {{Roll=[[?{Number of char points to spend on roll|1|2|3|4|5}d6!cf0cs6]]}}">Character points roll</button>
+					<button class="d6-dice" type="roll" name="roll_charptroll" value="&{template:black} {{name=Character points roll}} {{Roll=[[?{Number of char points to spend on roll|1|2|3|4|5}d6!cf0cs6]]}}">Character points roll</button>
 				</div>
 			</div>
 		</div>
@@ -200,7 +198,7 @@
 
 					<button class="d6-dice rollmod" type="roll" name="roll_init_n" value="&{template:black} {{name=Initiative}} {{Roll=[[(@{perception} + @{initiative} -@{WoundMod} + @{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{perceptionpip} + @{initiativepip} + ?{Other Mods(pip)|0} + 1d6@{wilddie} &{tracker}]]}}"/>Initiative</button>
 					<button class="d6-dice" type="roll" name="roll_customroll_n" value="&{template:black} {{name=?{Roll Name}}} {{Roll=[[{(?{Number of dice|0} - 1)d6cf0cs7 + ?{Number of pip|0},1d6@{wilddie}}]]}}"/>Custom Roll(no mods)</button>
-					<button class="d6-dice gmroll-hide" type="roll" name="rollg_customroll_n" value="/w gm &{template:black} {{name=?{Roll Name}}} {{Roll=[[{(?{Number of dice|0} - 1)d6cf0cs7 + ?{Number of pip|0},1d6@{wilddie}}]]}}"/><span class="redtxt">(GM)</span>C Roll</button>
+					<button class="d6-dice gmroll-hide" type="roll" name="roll_customroll_n-w" value="/w gm &{template:black} {{name=?{Roll Name}}} {{Roll=[[{(?{Number of dice|0} - 1)d6cf0cs7 + ?{Number of pip|0},1d6@{wilddie}}]]}}"/><span class="redtxt">(GM)</span>C Roll</button>
 				</div>
 				<div class="col">
 					<label>Physical Description & Other Info</label>
@@ -223,21 +221,21 @@
 
 							<div class="tdborder"> 
 										<div class="bold">
-											<button class="d6-dice rollmod" type="roll" value="&{template:blue} {{name=Dexterity}} {{Roll=[[(@{dexterity} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{dexteritypip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}" >Dexterity</button>
-											<button class="d6-dice rollmod gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=Dexterity}} {{Roll=[[(@{dexterity} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{dexteritypip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}" ><span class="redtxt">GM</span></button>
+											<button name="roll_dex" class="d6-dice rollmod" type="roll" value="&{template:blue} {{name=Dexterity}} {{Roll=[[(@{dexterity} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{dexteritypip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}" >Dexterity</button>
+											<button name="roll_dex-w" class="d6-dice rollmod gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=Dexterity}} {{Roll=[[(@{dexterity} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{dexteritypip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}" ><span class="redtxt">GM</span></button>
 
-											<button class="d6-dice rollmod-no" type="roll" value="&{template:blue} {{name=Dexterity}} {{Roll=[[(@{dexterity} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{dexteritypip} + 1d6@{wilddie}]]}}" >Dexterity</button>
-											<button class="d6-dice rollmod-no gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=Dexterity}} {{Roll=[[(@{dexterity} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{dexteritypip} + 1d6@{wilddie}]]}}" ><span class="redtxt">GM</span></button>
+											<button name="roll_dex_n" class="d6-dice rollmod-no" type="roll" value="&{template:blue} {{name=Dexterity}} {{Roll=[[(@{dexterity} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{dexteritypip} + 1d6@{wilddie}]]}}" >Dexterity</button>
+											<button name="roll_dex_n-w" class="d6-dice rollmod-no gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=Dexterity}} {{Roll=[[(@{dexterity} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{dexteritypip} + 1d6@{wilddie}]]}}" ><span class="redtxt">GM</span></button>
 											<div style="float:right;">
 												<input type="number" name="attr_dexterity" class="smallnumber" min="1" value="3"/>D+<input type="number" name="attr_dexteritypip" class="pipnumber" min="0" max="2" value="0"/>
 											</div>
 										</div>
 										<fieldset class="repeating_dexskills"> <!---Dex Skills --->
-											<button class="d6-dice rollmod"  type="roll" value="&{template:blue} {{name=@{dexskillname}}} {{Roll=[[(@{dexskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{dexskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"></button>
-											<button class="d6-dice rollmod gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=@{dexskillname}}} {{Roll=[[(@{dexskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{dexskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+											<button name="roll_dexskill" class="d6-dice rollmod"  type="roll" value="&{template:blue} {{name=@{dexskillname}}} {{Roll=[[(@{dexskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{dexskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"></button>
+											<button name="roll_dexskill-w" class="d6-dice rollmod gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=@{dexskillname}}} {{Roll=[[(@{dexskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{dexskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
 
-											<button class="d6-dice rollmod-no"  type="roll" value="&{template:blue} {{name=@{dexskillname}}} {{Roll=[[(@{dexskilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{dexskillpip} + 1d6@{wilddie}]]}}"></button>
-											<button class="d6-dice rollmod-no gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=@{dexskillname}}} {{Roll=[[(@{dexskilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{dexskillpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+											<button name="roll_dexskill_n" class="d6-dice rollmod-no"  type="roll" value="&{template:blue} {{name=@{dexskillname}}} {{Roll=[[(@{dexskilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{dexskillpip} + 1d6@{wilddie}]]}}"></button>
+											<button name="roll_dexskill_n-w" class="d6-dice rollmod-no gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=@{dexskillname}}} {{Roll=[[(@{dexskilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{dexskillpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
 												<input class="skilltext" type="text" name="attr_dexskillname"/>
 												<div class="right">
 												<input type="number" name="attr_dexskilldice" class="smallnumber shortnumber" min="1" value="3"/>D+<input type="number" name="attr_dexskillpip" class="pipnumber shortnumber" min="0" max="2" value="0"/>
@@ -249,21 +247,21 @@
 
 							<div class="tdborder"> 
 										<div class="bold">
-											<button class="d6-dice rollmod" type="roll" value="&{template:blue} {{name=Knowledge}} {{Roll=[[(@{knowledge} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{knowledgepip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}" >Knowledge</button>
-											<button class="d6-dice rollmod gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=Knowledge}} {{Roll=[[(@{knowledge} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{knowledgepip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+											<button name="knwo"class="d6-dice rollmod" type="roll" value="&{template:blue} {{name=Knowledge}} {{Roll=[[(@{knowledge} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{knowledgepip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}" >Knowledge</button>
+											<button name="know-w"class="d6-dice rollmod gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=Knowledge}} {{Roll=[[(@{knowledge} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{knowledgepip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
 
-											<button class="d6-dice rollmod-no" type="roll" value="&{template:blue} {{name=Knowledge}} {{Roll=[[(@{knowledge} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{knowledgepip} + 1d6@{wilddie}]]}}" >Knowledge</button>
-											<button class="d6-dice rollmod-no gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=Knowledge}} {{Roll=[[(@{knowledge} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{knowledgepip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+											<button name="know_n"class="d6-dice rollmod-no" type="roll" value="&{template:blue} {{name=Knowledge}} {{Roll=[[(@{knowledge} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{knowledgepip} + 1d6@{wilddie}]]}}" >Knowledge</button>
+											<button name="know_n-w"class="d6-dice rollmod-no gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=Knowledge}} {{Roll=[[(@{knowledge} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{knowledgepip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
 											<div style="float:right;">
 												<input type="number" name="attr_knowledge" class="smallnumber" min="1" value="3"/>D+<input type="number" name="attr_knowledgepip" class="pipnumber" min="0" max="2" value="0"/>
 											</div>
 										</div>
 										<fieldset class="repeating_knowskills">  <!---Know Skills --->
-											<button class="d6-dice rollmod"  type="roll" value="&{template:blue} {{name=@{knowskillname}}} {{Roll=[[(@{knowskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{knowskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"></button>
-											<button class="d6-dice rollmod gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=@{knowskillname}}} {{Roll=[[(@{knowskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{knowskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+											<button name="knowskill"class="d6-dice rollmod"  type="roll" value="&{template:blue} {{name=@{knowskillname}}} {{Roll=[[(@{knowskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{knowskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"></button>
+											<button name="knoskill-w"class="d6-dice rollmod gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=@{knowskillname}}} {{Roll=[[(@{knowskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{knowskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
 
-											<button class="d6-dice rollmod-no"  type="roll" value="&{template:blue} {{name=@{knowskillname}}} {{Roll=[[(@{knowskilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{knowskillpip} + 1d6@{wilddie}]]}}"></button>
-											<button class="d6-dice rollmod-no gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=@{knowskillname}}} {{Roll=[[(@{knowskilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{knowskillpip}+ 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+											<button name="knowskill_n"class="d6-dice rollmod-no"  type="roll" value="&{template:blue} {{name=@{knowskillname}}} {{Roll=[[(@{knowskilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{knowskillpip} + 1d6@{wilddie}]]}}"></button>
+											<button name="knowskill_n-w"class="d6-dice rollmod-no gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=@{knowskillname}}} {{Roll=[[(@{knowskilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{knowskillpip}+ 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
 											<input class="skilltext" type="text" name="attr_knowskillname"/>
 											<div class="right">
 												<input type="number" name="attr_knowskilldice" class="smallnumber shortnumber" min="1" value="3"/>D+<input type="number" name="attr_knowskillpip" class="pipnumber shortnumber" min="0" max="2" value="0"/>
@@ -275,21 +273,21 @@
 
 							<div class="tdborder">
 									<div class="bold">
-											<button class="d6-dice rollmod"  type="roll" value="&{template:blue} {{name=Mechanical}} {{Roll=[[(@{mechanical} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{mechanicalpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}">Mechanical</button>
-											<button class="d6-dice rollmod gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=Mechanical}} {{Roll=[[(@{mechanical} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{mechanicalpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}" ><span class="redtxt">GM</span></button>
+											<button name="roll_mech" class="d6-dice rollmod"  type="roll" value="&{template:blue} {{name=Mechanical}} {{Roll=[[(@{mechanical} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{mechanicalpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}">Mechanical</button>
+											<button name="roll_mech-w" class="d6-dice rollmod gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=Mechanical}} {{Roll=[[(@{mechanical} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{mechanicalpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}" ><span class="redtxt">GM</span></button>
 
-											<button class="d6-dice rollmod-no"  type="roll" value="&{template:blue} {{name=Mechanical}} {{Roll=[[(@{mechanical} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{mechanicalpip} + 1d6@{wilddie}]]}}">Mechanical</button>
-											<button class="d6-dice rollmod-no gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=Mechanical}} {{Roll=[[(@{mechanical} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{mechanicalpip} + 1d6@{wilddie}]]}}" ><span class="redtxt">GM</span></button>
+											<button name="roll_mech_n" class="d6-dice rollmod-no"  type="roll" value="&{template:blue} {{name=Mechanical}} {{Roll=[[(@{mechanical} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{mechanicalpip} + 1d6@{wilddie}]]}}">Mechanical</button>
+											<button name="roll_mech_n-w" class="d6-dice rollmod-no gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=Mechanical}} {{Roll=[[(@{mechanical} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{mechanicalpip} + 1d6@{wilddie}]]}}" ><span class="redtxt">GM</span></button>
 											<div style="float:right;">
 												<input type="number" name="attr_mechanical" class="smallnumber" min="1" value="3"/>D+<input type="number" name="attr_mechanicalpip" class="pipnumber" min="0" max="2" value="0"/>
 											</div>
 										</div>
 										<fieldset class="repeating_mechskills">  <!---Mech Skills --->
-											<button class="d6-dice rollmod"  type="roll" value="&{template:blue} {{name=@{mechskillname}}} {{Roll=[[(@{mechskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{mechskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"></button>
-											<button class="d6-dice rollmod gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=@{mechskillname}}} {{Roll=[[(@{mechskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{mechskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+											<button name="roll_mechskill" class="d6-dice rollmod"  type="roll" value="&{template:blue} {{name=@{mechskillname}}} {{Roll=[[(@{mechskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{mechskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"></button>
+											<button name="roll_mechskill-w" class="d6-dice rollmod gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=@{mechskillname}}} {{Roll=[[(@{mechskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{mechskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
 
-											<button class="d6-dice rollmod-no"  type="roll" value="&{template:blue} {{name=@{mechskillname}}} {{Roll=[[(@{mechskilldice} -@{WoundMod} +@{Force_Up}-1)d6cf0cs7 + @{mechskillpip} + 1d6@{wilddie}]]}}"></button>
-											<button class="d6-dice rollmod-no gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=@{mechskillname}}} {{Roll=[[(@{mechskilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{mechskillpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+											<button name="roll_mechskill_n" class="d6-dice rollmod-no"  type="roll" value="&{template:blue} {{name=@{mechskillname}}} {{Roll=[[(@{mechskilldice} -@{WoundMod} +@{Force_Up}-1)d6cf0cs7 + @{mechskillpip} + 1d6@{wilddie}]]}}"></button>
+											<button name="roll_mechskill_n-w" class="d6-dice rollmod-no gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=@{mechskillname}}} {{Roll=[[(@{mechskilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{mechskillpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
 											<input class="skilltext" type="text" name="attr_mechskillname"/>
 											<div class="right">
 												<input type="number" name="attr_mechskilldice" class="smallnumber shortnumber" min="1" value="3"/>D+<input type="number" name="attr_mechskillpip" class="pipnumber shortnumber" min="0" max="2" value="0"/>
@@ -305,21 +303,21 @@
 
 							<div class="tdborder">
 								<div class="bold">
-										<button class="d6-dice rollmod" type="roll" value="&{template:blue} {{name=Perception}} {{Roll=[[(@{perception} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs7 +@{perceptionpip} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}" >Perception</button>
-										<button class="d6-dice rollmod gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=Perception}} {{Roll=[[(@{perception} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs7 +@{perceptionpip} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+										<button name="roll_per" class="d6-dice rollmod" type="roll" value="&{template:blue} {{name=Perception}} {{Roll=[[(@{perception} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs7 +@{perceptionpip} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}" >Perception</button>
+										<button name="roll_per-w" class="d6-dice rollmod gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=Perception}} {{Roll=[[(@{perception} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs7 +@{perceptionpip} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
 
-										<button class="d6-dice rollmod-no" type="roll" value="&{template:blue} {{name=Perception}} {{Roll=[[(@{perception} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 +@{perceptionpip} +1d6@{wilddie}]]}}" >Perception</button>
-										<button class="d6-dice rollmod-no gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=Perception}} {{Roll=[[(@{perception} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 +@{perceptionpip} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+										<button name="roll_per_n" class="d6-dice rollmod-no" type="roll" value="&{template:blue} {{name=Perception}} {{Roll=[[(@{perception} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 +@{perceptionpip} +1d6@{wilddie}]]}}" >Perception</button>
+										<button name="roll_per_n-w" class="d6-dice rollmod-no gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=Perception}} {{Roll=[[(@{perception} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 +@{perceptionpip} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
 										<div style="float:right;">
 											<input type="number" name="attr_perception" class="smallnumber"  min="1" value="3"/>D+<input type="number" name="attr_perceptionpip" class="pipnumber" min="0" max="2" value="0"/>
 										</div>
 								</div>
 									<fieldset class="repeating_perckills"> <!---Perc Skills --->
-										<button class="d6-dice rollmod"  type="roll" value="&{template:blue} {{name=@{perckillname}}} {{Roll=[[(@{perckilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{perckillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"></button>
-										<button class="d6-dice rollmod gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=@{perckillname}}} {{Roll=[[(@{perckilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{perckillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+										<button name="roll_perskill" class="d6-dice rollmod"  type="roll" value="&{template:blue} {{name=@{perckillname}}} {{Roll=[[(@{perckilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{perckillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"></button>
+										<button name="roll_perskill-w" class="d6-dice rollmod gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=@{perckillname}}} {{Roll=[[(@{perckilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{perckillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
 
-										<button class="d6-dice rollmod-no"  type="roll" value="&{template:blue} {{name=@{perckillname}}} {{Roll=[[(@{perckilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{perckillpip} + 1d6@{wilddie}]]}}"></button>
-										<button class="d6-dice rollmod-no gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=@{perckillname}}} {{Roll=[[(@{perckilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{perckillpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+										<button name="roll_perskill_n" class="d6-dice rollmod-no"  type="roll" value="&{template:blue} {{name=@{perckillname}}} {{Roll=[[(@{perckilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{perckillpip} + 1d6@{wilddie}]]}}"></button>
+										<button name="roll_perskill_n-w" class="d6-dice rollmod-no gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=@{perckillname}}} {{Roll=[[(@{perckilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{perckillpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
 											<input class="skilltext" type="text" name="attr_perckillname"/> <!-- Misspelled attr name iis to be left as it is, otherwise it wipes char sheets from perseption skills-->
 											<div class="right">
 											<input type="number" name="attr_perckilldice" class="smallnumber shortnumber" min="1" value="3"/>D+<input type="number" name="attr_perckillpip" class="pipnumber shortnumber" min="0" max="2" value="0"/>
@@ -331,21 +329,21 @@
 
 							<div class="tdborder">
 								<div class="bold">
-										<button class="d6-dice rollmod" type="roll" value="&{template:blue} {{name=Strength}} {{Roll=[[(@{strength} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{strengthpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}" >Strength</button>
-										<button class="d6-dice rollmod gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=Strength}} {{Roll=[[(@{strength} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{strengthpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+										<button name="roll_str" class="d6-dice rollmod" type="roll" value="&{template:blue} {{name=Strength}} {{Roll=[[(@{strength} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{strengthpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}" >Strength</button>
+										<button name="roll_str-w" class="d6-dice rollmod gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=Strength}} {{Roll=[[(@{strength} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{strengthpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
 
-										<button class="d6-dice rollmod-no" type="roll" value="&{template:blue} {{name=Strength}} {{Roll=[[(@{strength} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{strengthpip} + 1d6@{wilddie}]]}}" >Strength</button>
-										<button class="d6-dice rollmod-no gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=Strength}} {{Roll=[[(@{strength} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{strengthpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+										<button name="roll_str_n" class="d6-dice rollmod-no" type="roll" value="&{template:blue} {{name=Strength}} {{Roll=[[(@{strength} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{strengthpip} + 1d6@{wilddie}]]}}" >Strength</button>
+										<button name="roll_str_n-w" class="d6-dice rollmod-no gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=Strength}} {{Roll=[[(@{strength} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{strengthpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
 										<div style="float:right;">
 											<input type="number" name="attr_strength" class="smallnumber" min="1" value="3"/>D+<input type="number" name="attr_strengthpip" class="pipnumber" min="0" max="2" value="0"/>
 										</div>
 									</div>
 									<fieldset class="repeating_strskills"> <!---Str Skills --->
-										<button class="d6-dice rollmod" type="roll" value="&{template:blue} {{name=@{strskillname}}} {{Roll=[[(@{strskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{strskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"></button>
-										<button class="d6-dice rollmod gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=@{strskillname}}} {{Roll=[[(@{strskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{strskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+										<button name="roll_strskill" class="d6-dice rollmod" type="roll" value="&{template:blue} {{name=@{strskillname}}} {{Roll=[[(@{strskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{strskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"></button>
+										<button name="roll_strskill-w" class="d6-dice rollmod gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=@{strskillname}}} {{Roll=[[(@{strskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{strskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
 
-										<button class="d6-dice rollmod-no" type="roll" value="&{template:blue} {{name=@{strskillname}}} {{Roll=[[(@{strskilldice} -@{WoundMod} +@{Force_Up}-1)d6cf0cs7 + @{strskillpip} + 1d6@{wilddie}]]}}"></button>
-										<button class="d6-dice rollmod-no gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=@{strskillname}}} {{Roll=[[(@{strskilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{strskillpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+										<button name="roll_strskill_n" class="d6-dice rollmod-no" type="roll" value="&{template:blue} {{name=@{strskillname}}} {{Roll=[[(@{strskilldice} -@{WoundMod} +@{Force_Up}-1)d6cf0cs7 + @{strskillpip} + 1d6@{wilddie}]]}}"></button>
+										<button name="roll_strskill_n-w" class="d6-dice rollmod-no gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=@{strskillname}}} {{Roll=[[(@{strskilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{strskillpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
 										  <input class="skilltext" type="text" name="attr_strskillname"/>
 										  <div class="right">
 											<input type="number" name="attr_strskilldice" class="smallnumber shortnumber" min="1" value="3"/>D+<input type="number" name="attr_strskillpip" class="pipnumber shortnumber" min="0" max="2" value="0"/>
@@ -357,21 +355,21 @@
 
 							<div class="tdborder">
 									<div class="bold">
-											<button class="d6-dice rollmod" type="roll" value="&{template:blue} {{name=Technical}} {{Roll=[[(@{technical} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{technicalpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}" >Technical</button>
-											<button class="d6-dice rollmod gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=Technical}} {{Roll=[[(@{technical} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{technicalpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+											<button name="roll_tech" class="d6-dice rollmod" type="roll" value="&{template:blue} {{name=Technical}} {{Roll=[[(@{technical} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{technicalpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}" >Technical</button>
+											<button name="roll_tech-w" class="d6-dice rollmod gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=Technical}} {{Roll=[[(@{technical} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{technicalpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
 
-											<button class="d6-dice rollmod-no" type="roll" value="&{template:blue} {{name=Technical}} {{Roll=[[(@{technical} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{technicalpip} + 1d6@{wilddie}]]}}" >Technical</button>
-											<button class="d6-dice rollmod-no gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=Technical}} {{Roll=[[(@{technical} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{technicalpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+											<button name="roll_tech_n" class="d6-dice rollmod-no" type="roll" value="&{template:blue} {{name=Technical}} {{Roll=[[(@{technical} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{technicalpip} + 1d6@{wilddie}]]}}" >Technical</button>
+											<button name="roll_tech_n-w" class="d6-dice rollmod-no gmroll gmroll-hide" type="roll" value="/w gm &{template:blue} {{name=Technical}} {{Roll=[[(@{technical} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{technicalpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
 											<div style="float:right;">
 												<input type="number" name="attr_technical" class="smallnumber" min="1" value="3"/>D+<input type="number" name="attr_technicalpip" class="pipnumber" min="0" max="2" value="0"/>
 											</div>
 										</div>
 										<fieldset class="repeating_techskills">  <!---Tech Skills --->
-											<button class="d6-dice rollmod"  type="roll" value="&{template:blue} {{name=@{techskillname}}} {{Roll=[[(@{techskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{techskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"></button>
-											<button class="d6-dice rollmod gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=@{techskillname}}} {{Roll=[[(@{techskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{techskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+											<button name="roll_techskill" class="d6-dice rollmod"  type="roll" value="&{template:blue} {{name=@{techskillname}}} {{Roll=[[(@{techskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{techskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"></button>
+											<button name="roll_techskill-w" class="d6-dice rollmod gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=@{techskillname}}} {{Roll=[[(@{techskilldice} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs7 + @{techskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
 
-											<button class="d6-dice rollmod-no"  type="roll" value="&{template:blue} {{name=@{techskillname}}} {{Roll=[[(@{techskilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{techskillpip} + 1d6@{wilddie}]]}}"></button>
-											<button class="d6-dice rollmod-no gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=@{techskillname}}} {{Roll=[[(@{techskilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{techskillpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+											<button name="roll_techskill_n" class="d6-dice rollmod-no"  type="roll" value="&{template:blue} {{name=@{techskillname}}} {{Roll=[[(@{techskilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{techskillpip} + 1d6@{wilddie}]]}}"></button>
+											<button name="roll_techskill_n-w" class="d6-dice rollmod-no gmroll gmroll-hide"  type="roll" value="/w gm &{template:blue} {{name=@{techskillname}}} {{Roll=[[(@{techskilldice} -@{WoundMod} +@{Force_Up} -1)d6cf0cs7 + @{techskillpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
 											  <input class="skilltext" type="text" name="attr_techskillname"/>
 											  <div class="right">
 												<input type="number" name="attr_techskilldice" class="smallnumber shortnumber" min="1" value="3"/>D+<input type="number" name="attr_techskillpip" class="pipnumber shortnumber" min="0" max="2" value="0"/>
@@ -412,11 +410,11 @@
 					<button class="d6-dice rollmod-no" name="roll_attack" type="roll" value="&{template:red} {{name=@{weapon}}} {{Roll=[[(@{weaponskill} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 + @{weaponskillpip} + 1d6@{wilddie}]]}}">Atk</button>
 
 		
-					<button class="d6-dice rollmod gmroll gmroll-hide" name="rollg_attack" type="roll" value="/w gm &{template:red} {{name=@{weapon}}} {{Roll=[[(@{weaponskill} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs0 + @{weaponskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span>Atk</button>
-					<button class="d6-dice rollmod-no gmroll gmroll-hide" name="rollg_attack" type="roll" value="/w gm &{template:red} {{name=@{weapon}}} {{Roll=[[(@{weaponskill} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 + @{weaponskillpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span>Atk</button>
+					<button class="d6-dice rollmod gmroll gmroll-hide" name="roll_attack-w" type="roll" value="/w gm &{template:red} {{name=@{weapon}}} {{Roll=[[(@{weaponskill} -@{WoundMod} +@{Force_Up} + ?{Dice mods|0} -1)d6cf0cs0 + @{weaponskillpip} + ?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span>Atk</button>
+					<button class="d6-dice rollmod-no gmroll gmroll-hide" name="roll_attack-w" type="roll" value="/w gm &{template:red} {{name=@{weapon}}} {{Roll=[[(@{weaponskill} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 + @{weaponskillpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span>Atk</button>
 
 					<button class="d6-dice" name="roll_dmg" type="roll" value="&{template:red} {{name=@{weapon} damage}} {{Roll=[[(@{damagedice}- 1)d6cf0cs7 + @{damagepip} + (1d6@{wilddie})]]}}">Dmg</button>
-					<button class="d6-dice gmroll gmroll-hide" name="rollg_dmg" type="roll" value="/w gm &{template:red} {{name=@{weapon} damage}} {{Roll=[[(@{damagedice}- 1)d6cf0cs7 + @{damagepip} + (1d6@{wilddie})]]}}"><span class="redtxt">GM</span>Dmg</button>								
+					<button class="d6-dice gmroll gmroll-hide" name="roll_dmg-w" type="roll" value="/w gm &{template:red} {{name=@{weapon} damage}} {{Roll=[[(@{damagedice}- 1)d6cf0cs7 + @{damagepip} + (1d6@{wilddie})]]}}"><span class="redtxt">GM</span>Dmg</button>								
 				</fieldset>
 			<table>
 				<tr>
@@ -436,17 +434,17 @@
 					<button class="d6-dice rollmod-no energy" name="roll_dmg_soak_ph" type="roll" value="&{template:red} {{name=Damage Soak(Energy)}} {{Roll=[[(@{strength} +@{armorEnDice} -1)d6cf0cs0 +@{strengthpip} +@{armorEnPip} +1d6@{wilddie}]]}}">e</button>
 					<button class="d6-dice rollmod-no" name="roll_dmg_soak_str" type="roll" value="&{template:red} {{name=Damage Soak(Strength only)}} {{Roll=[[(@{strength} -1)d6cf0cs0 +@{strengthpip} +1d6@{wilddie}]]}}">Str only</button>
 
-					<button class="d6-dice rollmod-no gmroll physical gmroll-hide" name="rollg_dmg_soak_en" type="roll" value="/w gm &{template:red} {{name=Damage Soak(Physical)}} {{Roll=[[(@{strength} +@{armorPhDice} -1)d6cf0cs0 +@{strengthpip} + @{armorPhPip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span>t</button>
-					<button class="d6-dice rollmod-no gmroll energy gmroll-hide" name="rollg_dmg_soak_ph" type="roll" value="/w gm &{template:red} {{name=Damage Soak(Energy)}} {{Roll=[[(@{strength} +@{armorEnDice} -1)d6cf0cs0 +@{strengthpip} + @{armorEnPip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span>e</button>
-					<button class="d6-dice rollmod-no gmroll gmroll-hide" name="rollg_dmg_soak_str" type="roll" value="/w gm &{template:red} {{name=Damage Soak(Strength only)}} {{Roll=[[(@{strength} -1)d6cf0cs0 +@{strengthpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span>S</button>
+					<button class="d6-dice rollmod-no gmroll physical gmroll-hide" name="roll_dmg_soak_en-w" type="roll" value="/w gm &{template:red} {{name=Damage Soak(Physical)}} {{Roll=[[(@{strength} +@{armorPhDice} -1)d6cf0cs0 +@{strengthpip} + @{armorPhPip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span>t</button>
+					<button class="d6-dice rollmod-no gmroll energy gmroll-hide" name="roll_dmg_soak_ph-w" type="roll" value="/w gm &{template:red} {{name=Damage Soak(Energy)}} {{Roll=[[(@{strength} +@{armorEnDice} -1)d6cf0cs0 +@{strengthpip} + @{armorEnPip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span>e</button>
+					<button class="d6-dice rollmod-no gmroll gmroll-hide" name="roll_dmg_soak_str-w" type="roll" value="/w gm &{template:red} {{name=Damage Soak(Strength only)}} {{Roll=[[(@{strength} -1)d6cf0cs0 +@{strengthpip} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span>S</button>
 
 					<button class="d6-dice rollmod physical" name="roll_dmg_soak_en" type="roll" value="&{template:red} {{name=Damage Soak(Physical)}} {{Roll=[[(@{strength} +@{armorPhDice} +?{Dice mods|0} -1)d6cf0cs0 +@{strengthpip} +@{armorPhPip} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}">t</button>
 					<button class="d6-dice rollmod energy" name="roll_dmg_soak_ph" type="roll" value="&{template:red} {{name=Damage Soak(Energy)}} {{Roll=[[(@{strength} +@{armorEnDice} +?{Dice mods|0} -1)d6cf0cs0 +@{strengthpip} +@{armorEnPip} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}">e</button>
 					<button class="d6-dice rollmod" name="roll_dmg_soak_str" type="roll" value="&{template:red} {{name=Damage Soak(Strength only)}} {{Roll=[[(@{strength} +?{Dice mods|0} -1)d6cf0cs0 +@{strengthpip} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}">Str only</button>
 
-					<button class="d6-dice rollmod-no gmroll physical gmroll-hide" name="rollg_dmg_soak_en" type="roll" value="/w gm &{template:red} {{name=Damage Soak(Physical)}} {{Roll=[[(@{strength} +@{armorPhDice} +?{Dice mods|0} -1)d6cf0cs0 +@{strengthpip} +@{armorPhPip} +?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span>t</button>
-					<button class="d6-dice rollmod-no gmroll energy gmroll-hide" name="rollg_dmg_soak_ph" type="roll" value="/w gm &{template:red} {{name=Damage Soak(Energy)}} {{Roll=[[(@{strength} +@{armorEnDice} +?{Dice mods|0} -1)d6cf0cs0  +@{strengthpip} +@{armorEnPip} +?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span>e</button>
-					<button class="d6-dice rollmod-no gmroll gmroll-hide" name="rollg_dmg_soak_str" type="roll" value="/w gm &{template:red} {{name=Damage Soak(Strength only)}} {{Roll=[[(@{strength} +?{Dice mods|0} -1)d6cf0cs0 +@{strengthpip} +?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span>S</button>		  
+					<button class="d6-dice rollmod-no gmroll physical gmroll-hide" name="roll_dmg_soak_en-w" type="roll" value="/w gm &{template:red} {{name=Damage Soak(Physical)}} {{Roll=[[(@{strength} +@{armorPhDice} +?{Dice mods|0} -1)d6cf0cs0 +@{strengthpip} +@{armorPhPip} +?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span>t</button>
+					<button class="d6-dice rollmod-no gmroll energy gmroll-hide" name="roll_dmg_soak_ph-w" type="roll" value="/w gm &{template:red} {{name=Damage Soak(Energy)}} {{Roll=[[(@{strength} +@{armorEnDice} +?{Dice mods|0} -1)d6cf0cs0  +@{strengthpip} +@{armorEnPip} +?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span>e</button>
+					<button class="d6-dice rollmod-no gmroll gmroll-hide" name="roll_dmg_soak_str-w" type="roll" value="/w gm &{template:red} {{name=Damage Soak(Strength only)}} {{Roll=[[(@{strength} +?{Dice mods|0} -1)d6cf0cs0 +@{strengthpip} +?{Other Mods(pip)|0} + 1d6@{wilddie}]]}}"><span class="redtxt">GM</span>S</button>		  
 				</fieldset>
 		</div>
 
@@ -464,18 +462,18 @@
 									<button class="d6-dice rollmod gmroll gmroll-hide" name="rollg_force_control" type='roll' value='/w gm &{template:default} {{name=Force:Control}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}'><span class="redtxt">GM</span></button>
 
 									<button class="d6-dice rollmod-no forcebutton" name="roll_force_control" type='roll' value='&{template:default} {{name=Force:Control}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod}  +1d6@{wilddie}]]}}'>Control</button>
-									<button class="d6-dice rollmod-no gmroll gmroll-hide" name="rollg_force_control" type='roll' value='/w gm &{template:default} {{name=Force:Control}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}'><span class="redtxt">GM</span></button>
+									<button class="d6-dice rollmod-no gmroll gmroll-hide" name="roll_force_control-w" type='roll' value='/w gm &{template:default} {{name=Force:Control}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}'><span class="redtxt">GM</span></button>
 									<div class="bold" style="float:right;">
 										<input type="number" name="attr_control" class="smallnumber"  min="0" value="0"/>D+<input type="number" name="attr_controlpip" class="pipnumber" min="0" max="2" value="0"/>
 									</div>
 								</div>
 								<fieldset class="repeating_controlpowers">  <!---Control Powers --->      
 									<button class="d6-dice rollmod" name="roll_force_control_p" type="roll" value="&{template:default} {{name=@{controlpowername} (Control)}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}"></button>
-									<button class="d6-dice rollmod gmroll gmroll-hide" name="rollg_force_control_p" type="roll" value="/w gm &{template:default} {{name=@{controlpowername} (Control)}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+									<button class="d6-dice rollmod gmroll gmroll-hide" name="roll_force_control_p-w" type="roll" value="/w gm &{template:default} {{name=@{controlpowername} (Control)}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
 									<input class="skilltext" type="text" name="attr_controlpowername"/> 
 
 									<button class="d6-dice rollmod-no" name="roll_force_control_p" type="roll" value="&{template:default} {{name=@{controlpowername} (Control)}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod} +1d6@{wilddie}]]}}"></button>
-									<button class="d6-dice rollmod-no gmroll gmroll-hide" name="rollg_force_control_p" type="roll" value="/w gm &{template:default} {{name=@{controlpowername} (Control)}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+									<button class="d6-dice rollmod-no gmroll gmroll-hide" name="roll_force_control_p-w" type="roll" value="/w gm &{template:default} {{name=@{controlpowername} (Control)}} {{Roll=[[(@{control} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{controlpip} +@{Force_EmptinessMod} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
 									<input class="skilltext" type="text" name="attr_controlpowername"/> 
 								</fieldset>								
 							</td>
@@ -484,20 +482,20 @@
 							<td class="tdborder">
 								<div class="bold">
 									<button class="d6-dice rollmod forcebutton" name="roll_force_sense" type='roll' value='&{template:default} {{name=Force:Sense}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}'>Sense</button>
-									<button class="d6-dice rollmod gmroll gmroll-hide" name="rollg_force_sense" type='roll' value='/w gm &{template:default} {{name=Force:Sense}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}'><span class="redtxt">GM</span></button>
+									<button class="d6-dice rollmod gmroll gmroll-hide" name="roll_force_sense-w" type='roll' value='/w gm &{template:default} {{name=Force:Sense}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}'><span class="redtxt">GM</span></button>
 
 									<button class="d6-dice rollmod-no forcebutton" name="roll_force_sense" type='roll' value='&{template:default} {{name=Force:Sense}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod} +1d6@{wilddie}]]}}'>Sense</button>
-									<button class="d6-dice rollmod-no gmroll gmroll-hide" name="rollg_force_sense" type='roll' value='/w gm &{template:default} {{name=Force:Sense}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod} +1d6@{wilddie}]]}}'><span class="redtxt">GM</span></button>
+									<button class="d6-dice rollmod-no gmroll gmroll-hide" name="roll_force_sense-w" type='roll' value='/w gm &{template:default} {{name=Force:Sense}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod} +1d6@{wilddie}]]}}'><span class="redtxt">GM</span></button>
 									<div class="bold" style="float:right;">
 										<input type="number" name="attr_sense" class="smallnumber" style="margin-left=100px;"  min="0" value="0"/>D+<input type="number" name="attr_sensepip" class="pipnumber" min="0" max="2" value="0"/>
 									</div>
 								</div>
 								<fieldset class="repeating_sensepowers">  <!---Sense Powers --->      
 									<button class="d6-dice rollmod" name="roll_force_sense_p" type="roll" value="&{template:default} {{name=@{sensepowername} (Sense)}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}"></button>
-									<button class="d6-dice rollmod gmroll gmroll-hide" name="rollg_force_sense_p"  type="roll" value="/w gm &{template:default} {{name=@{sensepowername} (Sense)}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+									<button class="d6-dice rollmod gmroll gmroll-hide" name="roll_force_sense_p-w"  type="roll" value="/w gm &{template:default} {{name=@{sensepowername} (Sense)}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
 
 									<button class="d6-dice rollmod-no" name="roll_force_sense_p" type="roll" value="&{template:default} {{name=@{sensepowername} (Sense)}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod} +1d6@{wilddie}]]}}"></button>
-									<button class="d6-dice rollmod-no gmroll gmroll-hide" name="rollg_force_sense_p"  type="roll" value="/w gm &{template:default} {{name=@{sensepowername} (Sense)}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+									<button class="d6-dice rollmod-no gmroll gmroll-hide" name="roll_force_sense_p-w"  type="roll" value="/w gm &{template:default} {{name=@{sensepowername} (Sense)}} {{Roll=[[(@{sense} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{sensepip} +@{Force_EmptinessMod} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
 									<input class="skilltext" type="text" name="attr_sensepowername"/> 
 								</fieldset>
 							</td>
@@ -506,20 +504,20 @@
 							<td class="tdborder">
 								<div class="bold">
 									<button class="d6-dice rollmod forcebutton" name="roll_force_alter" type='roll' value='&{template:default} {{name=Force:Alter}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{alterpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}'>Alter</button>
-									<button class="d6-dice rollmod gmroll gmroll-hide" name="rollg_force_alter"  type='roll' value='/w gm &{template:default} {{name=Force:Alter}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{alterpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}'><span class="redtxt">GM</span></button>
+									<button class="d6-dice rollmod gmroll gmroll-hide" name="roll_force_alter-w"  type='roll' value='/w gm &{template:default} {{name=Force:Alter}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{alterpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}'><span class="redtxt">GM</span></button>
 
 									<button class="d6-dice rollmod-no forcebutton" name="roll_force_alter" type='roll' value='&{template:default} {{name=Force:Alter}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up}-1)d6cf0cs0 +@{alterpip} +@{Force_EmptinessMod} +1d6@{wilddie}]]}}'>Alter</button>
-									<button class="d6-dice rollmod-no  gmroll gmroll-hide" name="rollg_force_alter"  type='roll' value='/w gm &{template:default} {{name=Force:Alter}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up}-1)d6cf0cs0 +@{alterpip} +@{Force_EmptinessMod} +1d6@{wilddie}]]}}'><span class="redtxt">GM</span></button>
+									<button class="d6-dice rollmod-no  gmroll gmroll-hide" name="roll_force_alter-w"  type='roll' value='/w gm &{template:default} {{name=Force:Alter}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up}-1)d6cf0cs0 +@{alterpip} +@{Force_EmptinessMod} +1d6@{wilddie}]]}}'><span class="redtxt">GM</span></button>
 									<div class="bold" style="float:right;">
 										<input type="number" name="attr_alter" class="smallnumber" min="0" value="0"/>D+<input type="number" name="attr_alterpip" class="pipnumber" min="0" max="2" value="0"/>
 									</div>
 								</div>
 								<fieldset class="repeating_alterpowers">  <!---Alter Powers --->      
 									<button class="d6-dice rollmod"  type="roll" name="roll_force_alter_p" value="&{template:default} {{name=@{alterpowername} (Alter)}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 + @{alterpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}"></button>
-									<button class="d6-dice rollmod gmroll gmroll-hide" name="rollg_force_alter_p"  type="roll" value="/w gm &{template:default} {{name=@{alterpowername} (Alter)}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{alterpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+									<button class="d6-dice rollmod gmroll gmroll-hide" name="roll_force_alter_p-w"  type="roll" value="/w gm &{template:default} {{name=@{alterpowername} (Alter)}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up} +?{Dice mods|0} -1)d6cf0cs0 +@{alterpip} +@{Force_EmptinessMod} +?{Other Mods(pip)|0} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
 
 									<button class="d6-dice rollmod-no"  type="roll" name="roll_force_alter_p" value="&{template:default} {{name=@{alterpowername} (Alter)}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 + @{alterpip} +@{Force_EmptinessMod} +1d6@{wilddie}]]}}"></button>
-									<button class="d6-dice rollmod-no gmroll gmroll-hide" name="rollg_force_alter_p"  type="roll" value="/w gm &{template:default} {{name=@{alterpowername} (Alter)}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{alterpip} +@{Force_EmptinessMod} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
+									<button class="d6-dice rollmod-no gmroll gmroll-hide" name="roll_force_alter_p-w"  type="roll" value="/w gm &{template:default} {{name=@{alterpowername} (Alter)}} {{Roll=[[(@{alter} -@{WoundMod} +@{Force_Up} -1)d6cf0cs0 +@{alterpip} +@{Force_EmptinessMod} +1d6@{wilddie}]]}}"><span class="redtxt">GM</span></button>
 									<input class="skilltext" type="text" name="attr_alterpowername"/> 
 								</fieldset>
 							</td>
diff --git a/D6StarWars/logo.png b/D6StarWars/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..0590dca21f33066e1f8345e5ca10382efca5addb
GIT binary patch
literal 4375
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

literal 0
HcmV?d00001