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

Use WRange for Follow.

Browse Source
This commit is contained in:
Paul Chote
2013-07-10 20:03:53 +12:00
parent ee188ededd
commit 0326d2bbd0
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.RA/Activities/Follow.cs
View File

@@ -16,13 +16,13 @@ namespace OpenRA.Mods.RA.Activities
public class Follow : Activity
{
Target target;
int range;
WRange range;
int nextPathTime;
const int delayBetweenPathingAttempts = 20;
const int delaySpread = 5;
public Follow(Target target, int range)
public Follow(Target target, WRange range)
{
this.target = target;
this.range = range;
@@ -33,16 +33,14 @@ namespace OpenRA.Mods.RA.Activities
if (IsCanceled || !target.IsValid)
return NextActivity;
var inRange = (target.CenterPosition.ToCPos() - self.Location).LengthSquared < range * range;
if (inRange || --nextPathTime > 0)
if (target.IsInRange(self.CenterPosition, range) || --nextPathTime > 0)
return this;
nextPathTime = self.World.SharedRandom.Next(delayBetweenPathingAttempts - delaySpread,
delayBetweenPathingAttempts + delaySpread);
var mobile = self.Trait<Mobile>();
return Util.SequenceActivities(mobile.MoveWithinRange(target, new WRange(1024*range)), this);
return Util.SequenceActivities(mobile.MoveWithinRange(target, range), this);
}
}
}