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/Traits/Wanders.cs
+++ b/OpenRA.Mods.Common/Traits/Wanders.cs
@@ -0,0 +1,89 @@
+#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 OpenRA.Traits;
+
+namespace OpenRA.Mods.Common.Traits
+{
+	[Desc("Wanders around aimlessly while idle.")]
+	abstract class WandersInfo : ITraitInfo
+	{
+		public readonly int WanderMoveRadius = 10;
+
+		[Desc("Number of ticks to wait before decreasing the effective move radius.")]
+		public readonly int TicksToWaitBeforeReducingMoveRadius = 5;
+
+		[Desc("Mimimum ammount of ticks the actor will sit idly before starting to wander.")]
+		public readonly int MinMoveDelayInTicks = 0;
+
+		[Desc("Maximum ammount of ticks the actor will sit idly before starting to wander.")]
+		public readonly int MaxMoveDelayInTicks = 0;
+
+		public abstract object Create(ActorInitializer init);
+	}
+
+	class Wanders : INotifyIdle, INotifyBecomingIdle
+	{
+		readonly Actor self;
+		readonly WandersInfo info;
+
+		int countdown;
+		int ticksIdle;
+		int effectiveMoveRadius;
+
+		public Wanders(Actor self, WandersInfo info)
+		{
+			this.self = self;
+			this.info = info;
+			effectiveMoveRadius = info.WanderMoveRadius;
+		}
+
+		public void OnBecomingIdle(Actor self)
+		{
+			countdown = self.World.SharedRandom.Next(info.MinMoveDelayInTicks, info.MaxMoveDelayInTicks);
+		}
+
+		public void TickIdle(Actor self)
+		{
+			if (--countdown > 0)
+				return;
+
+			var targetPos = PickTargetLocation();
+			if (targetPos != CPos.Zero)
+				DoAction(self, targetPos);
+		}
+
+		CPos PickTargetLocation()
+		{
+			var target = self.CenterPosition + new WVec(0, -1024 * effectiveMoveRadius, 0).Rotate(WRot.FromFacing(self.World.SharedRandom.Next(255)));
+			var targetCell = self.World.Map.CellContaining(target);
+
+			if (!self.World.Map.Contains(targetCell))
+			{
+				// If MoveRadius is too big there might not be a valid cell to order the attack to (if actor is on a small island and can't leave)
+				if (++ticksIdle % info.TicksToWaitBeforeReducingMoveRadius == 0)
+					effectiveMoveRadius--;
+
+				return CPos.Zero;  // We'll be back the next tick; better to sit idle for a few seconds than prolong this tick indefinitely with a loop
+			}
+
+			ticksIdle = 0;
+			effectiveMoveRadius = info.WanderMoveRadius;
+
+			return targetCell;
+		}
+
+		public virtual void DoAction(Actor self, CPos targetPos)
+		{
+			throw new NotImplementedException("Base class Wanders does not implement method DoAction!");
+		}
+	}
+}