From df36e5ed1ea8bb4f1bff0ee0d04bb138bedc206c Mon Sep 17 00:00:00 2001
From: Garth Gutenberg <garth.gutenberg@gmail.com>
Date: Wed, 8 Sep 2021 15:28:33 -0500
Subject: [PATCH] Add option to apply hand to hand critical range to modern
 weapons

---
 .../dist/rifts.html                           | 41 +++++++++++--------
 Palladium Rifts by Grinning Gecko/rifts.html  | 41 +++++++++++--------
 Palladium Rifts by Grinning Gecko/sheet.json  |  8 ++++
 .../src/partials/options.html                 |  4 ++
 .../repeating_modifiers_readonly.html         | 16 ++++----
 .../src/rifts.html                            |  5 ++-
 6 files changed, 69 insertions(+), 46 deletions(-)

diff --git a/Palladium Rifts by Grinning Gecko/dist/rifts.html b/Palladium Rifts by Grinning Gecko/dist/rifts.html
index 3fa761399e..a51f7567e7 100644
--- a/Palladium Rifts by Grinning Gecko/dist/rifts.html	
+++ b/Palladium Rifts by Grinning Gecko/dist/rifts.html	
@@ -4743,7 +4743,7 @@
       <span name="attr_strike_range_single"></span>
       <button
         type="roll"
-        value="&{template:custom} {{title=@{character_name} shoots with a single shot!}} {{Range Strike=[[d20+@{strike_range_single}]]}}"
+        value="&{template:custom} {{title=@{character_name} shoots with a single shot!}} {{Range Strike=[[ d20cs>[[ {{ @{opt_critical},0 }dl1 } * (@{critical}-20) + 20]] + @{strike_range_single} ]]}}"
         name="roll_bonus_strike_range_single"
       ></button>
     </label>
@@ -4754,7 +4754,7 @@
       <span name="attr_strike_range_burst"></span>
       <button
         type="roll"
-        value="&{template:custom} {{title=@{character_name} shoots with a burst shot!}} {{Range Strike=[[d20+@{strike_range_burst}]]}}"
+        value="&{template:custom} {{title=@{character_name} shoots with a single shot!}} {{Range Strike=[[ d20cs>[[ {{ @{opt_critical},0 }dl1 } * (@{critical}-20) + 20]] + @{strike_range_burst} ]]}}"
         name="roll_bonus_strike_range_burst"
       ></button>
     </label>
@@ -4771,7 +4771,7 @@
       <span name="attr_strike_range_aimed_single"></span>
       <button
         type="roll"
-        value="&{template:custom} {{title=@{character_name} shoots with an aimed single shot!}} {{Range Aimed Single Strike=[[d20+@{strike_range_aimed_single}]]}}"
+        value="&{template:custom} {{title=@{character_name} shoots with an aimed single shot!}} {{Range Aimed Single Strike=[[ d20cs>[[ {{ @{opt_critical},0 }dl1 } * (@{critical}-20) + 20]] + @{strike_range_aimed_single} ]]}}"
         name="roll_bonus_strike_range_aimed_single"
       ></button>
     </label>
@@ -4782,7 +4782,7 @@
       <span name="attr_strike_range_aimed_pulse"></span>
       <button
         type="roll"
-        value="&{template:custom} {{title=@{character_name} shoots with an aimed pulse shot!}} {{Range Aimed Pulse Strike=[[d20+@{strike_range_aimed_pulse}]]}}"
+        value="&{template:custom} {{title=@{character_name} shoots with an aimed pulse shot!}} {{Range Aimed Pulse Strike=[[ d20cs>[[ {{ @{opt_critical},0 }dl1 } * (@{critical}-20) + 20]] + @{strike_range_aimed_pulse} ]]}}"
         name="roll_bonus_strike_range_aimed_pulse"
       ></button>
     </label>
@@ -4799,7 +4799,7 @@
       <span name="attr_strike_range_called_single"></span>
       <button
         type="roll"
-        value="&{template:custom} {{title=@{character_name} shoots with a called single shot!}} {{Range Called Single Strike=[[d20+@{strike_range_called_single}]]}}"
+        value="&{template:custom} {{title=@{character_name} shoots with a called single shot!}} {{Range Called Single Strike=[[ d20cs>[[ {{ @{opt_critical},0 }dl1 } * (@{critical}-20) + 20]] + @{strike_range_called_single} ]]}}"
         name="roll_bonus_strike_range_called_single"
       ></button>
     </label>
@@ -4810,7 +4810,7 @@
       <span name="attr_strike_range_called_pulse"></span>
       <button
         type="roll"
-        value="&{template:custom} {{title=@{character_name} shoots with a called pulse shot!}} {{Range Called Pulse Strike=[[d20+@{strike_range_called_pulse}]]}}"
+        value="&{template:custom} {{title=@{character_name} shoots with a called pulse shot!}} {{Range Called Pulse Strike=[[ d20cs>[[ {{ @{opt_critical},0 }dl1 } * (@{critical}-20) + 20]] + @{strike_range_called_pulse} ]]}}"
         name="roll_bonus_strike_range_called_pulse"
       ></button>
     </label>
@@ -4825,7 +4825,7 @@
       <span name="attr_strike_range_aimed_called_single"></span>
       <button
         type="roll"
-        value="&{template:custom} {{title=@{character_name} shoots with an aimed called single shot!}} {{Range Aimed Called Single Strike=[[d20+@{strike_range_aimed_called_single}]]}}"
+        value="&{template:custom} {{title=@{character_name} shoots with an aimed called single shot!}} {{Range Aimed Called Single Strike=[[ d20cs>[[ {{ @{opt_critical},0 }dl1 } * (@{critical}-20) + 20]] + @{strike_range_aimed_called_single} ]]}}"
         name="roll_bonus_strike_range_aimed_called_single"
       ></button>
     </label>
@@ -4840,7 +4840,7 @@
       <span name="attr_strike_range_aimed_called_pulse"></span>
       <button
         type="roll"
-        value="&{template:custom} {{title=@{character_name} shoots with an aimed called pulse shot!}} {{Range Aimed Called Pulse Strike=[[d20+@{strike_range_aimed_called_pulse}]]}}"
+        value="&{template:custom} {{title=@{character_name} shoots with an aimed called pulse shot!}} {{Range Aimed Called Pulse Strike=[[ d20cs>[[ {{ @{opt_critical},0 }dl1 } * (@{critical}-20) + 20]] + @{strike_range_aimed_called_pulse} ]]}}"
         name="roll_bonus_strike_range_aimed_called_pulse"
       ></button>
     </label>
@@ -5797,7 +5797,7 @@
       <span name="attr_strike_range_single"></span>
       <button
         type="roll"
-        value="&{template:custom} {{title=@{character_name} shoots with a single shot!}} {{Range Strike=[[d20+@{strike_range_single}]]}}"
+        value="&{template:custom} {{title=@{character_name} shoots with a single shot!}} {{Range Strike=[[ d20cs>[[ {{ @{opt_critical},0 }dl1 } * (@{critical}-20) + 20]] + @{strike_range_single} ]]}}"
         name="roll_bonus_strike_range_single"
       ></button>
     </label>
@@ -5808,7 +5808,7 @@
       <span name="attr_strike_range_burst"></span>
       <button
         type="roll"
-        value="&{template:custom} {{title=@{character_name} shoots with a burst shot!}} {{Range Strike=[[d20+@{strike_range_burst}]]}}"
+        value="&{template:custom} {{title=@{character_name} shoots with a single shot!}} {{Range Strike=[[ d20cs>[[ {{ @{opt_critical},0 }dl1 } * (@{critical}-20) + 20]] + @{strike_range_burst} ]]}}"
         name="roll_bonus_strike_range_burst"
       ></button>
     </label>
@@ -5825,7 +5825,7 @@
       <span name="attr_strike_range_aimed_single"></span>
       <button
         type="roll"
-        value="&{template:custom} {{title=@{character_name} shoots with an aimed single shot!}} {{Range Aimed Single Strike=[[d20+@{strike_range_aimed_single}]]}}"
+        value="&{template:custom} {{title=@{character_name} shoots with an aimed single shot!}} {{Range Aimed Single Strike=[[ d20cs>[[ {{ @{opt_critical},0 }dl1 } * (@{critical}-20) + 20]] + @{strike_range_aimed_single} ]]}}"
         name="roll_bonus_strike_range_aimed_single"
       ></button>
     </label>
@@ -5836,7 +5836,7 @@
       <span name="attr_strike_range_aimed_pulse"></span>
       <button
         type="roll"
-        value="&{template:custom} {{title=@{character_name} shoots with an aimed pulse shot!}} {{Range Aimed Pulse Strike=[[d20+@{strike_range_aimed_pulse}]]}}"
+        value="&{template:custom} {{title=@{character_name} shoots with an aimed pulse shot!}} {{Range Aimed Pulse Strike=[[ d20cs>[[ {{ @{opt_critical},0 }dl1 } * (@{critical}-20) + 20]] + @{strike_range_aimed_pulse} ]]}}"
         name="roll_bonus_strike_range_aimed_pulse"
       ></button>
     </label>
@@ -5853,7 +5853,7 @@
       <span name="attr_strike_range_called_single"></span>
       <button
         type="roll"
-        value="&{template:custom} {{title=@{character_name} shoots with a called single shot!}} {{Range Called Single Strike=[[d20+@{strike_range_called_single}]]}}"
+        value="&{template:custom} {{title=@{character_name} shoots with a called single shot!}} {{Range Called Single Strike=[[ d20cs>[[ {{ @{opt_critical},0 }dl1 } * (@{critical}-20) + 20]] + @{strike_range_called_single} ]]}}"
         name="roll_bonus_strike_range_called_single"
       ></button>
     </label>
@@ -5864,7 +5864,7 @@
       <span name="attr_strike_range_called_pulse"></span>
       <button
         type="roll"
-        value="&{template:custom} {{title=@{character_name} shoots with a called pulse shot!}} {{Range Called Pulse Strike=[[d20+@{strike_range_called_pulse}]]}}"
+        value="&{template:custom} {{title=@{character_name} shoots with a called pulse shot!}} {{Range Called Pulse Strike=[[ d20cs>[[ {{ @{opt_critical},0 }dl1 } * (@{critical}-20) + 20]] + @{strike_range_called_pulse} ]]}}"
         name="roll_bonus_strike_range_called_pulse"
       ></button>
     </label>
@@ -5879,7 +5879,7 @@
       <span name="attr_strike_range_aimed_called_single"></span>
       <button
         type="roll"
-        value="&{template:custom} {{title=@{character_name} shoots with an aimed called single shot!}} {{Range Aimed Called Single Strike=[[d20+@{strike_range_aimed_called_single}]]}}"
+        value="&{template:custom} {{title=@{character_name} shoots with an aimed called single shot!}} {{Range Aimed Called Single Strike=[[ d20cs>[[ {{ @{opt_critical},0 }dl1 } * (@{critical}-20) + 20]] + @{strike_range_aimed_called_single} ]]}}"
         name="roll_bonus_strike_range_aimed_called_single"
       ></button>
     </label>
@@ -5894,7 +5894,7 @@
       <span name="attr_strike_range_aimed_called_pulse"></span>
       <button
         type="roll"
-        value="&{template:custom} {{title=@{character_name} shoots with an aimed called pulse shot!}} {{Range Aimed Called Pulse Strike=[[d20+@{strike_range_aimed_called_pulse}]]}}"
+        value="&{template:custom} {{title=@{character_name} shoots with an aimed called pulse shot!}} {{Range Aimed Called Pulse Strike=[[ d20cs>[[ {{ @{opt_critical},0 }dl1 } * (@{critical}-20) + 20]] + @{strike_range_aimed_called_pulse} ]]}}"
         name="roll_bonus_strike_range_aimed_called_pulse"
       ></button>
     </label>
@@ -6308,6 +6308,10 @@
       ><input type="checkbox" name="attr_opt_paired_damage" value="1" /> Apply
       PS damage to <b>each hand</b> in Paired attack</label
     >
+    <label
+      ><input type="checkbox" name="attr_opt_critical" value="1" /> Apply Hand
+      to Hand critical (19-20, 18-20) to modern weapons as well</label
+    >
     <hr />
     <h3>Import/Export</h3>
     <details>
@@ -9417,8 +9421,9 @@ on("sheet:opened", async (e) => {
   /* endinject */
 
   /**
-   * [] Fix iq_bonus() function to use default profile, not top.
-   * - [] skill bonuses aren't calculating properly.
+   * [x] Fix iq_bonus() function to use default profile, not top.
+   * - [x] skill bonuses aren't calculating properly.
+   * - [] TEST THOROUGHLY!
    * [] Refactor to get rid of the Bonuses repeating section and instead go straight from Modifiers to Picked Modifiers. I think the Bonuses section causes weird issues related to network/multiple updates at the same time.
    * [] Fix CSS on "Psionics vs. [n]"
    * [] Add range to modifiers (guns)
diff --git a/Palladium Rifts by Grinning Gecko/rifts.html b/Palladium Rifts by Grinning Gecko/rifts.html
index 3fa761399e..a51f7567e7 100644
--- a/Palladium Rifts by Grinning Gecko/rifts.html	
+++ b/Palladium Rifts by Grinning Gecko/rifts.html	
@@ -4743,7 +4743,7 @@
       <span name="attr_strike_range_single"></span>
       <button
         type="roll"
-        value="&{template:custom} {{title=@{character_name} shoots with a single shot!}} {{Range Strike=[[d20+@{strike_range_single}]]}}"
+        value="&{template:custom} {{title=@{character_name} shoots with a single shot!}} {{Range Strike=[[ d20cs>[[ {{ @{opt_critical},0 }dl1 } * (@{critical}-20) + 20]] + @{strike_range_single} ]]}}"
         name="roll_bonus_strike_range_single"
       ></button>
     </label>
@@ -4754,7 +4754,7 @@
       <span name="attr_strike_range_burst"></span>
       <button
         type="roll"
-        value="&{template:custom} {{title=@{character_name} shoots with a burst shot!}} {{Range Strike=[[d20+@{strike_range_burst}]]}}"
+        value="&{template:custom} {{title=@{character_name} shoots with a single shot!}} {{Range Strike=[[ d20cs>[[ {{ @{opt_critical},0 }dl1 } * (@{critical}-20) + 20]] + @{strike_range_burst} ]]}}"
         name="roll_bonus_strike_range_burst"
       ></button>
     </label>
@@ -4771,7 +4771,7 @@
       <span name="attr_strike_range_aimed_single"></span>
       <button
         type="roll"
-        value="&{template:custom} {{title=@{character_name} shoots with an aimed single shot!}} {{Range Aimed Single Strike=[[d20+@{strike_range_aimed_single}]]}}"
+        value="&{template:custom} {{title=@{character_name} shoots with an aimed single shot!}} {{Range Aimed Single Strike=[[ d20cs>[[ {{ @{opt_critical},0 }dl1 } * (@{critical}-20) + 20]] + @{strike_range_aimed_single} ]]}}"
         name="roll_bonus_strike_range_aimed_single"
       ></button>
     </label>
@@ -4782,7 +4782,7 @@
       <span name="attr_strike_range_aimed_pulse"></span>
       <button
         type="roll"
-        value="&{template:custom} {{title=@{character_name} shoots with an aimed pulse shot!}} {{Range Aimed Pulse Strike=[[d20+@{strike_range_aimed_pulse}]]}}"
+        value="&{template:custom} {{title=@{character_name} shoots with an aimed pulse shot!}} {{Range Aimed Pulse Strike=[[ d20cs>[[ {{ @{opt_critical},0 }dl1 } * (@{critical}-20) + 20]] + @{strike_range_aimed_pulse} ]]}}"
         name="roll_bonus_strike_range_aimed_pulse"
       ></button>
     </label>
@@ -4799,7 +4799,7 @@
       <span name="attr_strike_range_called_single"></span>
       <button
         type="roll"
-        value="&{template:custom} {{title=@{character_name} shoots with a called single shot!}} {{Range Called Single Strike=[[d20+@{strike_range_called_single}]]}}"
+        value="&{template:custom} {{title=@{character_name} shoots with a called single shot!}} {{Range Called Single Strike=[[ d20cs>[[ {{ @{opt_critical},0 }dl1 } * (@{critical}-20) + 20]] + @{strike_range_called_single} ]]}}"
         name="roll_bonus_strike_range_called_single"
       ></button>
     </label>
@@ -4810,7 +4810,7 @@
       <span name="attr_strike_range_called_pulse"></span>
       <button
         type="roll"
-        value="&{template:custom} {{title=@{character_name} shoots with a called pulse shot!}} {{Range Called Pulse Strike=[[d20+@{strike_range_called_pulse}]]}}"
+        value="&{template:custom} {{title=@{character_name} shoots with a called pulse shot!}} {{Range Called Pulse Strike=[[ d20cs>[[ {{ @{opt_critical},0 }dl1 } * (@{critical}-20) + 20]] + @{strike_range_called_pulse} ]]}}"
         name="roll_bonus_strike_range_called_pulse"
       ></button>
     </label>
@@ -4825,7 +4825,7 @@
       <span name="attr_strike_range_aimed_called_single"></span>
       <button
         type="roll"
-        value="&{template:custom} {{title=@{character_name} shoots with an aimed called single shot!}} {{Range Aimed Called Single Strike=[[d20+@{strike_range_aimed_called_single}]]}}"
+        value="&{template:custom} {{title=@{character_name} shoots with an aimed called single shot!}} {{Range Aimed Called Single Strike=[[ d20cs>[[ {{ @{opt_critical},0 }dl1 } * (@{critical}-20) + 20]] + @{strike_range_aimed_called_single} ]]}}"
         name="roll_bonus_strike_range_aimed_called_single"
       ></button>
     </label>
@@ -4840,7 +4840,7 @@
       <span name="attr_strike_range_aimed_called_pulse"></span>
       <button
         type="roll"
-        value="&{template:custom} {{title=@{character_name} shoots with an aimed called pulse shot!}} {{Range Aimed Called Pulse Strike=[[d20+@{strike_range_aimed_called_pulse}]]}}"
+        value="&{template:custom} {{title=@{character_name} shoots with an aimed called pulse shot!}} {{Range Aimed Called Pulse Strike=[[ d20cs>[[ {{ @{opt_critical},0 }dl1 } * (@{critical}-20) + 20]] + @{strike_range_aimed_called_pulse} ]]}}"
         name="roll_bonus_strike_range_aimed_called_pulse"
       ></button>
     </label>
@@ -5797,7 +5797,7 @@
       <span name="attr_strike_range_single"></span>
       <button
         type="roll"
-        value="&{template:custom} {{title=@{character_name} shoots with a single shot!}} {{Range Strike=[[d20+@{strike_range_single}]]}}"
+        value="&{template:custom} {{title=@{character_name} shoots with a single shot!}} {{Range Strike=[[ d20cs>[[ {{ @{opt_critical},0 }dl1 } * (@{critical}-20) + 20]] + @{strike_range_single} ]]}}"
         name="roll_bonus_strike_range_single"
       ></button>
     </label>
@@ -5808,7 +5808,7 @@
       <span name="attr_strike_range_burst"></span>
       <button
         type="roll"
-        value="&{template:custom} {{title=@{character_name} shoots with a burst shot!}} {{Range Strike=[[d20+@{strike_range_burst}]]}}"
+        value="&{template:custom} {{title=@{character_name} shoots with a single shot!}} {{Range Strike=[[ d20cs>[[ {{ @{opt_critical},0 }dl1 } * (@{critical}-20) + 20]] + @{strike_range_burst} ]]}}"
         name="roll_bonus_strike_range_burst"
       ></button>
     </label>
@@ -5825,7 +5825,7 @@
       <span name="attr_strike_range_aimed_single"></span>
       <button
         type="roll"
-        value="&{template:custom} {{title=@{character_name} shoots with an aimed single shot!}} {{Range Aimed Single Strike=[[d20+@{strike_range_aimed_single}]]}}"
+        value="&{template:custom} {{title=@{character_name} shoots with an aimed single shot!}} {{Range Aimed Single Strike=[[ d20cs>[[ {{ @{opt_critical},0 }dl1 } * (@{critical}-20) + 20]] + @{strike_range_aimed_single} ]]}}"
         name="roll_bonus_strike_range_aimed_single"
       ></button>
     </label>
@@ -5836,7 +5836,7 @@
       <span name="attr_strike_range_aimed_pulse"></span>
       <button
         type="roll"
-        value="&{template:custom} {{title=@{character_name} shoots with an aimed pulse shot!}} {{Range Aimed Pulse Strike=[[d20+@{strike_range_aimed_pulse}]]}}"
+        value="&{template:custom} {{title=@{character_name} shoots with an aimed pulse shot!}} {{Range Aimed Pulse Strike=[[ d20cs>[[ {{ @{opt_critical},0 }dl1 } * (@{critical}-20) + 20]] + @{strike_range_aimed_pulse} ]]}}"
         name="roll_bonus_strike_range_aimed_pulse"
       ></button>
     </label>
@@ -5853,7 +5853,7 @@
       <span name="attr_strike_range_called_single"></span>
       <button
         type="roll"
-        value="&{template:custom} {{title=@{character_name} shoots with a called single shot!}} {{Range Called Single Strike=[[d20+@{strike_range_called_single}]]}}"
+        value="&{template:custom} {{title=@{character_name} shoots with a called single shot!}} {{Range Called Single Strike=[[ d20cs>[[ {{ @{opt_critical},0 }dl1 } * (@{critical}-20) + 20]] + @{strike_range_called_single} ]]}}"
         name="roll_bonus_strike_range_called_single"
       ></button>
     </label>
@@ -5864,7 +5864,7 @@
       <span name="attr_strike_range_called_pulse"></span>
       <button
         type="roll"
-        value="&{template:custom} {{title=@{character_name} shoots with a called pulse shot!}} {{Range Called Pulse Strike=[[d20+@{strike_range_called_pulse}]]}}"
+        value="&{template:custom} {{title=@{character_name} shoots with a called pulse shot!}} {{Range Called Pulse Strike=[[ d20cs>[[ {{ @{opt_critical},0 }dl1 } * (@{critical}-20) + 20]] + @{strike_range_called_pulse} ]]}}"
         name="roll_bonus_strike_range_called_pulse"
       ></button>
     </label>
@@ -5879,7 +5879,7 @@
       <span name="attr_strike_range_aimed_called_single"></span>
       <button
         type="roll"
-        value="&{template:custom} {{title=@{character_name} shoots with an aimed called single shot!}} {{Range Aimed Called Single Strike=[[d20+@{strike_range_aimed_called_single}]]}}"
+        value="&{template:custom} {{title=@{character_name} shoots with an aimed called single shot!}} {{Range Aimed Called Single Strike=[[ d20cs>[[ {{ @{opt_critical},0 }dl1 } * (@{critical}-20) + 20]] + @{strike_range_aimed_called_single} ]]}}"
         name="roll_bonus_strike_range_aimed_called_single"
       ></button>
     </label>
@@ -5894,7 +5894,7 @@
       <span name="attr_strike_range_aimed_called_pulse"></span>
       <button
         type="roll"
-        value="&{template:custom} {{title=@{character_name} shoots with an aimed called pulse shot!}} {{Range Aimed Called Pulse Strike=[[d20+@{strike_range_aimed_called_pulse}]]}}"
+        value="&{template:custom} {{title=@{character_name} shoots with an aimed called pulse shot!}} {{Range Aimed Called Pulse Strike=[[ d20cs>[[ {{ @{opt_critical},0 }dl1 } * (@{critical}-20) + 20]] + @{strike_range_aimed_called_pulse} ]]}}"
         name="roll_bonus_strike_range_aimed_called_pulse"
       ></button>
     </label>
@@ -6308,6 +6308,10 @@
       ><input type="checkbox" name="attr_opt_paired_damage" value="1" /> Apply
       PS damage to <b>each hand</b> in Paired attack</label
     >
+    <label
+      ><input type="checkbox" name="attr_opt_critical" value="1" /> Apply Hand
+      to Hand critical (19-20, 18-20) to modern weapons as well</label
+    >
     <hr />
     <h3>Import/Export</h3>
     <details>
@@ -9417,8 +9421,9 @@ on("sheet:opened", async (e) => {
   /* endinject */
 
   /**
-   * [] Fix iq_bonus() function to use default profile, not top.
-   * - [] skill bonuses aren't calculating properly.
+   * [x] Fix iq_bonus() function to use default profile, not top.
+   * - [x] skill bonuses aren't calculating properly.
+   * - [] TEST THOROUGHLY!
    * [] Refactor to get rid of the Bonuses repeating section and instead go straight from Modifiers to Picked Modifiers. I think the Bonuses section causes weird issues related to network/multiple updates at the same time.
    * [] Fix CSS on "Psionics vs. [n]"
    * [] Add range to modifiers (guns)
diff --git a/Palladium Rifts by Grinning Gecko/sheet.json b/Palladium Rifts by Grinning Gecko/sheet.json
index 57f4be6c23..64fa7e4bd4 100644
--- a/Palladium Rifts by Grinning Gecko/sheet.json	
+++ b/Palladium Rifts by Grinning Gecko/sheet.json	
@@ -36,6 +36,14 @@
       "description": "If attacking using paired weapons, checking this will apply any PS bonus/Punch damage as applicable to <b>each weapon</b> in a Paired Weapons attack. Otherwise the PS damage is applied once to the total of both hands. If unchecked, this will also divide the PS damage by 2 when using Paired Weapons but only striking with one weapon.",
       "type": "checkbox",
       "value": "1"
+    },
+    {
+      "attribute": "opt_critical",
+      "displayname": "Apply Hand to Hand critical (19-20, 18-20) to modern weapons as well",
+      "description": "If a character has a critical on 19-20 or 18-20 from their Hand to Hand skill, apply this to modern weapons as well.",
+      "type": "checkbox",
+      "value": "1",
+      "checked": "checked"
     }
   ]
 }
diff --git a/Palladium Rifts by Grinning Gecko/src/partials/options.html b/Palladium Rifts by Grinning Gecko/src/partials/options.html
index 64a779ad9f..e8c5c3d34d 100644
--- a/Palladium Rifts by Grinning Gecko/src/partials/options.html	
+++ b/Palladium Rifts by Grinning Gecko/src/partials/options.html	
@@ -22,6 +22,10 @@
       ><input type="checkbox" name="attr_opt_paired_damage" value="1" /> Apply
       PS damage to <b>each hand</b> in Paired attack</label
     >
+    <label
+      ><input type="checkbox" name="attr_opt_critical" value="1" /> Apply Hand
+      to Hand critical (19-20, 18-20) to modern weapons as well</label
+    >
     <hr />
     <h3>Import/Export</h3>
     <details>
diff --git a/Palladium Rifts by Grinning Gecko/src/partials/repeating_modifiers_readonly.html b/Palladium Rifts by Grinning Gecko/src/partials/repeating_modifiers_readonly.html
index 9512b99fa2..f977b99cf0 100644
--- a/Palladium Rifts by Grinning Gecko/src/partials/repeating_modifiers_readonly.html	
+++ b/Palladium Rifts by Grinning Gecko/src/partials/repeating_modifiers_readonly.html	
@@ -517,7 +517,7 @@
       <span name="attr_strike_range_single"></span>
       <button
         type="roll"
-        value="&{template:custom} {{title=@{character_name} shoots with a single shot!}} {{Range Strike=[[d20+@{strike_range_single}]]}}"
+        value="&{template:custom} {{title=@{character_name} shoots with a single shot!}} {{Range Strike=[[ d20cs>[[ {{ @{opt_critical},0 }dl1 } * (@{critical}-20) + 20]] + @{strike_range_single} ]]}}"
         name="roll_bonus_strike_range_single"
       ></button>
     </label>
@@ -528,7 +528,7 @@
       <span name="attr_strike_range_burst"></span>
       <button
         type="roll"
-        value="&{template:custom} {{title=@{character_name} shoots with a burst shot!}} {{Range Strike=[[d20+@{strike_range_burst}]]}}"
+        value="&{template:custom} {{title=@{character_name} shoots with a single shot!}} {{Range Strike=[[ d20cs>[[ {{ @{opt_critical},0 }dl1 } * (@{critical}-20) + 20]] + @{strike_range_burst} ]]}}"
         name="roll_bonus_strike_range_burst"
       ></button>
     </label>
@@ -545,7 +545,7 @@
       <span name="attr_strike_range_aimed_single"></span>
       <button
         type="roll"
-        value="&{template:custom} {{title=@{character_name} shoots with an aimed single shot!}} {{Range Aimed Single Strike=[[d20+@{strike_range_aimed_single}]]}}"
+        value="&{template:custom} {{title=@{character_name} shoots with an aimed single shot!}} {{Range Aimed Single Strike=[[ d20cs>[[ {{ @{opt_critical},0 }dl1 } * (@{critical}-20) + 20]] + @{strike_range_aimed_single} ]]}}"
         name="roll_bonus_strike_range_aimed_single"
       ></button>
     </label>
@@ -556,7 +556,7 @@
       <span name="attr_strike_range_aimed_pulse"></span>
       <button
         type="roll"
-        value="&{template:custom} {{title=@{character_name} shoots with an aimed pulse shot!}} {{Range Aimed Pulse Strike=[[d20+@{strike_range_aimed_pulse}]]}}"
+        value="&{template:custom} {{title=@{character_name} shoots with an aimed pulse shot!}} {{Range Aimed Pulse Strike=[[ d20cs>[[ {{ @{opt_critical},0 }dl1 } * (@{critical}-20) + 20]] + @{strike_range_aimed_pulse} ]]}}"
         name="roll_bonus_strike_range_aimed_pulse"
       ></button>
     </label>
@@ -573,7 +573,7 @@
       <span name="attr_strike_range_called_single"></span>
       <button
         type="roll"
-        value="&{template:custom} {{title=@{character_name} shoots with a called single shot!}} {{Range Called Single Strike=[[d20+@{strike_range_called_single}]]}}"
+        value="&{template:custom} {{title=@{character_name} shoots with a called single shot!}} {{Range Called Single Strike=[[ d20cs>[[ {{ @{opt_critical},0 }dl1 } * (@{critical}-20) + 20]] + @{strike_range_called_single} ]]}}"
         name="roll_bonus_strike_range_called_single"
       ></button>
     </label>
@@ -584,7 +584,7 @@
       <span name="attr_strike_range_called_pulse"></span>
       <button
         type="roll"
-        value="&{template:custom} {{title=@{character_name} shoots with a called pulse shot!}} {{Range Called Pulse Strike=[[d20+@{strike_range_called_pulse}]]}}"
+        value="&{template:custom} {{title=@{character_name} shoots with a called pulse shot!}} {{Range Called Pulse Strike=[[ d20cs>[[ {{ @{opt_critical},0 }dl1 } * (@{critical}-20) + 20]] + @{strike_range_called_pulse} ]]}}"
         name="roll_bonus_strike_range_called_pulse"
       ></button>
     </label>
@@ -599,7 +599,7 @@
       <span name="attr_strike_range_aimed_called_single"></span>
       <button
         type="roll"
-        value="&{template:custom} {{title=@{character_name} shoots with an aimed called single shot!}} {{Range Aimed Called Single Strike=[[d20+@{strike_range_aimed_called_single}]]}}"
+        value="&{template:custom} {{title=@{character_name} shoots with an aimed called single shot!}} {{Range Aimed Called Single Strike=[[ d20cs>[[ {{ @{opt_critical},0 }dl1 } * (@{critical}-20) + 20]] + @{strike_range_aimed_called_single} ]]}}"
         name="roll_bonus_strike_range_aimed_called_single"
       ></button>
     </label>
@@ -614,7 +614,7 @@
       <span name="attr_strike_range_aimed_called_pulse"></span>
       <button
         type="roll"
-        value="&{template:custom} {{title=@{character_name} shoots with an aimed called pulse shot!}} {{Range Aimed Called Pulse Strike=[[d20+@{strike_range_aimed_called_pulse}]]}}"
+        value="&{template:custom} {{title=@{character_name} shoots with an aimed called pulse shot!}} {{Range Aimed Called Pulse Strike=[[ d20cs>[[ {{ @{opt_critical},0 }dl1 } * (@{critical}-20) + 20]] + @{strike_range_aimed_called_pulse} ]]}}"
         name="roll_bonus_strike_range_aimed_called_pulse"
       ></button>
     </label>
diff --git a/Palladium Rifts by Grinning Gecko/src/rifts.html b/Palladium Rifts by Grinning Gecko/src/rifts.html
index 854f8159e3..f6ef161447 100644
--- a/Palladium Rifts by Grinning Gecko/src/rifts.html	
+++ b/Palladium Rifts by Grinning Gecko/src/rifts.html	
@@ -762,8 +762,9 @@
   /* endinject */
 
   /**
-   * [] Fix iq_bonus() function to use default profile, not top.
-   * - [] skill bonuses aren't calculating properly.
+   * [x] Fix iq_bonus() function to use default profile, not top.
+   * - [x] skill bonuses aren't calculating properly.
+   * - [] TEST THOROUGHLY!
    * [] Refactor to get rid of the Bonuses repeating section and instead go straight from Modifiers to Picked Modifiers. I think the Bonuses section causes weird issues related to network/multiple updates at the same time.
    * [] Fix CSS on "Psionics vs. [n]"
    * [] Add range to modifiers (guns)