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/Fly.cs
+++ b/OpenRA.Mods.Common/Activities/Air/Fly.cs
@@ -0,0 +1,87 @@
+#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 OpenRA.Activities;
+using OpenRA.Mods.Common.Traits;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.Common.Activities
+{
+	public class Fly : Activity
+	{
+		readonly Plane plane;
+		readonly Target target;
+		readonly WRange maxRange;
+		readonly WRange minRange;
+
+		public Fly(Actor self, Target t)
+		{
+			plane = self.Trait<Plane>();
+			target = t;
+		}
+
+		public Fly(Actor self, Target t, WRange minRange, WRange maxRange)
+			: this(self, t)
+		{
+			this.maxRange = maxRange;
+			this.minRange = minRange;
+		}
+
+		public static void FlyToward(Actor self, Plane plane, int desiredFacing, WRange desiredAltitude)
+		{
+			var move = plane.FlyStep(plane.Facing);
+			var altitude = plane.CenterPosition.Z;
+
+			plane.Facing = Util.TickFacing(plane.Facing, desiredFacing, plane.ROT);
+
+			if (altitude != desiredAltitude.Range)
+			{
+				var delta = move.HorizontalLength * plane.Info.MaximumPitch.Tan() / 1024;
+				var dz = (desiredAltitude.Range - altitude).Clamp(-delta, delta);
+				move += new WVec(0, 0, dz);
+			}
+
+			plane.SetPosition(self, plane.CenterPosition + move);
+		}
+
+		public override Activity Tick(Actor self)
+		{
+			if (IsCanceled || !target.IsValidFor(self))
+				return NextActivity;
+
+			// Inside the target annulus, so we're done
+			var insideMaxRange = maxRange.Range > 0 && target.IsInRange(plane.CenterPosition, maxRange);
+			var insideMinRange = minRange.Range > 0 && target.IsInRange(plane.CenterPosition, minRange);
+			if (insideMaxRange && !insideMinRange)
+				return NextActivity;
+
+			// Close enough (ported from old code which checked length against sqrt(50) px)
+			var d = target.CenterPosition - self.CenterPosition;
+			if (d.HorizontalLengthSquared < 91022)
+				return NextActivity;
+
+			var desiredFacing = Util.GetFacing(d, plane.Facing);
+
+			// Don't turn until we've reached the cruise altitude
+			if (plane.CenterPosition.Z < plane.Info.CruiseAltitude.Range)
+				desiredFacing = plane.Facing;
+
+			FlyToward(self, plane, desiredFacing, plane.Info.CruiseAltitude);
+
+			return this;
+		}
+
+		public override IEnumerable<Target> GetTargets(Actor self)
+		{
+			yield return target;
+		}
+	}
+}