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

Replace SequenceActivities with ChildActivity in several activities.

Browse Source
This commit is contained in:
tovl
2019-03-23 19:20:34 +01:00
committed by Paul Chote
parent 90ddf24cf3
commit 30de4df749
5 changed files with 56 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenRA.Mods.Common/Activities/Hunt.cs
View File

@@ -33,6 +33,13 @@ namespace OpenRA.Mods.Common.Activities
public override Activity Tick(Actor self)
{
if (ChildActivity != null)
{
ChildActivity = ActivityUtils.RunActivity(self, ChildActivity);
if (ChildActivity != null)
return this;
}
if (IsCanceling)
return NextActivity;
@@ -40,10 +47,9 @@ namespace OpenRA.Mods.Common.Activities
if (target == null)
return this;
return ActivityUtils.SequenceActivities(self,
new AttackMoveActivity(self, () => move.MoveTo(target.Location, 2)),
new Wait(25),
this);
QueueChild(self, new AttackMoveActivity(self, () => move.MoveTo(target.Location, 2)), true);
QueueChild(self, new Wait(25));
return this;
}
}
}