Ported Allies 01 to the New Lua API

OpenRA.Mods.RA/OpenRA.Mods.RA.csproj

@@ -561,6 +561,9 @@
     <Compile Include="Warheads\SpreadDamageWarhead.cs" />
     <Compile Include="Scripting\Global\ReinforcementsGlobal.cs" />
     <Compile Include="Scripting\Global\DateGlobal.cs" />
+    <Compile Include="Scripting\Properties\HarvesterProperties.cs" />
+    <Compile Include="Scripting\Properties\HelicopterProperties.cs" />
+    <Compile Include="Scripting\Properties\PlaneProperties.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj">

OpenRA.Mods.RA/Scripting/Global/TriggerGlobal.cs

@@ -102,6 +102,38 @@ public void OnAllKilled(LuaTable actors, LuaFunction func)
 				GetScriptTriggers(a).OnKilledInternal += OnMemberKilled;
 		}
 
+		[Desc("Call a function when one of the actors in a group is killed. The callback " +
+			"function will be called as func(Actor killed).")]
+		public void OnAnyKilled(LuaTable actors, LuaFunction func)
+		{
+			var group = new List<Actor>();
+			foreach (var kv in actors)
+			{
+				Actor actor;
+				if (!kv.Value.TryGetClrValue<Actor>(out actor))
+					throw new LuaException("OnAnyKilled requires a table of int,Actor pairs. Recieved {0},{1}".F(kv.Key.GetType().Name, kv.Value.GetType().Name));
+
+				group.Add(actor);
+			}
+
+			var called = false;
+			var copy = (LuaFunction)func.CopyReference();
+			Action<Actor> OnMemberKilled = m =>
+			{
+				if (called)
+					return;
+
+				using (var killed = m.ToLuaValue(context))
+					copy.Call(killed).Dispose();
+
+				copy.Dispose();
+				called = true;
+			};
+
+			foreach (var a in group)
+				GetScriptTriggers(a).OnKilledInternal += OnMemberKilled;
+		}
+
 		[Desc("Call a function when this actor produces another actor. " +
 			"The callback function will be called as func(Actor producer, Actor produced).")]
 		public void OnProduction(Actor a, LuaFunction func)

OpenRA.Mods.RA/Scripting/Properties/HarvesterProperties.cs

@@ -0,0 +1,34 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * 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. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using OpenRA.Scripting;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.RA.Scripting
+{
+	[ScriptPropertyGroup("Harvester")]
+	public class HarvesterProperties : ScriptActorProperties, Requires<HarvesterInfo>
+	{
+		readonly Harvester harvester;
+
+		public HarvesterProperties(ScriptContext context, Actor self)
+			: base(context, self)
+		{
+			harvester = self.Trait<Harvester>();
+		}
+
+		[ScriptActorPropertyActivity]
+		[Desc("Search for nearby resources and begin harvesting.")]
+		public void FindResources()
+		{
+			harvester.ContinueHarvesting(self);
+		}
+	}
+}

OpenRA.Mods.RA/Scripting/Properties/HelicopterProperties.cs

@@ -0,0 +1,30 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * 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. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using OpenRA.Mods.RA.Air;
+using OpenRA.Scripting;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.RA.Scripting
+{
+	[ScriptPropertyGroup("Movement")]
+	public class HelicopterProperties : ScriptActorProperties, Requires<HelicopterInfo>
+	{
+		public HelicopterProperties(ScriptContext context, Actor self)
+			: base(context, self) { }
+
+		[ScriptActorPropertyActivity]
+		[Desc("Fly within the cell grid.")]
+		public void Move(CPos cell)
+		{
+			self.QueueActivity(new HeliFly(self, Target.FromCell(self.World, cell)));
+		}
+	}
+}

OpenRA.Mods.RA/Scripting/Properties/MobileProperties.cs

@@ -34,5 +34,12 @@ public void ScriptedMove(CPos cell)
 		{
 			self.QueueActivity(new Move.Move(cell));
 		}
+
+		[ScriptActorPropertyActivity]
+		[Desc("Leave the current position in a random direction.")]
+		public void Scatter()
+		{
+			self.Trait<Mobile>().Nudge(self, self, true);
+		}
 	}
 }

OpenRA.Mods.RA/Scripting/Properties/PlaneProperties.cs

@@ -0,0 +1,30 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * 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. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using OpenRA.Mods.RA.Air;
+using OpenRA.Scripting;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.RA.Scripting
+{
+	[ScriptPropertyGroup("Movement")]
+	public class PlaneProperties : ScriptActorProperties, Requires<PlaneInfo>
+	{
+		public PlaneProperties(ScriptContext context, Actor self)
+			: base(context, self) { }
+
+		[ScriptActorPropertyActivity]
+		[Desc("Fly within the cell grid.")]
+		public void Move(CPos cell)
+		{
+			self.QueueActivity(new Fly(self, Target.FromCell(self.World, cell)));
+		}
+	}
+}

OpenRA.Mods.RA/Widgets/Logic/Ingame/GameInfoObjectivesLogic.cs

@@ -67,6 +67,6 @@ void PopulateObjectivesList(MissionObjectives mo, ScrollPanelWidget parent, Cont
 
 				parent.AddChild(widget);
 			}
-        }
+		}
 	}
 }