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

Merge pull request #9802 from RoosterDragon/move-min-range

Browse Source 
Fix MoveWithinRange not moving far enough for min range checks
This commit is contained in:
Oliver Brakmann
2015-12-06 17:11:22 +01:00
parent fa5fd5c92f 26d7d59c1a
commit 8c8e29e2fa
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenRA.Mods.Common/Activities/Move/MoveWithinRange.cs
View File

@@ -32,14 +32,12 @@ namespace OpenRA.Mods.Common.Activities
{ {
// We are now in range. Don't move any further! // We are now in range. Don't move any further!
// HACK: This works around the pathfinder not returning the shortest path // HACK: This works around the pathfinder not returning the shortest path
var cp = self.CenterPosition; return AtCorrectRange(self.CenterPosition);
return Target.IsInRange(cp, maxRange) && !Target.IsInRange(cp, minRange);
} }
protected override bool ShouldRepath(Actor self, CPos oldTargetPosition) protected override bool ShouldRepath(Actor self, CPos oldTargetPosition)
{ {
var cp = self.CenterPosition; return targetPosition != oldTargetPosition && !AtCorrectRange(self.CenterPosition);
return targetPosition != oldTargetPosition && (!Target.IsInRange(cp, maxRange) || Target.IsInRange(cp, minRange));
} }
protected override IEnumerable<CPos> CandidateMovementCells(Actor self) protected override IEnumerable<CPos> CandidateMovementCells(Actor self)
@@ -48,15 +46,13 @@ namespace OpenRA.Mods.Common.Activities
var maxCells = (maxRange.Length + 1023) / 1024; var maxCells = (maxRange.Length + 1023) / 1024;
var minCells = minRange.Length / 1024; var minCells = minRange.Length / 1024;
var outerSq = maxRange.LengthSquared; return map.FindTilesInAnnulus(targetPosition, minCells, maxCells)
var innerSq = minRange.LengthSquared; .Where(c => AtCorrectRange(map.CenterOfCell(c)));
var center = Target.CenterPosition; }
return map.FindTilesInAnnulus(targetPosition, minCells + 1, maxCells).Where(c => bool AtCorrectRange(WPos origin)
{ {
var dxSq = (map.CenterOfCell(c) - center).HorizontalLengthSquared; return Target.IsInRange(origin, maxRange) && !Target.IsInRange(origin, minRange);
return dxSq >= innerSq && dxSq <= outerSq;
});
} }
} }
} }