move Activity from OpenRA.Traits.Activities namespace to OpenRA.Traits

2011-10-06 23:11:58 +13:00
parent 3cf15b870a
commit 2bc260c833
69 changed files with 38 additions and 128 deletions
--- a/OpenRA.Mods.RA/Activities/Attack.cs
+++ b/OpenRA.Mods.RA/Activities/Attack.cs
@@ -10,7 +10,6 @@

 using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 using OpenRA.Mods.RA.Move;

 namespace OpenRA.Mods.RA.Activities
--- a/OpenRA.Mods.RA/Activities/CallFunc.cs
+++ b/OpenRA.Mods.RA/Activities/CallFunc.cs
@@ -11,7 +11,6 @@
 using System;
 using System.Collections.Generic;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;

 namespace OpenRA.Mods.RA.Activities
 {
--- a/OpenRA.Mods.RA/Activities/CaptureActor.cs
+++ b/OpenRA.Mods.RA/Activities/CaptureActor.cs
@@ -10,7 +10,6 @@

 using System.Linq;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;

 namespace OpenRA.Mods.RA.Activities
 {
--- a/OpenRA.Mods.RA/Activities/DeliverResources.cs
+++ b/OpenRA.Mods.RA/Activities/DeliverResources.cs
@@ -11,7 +11,6 @@
 using System.Collections.Generic;
 using System.Drawing;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 using OpenRA.Mods.RA.Move;

 namespace OpenRA.Mods.RA.Activities
--- a/OpenRA.Mods.RA/Activities/Demolish.cs
+++ b/OpenRA.Mods.RA/Activities/Demolish.cs
@@ -11,7 +11,6 @@
 using System.Linq;
 using OpenRA.Effects;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;

 namespace OpenRA.Mods.RA.Activities
 {
--- a/OpenRA.Mods.RA/Activities/DonateSupplies.cs
+++ b/OpenRA.Mods.RA/Activities/DonateSupplies.cs
@@ -10,7 +10,6 @@

 using System.Linq;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 using OpenRA.Mods.RA.Effects;

 namespace OpenRA.Mods.RA.Activities
--- a/OpenRA.Mods.RA/Activities/Enter.cs
+++ b/OpenRA.Mods.RA/Activities/Enter.cs
@@ -8,12 +8,8 @@
 */
 #endregion

-using System;
-using System.Collections.Generic;
-using System.Linq;
-using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 using OpenRA.Mods.RA.Move;
+using OpenRA.Traits;

 namespace OpenRA.Mods.RA.Activities
 {
--- a/OpenRA.Mods.RA/Activities/EnterTransport.cs
+++ b/OpenRA.Mods.RA/Activities/EnterTransport.cs
@@ -9,7 +9,6 @@
 #endregion

 using OpenRA.Traits;
-using OpenRA.Traits.Activities;

 namespace OpenRA.Mods.RA.Activities
 {
--- a/OpenRA.Mods.RA/Activities/FindResources.cs
+++ b/OpenRA.Mods.RA/Activities/FindResources.cs
@@ -8,13 +8,12 @@
 */
 #endregion

-using System.Linq;
-using System.Drawing;
 using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using OpenRA.Mods.RA.Move;
 using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
-using OpenRA.Mods.RA.Move;

 namespace OpenRA.Mods.RA.Activities
 {
--- a/OpenRA.Mods.RA/Activities/Follow.cs
+++ b/OpenRA.Mods.RA/Activities/Follow.cs
@@ -9,7 +9,6 @@
 #endregion

 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 using OpenRA.Mods.RA.Move;

 namespace OpenRA.Mods.RA.Activities
--- a/OpenRA.Mods.RA/Activities/Heal.cs
+++ b/OpenRA.Mods.RA/Activities/Heal.cs
@@ -10,7 +10,6 @@

 using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 using OpenRA.Mods.RA.Move;

 namespace OpenRA.Mods.RA.Activities
--- a/OpenRA.Mods.RA/Activities/Infiltrate.cs
+++ b/OpenRA.Mods.RA/Activities/Infiltrate.cs
@@ -10,7 +10,6 @@

 using System.Linq;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;

 namespace OpenRA.Mods.RA.Activities
 {
--- a/OpenRA.Mods.RA/Activities/LayMines.cs
+++ b/OpenRA.Mods.RA/Activities/LayMines.cs
@@ -11,7 +11,6 @@
 using System.Linq;
 using OpenRA.FileFormats;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 using OpenRA.Mods.RA.Move;

 namespace OpenRA.Mods.RA.Activities
--- a/OpenRA.Mods.RA/Activities/Leap.cs
+++ b/OpenRA.Mods.RA/Activities/Leap.cs
@@ -9,10 +9,9 @@
 #endregion

 using System.Linq;
-using OpenRA.Mods.RA.Render;
 using OpenRA.Mods.RA.Move;
+using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;

 namespace OpenRA.Mods.RA.Activities
 {
--- a/OpenRA.Mods.RA/Activities/MakeAnimation.cs
+++ b/OpenRA.Mods.RA/Activities/MakeAnimation.cs
@@ -8,12 +8,10 @@
 */
 #endregion

-using OpenRA.FileFormats;
+using System;
 using OpenRA.Mods.RA.Buildings;
 using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
-using System;

 namespace OpenRA.Mods.RA.Activities
 {
@@ -32,6 +30,7 @@ namespace OpenRA.Mods.RA.Activities

 		bool complete = false;
 		bool started = false;
+
 		public override Activity Tick( Actor self )
 		{
 			if (started)
--- a/OpenRA.Mods.RA/Activities/MoveAdjacentTo.cs
+++ b/OpenRA.Mods.RA/Activities/MoveAdjacentTo.cs
@@ -8,12 +8,8 @@
 */
 #endregion

-using System.Collections.Generic;
-using System.Linq;
 using OpenRA.Mods.RA.Move;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
-using OpenRA.FileFormats;

 namespace OpenRA.Mods.RA.Activities
 {
--- a/OpenRA.Mods.RA/Activities/RAHarvesterDockSequence.cs
+++ b/OpenRA.Mods.RA/Activities/RAHarvesterDockSequence.cs
@@ -8,27 +8,17 @@
 */
 #endregion

-using OpenRA.Mods.RA.Activities;
-using OpenRA.Traits;
-using OpenRA.Traits.Activities;
-using System.Collections.Generic;
-using OpenRA.Mods.RA.Move;
-using OpenRA.Mods.RA.Render;
 using System;
+using System.Collections.Generic;
+using OpenRA.Mods.RA.Activities;
+using OpenRA.Mods.RA.Render;
+using OpenRA.Traits;

 namespace OpenRA.Mods.RA
 {
 	public class RAHarvesterDockSequence : Activity
 	{
-		enum State
-		{
-			Wait,
-			Turn,
-			Dock,
-			Loop,
-			Undock,
-			Complete
-		};
+		enum State { Wait, Turn, Dock, Loop, Undock, Complete };

 		readonly Actor proc;
 		readonly Harvester harv;
--- a/OpenRA.Mods.RA/Activities/Rearm.cs
+++ b/OpenRA.Mods.RA/Activities/Rearm.cs
@@ -11,7 +11,6 @@
 using System.Linq;
 using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;

 namespace OpenRA.Mods.RA.Activities
 {
--- a/OpenRA.Mods.RA/Activities/RemoveSelf.cs
+++ b/OpenRA.Mods.RA/Activities/RemoveSelf.cs
@@ -9,7 +9,6 @@
 #endregion

 using OpenRA.Traits;
-using OpenRA.Traits.Activities;

 namespace OpenRA.Mods.RA.Activities
 {
--- a/OpenRA.Mods.RA/Activities/Repair.cs
+++ b/OpenRA.Mods.RA/Activities/Repair.cs
@@ -11,7 +11,6 @@
 using System;
 using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;

 namespace OpenRA.Mods.RA.Activities
 {
--- a/OpenRA.Mods.RA/Activities/RepairBuilding.cs
+++ b/OpenRA.Mods.RA/Activities/RepairBuilding.cs
@@ -10,7 +10,6 @@

 using System.Linq;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;

 namespace OpenRA.Mods.RA.Activities
 {
--- a/OpenRA.Mods.RA/Activities/Sell.cs
+++ b/OpenRA.Mods.RA/Activities/Sell.cs
@@ -11,7 +11,6 @@
 using System.Collections.Generic;
 using OpenRA.Traits;
 using OpenRA.Mods.RA.Effects;
-using OpenRA.Traits.Activities;
 using OpenRA.Mods.RA.Buildings;

 namespace OpenRA.Mods.RA.Activities
--- a/OpenRA.Mods.RA/Activities/Teleport.cs
+++ b/OpenRA.Mods.RA/Activities/Teleport.cs
@@ -10,7 +10,6 @@

 using System.Linq;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;

 namespace OpenRA.Mods.RA.Activities
 {
--- a/OpenRA.Mods.RA/Activities/Transform.cs
+++ b/OpenRA.Mods.RA/Activities/Transform.cs
@@ -12,7 +12,6 @@ using OpenRA.FileFormats;
 using OpenRA.Mods.RA.Buildings;
 using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;

 namespace OpenRA.Mods.RA.Activities
 {
--- a/OpenRA.Mods.RA/Activities/Turn.cs
+++ b/OpenRA.Mods.RA/Activities/Turn.cs
@@ -10,7 +10,6 @@

 using System.Linq;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;

 namespace OpenRA.Mods.RA.Activities
 {
--- a/OpenRA.Mods.RA/Activities/UnloadCargo.cs
+++ b/OpenRA.Mods.RA/Activities/UnloadCargo.cs
@@ -8,12 +8,11 @@
 */
 #endregion

+using System.Drawing;
 using System.Linq;
+using OpenRA.Mods.RA.Move;
 using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
-using System.Drawing;
-using OpenRA.Mods.RA.Move;

 namespace OpenRA.Mods.RA.Activities
 {
--- a/OpenRA.Mods.RA/Activities/Wait.cs
+++ b/OpenRA.Mods.RA/Activities/Wait.cs
@@ -9,7 +9,6 @@
 #endregion

 using OpenRA.Traits;
-using OpenRA.Traits.Activities;

 namespace OpenRA.Mods.RA.Activities
 {
--- a/OpenRA.Mods.RA/Air/AttackHeli.cs
+++ b/OpenRA.Mods.RA/Air/AttackHeli.cs
@@ -10,7 +10,6 @@

 using OpenRA.Mods.RA.Activities;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;

 namespace OpenRA.Mods.RA.Air
 {
--- a/OpenRA.Mods.RA/Air/AttackPlane.cs
+++ b/OpenRA.Mods.RA/Air/AttackPlane.cs
@@ -10,7 +10,6 @@

 using OpenRA.Mods.RA.Activities;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;

 namespace OpenRA.Mods.RA.Air
 {
--- a/OpenRA.Mods.RA/Air/FallsToEarth.cs
+++ b/OpenRA.Mods.RA/Air/FallsToEarth.cs
@@ -10,7 +10,6 @@

 using OpenRA.Mods.RA.Activities;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;

 namespace OpenRA.Mods.RA.Air
 {
--- a/OpenRA.Mods.RA/Air/Fly.cs
+++ b/OpenRA.Mods.RA/Air/Fly.cs
@@ -11,7 +11,6 @@
 using System;
 using System.Collections.Generic;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;

 namespace OpenRA.Mods.RA.Air
 {
--- a/OpenRA.Mods.RA/Air/FlyAttack.cs
+++ b/OpenRA.Mods.RA/Air/FlyAttack.cs
@@ -9,7 +9,6 @@
 #endregion

 using OpenRA.Traits;
-using OpenRA.Traits.Activities;

 namespace OpenRA.Mods.RA.Air
 {
--- a/OpenRA.Mods.RA/Air/FlyCircle.cs
+++ b/OpenRA.Mods.RA/Air/FlyCircle.cs
@@ -10,7 +10,6 @@

 using System.Collections.Generic;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;

 namespace OpenRA.Mods.RA.Air
 {
--- a/OpenRA.Mods.RA/Air/FlyTimed.cs
+++ b/OpenRA.Mods.RA/Air/FlyTimed.cs
@@ -9,7 +9,6 @@
 #endregion

 using OpenRA.Traits;
-using OpenRA.Traits.Activities;

 namespace OpenRA.Mods.RA.Air
 {
--- a/OpenRA.Mods.RA/Air/HeliAttack.cs
+++ b/OpenRA.Mods.RA/Air/HeliAttack.cs
@@ -11,7 +11,6 @@
 using System;
 using System.Linq;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;

 namespace OpenRA.Mods.RA.Air
 {
--- a/OpenRA.Mods.RA/Air/HeliFly.cs
+++ b/OpenRA.Mods.RA/Air/HeliFly.cs
@@ -11,7 +11,6 @@
 using System;
 using System.Collections.Generic;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;

 namespace OpenRA.Mods.RA.Air
 {
--- a/OpenRA.Mods.RA/Air/HeliLand.cs
+++ b/OpenRA.Mods.RA/Air/HeliLand.cs
@@ -9,7 +9,6 @@
 #endregion

 using OpenRA.Traits;
-using OpenRA.Traits.Activities;

 namespace OpenRA.Mods.RA.Air
 {
--- a/OpenRA.Mods.RA/Air/HeliReturn.cs
+++ b/OpenRA.Mods.RA/Air/HeliReturn.cs
@@ -10,7 +10,6 @@

 using System.Linq;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 using OpenRA.Mods.RA.Activities;

 namespace OpenRA.Mods.RA.Air
--- a/OpenRA.Mods.RA/Air/Land.cs
+++ b/OpenRA.Mods.RA/Air/Land.cs
@@ -11,7 +11,6 @@
 using System;
 using System.Linq;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;

 namespace OpenRA.Mods.RA.Air
 {
--- a/OpenRA.Mods.RA/Air/Plane.cs
+++ b/OpenRA.Mods.RA/Air/Plane.cs
@@ -11,7 +11,6 @@
 using System.Drawing;
 using System.Linq;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;

 namespace OpenRA.Mods.RA.Air
 {
--- a/OpenRA.Mods.RA/Air/ReturnToBase.cs
+++ b/OpenRA.Mods.RA/Air/ReturnToBase.cs
@@ -11,7 +11,6 @@
 using System;
 using System.Linq;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 using OpenRA.Mods.RA.Buildings;

 namespace OpenRA.Mods.RA.Air
--- a/OpenRA.Mods.RA/Attack/AttackBase.cs
+++ b/OpenRA.Mods.RA/Attack/AttackBase.cs
@@ -14,7 +14,6 @@ using System.Drawing;
 using System.Linq;
 using OpenRA.FileFormats;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;

 namespace OpenRA.Mods.RA
 {
--- a/OpenRA.Mods.RA/Attack/AttackFrontal.cs
+++ b/OpenRA.Mods.RA/Attack/AttackFrontal.cs
@@ -10,7 +10,6 @@

 using System;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;

 namespace OpenRA.Mods.RA
 {
--- a/OpenRA.Mods.RA/Attack/AttackLeap.cs
+++ b/OpenRA.Mods.RA/Attack/AttackLeap.cs
@@ -11,7 +11,6 @@
 using System;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;

 namespace OpenRA.Mods.RA
 {
--- a/OpenRA.Mods.RA/Attack/AttackMedic.cs
+++ b/OpenRA.Mods.RA/Attack/AttackMedic.cs
@@ -10,7 +10,6 @@

 using System;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;

 namespace OpenRA.Mods.RA
 {
--- a/OpenRA.Mods.RA/Attack/AttackOmni.cs
+++ b/OpenRA.Mods.RA/Attack/AttackOmni.cs
@@ -10,7 +10,6 @@

 using OpenRA.Mods.RA.Buildings;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;

 namespace OpenRA.Mods.RA
 {
--- a/OpenRA.Mods.RA/Attack/AttackPopupTurreted.cs
+++ b/OpenRA.Mods.RA/Attack/AttackPopupTurreted.cs
@@ -8,15 +8,10 @@
 */
 #endregion

-using System;
-using System.Linq;
 using OpenRA.GameRules;
-using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Buildings;
-using OpenRA.Mods.RA.Move;
 using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;

 namespace OpenRA.Mods.RA
 {
--- a/OpenRA.Mods.RA/Attack/AttackTesla.cs
+++ b/OpenRA.Mods.RA/Attack/AttackTesla.cs
@@ -11,7 +11,6 @@
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;

 namespace OpenRA.Mods.RA
 {
--- a/OpenRA.Mods.RA/Attack/AttackTurreted.cs
+++ b/OpenRA.Mods.RA/Attack/AttackTurreted.cs
@@ -14,7 +14,6 @@ using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Buildings;
 using OpenRA.Mods.RA.Move;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;

 namespace OpenRA.Mods.RA
 {
--- a/OpenRA.Mods.RA/Attack/AttackWander.cs
+++ b/OpenRA.Mods.RA/Attack/AttackWander.cs
@@ -9,7 +9,6 @@
 #endregion

 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 using System.Drawing;
 using OpenRA.Mods.RA.Move;

--- a/OpenRA.Mods.RA/AttackMove.cs
+++ b/OpenRA.Mods.RA/AttackMove.cs
@@ -12,7 +12,6 @@ using System.Drawing;
 using OpenRA.Effects;
 using OpenRA.Mods.RA.Move;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;

 namespace OpenRA.Mods.RA
 {
--- a/OpenRA.Mods.RA/AutoHeal.cs
+++ b/OpenRA.Mods.RA/AutoHeal.cs
@@ -10,7 +10,6 @@

 using System.Linq;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;

 namespace OpenRA.Mods.RA
 {
--- a/OpenRA.Mods.RA/AutoTarget.cs
+++ b/OpenRA.Mods.RA/AutoTarget.cs
@@ -9,7 +9,6 @@
 #endregion

 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 using System.Drawing;
 using System.Linq;

--- a/OpenRA.Mods.RA/FreeActor.cs
+++ b/OpenRA.Mods.RA/FreeActor.cs
@@ -10,7 +10,6 @@

 using OpenRA.FileFormats;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;

 namespace OpenRA.Mods.RA
 {
--- a/OpenRA.Mods.RA/Husk.cs
+++ b/OpenRA.Mods.RA/Husk.cs
@@ -12,7 +12,6 @@ using System.Collections.Generic;
 using OpenRA.FileFormats;
 using OpenRA.Traits;
 using OpenRA.Mods.RA.Move;
-using OpenRA.Traits.Activities;

 namespace OpenRA.Mods.RA
 {
--- a/OpenRA.Mods.RA/Move/Drag.cs
+++ b/OpenRA.Mods.RA/Move/Drag.cs
@@ -10,7 +10,6 @@

 using System.Collections.Generic;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;

 namespace OpenRA.Mods.RA.Move
 {
--- a/OpenRA.Mods.RA/Move/Mobile.cs
+++ b/OpenRA.Mods.RA/Move/Mobile.cs
@@ -15,7 +15,6 @@ using System.Linq;
 using OpenRA.FileFormats;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;

 namespace OpenRA.Mods.RA.Move
 {
--- a/OpenRA.Mods.RA/Move/Move.cs
+++ b/OpenRA.Mods.RA/Move/Move.cs
@@ -15,7 +15,6 @@ using System.Linq;
 using OpenRA.FileFormats;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;

 namespace OpenRA.Mods.RA.Move
 {
--- a/OpenRA.Mods.RA/OreRefinery.cs
+++ b/OpenRA.Mods.RA/OreRefinery.cs
@@ -9,14 +9,11 @@
 #endregion

 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Effects;
-using OpenRA.Mods.RA.Move;
 using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;

 namespace OpenRA.Mods.RA
 {
--- a/OpenRA.Mods.RA/Render/RenderInfantry.cs
+++ b/OpenRA.Mods.RA/Render/RenderInfantry.cs
@@ -10,7 +10,6 @@

 using OpenRA.Mods.RA.Effects;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Move;

--- a/OpenRA.Mods.RA/ScaredyCat.cs
+++ b/OpenRA.Mods.RA/ScaredyCat.cs
@@ -8,11 +8,9 @@
 */
 #endregion

-using OpenRA.Traits;
-using OpenRA.Traits.Activities;
-using System.Drawing;
 using OpenRA.Mods.RA.Move;
 using OpenRA.Mods.RA.Render;
+using OpenRA.Traits;

 namespace OpenRA.Mods.RA
 {
--- a/OpenRA.Mods.RA/Spy.cs
+++ b/OpenRA.Mods.RA/Spy.cs
@@ -13,9 +13,8 @@ using System.Drawing;
 using System.Linq;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Orders;
-using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 using OpenRA.Mods.RA.Render;
+using OpenRA.Traits;

 namespace OpenRA.Mods.RA
 {
--- a/OpenRA.Mods.RA/SupportPowers/SpyPlanePower.cs
+++ b/OpenRA.Mods.RA/SupportPowers/SpyPlanePower.cs
@@ -8,12 +8,10 @@
 */
 #endregion

-using OpenRA.Mods.RA.Activities;
-using OpenRA.Orders;
-using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 using OpenRA.FileFormats;
+using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Air;
+using OpenRA.Traits;

 namespace OpenRA.Mods.RA
 {