From 85fcf4b65b1190fe6a523560813f53b010a43489 Mon Sep 17 00:00:00 2001
From: Mago <68646194+roguetradermago@users.noreply.github.com>
Date: Sat, 23 Nov 2024 05:19:55 -0500
Subject: [PATCH] rogue trader improved rev6 critical hotfix

see details below
---
 .../RogueTraderImproved.html                  | 184 +++++++++---------
 Rogue Trader Improved/sheet.json              |   2 +-
 2 files changed, 92 insertions(+), 94 deletions(-)

diff --git a/Rogue Trader Improved/RogueTraderImproved.html b/Rogue Trader Improved/RogueTraderImproved.html
index b9a86e6fbc86..15ccc97c2a9d 100644
--- a/Rogue Trader Improved/RogueTraderImproved.html	
+++ b/Rogue Trader Improved/RogueTraderImproved.html	
@@ -4931,17 +4931,17 @@ <h1>Special Thanks</h1>
                     {{#rollWasFumble() d100 }}<br>but the field Overloads&#10071;{{/rollWasFumble() d100 }}
                 </div>
             {{/field}}
-			{{#npcflame}}
+		{{#npcflame}}
                 <div class="sheet-result">{{npcflame}}&#160;
                     {{#rollWasFumble() npcflame }}<br><div class="sheet-result" style="color:red">The weapon malfunctions!</div>{{/rollWasFumble() npcflame }}
                 </div>
-            {{/npcflame}}
-			{{#flame}}
+            	{{/npcflame}}
+		{{#flame}}
                 <div class="sheet-result">{{flame}}&#160;
                     {{#rollWasFumble() flame }}<br><div class="sheet-result" style="color:red">The weapon malfunctions!</div>{{/rollWasFumble() flame }}
                     {{#rollWasCrit() flame }}<br>A Righteous Fury! &#128293;<br>Adds {{xd10}} Bonus Damage!{{/rollWasCrit() flame }}
                 </div>
-            {{/flame}}
+		{{/flame}}
             {{#calc}}
                 <div class="sheet-result">
                     {{#rollGreater() calc 0 }}taking {{calc}} Damage!<br><br>
@@ -4954,109 +4954,107 @@ <h1>Special Thanks</h1>
                 </div>
             {{/calc}}
         <!--sections without key/value, used in damage, type, pen and flame-->
-			{{#d1}}
+		{{#d1}}
                 <div class="sheet-result">{{d1}}</div>
-            {{/d1}}
+            	{{/d1}}
             {{#t1}}
                 <div class="sheet-result">{{t1}}</div>
             {{/t1}}
             {{#p1}}
                 <div class="sheet-result">{{p1}}</div>
             {{/p1}}
-		<!--section for attacks and hit location -->
-			{{#d100a}}
-                <div class="sheet-result">{{d100a}}&#160;d100 Roll</div>
+	<!--section for attacks and hit location -->
+	{{#d100a}}
+		<div class="sheet-result">{{d100a}}&#160;d100 Roll</div>
                 {{#rollWasFumble() d100a }}
-				    <div class="sheet-result" style="color:red">the weapon malfunctions!</div>
-				{{/rollWasFumble() d100a }}
-            {{/d100a}}
-            {{attack}}&#160;
-                    {{#rollGreater() d100a testtarget}}<span>Missed...</span>{{/rollGreater() d100a testtarget}}
-                    {{#^rollGreater() d100a testtarget}}
-                        <span>Attack Hits!</span> &#x1F4A2;
-                        <div class="sheet-result">
+			<div class="sheet-result" style="color:red">the weapon malfunctions!</div>
+		{{/rollWasFumble() d100a }}
+	{{/d100a}}
+            {{#attack}}
+		<div class="sheet-result">
+                    {{#rollGreater() d100a testtarget}}Missed...{{/rollGreater() d100a testtarget}}
+                    {{#^rollGreater() d100a testtarget}}Attack Hits! &#x1F4A2; <br>
                             <!--head locations-->
-                            {{#rollTotal() hitloc 01}}<span>Head</span>{{/rollTotal() hitloc 01}}
-                            {{#rollTotal() hitloc 10}}<span>Head</span>{{/rollTotal() hitloc 10}}
-                            {{#rollTotal() hitloc 20}}<span>Head</span>{{/rollTotal() hitloc 20}}
-                            {{#rollTotal() hitloc 30}}<span>Head</span>{{/rollTotal() hitloc 30}}
-                            {{#rollTotal() hitloc 40}}<span>Head</span>{{/rollTotal() hitloc 40}}
-                            {{#rollTotal() hitloc 50}}<span>Head</span>{{/rollTotal() hitloc 50}}
-                            {{#rollTotal() hitloc 60}}<span>Head</span>{{/rollTotal() hitloc 60}}
-                            {{#rollTotal() hitloc 70}}<span>Head</span>{{/rollTotal() hitloc 70}}
-                            {{#rollTotal() hitloc 80}}<span>Head</span>{{/rollTotal() hitloc 80}}
-                            {{#rollTotal() hitloc 90}}<span>Head</span>{{/rollTotal() hitloc 90}}
+                            {{#rollTotal() hitloc 01}}Head{{/rollTotal() hitloc 01}}
+                            {{#rollTotal() hitloc 10}}Head{{/rollTotal() hitloc 10}}
+                            {{#rollTotal() hitloc 20}}Head{{/rollTotal() hitloc 20}}
+                            {{#rollTotal() hitloc 30}}Head{{/rollTotal() hitloc 30}}
+                            {{#rollTotal() hitloc 40}}Head{{/rollTotal() hitloc 40}}
+                            {{#rollTotal() hitloc 50}}Head{{/rollTotal() hitloc 50}}
+                            {{#rollTotal() hitloc 60}}Head{{/rollTotal() hitloc 60}}
+                            {{#rollTotal() hitloc 70}}Head{{/rollTotal() hitloc 70}}
+                            {{#rollTotal() hitloc 80}}Head{{/rollTotal() hitloc 80}}
+                            {{#rollTotal() hitloc 90}}Head{{/rollTotal() hitloc 90}}
                             <!--right arm locations-->
-                            {{#rollTotal() hitloc 91}}<span>Right Arm</span>{{/rollTotal() hitloc 91}}
-                            {{#rollTotal() hitloc 81}}<span>Right Arm</span>{{/rollTotal() hitloc 81}}
-                            {{#rollTotal() hitloc 71}}<span>Right Arm</span>{{/rollTotal() hitloc 71}}
-                            {{#rollTotal() hitloc 61}}<span>Right Arm</span>{{/rollTotal() hitloc 61}}
-                            {{#rollTotal() hitloc 51}}<span>Right Arm</span>{{/rollTotal() hitloc 51}}
-                            {{#rollTotal() hitloc 41}}<span>Right Arm</span>{{/rollTotal() hitloc 41}}
-                            {{#rollTotal() hitloc 31}}<span>Right Arm</span>{{/rollTotal() hitloc 31}}
-                            {{#rollTotal() hitloc 21}}<span>Right Arm</span>{{/rollTotal() hitloc 21}}
-                            {{#rollTotal() hitloc 11}}<span>Right Arm</span>{{/rollTotal() hitloc 11}}
-                            {{#rollTotal() hitloc 02}}<span>Right Arm</span>{{/rollTotal() hitloc 02}}
+                            {{#rollTotal() hitloc 91}}Right Arm{{/rollTotal() hitloc 91}}
+                            {{#rollTotal() hitloc 81}}Right Arm{{/rollTotal() hitloc 81}}
+                            {{#rollTotal() hitloc 71}}Right Arm{{/rollTotal() hitloc 71}}
+                            {{#rollTotal() hitloc 61}}Right Arm{{/rollTotal() hitloc 61}}
+                            {{#rollTotal() hitloc 51}}Right Arm{{/rollTotal() hitloc 51}}
+                            {{#rollTotal() hitloc 41}}Right Arm{{/rollTotal() hitloc 41}}
+                            {{#rollTotal() hitloc 31}}Right Arm{{/rollTotal() hitloc 31}}
+                            {{#rollTotal() hitloc 21}}Right Arm{{/rollTotal() hitloc 21}}
+                            {{#rollTotal() hitloc 11}}Right Arm{{/rollTotal() hitloc 11}}
+                            {{#rollTotal() hitloc 02}}Right Arm{{/rollTotal() hitloc 02}}
                             <!--left arm locations-->
-                            {{#rollTotal() hitloc 92}}<span>Left Arm</span>{{/rollTotal() hitloc 92}}
-                            {{#rollTotal() hitloc 82}}<span>Left Arm</span>{{/rollTotal() hitloc 82}}
-                            {{#rollTotal() hitloc 72}}<span>Left Arm</span>{{/rollTotal() hitloc 72}}
-                            {{#rollTotal() hitloc 62}}<span>Left Arm</span>{{/rollTotal() hitloc 62}}
-                            {{#rollTotal() hitloc 52}}<span>Left Arm</span>{{/rollTotal() hitloc 52}}
-                            {{#rollTotal() hitloc 42}}<span>Left Arm</span>{{/rollTotal() hitloc 42}}
-                            {{#rollTotal() hitloc 32}}<span>Left Arm</span>{{/rollTotal() hitloc 32}}
-                            {{#rollTotal() hitloc 22}}<span>Left Arm</span>{{/rollTotal() hitloc 22}}
-                            {{#rollTotal() hitloc 12}}<span>Left Arm</span>{{/rollTotal() hitloc 12}}
-                            {{#rollTotal() hitloc 03}}<span>Left Arm</span>{{/rollTotal() hitloc 03}}
+                            {{#rollTotal() hitloc 92}}Left Arm{{/rollTotal() hitloc 92}}
+                            {{#rollTotal() hitloc 82}}Left Arm{{/rollTotal() hitloc 82}}
+                            {{#rollTotal() hitloc 72}}Left Arm{{/rollTotal() hitloc 72}}
+                            {{#rollTotal() hitloc 62}}Left Arm{{/rollTotal() hitloc 62}}
+                            {{#rollTotal() hitloc 52}}Left Arm{{/rollTotal() hitloc 52}}
+                            {{#rollTotal() hitloc 42}}Left Arm{{/rollTotal() hitloc 42}}
+                            {{#rollTotal() hitloc 32}}Left Arm{{/rollTotal() hitloc 32}}
+                            {{#rollTotal() hitloc 22}}Left Arm{{/rollTotal() hitloc 22}}
+                            {{#rollTotal() hitloc 12}}Left Arm{{/rollTotal() hitloc 12}}
+                            {{#rollTotal() hitloc 03}}Left Arm{{/rollTotal() hitloc 03}}
                             <!--body locations-->
-                            {{#rollBetween() hitloc 93 96}}<span>Body</span>{{/rollBetween() hitloc 93 96}}
-                            {{#rollBetween() hitloc 83 86}}<span>Body</span>{{/rollBetween() hitloc 83 86}}
-                            {{#rollBetween() hitloc 73 76}}<span>Body</span>{{/rollBetween() hitloc 73 76}}
-                            {{#rollBetween() hitloc 63 66}}<span>Body</span>{{/rollBetween() hitloc 63 66}}
-                            {{#rollBetween() hitloc 53 56}}<span>Body</span>{{/rollBetween() hitloc 53 56}}
-                            {{#rollBetween() hitloc 43 46}}<span>Body</span>{{/rollBetween() hitloc 43 46}}
-                            {{#rollBetween() hitloc 33 36}}<span>Body</span>{{/rollBetween() hitloc 33 36}}
-                            {{#rollBetween() hitloc 23 26}}<span>Body</span>{{/rollBetween() hitloc 23 26}}
-                            {{#rollBetween() hitloc 13 16}}<span>Body</span>{{/rollBetween() hitloc 13 16}}
-                            {{#rollBetween() hitloc 13 16}}<span>Body</span>{{/rollBetween() hitloc 13 16}}
-                            {{#rollBetween() hitloc 04 07}}<span>Body</span>{{/rollBetween() hitloc 04 07}}
+                            {{#rollBetween() hitloc 93 96}}Body{{/rollBetween() hitloc 93 96}}
+                            {{#rollBetween() hitloc 83 86}}Body{{/rollBetween() hitloc 83 86}}
+                            {{#rollBetween() hitloc 73 76}}Body{{/rollBetween() hitloc 73 76}}
+                            {{#rollBetween() hitloc 63 66}}Body{{/rollBetween() hitloc 63 66}}
+                            {{#rollBetween() hitloc 53 56}}Body{{/rollBetween() hitloc 53 56}}
+                            {{#rollBetween() hitloc 43 46}}Body{{/rollBetween() hitloc 43 46}}
+                            {{#rollBetween() hitloc 33 36}}Body{{/rollBetween() hitloc 33 36}}
+                            {{#rollBetween() hitloc 23 26}}Body{{/rollBetween() hitloc 23 26}}
+                            {{#rollBetween() hitloc 13 16}}Body{{/rollBetween() hitloc 13 16}}
+                            {{#rollBetween() hitloc 13 16}}Body{{/rollBetween() hitloc 13 16}}
+                            {{#rollBetween() hitloc 04 07}}Body{{/rollBetween() hitloc 04 07}}
                             <!--right leg locations-->
-                            {{#rollTotal() hitloc 97}}<span>Right Leg</span>{{/rollTotal() hitloc 97}}
-                            {{#rollTotal() hitloc 87}}<span>Right Leg</span>{{/rollTotal() hitloc 87}}
-                            {{#rollTotal() hitloc 77}}<span>Right Leg</span>{{/rollTotal() hitloc 77}}
-                            {{#rollTotal() hitloc 67}}<span>Right Leg</span>{{/rollTotal() hitloc 67}}
-                            {{#rollBetween() hitloc 57 58}}<span>Right Leg<</span>{{/rollBetween() hitloc 57 58}}
-                            {{#rollBetween() hitloc 47 48}}<span>Right Leg<</span>{{/rollBetween() hitloc 47 48}}
-                            {{#rollBetween() hitloc 37 38}}<span>Right Leg<</span>{{/rollBetween() hitloc 37 38}}
-                            {{#rollBetween() hitloc 27 28}}<span>Right Leg<</span>{{/rollBetween() hitloc 27 28}}
-                            {{#rollBetween() hitloc 17 18}}<span>Right Leg<</span>{{/rollBetween() hitloc 17 18}}
-                            {{#rollTotal() hitloc 08}}<span>Right Leg</span>{{/rollTotal() hitloc 08}}
+                            {{#rollTotal() hitloc 97}}Right Leg{{/rollTotal() hitloc 97}}
+                            {{#rollTotal() hitloc 87}}Right Leg{{/rollTotal() hitloc 87}}
+                            {{#rollTotal() hitloc 77}}Right Leg{{/rollTotal() hitloc 77}}
+                            {{#rollTotal() hitloc 67}}Right Leg{{/rollTotal() hitloc 67}}
+                            {{#rollBetween() hitloc 57 58}}Right Leg<{{/rollBetween() hitloc 57 58}}
+                            {{#rollBetween() hitloc 47 48}}Right Leg<{{/rollBetween() hitloc 47 48}}
+                            {{#rollBetween() hitloc 37 38}}Right Leg<{{/rollBetween() hitloc 37 38}}
+                            {{#rollBetween() hitloc 27 28}}Right Leg<{{/rollBetween() hitloc 27 28}}
+                            {{#rollBetween() hitloc 17 18}}Right Leg<{{/rollBetween() hitloc 17 18}}
+                            {{#rollTotal() hitloc 08}}Right Leg{{/rollTotal() hitloc 08}}
                             <!--left leg locations-->
-                            {{#rollTotal() hitloc 100}}<span>Left Leg</span>{{/rollTotal() hitloc 100}}
-                            {{#rollBetween() hitloc 98 99}}<span>Left Leg<</span>{{/rollBetween() hitloc 98 99}}
-                            {{#rollBetween() hitloc 88 89}}<span>Left Leg<</span>{{/rollBetween() hitloc 88 89}}
-                            {{#rollBetween() hitloc 78 79}}<span>Left Leg<</span>{{/rollBetween() hitloc 78 79}}
-                            {{#rollBetween() hitloc 68 69}}<span>Left Leg<</span>{{/rollBetween() hitloc 68 69}}
-                            {{#rollTotal() hitloc 59}}<span>Left Leg</span>{{/rollTotal() hitloc 59}}
-                            {{#rollTotal() hitloc 49}}<span>Left Leg</span>{{/rollTotal() hitloc 49}}
-                            {{#rollTotal() hitloc 39}}<span>Left Leg</span>{{/rollTotal() hitloc 39}}
-                            {{#rollTotal() hitloc 29}}<span>Left Leg</span>{{/rollTotal() hitloc 29}}
-                            {{#rollTotal() hitloc 19}}<span>Left Leg</span>{{/rollTotal() hitloc 19}}
-                            {{#rollTotal() hitloc 09}}<span>Left Leg</span>{{/rollTotal() hitloc 09}}
-                        </div>
+                            {{#rollTotal() hitloc 100}}Left Leg{{/rollTotal() hitloc 100}}
+                            {{#rollBetween() hitloc 98 99}}Left Leg<{{/rollBetween() hitloc 98 99}}
+                            {{#rollBetween() hitloc 88 89}}Left Leg<{{/rollBetween() hitloc 88 89}}
+                            {{#rollBetween() hitloc 78 79}}Left Leg<{{/rollBetween() hitloc 78 79}}
+                            {{#rollBetween() hitloc 68 69}}Left Leg<{{/rollBetween() hitloc 68 69}}
+                            {{#rollTotal() hitloc 59}}Left Leg{{/rollTotal() hitloc 59}}
+                            {{#rollTotal() hitloc 49}}Left Leg{{/rollTotal() hitloc 49}}
+                            {{#rollTotal() hitloc 39}}Left Leg{{/rollTotal() hitloc 39}}
+                            {{#rollTotal() hitloc 29}}Left Leg{{/rollTotal() hitloc 29}}
+                            {{#rollTotal() hitloc 19}}Left Leg{{/rollTotal() hitloc 19}}
+                            {{#rollTotal() hitloc 09}}Left Leg{{/rollTotal() hitloc 09}}
                     {{/^rollGreater() d100a testtarget}}
                 </div>
             {{/attack}}
         <!--section for strike to stun -->
             {{#stun}}
                 <div class="sheet-result">{{stun}}&#160;
-                    {{#rollGreater() d100 testtarget }}Missed...{{/rollGreater() d100 testtarget }}
-                    {{#rollLess() d100 testtarget }}Attack Hits! &#x1F4A2;
-						<div class="sheet-result">{{hitloc}}</div>
-					{{/rollLess() d100 testtarget }}
-                    {{#rollTotal() d100 testtarget }}Attack Hits! &#x1F4A2;
-						<div class="sheet-result">{{hitloc}}</div>
-					{{/rollTotal() d100 testtarget }}
+                    	{{#rollGreater() d100 testtarget }}Missed...{{/rollGreater() d100 testtarget }}
+                    	{{#rollLess() d100 testtarget }}Attack Hits! &#x1F4A2;
+				<div class="sheet-result">{{hitloc}}</div>
+			{{/rollLess() d100 testtarget }}
+                    	{{#rollTotal() d100 testtarget }}Attack Hits! &#x1F4A2;
+				<div class="sheet-result">{{hitloc}}</div>
+			{{/rollTotal() d100 testtarget }}
                 </div>
             {{/stun}}
         <!--section for psy powers result-->
@@ -5082,14 +5080,14 @@ <h1>Special Thanks</h1>
                     {{/rollTotal() d100p testtarget }}
                 </div>
             {{/psyres}}
-		<!--section for DoS and DoF goes under other fields-->
-			{{#dosdof}}
+	<!--section for DoS and DoF goes under other fields-->
+	{{#dosdof}}
                 <div class="sheet-result">{{dosdof}}
                     {{#rollGreater() dosdof 0 }}of Success{{/rollGreater() dosdof 0 }}
                     {{#rollLess() dosdof 0 }}of Failure{{/rollLess() dosdof 0 }}
                     {{#rollTotal() dosdof 0 }}{{/rollTotal() dosdof 0 }}
                 </div>
-            {{/dosdof}}
+        {{/dosdof}}
         <!--section for righteous fury -->
             {{#fury}}
                 <div class="sheet-result">{{fury}}
@@ -5120,8 +5118,8 @@ <h1>Special Thanks</h1>
                     {{#rollWasFumble() bloodloss }}Bleeds to Death &#9760;{{/rollWasFumble() bloodloss }}
                 </div>
             {{/bloodloss}}
-		<!--section for power field parry -->
-		    {{#parry}}
+	<!--section for power field parry -->
+	{{#parry}}
                 <div class="sheet-desc">{{parry}}
                     {{#rollGreater() d100 testtarget }}**Failed!** &#10060;{{/rollGreater() d100 testtarget }}
                     {{#rollLess() d100 testtarget }}**Parried!** &#9989;<br><br>
@@ -5137,7 +5135,7 @@ <h1>Special Thanks</h1>
                         {{/rollWasCrit() d100h }}
                     {{/rollTotal() d100 testtarget }}
                 </div>
-            {{/parry}}
+	{{/parry}}
         <!--section for ship weapons (macrobat)-->
             {{#spmac}}
                 <div class="sheet-result">
diff --git a/Rogue Trader Improved/sheet.json b/Rogue Trader Improved/sheet.json
index 04cdca9e7d8b..17cf57ffb6e5 100644
--- a/Rogue Trader Improved/sheet.json	
+++ b/Rogue Trader Improved/sheet.json	
@@ -4,6 +4,6 @@
     "authors": "Mago",
     "roll20userid": "986445",
     "preview": "RTimprovedPreview.png",
-    "instructions": "Character Sheet designed to play **Warhammer 40k Rogue Trader** pen & paper RPG by Fantasy Flight Games.  This Sheet does Not require API scripts.  Most of the sheets functions are described with **Info Tooltips** hover over fields and buttons to see them  For more information visit the documentation page at [Rogue Trader Improved Wiki](https://wiki.roll20.net/Rogue_trader_improved)  **IMPORTANT TIP** The roll template is best displayed in chat when **turning off the ENABLE CHAT AVATARS** option in the My Settings tab./  If you have any questions, suggestions or feedback, send a private message to [Author Mago](https://app.roll20.net/users/986445/mago)/n**Revision 6 October 2024**",
+    "instructions": "Character Sheet designed to play **Warhammer 40k Rogue Trader** pen & paper RPG by Fantasy Flight Games.\This Sheet does Not require API scripts.\Most of the sheets functions are described with **Info Tooltips** hover over fields and buttons to see them\For more information visit the documentation page at [Rogue Trader Improved Wiki](https://wiki.roll20.net/Rogue_trader_improved)<div></div>**IMPORTANT TIP** The roll template is best displayed in chat when **turning off the ENABLE CHAT AVATARS** option in the My Settings tab.<br/>If you have any questions, suggestions or feedback, send a private message to [Author Mago](https://app.roll20.net/users/986445/mago) &nbsp; **Revision 6 October 2024**",
     "legacy": false
 }
\ No newline at end of file