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

Port CaptureActor to the new Enter activity.

Browse Source
This commit is contained in:
Paul Chote
2019-01-31 20:36:38 +00:00
committed by Oliver Brakmann
parent c1e8bbfc58
commit e9c3216048
3 changed files with 45 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Traits/Captures.cs
View File

@@ -95,15 +95,11 @@ namespace OpenRA.Mods.Common.Traits
if (order.OrderString != "CaptureActor" || IsTraitDisabled)
return;
var target = self.ResolveFrozenActorOrder(order, Color.Red);
if (target.Type != TargetType.Actor)
return;
if (!order.Queued)
self.CancelActivity();
self.SetTargetLine(target, Color.Red);
self.QueueActivity(new CaptureActor(self, target.Actor));
self.SetTargetLine(order.Target, Color.Red);
self.QueueActivity(new CaptureActor(self, order.Target));
}
protected override void TraitEnabled(Actor self) { captureManager.RefreshCaptures(self); }