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

Properly deal with FindUnitPathToRange

Browse Source 
This fixes boats attacking land targets.
This commit is contained in:
Andrew Aldridge
2013-05-29 01:10:00 -05:00
committed by Andrew Aldridge
parent d4cead2187
commit 6fb01c7ab8
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OpenRA.Mods.RA/Move/PathFinder.cs
View File

@@ -75,13 +75,6 @@ namespace OpenRA.Mods.RA.Move
{ {
using (new PerfSample("Pathfinder")) using (new PerfSample("Pathfinder"))
{ {
// As with FindUnitPath, avoid trying to traverse domain transitions.
// In this case it's pretty sketchy; path false-negatives are possible.
if(world.WorldDomains.IsCrossDomain(src, target.ToCPos()))
{
return new List<CPos>(0);
}
var mi = self.Info.Traits.Get<MobileInfo>(); var mi = self.Info.Traits.Get<MobileInfo>();
var targetCell = target.ToCPos(); var targetCell = target.ToCPos();
var rangeSquared = range.Range*range.Range; var rangeSquared = range.Range*range.Range;
@@ -94,7 +87,13 @@ namespace OpenRA.Mods.RA.Move
// This assumes that the SubCell does not change during the path traversal // This assumes that the SubCell does not change during the path traversal
var tilesInRange = world.FindTilesInCircle(targetCell, range.Range / 1024 + 1) var tilesInRange = world.FindTilesInCircle(targetCell, range.Range / 1024 + 1)
.Where(t => (t.CenterPosition - target).LengthSquared <= rangeSquared .Where(t => (t.CenterPosition - target).LengthSquared <= rangeSquared
&& mi.CanEnterCell(self.World, self, t, null, true, true)); && mi.CanEnterCell(self.World, self, t, null, true, true)
&& !world.WorldDomains.IsCrossDomain(src, t));
if(tilesInRange.Count() == 0)
{
return new List<CPos>(0);
}
var path = FindBidiPath( var path = FindBidiPath(
PathSearch.FromPoints(world, mi, self, tilesInRange, src, true), PathSearch.FromPoints(world, mi, self, tilesInRange, src, true),