Merge pull request #11702 from Mailaender/infiltration-mission

Added Scott's Allies04 co-op multiplayer mission as "Infiltration"

OpenRA.Mods.Common/OpenRA.Mods.Common.csproj

@@ -252,6 +252,7 @@
     <Compile Include="Scripting\Properties\ProductionProperties.cs" />
     <Compile Include="Scripting\Properties\RepairableBuildingProperties.cs" />
     <Compile Include="Scripting\Properties\ResourceProperties.cs" />
+    <Compile Include="Scripting\Properties\SellableProperties.cs" />
     <Compile Include="Scripting\Properties\TransformProperties.cs" />
     <Compile Include="Scripting\Properties\TransportProperties.cs" />
     <Compile Include="Scripting\Properties\UpgradeProperties.cs" />

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

@@ -0,0 +1,31 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2016 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, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
+ */
+#endregion
+
+using OpenRA.Mods.Common.Traits;
+using OpenRA.Scripting;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.Common.Scripting
+{
+	[ScriptPropertyGroup("General")]
+	public class SellableProperties : ScriptActorProperties, Requires<SellableInfo>
+	{
+		public SellableProperties(ScriptContext context, Actor self)
+			: base(context, self) { }
+
+		[Desc("Start selling the actor.")]
+		public void Sell()
+		{
+			// PERF: No trait lookup cache in the constructor to avoid doing it for all buildings except just the ones getting sold.
+			Self.Trait<Sellable>().Sell(Self);
+		}
+	}
+}

OpenRA.Mods.Common/Scripting/ScriptTriggers.cs

@@ -23,7 +23,7 @@ namespace OpenRA.Mods.Common.Scripting
 		OnIdle, OnDamaged, OnKilled, OnProduction, OnOtherProduction, OnPlayerWon, OnPlayerLost,
 		OnObjectiveAdded, OnObjectiveCompleted, OnObjectiveFailed, OnCapture, OnInfiltrated,
 		OnAddedToWorld, OnRemovedFromWorld, OnDiscovered, OnPlayerDiscovered,
-		OnPassengerEntered, OnPassengerExited
+		OnPassengerEntered, OnPassengerExited, OnSelling, OnSold
 	}
 
 	[Desc("Allows map scripts to attach triggers to this actor via the Triggers global.")]
@@ -34,7 +34,7 @@ namespace OpenRA.Mods.Common.Scripting
 
 	public sealed class ScriptTriggers : INotifyIdle, INotifyDamage, INotifyKilled, INotifyProduction, INotifyOtherProduction,
 		INotifyObjectivesUpdated, INotifyCapture, INotifyInfiltrated, INotifyAddedToWorld, INotifyRemovedFromWorld, INotifyDiscovered, INotifyActorDisposing,
-		INotifyPassengerEntered, INotifyPassengerExited
+		INotifyPassengerEntered, INotifyPassengerExited, INotifySold
 	{
 		readonly World world;
 		readonly Actor self;
@@ -364,6 +364,46 @@ namespace OpenRA.Mods.Common.Scripting
 			OnRemovedInternal(self);
 		}
 
+		void INotifySold.Selling(Actor self)
+		{
+			if (world.Disposing)
+				return;
+
+			// Run Lua callbacks
+			foreach (var f in Triggerables(Trigger.OnSelling))
+			{
+				try
+				{
+					f.Function.Call(f.Self).Dispose();
+				}
+				catch (Exception ex)
+				{
+					f.Context.FatalError(ex.Message);
+					return;
+				}
+			}
+		}
+
+		void INotifySold.Sold(Actor self)
+		{
+			if (world.Disposing)
+				return;
+
+			// Run Lua callbacks
+			foreach (var f in Triggerables(Trigger.OnSold))
+			{
+				try
+				{
+					f.Function.Call(f.Self).Dispose();
+				}
+				catch (Exception ex)
+				{
+					f.Context.FatalError(ex.Message);
+					return;
+				}
+			}
+		}
+
 		public void UnitProducedByOther(Actor self, Actor producee, Actor produced)
 		{
 			if (world.Disposing)