Merge branch 'master' into minelayer

OpenRa.Game/Traits/AutoHeal.cs

@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace OpenRa.Game.Traits
+{
+	class AutoHeal : ITick
+	{
+		public AutoHeal(Actor self) { }
+
+		void AttackTarget(Actor self, Actor target)
+		{
+			var attack = self.traits.WithInterface<AttackBase>().First();
+			if (target != null)
+				attack.ResolveOrder(self, new Order("Attack", self, target, int2.Zero, null));
+			else
+				self.CancelActivity();
+		}
+
+		float GetMaximumRange(Actor self)
+		{
+			return new[] { self.Info.Primary, self.Info.Secondary }
+				.Where(w => w != null)
+				.Max(w => Rules.WeaponInfo[w].Range);
+		}
+
+		bool NeedsNewTarget(Actor self)
+		{
+			var attack = self.traits.WithInterface<AttackBase>().First();
+			var range = GetMaximumRange(self);
+
+			if (attack.target == null)
+				return true;	// he's dead.
+			if ((attack.target.Location - self.Location).LengthSquared > range * range + 2)
+				return true;	// wandered off faster than we could follow
+			if (attack.target.Health == attack.target.Info.Strength)
+				return true;	// fully healed
+
+			return false;
+		}
+
+		public void Tick(Actor self)
+		{
+			var attack = self.traits.WithInterface<AttackBase>().First();
+			var range = GetMaximumRange(self);
+
+			if (NeedsNewTarget(self))
+				AttackTarget(self, ChooseTarget(self, range));
+		}
+
+		Actor ChooseTarget(Actor self, float range)
+		{
+			var inRange = Game.FindUnitsInCircle(self.CenterLocation, Game.CellSize * range);
+
+			return inRange
+				.Where(a => a.Owner == self.Owner)	/* todo: one day deal with friendly players */
+				.Where(a => Combat.HasAnyValidWeapons(self, a))
+				.Where(a => a.Health < a.Info.Strength)
+				.OrderBy(a => (a.Location - self.Location).LengthSquared)
+				.FirstOrDefault();
+		}
+	}
+}

OpenRa.Game/Traits/AutoTarget.cs

@@ -16,16 +16,23 @@ namespace OpenRa.Game.Traits
 				attack.ResolveOrder(self, new Order("Attack", self, target, int2.Zero, null));
 		}
 
+		float GetMaximumRange(Actor self)
+		{
+			return new[] { self.Info.Primary, self.Info.Secondary }
+				.Where(w => w != null)
+				.Max(w => Rules.WeaponInfo[w].Range);
+		}
+
 		public void Tick(Actor self)
 		{
 			if (!self.IsIdle) return;
 
 			var attack = self.traits.WithInterface<AttackBase>().First();
-			var range = Rules.WeaponInfo[self.Info.Primary].Range;
+			var range = GetMaximumRange(self);
 			
 			if (attack.target == null || 
 				(attack.target.Location - self.Location).LengthSquared > range * range + 2)
-				attack.target = ChooseTarget(self, range);
+				AttackTarget(self, ChooseTarget(self, range));
 		}
 
 		Actor ChooseTarget(Actor self, float range)

OpenRa.Game/Traits/RenderBuildingWarFactory.cs

@@ -35,7 +35,7 @@ namespace OpenRa.Game.Traits
 		{
 			if (doneBuilding) roof.Tick();
 
-			var b = self.Bounds;
+			var b = self.GetBounds(false);
 			if (isOpen && !Game.UnitInfluence.GetUnitsAt(((1/24f) * self.CenterLocation).ToInt2()).Any())
 			{
 				isOpen = false;