From 218ee43e6200cc56cd3554bf31d348455f7ac992 Mon Sep 17 00:00:00 2001
From: Lockbox313 <8994813+Lockbox313@users.noreply.github.com>
Date: Tue, 23 Apr 2019 04:40:23 +0000
Subject: [PATCH] Runequest:Glorantha MQ mod fix (#4998)

* Add files via upload

* fix clusterfuck

* Add files via upload
---
 RunequestGQS/ReadMe.md         | 10 +++++-
 RunequestGQS/RunequestGQS.html | 66 +++++++++++++++++++++++++---------
 2 files changed, 59 insertions(+), 17 deletions(-)

diff --git a/RunequestGQS/ReadMe.md b/RunequestGQS/ReadMe.md
index 1cdff52d19..e05834a7ff 100644
--- a/RunequestGQS/ReadMe.md
+++ b/RunequestGQS/ReadMe.md
@@ -42,6 +42,12 @@ Changed the way version number was displayed .A attributes was removed but it wi
 Changed the path for button images and roll templates images to point to images in Roll20 repository.
 
 
+## 22.04.2019
+	Fix Move Quietly modifiers were being totalled now takes the highest.
+	
+	Tided up the Experience Roll button beside the category modifier, it now uses a Roll template and asks for a skill value to compare it against.
+
+	
 
 ## 08.04.2019 Version 
 
@@ -59,7 +65,7 @@ Changed the path for button images and roll templates images to point to images
 	
 	Added support to add turn order entries based on missile weapon strike ranks.
 	
-
+	Added support for Coordination spell
 	
 	
 	
@@ -76,6 +82,8 @@ I added a bunch of new hit locations including all the location tables  at the s
 
 Added fields for individual weapons skill modifiers or occasions such as Bladesharp cast.
 
+
+
 I also added checkboxes with the heading Spells Cast for Vigor, Strength  and Glamour they handle all the fudges listed under the spells,such as skill category  increases, damage die steps and max enc.So don't add the stat bonuses in the mod fields of the characteristics.The bonuses are automatically added to stat rolls. A message appears under the stats  reminding you to add the bonus when doing resistance table rolls.  There is probably better way of doing this but it would mean changing a lot of sheetworkers and/or adding a whole new column of mod fields
 
 
diff --git a/RunequestGQS/RunequestGQS.html b/RunequestGQS/RunequestGQS.html
index 591cc1f158..9056a33ac1 100644
--- a/RunequestGQS/RunequestGQS.html
+++ b/RunequestGQS/RunequestGQS.html
@@ -22,7 +22,7 @@
 
 
 					</div>
-					<b>Version 08.04.2019</b>
+					<b>Version 22.04.2019</b>
 					<input style="color:red;border:none;background:none;padding 0px;font-weight: bold;;width:400px;" type="text" readonly name="attr_versiony" value ="(https://tinyurl.com/yb9tgmlv)" />
 					
 					
@@ -892,7 +892,7 @@
 						<div class="sheet-skill_category">Agility</div>
 						<div style="display:inline-block;margin-left:69px;">
 							<span><b>Modifier</b></span>
-							<input type="text" value="0" class="sheet-text_input sheet-skill_values2" readonly name="attr_agility_mod"/><button type="roll" class="sheet-d100_roll" value="/r [[1d00+@{agility_mod}]]"  ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>
+							<input type="text" value="0" class="sheet-text_input sheet-skill_values2" readonly name="attr_agility_mod"/><button type="roll" class="sheet-d100_roll" value="&{template:expRoll} {{skill=Agility Skill }} {{value=[[(?{Skill Value|0})+1]]}} {{name=@{character_name}}}  {{roll=[[1d100+@{agility_mod}]]}}"  ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>
 						</div>
 						
 						<fieldset class="repeating_agilitySkills">
@@ -911,7 +911,7 @@
 						<div class="sheet-skill_category">Communication</div>
 						<div style="display:inline-block;margin-left:9px;">
 							<span><b>Modifier</b></span>
-							<input type="text" value="0" class="sheet-text_input sheet-skill_values2" readonly name="attr_communication_mod"/><button type="roll" class="sheet-d100_roll" value="/r [[1d00+@{communication_mod}]]"  ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>
+							<input type="text" value="0" class="sheet-text_input sheet-skill_values2" readonly name="attr_communication_mod"/><button type="roll" class="sheet-d100_roll" value="&{template:expRoll} {{skill=Communication Skill }} {{value=[[(?{Skill Value|0})+1]]}} {{name=@{character_name}}}  {{roll=[[1d100+@{communication_mod}]]}}"  ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>
 						</div>
 						
 						<fieldset class="repeating_communicationSkills">
@@ -928,7 +928,7 @@
 						<div class="sheet-skill_category">Knowledge</div>
 						<div style="display:inline-block;margin-left:40px;">
 							<span><b>Modifier</b></span>
-							<input type="text" value="0" class="sheet-text_input sheet-skill_values2" readonly name="attr_knowledge_mod"/><button type="roll" class="sheet-d100_roll" value="/r [[1d00+@{knowledge_mod}]]"  ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>
+							<input type="text" value="0" class="sheet-text_input sheet-skill_values2" readonly name="attr_knowledge_mod"/><button type="roll" class="sheet-d100_roll" value="&{template:expRoll} {{skill=Knowledge Skill }} {{value=[[(?{Skill Value|0})+1]]}} {{name=@{character_name}}}  {{roll=[[1d100+@{knowledge_mod}]]}}"  ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>
 						</div>
 						
 						<fieldset class="repeating_knowledgeSkills">
@@ -955,7 +955,7 @@
 								<div class="sheet-skill_category">Magic</div>
 								<div style="display:inline-block;margin-left:75px;">
 									<span><b>Modifier</b></span>
-									<input type="text" value="0" class="sheet-text_input sheet-skill_values2" readonly name="attr_magic_mod"/><button type="roll" class="sheet-d100_roll" value="/r [[1d00+@{magic_mod}]]"  ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>
+									<input type="text" value="0" class="sheet-text_input sheet-skill_values2" readonly name="attr_magic_mod"/><button type="roll" class="sheet-d100_roll" value="&{template:expRoll} {{skill=Magic Skill }} {{value=[[(?{Skill Value|0})+1]]}} {{name=@{character_name}}}  {{roll=[[1d100+@{magic_mod}]]}}"  ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>
 								</div>
 								
 								<fieldset class="repeating_magicSkills">
@@ -972,7 +972,7 @@
 								<div class="sheet-skill_category">Manipulation</div>
 								<div style="display:inline-block;margin-left:29px;">
 									<span><b>Modifier</b></span>
-									<input type="text" value="0" class="sheet-text_input sheet-skill_values2" readonly name="attr_manipulation_mod"/><button type="roll" class="sheet-d100_roll" value="/r [[1d00+@{manipulation_mod}]]"  ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>
+									<input type="text" value="0" class="sheet-text_input sheet-skill_values2" readonly name="attr_manipulation_mod"/><button type="roll" class="sheet-d100_roll" value="&{template:expRoll} {{skill=Manipulation Skill }} {{value=[[(?{Skill Value|0})+1]]}} {{name=@{character_name}}}  {{roll=[[1d100+@{manipulation_mod}]]}}"  ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>
 								</div>
 								
 								<fieldset class="repeating_manipulationSkills">
@@ -990,7 +990,7 @@
 								<div class="sheet-skill_category">Perception</div>
 								<div style="display:inline-block;margin-left:43px;">
 									<span><b>Modifier</b></span>
-									<input type="text" value="0" class="sheet-text_input sheet-skill_values2" readonly name="attr_perception_mod"/><button type="roll" class="sheet-d100_roll" value="/r [[1d00+@{preception_mod}]]"  ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>
+									<input type="text" value="0" class="sheet-text_input sheet-skill_values2" readonly name="attr_perception_mod"/><button type="roll" class="sheet-d100_roll" value="&{template:expRoll} {{skill=Perception Skill }} {{value=[[(?{Skill Value|0})+1]]}} {{name=@{character_name}}}  {{roll=[[1d100+@{perception_mod}]]}}"  ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>
 								</div>
 								
 								<fieldset class="repeating_perceptionSkills">
@@ -1007,7 +1007,7 @@
 								<div class="sheet-skill_category">Stealth</div>
 								<div style="display:inline-block;margin-left:66px;">
 									<span><b>Modifier</b></span>
-									<input type="text" value="0" class="sheet-text_input sheet-skill_values2" readonly name="attr_stealth_mod"/><button type="roll" class="sheet-d100_roll" value="/r [[1d00+@{stealth_mod}]]"  ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>
+									<input type="text" value="0" class="sheet-text_input sheet-skill_values2" readonly name="attr_stealth_mod"/><button type="roll" class="sheet-d100_roll" value="&{template:expRoll} {{skill=Stealth Skill }} {{value=[[(?{Skill Value|0})+1]]}} {{name=@{character_name}}}  {{roll=[[1d100+@{stealth_mod}]]}}"  ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>
 								</div>
 								
 								<fieldset class="repeating_stealthSkills">
@@ -1027,7 +1027,7 @@
 									<div class="sheet-skill_category">Melee Weapons</div>
 									<div style="display:inline-block;margin-left:9px;">
 										<span><b>Modifier</b></span>
-										<input type="text" value="0" class="sheet-text_input sheet-skill_values2" readonly name="attr_manipulation_mod"/><button type="roll" class="sheet-d100_roll" value="/r [[1d00+@{manipulation_mod}]]"  ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>
+										<input type="text" value="0" class="sheet-text_input sheet-skill_values2" readonly name="attr_manipulation_mod"/><button type="roll" class="sheet-d100_roll" value="&{template:expRoll} {{skill=Melee Weapon Skill }} {{value=[[(?{Skill Value|0})+1]]}} {{name=@{character_name}}}  {{roll=[[1d100+@{manipulation_mod}]]}}"  ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>
 									</div>
 									
 									<fieldset class="repeating_meleeSkills">
@@ -1041,7 +1041,7 @@
 									<div class="sheet-skill_category">Missile Weapons</div>
 									<div style="display:inline-block;margin-left:4px;">
 										<span><b>Modifier</b></span>
-										<input type="text" value="0" class="sheet-text_input sheet-skill_values2" readonly name="attr_manipulation_mod"/><button type="roll" class="sheet-d100_roll" value="/r [[1d00+@{manipulation_mod}]]"  ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>
+										<input type="text" value="0" class="sheet-text_input sheet-skill_values2" readonly name="attr_manipulation_mod"/><button type="roll" class="sheet-d100_roll" value="&{template:expRoll} {{skill=Missle Weapon Skill }} {{value=[[(?{Skill Value|0})+1]]}} {{name=@{character_name}}}  {{roll=[[1d100+@{manipulation_mod}]]}}"  ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>
 									</div>
 									
 									<fieldset class="repeating_missileSkills">
@@ -1055,7 +1055,7 @@
 									<div class="sheet-skill_category">Shields</div>
 									<div style="display:inline-block;margin-left:63px;">
 										<span><b>Modifier</b></span>
-										<input type="text" value="0" class="sheet-text_input sheet-skill_values2" readonly name="attr_manipulation_mod"/><button type="roll" class="sheet-d100_roll" value="/r [[1d00+@{manipulation_mod}]]"  ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>
+										<input type="text" value="0" class="sheet-text_input sheet-skill_values2" readonly name="attr_manipulation_mod"/><button type="roll" class="sheet-d100_roll" value="&{template:expRoll} {{skill=Shield Skill }} {{value=[[(?{Skill Value|0})+1]]}} {{name=@{character_name}}}  {{roll=[[1d100+@{manipulation_mod}]]}}"  ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>
 									</div>
 									
 									<fieldset class="repeating_shieldSkills">
@@ -1070,7 +1070,7 @@
 									<div class="sheet-skill_category">Natural Weapons</div>
 									<div style="display:inline-block;margin-left:-1px;">
 										<span><b>Modifier</b></span>
-										<input type="text" value="0" class="sheet-text_input sheet-skill_values2" readonly name="attr_manipulation_mod"/><button type="roll" class="sheet-d100_roll" value="/r [[1d00+@{manipulation_mod}]]"  ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>
+										<input type="text" value="0" class="sheet-text_input sheet-skill_values2" readonly name="attr_manipulation_mod"/><button type="roll" class="sheet-d100_roll" value="&{template:expRoll} {{skill=Natural Weapon Skill }} {{value=[[(?{Skill Value|0})+1]]}} {{name=@{character_name}}}  {{roll=[[1d100+@{manipulation_mod}]]}}"  ><img class="sheet-d100_image" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/luck.png" /></button>
 										<input type="checkbox" name="attr_expCheck" />
 
 									</div>
@@ -6633,7 +6633,14 @@ console.log("^^^^^^^^^^^^^ dsrm: "+dsrm);
 							
 							console.log("carried "+(r.F["carried"]));
 							if ( (r.F["carried"]) == 1){
-								return m + (r.F["mq_mod"]);
+							
+								if ( (r.F["mq_mod"]) < m){
+									return (r.F["mq_mod"]);
+								}
+								else{
+									return m;
+								}
+								///return m + (r.F["mq_mod"]);
 							} else{
 								return m;
 							}
@@ -7203,6 +7210,7 @@ console.log("111111111 swim_mod2 "+swim_mod);
 								}else if (skill.toUpperCase()=="SWIM"){
 									tot = tot+parseInt(values.swim_mod2)
 								}else if (skill.toUpperCase()=="MOVE QUIETLY"){
+								console.log("£££££££££ mq_tot ="+values.mq_total);
 									tot = tot+parseInt(values.mq_total)
 								}
 								
@@ -7739,7 +7747,7 @@ console.log("111111111 swim_mod2 "+swim_mod);
 			});	
                        
 			on("change:mq_total", function() {
-					console.log("shut thoose dogs up");
+					console.log("£££££££££££££shut thoose dogs up");
 				 resetSkills("repeating_stealthSkills","stealth_mod","1");
 			});	
 			
@@ -8826,7 +8834,9 @@ console.log("111111111 swim_mod2 "+swim_mod);
 		</rolltemplate>
 		
 		
-		<rolltemplate class="sheet-rolltemplate-melee-roll2">
+		
+		
+<rolltemplate class="sheet-rolltemplate-melee-roll2">
 		<!--awaqsdasd {{mntTogVal}}</br/>
 		Mount damage {{mntTot}}</br/>
 		mount spcl {{mntSpcl}}</br/>
@@ -8976,6 +8986,8 @@ console.log("111111111 swim_mod2 "+swim_mod);
 			<img style="margin-top:3px;border-left:1px solid black;" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/banner.jpg" />
 		<div style="border: 1px solid black ">
 	</rolltemplate>
+	
+	
 	<rolltemplate class="sheet-rolltemplate-RQG-Fumble">
 		<table style="background-color: #ffffff;" class="sheet-rolltemplate-skillRoll">
 		<th>Fumble </th>
@@ -9027,6 +9039,28 @@ console.log("111111111 swim_mod2 "+swim_mod);
 		</table>
 	</rolltemplate>
 
+	
+	<rolltemplate class="sheet-rolltemplate-expRoll">
+		<img style="margin-top:3px;border-left:1px solid black;" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/banner.jpg" />
+		<div style="border: 1px solid black ">
+		
+		<div style="background-color:white;color:#b87a38;text-align:center" >{{name}}</div>
+		<div style="background-color:white;color:#b87a38;text-align:center" >{{skill}} Experience Roll</div>	
+
+
+		<div style="padding-top:5px;baCkground-color:white">
+				
+			<div style="text-align:center"><b>Roll:</b>{{roll}} >= {{value}}</div> 
+			{{#rollGreater() roll value}}
+				<div style="background-color:white;color:#b87a38;text-align:center" >Increase Skill</div>					
+			{{/rollGreater() roll value}}
+			{{#^rollGreater() roll value}}
+				<div style="background-color:white;color:#b87a38;text-align:center" >Failed to Increase Skill</div>					
+			{{/^rollGreater() roll value}}			
+			
+		</div>	
+		<img style="margin-top:3px;border-left:1px solid black;" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/RunequestGQS/banner.jpg" />
+	</rolltemplate>	
 
 		<!--end new rolltemplates -->
 		<!--old templates -->
@@ -9682,7 +9716,7 @@ console.log("111111111 swim_mod2 "+swim_mod);
 						{{#rollLess() roll special}}Special (+30%) {{/rollLess() roll special}}
 						{{#^rollLess() roll special}}
 						
-							{{#rollGreater() roll 95}}Failure (-20%/-10% if passion)  {{/rollGreater() roll 95}}
+							{{#rollGreater() roll 95}}Failure -20%/-10% (Pass.)  {{/rollGreater() roll 95}}
 							{{#^rollGreater() roll 95}}
 								{{#rollBetween() roll special success}}Success (+20%) {{/rollBetween() roll special success}}
 							{{/^rollGreater() roll 95}}