Skip to content

Fix impact position for fast projectiles #4416

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
mszabo-wikia wants to merge 2 commits into
base: Development
Choose a base branch
from
Open

Fix impact position for fast projectiles #4416

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0ee1ef
Fix impact position for fast projectiles
mszabo-wikia Jan 3, 2026
5989bf5
Shift explosion position when shooting south or west
mszabo-wikia Jan 3, 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
28 changes: 22 additions & 6 deletions Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1031,15 +1031,16 @@ protected virtual bool CanCollideWith(Thing thing, out float dist)
}

var bounds = CE_Utility.GetBoundsFor(thing);
if (bounds.Contains(LastPos) || bounds.Contains(ExactPosition))
{
dist = 0f;
return true;
}
if (!bounds.IntersectRay(ShotLine, out dist))
{
return false;
}

if (bounds.Contains(LastPos) || bounds.Contains(ExactPosition))
{
return true;
}

if (dist * dist > (ExactPosition - LastPos).sqrMagnitude)
{
return false;
Expand Down Expand Up @@ -1454,7 +1455,22 @@ public virtual void Impact(Thing hitThing)
}
}

var explodePos = ExactPosition;
// The projectile's position will have been normalized to the point of impact with the Thing,
// which may sit exactly on a cell boundary for Things whose hitbox precisely lines up with a cell.
// This would always correspond to the cell due east or north of the boundary, which,
// when shooting south or west, would be the previous cell on the shotline.
// Since we always want explosion effects to occur in the impacted cell, shift the position accordingly
// if it is on a cell boundary.
Vector3 explodePos = ExactPosition;
if (ShotLine.direction.x < 0 && Mathf.Approximately(explodePos.x, (int)explodePos.x))
{
explodePos.x -= 0.5f;
}
if (ShotLine.direction.z < 0 && Mathf.Approximately(explodePos.z, (int)explodePos.z))
{
explodePos.z -= 0.5f;
}


if (!explodePos.ToIntVec3().IsValid)
{
Expand Down