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

c4 and goldwrench voices / flashes / fixed movement

Browse Source
This commit is contained in:
Paul Chote
2010-07-23 20:13:41 +12:00
parent 7a06ddb8d1
commit 4016b81208
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,6 +8,7 @@
*/ */
#endregion #endregion
using OpenRA.Effects;
using OpenRA.Mods.RA.Activities; using OpenRA.Mods.RA.Activities;
using OpenRA.Traits; using OpenRA.Traits;
using OpenRA.Traits.Activities; using OpenRA.Traits.Activities;
@@ -19,7 +20,7 @@ namespace OpenRA.Mods.RA
public readonly float C4Delay = 0; public readonly float C4Delay = 0;
} }
class C4Demolition : IIssueOrder, IResolveOrder, IOrderCursor class C4Demolition : IIssueOrder, IResolveOrder, IOrderCursor, IOrderVoice
{ {
public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor) public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor)
{ {
@@ -35,8 +36,11 @@ namespace OpenRA.Mods.RA
{ {
if (order.OrderString == "C4") if (order.OrderString == "C4")
{ {
if (self.Owner == self.World.LocalPlayer)
self.World.AddFrameEndTask(w => w.Add(new FlashTarget(order.TargetActor)));
self.CancelActivity(); self.CancelActivity();
self.QueueActivity(new Move(order.TargetActor, 2)); self.QueueActivity(new Move(order.TargetActor.Location, order.TargetActor));
self.QueueActivity(new Demolish(order.TargetActor)); self.QueueActivity(new Demolish(order.TargetActor));
self.QueueActivity(new Move(self.Location, 0)); self.QueueActivity(new Move(self.Location, 0));
} }
@@ -46,5 +50,10 @@ namespace OpenRA.Mods.RA
{ {
return (order.OrderString == "C4") ? "c4" : null; return (order.OrderString == "C4") ? "c4" : null;
} }
public string VoicePhraseForOrder(Actor self, Order order)
{
return (order.OrderString == "C4") ? "Attack" : null;
}
} }
} }

14
OpenRA.Mods.RA/EngineerRepair.cs
View File

@@ -11,6 +11,7 @@
using OpenRA.Mods.RA.Activities; using OpenRA.Mods.RA.Activities;
using OpenRA.Traits; using OpenRA.Traits;
using OpenRA.Traits.Activities; using OpenRA.Traits.Activities;
using OpenRA.Effects;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.RA
{ {
@@ -19,7 +20,7 @@ namespace OpenRA.Mods.RA
public readonly bool RepairsBridges = true; public readonly bool RepairsBridges = true;
} }
class EngineerRepair : IIssueOrder, IResolveOrder, IOrderCursor class EngineerRepair : IIssueOrder, IResolveOrder, IOrderCursor, IOrderVoice
{ {
public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor) public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor)
{ {
@@ -46,12 +47,21 @@ namespace OpenRA.Mods.RA
return (order.TargetActor.Health == order.TargetActor.GetMaxHP()) ? "goldwrench-blocked" : "goldwrench"; return (order.TargetActor.Health == order.TargetActor.GetMaxHP()) ? "goldwrench-blocked" : "goldwrench";
} }
public string VoicePhraseForOrder(Actor self, Order order)
{
return (order.OrderString == "EngineerRepair"
&& order.TargetActor.Health < order.TargetActor.GetMaxHP()) ? "Attack" : null;
}
public void ResolveOrder(Actor self, Order order) public void ResolveOrder(Actor self, Order order)
{ {
if (order.OrderString == "EngineerRepair" && order.TargetActor.Health < order.TargetActor.GetMaxHP()) if (order.OrderString == "EngineerRepair" && order.TargetActor.Health < order.TargetActor.GetMaxHP())
{ {
if (self.Owner == self.World.LocalPlayer)
self.World.AddFrameEndTask(w => w.Add(new FlashTarget(order.TargetActor)));
self.CancelActivity(); self.CancelActivity();
self.QueueActivity(new Move(order.TargetActor, 1)); self.QueueActivity(new Move(order.TargetActor.Location, order.TargetActor));
self.QueueActivity(new RepairBuilding(order.TargetActor)); self.QueueActivity(new RepairBuilding(order.TargetActor));
} }
} }