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

Fix aircraft reservation madness

Browse Source
This commit is contained in:
Oliver Brakmann
2016-09-03 18:37:36 +02:00
parent 1592f9dd63
commit 6d15406ffe
3 changed files with 53 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
OpenRA.Mods.Common/Activities/Air/ResupplyAircraft.cs
View File

@@ -19,6 +19,7 @@ namespace OpenRA.Mods.Common.Activities
public class ResupplyAircraft : Activity
{
readonly Aircraft aircraft;
Activity inner;
public ResupplyAircraft(Actor self)
{
@@ -27,22 +28,45 @@ namespace OpenRA.Mods.Common.Activities
public override Activity Tick(Actor self)
{
var host = aircraft.GetActorBelow();
if (host == null)
if (IsCanceled)
return NextActivity;
if (aircraft.IsPlane)
return ActivityUtils.SequenceActivities(
aircraft.GetResupplyActivities(host)
.Append(new CallFunc(() => aircraft.UnReserve()))
.Append(new WaitFor(() => NextActivity != null || Reservable.IsReserved(host)))
.Append(new TakeOff(self))
.Append(NextActivity).ToArray());
if (inner == null)
{
var host = aircraft.GetActorBelow();
// If is helicopter move away as soon as the resupply ends
return ActivityUtils.SequenceActivities(
aircraft.GetResupplyActivities(host).Append(new TakeOff(self)).Append(NextActivity).ToArray());
if (host == null)
return NextActivity;
if (aircraft.IsPlane)
{
inner = ActivityUtils.SequenceActivities(
aircraft.GetResupplyActivities(host)
.Append(new CallFunc(() => aircraft.MayYieldReservation = true))
.Append(new WaitFor(() => NextActivity != null || aircraft.ReservedActor == null))
.ToArray());
}
else
{
// Helicopters should take off from their helipad immediately after resupplying.
// HACK: NextActivity needs to be appended here because otherwise TakeOff does stupid things.
inner = ActivityUtils.SequenceActivities(
aircraft.GetResupplyActivities(host).Append(new TakeOff(self)).Append(NextActivity).ToArray());
}
}
else
inner = ActivityUtils.RunActivity(self, inner);
// The inner == NextActivity check is needed here because of the TakeOff issue mentioned in the comment above.
return inner == null || inner == NextActivity ? NextActivity : this;
}
public override void Cancel(Actor self)
{
if (!IsCanceled && inner != null)
inner.Cancel(self);
base.Cancel(self);
}
}
}