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.
2015-01-01 18:08:08 +01:00
parent 158517c09f
commit 654f56c5d5
113 changed files with 255 additions and 244 deletions
--- a/OpenRA.Mods.Common/Activities/Air/HeliReturn.cs
+++ b/OpenRA.Mods.Common/Activities/Air/HeliReturn.cs
@@ -0,0 +1,68 @@
+#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.Linq;
+using OpenRA.Activities;
+using OpenRA.Mods.Common.Traits;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.Common.Activities
+{
+	public class HeliReturn : Activity
+	{
+		static Actor ChooseHelipad(Actor self)
+		{
+			var rearmBuildings = self.Info.Traits.Get<HelicopterInfo>().RearmBuildings;
+			return self.World.Actors.Where(a => a.Owner == self.Owner).FirstOrDefault(
+				a => rearmBuildings.Contains(a.Info.Name) && !Reservable.IsReserved(a));
+		}
+
+		public override Activity Tick(Actor self)
+		{
+			if (IsCanceled)
+				return NextActivity;
+
+			var dest = ChooseHelipad(self);
+			var initialFacing = self.Info.Traits.Get<AircraftInfo>().InitialFacing;
+
+			if (dest == null)
+			{
+				var rearmBuildings = self.Info.Traits.Get<HelicopterInfo>().RearmBuildings;
+				var nearestHpad = self.World.ActorsWithTrait<Reservable>()
+									.Where(a => a.Actor.Owner == self.Owner && rearmBuildings.Contains(a.Actor.Info.Name))
+									.Select(a => a.Actor)
+									.ClosestTo(self);
+
+				if (nearestHpad == null)
+					return Util.SequenceActivities(new Turn(self, initialFacing), new HeliLand(true), NextActivity);
+				else
+					return Util.SequenceActivities(new HeliFly(self, Target.FromActor(nearestHpad)));
+			}
+
+			var res = dest.TraitOrDefault<Reservable>();
+			var heli = self.Trait<Helicopter>();
+
+			if (res != null)
+			{
+				heli.UnReserve();
+				heli.Reservation = res.Reserve(dest, self, heli);
+			}
+
+			var exit = dest.Info.Traits.WithInterface<ExitInfo>().FirstOrDefault();
+			var offset = (exit != null) ? exit.SpawnOffset : WVec.Zero;
+
+			return Util.SequenceActivities(
+				new HeliFly(self, Target.FromPos(dest.CenterPosition + offset)),
+				new Turn(self, initialFacing),
+				new HeliLand(false),
+				new ResupplyAircraft());
+		}
+	}
+}