From 4016b81208a555bc32a2fd00e07dfef1d81f0302 Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Fri, 23 Jul 2010 20:13:41 +1200
Subject: [PATCH] c4 and goldwrench voices / flashes / fixed movement

---
 OpenRA.Mods.RA/C4Demolition.cs   | 13 +++++++++++--
 OpenRA.Mods.RA/EngineerRepair.cs | 14 ++++++++++++--
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/OpenRA.Mods.RA/C4Demolition.cs b/OpenRA.Mods.RA/C4Demolition.cs
index b44775b1a2..603e2af541 100644
--- a/OpenRA.Mods.RA/C4Demolition.cs
+++ b/OpenRA.Mods.RA/C4Demolition.cs
@@ -8,6 +8,7 @@
  */
 #endregion
 
+using OpenRA.Effects;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Traits;
 using OpenRA.Traits.Activities;
@@ -19,7 +20,7 @@ namespace OpenRA.Mods.RA
 		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)
 		{
@@ -35,8 +36,11 @@ namespace OpenRA.Mods.RA
 		{
 			if (order.OrderString == "C4")
 			{
+				if (self.Owner == self.World.LocalPlayer)
+					self.World.AddFrameEndTask(w => w.Add(new FlashTarget(order.TargetActor)));
+				
 				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 Move(self.Location, 0));
 			}
@@ -46,5 +50,10 @@ namespace OpenRA.Mods.RA
 		{
 			return (order.OrderString == "C4") ? "c4" : null;
 		}
+		
+		public string VoicePhraseForOrder(Actor self, Order order)
+		{
+			return (order.OrderString == "C4") ? "Attack" : null;
+		}
 	}
 }
diff --git a/OpenRA.Mods.RA/EngineerRepair.cs b/OpenRA.Mods.RA/EngineerRepair.cs
index 51bae04d28..de7fce00bc 100644
--- a/OpenRA.Mods.RA/EngineerRepair.cs
+++ b/OpenRA.Mods.RA/EngineerRepair.cs
@@ -11,6 +11,7 @@
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Traits;
 using OpenRA.Traits.Activities;
+using OpenRA.Effects;
 
 namespace OpenRA.Mods.RA
 {
@@ -19,7 +20,7 @@ namespace OpenRA.Mods.RA
 		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)
 		{
@@ -46,12 +47,21 @@ namespace OpenRA.Mods.RA
 			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)
 		{
 			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.QueueActivity(new Move(order.TargetActor, 1));
+				self.QueueActivity(new Move(order.TargetActor.Location, order.TargetActor));
 				self.QueueActivity(new RepairBuilding(order.TargetActor));
 			}
 		}