Merge pull request #3147 from Anduh/D6StarWars

D6 Star Wars roll fixes
This commit is contained in:
wing-it
2017-11-14 08:59:12 -05:00
committed by GitHub
+29 -17
View File
@@ -77,7 +77,8 @@
<td class="sheet-tdborder"><div class="sheet-bold"><!---Perc Attribute --->
<button class="sheet-d6-dice" type='roll' class="astext" value='&{template:default} {{name=Perception}} {{Roll=[[(@{perception} -1 +@{WoundLevel} +@{Force_ControlPain_ResistStun} + @{Force_Up} + ?{Dice mods|0})d6cf0cs7 + @{perceptionpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}' >Perception</button>
<div style="float:right;">
<input type="number" name="attr_perception" class="sheet-smallnumber" min="1" value="3"/>D+<input type="number" name="attr_perceptionpip" class="sheet-smallnumber" min="0" max="2" value="0"/>
<input type="number" name="attr_perception" class="sheet-smallnumber" min="1" value="3"/>D
+<input type="number" name="attr_perceptionpip" class="sheet-smallnumber" min="0" max="2" value="0"/>
</div>
</div>
<fieldset class="repeating_perckills"> <!---Perc Skills --->
@@ -92,14 +93,16 @@
<td class="sheet-tdborder"><div class="sheet-bold"><!---Str Attribute --->
<button class="sheet-d6-dice" type='roll' class="astext" value='&{template:default} {{name=Strength}} {{Roll=[[(@{strength} -1 +@{WoundLevel} +@{Force_ControlPain_ResistStun} + @{Force_Up} + ?{Dice mods|0})d6cf0cs7 + @{strengthpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}' >Strength</button>
<div style="float:right;">
<input type="number" name="attr_strength" class="sheet-smallnumber" min="1" value="3"/>D+<input type="number" name="attr_strengthpip" class="sheet-smallnumber" min="0" max="2" value="0"/>
<input type="number" name="attr_strength" class="sheet-smallnumber" min="1" value="3"/>D
+<input type="number" name="attr_strengthpip" class="sheet-smallnumber" min="0" max="2" value="0"/>
</div>
</div>
<fieldset class="repeating_strskills"> <!---Str Skills --->
<button class="sheet-d6-dice" type="roll" value="&{template:default} {{name=@{strskillname}}} {{Roll=[[(@{strskilldice} -1 +@{WoundLevel} +@{Force_ControlPain_ResistStun} + @{Force_Up} + ?{Dice mods|0})d6cf0cs7 + @{strskillpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}"></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="@{strength}"/>D+<input type="number" name="attr_strskillpip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2" value="@{strengthpip}"/>
<input type="number" name="attr_strskilldice" class="sheet-smallnumber sheet-shortnumber" min="1" value="0"/>D
+<input type="number" name="attr_strskillpip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2" value="0"/>
</div>
</fieldset>
</td>
@@ -113,7 +116,8 @@
<button class="sheet-d6-dice" type="roll" value="&{template:default} {{name=@{techskillname}}} {{Roll=[[(@{techskilldice} -1 +@{WoundLevel} +@{Force_ControlPain_ResistStun} + @{Force_Up} + ?{Dice mods|0})d6cf0cs7 + @{techskillpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}"></button>
<input class="sheet-skilltext" type="text" name="attr_techskillname"/>
<div class="sheet-right">
<input type="number" name="attr_techskilldice" class="sheet-smallnumber sheet-shortnumber" min="1" value="@{technical}"/>D+<input type="number" name="attr_techskillpip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2" value="@{technicalpip}"/>
<input type="number" name="attr_techskilldice" class="sheet-smallnumber sheet-shortnumber" min="1"/>D
+<input type="number" name="attr_techskillpip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2"/>
</div>
</fieldset>
</td class="sheet-tdborder">
@@ -122,28 +126,32 @@
<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 +@{WoundLevel} +@{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"/>
<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>
</div>
<fieldset class="repeating_dexskills"> <!---Dex Skills --->
<button class="sheet-d6-dice" type="roll" value="&{template:default} {{name=@{dexskillname}}} {{Roll=[[(@{dexskilldice} -1 +@{WoundLevel} +@{Force_ControlPain_ResistStun} + @{Force_Up} + ?{Dice mods|0})d6cf0cs7 + @{dexskillpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}"></button>
<input class="sheet-skilltext" type="text" name="attr_dexskillname"/>
<div class="sheet-right">
<input type="number" name="attr_dexskilldice" class="sheet-smallnumber sheet-shortnumber" min="1" value="@{dexterity}"/>D+<input type="number" name="attr_dexskillpip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2" value="@{dexteritypip}"/>
<input type="number" name="attr_dexskilldice" class="sheet-smallnumber sheet-shortnumber" min="1"/>D
+<input type="number" name="attr_dexskillpip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2"/>
</div>
</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 +@{WoundLevel} +@{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"/>
<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>
</div>
<fieldset class="repeating_knowskills"> <!---Know Skills --->
<button class="sheet-d6-dice" type="roll" value="&{template:default} {{name=@{knowskillname}}} {{Roll=[[(@{knowskilldice} -1 +@{WoundLevel} +@{Force_ControlPain_ResistStun} + @{Force_Up} + ?{Dice mods|0})d6cf0cs7 + @{knowskillpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}"></button>
<input class="sheet-skilltext" type="text" name="attr_knowskillname"/>
<div class="sheet-right">
<input type="number" name="attr_knowskilldice" class="sheet-smallnumber sheet-shortnumber" min="1" value="@{knowledge}"/>D+<input type="number" name="attr_knowskillpip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2" value="@{knowledgepip}"/>
<input type="number" name="attr_knowskilldice" class="sheet-smallnumber sheet-shortnumber" min="1"/>D
+<input type="number" name="attr_knowskillpip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2"/>
</div>
</fieldset>
</td>
@@ -157,7 +165,8 @@
<button class="sheet-d6-dice" type="roll" value="&{template:default} {{name=@{mechskillname}}} {{Roll=[[(@{mechskilldice} -1 +@{WoundLevel} +@{Force_ControlPain_ResistStun} + @{Force_Up} + ?{Dice mods|0})d6cf0cs7 + @{mechskillpip} + ?{Other Mods(pip)|0} + 1d6!cf1cs6]]}}"></button>
<input class="sheet-skilltext" type="text" name="attr_mechskillname"/>
<div class="sheet-right">
<input type="number" name="attr_mechskilldice" class="sheet-smallnumber sheet-shortnumber" min="1" value="@{mechanicalpip}"/>D+<input type="number" name="attr_mechskillpip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2" value="@{mechanicalpip}"/>
<input type="number" name="attr_mechskilldice" class="sheet-smallnumber sheet-shortnumber" min="1"/>D
+<input type="number" name="attr_mechskillpip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2"/>
</div>
</fieldset>
</td>
@@ -175,6 +184,7 @@
<td style="width:35px">Long</td>
<td style="width:30px">ROF</td>
<td style="width:30px">Ammo</td>
<td style="width:30px">Skill</td>
</tr>
</table>
<fieldset class="repeating_weapons">
@@ -185,8 +195,10 @@
<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"/>
<input class="sheet-skilltext" type="text" style="width:150px" name="attr_skill"/>
<button class="sheet-d6-dice" type="roll" value="&{template:default} {{name=@{weaponname} damage}} {{Roll=[[(@{damagedice}- 1)d6cf0cs7 + @{damagepip} + (1d6!cf1cs6)]]}}">Damage</button>
</fieldset>
<button class="sheet-d6-dice" type="roll" value="&{template:default} {{name=@{weaponname} damage}} {{Roll=[[(@{damagedice}- 1)d6cf0cs7 + @{damagepip} + (1d6!cf1cs6)]]}}">Damage</button>
</div>
<div class="sheet-section"> <!-- id="Armor"-->
<table>
@@ -195,16 +207,16 @@
<td style="width:80px">Physical</td>
<td style="width:80px">Energy</td>
<td style="width:180px">Other</td>
<td style="width:180px">Other</td>
<td style="width:180px">Rolls</td>
</tr>
</table>
<fieldset class="repeating_armors">
<input class="sheet-skilltext" type="text" style="width:200px" name="attr_armorname"/>
<input type="number" name="attr_armorPhDice" class="sheet-smallnumber sheet-shortnumber" min="1" value="1"/>D+<input type="number" name="attr_armorPhPip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2" value="0"/>
<input type="number" name="attr_armorEnDice" class="sheet-smallnumber sheet-shortnumber" min="1" value="1"/>D+<input type="number" name="attr_armorEnPip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2" value="0"/>
<input type="number" name="attr_armorPhDice" class="sheet-smallnumber sheet-shortnumber" min="0" value="1"/>D+<input type="number" name="attr_armorPhPip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2" value="0"/>
<input type="number" name="attr_armorEnDice" class="sheet-smallnumber sheet-shortnumber" min="0" value="1"/>D+<input type="number" name="attr_armorEnPip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2" value="0"/>
<input class="sheet-skilltext" type="text" name="attr_armor_other"/>
<button class="sheet-d6-dice" type="roll" value="&{template:default} {{name=Damage Soak(Physical)}} {{Roll=[[(@{strength} @{armorPhDice} +@{WoundLevel} +@{Force_ControlPain_ResistStun} - 1)d6cf0cs7 @{armorPhPip} + 1d6!cf1cs6]]}}">Soak Physical</button>
<button class="sheet-d6-dice" type="roll" value="&{template:default} {{name=Damage Soak(Energy)}} {{Roll=[[(@{strength} @{armorEnDice} +@{WoundLevel} +@{Force_ControlPain_ResistStun} - 1)d6cf0cs7 @{rmorEnPip} + 1d6!cf1cs6]]}}">Soak Energy</button>
<button class="sheet-d6-dice" type="roll" value="&{template:default} {{name=Damage Soak(Physical)}} {{Roll=[[(@{strength} + @{armorPhDice} +@{WoundLevel} +@{Force_ControlPain_ResistStun} - 1)d6cf0cs7 + @{armorPhPip} + 1d6!cf1cs6]]}}">Soak Physical</button>
<button class="sheet-d6-dice" type="roll" value="&{template:default} {{name=Damage Soak(Energy)}} {{Roll=[[(@{strength} + @{armorEnDice} +@{WoundLevel} +@{Force_ControlPain_ResistStun} - 1)d6cf0cs7 + @{armorEnPip} + 1d6!cf1cs6]]}}">Soak Energy</button>
<button class="sheet-d6-dice" type="roll" value="&{template:default} {{name=Damage Soak(Strength only)}} {{Roll=[[(@{strength} +@{WoundLevel} +@{Force_ControlPain_ResistStun} - 1)d6cf0cs7 + 1d6!cf1cs6]]}}">Soak</button>
</fieldset>
</div>
@@ -217,7 +229,7 @@
<tr><!--Control -->
<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: Control}} {{Roll=[[{(((@{control} -1 +@{WoundLevel} +@{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 + @{controlpip} + ?{Other Mods(pip)|0} + @{Force_Emptiness} + 1d6!cf1cs6}}]]}}' > Control</button>
<button class="sheet-d6-dice" class="sheet-forcebutton" type='roll' class="astext" value='&{template:default} {{name=Force: Control}} {{Roll=[[(@{control} -1 +@{WoundLevel} +@{Force_ControlPain_ResistStun} + @{Force_Up} + ?{Dice mods|0})d6cf0cs7 + @{controlpip} + @{Force_Emptiness}+ ?{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"/>
@@ -269,7 +281,7 @@
<span style="padding-top:8px; padding-bottom:12px;" title="Negates any WoundLevel penalties to rolls if active" >Control Pain/Resist Stun active?</span><!---Negates any wound penalties to rolls if active --->
<select name="attr_Force_ControlPain_ResistStun" class="sheet-smallselect">
<option value="0" selected="selected">No</option>
<option value="-@{WoundLevel}">Yes</option>
<option value="abs(@{WoundLevel})">Yes</option>
</select>
</td></tr>
<tr><td><!---Force Powers active --->