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

Remove some legacy activity cruft from Aircraft

Browse Source 
You only need to look at the RTB activities to tell that
Aircraft doing its own stuff here was somewhat redundant
and just made things worse regarding debugging and
code consistency.
This commit is contained in:
reaperrr
2019-02-15 01:00:09 +01:00
committed by Paul Chote
parent d7f8f2ba7b
commit 2ac9d92ce7
1 changed files with 7 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
OpenRA.Mods.Common/Traits/Air/Aircraft.cs
View File

@@ -790,43 +790,15 @@ namespace OpenRA.Mods.Common.Traits
UnReserve();
var targetActor = order.Target.Actor;
if (!Reservable.IsAvailableFor(targetActor, self))
{
if (!Info.CanHover)
self.QueueActivity(new ReturnToBase(self, Info.AbortOnResupply));
else
self.QueueActivity(new HeliReturnToBase(self, Info.AbortOnResupply));
}
else
{
// We only want to set a target line if the order will (most likely) succeed
if (Reservable.IsAvailableFor(targetActor, self))
self.SetTargetLine(Target.FromActor(targetActor), Color.Green);
if (!Info.CanHover && !Info.VTOL)
{
self.QueueActivity(order.Queued, ActivityUtils.SequenceActivities(
new ReturnToBase(self, Info.AbortOnResupply, targetActor),
new ResupplyAircraft(self)));
}
else
{
MakeReservation(targetActor);
Action enter = () =>
{
var exit = targetActor.FirstExitOrDefault(null);
var offset = exit != null ? exit.Info.SpawnOffset : WVec.Zero;
self.QueueActivity(new HeliFly(self, Target.FromPos(targetActor.CenterPosition + offset)));
if (Info.TurnToDock)
self.QueueActivity(new Turn(self, Info.InitialFacing));
self.QueueActivity(new HeliLand(self, false));
self.QueueActivity(new ResupplyAircraft(self));
};
self.QueueActivity(order.Queued, new CallFunc(enter));
}
}
if (!Info.CanHover && !Info.VTOL)
self.QueueActivity(order.Queued, new ReturnToBase(self, Info.AbortOnResupply, targetActor));
else
self.QueueActivity(order.Queued, new HeliReturnToBase(self, Info.AbortOnResupply, targetActor));
}
else if (order.OrderString == "Stop")
{