new heli movement

OpenRa.Game/OpenRa.Game.csproj

@@ -114,6 +114,8 @@
     <Compile Include="Traits\Activities\Demolish.cs" />
     <Compile Include="Traits\Activities\Fly.cs" />
     <Compile Include="Traits\Activities\FlyTimed.cs" />
+    <Compile Include="Traits\Activities\HeliFly.cs" />
+    <Compile Include="Traits\Activities\HeliLand.cs" />
     <Compile Include="Traits\Activities\IActivity.cs" />
     <Compile Include="Traits\Activities\DeliverOre.cs" />
     <Compile Include="Traits\Activities\DeployMcv.cs" />

OpenRa.Game/Traits/Activities/HeliFly.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace OpenRa.Game.Traits.Activities
+{
+	class HeliFly : IActivity
+	{
+		const int CruiseAltitude = 20;
+		readonly float2 Dest;
+		public HeliFly(float2 dest)
+		{
+			Dest = dest;
+		}
+
+		public IActivity NextActivity { get; set; }
+		bool isCanceled;
+		
+		public IActivity Tick(Actor self)
+		{
+			if (isCanceled)
+				return NextActivity;
+
+			var unit = self.traits.Get<Unit>();
+
+			if (unit.Altitude != CruiseAltitude)
+			{
+				unit.Altitude += Math.Sign(CruiseAltitude - unit.Altitude);
+				return this;
+			}
+
+			var dist = Dest - self.CenterLocation;
+			if (float2.WithinEpsilon(float2.Zero, dist, 10))
+				return NextActivity;
+
+			var desiredFacing = Util.GetFacing(dist, unit.Facing);
+			Util.TickFacing(ref unit.Facing, desiredFacing, self.Info.ROT);
+
+			var rawSpeed = .2f * Util.GetEffectiveSpeed(self);
+			self.CenterLocation += (rawSpeed / dist.Length) * dist;
+			self.Location = ((1 / 24f) * self.CenterLocation).ToInt2();
+
+			return this;
+		}
+
+		public void Cancel(Actor self) { isCanceled = true; NextActivity = null; }
+	}
+}

OpenRa.Game/Traits/Activities/HeliLand.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace OpenRa.Game.Traits.Activities
+{
+	class HeliLand : IActivity
+	{
+		public HeliLand(bool requireSpace) { this.requireSpace = requireSpace; }
+
+		bool requireSpace;
+		bool isCanceled;
+		public IActivity NextActivity { get; set; }
+
+		public IActivity Tick(Actor self)
+		{
+			if (isCanceled) return NextActivity;
+			var unit = self.traits.Get<Unit>();
+			if (unit.Altitude == 0)
+				return NextActivity;
+
+			if (requireSpace && !Game.IsCellBuildable(self.Location, UnitMovementType.Foot))
+				return this;	// fail to land if no space
+
+			--unit.Altitude;
+			return this;
+		}
+
+		public void Cancel(Actor self) { isCanceled = true; NextActivity = null; }
+	}
+}

OpenRa.Game/Traits/Helicopter.cs

@@ -1,19 +1,13 @@
 using System;
 using System.Linq;
 using OpenRa.Game.GameRules;
+using OpenRa.Game.Traits.Activities;
 
 namespace OpenRa.Game.Traits
 {
-	class Helicopter : ITick, IOrder, IMovement
+	class Helicopter : IOrder, IMovement
 	{
-		public int2 targetLocation;
+		public Helicopter(Actor self) {}
-
-		const int CruiseAltitude = 20;
-
-		public Helicopter(Actor self)
-		{
-			targetLocation = self.Location;
-		}
 
 		public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor)
 		{
@@ -29,59 +23,13 @@ namespace OpenRa.Game.Traits
 		{
 			if (order.OrderString == "Move")
 			{
-				targetLocation = order.TargetLocation;
+				self.CancelActivity();
-
+				self.QueueActivity(new HeliFly(Util.CenterOfCell(order.TargetLocation)));
-				var attackBase = self.traits.WithInterface<AttackBase>().FirstOrDefault();
+				self.QueueActivity(new HeliLand(true));
-				if( attackBase != null )
-					attackBase.target = null;	/* move cancels attack order */
 			}
 		}
 
-		public void Tick(Actor self)
+		public UnitMovementType GetMovementType() { return UnitMovementType.Fly; }
-		{
+		public bool CanEnterCell(int2 location) { return true; }
-			var unit = self.traits.Get<Unit>();
-
-			if (self.Location != targetLocation)
-			{
-				var dist = Util.CenterOfCell(targetLocation) - self.CenterLocation;
-				var desiredFacing = Util.GetFacing(dist, unit.Facing);
-				Util.TickFacing(ref unit.Facing, desiredFacing,
-					self.Info.ROT);
-
-				var rawSpeed = .2f * Util.GetEffectiveSpeed(self);
-				var angle = (unit.Facing - desiredFacing) / 128f * Math.PI;
-				var scale = .4f + .6f * (float)Math.Cos(angle);
-
-				if (unit.Altitude > CruiseAltitude / 2)		// do some movement.
-				{
-					self.CenterLocation += (rawSpeed * scale / dist.Length) * dist;
-					self.CenterLocation +=  (1f - scale) * rawSpeed 
-						* float2.FromAngle((float)angle);
-					self.Location = ((1 / 24f) * self.CenterLocation).ToInt2();
-				}
-
-				if (unit.Altitude < CruiseAltitude)
-				{
-					++unit.Altitude;
-					return;
-				}
-			}
-			else if (unit.Altitude > 0 && 
-				Game.IsCellBuildable( self.Location, UnitMovementType.Foot ))
-			{
-				--unit.Altitude;
-			}
-
-			/* todo: bob slightly when hovering */
-		}
-		public UnitMovementType GetMovementType()
-		{
-			return UnitMovementType.Fly;
-		}
-
-		public bool CanEnterCell(int2 location)
-		{
-			return true; // Planes can go anywhere (?)
-		}
 	}
 }

OpenRa.Game/Traits/Production.cs

@@ -33,10 +33,6 @@ namespace OpenRa.Game.Traits
 				var mobile = newUnit.traits.GetOrDefault<Mobile>();
 				if( mobile != null )
 					newUnit.QueueActivity( new Activities.Move( rp.rallyPoint, 1 ) );
-
-				var heli = newUnit.traits.GetOrDefault<Helicopter>();
-				if (heli != null)
-					heli.targetLocation = rp.rallyPoint; // TODO: make Activity.Move work for helis.
 			}
 
 			var bi = self.Info as BuildingInfo;