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

OpenRA.Game/Actor.cs

@@ -14,7 +14,6 @@ using System.Drawing;
 using System.Linq;
 using OpenRA.FileFormats;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA
 {

OpenRA.Game/OpenRA.Game.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -148,7 +148,7 @@
     <Compile Include="Support\Program.cs" />
     <Compile Include="Sync.cs" />
     <Compile Include="TraitDictionary.cs" />
-    <Compile Include="Traits\Activities\Activity.cs" />
+    <Compile Include="Traits\Activity.cs" />
     <Compile Include="Traits\Armor.cs" />
     <Compile Include="Traits\DrawLineToTarget.cs" />
     <Compile Include="Traits\EditorAppearance.cs" />

OpenRA.Game/Traits/Activity.cs

@@ -1,9 +1,19 @@
-using System;
+#region Copyright & License Information
+/*
+ * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace OpenRA.Traits.Activities
+namespace OpenRA.Traits
 {
 	public abstract class Activity
 	{

OpenRA.Game/Traits/Util.cs

@@ -13,7 +13,6 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using OpenRA.Support;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Traits
 {

OpenRA.Mods.Cnc/Activities/HarvesterDockSequence.cs

@@ -15,22 +15,12 @@ using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Move;
 using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.Cnc
 {
 	public class HarvesterDockSequence : Activity
 	{
-		enum State
+		enum State { Wait, Turn, DragIn, Dock, Loop, Undock, DragOut };
-		{
-			Wait,
-			Turn,
-			Dragin,
-			Dock,
-			Loop,
-			Undock,
-			Dragout
-		};
 
 		readonly Actor proc;
 		readonly Harvester harv;
@@ -56,9 +46,9 @@ namespace OpenRA.Mods.Cnc
 				case State.Wait:
 					return this;
 				case State.Turn:
-					state = State.Dragin;
+					state = State.DragIn;
 					return Util.SequenceActivities(new Turn(112), this);
-				case State.Dragin:
+				case State.DragIn:
 					state = State.Dock;
 					return Util.SequenceActivities(new Drag(startDock, endDock, 12), this);
 				case State.Dock:
@@ -70,10 +60,10 @@ namespace OpenRA.Mods.Cnc
 						state = State.Undock;
 					return this;
 				case State.Undock:
-					ru.PlayCustomAnimBackwards(self, "dock", () => state = State.Dragout);
+					ru.PlayCustomAnimBackwards(self, "dock", () => state = State.DragOut);
 					state = State.Wait;
 					return this;
-				case State.Dragout:
+				case State.DragOut:
 					return Util.SequenceActivities(new Drag(endDock, startDock, 12), NextActivity);
 			}
 			throw new InvalidOperationException("Invalid harvester dock state");

OpenRA.Mods.Cnc/TiberiumRefinery.cs

@@ -8,10 +8,8 @@
  */
 #endregion
 
-using System.Collections.Generic;
 using OpenRA.Mods.RA;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.Cnc
 {

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

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
 {

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
 {

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

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
 {

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

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
 {

OpenRA.Mods.RA/Activities/EnterTransport.cs

@@ -9,7 +9,6 @@
 #endregion
 
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA.Activities
 {

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
 {

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

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

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
 {

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

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
 {

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)

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
 {

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
+		enum State { Wait, Turn, Dock, Loop, Undock, Complete };
-		{
-			Wait,
-			Turn,
-			Dock,
-			Loop,
-			Undock,
-			Complete
-		};
 
 		readonly Actor proc;
 		readonly Harvester harv;

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
 {

OpenRA.Mods.RA/Activities/RemoveSelf.cs

@@ -9,7 +9,6 @@
 #endregion
 
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA.Activities
 {

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
 {

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
 {

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

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
 {

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
 {

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
 {

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
 {

OpenRA.Mods.RA/Activities/Wait.cs

@@ -9,7 +9,6 @@
 #endregion
 
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA.Activities
 {

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
 {

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
 {

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
 {

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
 {

OpenRA.Mods.RA/Air/FlyAttack.cs

@@ -9,7 +9,6 @@
 #endregion
 
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA.Air
 {

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
 {

OpenRA.Mods.RA/Air/FlyTimed.cs

@@ -9,7 +9,6 @@
 #endregion
 
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA.Air
 {

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
 {

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
 {

OpenRA.Mods.RA/Air/HeliLand.cs

@@ -9,7 +9,6 @@
 #endregion
 
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA.Air
 {

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

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
 {

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
 {

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

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
 {

OpenRA.Mods.RA/Attack/AttackFrontal.cs

@@ -10,7 +10,6 @@
 
 using System;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA
 {

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
 {

OpenRA.Mods.RA/Attack/AttackMedic.cs

@@ -10,7 +10,6 @@
 
 using System;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA
 {

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
 {

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
 {

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
 {

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
 {

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;
 

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
 {

OpenRA.Mods.RA/AutoHeal.cs

@@ -10,7 +10,6 @@
 
 using System.Linq;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA
 {

OpenRA.Mods.RA/AutoTarget.cs

@@ -9,7 +9,6 @@
 #endregion
 
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 using System.Drawing;
 using System.Linq;
 

OpenRA.Mods.RA/FreeActor.cs

@@ -10,7 +10,6 @@
 
 using OpenRA.FileFormats;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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;
 

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
 {

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
 {

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
 {