From ffee45cd7652ffc5b455fd63e7bc2741429ee909 Mon Sep 17 00:00:00 2001
From: Paul Chote <pchote@users.noreply.github.com>
Date: Sat, 9 Sep 2017 15:02:01 +0100
Subject: [PATCH] Add AttackMove support for AssaultMove orders and condition
 granting.

---
 OpenRA.Mods.Common/Traits/AttackMove.cs | 51 ++++++++++++++++++++++---
 1 file changed, 45 insertions(+), 6 deletions(-)

diff --git a/OpenRA.Mods.Common/Traits/AttackMove.cs b/OpenRA.Mods.Common/Traits/AttackMove.cs
index e447a2a0d2..eec324fc7d 100644
--- a/OpenRA.Mods.Common/Traits/AttackMove.cs
+++ b/OpenRA.Mods.Common/Traits/AttackMove.cs
@@ -20,10 +20,18 @@ namespace OpenRA.Mods.Common.Traits
 	{
 		[VoiceReference] public readonly string Voice = "Action";
 
+		[GrantedConditionReference]
+		[Desc("The condition to grant to self while scanning for targets during an attack-move.")]
+		public readonly string AttackMoveScanCondition = null;
+
+		[GrantedConditionReference]
+		[Desc("The condition to grant to self while scanning for targets during an assault-move.")]
+		public readonly string AssaultMoveScanCondition = null;
+
 		public object Create(ActorInitializer init) { return new AttackMove(init.Self, this); }
 	}
 
-	class AttackMove : IResolveOrder, IOrderVoice, INotifyIdle, ISync
+	class AttackMove : INotifyCreated, ITick, IResolveOrder, IOrderVoice, INotifyIdle, ISync
 	{
 		[Sync] public CPos _targetLocation { get { return TargetLocation.HasValue ? TargetLocation.Value : CPos.Zero; } }
 		public CPos? TargetLocation = null;
@@ -31,22 +39,53 @@ namespace OpenRA.Mods.Common.Traits
 		readonly IMove move;
 		readonly AttackMoveInfo info;
 
+		ConditionManager conditionManager;
+		int attackMoveToken = ConditionManager.InvalidConditionToken;
+		int assaultMoveToken = ConditionManager.InvalidConditionToken;
+		bool assaultMoving = false;
+
 		public AttackMove(Actor self, AttackMoveInfo info)
 		{
 			move = self.Trait<IMove>();
 			this.info = info;
 		}
 
+		void INotifyCreated.Created(Actor self)
+		{
+			conditionManager = self.TraitOrDefault<ConditionManager>();
+		}
+
+		void ITick.Tick(Actor self)
+		{
+			if (conditionManager == null)
+				return;
+
+			var activity = self.CurrentActivity as AttackMoveActivity;
+			var attackActive = activity != null && !assaultMoving;
+			var assaultActive = activity != null && assaultMoving;
+
+			if (attackActive && attackMoveToken == ConditionManager.InvalidConditionToken && !string.IsNullOrEmpty(info.AttackMoveScanCondition))
+				attackMoveToken = conditionManager.GrantCondition(self, info.AttackMoveScanCondition);
+			else if (!attackActive && attackMoveToken != ConditionManager.InvalidConditionToken)
+				attackMoveToken = conditionManager.RevokeCondition(self, attackMoveToken);
+
+			if (assaultActive && assaultMoveToken == ConditionManager.InvalidConditionToken && !string.IsNullOrEmpty(info.AssaultMoveScanCondition))
+				assaultMoveToken = conditionManager.GrantCondition(self, info.AssaultMoveScanCondition);
+			else if (!assaultActive && assaultMoveToken != ConditionManager.InvalidConditionToken)
+				assaultMoveToken = conditionManager.RevokeCondition(self, assaultMoveToken);
+		}
+
 		public string VoicePhraseForOrder(Actor self, Order order)
 		{
-			if (order.OrderString == "AttackMove")
+			if (order.OrderString == "AttackMove" || order.OrderString == "AssaultMove")
 				return info.Voice;
 
 			return null;
 		}
 
-		void Activate(Actor self)
+		void Activate(Actor self, bool assaultMove)
 		{
+			assaultMoving = assaultMove;
 			self.QueueActivity(new AttackMoveActivity(self, move.MoveTo(TargetLocation.Value, 1)));
 		}
 
@@ -54,21 +93,21 @@ namespace OpenRA.Mods.Common.Traits
 		{
 			// This might cause the actor to be stuck if the target location is unreachable
 			if (TargetLocation.HasValue && self.Location != TargetLocation.Value)
-				Activate(self);
+				Activate(self, assaultMoving);
 		}
 
 		public void ResolveOrder(Actor self, Order order)
 		{
 			TargetLocation = null;
 
-			if (order.OrderString == "AttackMove")
+			if (order.OrderString == "AttackMove" || order.OrderString == "AssaultMove")
 			{
 				if (!order.Queued)
 					self.CancelActivity();
 
 				TargetLocation = move.NearestMoveableCell(order.TargetLocation);
 				self.SetTargetLine(Target.FromCell(self.World, TargetLocation.Value), Color.Red);
-				Activate(self);
+				Activate(self, order.OrderString == "AssaultMove");
 			}
 		}
 	}