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

Fix #725; planes don't stack afld / planes will fly to empty aflds

Browse Source
This commit is contained in:
Curtis S
2011-10-22 13:23:30 -06:00
parent 935c2eff31
commit 9e21282341
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OpenRA.Mods.RA/Air/ReturnToBase.cs
View File

@@ -35,8 +35,7 @@ namespace OpenRA.Mods.RA.Air
void Calculate(Actor self) void Calculate(Actor self)
{ {
if (dest == null) if (dest == null || Reservable.IsReserved(dest)) dest = ChooseAirfield(self);
dest = ChooseAirfield(self);
if (dest == null) return; if (dest == null) return;
@@ -94,7 +93,17 @@ namespace OpenRA.Mods.RA.Air
if (IsCanceled) return NextActivity; if (IsCanceled) return NextActivity;
if (!isCalculated) if (!isCalculated)
Calculate(self); Calculate(self);
if (dest == null) return NextActivity; if (dest == null)
{
var rearmBuildings = self.Info.Traits.Get<PlaneInfo>().RearmBuildings;
var nearestAfld = self.World.ActorsWithTrait<Reservable>()
.Where(a => a.Actor.Owner == self.Owner && rearmBuildings.Contains(a.Actor.Info.Name))
.Select(a => a.Actor)
.ClosestTo(self.CenterLocation);
self.CancelActivity();
return Util.SequenceActivities(Fly.ToCell(nearestAfld.Location), new FlyCircle());
}
return Util.SequenceActivities( return Util.SequenceActivities(
Fly.ToPx(w1), Fly.ToPx(w1),