detectors

OpenRA.Game/Graphics/WorldRenderer.cs

@@ -341,31 +341,33 @@ namespace OpenRA.Graphics
 			}
 		}
 
-		public void DrawRangeCircle(Actor selectedUnit)
+		public void DrawRangeCircle(Color c, int2 location, int range)
 		{
-			if (selectedUnit.Owner != world.LocalPlayer)
-				return;
-
-			var range = (int)selectedUnit.GetPrimaryWeapon().Range;
 			var r2 = range * range;
 
-			var c = Color.FromArgb(128, Color.Yellow);
-
-			foreach (var t in world.FindTilesInCircle(selectedUnit.Location, range))
+			foreach (var t in world.FindTilesInCircle(location, range))
 			{
-				if ((selectedUnit.Location - t - new int2(-1, 0)).LengthSquared > r2)
+				if ((location - t - new int2(-1, 0)).LengthSquared > r2)
 					lineRenderer.DrawLine(Game.CellSize * t, Game.CellSize * (t + new int2(0, 1)),
 						c, c);
-				if ((selectedUnit.Location - t - new int2(1, 0)).LengthSquared > r2)
+				if ((location - t - new int2(1, 0)).LengthSquared > r2)
 					lineRenderer.DrawLine(Game.CellSize * (t + new int2(1, 0)), Game.CellSize * (t + new int2(1, 1)),
 						c, c);
-				if ((selectedUnit.Location - t - new int2(0,-1)).LengthSquared > r2)
+				if ((location - t - new int2(0, -1)).LengthSquared > r2)
 					lineRenderer.DrawLine(Game.CellSize * t, Game.CellSize * (t + new int2(1, 0)),
 						c, c);
-				if ((selectedUnit.Location - t - new int2(0,1)).LengthSquared > r2)
+				if ((location - t - new int2(0, 1)).LengthSquared > r2)
 					lineRenderer.DrawLine(Game.CellSize * (t + new int2(0, 1)), Game.CellSize * (t + new int2(1, 1)),
 						c, c);
 			}
 		}
+
+		public void DrawRangeCircle(Actor selectedUnit)
+		{
+			if (selectedUnit.Owner == world.LocalPlayer)
+				DrawRangeCircle(Color.FromArgb(128, Color.Yellow), 
+					selectedUnit.Location, 
+					(int)selectedUnit.GetPrimaryWeapon().Range);
+		}
 	}
 }

OpenRA.Game/OpenRA.Game.csproj

@@ -85,6 +85,7 @@
     <Compile Include="Traits\AI\EmitInfantryOnSell.cs" />
     <Compile Include="Traits\AI\ReturnOnIdle.cs" />
     <Compile Include="Traits\Attack\AttackLeap.cs" />
+    <Compile Include="Traits\DetectCloaked.cs" />
     <Compile Include="Traits\Player\ActorGroupProxy.cs" />
     <Compile Include="Traits\Player\PlayerResources.cs" />
     <Compile Include="Traits\Player\TechTreeCache.cs" />
@@ -268,7 +269,7 @@
     <Compile Include="Traits\Render\RenderUnitTurreted.cs" />
     <Compile Include="Traits\SeedsResource.cs" />
     <Compile Include="Traits\StoresOre.cs" />
-    <Compile Include="Traits\Submarine.cs" />
+    <Compile Include="Traits\Cloak.cs" />
     <Compile Include="Traits\AI\TakeCover.cs" />
     <Compile Include="Traits\TraitsInterfaces.cs" />
     <Compile Include="Traits\Turreted.cs" />

OpenRA.Game/Orders/UnitOrderGenerator.cs

@@ -51,8 +51,16 @@ namespace OpenRA.Orders
 			foreach (var a in Game.controller.selection.Actors)
 			{
 				world.WorldRenderer.DrawSelectionBox(a, Color.White, true);
+				if (a.Owner == world.LocalPlayer)
+				{
 					if (a.traits.Contains<RenderRangeCircle>())
-					world.WorldRenderer.DrawRangeCircle(a);
+						world.WorldRenderer.DrawRangeCircle(Color.FromArgb(128, Color.Yellow),
+							a.Location, (int)a.GetPrimaryWeapon().Range);
+
+					if (a.traits.Contains<DetectCloaked>())
+						world.WorldRenderer.DrawRangeCircle(Color.FromArgb(128, Color.LimeGreen),
+							a.Location, a.Info.Traits.Get<DetectCloakedInfo>().Range);
+				}
 			}
 		}
 

OpenRA.Game/Traits/Cloak.cs

@@ -86,5 +86,11 @@ namespace OpenRA.Traits
 		}
 
 		public bool Cloaked { get { return remainingTime > 0; } }
+
+		public void Decloak(int time)
+		{
+			DoSurface();
+			remainingTime = Math.Max(remainingTime, time);
+		}
 	}
 }

OpenRA.Game/Traits/DetectCloaked.cs

@@ -0,0 +1,52 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System.Linq;
+
+namespace OpenRA.Traits
+{
+	class DetectCloakedInfo : TraitInfo<DetectCloaked>
+	{
+		public readonly int Interval = 12;		// ~.5s
+		public readonly float DecloakTime = 2f;	// 2s
+		public readonly int Range = 5;
+	}
+
+	class DetectCloaked : ITick
+	{
+		[Sync] int ticks;
+
+		public void Tick(Actor self)
+		{
+			if (--ticks <= 0)
+			{
+				var info = self.Info.Traits.Get<DetectCloakedInfo>();
+				ticks = info.Interval;
+
+				var toDecloak = self.World.FindUnitsInCircle(self.CenterLocation, info.Range * Game.CellSize)
+					.Where(a => a.traits.Contains<Cloak>())
+					.Where(a => a.Owner.Stances[self.Owner] != Stance.Ally);
+
+				foreach (var a in toDecloak)
+					a.traits.Get<Cloak>().Decloak((int)(25 * info.DecloakTime));
+			}
+		}
+	}
+}