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

Replace pseudo-childactivities in carryall logic.

Browse Source
This commit is contained in:
tovl
2019-03-31 17:17:14 +02:00
committed by Paul Chote
parent 0eb0a5a2bd
commit cc7e758b27
2 changed files with 24 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
OpenRA.Mods.Common/Activities/PickupUnit.cs
View File

@@ -33,7 +33,6 @@ namespace OpenRA.Mods.Common.Activities
enum PickupState { Intercept, LockCarryable, MoveToCarryable, Turn, Land, Wait, Pickup, Aborted }
PickupState state;
Activity innerActivity;
public PickupUnit(Actor self, Actor cargo, int delay)
{
@@ -52,10 +51,11 @@ namespace OpenRA.Mods.Common.Activities
public override Activity Tick(Actor self)
{
if (innerActivity != null)
if (ChildActivity != null)
{
innerActivity = ActivityUtils.RunActivity(self, innerActivity);
return this;
ChildActivity = ActivityUtils.RunActivity(self, ChildActivity);
if (ChildActivity != null)
return this;
}
if (cargo != carryall.Carryable)
@@ -73,8 +73,7 @@ namespace OpenRA.Mods.Common.Activities
switch (state)
{
case PickupState.Intercept:
innerActivity = movement.MoveWithinRange(Target.FromActor(cargo), WDist.FromCells(4),
targetLineColor: Color.Yellow);
QueueChild(self, movement.MoveWithinRange(Target.FromActor(cargo), WDist.FromCells(4), targetLineColor: Color.Yellow), true);
state = PickupState.LockCarryable;
return this;
@@ -91,8 +90,7 @@ namespace OpenRA.Mods.Common.Activities
var targetPosition = cargo.CenterPosition - carryableBody.LocalToWorld(localOffset);
if ((self.CenterPosition - targetPosition).HorizontalLengthSquared != 0)
{
// Run the first tick of the move activity immediately to avoid a one-frame pause
innerActivity = ActivityUtils.RunActivity(self, new HeliFly(self, Target.FromPos(targetPosition)));
QueueChild(self, new HeliFly(self, Target.FromPos(targetPosition)), true);
return this;
}
@@ -103,7 +101,7 @@ namespace OpenRA.Mods.Common.Activities
case PickupState.Turn:
if (carryallFacing.Facing != carryableFacing.Facing)
{
innerActivity = new Turn(self, carryableFacing.Facing);
QueueChild(self, new Turn(self, carryableFacing.Facing), true);
return this;
}
@@ -122,7 +120,7 @@ namespace OpenRA.Mods.Common.Activities
if (targetPosition.Z != self.CenterPosition.Z)
{
innerActivity = new HeliLand(self, false, self.World.Map.DistanceAboveTerrain(targetPosition));
QueueChild(self, new HeliLand(self, false, self.World.Map.DistanceAboveTerrain(targetPosition)), true);
return this;
}
@@ -132,7 +130,7 @@ namespace OpenRA.Mods.Common.Activities
case PickupState.Wait:
state = PickupState.Pickup;
innerActivity = new Wait(delay, false);
QueueChild(self, new Wait(delay, false), true);
return this;
case PickupState.Pickup:
@@ -158,13 +156,5 @@ namespace OpenRA.Mods.Common.Activities
carryall.AttachCarryable(self, cargo);
});
}
public override void Cancel(Actor self, bool keepQueue = false)
{
if (!IsCanceling && innerActivity != null)
innerActivity.Cancel(self);
base.Cancel(self, keepQueue);
}
}
}