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

Enable frozen order: DeliverSupplies.

Browse Source
This commit is contained in:
Paul Chote
2013-08-09 23:36:41 +12:00
parent 9c5b526a3d
commit d27d5f449e
1 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
OpenRA.Mods.RA/SupplyTruck.cs
View File

@@ -10,10 +10,10 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using OpenRA.FileFormats;
using OpenRA.Mods.RA.Activities; using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Buildings; using OpenRA.Mods.RA.Buildings;
using OpenRA.Mods.RA.Orders; using OpenRA.Mods.RA.Orders;
using OpenRA.FileFormats;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.RA
@@ -28,11 +28,11 @@ namespace OpenRA.Mods.RA
class SupplyTruck : IIssueOrder, IResolveOrder, IOrderVoice class SupplyTruck : IIssueOrder, IResolveOrder, IOrderVoice
{ {
SupplyTruckInfo Info; SupplyTruckInfo info;
public SupplyTruck(SupplyTruckInfo info) public SupplyTruck(SupplyTruckInfo info)
{ {
Info = info; this.info = info;
} }
public IEnumerable<IOrderTargeter> Orders public IEnumerable<IOrderTargeter> Orders
@@ -42,10 +42,13 @@ 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 == "DeliverSupplies") if (order.OrderID != "DeliverSupplies")
return new Order(order.OrderID, 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 string VoicePhraseForOrder(Actor self, Order order) public string VoicePhraseForOrder(Actor self, Order order)
@@ -55,12 +58,18 @@ namespace OpenRA.Mods.RA
public void ResolveOrder(Actor self, Order order) public void ResolveOrder(Actor self, Order order)
{ {
if (order.OrderString == "DeliverSupplies") if (order.OrderString != "DeliverSupplies")
{ return;
self.SetTargetLine(Target.FromOrder(order), Color.Yellow);
var target = self.ResolveFrozenActorOrder(order, Color.Yellow);
if (target.Type != TargetType.Actor)
return;
if (!order.Queued)
self.CancelActivity(); self.CancelActivity();
self.QueueActivity(new Enter(order.TargetActor, new DonateSupplies(order.TargetActor, Info.Payload)));
} self.SetTargetLine(target, Color.Yellow);
self.QueueActivity(new Enter(target.Actor, new DonateSupplies(target.Actor, info.Payload)));
} }
class SupplyTruckOrderTargeter : UnitOrderTargeter class SupplyTruckOrderTargeter : UnitOrderTargeter
@@ -77,8 +86,7 @@ namespace OpenRA.Mods.RA
public override bool CanTargetFrozenActor(Actor self, FrozenActor target, TargetModifiers modifiers, ref string cursor) public override bool CanTargetFrozenActor(Actor self, FrozenActor target, TargetModifiers modifiers, ref string cursor)
{ {
// TODO: Not yet supported return target.Info.Traits.Contains<AcceptsSuppliesInfo>();
return false;
} }
} }
} }