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

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

@@ -424,7 +424,7 @@ namespace OpenRA.Mods.Common.Traits
if (IsPlane)
return new Fly(self, target, WDist.FromCells(3), WDist.FromCells(5));
return Util.SequenceActivities(new HeliFly(self, target), new Turn(self, Info.InitialFacing));
return ActivityUtils.SequenceActivities(new HeliFly(self, target), new Turn(self, Info.InitialFacing));
}
public Activity MoveIntoTarget(Actor self, Target target)
@@ -439,11 +439,11 @@ namespace OpenRA.Mods.Common.Traits
{
// TODO: Ignore repulsion when moving
if (IsPlane)
return Util.SequenceActivities(
return ActivityUtils.SequenceActivities(
new CallFunc(() => SetVisualPosition(self, fromPos)),
new Fly(self, Target.FromPos(toPos)));
return Util.SequenceActivities(new CallFunc(() => SetVisualPosition(self, fromPos)),
return ActivityUtils.SequenceActivities(new CallFunc(() => SetVisualPosition(self, fromPos)),
new HeliFly(self, Target.FromPos(toPos)));
}
@@ -538,7 +538,7 @@ namespace OpenRA.Mods.Common.Traits
if (IsPlane)
{
self.QueueActivity(order.Queued, Util.SequenceActivities(
self.QueueActivity(order.Queued, ActivityUtils.SequenceActivities(
new ReturnToBase(self, order.TargetActor),
new ResupplyAircraft(self)));
}

4
OpenRA.Mods.Common/Traits/Attack/AttackCharge.cs
View File

@@ -107,7 +107,7 @@ namespace OpenRA.Mods.Common.Traits
if (!string.IsNullOrEmpty(attack.info.ChargeAudio))
Game.Sound.Play(attack.info.ChargeAudio, self.CenterPosition);
return Util.SequenceActivities(new Wait(attack.info.InitialChargeDelay), new ChargeFire(attack, target), this);
return ActivityUtils.SequenceActivities(new Wait(attack.info.InitialChargeDelay), new ChargeFire(attack, target), this);
}
}
@@ -132,7 +132,7 @@ namespace OpenRA.Mods.Common.Traits
attack.DoAttack(self, target);
return Util.SequenceActivities(new Wait(attack.info.ChargeDelay), this);
return ActivityUtils.SequenceActivities(new Wait(attack.info.ChargeDelay), this);
}
}
}

2
OpenRA.Mods.Common/Traits/Attack/AttackFollow.cs
View File

@@ -95,7 +95,7 @@ namespace OpenRA.Mods.Common.Traits
attack.Target = target;
if (move != null)
return Util.SequenceActivities(move.MoveFollow(self, target, weapon.Weapon.MinRange, maxRange), this);
return ActivityUtils.SequenceActivities(move.MoveFollow(self, target, weapon.Weapon.MinRange, maxRange), this);
}
return NextActivity;

4
OpenRA.Mods.Common/Traits/Mobile.cs
View File

@@ -682,7 +682,7 @@ namespace OpenRA.Mods.Common.Traits
var notifyBlocking = new CallFunc(() => self.NotifyBlocker(cellInfo.Cell));
var waitFor = new WaitFor(() => CanEnterCell(cellInfo.Cell));
var move = new Move(self, cellInfo.Cell);
self.QueueActivity(Util.SequenceActivities(notifyBlocking, waitFor, move));
self.QueueActivity(ActivityUtils.SequenceActivities(notifyBlocking, waitFor, move));
Log.Write("debug", "OnNudge (notify next blocking actor, wait and move) #{0} from {1} to {2}",
self.ActorID, self.Location, cellInfo.Cell);
@@ -797,7 +797,7 @@ namespace OpenRA.Mods.Common.Traits
var delta = toPos - fromPos;
var facing = delta.HorizontalLengthSquared != 0 ? delta.Yaw.Facing : Facing;
return Util.SequenceActivities(new Turn(self, facing), new Drag(self, fromPos, toPos, length));
return ActivityUtils.SequenceActivities(new Turn(self, facing), new Drag(self, fromPos, toPos, length));
}
public void ModifyDeathActorInit(Actor self, TypeDictionary init)

2
OpenRA.Mods.Common/Traits/Repairable.cs
View File

@@ -94,7 +94,7 @@ namespace OpenRA.Mods.Common.Traits
self.SetTargetLine(target, Color.Green);
self.CancelActivity();
self.QueueActivity(new WaitForTransport(self, Util.SequenceActivities(new MoveAdjacentTo(self, target),
self.QueueActivity(new WaitForTransport(self, ActivityUtils.SequenceActivities(new MoveAdjacentTo(self, target),
new CallFunc(() => AfterReachActivities(self, order, movement)))));
TryCallTransport(self, target, new CallFunc(() => AfterReachActivities(self, order, movement)));