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

Make HeliReturnToBase use RTB.ChooseResupplier

Browse Source 
Small consistency fix and prep for merging HRTB into RTB.
This commit is contained in:
reaperrr
2019-02-16 13:18:08 +01:00
committed by Paul Chote
parent 2ac9d92ce7
commit a7702a8ecd
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,17 +37,6 @@ namespace OpenRA.Mods.Common.Activities
this.dest = dest; this.dest = dest;
} }
public Actor ChooseResupplier(Actor self, bool unreservedOnly)
{
if (rearmable == null)
return null;
return self.World.Actors.Where(a => a.Owner == self.Owner
&& rearmable.Info.RearmActors.Contains(a.Info.Name)
&& (!unreservedOnly || Reservable.IsAvailableFor(a, self)))
.ClosestTo(self);
}
public override Activity Tick(Actor self) public override Activity Tick(Actor self)
{ {
// Refuse to take off if it would land immediately again. // Refuse to take off if it would land immediately again.
@@ -59,13 +48,13 @@ namespace OpenRA.Mods.Common.Activities
return NextActivity; return NextActivity;
if (dest == null || dest.IsDead || !Reservable.IsAvailableFor(dest, self)) if (dest == null || dest.IsDead || !Reservable.IsAvailableFor(dest, self))
dest = ChooseResupplier(self, true); dest = ReturnToBase.ChooseResupplier(self, true);
var initialFacing = aircraft.Info.InitialFacing; var initialFacing = aircraft.Info.InitialFacing;
if (dest == null || dest.IsDead) if (dest == null || dest.IsDead)
{ {
var nearestResupplier = ChooseResupplier(self, false); var nearestResupplier = ReturnToBase.ChooseResupplier(self, false);
// If a heli was told to return and there's no (available) RearmBuilding, going to the probable next queued activity (HeliAttack) // If a heli was told to return and there's no (available) RearmBuilding, going to the probable next queued activity (HeliAttack)
// would be pointless (due to lack of ammo), and possibly even lead to an infinite loop due to HeliAttack.cs:L79. // would be pointless (due to lack of ammo), and possibly even lead to an infinite loop due to HeliAttack.cs:L79.