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

Port Demolish to the new Enter activity.

Browse Source
This commit is contained in:
Paul Chote
2019-02-01 09:48:25 +00:00
committed by Oliver Brakmann
parent a17608a24e
commit 167371d540
3 changed files with 47 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenRA.Mods.Common/Traits/Demolition.cs
View File

@@ -75,19 +75,18 @@ namespace OpenRA.Mods.Common.Traits
if (order.OrderString != "C4")
return;
var target = self.ResolveFrozenActorOrder(order, Color.Red);
if (target.Type != TargetType.Actor)
return;
var demolishable = target.Actor.TraitOrDefault<IDemolishable>();
if (demolishable == null || !demolishable.IsValidTarget(target.Actor, self))
return;
if (order.Target.Type == TargetType.Actor)
{
var demolishables = order.Target.Actor.TraitsImplementing<IDemolishable>();
if (!demolishables.Any(i => i.IsValidTarget(order.Target.Actor, self)))
return;
}
if (!order.Queued)
self.CancelActivity();
self.SetTargetLine(target, Color.Red);
self.QueueActivity(new Demolish(self, target.Actor, info.EnterBehaviour, info.DetonationDelay,
self.SetTargetLine(order.Target, Color.Red);
self.QueueActivity(new Demolish(self, order.Target, info.EnterBehaviour, info.DetonationDelay,
info.Flashes, info.FlashesDelay, info.FlashInterval));
}