Skip to content

Implement Trajectory Worker #4603

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ViralReaction wants to merge 4 commits into
base: Development
Choose a base branch
from
Open

Implement Trajectory Worker #4603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5c34e53
Swap to Trajectory Worker
ViralReaction May 31, 2026
450fc89
Trajectory Worker Grenade Projectile
ViralReaction May 31, 2026
bf718be
More grenade transition
ViralReaction May 31, 2026
d783228
Null checks
ViralReaction May 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions Defs/Ammo/Projectiles_Fragments.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -39,6 +40,7 @@
<diameter>6~8</diameter>
<mass>14~16</mass>
<ballisticCoefficient>0.95~1.42</ballisticCoefficient>
<trajectoryWorker>CombatExtended.BallisticsTrajectoryWorker</trajectoryWorker>
</projectile>
</ThingDef>

Expand All @@ -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>
<!--
Expand Down
15 changes: 10 additions & 5 deletions Defs/ThingDefs_Misc/Weapons_Grenades.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -124,7 +125,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>
Expand Down Expand Up @@ -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">
Expand Down Expand Up @@ -206,7 +208,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>
Expand Down Expand Up @@ -254,6 +256,7 @@
<ballisticCoefficient>10.0~10.0</ballisticCoefficient>
<mass>1400~1500</mass>
<diameter>100~120</diameter>
<trajectoryWorker>CombatExtended.BallisticsTrajectoryWorker</trajectoryWorker>
</projectile>
</ThingDef>

Expand Down Expand Up @@ -285,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>
Expand Down Expand Up @@ -326,6 +329,7 @@
<preExplosionSpawnChance>1</preExplosionSpawnChance>
<speed>12</speed>
<screenShakeFactor>0</screenShakeFactor>
<trajectoryWorker>CombatExtended.BallisticsTrajectoryWorker</trajectoryWorker>
</projectile>
</ThingDef>

Expand Down Expand Up @@ -356,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>
Expand Down Expand Up @@ -403,6 +407,7 @@
<preExplosionSpawnChance>1</preExplosionSpawnChance>
<speed>12</speed>
<screenShakeFactor>0</screenShakeFactor>
<trajectoryWorker>CombatExtended.BallisticsTrajectoryWorker</trajectoryWorker>
</projectile>
</ThingDef>

Expand Down Expand Up @@ -433,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>
Expand Down
10 changes: 7 additions & 3 deletions Patches/Core/ThingDefs_Misc/Weapons_Grenades.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@
<ballisticCoefficient>2.0~2.0</ballisticCoefficient>
<mass>400~400</mass>
<diameter>64~64</diameter>
<trajectoryWorker>CombatExtended.BallisticsTrajectoryWorker</trajectoryWorker>
</projectile>
</value>
</Operation>
Expand All @@ -127,6 +128,7 @@
<fragments>
<Fragment_Small>40</Fragment_Small>
</fragments>
<fragAngleRange>30~45</fragAngleRange>
</li>
</value>
</Operation>
Expand Down Expand Up @@ -208,7 +210,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>
Expand Down Expand Up @@ -258,6 +260,7 @@
<suppressionFactor>3.0</suppressionFactor>
<dangerFactor>2.0</dangerFactor>
<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
<trajectoryWorker>CombatExtended.BallisticsTrajectoryWorker</trajectoryWorker>
</projectile>
</value>
</Operation>
Expand Down Expand Up @@ -330,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>
Expand Down Expand Up @@ -388,6 +391,7 @@
<suppressionFactor>3.0</suppressionFactor>
<dangerFactor>2.0</dangerFactor>
<airborneSuppressionFactor>0.25</airborneSuppressionFactor>
<trajectoryWorker>CombatExtended.BallisticsTrajectoryWorker</trajectoryWorker>
</projectile>
</value>
</Operation>
Expand Down Expand Up @@ -458,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>
Expand Down
4 changes: 4 additions & 0 deletions Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
14 changes: 12 additions & 2 deletions Source/CombatExtended/Utilities/GenClosest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading