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

Helis return to nearest base like Planes

Browse Source
This commit is contained in:
rob-v
2017-04-22 15:53:05 +02:00
parent 9f8e9426af
commit df07d89f9e
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OpenRA.Mods.Common/Activities/Air/HeliReturnToBase.cs
View File

@@ -31,11 +31,13 @@ namespace OpenRA.Mods.Common.Activities
this.dest = dest; this.dest = dest;
} }
public Actor ChooseHelipad(Actor self) public Actor ChooseHelipad(Actor self, bool unreservedOnly)
{ {
var rearmBuildings = heli.Info.RearmBuildings; var rearmBuildings = heli.Info.RearmBuildings;
return self.World.Actors.Where(a => a.Owner == self.Owner).FirstOrDefault( return self.World.Actors.Where(a => a.Owner == self.Owner
a => rearmBuildings.Contains(a.Info.Name) && !Reservable.IsReserved(a)); && rearmBuildings.Contains(a.Info.Name)
&& (!unreservedOnly || !Reservable.IsReserved(a)))
.ClosestTo(self);
} }
public override Activity Tick(Actor self) public override Activity Tick(Actor self)
@@ -44,16 +46,13 @@ namespace OpenRA.Mods.Common.Activities
return NextActivity; return NextActivity;
if (dest == null || dest.IsDead || Reservable.IsReserved(dest)) if (dest == null || dest.IsDead || Reservable.IsReserved(dest))
dest = ChooseHelipad(self); dest = ChooseHelipad(self, true);
var initialFacing = heli.Info.InitialFacing; var initialFacing = heli.Info.InitialFacing;
if (dest == null || dest.IsDead) if (dest == null || dest.IsDead)
{ {
var rearmBuildings = heli.Info.RearmBuildings; var nearestHpad = ChooseHelipad(self, false);
var nearestHpad = self.World.ActorsHavingTrait<Reservable>()
.Where(a => a.Owner == self.Owner && rearmBuildings.Contains(a.Info.Name))
.ClosestTo(self);
if (nearestHpad == null) if (nearestHpad == null)
return ActivityUtils.SequenceActivities(new Turn(self, initialFacing), new HeliLand(self, true), NextActivity); return ActivityUtils.SequenceActivities(new Turn(self, initialFacing), new HeliLand(self, true), NextActivity);