Merge branch 'development'

Karlinator · Apr 10, 2018 · b230504 · b230504
2 parents 8e60ac2 + 83e2c23
commit b230504
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/Stars_Without_Number_Revised/ReadMe.md b/Stars_Without_Number_Revised/ReadMe.md
@@ -25,6 +25,11 @@ Report any problems, suggestions, or features by [creating an issue](https://git
 
 ### Changelog
 
+### 1.6.2
+
+* Fixed weapons rolling with Shoot when First Edition skills was selected.
+* Add attribute to Shock damage.
+
 ### 1.6.1
 
 * Fix the sheet default settings to actually work.

diff --git a/Stars_Without_Number_Revised/Stars_Without_Number_Revised.html b/Stars_Without_Number_Revised/Stars_Without_Number_Revised.html
@@ -305,7 +305,7 @@
 <div class="sheet-logo">
 	<img src="http://i.imgur.com/3U3Ibb7.png" alt="Stars Without Number">
 </div>
-<div class="sheet-version">Version 1.6.1</div>
+<div class="sheet-version">Version 1.6.2</div>
 
 <input type="radio" name="attr_tab" class="sheet-tab sheet-tab-character" value="1" title="Character" checked>
 <input type="radio" name="attr_tab" class="sheet-tab sheet-tab-ship" value="2" title="Ship">
@@ -1237,6 +1237,10 @@ <h3>Combat</h3>
 						<option value="@{skill_combat_unarmed}">Combat/Unarmed</option>
 						<option value="@{skill_telekinesis}">Telekinesis</option>
 						<option value="0">None</option>
+						<option hidden value="@{skill_shoot}">Shoot</option>
+						<option hidden value="@{skill_punch}">Punch</option>
+						<option hidden value="@{skill_stab}">Stab</option>
+						<option hidden value="@{skill_telekinesis}">Telekinesis</option>
 					</select>
 					<input type="radio" name="attr_homebrew_skill_list" class="sheet-homebrew-toggle" value="revised" checked>
 					<select class="inputbox sheet-homebrew-hide" name="attr_weapon_skill_bonus" style="width: 80px; height: 25px">
@@ -1245,6 +1249,13 @@ <h3>Combat</h3>
 						<option value="@{skill_stab}">Stab</option>
 						<option value="@{skill_telekinesis}">Telekinesis</option>
 						<option value="0">None</option>
+						<option hidden value="@{skill_combat_energy}">Combat/Energy Weapons</option>
+						<option hidden value="@{skill_combat_gunnery}">Combat/Gunnery</option>
+						<option hidden value="@{skill_combat_primitive}">Combat/Primitive Weapons</option>
+						<option hidden value="@{skill_combat_projectile}">Combat/Projectile Weapons</option>
+						<option hidden value="@{skill_combat_psitech}">Combat/Psitech</option>
+						<option hidden value="@{skill_combat_unarmed}">Combat/Unarmed</option>
+						<option hidden value="@{skill_telekinesis}">Telekinesis</option>
 					</select>
 					<input type="radio" name="attr_homebrew_skill_list" class="sheet-homebrew-toggle" value="neither">
 					<input class="sheet-homebrew-hide" type="number" name="attr_weapon_skill_bonus" style="width: 80px">
@@ -1267,7 +1278,7 @@ <h3>Combat</h3>
 					<input type="checkbox" name="attr_add_skill" value="@{weapon_skill_bonus}" style="width: 80px;">
 					<input type="text" name="attr_weapon_range" style="width: 50px">
 					<input type="number" name="attr_weapon_ammo" style="width: 35px">
-					<button type="roll" name="roll_weapon_to_hit" value="/me &{template:attack} {{characterName=@{name}}} {{name=@{weapon_name}}} {{rollValue=[[1d20 + @{attack_bonus}[AB] + @{weapon_attack}[Weapon AB] + [[{{@{weapon_skill_bonus},-1}>0}*(@{weapon_skill_bonus}+2) - 2]][Skill] + @{attribute_mod}[Attribute] + @{weapon_burst}[Burst] + ?{Other Modifier|0}[Modifier]]]}} {{damage=[[@{weapon_damage} + @{attribute_mod}[Attribute] + @{add_skill}[Skill] + @{weapon_burst}[Burst]]]}} {{shock=[[@{weapon_shock} + @{add_skill}[Skill]]]}} {{shock_base=[[@{weapon_shock}]]}} {{shock_ac=[[@{weapon_shock_ac}]]}}"></button>
+					<button type="roll" name="roll_weapon_to_hit" value="/me &{template:attack} {{characterName=@{name}}} {{name=@{weapon_name}}} {{rollValue=[[1d20 + @{attack_bonus}[AB] + @{weapon_attack}[Weapon AB] + [[{{@{weapon_skill_bonus},-1}>0}*(@{weapon_skill_bonus}+2) - 2]][Skill] + @{attribute_mod}[Attribute] + @{weapon_burst}[Burst] + ?{Other Modifier|0}[Modifier]]]}} {{damage=[[@{weapon_damage} + @{attribute_mod}[Attribute] + @{add_skill}[Skill] + @{weapon_burst}[Burst]]]}} {{shock=[[@{weapon_shock} + @{attribute_mod}[Attribute] + @{add_skill}[Skill]]]}} {{shock_base=[[@{weapon_shock}]]}} {{shock_ac=[[@{weapon_shock_ac}]]}}"></button>
 				</fieldset>
 			</div>
 		</div>