Add InstantlyRepairsProperties

OpenRA.Mods.Common/Activities/InstantRepair.cs

@@ -10,6 +10,7 @@
 #endregion
 
 using OpenRA.Mods.Common.Traits;
+using OpenRA.Primitives;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.Common.Activities
@@ -22,8 +23,8 @@ namespace OpenRA.Mods.Common.Activities
 		IHealth enterHealth;
 		InstantlyRepairable enterInstantlyRepariable;
 
-		public InstantRepair(Actor self, in Target target, InstantlyRepairsInfo info)
+		public InstantRepair(Actor self, in Target target, InstantlyRepairsInfo info, Color? targetLineColor)
-			: base(self, target, info.TargetLineColor)
+			: base(self, target, targetLineColor)
 		{
 			this.info = info;
 		}

OpenRA.Mods.Common/Scripting/Properties/InstantlyRepairsProperties.cs

@@ -0,0 +1,41 @@
+#region Copyright & License Information
+/*
+ * Copyright (c) The OpenRA Developers and Contributors
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
+ */
+#endregion
+
+using System.Linq;
+using OpenRA.Mods.Common.Activities;
+using OpenRA.Mods.Common.Traits;
+using OpenRA.Scripting;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.Common.Scripting
+{
+	[ScriptPropertyGroup("Ability")]
+	public class InstantlyRepairsProperties : ScriptActorProperties, Requires<IMoveInfo>, Requires<InstantlyRepairsInfo>
+	{
+		readonly InstantlyRepairs[] instantlyRepairs;
+
+		public InstantlyRepairsProperties(ScriptContext context, Actor self)
+			: base(context, self)
+		{
+			instantlyRepairs = Self.TraitsImplementing<InstantlyRepairs>().ToArray();
+		}
+
+		[ScriptActorPropertyActivity]
+		[Desc("Enter the target actor to repair it instantly.")]
+		public void InstantlyRepair(Actor target)
+		{
+			// NB: Scripted actions get no visible targetlines.
+			var repair = instantlyRepairs.FirstEnabledConditionalTraitOrDefault();
+			if (repair != null)
+				Self.QueueActivity(new InstantRepair(Self, Target.FromActor(target), repair.Info, null));
+		}
+	}
+}

OpenRA.Mods.Common/Traits/InstantlyRepairs.cs

@@ -96,7 +96,7 @@ namespace OpenRA.Mods.Common.Traits
 			if (order.OrderString != "InstantRepair" || !IsValidOrder(order))
 				return;
 
-			self.QueueActivity(order.Queued, new InstantRepair(self, order.Target, Info));
+			self.QueueActivity(order.Queued, new InstantRepair(self, order.Target, Info, Info.TargetLineColor));
 			self.ShowTargetLines();
 		}