From fec4aa5483d8809361d8d44de3d4e6f064c35f06 Mon Sep 17 00:00:00 2001
From: John Sherwood <jsherwood0@users.noreply.github.com>
Date: Fri, 5 Aug 2022 23:48:09 -0400
Subject: [PATCH 1/3] Update HeroSystem6e,html to improve generic attack button

- Made generic attack button on OCV provide hit location and body count as powers do
- Added a button to do the same thing at the end of the OCV line of the combat preview table
---
 HeroSystem6e/HeroSystem6e.html | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/HeroSystem6e/HeroSystem6e.html b/HeroSystem6e/HeroSystem6e.html
index 341baec02e..e04d952213 100644
--- a/HeroSystem6e/HeroSystem6e.html
+++ b/HeroSystem6e/HeroSystem6e.html
@@ -125,7 +125,8 @@
 							<button type="roll" class="edit-hide tooltip" name="roll_Attack_Roll" value="@{ocv_formula}"></button>
 							<span class="tooltiptext">Attack&nbsp;Roll</span>
 						</div>
-						<input type="hidden" name="attr_ocv_formula" value="&{template:hero6template} {{charname=@{character_name}}} {{action=Attack Roll}} {{attack=[[3d6]]}} {{ocv=@{OCV}}}" />
+						<input type="hidden" name="attr_ocv_formula" value="&{template:hero6template} {{charname=@{character_name}}} {{action=Attack Roll}} {{attack=[[3d6]]}} {{ocv=@{OCV}}} {{hitlocation=[[3d6]]}} {{damage=[[@{hth} @{preview_damage}]]}} {{type=STUN}} {{count=BODY}}" />
+						<!--<input type="hidden" name="attr_ocv_formula" value="&{template:hero6template} {{charname=@{character_name}}} {{action=Attack Roll}} {{attack=[[3d6]]}} {{ocv=@{OCV}}}" /> -->
 					</div>
 					<div class="line">
 						<div class="in3">DCV</div>
@@ -550,7 +551,8 @@
 							<button type="roll" class="edit-hide tooltip" name="roll_Attack_Roll" value="@{ocv_formula}"></button>
 							<span class="tooltiptext">Attack&nbsp;Roll</span>
 						</div>
-						<input type="hidden" name="attr_ocv_formula" value="&{template:hero6template} {{charname=@{character_name}}} {{action=Attack Roll}} {{attack=[[3d6]]}} {{ocv=@{OCV}}}" />
+						<input type="hidden" name="attr_ocv_formula" value="&{template:hero6template} {{charname=@{character_name}}} {{action=Attack Roll}} {{attack=[[3d6]]}} {{ocv=@{OCV}}} {{hitlocation=[[3d6]]}} {{damage=[[@{hth} @{preview_damage}]]}} {{type=STUN}} {{count=BODY}}" />
+						<!--<input type="hidden" name="attr_ocv_formula" value="&{template:hero6template} {{charname=@{character_name}}} {{action=Attack Roll}} {{attack=[[3d6]]}} {{ocv=@{OCV}}}" /> -->
 					</div>
 					<div class="line">
 						<div class="in3">DCV</div>
@@ -940,6 +942,8 @@
 						<span class="cp2 field" name="attr_preview_half_ocv" disabled="true"></span>
 						<span class="cp3 field heads" name="attr_preview_final_ocv" disabled="true"></span>
 						<span class="cp4 field" name="attr_preview_damage" disabled="true"></span>
+						<button type="roll" class="edit-hide tooltip" name="roll_Attack_Roll" value="@{ocv_formula}"></button>
+
 					</div>
 					<div class="line">
 						<div class="cp1">DCV</div>
@@ -6178,4 +6182,4 @@ on("sheet:opened",function(){
 </rolltemplate>
 
 <!-- this closes the div that hides the roll template from the preview -->
-</div>
\ No newline at end of file
+</div>

From 7b9ffcafe10e5f6843462f041cbf2b4e1d53e480 Mon Sep 17 00:00:00 2001
From: John Sherwood <jsherwood0@users.noreply.github.com>
Date: Sun, 7 Aug 2022 21:19:56 -0400
Subject: [PATCH 2/3] Update HeroSystem6e.html to use selected hit location
 roll

Make the default attack roll use the hit location roll selected on the combat page.
---
 HeroSystem6e/HeroSystem6e.html | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/HeroSystem6e/HeroSystem6e.html b/HeroSystem6e/HeroSystem6e.html
index e04d952213..9786c8cc45 100644
--- a/HeroSystem6e/HeroSystem6e.html
+++ b/HeroSystem6e/HeroSystem6e.html
@@ -125,8 +125,7 @@
 							<button type="roll" class="edit-hide tooltip" name="roll_Attack_Roll" value="@{ocv_formula}"></button>
 							<span class="tooltiptext">Attack&nbsp;Roll</span>
 						</div>
-						<input type="hidden" name="attr_ocv_formula" value="&{template:hero6template} {{charname=@{character_name}}} {{action=Attack Roll}} {{attack=[[3d6]]}} {{ocv=@{OCV}}} {{hitlocation=[[3d6]]}} {{damage=[[@{hth} @{preview_damage}]]}} {{type=STUN}} {{count=BODY}}" />
-						<!--<input type="hidden" name="attr_ocv_formula" value="&{template:hero6template} {{charname=@{character_name}}} {{action=Attack Roll}} {{attack=[[3d6]]}} {{ocv=@{OCV}}}" /> -->
+						<input type="hidden" name="attr_ocv_formula" value="&{template:hero6template} {{charname=@{character_name}}} {{action=Attack Roll}} {{attack=[[3d6]]}} {{ocv=@{OCV}}} {{hitlocation=[[@{hit_location_roll}]]}} {{damage=[[@{hth} @{preview_damage}]]}} {{type=STUN}} {{count=BODY}}" />
 					</div>
 					<div class="line">
 						<div class="in3">DCV</div>
@@ -551,8 +550,7 @@
 							<button type="roll" class="edit-hide tooltip" name="roll_Attack_Roll" value="@{ocv_formula}"></button>
 							<span class="tooltiptext">Attack&nbsp;Roll</span>
 						</div>
-						<input type="hidden" name="attr_ocv_formula" value="&{template:hero6template} {{charname=@{character_name}}} {{action=Attack Roll}} {{attack=[[3d6]]}} {{ocv=@{OCV}}} {{hitlocation=[[3d6]]}} {{damage=[[@{hth} @{preview_damage}]]}} {{type=STUN}} {{count=BODY}}" />
-						<!--<input type="hidden" name="attr_ocv_formula" value="&{template:hero6template} {{charname=@{character_name}}} {{action=Attack Roll}} {{attack=[[3d6]]}} {{ocv=@{OCV}}}" /> -->
+						<input type="hidden" name="attr_ocv_formula" value="&{template:hero6template} {{charname=@{character_name}}} {{action=Attack Roll}} {{attack=[[3d6]]}} {{ocv=@{OCV}}} {{hitlocation=[[@{hit_location_roll}]]}} {{damage=[[@{hth} @{preview_damage}]]}} {{type=STUN}} {{count=BODY}}" />
 					</div>
 					<div class="line">
 						<div class="in3">DCV</div>
@@ -5050,7 +5048,7 @@ var setCombatModifiers = function() {
 		switch( v[ "radio_target" ]) {
 		case "-1":     /* none */
 			modifier = 0;
-			roll = "";
+			roll = "0";
 			break;
 		case "1":     /* normal */
 			modifier = 0;
@@ -5058,7 +5056,7 @@ var setCombatModifiers = function() {
 			break;
 		case "2":     /* focus */
 			modifier = (-4);
-			roll = "";
+			roll = "1";
 			break;
 		case "3":     /* head shot (head to shoulders) */
 			modifier = (-4);
@@ -5118,7 +5116,7 @@ var setCombatModifiers = function() {
 			break;
 		default:
 			modifier = 0;
-			roll = "";
+			roll = "0";
 		}
 
 		setAttrs({ ocv_modifiers: modifier, hit_location_roll: roll });

From ee8eef0ca5ec11aa05040ca9e96a59fb15755c2d Mon Sep 17 00:00:00 2001
From: John Sherwood <jsherwood0@users.noreply.github.com>
Date: Sun, 7 Aug 2022 21:56:02 -0400
Subject: [PATCH 3/3] Make attack roll button more intuitive

- Added "Roll" text to button
- Added "Attack Roll" tooltip to button
---
 HeroSystem6e/HeroSystem6e.html | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/HeroSystem6e/HeroSystem6e.html b/HeroSystem6e/HeroSystem6e.html
index 9786c8cc45..ac6366e179 100644
--- a/HeroSystem6e/HeroSystem6e.html
+++ b/HeroSystem6e/HeroSystem6e.html
@@ -925,6 +925,7 @@
 						<div class="cp2">Half</div>
 						<div class="cp3">Final</div>
 						<div class="cp4">Damage</div>
+						<div class="cp2"></div>
 					</div>
 					<div class="line">
 						<div class="cp1">OCV</div>
@@ -940,8 +941,11 @@
 						<span class="cp2 field" name="attr_preview_half_ocv" disabled="true"></span>
 						<span class="cp3 field heads" name="attr_preview_final_ocv" disabled="true"></span>
 						<span class="cp4 field" name="attr_preview_damage" disabled="true"></span>
-						<button type="roll" class="edit-hide tooltip" name="roll_Attack_Roll" value="@{ocv_formula}"></button>
-
+						<div class="cp2 button">
+						    <span class="sheet-stat-button sheet-flash" name="attr_preview_atkbtn" disabled="true">Roll</span>
+    						<button type="roll" class="edit-hide tooltip" name="roll_Attack_Roll" value="@{ocv_formula}"></button>
+    					    <span class="tooltiptext">Attack&nbsp;Roll</span>
+		                </div>
 					</div>
 					<div class="line">
 						<div class="cp1">DCV</div>
@@ -956,6 +960,8 @@
 						<span class="cp2 field" name="attr_preview_psl_dcv" disabled="true"></span>
 						<span class="cp2 field" name="attr_preview_half_dcv" disabled="true"></span>
 						<span class="cp3 field heads" name="attr_preview_final_dcv" disabled="true"></span>
+						<div class="cp4"></div>
+						<div class="cp2"></div>
 					</div>
 				</div><!-- end subsection -->