From 982fce7a9936afed2bb98663348db37514b6af17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Sat, 2 Apr 2016 13:00:35 +0200
Subject: [PATCH 1/4] Document that PowerManager is a player actor trait.

---
 OpenRA.Mods.Common/Traits/Power/Player/PowerManager.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OpenRA.Mods.Common/Traits/Power/Player/PowerManager.cs b/OpenRA.Mods.Common/Traits/Power/Player/PowerManager.cs
index 1616b1efe1..0ae7a61be0 100644
--- a/OpenRA.Mods.Common/Traits/Power/Player/PowerManager.cs
+++ b/OpenRA.Mods.Common/Traits/Power/Player/PowerManager.cs
@@ -15,6 +15,7 @@ using OpenRA.Traits;
 
 namespace OpenRA.Mods.Common.Traits
 {
+	[Desc("Attach this to the player actor.")]
 	public class PowerManagerInfo : ITraitInfo, Requires<DeveloperModeInfo>
 	{
 		public readonly int AdviceInterval = 250;

From 9b9b3474dda5a4e38b0808ef1bad73804321698b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Sat, 2 Apr 2016 14:07:37 +0200
Subject: [PATCH 2/4] Group radar traits in a sub-folder.

---
 OpenRA.Mods.Common/OpenRA.Mods.Common.csproj                | 6 +++---
 OpenRA.Mods.Common/Traits/{ => Radar}/AppearsOnRadar.cs     | 0
 OpenRA.Mods.Common/Traits/{ => Radar}/ProvidesRadar.cs      | 0
 .../Traits/{ => Radar}/RadarColorFromTerrain.cs             | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename OpenRA.Mods.Common/Traits/{ => Radar}/AppearsOnRadar.cs (100%)
 rename OpenRA.Mods.Common/Traits/{ => Radar}/ProvidesRadar.cs (100%)
 rename OpenRA.Mods.Common/Traits/{ => Radar}/RadarColorFromTerrain.cs (100%)

diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index 4a2f5fae3e..a16fc54752 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -260,7 +260,6 @@
     <Compile Include="Traits\Air\FlyAwayOnIdle.cs" />
     <Compile Include="Traits\Air\FallsToEarth.cs" />
     <Compile Include="Traits\Air\ReturnOnIdle.cs" />
-    <Compile Include="Traits\AppearsOnRadar.cs" />
     <Compile Include="Traits\Armament.cs" />
     <Compile Include="Traits\Armor.cs" />
     <Compile Include="Traits\AttackMove.cs" />
@@ -401,12 +400,10 @@
     <Compile Include="Traits\Power\ScalePowerWithHealth.cs" />
     <Compile Include="Traits\Production.cs" />
     <Compile Include="Traits\ProductionQueueFromSelection.cs" />
-    <Compile Include="Traits\ProvidesRadar.cs" />
     <Compile Include="Traits\ProximityCaptor.cs" />
     <Compile Include="Traits\ProximityCapturable.cs" />
     <Compile Include="Traits\BodyOrientation.cs" />
     <Compile Include="Traits\QuantizeFacingsFromSequence.cs" />
-    <Compile Include="Traits\RadarColorFromTerrain.cs" />
     <Compile Include="Traits\Render\AutoSelectionSize.cs" />
     <Compile Include="Traits\Render\Hovers.cs" />
     <Compile Include="Traits\Render\LeavesTrails.cs" />
@@ -737,6 +734,9 @@
     <Compile Include="Traits\World\MissionData.cs" />
     <Compile Include="UtilityCommands\ExtractMapRules.cs" />
     <Compile Include="Traits\ScriptTags.cs" />
+    <Compile Include="Traits\Radar\AppearsOnRadar.cs" />
+    <Compile Include="Traits\Radar\ProvidesRadar.cs" />
+    <Compile Include="Traits\Radar\RadarColorFromTerrain.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
diff --git a/OpenRA.Mods.Common/Traits/AppearsOnRadar.cs b/OpenRA.Mods.Common/Traits/Radar/AppearsOnRadar.cs
similarity index 100%
rename from OpenRA.Mods.Common/Traits/AppearsOnRadar.cs
rename to OpenRA.Mods.Common/Traits/Radar/AppearsOnRadar.cs
diff --git a/OpenRA.Mods.Common/Traits/ProvidesRadar.cs b/OpenRA.Mods.Common/Traits/Radar/ProvidesRadar.cs
similarity index 100%
rename from OpenRA.Mods.Common/Traits/ProvidesRadar.cs
rename to OpenRA.Mods.Common/Traits/Radar/ProvidesRadar.cs
diff --git a/OpenRA.Mods.Common/Traits/RadarColorFromTerrain.cs b/OpenRA.Mods.Common/Traits/Radar/RadarColorFromTerrain.cs
similarity index 100%
rename from OpenRA.Mods.Common/Traits/RadarColorFromTerrain.cs
rename to OpenRA.Mods.Common/Traits/Radar/RadarColorFromTerrain.cs

From 8df7d8b7845cdde7b251ebdcf1577a7d984503e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Sat, 2 Apr 2016 14:08:58 +0200
Subject: [PATCH 3/4] Separate JamsRadar into it's own file.

---
 OpenRA.Mods.Common/OpenRA.Mods.Common.csproj  |  1 +
 OpenRA.Mods.Common/Traits/Radar/JamsRadar.cs  | 24 +++++++++++++++++++
 .../Traits/Radar/ProvidesRadar.cs             |  9 -------
 3 files changed, 25 insertions(+), 9 deletions(-)
 create mode 100644 OpenRA.Mods.Common/Traits/Radar/JamsRadar.cs

diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index a16fc54752..4202672c00 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -737,6 +737,7 @@
     <Compile Include="Traits\Radar\AppearsOnRadar.cs" />
     <Compile Include="Traits\Radar\ProvidesRadar.cs" />
     <Compile Include="Traits\Radar\RadarColorFromTerrain.cs" />
+    <Compile Include="Traits\Radar\JamsRadar.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
diff --git a/OpenRA.Mods.Common/Traits/Radar/JamsRadar.cs b/OpenRA.Mods.Common/Traits/Radar/JamsRadar.cs
new file mode 100644
index 0000000000..4fd9b72c92
--- /dev/null
+++ b/OpenRA.Mods.Common/Traits/Radar/JamsRadar.cs
@@ -0,0 +1,24 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2016 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, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
+ */
+#endregion
+
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.Common.Traits
+{
+	[Desc("When an actor with this trait is in range of an actor with ProvidesRadar, it will temporarily disable the radar minimap for the enemy player.")]
+	public class JamsRadarInfo : TraitInfo<JamsRadar>
+	{
+		[Desc("Range for jamming.")]
+		public readonly WDist Range = WDist.Zero;
+	}
+
+	public class JamsRadar { }
+}
diff --git a/OpenRA.Mods.Common/Traits/Radar/ProvidesRadar.cs b/OpenRA.Mods.Common/Traits/Radar/ProvidesRadar.cs
index e2f5fe75ce..d18d2e7dbe 100644
--- a/OpenRA.Mods.Common/Traits/Radar/ProvidesRadar.cs
+++ b/OpenRA.Mods.Common/Traits/Radar/ProvidesRadar.cs
@@ -33,13 +33,4 @@ namespace OpenRA.Mods.Common.Traits
 					> a.Actor.Info.TraitInfo<JamsRadarInfo>().Range.LengthSquared);
 		}
 	}
-
-	[Desc("When an actor with this trait is in range of an actor with ProvidesRadar, it will temporarily disable the radar minimap for the enemy player.")]
-	public class JamsRadarInfo : TraitInfo<JamsRadar>
-	{
-		[Desc("Range for jamming.")]
-		public readonly WDist Range = WDist.Zero;
-	}
-
-	public class JamsRadar { }
 }

From a78d67a60cd6ae03a086b1c07d88012db5787730 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Sat, 2 Apr 2016 14:36:26 +0200
Subject: [PATCH 4/4] Put radar traits into their own namespace.

---
 OpenRA.Mods.Common/Traits/Radar/AppearsOnRadar.cs               | 2 +-
 OpenRA.Mods.Common/Traits/Radar/JamsRadar.cs                    | 2 +-
 OpenRA.Mods.Common/Traits/Radar/ProvidesRadar.cs                | 2 +-
 OpenRA.Mods.Common/Traits/Radar/RadarColorFromTerrain.cs        | 2 +-
 .../Widgets/Logic/Ingame/IngameRadarDisplayLogic.cs             | 2 +-
 OpenRA.Mods.RA/Traits/Render/RenderJammerCircle.cs              | 1 +
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/OpenRA.Mods.Common/Traits/Radar/AppearsOnRadar.cs b/OpenRA.Mods.Common/Traits/Radar/AppearsOnRadar.cs
index 8f65e4ae0e..ebd19bdb04 100644
--- a/OpenRA.Mods.Common/Traits/Radar/AppearsOnRadar.cs
+++ b/OpenRA.Mods.Common/Traits/Radar/AppearsOnRadar.cs
@@ -15,7 +15,7 @@ using System.Linq;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common.Traits
+namespace OpenRA.Mods.Common.Traits.Radar
 {
 	public class AppearsOnRadarInfo : ITraitInfo
 	{
diff --git a/OpenRA.Mods.Common/Traits/Radar/JamsRadar.cs b/OpenRA.Mods.Common/Traits/Radar/JamsRadar.cs
index 4fd9b72c92..f03b4c5233 100644
--- a/OpenRA.Mods.Common/Traits/Radar/JamsRadar.cs
+++ b/OpenRA.Mods.Common/Traits/Radar/JamsRadar.cs
@@ -11,7 +11,7 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common.Traits
+namespace OpenRA.Mods.Common.Traits.Radar
 {
 	[Desc("When an actor with this trait is in range of an actor with ProvidesRadar, it will temporarily disable the radar minimap for the enemy player.")]
 	public class JamsRadarInfo : TraitInfo<JamsRadar>
diff --git a/OpenRA.Mods.Common/Traits/Radar/ProvidesRadar.cs b/OpenRA.Mods.Common/Traits/Radar/ProvidesRadar.cs
index d18d2e7dbe..0ed0cf8ebc 100644
--- a/OpenRA.Mods.Common/Traits/Radar/ProvidesRadar.cs
+++ b/OpenRA.Mods.Common/Traits/Radar/ProvidesRadar.cs
@@ -12,7 +12,7 @@
 using System.Linq;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common.Traits
+namespace OpenRA.Mods.Common.Traits.Radar
 {
 	[Desc("This actor enables the radar minimap.")]
 	public class ProvidesRadarInfo : TraitInfo<ProvidesRadar> { }
diff --git a/OpenRA.Mods.Common/Traits/Radar/RadarColorFromTerrain.cs b/OpenRA.Mods.Common/Traits/Radar/RadarColorFromTerrain.cs
index b0a55b0af3..eea87b7057 100644
--- a/OpenRA.Mods.Common/Traits/Radar/RadarColorFromTerrain.cs
+++ b/OpenRA.Mods.Common/Traits/Radar/RadarColorFromTerrain.cs
@@ -12,7 +12,7 @@
 using System.Drawing;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common.Traits
+namespace OpenRA.Mods.Common.Traits.Radar
 {
 	public class RadarColorFromTerrainInfo : ITraitInfo
 	{
diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameRadarDisplayLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameRadarDisplayLogic.cs
index 6d3201fa37..960fced168 100644
--- a/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameRadarDisplayLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameRadarDisplayLogic.cs
@@ -11,7 +11,7 @@
 
 using System.Drawing;
 using System.Linq;
-using OpenRA.Mods.Common.Traits;
+using OpenRA.Mods.Common.Traits.Radar;
 using OpenRA.Traits;
 using OpenRA.Widgets;
 
diff --git a/OpenRA.Mods.RA/Traits/Render/RenderJammerCircle.cs b/OpenRA.Mods.RA/Traits/Render/RenderJammerCircle.cs
index 391c4c1e63..2002cbcfc1 100644
--- a/OpenRA.Mods.RA/Traits/Render/RenderJammerCircle.cs
+++ b/OpenRA.Mods.RA/Traits/Render/RenderJammerCircle.cs
@@ -14,6 +14,7 @@ using System.Drawing;
 using OpenRA.Graphics;
 using OpenRA.Mods.Common.Graphics;
 using OpenRA.Mods.Common.Traits;
+using OpenRA.Mods.Common.Traits.Radar;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Traits