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

Merge pull request #7088 from Gishten/taskbranch-7083

Browse Source 
Fix aircraft fly endlessly in a circle when ordered to attack inside own...
This commit is contained in:
obrakmann
2014-12-08 09:57:32 +01:00
parent eec4f7171a d7f321e04d
commit fbddff3a75
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.RA/Activities/Air/FlyAttack.cs
View File

@@ -10,6 +10,7 @@
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
using System.Linq;
namespace OpenRA.Mods.RA.Activities
{
@@ -17,6 +18,7 @@ namespace OpenRA.Mods.RA.Activities
{
readonly Target target;
Activity inner;
int ticksUntilTurn = 50;
public FlyAttack(Target target) { this.target = target; }
@@ -38,9 +40,11 @@ namespace OpenRA.Mods.RA.Activities
if (IsCanceled)
return NextActivity;
inner = Util.SequenceActivities(new Fly(self, target), new FlyTimed(50));
if (target.IsInRange(self.CenterPosition, attack.Armaments.Select(a => a.Weapon.MinRange).Min()))
inner = Util.SequenceActivities(new FlyTimed(ticksUntilTurn), new Fly(self, target), new FlyTimed(ticksUntilTurn));
else
inner = Util.SequenceActivities(new Fly(self, target), new FlyTimed(ticksUntilTurn));
}
inner = Util.RunActivity(self, inner);
return this;