Skip to content

Fixes bug of pawns on stuff or downed not been hitable #4732

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
SaltyKarl wants to merge 7 commits into
base: Development
Choose a base branch
from
+7 −12
Open

Fixes bug of pawns on stuff or downed not been hitable #4732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6f9c2bd
HighestCoverAt fix
SaltyKarl Jul 23, 2026
a882743
new coverHeight cal
SaltyKarl Aug 4, 2026
af7257a
Remove flying offset,
SaltyKarl Aug 28, 2026
1784962
Merge branch 'CombatExtended-Continued:Development' into HighestCoverAt
SaltyKarl Sep 5, 2026
b2effc2
Update CollisionVertical.cs
SaltyKarl Sep 13, 2026
7907c2f
whitespace
SaltyKarl Sep 13, 2026
97be479
Merge branch 'Development' into pr/SaltyKarl/4732
N7Huntsman Sep 16, 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
3 changes: 1 addition & 2 deletions Source/CombatExtended/CombatExtended/CollisionVertical.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,9 @@ private static void CalculateHeightRange(Thing thing, out FloatRange heightRange

if (pawn.Flying)
{
heightAdjust += 0.5f * pawn.flight.PositionOffsetFactor;
heightAdjust += 1;
}


// Humanlikes in combat crouch to reduce their profile
if (pawn.IsCrouching())
{
Expand Down
16 changes: 6 additions & 10 deletions Source/CombatExtended/CombatExtended/LightingTracker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,16 +259,12 @@ public float HighestCoverAt(IntVec3 position)
float coverHeight = coverGridCache[CellToIndex(position)];
if (coverHeight == -1)
{
Thing cover = position.GetFirstPawn(map) ?? position.GetCover(map);
if (cover == null)
{
coverHeight = 0;
}
else
{
Bounds bounds = CE_Utility.GetBoundsFor(cover);
coverHeight = bounds.size.y;
}
// separate pawnHeight and coverHeight and keep the higher instead of pawn height XOR cover height.
Thing pawn = position.GetFirstPawn(map);
Thing coverThing = position.GetCover(map);
float pawnHeight = pawn == null ? 0f : CE_Utility.GetBoundsFor(pawn).max.y;
float coverHeightFromThing = coverThing == null ? 0f : CE_Utility.GetBoundsFor(coverThing).max.y;
coverHeight = Mathf.Max(pawnHeight, coverHeightFromThing);
coverGridCache[CellToIndex(position)] = coverHeight;
}
return coverHeight;
Expand Down
Loading