Move Activities CallFunc, RemoveSelf and SimpleTeleport to Common

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;

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;

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
 	{

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
 	{

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
 	{

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" />

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;
 

OpenRA.Mods.RA/DemoTruck.cs

@@ -10,10 +10,11 @@
 
 using System.Drawing;
 using System.Collections.Generic;
-using OpenRA.Traits;
+using OpenRA.Mods.Common.Activities;
-using OpenRA.Mods.RA.Orders;
-using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.Common.Orders;
+using OpenRA.Mods.RA.Activities;
+using OpenRA.Mods.RA.Orders;
+using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
 {

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
 {

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">

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;

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
 {

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;
 

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;