Merge pull request #10894 from jsherwood0/jsherwood0-patch-2

Update HeroSystem6e,html to improve generic attack button
This commit is contained in:
David
2022-08-09 15:32:00 -04:00
committed by GitHub
+14 -6
View File
@@ -125,7 +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}}}" />
<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>
@@ -550,7 +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}}}" />
<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>
@@ -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,6 +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>
<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>
@@ -954,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 -->
@@ -5046,7 +5054,7 @@ var setCombatModifiers = function() {
switch( v[ "radio_target" ]) {
case "-1": /* none */
modifier = 0;
roll = "";
roll = "0";
break;
case "1": /* normal */
modifier = 0;
@@ -5054,7 +5062,7 @@ var setCombatModifiers = function() {
break;
case "2": /* focus */
modifier = (-4);
roll = "";
roll = "1";
break;
case "3": /* head shot (head to shoulders) */
modifier = (-4);
@@ -5114,7 +5122,7 @@ var setCombatModifiers = function() {
break;
default:
modifier = 0;
roll = "";
roll = "0";
}
setAttrs({ ocv_modifiers: modifier, hit_location_roll: roll });
@@ -6178,4 +6186,4 @@ on("sheet:opened",function(){
</rolltemplate>
<!-- this closes the div that hides the roll template from the preview -->
</div>
</div>