From a54d1fea6f12e60fead2fbbba51d78f841ec3a03 Mon Sep 17 00:00:00 2001
From: Lockbox313 <8994813+Lockbox313@users.noreply.github.com>
Date: Mon, 25 Oct 2021 09:59:12 +0100
Subject: [PATCH] Add files via upload

---
 RunequestGQS/ReadMe.md         |  8 +++++++-
 RunequestGQS/RunequestGQS.html | 34 ++++++++++++++++++----------------
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/RunequestGQS/ReadMe.md b/RunequestGQS/ReadMe.md
index fcdf8db96f..b6791b56e9 100644
--- a/RunequestGQS/ReadMe.md
+++ b/RunequestGQS/ReadMe.md
@@ -35,7 +35,13 @@ To remove the experience checkbox from a skill add a - at the start of the name
 STR and DEX minimums are not currently supported this maybe added in a future release.
 
 
-## 10.06.2021
+## 25.10.2021
+
+	Fixed Strike issues with DEX 19+.  DEX will have to be changed for this to be triggered.
+	Added headers to Parry & Attack Rolls
+	Added delimiters to clarigy the start and end of attacks and parries.
+
+## 06.10.2021
 
 	To account for damage reduction in the attack results tables
 	Added display of special damage and normal damage to critical attack results
diff --git a/RunequestGQS/RunequestGQS.html b/RunequestGQS/RunequestGQS.html
index f5342e6d58..0171f58157 100644
--- a/RunequestGQS/RunequestGQS.html
+++ b/RunequestGQS/RunequestGQS.html
@@ -24,7 +24,7 @@
 
 
 						</div>
-						<b>Version 10.06.2021</b>
+						<b>Version 25.10.2021</b>
 						<input name="attr_versiony" style="background: none; border: currentColor; border-image: none; width: 400px; color: red; font-weight: bold;" type="text" readonly="" value="(https://tinyurl.com/yb9tgmlv)">
 						
 						
@@ -923,22 +923,24 @@
 									<div><button   name="roll_melee-roll" style="margin-right: 0px; margin-left: 0px;" type="roll" value="@{melee_value}"></button></div>
 
 
-												<textarea name="attr_melee_value" style="display: none;">&{template:melee-roll2} {{name=@{character_name}}} {{tot=[[@{wpn_damage}+@{damagebonus}+@{magic-db}]]}}{{skillvalue=(@{skillTotal})}} {{fumble=[[{(101-(round((100-(@{attackfinal}))/20))),100}kl1]]}}        {{crit=[[{round(@{attackfinal}/20)+1,2}kh1]]}} {{special=[[round((@{attackfinal})/5)+1]]}}  {{spclDam=[[@{spcldamage}+@{damagebonus}+@{magic-db}]]}}   {{crshDam=[[@{wpn_damage}+@{maxDb}+@{damagebonus}+@{magic-db}]]}}  {{critCrsh=[[@{critdamage}+@{maxDb}+@{maxDb}+@{magic-db}]]}} {{critSI=[[@{critdamage}+@{damagebonus}+@{magic-db}]]}} {{type="[[@{wpn_spl}"]]}}  {	{{success=[[@{attackfinal}]]}}{{roll=[[1d100]]}} {{skillname=@{weapon_type}}} {{mntTogVal=[[@{mntTogVal}]]}} {{mntTot=[[@{wpn_damage}+@{mountDB}+@{magic-db}]]}} {{mntSpcl=[[@{spcldamage}+@{mountDB}+@{magic-db}]]}} {{mntCrit=[[@{critdamage}+@{mountDB}+@{magic-db}]]}}
-																			
-												
-												
-
-												&{template:@{creature_hit_location}Melee}} {{roll=[[@{selected_die_roll}]]}}</textarea>
+												<textarea name="attr_melee_value" style="display: none;">
+												---- Attack Start ----
+												&{template:melee-roll2} {{name=@{character_name} Attack}} {{tot=[[@{wpn_damage}+@{damagebonus}+@{magic-db}]]}}{{skillvalue=(@{skillTotal})}} {{fumble=[[{(101-(round((100-(@{attackfinal}))/20))),100}kl1]]}}        {{crit=[[{round(@{attackfinal}/20)+1,2}kh1]]}} {{special=[[round((@{attackfinal})/5)+1]]}}  {{spclDam=[[@{spcldamage}+@{damagebonus}+@{magic-db}]]}}   {{crshDam=[[@{wpn_damage}+@{maxDb}+@{damagebonus}+@{magic-db}]]}}  {{critCrsh=[[@{critdamage}+@{maxDb}+@{maxDb}+@{magic-db}]]}} {{critSI=[[@{critdamage}+@{damagebonus}+@{magic-db}]]}} {{type="[[@{wpn_spl}"]]}}  {	{{success=[[@{attackfinal}]]}}{{roll=[[1d100]]}} {{skillname=@{weapon_type}}} {{mntTogVal=[[@{mntTogVal}]]}} {{mntTot=[[@{wpn_damage}+@{mountDB}+@{magic-db}]]}} {{mntSpcl=[[@{spcldamage}+@{mountDB}+@{magic-db}]]}} {{mntCrit=[[@{critdamage}+@{mountDB}+@{magic-db}]]}}
+																		
+												&{template:@{creature_hit_location}Melee}} {{roll=[[@{selected_die_roll}]]}}
+												---- Attack End ----
+												</textarea>
 
 												<textarea name="attr_melee_value_backup" style="display: none;">&{template:melee-roll2} {{name=@{character_name}}} {{tot=[[@{wpn_damage}+@{damagebonus}+@{magic-db}]]}}{{skillvalue=(@{skillTotal})}} {{fumble=[[{(101-(round((100-((@{skillTotal}*@{skillReduct})+@{skillWpnMod}+@{skillMods}))/20))),100}kl1]]}}  {{crit=[[{round([[ceil((@{skillTotal}*@{skillReduct}))+@{skillWpnMod}+@{skillMods}]]/20)+1,2}kh1]]}} {{special=[[round(([[ceil((@{skillTotal}*@{skillReduct}))+@{skillWpnMod}+@{skillMods}]])/5)+1]]}}   {{spclDam=[[@{spcldamage}+@{damagebonus}+@{magic-db}]]}}   {{crshDam=[[@{wpn_damage}+@{maxDb}+@{damagebonus}+@{magic-db}]]}}  {{critCrsh=[[@{critdamage}+@{maxDb}+@{maxDb}+@{magic-db}]]}} {{critSI=[[@{critdamage}+@{damagebonus}+@{magic-db}]]}} {{type="[[@{wpn_spl}"]]}}  {{success=[[ceil(ceil((@{skillTotal}*@{skillReduct})))+@{skillWpnMod}+@{skillMods}]]}} {{roll=[[1d100]]}} {{skillname=@{weapon_type}}} {{mntTogVal=[[@{mntTogVal}]]}} {{mntTot=[[@{wpn_damage}+@{mountDB}+@{magic-db}]]}} {{mntSpcl=[[@{spcldamage}+@{mountDB}+@{magic-db}]]}} {{mntCrit=[[@{critdamage}+@{mountDB}+@{magic-db}]]}}
-																			
-												
-												
 
 												&{template:@{creature_hit_location}Melee}} {{roll=[[@{selected_die_roll}]]}}</textarea>	
 
 
-												<textarea name="attr_parry_value" style="display: none;">&{template:melee-roll2} {{name=@{character_name}}} {{tot=[[@{wpn_damage}+@{damagebonus}+@{magic-db}]]}}{{skillvalue=(@{skillTotal})}} {{fumble=[[{(101-(round((100-(@{parryfinal}))/20))),100}kl1]]}}        {{crit=[[{round(@{parryfinal}/20)+1,2}kh1]]}} {{special=[[round((@{parryfinal})/5)+1]]}}  {{spclDam=[[@{spcldamage}+@{damagebonus}+@{magic-db}]]}}   {{crshDam=[[@{wpn_damage}+@{maxDb}+@{damagebonus}+@{magic-db}]]}}  {{critCrsh=[[@{critdamage}+@{maxDb}+@{maxDb}+@{magic-db}]]}} {{critSI=[[@{critdamage}+@{damagebonus}+@{magic-db}]]}} {{type="[[@{wpn_spl}"]]}}  {	{{success=[[@{parryfinal}]]}}{{roll=[[1d100]]}} {{skillname=@{weapon_type}}} {{mntTogVal=[[@{mntTogVal}]]}} {{mntTot=[[@{wpn_damage}+@{mountDB}+@{magic-db}]]}} {{mntSpcl=[[@{spcldamage}+@{mountDB}+@{magic-db}]]}} {{mntCrit=[[@{critdamage}+@{mountDB}+@{magic-db}]]}</textarea>												
+												<textarea name="attr_parry_value" style="display: none;">
+												---- Parry Start ----
+												&{template:melee-roll2} {{name=@{character_name} Parry}} {{tot=[[@{wpn_damage}+@{damagebonus}+@{magic-db}]]}}{{skillvalue=(@{skillTotal})}} {{fumble=[[{(101-(round((100-(@{parryfinal}))/20))),100}kl1]]}}        {{crit=[[{round(@{parryfinal}/20)+1,2}kh1]]}} {{special=[[round((@{parryfinal})/5)+1]]}}  {{spclDam=[[@{spcldamage}+@{damagebonus}+@{magic-db}]]}}   {{crshDam=[[@{wpn_damage}+@{maxDb}+@{damagebonus}+@{magic-db}]]}}  {{critCrsh=[[@{critdamage}+@{maxDb}+@{maxDb}+@{magic-db}]]}} {{critSI=[[@{critdamage}+@{damagebonus}+@{magic-db}]]}} {{type="[[@{wpn_spl}"]]}}  {	{{success=[[@{parryfinal}]]}}{{roll=[[1d100]]}} {{skillname=@{weapon_type}}} {{mntTogVal=[[@{mntTogVal}]]}} {{mntTot=[[@{wpn_damage}+@{mountDB}+@{magic-db}]]}} {{mntSpcl=[[@{spcldamage}+@{mountDB}+@{magic-db}]]}} {{mntCrit=[[@{critdamage}+@{mountDB}+@{magic-db}]]}
+												---- Parry End ----
+												</textarea>												
 												
 												
 												<textarea name="attr_parry_value2" style="display: none;">&{template:melee-roll2} {{name=@{character_name}}} {{tot=[[@{wpn_damage}+@{damagebonus}+@{magic-db}]]}}{{skillvalue=(@{skillTotal})}} {{fumble=[[{(101-(round((100-((@{skillTotal}*@{skillReduct})+@{skillParryMod}+@{skillMods}-(1*@{prevdefends}*20)))/20))),100}kl1]]}}  {{crit=[[{round([[ceil((@{skillTotal}*@{skillReduct}))+@{skillParryMod}+@{skillMods}-(1*@{prevdefends}*20)]]/20)+1,2}kh1]]}} {{special=[[round(([[ceil((@{skillTotal}*@{skillReduct}))+@{skillParryMod}+@{skillMods}-(1*@{prevdefends}*20)]])/5)+1]]}}   {{spclDam=[[@{spcldamage}+@{damagebonus}]]}}   {{crshDam=[[@{wpn_damage}+@{maxDb}+@{damagebonus}+@{magic-db}]]}}  {{critCrsh=[[@{critdamage}+@{maxDb}+@{maxDb}+@{magic-db}]]}} {{critSI=[[@{critdamage}+@{damagebonus}+@{magic-db}]]}} {{type="[[@{wpn_spl}"]]}}  {{success=[[ceil(ceil((@{skillTotal}*@{skillReduct})))+@{skillParryMod}+@{skillMods}-(1*@{prevdefends}*20)]]}} {{roll=[[1d100]]}} {{skillname=@{weapon_type} Parry}} {{mntTogVal=[[0]]}} {{mntTot=[[@{wpn_damage}+@{mountDB}+@{magic-db}]]}} {{mntSpcl=[[@{spcldamage}+@{mountDB}+@{magic-db}]]}} {{mntCrit=[[@{critdamage}+@{mountDB}+@{magic-db}]]}}</textarea>												
@@ -5016,7 +5018,7 @@
 					<input name="attr_is_config" class="sheet-HideConfig" type="checkbox" checked="checked"><span class="sheet-is-config" ><span style='font-family:pictos;' >y</span></span>
 					<div class="sheet-config" style="border-style: dotted; border-color: gray; padding: 5px; background-image: none; background-color: white;">
 						<div>
-							<b>Version 10.06.2021</b> <input name="attr_versiony" style="background: none; border: currentColor; border-image: none; width: 400px; color: red; font-weight: bold;" type="text" readonly="" value="(https://tinyurl.com/yb9tgmlv)">
+							<b>25.10.2021</b> <input name="attr_versiony" style="background: none; border: currentColor; border-image: none; width: 400px; color: red; font-weight: bold;" type="text" readonly="" value="(https://tinyurl.com/yb9tgmlv)">
 						</div><br>
 						<input name="attr_toggleQSSheet" class="sheet-toggleQSSheet" type="checkbox" checked="checked">Display Quick Start Sheet <input name="attr_toggleFullSheet" class="sheet-toggleFullSheet" type="checkbox">Display Full Sheet <input name="attr_toggleNPC1Sheet" class="sheet-toggleNPC1Sheet" type="checkbox">Display NPC Sheet
 					</div>
@@ -6711,9 +6713,9 @@
 	console.log("^^^^^^^^^^^^^ srbuff: "+srBuff)					
 						msrm = msrm+dsrm;
 						
-						if (msrm < 1){
+						/*if (msrm < 1){
 							msrm=1;
-						}
+						}*/
 						
 						srCnt =dsrm-srBuff;
 						if (srCnt<1){
@@ -6741,9 +6743,9 @@
 						}					
 						
 						
-						if (dsrm < 1){
+						/*if (dsrm < 1){
 							dsrm =1;
-						}
+						}*/
 						console.log("^^^^^^^^^^^^^ srbuff: "+srBuff)
 						
 						setAttrs({ dex_srm: dsrm , melee_srm: msrm,ready_wpn: srStr,unready_wpn: srStr2,srMod:srBuff});