From 1fa96136b02c29dcf6eea6dee18cda495bbb97f4 Mon Sep 17 00:00:00 2001
From: Anduh <andreas.johansson@aalto.fi>
Date: Sun, 5 Nov 2017 22:49:27 +0200
Subject: [PATCH] fixed attr& force skill rolls

---
 D6StarWars/D6StarWars.html | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/D6StarWars/D6StarWars.html b/D6StarWars/D6StarWars.html
index e468127065..4eacb88f29 100644
--- a/D6StarWars/D6StarWars.html
+++ b/D6StarWars/D6StarWars.html
@@ -103,9 +103,19 @@
 							<input type="number" name="attr_strskilldice" class="sheet-smallnumber sheet-shortnumber" min="1" value="@{strength}"/>D+<input type="number" name="attr_strskillpip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2" value="@{strengthpip}"/> 
                           </div>
                     </fieldset>
+<!--
+					<fieldset class="repeating_strskills">
+                        <button  type="roll" value="/r (@{strskilldice} - 1)d6 + 1d6! + @{strskillpip}"></button>
+                          <input class="sheet-skilltext" type="text" name="attr_strskillname"/> 
+                          <div class="sheet-right">
+                          <input type="number" name="attr_strskilldice" class="sheet-smallnumber sheet-shortnumber" min="1" value="3"/>D 
+                          +<input type="number" name="attr_strskillpip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2" value="0"/> 
+                          </div>
+                    </fieldset>				
+-->					
                 </td> 
                 <td class="sheet-tdborder"><div class="sheet-bold"><!---Tech Attribute --->
-                        <button class="sheet-d6-dice" type='roll' class="astext" value='&{template:default} {{name=Technical}} {{Roll=[[{(((@{technical} -1 +@{WoundStatus} +@{Force_ControlPain_ResistStun} + @{Force_Up} + ?{Multiple action penalty|No, ?{Multiple action penalty|No, 0|-1|-2|-3|-4})*?{Force point|No,1)|Yes,2)+1})d6cf0cs7 + @{technicalpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6}}]]}}' >Technical</button>
+                        <button class="sheet-d6-dice" type='roll' class="astext" value='&{template:default} {{name=Technical}} {{Roll=[[(@{technical} -1 +@{WoundStatus} +@{Force_ControlPain_ResistStun} + @{Force_Up} + ?{Dice mods|0})d6cf0cs7 + @{technicalpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}' >Technical</button>
                         <div style="float:right;">
                             <input type="number" name="attr_technical" class="sheet-smallnumber" min="1" value="3"/>D+<input type="number" name="attr_technicalpip" class="sheet-smallnumber" min="0" max="2" value="0"/>    
                         </div>
@@ -121,7 +131,7 @@
             </tr>
             <tr>
                 <td class="sheet-tdborder"><div class="sheet-bold"> <!---Dex Attribute --->
-                        <button class="sheet-d6-dice" type='roll'value='&{template:default} {{name=Dexterity}} {{Roll=[[{(((@{dexterity} -1 +@{WoundStatus} +@{Force_ControlPain_ResistStun} + @{Force_Up} + ?{Multiple action penalty|No, ?{Multiple action penalty|No, 0|-1|-2|-3|-4})*?{Force point|No,1)|Yes,2)+1})d6cf0cs7 + @{dexteritypip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6}}]]}}' >Dexterity</button>
+                        <button class="sheet-d6-dice" type='roll'value='&{template:default} {{name=Dexterity}} {{Roll=[[(@{dexterity} -1 +@{WoundStatus} +@{Force_ControlPain_ResistStun} + @{Force_Up} + ?{Dice mods|0})d6cf0cs7 + @{dexteritypip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}' >Dexterity</button>
                         <div style="float:right;">
                             <input type="number" name="attr_dexterity" class="sheet-smallnumber" min="1" value="3"/>D+<input type="number" name="attr_dexteritypip" class="sheet-smallnumber" min="0" max="2" value="0"/>
                         </div>
@@ -135,7 +145,7 @@
                     </fieldset>
                 </td>
                 <td class="sheet-tdborder"><div class="sheet-bold"> <!---Know Attribute ---> 
-                        <button class="sheet-d6-dice" type='roll' value='&{template:default} {{name=Knowledge}} {{Roll=[[{(((@{knowledge} -1 +@{WoundStatus} +@{Force_ControlPain_ResistStun} + @{Force_Up} + ?{Multiple action penalty|No, ?{Multiple action penalty|No, 0|-1|-2|-3|-4})*?{Force point|No,1)|Yes,2)+1})d6cf0cs7 + @{knowledgepip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6}}]]}}' >Knowledge</button>
+                        <button class="sheet-d6-dice" type='roll' value='&{template:default} {{name=Knowledge}} {{Roll=[[(@{knowledge} -1 +@{WoundStatus} +@{Force_ControlPain_ResistStun} + @{Force_Up} + ?{Dice mods|0})d6cf0cs7 + @{knowledgepip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}' >Knowledge</button>
                         <div style="float:right;">
                             <input type="number" name="attr_knowledge" class="sheet-smallnumber" min="1" value="3"/>D+<input type="number" name="attr_knowledgepip" class="sheet-smallnumber" min="0" max="2" value="0"/>
                         </div>
@@ -149,7 +159,7 @@
                     </fieldset>
                 </td> 
                 <td class="sheet-tdborder"><div class="sheet-bold"><!---Mech Attribute --->
-                        <button class="sheet-d6-dice"  type='roll' value='&{template:default} {{name=Mechanical}} {{Roll=[[{(((@{mechanical} -1 +@{WoundStatus} +@{Force_ControlPain_ResistStun} + @{Force_Up} + ?{Multiple action penalty|No, ?{Multiple action penalty|No, 0|-1|-2|-3|-4})*?{Force point|No,1)|Yes,2)+1})d6cf0cs7 + @{mechanicalpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6}}]]}}' >Mechanical</button>
+                        <button class="sheet-d6-dice"  type='roll' value='&{template:default} {{name=Mechanical}} {{Roll=[[(@{mechanical} -1 +@{WoundStatus} +@{Force_ControlPain_ResistStun} + @{Force_Up} + ?{Dice mods|0})d6cf0cs7 + @{mechanicalpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}' >Mechanical</button>
                         <div style="float:right;">
                             <input type="number" name="attr_mechanical" class="sheet-smallnumber" min="1" value="3"/>D+<input type="number" name="attr_mechanicalpip" class="sheet-smallnumber" min="0" max="2" value="0"/>
                         </div>
@@ -230,7 +240,7 @@
                     <tr><!-- Sense -->
                         <td style="width:260px;">
                             <div class="sheet-bold">
-                                <button class="sheet-d6-dice" class="sheet-forcebutton" type='roll' class="astext" value='&{template:default} {{name=Force: Sense}} {{Roll=[[{(((@{sense} -1 +@{WoundStatus} +@{Force_ControlPain_ResistStun} + @{Force_Up} + ?{Multiple action penalty|No, ?{Multiple action penalty|No, 0|-1|-2|-3|-4})*?{Force point|No,1)|Yes,2)+1})d6cf0cs7 + @{sensepip} + ?{Other Mods(pip)|0} + @{Force_Emptiness} + 1d6!cf1cs6}}]]}}' > Sense</button>
+                                <button class="sheet-d6-dice" class="sheet-forcebutton" type='roll' class="astext" value='&{template:default} {{name=Force: Sense}} {{Roll=[[(@{sense} -1 +@{WoundStatus} +@{Force_ControlPain_ResistStun} + @{Force_Up} + ?{Dice mods|0})d6cf0cs7 + @{sensepip} + @{Force_Emptiness}+ ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}' > Sense</button>
                                 <div style="float:right;">
                                     <input type="number" name="attr_sense" class="sheet-smallnumber" style="margin-left=100px;"  min="0" value="0"/>D
                                     +<input type="number" name="attr_sensepip" class="sheet-smallnumber" min="0" max="2" value="0"/>  
@@ -241,7 +251,7 @@
                     <tr><!-- Alter -->
                         <td style="width:260px;">
                             <div class="sheet-bold">
-                                <button class="sheet-d6-dice" class="sheet-forcebutton" type='roll' class="astext" value='&{template:default} {{name=Force: Alter}} {{Roll=[[{(((@{alter} -1 +@{WoundStatus} +@{Force_ControlPain_ResistStun} + @{Force_Up} + ?{Multiple action penalty|No, ?{Multiple action penalty|No, 0|-1|-2|-3|-4})*?{Force point|No,1)|Yes,2)+1})d6cf0cs7 + @{alterpip} + ?{Other Mods(pip)|0} + @{Force_Emptiness} + 1d6!cf1cs6}}]]}}' > Alter</button>
+                                <button class="sheet-d6-dice" class="sheet-forcebutton" type='roll' class="astext" value='&{template:default} {{name=Force: Alter}} {{Roll=[[(@{alter} -1 +@{WoundStatus} +@{Force_ControlPain_ResistStun} + @{Force_Up} + ?{Dice mods|0})d6cf0cs7 + @{alterpip} + @{Force_Emptiness}+ ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}' > Alter</button>
                                 <div style="float:right;">
                                     <input type="number" name="attr_alter" class="sheet-smallnumber" min="0" value="0"/>D 
                                     +<input type="number" name="attr_alterpip" class="sheet-smallnumber" min="0" max="2" value="0"/>