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

Enable frozen order: C4.

Browse Source
This commit is contained in:
Paul Chote
2013-08-10 12:13:58 +12:00
parent f2ecea4731
commit aab63e6f2d
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
OpenRA.Mods.RA/C4Demolition.cs
View File

@@ -26,11 +26,11 @@ namespace OpenRA.Mods.RA
class C4Demolition : IIssueOrder, IResolveOrder, IOrderVoice class C4Demolition : IIssueOrder, IResolveOrder, IOrderVoice
{ {
readonly C4DemolitionInfo Info; readonly C4DemolitionInfo info;
public C4Demolition(C4DemolitionInfo info) public C4Demolition(C4DemolitionInfo info)
{ {
Info = info; this.info = info;
} }
public IEnumerable<IOrderTargeter> Orders public IEnumerable<IOrderTargeter> Orders
@@ -40,26 +40,34 @@ namespace OpenRA.Mods.RA
public Order IssueOrder(Actor self, IOrderTargeter order, Target target, bool queued) public Order IssueOrder(Actor self, IOrderTargeter order, Target target, bool queued)
{ {
if (order.OrderID == "C4") if (order.OrderID != "C4")
return new Order("C4", self, queued) { TargetActor = target.Actor };
return null; return null;
if (target.Type == TargetType.FrozenActor)
return new Order(order.OrderID, self, queued) { ExtraData = target.FrozenActor.ID };
return new Order(order.OrderID, self, queued) { TargetActor = target.Actor };
} }
public void ResolveOrder(Actor self, Order order) public void ResolveOrder(Actor self, Order order)
{ {
if (order.OrderString == "C4") if (order.OrderString != "C4")
{ return;
self.SetTargetLine(Target.FromOrder(order), Color.Red);
var target = self.ResolveFrozenActorOrder(order, Color.Red);
if (target.Type != TargetType.Actor)
return;
if (!order.Queued)
self.CancelActivity(); self.CancelActivity();
self.QueueActivity(new Enter(order.TargetActor, new Demolish(order.TargetActor, Info.C4Delay)));
} self.SetTargetLine(target, Color.Red);
self.QueueActivity(new Enter(target.Actor, new Demolish(target.Actor, info.C4Delay)));
} }
public string VoicePhraseForOrder(Actor self, Order order) public string VoicePhraseForOrder(Actor self, Order order)
{ {
return (order.OrderString == "C4") ? "Attack" : null; return order.OrderString == "C4" ? "Attack" : null;
} }
} }
} }