Add RenderJammerCircle

OpenRA.Mods.RA/JamsMissiles.cs

@@ -11,22 +11,25 @@
 using OpenRA;
 using OpenRA.Traits;
 
-class JamsMissilesInfo : ITraitInfo
+namespace OpenRA.Mods.RA
 {
-	public readonly int Range = 0;
-	public readonly bool AlliedMissiles = true;
-	public readonly int Chance = 100;
+	class JamsMissilesInfo : ITraitInfo
+	{
+		public readonly int Range = 0;
+		public readonly bool AlliedMissiles = true;
+		public readonly int Chance = 100;
 
-	public object Create(ActorInitializer init) { return new JamsMissiles(this); }
-}
-
-class JamsMissiles
-{
-	readonly JamsMissilesInfo info;
-
-	public int Range { get { return info.Range; } }
-	public bool AlliedMissiles { get { return info.AlliedMissiles; } }
-	public int Chance { get { return info.Chance; } }
-
-	public JamsMissiles(JamsMissilesInfo info) { this.info = info; }
+		public object Create(ActorInitializer init) { return new JamsMissiles(this); }
+	}
+
+	class JamsMissiles
+	{
+		readonly JamsMissilesInfo info;
+
+		public int Range { get { return info.Range; } }
+		public bool AlliedMissiles { get { return info.AlliedMissiles; } }
+		public int Chance { get { return info.Chance; } }
+
+		public JamsMissiles(JamsMissilesInfo info) { this.info = info; }
+	}
 }

OpenRA.Mods.RA/OpenRA.Mods.RA.csproj

@@ -302,6 +302,7 @@
     <Compile Include="RallyPoint.cs" />
     <Compile Include="Reloads.cs" />
     <Compile Include="RenderDetectionCircle.cs" />
+    <Compile Include="RenderJammerCircle.cs" />
     <Compile Include="RenderRangeCircle.cs" />
     <Compile Include="Render\RenderBuilding.cs" />
     <Compile Include="Render\RenderBuildingCharge.cs" />

OpenRA.Mods.RA/RenderJammerCircle.cs

@@ -0,0 +1,63 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2013 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.Drawing;
+using OpenRA.Graphics;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.RA
+{
+	//todo: remove all the Render*Circle duplication
+	class RenderJammerCircleInfo : TraitInfo<RenderJammerCircle>, IPlaceBuildingDecoration
+	{
+		public void Render(WorldRenderer wr, World w, ActorInfo ai, PPos centerLocation)
+		{
+			var jamsMissiles = ai.Traits.GetOrDefault<JamsMissilesInfo>();
+			if (jamsMissiles != null)
+				RenderJammerCircle.DrawRangeCircle(wr, centerLocation.ToFloat2(), jamsMissiles.Range, Color.Red);
+
+			var jamsRadar = ai.Traits.GetOrDefault<JamsRadarInfo>();
+			if (jamsRadar != null)
+				RenderJammerCircle.DrawRangeCircle(wr, centerLocation.ToFloat2(), jamsRadar.Range, Color.Blue);
+
+			foreach (var a in w.ActorsWithTrait<RenderJammerCircle>())
+				if (a.Actor.Owner == a.Actor.World.LocalPlayer)
+					a.Trait.RenderBeforeWorld(wr, a.Actor);
+		}
+	}
+
+	public class RenderJammerCircle : IPreRenderSelection
+	{
+		public void RenderBeforeWorld(WorldRenderer wr, Actor self)
+		{
+			if (self.Owner != self.World.LocalPlayer)
+				return;
+
+			var jamsMissiles = self.Info.Traits.GetOrDefault<JamsMissilesInfo>();
+			if (jamsMissiles != null)
+				DrawRangeCircle(wr, self.CenterLocation.ToFloat2(), jamsMissiles.Range, Color.Red);
+
+			var jamsRadar = self.Info.Traits.GetOrDefault<JamsRadarInfo>();
+			if (jamsRadar != null)
+				DrawRangeCircle(wr, self.CenterLocation.ToFloat2(), jamsRadar.Range, Color.Blue);
+		}
+
+		public static void DrawRangeCircle(WorldRenderer wr, float2 location, int range, Color color)
+		{
+			wr.DrawRangeCircleWithContrast(
+				Color.FromArgb(128, color),
+				location,
+				range,
+				Color.FromArgb(96, Color.Black),
+				1);
+		}
+	}
+}
+

mods/ra/rules/vehicles.yaml

@@ -564,6 +564,7 @@ MRJ:
 		Range: 15
 	JamsMissiles:
 		Range: 3
+	RenderJammerCircle:
 
 1TNK.Husk:
 	Inherits: ^Husk