From f3d364877af1087554e6d9372323ee82b1069ddd Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Thu, 15 Jan 2015 22:39:41 +0100
Subject: [PATCH 1/4] Moves the last 3 UtilityCommands and some prerequisite
 references to Mods.Common

---
 OpenRA.Mods.Common/OpenRA.Mods.Common.csproj             | 9 ++++++++-
 .../UtilityCommands/ActorStatsExport.cs                  | 3 +--
 .../UtilityCommands/ExportCharacterSeparatedRules.cs     | 2 +-
 .../UtilityCommands/Extensions.cs                        | 2 +-
 OpenRA.Mods.RA/OpenRA.Mods.RA.csproj                     | 3 ---
 5 files changed, 11 insertions(+), 8 deletions(-)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/UtilityCommands/ActorStatsExport.cs (97%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/UtilityCommands/ExportCharacterSeparatedRules.cs (95%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/UtilityCommands/Extensions.cs (96%)

diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index 3414364aad..9fd20ac599 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -32,8 +32,12 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="System.Drawing" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
     <Reference Include="Eluant">
       <HintPath>..\thirdparty\Eluant.dll</HintPath>
       <Private>False</Private>
@@ -374,8 +378,11 @@
     <Compile Include="Traits\World\SpawnMPUnits.cs" />
     <Compile Include="Traits\World\StartGameNotification.cs" />
     <Compile Include="Traits\World\TerrainGeometryOverlay.cs" />
+    <Compile Include="UtilityCommands\ActorStatsExport.cs" />
     <Compile Include="UtilityCommands\ConvertPngToShpCommand.cs" />
     <Compile Include="UtilityCommands\ConvertSpriteToPngCommand.cs" />
+    <Compile Include="UtilityCommands\ExportCharacterSeparatedRules.cs" />
+    <Compile Include="UtilityCommands\Extensions.cs" />
     <Compile Include="UtilityCommands\ExtractFilesCommand.cs" />
     <Compile Include="UtilityCommands\ExtractLanguageStringsCommand.cs" />
     <Compile Include="UtilityCommands\ExtractLuaDocsCommand.cs" />
diff --git a/OpenRA.Mods.RA/UtilityCommands/ActorStatsExport.cs b/OpenRA.Mods.Common/UtilityCommands/ActorStatsExport.cs
similarity index 97%
rename from OpenRA.Mods.RA/UtilityCommands/ActorStatsExport.cs
rename to OpenRA.Mods.Common/UtilityCommands/ActorStatsExport.cs
index a631209f03..883d103ed3 100644
--- a/OpenRA.Mods.RA/UtilityCommands/ActorStatsExport.cs
+++ b/OpenRA.Mods.Common/UtilityCommands/ActorStatsExport.cs
@@ -14,10 +14,9 @@ using System.Data;
 using System.Linq;
 using OpenRA.GameRules;
 using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.UtilityCommands
+namespace OpenRA.Mods.Common.UtilityCommands
 {
 	public static class ActorStatsExport
 	{
diff --git a/OpenRA.Mods.RA/UtilityCommands/ExportCharacterSeparatedRules.cs b/OpenRA.Mods.Common/UtilityCommands/ExportCharacterSeparatedRules.cs
similarity index 95%
rename from OpenRA.Mods.RA/UtilityCommands/ExportCharacterSeparatedRules.cs
rename to OpenRA.Mods.Common/UtilityCommands/ExportCharacterSeparatedRules.cs
index faf1150f40..98dbd800d3 100644
--- a/OpenRA.Mods.RA/UtilityCommands/ExportCharacterSeparatedRules.cs
+++ b/OpenRA.Mods.Common/UtilityCommands/ExportCharacterSeparatedRules.cs
@@ -11,7 +11,7 @@
 using System;
 using System.IO;
 
-namespace OpenRA.Mods.RA.UtilityCommands
+namespace OpenRA.Mods.Common.UtilityCommands
 {
 	class ExportCharacterSeparatedRules : IUtilityCommand
 	{
diff --git a/OpenRA.Mods.RA/UtilityCommands/Extensions.cs b/OpenRA.Mods.Common/UtilityCommands/Extensions.cs
similarity index 96%
rename from OpenRA.Mods.RA/UtilityCommands/Extensions.cs
rename to OpenRA.Mods.Common/UtilityCommands/Extensions.cs
index c36cdcec98..5bb4a71507 100644
--- a/OpenRA.Mods.RA/UtilityCommands/Extensions.cs
+++ b/OpenRA.Mods.Common/UtilityCommands/Extensions.cs
@@ -12,7 +12,7 @@ using System;
 using System.Data;
 using System.Text;
 
-namespace OpenRA.Mods.RA.UtilityCommands
+namespace OpenRA.Mods.Common.UtilityCommands
 {
 	public static class Extensions
 	{
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index 425369810f..e0507fed2e 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -233,9 +233,6 @@
     <Compile Include="Scripting\Properties\PlaneProperties.cs" />
     <Compile Include="Traits\InvulnerabilityUpgrade.cs" />
     <Compile Include="Scripting\Properties\TransformProperties.cs" />
-    <Compile Include="UtilityCommands\ActorStatsExport.cs" />
-    <Compile Include="UtilityCommands\ExportCharacterSeparatedRules.cs" />
-    <Compile Include="UtilityCommands\Extensions.cs" />
     <Compile Include="Lint\CheckMapRules.cs" />
   </ItemGroup>
   <ItemGroup>

From 6f0ae30a7e30c2a1c27494e3cca1ddc727bb2ac7 Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Thu, 15 Jan 2015 22:56:35 +0100
Subject: [PATCH 2/4] Moves nearly all ScriptingProperties to Mods.Common

---
 OpenRA.Mods.Common/OpenRA.Mods.Common.csproj      | 13 +++++++++++++
 .../Scripting/Global/ReinforcementsGlobal.cs      |  5 +----
 .../Scripting/Properties/AirstrikeProperties.cs   |  2 +-
 .../Scripting/Properties/CombatProperties.cs      |  3 +--
 .../Scripting/Properties/GeneralProperties.cs     |  4 +---
 .../Scripting/Properties/GuardProperties.cs       |  2 +-
 .../Scripting/Properties/HelicopterProperties.cs  |  3 +--
 .../Properties/MissionObjectiveProperties.cs      |  3 +--
 .../Scripting/Properties/MobileProperties.cs      |  4 +---
 .../Scripting/Properties/PlaneProperties.cs       |  3 +--
 .../Scripting/Properties/PlayerProperties.cs      |  3 +--
 .../Scripting/Properties/ProductionProperties.cs  |  3 +--
 .../Properties/RepairableBuildingProperties.cs    |  2 +-
 .../Scripting/Properties/TransformProperties.cs   |  3 +--
 OpenRA.Mods.RA/OpenRA.Mods.RA.csproj              | 15 +--------------
 15 files changed, 27 insertions(+), 41 deletions(-)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Scripting/Global/ReinforcementsGlobal.cs (98%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Scripting/Properties/AirstrikeProperties.cs (96%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Scripting/Properties/CombatProperties.cs (97%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Scripting/Properties/GeneralProperties.cs (97%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Scripting/Properties/GuardProperties.cs (95%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Scripting/Properties/HelicopterProperties.cs (93%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Scripting/Properties/MissionObjectiveProperties.cs (98%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Scripting/Properties/MobileProperties.cs (94%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Scripting/Properties/PlaneProperties.cs (95%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Scripting/Properties/PlayerProperties.cs (94%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Scripting/Properties/ProductionProperties.cs (99%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Scripting/Properties/RepairableBuildingProperties.cs (97%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Scripting/Properties/TransformProperties.cs (93%)

diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index 9fd20ac599..775e10c6a6 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -155,6 +155,7 @@
     <Compile Include="Scripting\Global\MapGlobal.cs" />
     <Compile Include="Scripting\Global\MediaGlobal.cs" />
     <Compile Include="Scripting\Global\PlayerGlobal.cs" />
+    <Compile Include="Scripting\Global\ReinforcementsGlobal.cs" />
     <Compile Include="Scripting\Global\TriggerGlobal.cs" />
     <Compile Include="Scripting\Global\UtilsGlobal.cs" />
     <Compile Include="Scripting\Properties\DiplomacyProperties.cs" />
@@ -162,6 +163,18 @@
     <Compile Include="Scripting\Properties\PowerProperties.cs" />
     <Compile Include="Scripting\Properties\ResourceProperties.cs" />
     <Compile Include="Scripting\Properties\UpgradeProperties.cs" />
+    <Compile Include="Scripting\Properties\AirstrikeProperties.cs" />
+    <Compile Include="Scripting\Properties\ProductionProperties.cs" />
+    <Compile Include="Scripting\Properties\MissionObjectiveProperties.cs" />
+    <Compile Include="Scripting\Properties\MobileProperties.cs" />
+    <Compile Include="Scripting\Properties\GeneralProperties.cs" />
+    <Compile Include="Scripting\Properties\CombatProperties.cs" />
+    <Compile Include="Scripting\Properties\PlayerProperties.cs" />
+    <Compile Include="Scripting\Properties\HelicopterProperties.cs" />
+    <Compile Include="Scripting\Properties\PlaneProperties.cs" />
+    <Compile Include="Scripting\Properties\TransformProperties.cs" />
+    <Compile Include="Scripting\Properties\RepairableBuildingProperties.cs" />
+    <Compile Include="Scripting\Properties\GuardProperties.cs" />
     <Compile Include="TraitsInterfaces.cs" />
     <Compile Include="Traits\Air\Aircraft.cs" />
     <Compile Include="Traits\Air\AttackBomber.cs" />
diff --git a/OpenRA.Mods.RA/Scripting/Global/ReinforcementsGlobal.cs b/OpenRA.Mods.Common/Scripting/Global/ReinforcementsGlobal.cs
similarity index 98%
rename from OpenRA.Mods.RA/Scripting/Global/ReinforcementsGlobal.cs
rename to OpenRA.Mods.Common/Scripting/Global/ReinforcementsGlobal.cs
index 990cbf70fa..1f02271e6d 100644
--- a/OpenRA.Mods.RA/Scripting/Global/ReinforcementsGlobal.cs
+++ b/OpenRA.Mods.Common/Scripting/Global/ReinforcementsGlobal.cs
@@ -12,18 +12,15 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Eluant;
-using OpenRA;
 using OpenRA.Activities;
 using OpenRA.Effects;
 using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.RA.Activities;
-using OpenRA.Mods.RA.Traits;
 using OpenRA.Primitives;
 using OpenRA.Scripting;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Scripting
+namespace OpenRA.Mods.Common.Scripting
 {
 	[ScriptGlobal("Reinforcements")]
 	public class ReinforcementsGlobal : ScriptGlobal
diff --git a/OpenRA.Mods.RA/Scripting/Properties/AirstrikeProperties.cs b/OpenRA.Mods.Common/Scripting/Properties/AirstrikeProperties.cs
similarity index 96%
rename from OpenRA.Mods.RA/Scripting/Properties/AirstrikeProperties.cs
rename to OpenRA.Mods.Common/Scripting/Properties/AirstrikeProperties.cs
index 6856427619..7ab314dfe5 100644
--- a/OpenRA.Mods.RA/Scripting/Properties/AirstrikeProperties.cs
+++ b/OpenRA.Mods.Common/Scripting/Properties/AirstrikeProperties.cs
@@ -14,7 +14,7 @@ using OpenRA.Mods.Common.Traits;
 using OpenRA.Scripting;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Scripting
+namespace OpenRA.Mods.Common.Scripting
 {
 	[ScriptGlobal("Air Support Powers")]
 	public class AirstrikeProperties : ScriptActorProperties, Requires<AirstrikePowerInfo>
diff --git a/OpenRA.Mods.RA/Scripting/Properties/CombatProperties.cs b/OpenRA.Mods.Common/Scripting/Properties/CombatProperties.cs
similarity index 97%
rename from OpenRA.Mods.RA/Scripting/Properties/CombatProperties.cs
rename to OpenRA.Mods.Common/Scripting/Properties/CombatProperties.cs
index 298681366f..6f843ed438 100644
--- a/OpenRA.Mods.RA/Scripting/Properties/CombatProperties.cs
+++ b/OpenRA.Mods.Common/Scripting/Properties/CombatProperties.cs
@@ -14,11 +14,10 @@ using Eluant;
 using OpenRA.Activities;
 using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.RA.Activities;
 using OpenRA.Scripting;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Scripting
+namespace OpenRA.Mods.Common.Scripting
 {
 	[ScriptPropertyGroup("Combat")]
 	public class CombatProperties : ScriptActorProperties, Requires<AttackBaseInfo>, Requires<IMoveInfo>
diff --git a/OpenRA.Mods.RA/Scripting/Properties/GeneralProperties.cs b/OpenRA.Mods.Common/Scripting/Properties/GeneralProperties.cs
similarity index 97%
rename from OpenRA.Mods.RA/Scripting/Properties/GeneralProperties.cs
rename to OpenRA.Mods.Common/Scripting/Properties/GeneralProperties.cs
index da5bca7399..0f129f6635 100644
--- a/OpenRA.Mods.RA/Scripting/Properties/GeneralProperties.cs
+++ b/OpenRA.Mods.Common/Scripting/Properties/GeneralProperties.cs
@@ -11,12 +11,10 @@
 using Eluant;
 using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.RA.Activities;
-using OpenRA.Mods.RA.Traits;
 using OpenRA.Scripting;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Scripting
+namespace OpenRA.Mods.Common.Scripting
 {
 	[ExposedForDestroyedActors]
 	[ScriptPropertyGroup("General")]
diff --git a/OpenRA.Mods.RA/Scripting/Properties/GuardProperties.cs b/OpenRA.Mods.Common/Scripting/Properties/GuardProperties.cs
similarity index 95%
rename from OpenRA.Mods.RA/Scripting/Properties/GuardProperties.cs
rename to OpenRA.Mods.Common/Scripting/Properties/GuardProperties.cs
index 0481b6ebd2..bf947cae36 100644
--- a/OpenRA.Mods.RA/Scripting/Properties/GuardProperties.cs
+++ b/OpenRA.Mods.Common/Scripting/Properties/GuardProperties.cs
@@ -12,7 +12,7 @@ using OpenRA.Mods.Common.Traits;
 using OpenRA.Scripting;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Scripting
+namespace OpenRA.Mods.Common.Scripting
 {
 	[ScriptPropertyGroup("Guard")]
 	public class GuardProperties : ScriptActorProperties, Requires<GuardInfo>, Requires<IMoveInfo>
diff --git a/OpenRA.Mods.RA/Scripting/Properties/HelicopterProperties.cs b/OpenRA.Mods.Common/Scripting/Properties/HelicopterProperties.cs
similarity index 93%
rename from OpenRA.Mods.RA/Scripting/Properties/HelicopterProperties.cs
rename to OpenRA.Mods.Common/Scripting/Properties/HelicopterProperties.cs
index 6da7cb9dbb..eb0e718d63 100644
--- a/OpenRA.Mods.RA/Scripting/Properties/HelicopterProperties.cs
+++ b/OpenRA.Mods.Common/Scripting/Properties/HelicopterProperties.cs
@@ -10,11 +10,10 @@
 
 using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.RA.Traits;
 using OpenRA.Scripting;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Scripting
+namespace OpenRA.Mods.Common.Scripting
 {
 	[ScriptPropertyGroup("Movement")]
 	public class HelicopterProperties : ScriptActorProperties, Requires<HelicopterInfo>
diff --git a/OpenRA.Mods.RA/Scripting/Properties/MissionObjectiveProperties.cs b/OpenRA.Mods.Common/Scripting/Properties/MissionObjectiveProperties.cs
similarity index 98%
rename from OpenRA.Mods.RA/Scripting/Properties/MissionObjectiveProperties.cs
rename to OpenRA.Mods.Common/Scripting/Properties/MissionObjectiveProperties.cs
index c0d428c106..4f42bfd5f4 100644
--- a/OpenRA.Mods.RA/Scripting/Properties/MissionObjectiveProperties.cs
+++ b/OpenRA.Mods.Common/Scripting/Properties/MissionObjectiveProperties.cs
@@ -10,12 +10,11 @@
 
 using System;
 using Eluant;
-using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Scripting;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Scripting
+namespace OpenRA.Mods.Common.Scripting
 {
 	[ScriptPropertyGroup("MissionObjectives")]
 	public class MissionObjectiveProperties : ScriptPlayerProperties
diff --git a/OpenRA.Mods.RA/Scripting/Properties/MobileProperties.cs b/OpenRA.Mods.Common/Scripting/Properties/MobileProperties.cs
similarity index 94%
rename from OpenRA.Mods.RA/Scripting/Properties/MobileProperties.cs
rename to OpenRA.Mods.Common/Scripting/Properties/MobileProperties.cs
index 3b6b0e950d..8314022a27 100644
--- a/OpenRA.Mods.RA/Scripting/Properties/MobileProperties.cs
+++ b/OpenRA.Mods.Common/Scripting/Properties/MobileProperties.cs
@@ -10,12 +10,10 @@
 
 using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.RA.Activities;
-using OpenRA.Mods.RA.Traits;
 using OpenRA.Scripting;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Scripting
+namespace OpenRA.Mods.Common.Scripting
 {
 	[ScriptPropertyGroup("Movement")]
 	public class MobileProperties : ScriptActorProperties, Requires<MobileInfo>
diff --git a/OpenRA.Mods.RA/Scripting/Properties/PlaneProperties.cs b/OpenRA.Mods.Common/Scripting/Properties/PlaneProperties.cs
similarity index 95%
rename from OpenRA.Mods.RA/Scripting/Properties/PlaneProperties.cs
rename to OpenRA.Mods.Common/Scripting/Properties/PlaneProperties.cs
index ad25f2ddaa..ab3b29cdbb 100644
--- a/OpenRA.Mods.RA/Scripting/Properties/PlaneProperties.cs
+++ b/OpenRA.Mods.Common/Scripting/Properties/PlaneProperties.cs
@@ -10,11 +10,10 @@
 
 using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.RA.Traits;
 using OpenRA.Scripting;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Scripting
+namespace OpenRA.Mods.Common.Scripting
 {
 	[ScriptPropertyGroup("Movement")]
 	public class PlaneProperties : ScriptActorProperties, Requires<PlaneInfo>
diff --git a/OpenRA.Mods.RA/Scripting/Properties/PlayerProperties.cs b/OpenRA.Mods.Common/Scripting/Properties/PlayerProperties.cs
similarity index 94%
rename from OpenRA.Mods.RA/Scripting/Properties/PlayerProperties.cs
rename to OpenRA.Mods.Common/Scripting/Properties/PlayerProperties.cs
index e2a2839c6c..fbedf9b41a 100644
--- a/OpenRA.Mods.RA/Scripting/Properties/PlayerProperties.cs
+++ b/OpenRA.Mods.Common/Scripting/Properties/PlayerProperties.cs
@@ -12,10 +12,9 @@ using System;
 using System.Linq;
 using Eluant;
 using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.RA.Traits;
 using OpenRA.Scripting;
 
-namespace OpenRA.Mods.RA.Scripting
+namespace OpenRA.Mods.Common.Scripting
 {
 	[ScriptPropertyGroup("Player")]
 	public class PlayerProperties : ScriptPlayerProperties
diff --git a/OpenRA.Mods.RA/Scripting/Properties/ProductionProperties.cs b/OpenRA.Mods.Common/Scripting/Properties/ProductionProperties.cs
similarity index 99%
rename from OpenRA.Mods.RA/Scripting/Properties/ProductionProperties.cs
rename to OpenRA.Mods.Common/Scripting/Properties/ProductionProperties.cs
index 15d1447ad7..abc5f73f8b 100644
--- a/OpenRA.Mods.RA/Scripting/Properties/ProductionProperties.cs
+++ b/OpenRA.Mods.Common/Scripting/Properties/ProductionProperties.cs
@@ -15,11 +15,10 @@ using Eluant;
 using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.Common.Scripting;
 using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.RA.Traits;
 using OpenRA.Scripting;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Scripting
+namespace OpenRA.Mods.Common.Scripting
 {
 	[ScriptPropertyGroup("Production")]
 	public class ProductionProperties : ScriptActorProperties, Requires<ProductionInfo>
diff --git a/OpenRA.Mods.RA/Scripting/Properties/RepairableBuildingProperties.cs b/OpenRA.Mods.Common/Scripting/Properties/RepairableBuildingProperties.cs
similarity index 97%
rename from OpenRA.Mods.RA/Scripting/Properties/RepairableBuildingProperties.cs
rename to OpenRA.Mods.Common/Scripting/Properties/RepairableBuildingProperties.cs
index e5a48fc53f..8c0b943aed 100644
--- a/OpenRA.Mods.RA/Scripting/Properties/RepairableBuildingProperties.cs
+++ b/OpenRA.Mods.Common/Scripting/Properties/RepairableBuildingProperties.cs
@@ -12,7 +12,7 @@ using OpenRA.Mods.Common.Traits;
 using OpenRA.Scripting;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Scripting
+namespace OpenRA.Mods.Common.Scripting
 {
 	[ScriptPropertyGroup("General")]
 	public class RepairableBuildingProperties : ScriptActorProperties, Requires<RepairableBuildingInfo>
diff --git a/OpenRA.Mods.RA/Scripting/Properties/TransformProperties.cs b/OpenRA.Mods.Common/Scripting/Properties/TransformProperties.cs
similarity index 93%
rename from OpenRA.Mods.RA/Scripting/Properties/TransformProperties.cs
rename to OpenRA.Mods.Common/Scripting/Properties/TransformProperties.cs
index a812024102..7fec27e43a 100644
--- a/OpenRA.Mods.RA/Scripting/Properties/TransformProperties.cs
+++ b/OpenRA.Mods.Common/Scripting/Properties/TransformProperties.cs
@@ -9,11 +9,10 @@
 #endregion
 
 using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.RA.Traits;
 using OpenRA.Scripting;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Scripting
+namespace OpenRA.Mods.Common.Scripting
 {
 	[ScriptPropertyGroup("Transform")]
 	public class TransformProperties : ScriptActorProperties, Requires<TransformsInfo>
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index e0507fed2e..b02842779f 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -100,7 +100,6 @@
     <Compile Include="AI\RushFuzzy.cs" />
     <Compile Include="AI\StateMachine.cs" />
     <Compile Include="Traits\Attack\AttackLeap.cs" />
-    <Compile Include="Scripting\Properties\RepairableBuildingProperties.cs" />
     <Compile Include="Traits\PaletteEffects\ChronoshiftPaletteEffect.cs" />
     <Compile Include="Traits\Chronoshiftable.cs" />
     <Compile Include="CrateSpawner.cs" />
@@ -129,7 +128,6 @@
     <Compile Include="Traits\Minelayer.cs" />
     <Compile Include="Traits\ParaDrop.cs" />
     <Compile Include="Traits\PortableChrono.cs" />
-    <Compile Include="Scripting\Properties\GuardProperties.cs" />
     <Compile Include="Widgets\Logic\TabCompletionLogic.cs" />
     <Compile Include="Traits\Render\RenderJammerCircle.cs" />
     <Compile Include="Traits\Render\RenderHarvester.cs" />
@@ -202,15 +200,6 @@
     <Compile Include="Traits\Attack\AttackGarrisoned.cs" />
     <Compile Include="Widgets\Logic\LobbyMapPreviewLogic.cs" />
     <Compile Include="Widgets\Logic\ControlGroupLogic.cs" />
-    <Compile Include="Scripting\Global\ReinforcementsGlobal.cs" />
-    <Compile Include="Scripting\Properties\AirstrikeProperties.cs" />
-    <Compile Include="Scripting\Properties\ProductionProperties.cs" />
-    <Compile Include="Scripting\Properties\MissionObjectiveProperties.cs" />
-    <Compile Include="Scripting\Properties\MobileProperties.cs" />
-    <Compile Include="Scripting\Properties\GeneralProperties.cs" />
-    <Compile Include="Scripting\Properties\CombatProperties.cs" />
-    <Compile Include="Scripting\Properties\PlayerProperties.cs" />
-    <Compile Include="Scripting\Properties\TransportProperties.cs" />
     <Compile Include="Scripting\Properties\ChronosphereProperties.cs" />
     <Compile Include="Lint\CheckPlayers.cs" />
     <Compile Include="Lint\CheckActors.cs" />
@@ -229,10 +218,8 @@
     <Compile Include="Widgets\Logic\DebugMenuLogic.cs" />
     <Compile Include="Warheads\PerCellDamageWarhead.cs" />
     <Compile Include="Scripting\Properties\HarvesterProperties.cs" />
-    <Compile Include="Scripting\Properties\HelicopterProperties.cs" />
-    <Compile Include="Scripting\Properties\PlaneProperties.cs" />
+    <Compile Include="Scripting\Properties\TransportProperties.cs" />
     <Compile Include="Traits\InvulnerabilityUpgrade.cs" />
-    <Compile Include="Scripting\Properties\TransformProperties.cs" />
     <Compile Include="Lint\CheckMapRules.cs" />
   </ItemGroup>
   <ItemGroup>

From e82b2ce8ddffc5b7f20a21e1e77bda2aab6dd8bb Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Thu, 15 Jan 2015 22:59:43 +0100
Subject: [PATCH 3/4] Moves BaseAttackNotifier to Mods.Common

---
 OpenRA.Mods.Common/OpenRA.Mods.Common.csproj                   | 1 +
 .../Traits}/Player/BaseAttackNotifier.cs                       | 3 +--
 OpenRA.Mods.RA/OpenRA.Mods.RA.csproj                           | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common/Traits}/Player/BaseAttackNotifier.cs (97%)

diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index 775e10c6a6..478bc4d331 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -271,6 +271,7 @@
     <Compile Include="Traits\PaletteEffects\WaterPaletteRotation.cs" />
     <Compile Include="Traits\Player\ActorGroupProxy.cs" />
     <Compile Include="Traits\Player\AllyRepair.cs" />
+    <Compile Include="Traits\Player\BaseAttackNotifier.cs" />
     <Compile Include="Traits\Player\ClassicProductionQueue.cs" />
     <Compile Include="Traits\Player\ConquestVictoryConditions.cs" />
     <Compile Include="Traits\Player\GlobalUpgradeManager.cs" />
diff --git a/OpenRA.Mods.RA/Player/BaseAttackNotifier.cs b/OpenRA.Mods.Common/Traits/Player/BaseAttackNotifier.cs
similarity index 97%
rename from OpenRA.Mods.RA/Player/BaseAttackNotifier.cs
rename to OpenRA.Mods.Common/Traits/Player/BaseAttackNotifier.cs
index e00a2f10f0..0e32248c9e 100644
--- a/OpenRA.Mods.RA/Player/BaseAttackNotifier.cs
+++ b/OpenRA.Mods.Common/Traits/Player/BaseAttackNotifier.cs
@@ -9,10 +9,9 @@
 #endregion
 
 using System.Drawing;
-using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Plays an audio notification and shows a radar ping when a building is attacked.",
 		"Attach this to the player actor.")]
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index b02842779f..baa6abc626 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -173,7 +173,6 @@
     <Compile Include="Widgets\Logic\ServerCreationLogic.cs" />
     <Compile Include="Widgets\ObserverProductionIconsWidget.cs" />
     <Compile Include="Widgets\WorldCommandWidget.cs" />
-    <Compile Include="Player\BaseAttackNotifier.cs" />
     <Compile Include="Player\HarvesterAttackNotifier.cs" />
     <Compile Include="Traits\Render\RenderShroudCircle.cs" />
     <Compile Include="Traits\Infiltration\InfiltrateForCash.cs" />

From 52dd8c922f204be816e218ec10c0386b4f58257a Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Thu, 15 Jan 2015 23:15:51 +0100
Subject: [PATCH 4/4] Moves Lint checks to Mods.Common

---
 .../Lint/CheckActorReferences.cs                         | 2 +-
 .../Lint/CheckActors.cs                                  | 2 +-
 .../Lint/CheckMapCordon.cs                               | 2 +-
 .../Lint/CheckMapRules.cs                                | 2 +-
 .../Lint/CheckPlayers.cs                                 | 2 +-
 .../Lint/CheckSequences.cs                               | 2 +-
 .../Lint/CheckSyncAnnotations.cs                         | 2 +-
 .../Lint/CheckTraitPrerequisites.cs                      | 2 +-
 .../Lint/LintBuildablePrerequisites.cs                   | 3 +--
 OpenRA.Mods.Common/OpenRA.Mods.Common.csproj             | 9 +++++++++
 OpenRA.Mods.RA/OpenRA.Mods.RA.csproj                     | 9 ---------
 11 files changed, 18 insertions(+), 19 deletions(-)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Lint/CheckActorReferences.cs (98%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Lint/CheckActors.cs (95%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Lint/CheckMapCordon.cs (96%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Lint/CheckMapRules.cs (94%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Lint/CheckPlayers.cs (97%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Lint/CheckSequences.cs (97%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Lint/CheckSyncAnnotations.cs (97%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Lint/CheckTraitPrerequisites.cs (96%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Lint/LintBuildablePrerequisites.cs (97%)

diff --git a/OpenRA.Mods.RA/Lint/CheckActorReferences.cs b/OpenRA.Mods.Common/Lint/CheckActorReferences.cs
similarity index 98%
rename from OpenRA.Mods.RA/Lint/CheckActorReferences.cs
rename to OpenRA.Mods.Common/Lint/CheckActorReferences.cs
index e6b6a08b65..1bbb6c611c 100644
--- a/OpenRA.Mods.RA/Lint/CheckActorReferences.cs
+++ b/OpenRA.Mods.Common/Lint/CheckActorReferences.cs
@@ -12,7 +12,7 @@ using System;
 using System.Reflection;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common.Lint
 {
 	public class CheckActorReferences : ILintPass
 	{
diff --git a/OpenRA.Mods.RA/Lint/CheckActors.cs b/OpenRA.Mods.Common/Lint/CheckActors.cs
similarity index 95%
rename from OpenRA.Mods.RA/Lint/CheckActors.cs
rename to OpenRA.Mods.Common/Lint/CheckActors.cs
index 94f6227fea..405c430eda 100644
--- a/OpenRA.Mods.RA/Lint/CheckActors.cs
+++ b/OpenRA.Mods.Common/Lint/CheckActors.cs
@@ -12,7 +12,7 @@ using System;
 using System.Linq;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common.Lint
 {
 	public class CheckActors : ILintPass
 	{
diff --git a/OpenRA.Mods.RA/Lint/CheckMapCordon.cs b/OpenRA.Mods.Common/Lint/CheckMapCordon.cs
similarity index 96%
rename from OpenRA.Mods.RA/Lint/CheckMapCordon.cs
rename to OpenRA.Mods.Common/Lint/CheckMapCordon.cs
index a4c43719da..c5e1aed3cd 100644
--- a/OpenRA.Mods.RA/Lint/CheckMapCordon.cs
+++ b/OpenRA.Mods.Common/Lint/CheckMapCordon.cs
@@ -12,7 +12,7 @@ using System;
 using System.Linq;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common.Lint
 {
 	public class CheckMapCordon : ILintPass
 	{
diff --git a/OpenRA.Mods.RA/Lint/CheckMapRules.cs b/OpenRA.Mods.Common/Lint/CheckMapRules.cs
similarity index 94%
rename from OpenRA.Mods.RA/Lint/CheckMapRules.cs
rename to OpenRA.Mods.Common/Lint/CheckMapRules.cs
index 7998711a60..b75e37ae03 100644
--- a/OpenRA.Mods.RA/Lint/CheckMapRules.cs
+++ b/OpenRA.Mods.Common/Lint/CheckMapRules.cs
@@ -11,7 +11,7 @@
 using System;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common.Lint
 {
 	public class CheckMapRules : ILintPass
 	{
diff --git a/OpenRA.Mods.RA/Lint/CheckPlayers.cs b/OpenRA.Mods.Common/Lint/CheckPlayers.cs
similarity index 97%
rename from OpenRA.Mods.RA/Lint/CheckPlayers.cs
rename to OpenRA.Mods.Common/Lint/CheckPlayers.cs
index df3d5be1e4..d49bd78166 100644
--- a/OpenRA.Mods.RA/Lint/CheckPlayers.cs
+++ b/OpenRA.Mods.Common/Lint/CheckPlayers.cs
@@ -12,7 +12,7 @@ using System;
 using System.Linq;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common.Lint
 {
 	public class CheckPlayers : ILintPass
 	{
diff --git a/OpenRA.Mods.RA/Lint/CheckSequences.cs b/OpenRA.Mods.Common/Lint/CheckSequences.cs
similarity index 97%
rename from OpenRA.Mods.RA/Lint/CheckSequences.cs
rename to OpenRA.Mods.Common/Lint/CheckSequences.cs
index 56c566d515..721be372f6 100644
--- a/OpenRA.Mods.RA/Lint/CheckSequences.cs
+++ b/OpenRA.Mods.Common/Lint/CheckSequences.cs
@@ -13,7 +13,7 @@ using System.Linq;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common.Lint
 {
 	class CheckSequences : ILintPass
 	{
diff --git a/OpenRA.Mods.RA/Lint/CheckSyncAnnotations.cs b/OpenRA.Mods.Common/Lint/CheckSyncAnnotations.cs
similarity index 97%
rename from OpenRA.Mods.RA/Lint/CheckSyncAnnotations.cs
rename to OpenRA.Mods.Common/Lint/CheckSyncAnnotations.cs
index c473db8990..ce4f7e7965 100644
--- a/OpenRA.Mods.RA/Lint/CheckSyncAnnotations.cs
+++ b/OpenRA.Mods.Common/Lint/CheckSyncAnnotations.cs
@@ -13,7 +13,7 @@ using System.Linq;
 using System.Reflection;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common.Lint
 {
 	class CheckSyncAnnotations : ILintPass
 	{
diff --git a/OpenRA.Mods.RA/Lint/CheckTraitPrerequisites.cs b/OpenRA.Mods.Common/Lint/CheckTraitPrerequisites.cs
similarity index 96%
rename from OpenRA.Mods.RA/Lint/CheckTraitPrerequisites.cs
rename to OpenRA.Mods.Common/Lint/CheckTraitPrerequisites.cs
index caa8085d49..107594aeb6 100644
--- a/OpenRA.Mods.RA/Lint/CheckTraitPrerequisites.cs
+++ b/OpenRA.Mods.Common/Lint/CheckTraitPrerequisites.cs
@@ -12,7 +12,7 @@ using System;
 using System.Linq;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common.Lint
 {
 	public class CheckTraitPrerequisites : ILintPass
 	{
diff --git a/OpenRA.Mods.RA/Lint/LintBuildablePrerequisites.cs b/OpenRA.Mods.Common/Lint/LintBuildablePrerequisites.cs
similarity index 97%
rename from OpenRA.Mods.RA/Lint/LintBuildablePrerequisites.cs
rename to OpenRA.Mods.Common/Lint/LintBuildablePrerequisites.cs
index 65642f93e4..d62f0dd8fc 100644
--- a/OpenRA.Mods.RA/Lint/LintBuildablePrerequisites.cs
+++ b/OpenRA.Mods.Common/Lint/LintBuildablePrerequisites.cs
@@ -11,10 +11,9 @@
 using System;
 using System.Linq;
 using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common.Lint
 {
 	class LintBuildablePrerequisites : ILintPass
 	{
diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index 478bc4d331..cfa8a878f4 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -130,6 +130,15 @@
     <Compile Include="Graphics\TextRenderable.cs" />
     <Compile Include="Graphics\VoxelActorPreview.cs" />
     <Compile Include="Graphics\VoxelRenderable.cs" />
+    <Compile Include="Lint\CheckSequences.cs" />
+    <Compile Include="Lint\CheckPlayers.cs" />
+    <Compile Include="Lint\CheckActors.cs" />
+    <Compile Include="Lint\CheckMapCordon.cs" />
+    <Compile Include="Lint\CheckMapRules.cs" />
+    <Compile Include="Lint\CheckActorReferences.cs" />
+    <Compile Include="Lint\CheckSyncAnnotations.cs" />
+    <Compile Include="Lint\CheckTraitPrerequisites.cs" />
+    <Compile Include="Lint\LintBuildablePrerequisites.cs" />
     <Compile Include="LoadScreens\ModChooserLoadScreen.cs" />
     <Compile Include="Orders\BeaconOrderGenerator.cs" />
     <Compile Include="Orders\DeployOrderTargeter.cs" />
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index baa6abc626..b9fddd9f5a 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -119,10 +119,6 @@
     <Compile Include="Traits\DemoTruck.cs" />
     <Compile Include="Effects\GpsDot.cs" />
     <Compile Include="Effects\Parachute.cs" />
-    <Compile Include="Lint\CheckActorReferences.cs" />
-    <Compile Include="Lint\CheckSyncAnnotations.cs" />
-    <Compile Include="Lint\CheckTraitPrerequisites.cs" />
-    <Compile Include="Lint\LintBuildablePrerequisites.cs" />
     <Compile Include="Traits\MadTank.cs" />
     <Compile Include="Traits\Mine.cs" />
     <Compile Include="Traits\Minelayer.cs" />
@@ -181,7 +177,6 @@
     <Compile Include="Traits\Infiltration\InfiltrateForSupportPower.cs" />
     <Compile Include="Traits\Infiltration\Infiltrates.cs" />
     <Compile Include="Widgets\Logic\ObserverShroudSelectorLogic.cs" />
-    <Compile Include="Lint\CheckSequences.cs" />
     <Compile Include="Widgets\Logic\SpawnSelectorTooltipLogic.cs" />
     <Compile Include="Widgets\Logic\ClientTooltipLogic.cs" />
     <Compile Include="Widgets\Logic\CreditsLogic.cs" />
@@ -200,9 +195,6 @@
     <Compile Include="Widgets\Logic\LobbyMapPreviewLogic.cs" />
     <Compile Include="Widgets\Logic\ControlGroupLogic.cs" />
     <Compile Include="Scripting\Properties\ChronosphereProperties.cs" />
-    <Compile Include="Lint\CheckPlayers.cs" />
-    <Compile Include="Lint\CheckActors.cs" />
-    <Compile Include="Lint\CheckMapCordon.cs" />
     <Compile Include="Traits\Parachutable.cs" />
     <Compile Include="Widgets\Logic\InstallFromCDLogic.cs" />
     <Compile Include="Widgets\Logic\InstallMusicLogic.cs" />
@@ -219,7 +211,6 @@
     <Compile Include="Scripting\Properties\HarvesterProperties.cs" />
     <Compile Include="Scripting\Properties\TransportProperties.cs" />
     <Compile Include="Traits\InvulnerabilityUpgrade.cs" />
-    <Compile Include="Lint\CheckMapRules.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj">