From 5c34e531efd3c1bbd0ee78fa4dafc8ba42a917ef Mon Sep 17 00:00:00 2001
From: ViralReaction <136116069+ViralReaction@users.noreply.github.com>
Date: Sat, 30 May 2026 21:25:37 -0600
Subject: [PATCH 1/4] Swap to Trajectory Worker

---
 Defs/Ammo/Projectiles_Fragments.xml              | 7 +++++--
 Defs/ThingDefs_Misc/Weapons_Grenades.xml         | 5 +++--
 Patches/Core/ThingDefs_Misc/Weapons_Grenades.xml | 3 ++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Defs/Ammo/Projectiles_Fragments.xml b/Defs/Ammo/Projectiles_Fragments.xml
index 1ffeb15090..53a3aa53a2 100644
--- a/Defs/Ammo/Projectiles_Fragments.xml
+++ b/Defs/Ammo/Projectiles_Fragments.xml
@@ -15,9 +15,10 @@
 			<armorPenetrationBlunt>122.5</armorPenetrationBlunt>
 			<tickToTruePos>0</tickToTruePos>
 			<ballisticCoefficient>0.95~1.42</ballisticCoefficient>
-			<gravityFactor>5</gravityFactor>
+			<gravityFactor>60</gravityFactor>
 			<mass>65~75</mass>
 			<diameter>10~12</diameter>
+			<trajectoryWorker>CombatExtended.BallisticsTrajectoryWorker</trajectoryWorker>
 		</projectile>
 	</ThingDef>
 
@@ -39,6 +40,7 @@
 			<diameter>6~8</diameter>
 			<mass>14~16</mass>
 			<ballisticCoefficient>0.95~1.42</ballisticCoefficient>
+			<trajectoryWorker>CombatExtended.BallisticsTrajectoryWorker</trajectoryWorker>
 		</projectile>
 	</ThingDef>
 
@@ -56,11 +58,12 @@
 			<armorPenetrationSharp>2</armorPenetrationSharp>
 			<armorPenetrationBlunt>14.4</armorPenetrationBlunt>
 			<tickToTruePos>0</tickToTruePos>
-			<gravityFactor>5</gravityFactor>
+			<gravityFactor>60</gravityFactor>
 			<diameter>3.5~4.5</diameter>
 			<mass>3.5~4.5</mass>
 			<ballisticCoefficient>0.95~1.42</ballisticCoefficient>
 			<shieldDamageMultiplier>0.25</shieldDamageMultiplier>
+			<trajectoryWorker>CombatExtended.BallisticsTrajectoryWorker</trajectoryWorker>
 		</projectile>
 	</ThingDef>
 <!--
diff --git a/Defs/ThingDefs_Misc/Weapons_Grenades.xml b/Defs/ThingDefs_Misc/Weapons_Grenades.xml
index 17e3970a3f..0b13c365f7 100644
--- a/Defs/ThingDefs_Misc/Weapons_Grenades.xml
+++ b/Defs/ThingDefs_Misc/Weapons_Grenades.xml
@@ -124,7 +124,7 @@
 		<verbs>
 			<li Class="CombatExtended.VerbPropertiesCE">
 				<label>throw concussion grenade</label>
-				<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+				<verbClass>CombatExtended.Verb_ThrowGrenade</verbClass>
 				<hasStandardCommand>true</hasStandardCommand>
 				<range>10.0</range>
 				<minRange>2.9</minRange>
@@ -206,7 +206,7 @@
 		<verbs>
 			<li Class="CombatExtended.VerbPropertiesCE">
 				<label>throw flashbang grenade</label>
-				<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+				<verbClass>CombatExtended.Verb_ThrowGrenade</verbClass>
 				<hasStandardCommand>true</hasStandardCommand>
 				<range>10</range>
 				<warmupTime>0.8</warmupTime>
@@ -254,6 +254,7 @@
 			<ballisticCoefficient>10.0~10.0</ballisticCoefficient>
 			<mass>1400~1500</mass>
 			<diameter>100~120</diameter>
+			<lerpPosition>true</lerpPosition>
 		</projectile>
 	</ThingDef>
 
diff --git a/Patches/Core/ThingDefs_Misc/Weapons_Grenades.xml b/Patches/Core/ThingDefs_Misc/Weapons_Grenades.xml
index db02829299..95496f6d8f 100644
--- a/Patches/Core/ThingDefs_Misc/Weapons_Grenades.xml
+++ b/Patches/Core/ThingDefs_Misc/Weapons_Grenades.xml
@@ -106,6 +106,7 @@
 				<ballisticCoefficient>2.0~2.0</ballisticCoefficient>
 				<mass>400~400</mass>
 				<diameter>64~64</diameter>
+				<lerpPosition>true</lerpPosition>
 			</projectile>
 		</value>
 	</Operation>
@@ -208,7 +209,7 @@
 		</statBases>
 		<Properties>
 			<label>throw frag grenade</label>
-			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<verbClass>CombatExtended.Verb_ThrowGrenade</verbClass>
 			<hasStandardCommand>true</hasStandardCommand>
 			<range>10.0</range>
 			<minRange>4</minRange>

From 450fc89a8edd8e2db8356376490ecf2f2701e4b6 Mon Sep 17 00:00:00 2001
From: ViralReaction <136116069+ViralReaction@users.noreply.github.com>
Date: Sat, 30 May 2026 21:56:03 -0600
Subject: [PATCH 2/4] Trajectory Worker Grenade Projectile

---
 Defs/ThingDefs_Misc/Weapons_Grenades.xml         | 12 ++++++++----
 Patches/Core/ThingDefs_Misc/Weapons_Grenades.xml |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Defs/ThingDefs_Misc/Weapons_Grenades.xml b/Defs/ThingDefs_Misc/Weapons_Grenades.xml
index 0b13c365f7..e886481272 100644
--- a/Defs/ThingDefs_Misc/Weapons_Grenades.xml
+++ b/Defs/ThingDefs_Misc/Weapons_Grenades.xml
@@ -85,6 +85,7 @@
 			<suppressionFactor>3.0</suppressionFactor>
 			<dangerFactor>2.0</dangerFactor>
 			<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
+			<trajectoryWorker>CombatExtended.BallisticsTrajectoryWorker</trajectoryWorker>
 		</projectile>
 		<comps>
 			<li Class="CombatExtended.CompProperties_Fragments">
@@ -168,6 +169,7 @@
 			<suppressionFactor>2.0</suppressionFactor>
 			<dangerFactor>1.5</dangerFactor>
 			<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
+			<trajectoryWorker>CombatExtended.BallisticsTrajectoryWorker</trajectoryWorker>
 		</projectile>
 		<comps>
 			<li Class="CombatExtended.CompProperties_ExplosiveCE">
@@ -254,7 +256,7 @@
 			<ballisticCoefficient>10.0~10.0</ballisticCoefficient>
 			<mass>1400~1500</mass>
 			<diameter>100~120</diameter>
-			<lerpPosition>true</lerpPosition>
+			<trajectoryWorker>CombatExtended.BallisticsTrajectoryWorker</trajectoryWorker>
 		</projectile>
 	</ThingDef>
 
@@ -286,7 +288,7 @@
 		<verbs>
 			<li Class="CombatExtended.VerbPropertiesCE">
 				<label>throw stick bomb</label>
-				<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+				<verbClass>CombatExtended.Verb_ThrowGrenade</verbClass>
 				<hasStandardCommand>true</hasStandardCommand>
 				<range>7.0</range>
 				<warmupTime>1.6</warmupTime>
@@ -327,6 +329,7 @@
 			<preExplosionSpawnChance>1</preExplosionSpawnChance>
 			<speed>12</speed>
 			<screenShakeFactor>0</screenShakeFactor>
+			<trajectoryWorker>CombatExtended.BallisticsTrajectoryWorker</trajectoryWorker>
 		</projectile>
 	</ThingDef>
 
@@ -357,7 +360,7 @@
 		<verbs>
 			<li Class="CombatExtended.VerbPropertiesCE">
 				<label>throw smoke grenade</label>
-				<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+				<verbClass>CombatExtended.Verb_ThrowGrenade</verbClass>
 				<hasStandardCommand>true</hasStandardCommand>
 				<range>10</range>
 				<warmupTime>0.8</warmupTime>
@@ -404,6 +407,7 @@
 			<preExplosionSpawnChance>1</preExplosionSpawnChance>
 			<speed>12</speed>
 			<screenShakeFactor>0</screenShakeFactor>
+			<trajectoryWorker>CombatExtended.BallisticsTrajectoryWorker</trajectoryWorker>
 		</projectile>
 	</ThingDef>
 
@@ -434,7 +438,7 @@
 		<verbs>
 			<li Class="CombatExtended.VerbPropertiesCE">
 				<label>throw firefoam grenade</label>
-				<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+				<verbClass>CombatExtended.Verb_ThrowGrenade</verbClass>
 				<hasStandardCommand>true</hasStandardCommand>
 				<range>10</range>
 				<warmupTime>0.8</warmupTime>
diff --git a/Patches/Core/ThingDefs_Misc/Weapons_Grenades.xml b/Patches/Core/ThingDefs_Misc/Weapons_Grenades.xml
index 95496f6d8f..f5d5f2f075 100644
--- a/Patches/Core/ThingDefs_Misc/Weapons_Grenades.xml
+++ b/Patches/Core/ThingDefs_Misc/Weapons_Grenades.xml
@@ -106,7 +106,7 @@
 				<ballisticCoefficient>2.0~2.0</ballisticCoefficient>
 				<mass>400~400</mass>
 				<diameter>64~64</diameter>
-				<lerpPosition>true</lerpPosition>
+				<trajectoryWorker>CombatExtended.BallisticsTrajectoryWorker</trajectoryWorker>
 			</projectile>
 		</value>
 	</Operation>

From bf718be2711970b5a4e6134297210954bf751159 Mon Sep 17 00:00:00 2001
From: ViralReaction <136116069+ViralReaction@users.noreply.github.com>
Date: Sun, 31 May 2026 09:43:34 -0600
Subject: [PATCH 3/4] More grenade transition

---
 Patches/Core/ThingDefs_Misc/Weapons_Grenades.xml           | 7 +++++--
 .../CombatExtended/Projectiles/ProjectileCE.cs             | 4 ++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Patches/Core/ThingDefs_Misc/Weapons_Grenades.xml b/Patches/Core/ThingDefs_Misc/Weapons_Grenades.xml
index f5d5f2f075..abcfd4aae6 100644
--- a/Patches/Core/ThingDefs_Misc/Weapons_Grenades.xml
+++ b/Patches/Core/ThingDefs_Misc/Weapons_Grenades.xml
@@ -128,6 +128,7 @@
 				<fragments>
 					<Fragment_Small>40</Fragment_Small>
 				</fragments>
+				<fragAngleRange>30~45</fragAngleRange>
 			</li>
 		</value>
 	</Operation>
@@ -259,6 +260,7 @@
 				<suppressionFactor>3.0</suppressionFactor>
 				<dangerFactor>2.0</dangerFactor>
 				<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
+				<trajectoryWorker>CombatExtended.BallisticsTrajectoryWorker</trajectoryWorker>
 			</projectile>
 		</value>
 	</Operation>
@@ -331,7 +333,7 @@
 		</statBases>
 		<Properties>
 			<label>throw molotov</label>
-			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<verbClass>CombatExtended.Verb_ThrowGrenade</verbClass>
 			<hasStandardCommand>true</hasStandardCommand>
 			<range>10</range>
 			<minRange>1.9</minRange>
@@ -389,6 +391,7 @@
 				<suppressionFactor>3.0</suppressionFactor>
 				<dangerFactor>2.0</dangerFactor>
 				<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
+				<trajectoryWorker>CombatExtended.BallisticsTrajectoryWorker</trajectoryWorker>
 			</projectile>
 		</value>
 	</Operation>
@@ -459,7 +462,7 @@
 		</statBases>
 		<Properties>
 			<label>throw EMP grenade</label>
-			<verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+			<verbClass>CombatExtended.Verb_ThrowGrenade</verbClass>
 			<hasStandardCommand>true</hasStandardCommand>
 			<range>10</range>
 			<minRange>4</minRange>
diff --git a/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs b/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs
index 064ca57327..3dafb00e82 100755
--- a/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs
+++ b/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs
@@ -1574,6 +1574,10 @@ public virtual void Impact(Thing hitThing)
         //{
         //    Find.CameraDriver.shaker.DoShake(cameraShakingInit);
         //}
+        if (Map == null)
+        {
+            return;
+        }
         GenClamor.DoClamor(this, 12f, ClamorDefOf.Impact);
         if (Controller.settings.EnableExtraEffects)
         {

From d783228ab3919a7814c99d5b38a38cb2312dae35 Mon Sep 17 00:00:00 2001
From: ViralReaction <136116069+ViralReaction@users.noreply.github.com>
Date: Sun, 31 May 2026 09:43:42 -0600
Subject: [PATCH 4/4] Null checks

---
 Source/CombatExtended/Utilities/GenClosest.cs | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/Source/CombatExtended/Utilities/GenClosest.cs b/Source/CombatExtended/Utilities/GenClosest.cs
index 27041e121e..0a38ff02eb 100755
--- a/Source/CombatExtended/Utilities/GenClosest.cs
+++ b/Source/CombatExtended/Utilities/GenClosest.cs
@@ -30,8 +30,18 @@ public static IEnumerable<Thing> ThingsByDefInRange(this IntVec3 cell, Map map,
 
     public static IEnumerable<Pawn> PawnsInRange(this IntVec3 cell, Map map, float range)
     {
-        ThingsTracker tracker = map.GetThingTracker();
-        return tracker.ThingsInRangeOf(TrackedThingsRequestCategory.Pawns, cell, range).Select(t => t as Pawn);
+        ThingsTracker tracker = map?.GetThingTracker();
+        if (tracker == null)
+        {
+            yield break;
+        }
+        foreach (Thing t in tracker.ThingsInRangeOf(TrackedThingsRequestCategory.Pawns, cell, range))
+        {
+            if (t is Pawn pawn)
+            {
+                yield return pawn;
+            }
+        }
     }
 
     public static IEnumerable<Pawn> HostilesInRange(this IntVec3 cell, Map map, Faction faction, float range)