From b217730caa8e8734f50c14e4b93d020d94dfdd47 Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Sun, 14 Dec 2014 14:34:32 +0100
Subject: [PATCH] Move Activities CallFunc, RemoveSelf and SimpleTeleport to
 Common

---
 OpenRA.Mods.Cnc/Traits/Buildings/ProductionAirdrop.cs      | 1 +
 OpenRA.Mods.Cnc/Traits/SupportPowers/IonCannonPower.cs     | 1 +
 .../Activities/CallFunc.cs                                 | 2 +-
 .../Activities/RemoveSelf.cs                               | 2 +-
 .../Activities/SimpleTeleport.cs                           | 2 +-
 OpenRA.Mods.Common/OpenRA.Mods.Common.csproj               | 3 +++
 OpenRA.Mods.RA/CrateSpawner.cs                             | 3 ++-
 OpenRA.Mods.RA/DemoTruck.cs                                | 7 ++++---
 OpenRA.Mods.RA/MadTank.cs                                  | 7 ++++---
 OpenRA.Mods.RA/OpenRA.Mods.RA.csproj                       | 3 ---
 OpenRA.Mods.RA/Repairable.cs                               | 1 +
 OpenRA.Mods.RA/Scripting/Global/ReinforcementsGlobal.cs    | 7 ++++---
 OpenRA.Mods.RA/Scripting/Properties/CombatProperties.cs    | 1 +
 OpenRA.Mods.RA/Scripting/Properties/TransportProperties.cs | 1 +
 OpenRA.Mods.RA/SupportPowers/AirstrikePower.cs             | 1 +
 OpenRA.Mods.RA/SupportPowers/NukePower.cs                  | 1 +
 OpenRA.Mods.RA/SupportPowers/ParatroopersPower.cs          | 1 +
 OpenRA.Mods.RA/SupportPowers/SpawnActorPower.cs            | 1 +
 OpenRA.Mods.RA/Traits/Air/FlyAwayOnIdle.cs                 | 1 +
 OpenRA.Mods.RA/Traits/Air/Helicopter.cs                    | 1 +
 OpenRA.Mods.RA/Traits/Air/Plane.cs                         | 1 +
 OpenRA.Mods.RA/Traits/Air/ReturnOnIdle.cs                  | 1 +
 OpenRA.Mods.RA/Traits/Buildings/OreRefinery.cs             | 3 ++-
 OpenRA.Mods.RA/Traits/Harvester.cs                         | 1 +
 24 files changed, 36 insertions(+), 17 deletions(-)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Activities/CallFunc.cs (95%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Activities/RemoveSelf.cs (93%)
 mode change 100755 => 100644
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Activities/SimpleTeleport.cs (94%)
 mode change 100755 => 100644

diff --git a/OpenRA.Mods.Cnc/Traits/Buildings/ProductionAirdrop.cs b/OpenRA.Mods.Cnc/Traits/Buildings/ProductionAirdrop.cs
index 30d1f4fd2e..fd0a7a516f 100644
--- a/OpenRA.Mods.Cnc/Traits/Buildings/ProductionAirdrop.cs
+++ b/OpenRA.Mods.Cnc/Traits/Buildings/ProductionAirdrop.cs
@@ -9,6 +9,7 @@
 #endregion
 
 using System.Linq;
+using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.RA;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Traits;
diff --git a/OpenRA.Mods.Cnc/Traits/SupportPowers/IonCannonPower.cs b/OpenRA.Mods.Cnc/Traits/SupportPowers/IonCannonPower.cs
index 678c1037a7..b2e39592ad 100644
--- a/OpenRA.Mods.Cnc/Traits/SupportPowers/IonCannonPower.cs
+++ b/OpenRA.Mods.Cnc/Traits/SupportPowers/IonCannonPower.cs
@@ -9,6 +9,7 @@
 #endregion
 
 using OpenRA.Mods.Cnc.Effects;
+using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.RA;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Primitives;
diff --git a/OpenRA.Mods.RA/Activities/CallFunc.cs b/OpenRA.Mods.Common/Activities/CallFunc.cs
similarity index 95%
rename from OpenRA.Mods.RA/Activities/CallFunc.cs
rename to OpenRA.Mods.Common/Activities/CallFunc.cs
index 50e773c4af..49f460d924 100644
--- a/OpenRA.Mods.RA/Activities/CallFunc.cs
+++ b/OpenRA.Mods.Common/Activities/CallFunc.cs
@@ -11,7 +11,7 @@
 using System;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Activities
+namespace OpenRA.Mods.Common.Activities
 {
 	public class CallFunc : Activity
 	{
diff --git a/OpenRA.Mods.RA/Activities/RemoveSelf.cs b/OpenRA.Mods.Common/Activities/RemoveSelf.cs
old mode 100755
new mode 100644
similarity index 93%
rename from OpenRA.Mods.RA/Activities/RemoveSelf.cs
rename to OpenRA.Mods.Common/Activities/RemoveSelf.cs
index 62e20900bd..568c4c5cb2
--- a/OpenRA.Mods.RA/Activities/RemoveSelf.cs
+++ b/OpenRA.Mods.Common/Activities/RemoveSelf.cs
@@ -10,7 +10,7 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Activities
+namespace OpenRA.Mods.Common.Activities
 {
 	public class RemoveSelf : Activity
 	{
diff --git a/OpenRA.Mods.RA/Activities/SimpleTeleport.cs b/OpenRA.Mods.Common/Activities/SimpleTeleport.cs
old mode 100755
new mode 100644
similarity index 94%
rename from OpenRA.Mods.RA/Activities/SimpleTeleport.cs
rename to OpenRA.Mods.Common/Activities/SimpleTeleport.cs
index d008532eaf..c0191b956b
--- a/OpenRA.Mods.RA/Activities/SimpleTeleport.cs
+++ b/OpenRA.Mods.Common/Activities/SimpleTeleport.cs
@@ -10,7 +10,7 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Activities
+namespace OpenRA.Mods.Common.Activities
 {
 	public class SimpleTeleport : Activity
 	{
diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index 9469a2008a..a118cea084 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -49,6 +49,9 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Activities\Move\Drag.cs" />
+    <Compile Include="Activities\CallFunc.cs" />
+    <Compile Include="Activities\RemoveSelf.cs" />
+    <Compile Include="Activities\SimpleTeleport.cs" />
     <Compile Include="CommonTraitsInterfaces.cs" />
     <Compile Include="Effects\Beacon.cs" />
     <Compile Include="Effects\Bullet.cs" />
diff --git a/OpenRA.Mods.RA/CrateSpawner.cs b/OpenRA.Mods.RA/CrateSpawner.cs
index 140a737238..e0fdba3c72 100644
--- a/OpenRA.Mods.RA/CrateSpawner.cs
+++ b/OpenRA.Mods.RA/CrateSpawner.cs
@@ -10,9 +10,10 @@
 
 using System;
 using System.Linq;
+using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.RA.Activities;
-using OpenRA.Mods.RA.Traits;
 using OpenRA.Mods.RA.Buildings;
+using OpenRA.Mods.RA.Traits;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.RA/DemoTruck.cs b/OpenRA.Mods.RA/DemoTruck.cs
index eba4ea259f..f2f25ec2b7 100644
--- a/OpenRA.Mods.RA/DemoTruck.cs
+++ b/OpenRA.Mods.RA/DemoTruck.cs
@@ -10,10 +10,11 @@
 
 using System.Drawing;
 using System.Collections.Generic;
-using OpenRA.Traits;
-using OpenRA.Mods.RA.Orders;
-using OpenRA.Mods.RA.Activities;
+using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.Common.Orders;
+using OpenRA.Mods.RA.Activities;
+using OpenRA.Mods.RA.Orders;
+using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
 {
diff --git a/OpenRA.Mods.RA/MadTank.cs b/OpenRA.Mods.RA/MadTank.cs
index 9b1ac26464..bca6f44671 100644
--- a/OpenRA.Mods.RA/MadTank.cs
+++ b/OpenRA.Mods.RA/MadTank.cs
@@ -11,12 +11,13 @@
 using System.Linq;
 using System.Drawing;
 using System.Collections.Generic;
+using OpenRA.Mods.Common.Activities;
+using OpenRA.Mods.Common.Orders;
 using OpenRA.Mods.Common.Traits;
+using OpenRA.Mods.RA.Activities;
+using OpenRA.Mods.RA.Move;
 using OpenRA.Traits;
 using OpenRA.Primitives;
-using OpenRA.Mods.RA.Move;
-using OpenRA.Mods.RA.Activities;
-using OpenRA.Mods.Common.Orders;
 
 namespace OpenRA.Mods.RA
 {
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index e5e01b3249..a1c32dfc36 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -100,7 +100,6 @@
     <Compile Include="AcceptsSupplies.cs" />
     <Compile Include="Activities\Attack.cs" />
     <Compile Include="Activities\AttackMoveActivity.cs" />
-    <Compile Include="Activities\CallFunc.cs" />
     <Compile Include="Activities\ExternalCaptureActor.cs" />
     <Compile Include="Activities\DeliverResources.cs" />
     <Compile Include="Activities\Demolish.cs" />
@@ -116,7 +115,6 @@
     <Compile Include="Activities\MoveAdjacentTo.cs" />
     <Compile Include="Activities\RAHarvesterDockSequence.cs" />
     <Compile Include="Activities\Rearm.cs" />
-    <Compile Include="Activities\RemoveSelf.cs" />
     <Compile Include="Activities\Repair.cs" />
     <Compile Include="Activities\RepairBuilding.cs" />
     <Compile Include="Activities\Sell.cs" />
@@ -428,7 +426,6 @@
     <Compile Include="Lint\CheckMapRules.cs" />
     <Compile Include="Activities\Air\HeliFlyCircle.cs" />
     <Compile Include="Render\Hovers.cs" />
-    <Compile Include="Activities\SimpleTeleport.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj">
diff --git a/OpenRA.Mods.RA/Repairable.cs b/OpenRA.Mods.RA/Repairable.cs
index 07a6b3d606..82abeb51b0 100644
--- a/OpenRA.Mods.RA/Repairable.cs
+++ b/OpenRA.Mods.RA/Repairable.cs
@@ -12,6 +12,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using OpenRA.Mods.Common;
+using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.Common.Orders;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Activities;
diff --git a/OpenRA.Mods.RA/Scripting/Global/ReinforcementsGlobal.cs b/OpenRA.Mods.RA/Scripting/Global/ReinforcementsGlobal.cs
index c17a186509..3f40ae4f06 100644
--- a/OpenRA.Mods.RA/Scripting/Global/ReinforcementsGlobal.cs
+++ b/OpenRA.Mods.RA/Scripting/Global/ReinforcementsGlobal.cs
@@ -13,12 +13,13 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA;
-using OpenRA.Primitives;
-using OpenRA.Traits;
-using OpenRA.Scripting;
 using OpenRA.Effects;
+using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Traits;
+using OpenRA.Primitives;
+using OpenRA.Scripting;
+using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Scripting
 {
diff --git a/OpenRA.Mods.RA/Scripting/Properties/CombatProperties.cs b/OpenRA.Mods.RA/Scripting/Properties/CombatProperties.cs
index 6e355f9389..d346d4653a 100644
--- a/OpenRA.Mods.RA/Scripting/Properties/CombatProperties.cs
+++ b/OpenRA.Mods.RA/Scripting/Properties/CombatProperties.cs
@@ -11,6 +11,7 @@
 using Eluant;
 using System;
 using System.Linq;
+using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Scripting;
diff --git a/OpenRA.Mods.RA/Scripting/Properties/TransportProperties.cs b/OpenRA.Mods.RA/Scripting/Properties/TransportProperties.cs
index 57380c680e..0656503b67 100644
--- a/OpenRA.Mods.RA/Scripting/Properties/TransportProperties.cs
+++ b/OpenRA.Mods.RA/Scripting/Properties/TransportProperties.cs
@@ -9,6 +9,7 @@
 #endregion
 
 using System.Linq;
+using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Scripting;
diff --git a/OpenRA.Mods.RA/SupportPowers/AirstrikePower.cs b/OpenRA.Mods.RA/SupportPowers/AirstrikePower.cs
index 89badcd4a4..587508b87d 100644
--- a/OpenRA.Mods.RA/SupportPowers/AirstrikePower.cs
+++ b/OpenRA.Mods.RA/SupportPowers/AirstrikePower.cs
@@ -11,6 +11,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.Common.Effects;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Traits;
diff --git a/OpenRA.Mods.RA/SupportPowers/NukePower.cs b/OpenRA.Mods.RA/SupportPowers/NukePower.cs
index 529c22124c..ee35a667f9 100755
--- a/OpenRA.Mods.RA/SupportPowers/NukePower.cs
+++ b/OpenRA.Mods.RA/SupportPowers/NukePower.cs
@@ -10,6 +10,7 @@
 
 using System;
 using OpenRA.Effects;
+using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.Common.Effects;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Activities;
diff --git a/OpenRA.Mods.RA/SupportPowers/ParatroopersPower.cs b/OpenRA.Mods.RA/SupportPowers/ParatroopersPower.cs
index 8f504c76df..63ecf25d61 100644
--- a/OpenRA.Mods.RA/SupportPowers/ParatroopersPower.cs
+++ b/OpenRA.Mods.RA/SupportPowers/ParatroopersPower.cs
@@ -11,6 +11,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.Common.Effects;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Traits;
diff --git a/OpenRA.Mods.RA/SupportPowers/SpawnActorPower.cs b/OpenRA.Mods.RA/SupportPowers/SpawnActorPower.cs
index a3927557e4..75425787c8 100755
--- a/OpenRA.Mods.RA/SupportPowers/SpawnActorPower.cs
+++ b/OpenRA.Mods.RA/SupportPowers/SpawnActorPower.cs
@@ -9,6 +9,7 @@
 #endregion
 
 using OpenRA.Effects;
+using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Effects;
 using OpenRA.Primitives;
diff --git a/OpenRA.Mods.RA/Traits/Air/FlyAwayOnIdle.cs b/OpenRA.Mods.RA/Traits/Air/FlyAwayOnIdle.cs
index 2d51542247..f7806d7e1f 100644
--- a/OpenRA.Mods.RA/Traits/Air/FlyAwayOnIdle.cs
+++ b/OpenRA.Mods.RA/Traits/Air/FlyAwayOnIdle.cs
@@ -8,6 +8,7 @@
  */
 #endregion
 
+using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.RA;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Traits;
diff --git a/OpenRA.Mods.RA/Traits/Air/Helicopter.cs b/OpenRA.Mods.RA/Traits/Air/Helicopter.cs
index ccb71305cb..54ca81491a 100644
--- a/OpenRA.Mods.RA/Traits/Air/Helicopter.cs
+++ b/OpenRA.Mods.RA/Traits/Air/Helicopter.cs
@@ -12,6 +12,7 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
+using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.RA;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Traits;
diff --git a/OpenRA.Mods.RA/Traits/Air/Plane.cs b/OpenRA.Mods.RA/Traits/Air/Plane.cs
index 86c2284eab..f7e95b9352 100644
--- a/OpenRA.Mods.RA/Traits/Air/Plane.cs
+++ b/OpenRA.Mods.RA/Traits/Air/Plane.cs
@@ -10,6 +10,7 @@
 
 using System;
 using System.Drawing;
+using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.RA;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Traits;
diff --git a/OpenRA.Mods.RA/Traits/Air/ReturnOnIdle.cs b/OpenRA.Mods.RA/Traits/Air/ReturnOnIdle.cs
index 5483d354f9..fecf4a4083 100644
--- a/OpenRA.Mods.RA/Traits/Air/ReturnOnIdle.cs
+++ b/OpenRA.Mods.RA/Traits/Air/ReturnOnIdle.cs
@@ -9,6 +9,7 @@
 #endregion
 
 using System.Linq;
+using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.RA;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Buildings;
diff --git a/OpenRA.Mods.RA/Traits/Buildings/OreRefinery.cs b/OpenRA.Mods.RA/Traits/Buildings/OreRefinery.cs
index 12e10feceb..facf8090ac 100644
--- a/OpenRA.Mods.RA/Traits/Buildings/OreRefinery.cs
+++ b/OpenRA.Mods.RA/Traits/Buildings/OreRefinery.cs
@@ -10,8 +10,9 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using OpenRA.Mods.RA.Activities;
+using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.Common.Effects;
+using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.RA/Traits/Harvester.cs b/OpenRA.Mods.RA/Traits/Harvester.cs
index 0605553f6a..3955651690 100644
--- a/OpenRA.Mods.RA/Traits/Harvester.cs
+++ b/OpenRA.Mods.RA/Traits/Harvester.cs
@@ -12,6 +12,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using OpenRA.Mods.Common;
+using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.Common.Orders;
 using OpenRA.Mods.RA.Activities;