From cdfa3fddf819aa659af8d68ad9651f6a8f23d2be Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Sat, 11 Feb 2017 19:02:06 +0100
Subject: [PATCH] Move ParatroopersPower and para scripting to Mods.Common

---
 OpenRA.Mods.Common/OpenRA.Mods.Common.csproj                  | 3 +++
 .../Scripting/Properties/ParadropProperties.cs                | 2 +-
 .../Scripting/Properties/ParatroopersProperties.cs            | 4 ++--
 .../Traits/SupportPowers/ParatroopersPower.cs                 | 4 +---
 OpenRA.Mods.RA/OpenRA.Mods.RA.csproj                          | 3 ---
 5 files changed, 7 insertions(+), 9 deletions(-)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Scripting/Properties/ParadropProperties.cs (96%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Scripting/Properties/ParatroopersProperties.cs (94%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Traits/SupportPowers/ParatroopersPower.cs (98%)

diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index 5de606a962..b292906005 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -245,6 +245,8 @@
     <Compile Include="Scripting\Properties\TransformProperties.cs" />
     <Compile Include="Scripting\Properties\TransportProperties.cs" />
     <Compile Include="Scripting\Properties\ConditionProperties.cs" />
+    <Compile Include="Scripting\Properties\ParadropProperties.cs" />
+    <Compile Include="Scripting\Properties\ParatroopersProperties.cs" />
     <Compile Include="TraitsInterfaces.cs" />
     <Compile Include="Traits\AcceptsSupplies.cs" />
     <Compile Include="Traits\Air\Aircraft.cs" />
@@ -480,6 +482,7 @@
     <Compile Include="Traits\SupportPowers\AirstrikePower.cs" />
     <Compile Include="Traits\SupportPowers\GrantExternalConditionPower.cs" />
     <Compile Include="Traits\SupportPowers\NukePower.cs" />
+    <Compile Include="Traits\SupportPowers\ParatroopersPower.cs" />
     <Compile Include="Traits\SupportPowers\SupportPower.cs" />
     <Compile Include="Traits\SupportPowers\SupportPowerManager.cs" />
     <Compile Include="Traits\SupportPowers\SpawnActorPower.cs" />
diff --git a/OpenRA.Mods.RA/Scripting/Properties/ParadropProperties.cs b/OpenRA.Mods.Common/Scripting/Properties/ParadropProperties.cs
similarity index 96%
rename from OpenRA.Mods.RA/Scripting/Properties/ParadropProperties.cs
rename to OpenRA.Mods.Common/Scripting/Properties/ParadropProperties.cs
index 915df217c6..30045bb0a7 100644
--- a/OpenRA.Mods.RA/Scripting/Properties/ParadropProperties.cs
+++ b/OpenRA.Mods.Common/Scripting/Properties/ParadropProperties.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
 {
 	[ScriptPropertyGroup("Transports")]
 	public class ParadropProperties : ScriptActorProperties, Requires<CargoInfo>, Requires<ParaDropInfo>
diff --git a/OpenRA.Mods.RA/Scripting/Properties/ParatroopersProperties.cs b/OpenRA.Mods.Common/Scripting/Properties/ParatroopersProperties.cs
similarity index 94%
rename from OpenRA.Mods.RA/Scripting/Properties/ParatroopersProperties.cs
rename to OpenRA.Mods.Common/Scripting/Properties/ParatroopersProperties.cs
index afb595cff1..3d9dbcf914 100644
--- a/OpenRA.Mods.RA/Scripting/Properties/ParatroopersProperties.cs
+++ b/OpenRA.Mods.Common/Scripting/Properties/ParatroopersProperties.cs
@@ -10,11 +10,11 @@
 #endregion
 
 using System.Linq;
-using OpenRA.Mods.RA.Traits;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Scripting;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Scripting
+namespace OpenRA.Mods.Common.Scripting
 {
 	[ScriptPropertyGroup("Support Powers")]
 	public class ParatroopersProperties : ScriptActorProperties, Requires<ParatroopersPowerInfo>
diff --git a/OpenRA.Mods.RA/Traits/SupportPowers/ParatroopersPower.cs b/OpenRA.Mods.Common/Traits/SupportPowers/ParatroopersPower.cs
similarity index 98%
rename from OpenRA.Mods.RA/Traits/SupportPowers/ParatroopersPower.cs
rename to OpenRA.Mods.Common/Traits/SupportPowers/ParatroopersPower.cs
index 8d1cf02ac5..6f11140164 100644
--- a/OpenRA.Mods.RA/Traits/SupportPowers/ParatroopersPower.cs
+++ b/OpenRA.Mods.Common/Traits/SupportPowers/ParatroopersPower.cs
@@ -12,14 +12,12 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.Common.Effects;
-using OpenRA.Mods.Common.Traits;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
 {
 	public class ParatroopersPowerInfo : SupportPowerInfo
 	{
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index bccd64b734..7829d003a3 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -98,10 +98,7 @@
     <Compile Include="Traits\SupportPowers\ChronoshiftPower.cs" />
     <Compile Include="Traits\SupportPowers\GpsPower.cs" />
     <Compile Include="Traits\GpsWatcher.cs" />
-    <Compile Include="Traits\SupportPowers\ParatroopersPower.cs" />
     <Compile Include="Scripting\Properties\ChronosphereProperties.cs" />
-    <Compile Include="Scripting\Properties\ParadropProperties.cs" />
-    <Compile Include="Scripting\Properties\ParatroopersProperties.cs" />
     <Compile Include="Traits\Render\WithDisguisingInfantryBody.cs" />
     <Compile Include="ImportRedAlertLegacyMapCommand.cs" />
     <Compile Include="Traits\Infiltration\InfiltrateForDecoration.cs" />