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

Split out an ActivityUtils class.

Browse Source
This commit is contained in:
Paul Chote
2016-01-14 21:50:11 +00:00
parent e46fc644c1
commit 0039a2bdbf
32 changed files with 120 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.D2k/Activities/DeliverUnit.cs
View File

@@ -86,7 +86,7 @@ namespace OpenRA.Mods.D2k.Activities
case State.Transport:
var targetl = GetLocationToDrop(carryable.Destination);
state = State.Land;
return Util.SequenceActivities(movement.MoveTo(targetl, 0), this);
return ActivityUtils.SequenceActivities(movement.MoveTo(targetl, 0), this);
case State.Land:
if (!CanDropHere())
@@ -98,7 +98,7 @@ namespace OpenRA.Mods.D2k.Activities
if (HeliFly.AdjustAltitude(self, aircraft, aircraft.Info.LandAltitude))
return this;
state = State.Release;
return Util.SequenceActivities(new Wait(15), this);
return ActivityUtils.SequenceActivities(new Wait(15), this);
case State.Release:
if (!CanDropHere())

9
OpenRA.Mods.D2k/Activities/PickupUnit.cs
View File

@@ -9,6 +9,7 @@
#endregion
using OpenRA.Activities;
using OpenRA.Mods.Common;
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.D2k.Traits;
@@ -54,7 +55,7 @@ namespace OpenRA.Mods.D2k.Activities
{
case State.Intercept:
state = State.LockCarryable;
return Util.SequenceActivities(movement.MoveWithinRange(Target.FromActor(cargo), WDist.FromCells(4)), this);
return ActivityUtils.SequenceActivities(movement.MoveWithinRange(Target.FromActor(cargo), WDist.FromCells(4)), this);
case State.LockCarryable:
// Last check
@@ -75,13 +76,13 @@ namespace OpenRA.Mods.D2k.Activities
return this;
}
return Util.SequenceActivities(movement.MoveTo(cargo.Location, 0), this);
return ActivityUtils.SequenceActivities(movement.MoveTo(cargo.Location, 0), this);
case State.Turn: // Align facing and Land
if (selfFacing.Facing != cargoFacing.Facing)
return Util.SequenceActivities(new Turn(self, cargoFacing.Facing), this);
return ActivityUtils.SequenceActivities(new Turn(self, cargoFacing.Facing), this);
state = State.Pickup;
return Util.SequenceActivities(new HeliLand(self, false), new Wait(10), this);
return ActivityUtils.SequenceActivities(new HeliLand(self, false), new Wait(10), this);
case State.Pickup:
// Remove our carryable from world