From 1de079032d9cf6dc27b340497ab40cddd935cd78 Mon Sep 17 00:00:00 2001
From: Michael Raichelson <i.am@michaelraichelson.com>
Date: Mon, 1 Feb 2021 12:22:42 -0600
Subject: [PATCH 1/2] Cyberpunk Red Tabbed: Updates/fixes * Add Precision
 Attack from the Solo Role to attack rolls automatically. * Fix the Evasion
 button in the Combat section to be based on DEX not REF.

---
 Cyberpunk Red Tabbed/cyberpunk-red-tabbed.html | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/Cyberpunk Red Tabbed/cyberpunk-red-tabbed.html b/Cyberpunk Red Tabbed/cyberpunk-red-tabbed.html
index 59d59395d0..d86b9e5b83 100644
--- a/Cyberpunk Red Tabbed/cyberpunk-red-tabbed.html	
+++ b/Cyberpunk Red Tabbed/cyberpunk-red-tabbed.html	
@@ -2987,7 +2987,7 @@
                 <input type="number" value="0" name="attr_evasionmodifier" />
                 <button
                   type="roll"
-                  value="&{template:skill}{{charactername=@{character_name}}} {{skillname=Evasion}} {{skillvalue=@{skill_evasion}}} {{statname=REF}} {{statvalue=@{stat_ref}}} {{finalmodifier=@{finalmodifier}}} {{roll=[[1d10 + @{skill_evasion} + @{stat_ref} + @{armor_penalty} + @{finalmodifier} + @{evasionmodifier}]]}} {{critroll=[[1d10]]}}"
+                  value="&{template:skill}{{charactername=@{character_name}}} {{skillname=Evasion}} {{skillvalue=@{skill_evasion}}} {{statname=DEX}} {{statvalue=@{stat_dex}}} {{finalmodifier=@{finalmodifier}}} {{roll=[[1d10 + @{skill_evasion} + @{stat_dex} + @{armor_penalty} + @{finalmodifier} + @{evasionmodifier}]]}} {{critroll=[[1d10]]}}"
                 >
                   Evasion
                 </button>
@@ -3155,7 +3155,7 @@
                   class="autofirebutton"
                   type="roll"
                   name="roll_autofire"
-                  value="&{template:attack}{{charactername=@{character_name}}}{{weapon=@{weaponname} (Autofire)}}{{specialrule=See full Autofire rules on p.173}}{{roll=[[1d10+@{skill_autofire}+@{stat_ref}+@{armor_penalty}+@{weaponmodifier}+@{finalmodifier}]]}}{{critroll=[[1d10]]}}"
+                  value="&{template:attack}{{charactername=@{character_name}}}{{weapon=@{weaponname} (Autofire)}}{{specialrule=See full Autofire rules on p.173}}{{roll=[[1d10+@{skill_autofire}+@{stat_ref}+@{armor_penalty}+@{weaponmodifier}+@{role_solo_precisionattack_calc}+@{finalmodifier}]]}}{{critroll=[[1d10]]}}"
                 >
                   Autofire
                 </button>
@@ -3168,14 +3168,14 @@
                   class="suppfirebutton"
                   type="roll"
                   name="roll_suppfire"
-                  value="&{template:attack}{{charactername=@{character_name}}}{{weapon=@{weaponname} (Suppressing Fire)}}{{specialrule=Opponents need to make a Concentration check. (See p.174)}}{{roll=[[1d10+@{skill_autofire}+@{stat_ref}+@{armor_penalty}+@{weaponmodifier}+@{finalmodifier}]]}}{{critroll=[[1d10]]}}"
+                  value="&{template:attack}{{charactername=@{character_name}}}{{weapon=@{weaponname} (Suppressing Fire)}}{{specialrule=Opponents need to make a Concentration check. (See p.174)}}{{roll=[[1d10+@{skill_autofire}+@{stat_ref}+@{armor_penalty}+@{weaponmodifier}+@{role_solo_precisionattack_calc}+@{finalmodifier}]]}}{{critroll=[[1d10]]}}"
                 >
                   Suppressing Fire
                 </button>
                 <button
                   type="roll"
                   name="roll_attack"
-                  value="&{template:attack}{{charactername=@{character_name}}}{{weapon=@{weaponname}}}{{roll=[[1d10+@{weaponskill}+@{armor_penalty}+@{weaponmodifier}+@{finalmodifier}]]}}{{critroll=[[1d10]]}}"
+                  value="&{template:attack}{{charactername=@{character_name}}}{{weapon=@{weaponname}}}{{roll=[[1d10+@{weaponskill}+@{armor_penalty}+@{weaponmodifier}+@{role_solo_precisionattack_calc}+@{finalmodifier}]]}}{{critroll=[[1d10]]}}"
                 >
                   Attack
                 </button>
@@ -3206,11 +3206,6 @@
               <div class="martialart">
                 <div class="columns">
                   <div class="column">
-                    <!--
-                    Roll20 won't allow us to just read values from the shared 
-                    repeating fieldset in roll templates, there needs to be an
-                    input field to actually give us a readable value to include.
-                    -->
                     <div style="display: none">
                       <input type="text" name="attr_skillname" />
                       <input type="number" name="attr_skillvalue" />
@@ -3702,7 +3697,7 @@
               <fieldset class="repeating_cyberinternal">
                 <div class="columns">
                   <div class="column label">Name</div>
-                  <div lass="column column-5">
+                  <div class="column column-5">
                     <input type="text" name="attr_cyberwarename" />
                   </div>
                 </div>
@@ -3932,8 +3927,6 @@
       </div>
     </div>
   </div>
-
-  <!-- The "modifiers" component is included twice but only needs one set of JS -->
   <script type="text/worker">
     /**
      * Convert from Roll20's handling of checkbox values to

From 8e86051cc676150fc1537407969bea75cba1907b Mon Sep 17 00:00:00 2001
From: Michael Raichelson <i.am@michaelraichelson.com>
Date: Mon, 1 Feb 2021 14:29:54 -0600
Subject: [PATCH 2/2] Cyberpunk Red Tabbed: fix weirdness with hidden field
 with no default value that gets used in a roll template

---
 Cyberpunk Red Tabbed/cyberpunk-red-tabbed.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Cyberpunk Red Tabbed/cyberpunk-red-tabbed.html b/Cyberpunk Red Tabbed/cyberpunk-red-tabbed.html
index d86b9e5b83..5c7391a689 100644
--- a/Cyberpunk Red Tabbed/cyberpunk-red-tabbed.html	
+++ b/Cyberpunk Red Tabbed/cyberpunk-red-tabbed.html	
@@ -748,6 +748,7 @@
                   <input
                     type="hidden"
                     name="attr_role_solo_precisionattack_calc"
+                    value="0"
                   />
                   Precision Attack (+<span
                     name="attr_role_solo_precisionattack_calc"
@@ -3296,7 +3297,7 @@
                   </div>
                   <div class="column">
                     <select name="attr_armor_penalty">
-                      <option value="0">0</option>
+                      <option value="0" selected="selected">0</option>
                       <option value="-2">-2</option>
                       <option value="-4">-4</option>
                     </select>
@@ -3927,6 +3928,8 @@
       </div>
     </div>
   </div>
+
+  <!-- The "modifiers" component is included twice but only needs one set of JS -->
   <script type="text/worker">
     /**
      * Convert from Roll20's handling of checkbox values to