epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ignore nearEnough if we think the actor can get closer.

Browse Source
This commit is contained in:
Paul Chote
2020-02-17 22:46:33 +00:00
committed by teinarss
parent 57da756f2f
commit 9a6602656b
1 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
OpenRA.Mods.Common/Activities/Move/Move.cs
View File

@@ -242,8 +242,29 @@ namespace OpenRA.Mods.Common.Activities
var cellRange = nearEnough.Length / 1024;
if (!containsTemporaryBlocker && (mobile.ToCell - destination.Value).LengthSquared <= cellRange * cellRange && mobile.CanStayInCell(mobile.ToCell))
{
path.Clear();
return null;
// Apply some simple checks to avoid giving up in cases where we can be confident that
// nudging/waiting/repathing should produce better results.
// Avoid fighting over the destination cell
if (path.Count < 2)
{
path.Clear();
return null;
}
// We can reasonably assume that the blocker is friendly and has a similar locomotor type.
// If there is a free cell next to the blocker that is a similar or closer distance to the
// destination then we can probably nudge or path around it.
var blockerDistSq = (nextCell - destination.Value).LengthSquared;
var nudgeOrRepath = CVec.Directions
.Select(d => nextCell + d)
.Any(c => c != self.Location && (c - destination.Value).LengthSquared <= blockerDistSq && mobile.CanEnterCell(c, ignoreActor));
if (!nudgeOrRepath)
{
path.Clear();
return null;
}
}
// There is no point in waiting for the other actor to move if it is incapable of moving.