Implementation of the automated D2k Carryall

Closes #2246

OpenRA.Mods.RA/Activities/Air/HeliFly.cs

@@ -14,7 +14,7 @@ using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Activities
 {
-	class HeliFly : Activity
+	public class HeliFly : Activity
 	{
 		readonly Helicopter helicopter;
 		readonly Target target;

OpenRA.Mods.RA/Activities/Air/HeliFlyCircle.cs

@@ -0,0 +1,45 @@
+#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;
+using System.Collections.Generic;
+using OpenRA.Traits;
+using OpenRA.Mods.RA.Activities;
+using OpenRA.Mods.RA.Traits;
+
+namespace OpenRA.Mods.RA.Activities
+{
+	public class HeliFlyCircle : Activity
+	{
+		readonly Helicopter helicopter;
+
+		public HeliFlyCircle(Actor self)
+		{
+			helicopter = self.Trait<Helicopter>();
+		}
+
+		public override Activity Tick(Actor self)
+		{
+			if (IsCanceled)
+				return NextActivity;
+
+			if (HeliFly.AdjustAltitude(self, helicopter, helicopter.Info.CruiseAltitude))
+				return this;
+
+			var move = helicopter.FlyStep(helicopter.Facing);
+			helicopter.SetPosition(self, helicopter.CenterPosition + move);
+
+			var desiredFacing = helicopter.Facing + 64;
+			helicopter.Facing = Util.TickFacing(helicopter.Facing, desiredFacing, helicopter.ROT / 3);
+
+			return this;
+		}
+	}
+}

OpenRA.Mods.RA/Activities/Air/HeliLand.cs

@@ -13,7 +13,7 @@ using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Activities
 {
-	class HeliLand : Activity
+	public class HeliLand : Activity
 	{
 		bool requireSpace;
 

OpenRA.Mods.RA/Activities/DeliverResources.cs

@@ -9,6 +9,7 @@
 #endregion
 
 using System.Drawing;
+using OpenRA.Mods.Common;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Activities
@@ -55,7 +56,14 @@ namespace OpenRA.Mods.RA.Activities
 
 			self.SetTargetLine(Target.FromActor(proc), Color.Green, false);
 			if (self.Location != proc.Location + iao.DeliverOffset)
+			{
+				var notify = self.TraitsImplementing<INotifyHarvesterAction>();
+				var next = new DeliverResources();
+				foreach (var n in notify)
+					n.MovingToRefinery(self, proc.Location + iao.DeliverOffset, next);
+
 				return Util.SequenceActivities(movement.MoveTo(proc.Location + iao.DeliverOffset, 0), this);
+			}
 
 			if (!isDocking)
 			{

OpenRA.Mods.RA/Activities/FindResources.cs

@@ -111,6 +111,12 @@ namespace OpenRA.Mods.RA.Activities
 				harv.LastOrderLocation = path[0];
 
 			self.SetTargetLine(Target.FromCell(self.World, path[0]), Color.Red, false);
+
+			var notify = self.TraitsImplementing<INotifyHarvesterAction>();
+			var next = new FindResources();
+			foreach (var n in notify)
+				n.MovingToResources(self, path[0], next);
+
 			return Util.SequenceActivities(mobile.MoveTo(path[0], 1), new HarvestResource(), new FindResources());
 		}
 
@@ -163,7 +169,7 @@ namespace OpenRA.Mods.RA.Activities
 
 			harv.AcceptResource(resource);
 
-			foreach (var t in self.TraitsImplementing<INotifyHarvest>())
+			foreach (var t in self.TraitsImplementing<INotifyHarvesterAction>())
 				t.Harvested(self, resource);
 
 			return Util.SequenceActivities(new Wait(harvInfo.LoadTicksPerBale), this);