Skip to content

Switch a buggy function that led to overlapping patrol units #1558

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

Merged
Tedster59 merged 1 commit into from
Jan 19, 2026
Merged

Switch a buggy function that led to overlapping patrol units #1558

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 13 additions & 4 deletions X2WOTCCommunityHighlander/Src/XComGame/Classes/XGAIBehavior.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9679,15 +9679,24 @@ state XComMovement extends MoveState // Only accessed via specialized behavior t
// Start Issue #1550
simulated function MaybeUnblockPatrolMemberTiles()
{
local array<TTile> Tiles;
local int UnitMobility;

if( m_kPlayer != None &&
m_kPlayer.m_kNav.IsPatrol(m_kUnit.ObjectID, m_kPatrolGroup) &&
!m_kPatrolGroup.bDisableGroupMove &&
(m_kPlayer.m_ePhase == eAAP_GreenPatrolMovement || m_kPlayer.IsScampering(UnitState.ObjectID)) &&
class'X2PathSolver'.static.IsUnitTrapped(UnitState))
(m_kPlayer.m_ePhase == eAAP_GreenPatrolMovement || m_kPlayer.IsScampering(UnitState.ObjectID)) )
{
m_kPatrolGroup.UnblockMemberTiles();
}
UnitMobility = m_kUnit.GetMobility();
m_kUnit.m_kReachableTilesCache.GetAllPathableTiles(Tiles);

// consider an unit that can't move at least its one action of movement "stuck" and unblock their patrol member tiles
if(Tiles.Length <= `METERSTOTILES(UnitMobility))
{
m_kPatrolGroup.UnblockMemberTiles();
m_kUnit.m_kReachableTilesCache.ForceCacheUpdate();
}
}
}
// End Issue #1550

Expand Down