From 39c5ad1d9bb0186ec79a5fb39b769fcbd2f2a277 Mon Sep 17 00:00:00 2001
From: Anduh <andreas.johansson@aalto.fi>
Date: Mon, 30 Oct 2017 12:05:27 +0200
Subject: [PATCH] Force skills use now template with options for rolls,
 accounting for wounds

---
 D6StarWars/D6StarWars.html | 35 +++++++++++++++++++++++++++++------
 D6StarWars/log.txt         |  1 -
 2 files changed, 29 insertions(+), 7 deletions(-)
 delete mode 100644 D6StarWars/log.txt

diff --git a/D6StarWars/D6StarWars.html b/D6StarWars/D6StarWars.html
index c0dd441817..c6f624085a 100644
--- a/D6StarWars/D6StarWars.html
+++ b/D6StarWars/D6StarWars.html
@@ -184,7 +184,7 @@
 				<td style="width:30px">Skill</td>
 			</tr>
 		</table>	
-		<fieldset class="repeating_weapons">
+		
             <input class="sheet-skilltext" type="text"  style="width:200px" name="attr_weapon"/>
 			<input type="number" name="attr_damagedice" class="sheet-smallnumber sheet-shortnumber" min="1" value="1"/>D+<input type="number" name="attr_damagepip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2" value="0"/>
 			<input class="sheet-smallnumber sheet-shortnumber" type="number" name="attr_shortrange"/>
@@ -193,10 +193,33 @@
 			<input class="sheet-smallnumber sheet-shortnumber" type="number" name="attr_ROF"/>
 			<input class="sheet-smallnumber sheet-shortnumber" type="number" name="attr_Ammo"/>
 			
-						<button  type="roll" value="/r (@{damagedice} - 1)d6 + 1d6! + @{damagepip}">Damage</button>
-						<button  type="roll" value="/r (@{damagedice} - 1)d6 + 1d6! + @{damagepip}">Damage</button>
+						<button  type="roll" value="/r (@{damagedice} - 1)d6 + 1d6! + @{damagepip}">Damage</button>		  
+    </div>
+
+	<div name"Armor" class="sheet-section">
+		<table>
+			<tr>
+				<td style="width:200px"><label>Armor</label></td>
+				<td style="width:80px">Physical</td>
+				<td style="width:40px">Phy pip</td>
+				<td style="width:80px">Energy</td>
+				<td style="width:40px">En pip</td>
+				<td style="width:200px">Other</td>
+			</tr>
+		</table>	
+		<fieldset class="repeating_weapons">
+            <input class="sheet-skilltext" type="text"  style="width:200px" name="attr_armor1"/>
+			<input type="number" name="attr_armor1PhDice" class="sheet-smallnumber sheet-shortnumber" min="1" value="1"/>D+<input type="number" name="attr_armor1PhPip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2" value="0"/>
+			<input type="number" name="attr_armor1EnDice" class="sheet-smallnumber sheet-shortnumber" min="1" value="1"/>D+<input type="number" name="attr_armor1EnPip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2" value="0"/>
+			<input class="sheet-smallnumber sheet-shortnumber" type="number" name="attr_longrange"/>
+			<input class="sheet-smallnumber sheet-shortnumber" type="number" name="attr_ROF"/>
+			<input class="sheet-smallnumber sheet-shortnumber" type="number" name="attr_Ammo"/>
+			
+						<button  type="roll" value="/r (@{damagedice} - 1)d6 + 1d6! + @{damagepip}">Soak Physical</button>
+						<button  type="roll" value="/r (@{damagedice} - 1)d6 + 1d6! + @{damagepip}">Soak Energy</button>
         </fieldset>		  
     </div>
+	
     <div name="theforce" class="sheet-section" style="text-align: Left; position:relative;">
         <div class='sheet-2colrow'>
             <div class='sheet-col'>
@@ -205,7 +228,7 @@
                     <tr>
                         <td style="width:260px;">
                             <div class="sheet-bold">
-                                <button class="sheet-forcebutton" type='roll' class="astext" value='/roll (@{control} - 1)d6 + 1d6! + @{controlpip}' > Control</button>
+                                <button class="sheet-forcebutton" type='roll' class="astext" value='&{template:default} {{name=Force: Control}} {{Roll=[[{(((@{control} -1 +@{WoundStatus} + ?{Multiple action penalty|No, ?{Force Concentration&#124;No&#44; 0 &#124; Yes&#44; 4 &#125;|-1|-2|-3|-4})*?{Force point|No,1)|Yes,2)+1})d6cf0cs7 + @{controlpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6}}]]}}' > Control</button>
                                 <div style="float:right;">
                                     <input type="number" name="attr_control" class="sheet-smallnumber"  min="0" value="0"/>D 
                                     +<input type="number" name="attr_controlpip" class="sheet-smallnumber" min="0" max="2" value="0"/>
@@ -216,7 +239,7 @@
                     <tr>
                         <td style="width:260px;">
                             <div class="sheet-bold">
-                                <button class="sheet-forcebutton" type='roll' class="astext" value='/roll (@{sense} - 1)d6 + 1d6! + @{sensepip}' > Sense</button>
+                                <button class="sheet-forcebutton" type='roll' class="astext" value='&{template:default} {{name=Force: Sense}} {{Roll=[[{(((@{sense} -1 +@{WoundStatus} + ?{Multiple action penalty|No, ?{Force Concentration&#124;No&#44; 0 &#124; Yes&#44; 4 &#125;|-1|-2|-3|-4})*?{Force point|No,1)|Yes,2)+1})d6cf0cs7 + @{sensepip} + ?{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"/>  
@@ -227,7 +250,7 @@
                     <tr>    
                         <td style="width:260px;">
                             <div class="sheet-bold">
-                                <button class="sheet-forcebutton" type='roll' class="astext" value='/roll (@{alter} - 1)d6 + 1d6! + @{alterpip}' > Alter</button>
+                                <button class="sheet-forcebutton" type='roll' class="astext" value='&{template:default} {{name=Force: Alter}} {{Roll=[[{(((@{alter} -1 +@{WoundStatus} + ?{Multiple action penalty|No, ?{Force Concentration&#124;No&#44; 0 &#124; Yes&#44; 4 &#125;|-1|-2|-3|-4})*?{Force point|No,1)|Yes,2)+1})d6cf0cs7 + @{alterpip} + ?{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"/>    
diff --git a/D6StarWars/log.txt b/D6StarWars/log.txt
deleted file mode 100644
index d47fcd140a..0000000000
--- a/D6StarWars/log.txt
+++ /dev/null
@@ -1 +0,0 @@
- bla bla