Moves Attack, Armament, Move, Air traits and activities as well as anything required by them to Mods.Common.

Extracts Exit from Production into its own trait.

OpenRA.Mods.Common/Activities/UnloadCargo.cs

@@ -0,0 +1,103 @@
+#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 System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using OpenRA.Activities;
+using OpenRA.Mods.Common.Traits;
+using OpenRA.Primitives;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.Common.Activities
+{
+	public class UnloadCargo : Activity
+	{
+		readonly Actor self;
+		readonly Cargo cargo;
+		readonly Cloak cloak;
+		readonly bool unloadAll;
+
+		public UnloadCargo(Actor self, bool unloadAll)
+		{
+			this.self = self;
+			cargo = self.Trait<Cargo>();
+			cloak = self.TraitOrDefault<Cloak>();
+			this.unloadAll = unloadAll;
+		}
+
+		public Pair<CPos, SubCell>? ChooseExitSubCell(Actor passenger)
+		{
+			var pos = passenger.Trait<IPositionable>();
+
+			return cargo.CurrentAdjacentCells
+				.Shuffle(self.World.SharedRandom)
+				.Select(c => Pair.New(c, pos.GetAvailableSubCell(c)))
+				.Cast<Pair<CPos, SubCell>?>()
+				.FirstOrDefault(s => s.Value.Second != SubCell.Invalid);
+		}
+
+		IEnumerable<CPos> BlockedExitCells(Actor passenger)
+		{
+			var pos = passenger.Trait<IPositionable>();
+
+			// Find the cells that are blocked by transient actors
+			return cargo.CurrentAdjacentCells
+				.Where(c => pos.CanEnterCell(c, null, true) != pos.CanEnterCell(c, null, false));
+		}
+
+		public override Activity Tick(Actor self)
+		{
+			cargo.Unloading = false;
+			if (IsCanceled || cargo.IsEmpty(self))
+				return NextActivity;
+
+			if (cloak != null && cloak.Info.UncloakOnUnload)
+				cloak.Uncloak();
+
+			var actor = cargo.Peek(self);
+			var spawn = self.CenterPosition;
+
+			var exitSubCell = ChooseExitSubCell(actor);
+			if (exitSubCell == null)
+			{
+				foreach (var blocker in BlockedExitCells(actor).SelectMany(p => self.World.ActorMap.GetUnitsAt(p)))
+				{
+					foreach (var nbm in blocker.TraitsImplementing<INotifyBlockingMove>())
+						nbm.OnNotifyBlockingMove(blocker, self);
+				}
+
+				return Util.SequenceActivities(new Wait(10), this);
+			}
+
+			cargo.Unload(self);
+			self.World.AddFrameEndTask(w =>
+			{
+				if (actor.Destroyed)
+					return;
+
+				var move = actor.Trait<IMove>();
+				var pos = actor.Trait<IPositionable>();
+
+				actor.CancelActivity();
+				pos.SetVisualPosition(actor, spawn);
+				actor.QueueActivity(move.MoveIntoWorld(actor, exitSubCell.Value.First, exitSubCell.Value.Second));
+				actor.SetTargetLine(Target.FromCell(w, exitSubCell.Value.First, exitSubCell.Value.Second), Color.Green, false);
+				w.Add(actor);
+			});
+
+			if (!unloadAll || cargo.IsEmpty(self))
+				return NextActivity;
+
+			cargo.Unloading = true;
+			return this;
+		}
+	}
+}