Further RA project cleanup

OpenRA.Mods.Cnc/Traits/SupportPowers/IonCannonPower.cs

@@ -11,7 +11,6 @@
 using OpenRA.Mods.Cnc.Effects;
 using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.RA;
-using OpenRA.Mods.RA.Activities;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 

OpenRA.Mods.Common/Activities/Turn.cs

@@ -13,7 +13,7 @@ using System.Linq;
 using OpenRA.Activities;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Activities
+namespace OpenRA.Mods.Common.Activities
 {
 	public class Turn : Activity
 	{

OpenRA.Mods.Common/Activities/Wait.cs

@@ -10,9 +10,8 @@
 
 using System;
 using OpenRA.Activities;
-using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Activities
+namespace OpenRA.Mods.Common.Activities
 {
 	public class Wait : Activity
 	{

OpenRA.Mods.Common/OpenRA.Mods.Common.csproj

@@ -51,6 +51,8 @@
     <Compile Include="Activities\Move\Drag.cs" />
     <Compile Include="Activities\RemoveSelf.cs" />
     <Compile Include="Activities\SimpleTeleport.cs" />
+    <Compile Include="Activities\Turn.cs" />
+    <Compile Include="Activities\Wait.cs" />
     <Compile Include="Effects\Beacon.cs" />
     <Compile Include="Effects\Bullet.cs" />
     <Compile Include="Effects\Contrail.cs" />
@@ -112,12 +114,14 @@
     <Compile Include="Traits\AppearsOnRadar.cs" />
     <Compile Include="Traits\BlocksBullets.cs" />
     <Compile Include="Traits\Buildable.cs" />
+    <Compile Include="Traits\Buildings\BaseBuilding.cs" />
     <Compile Include="Traits\Buildings\BaseProvider.cs" />
     <Compile Include="Traits\Buildings\DeadBuildingState.cs" />
     <Compile Include="Traits\Buildings\LineBuild.cs" />
     <Compile Include="Traits\Buildings\LineBuildNode.cs" />
     <Compile Include="Traits\Buildings\RallyPoint.cs" />
     <Compile Include="Traits\Burns.cs" />
+    <Compile Include="Traits\Huntable.cs" />
     <Compile Include="Traits\CustomBuildTimeValue.cs" />
     <Compile Include="Traits\CustomSellValue.cs" />
     <Compile Include="Traits\Demolishable.cs" />

OpenRA.Mods.Common/Traits/Buildings/BaseBuilding.cs

@@ -10,7 +10,7 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Tag trait for construction yard and MCVs. Used by the cycle bases hotkey to identify actors.")]
 	public class BaseBuildingInfo : TraitInfo<BaseBuilding> { }

OpenRA.Mods.Common/Traits/Huntable.cs

@@ -0,0 +1,18 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2014 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 OpenRA.Traits;
+
+namespace OpenRA.Mods.Common.Traits
+{
+    [Desc("This actor can be targeted by the Hunt activity.")]
+    public class HuntableInfo : TraitInfo<Huntable> { }
+    public class Huntable { }
+}

OpenRA.Mods.Common/TraitsInterfaces.cs

@@ -11,7 +11,6 @@
 using System.Collections.Generic;
 using OpenRA.Activities;
 using OpenRA.Mods.Common.Graphics;
-using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.Common.Traits
@@ -52,4 +51,6 @@ namespace OpenRA.Mods.Common.Traits
 		void PrerequisitesItemHidden(string key);
 		void PrerequisitesItemVisible(string key);
 	}
+
+	public interface INotifyTransform { void BeforeTransform(Actor self); void OnTransform(Actor self); void AfterTransform(Actor toActor); }
 }

OpenRA.Mods.D2k/Activities/CarryUnit.cs

@@ -7,12 +7,10 @@
  * see COPYING.
  */
 #endregion
-using System;
+
-using System.Drawing;
-using System.Linq;
 using OpenRA.Activities;
+using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.D2k.Traits;
-using OpenRA.Mods.RA;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;

OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj

@@ -74,6 +74,7 @@
     <Compile Include="Traits\AttackSwallow.cs" />
     <Compile Include="Traits\AutoCarryall.cs" />
     <Compile Include="Traits\Buildings\DamagedWithoutFoundation.cs" />
+    <Compile Include="Traits\Buildings\LaysTerrain.cs" />
     <Compile Include="Traits\Carryable.cs" />
     <Compile Include="Traits\Render\WithBuildingPlacedOverlay.cs" />
     <Compile Include="Traits\Render\WithCrumbleOverlay.cs" />
@@ -82,6 +83,7 @@
     <Compile Include="Traits\Render\WithProductionOverlay.cs" />
     <Compile Include="Traits\TemporaryOwnerManager.cs" />
     <Compile Include="Traits\ThrowsShrapnel.cs" />
+    <Compile Include="Traits\World\BuildableTerrainLayer.cs" />
     <Compile Include="Traits\World\ChooseBuildTabOnSelect.cs" />
     <Compile Include="Traits\World\D2kResourceLayer.cs" />
     <Compile Include="Traits\World\FogPaletteFromR8.cs" />

OpenRA.Mods.D2k/Traits/Buildings/LaysTerrain.cs

@@ -9,10 +9,10 @@
 #endregion
 
 using System.Linq;
-using OpenRA.Mods.RA.Traits;
+using OpenRA.Mods.RA.Buildings;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Buildings
+namespace OpenRA.Mods.D2k.Traits
 {
 	public class LaysTerrainInfo : ITraitInfo, Requires<BuildingInfo>
 	{

OpenRA.Mods.D2k/Traits/World/BuildableTerrainLayer.cs

@@ -12,7 +12,7 @@ using System.Collections.Generic;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.D2k.Traits
 {
 	[Desc("Attach this to the world actor. Required for LaysTerrain to work.")]
 	public class BuildableTerrainLayerInfo : TraitInfo<BuildableTerrainLayer> { }

OpenRA.Mods.RA/AI/HackyAI.cs

@@ -12,6 +12,7 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Buildings;

OpenRA.Mods.RA/Activities/Air/HeliReturn.cs

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

OpenRA.Mods.RA/Activities/Attack.cs

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

OpenRA.Mods.RA/Activities/DeliverResources.cs

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

OpenRA.Mods.RA/Activities/FindResources.cs

@@ -8,11 +8,11 @@
  */
 #endregion
 
-using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using OpenRA.Activities;
+using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;

OpenRA.Mods.RA/Activities/Follow.cs

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

OpenRA.Mods.RA/Activities/Hunt.cs

@@ -11,7 +11,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Activities;
-using OpenRA.Mods.RA.Traits;
+using OpenRA.Mods.Common.Activities;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Activities
@@ -48,8 +49,4 @@ namespace OpenRA.Mods.RA.Activities
 				this);
 		}
 	}
-
-	[Desc("Can be targeted by the Hunt activity.")]
-	public class HuntableInfo : TraitInfo<Huntable> { }
-	public class Huntable { }
 }

OpenRA.Mods.RA/Activities/LayMines.cs

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

OpenRA.Mods.RA/Activities/Move.cs

@@ -13,6 +13,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using OpenRA.Activities;
+using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Primitives;
 using OpenRA.Traits;

OpenRA.Mods.RA/Activities/RAHarvesterDockSequence.cs

@@ -11,8 +11,8 @@
 using System;
 using System.Collections.Generic;
 using OpenRA.Activities;
+using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 

OpenRA.Mods.RA/Activities/UnloadCargo.cs

@@ -12,6 +12,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using OpenRA.Activities;
+using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Primitives;
 using OpenRA.Traits;

OpenRA.Mods.RA/Attack/AttackCharge.cs

@@ -9,7 +9,7 @@
 #endregion
 
 using OpenRA.Activities;
-using OpenRA.Mods.RA.Activities;
+using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
 

OpenRA.Mods.RA/OpenRA.Mods.RA.csproj

@@ -97,6 +97,7 @@
     <Compile Include="AI\AttackOrFleeFuzzy.cs" />
     <Compile Include="AI\BaseBuilder.cs" />
     <Compile Include="AI\HackyAI.cs" />
+    <Compile Include="Render\WithIdleOverlay.cs" />
     <Compile Include="Traits\AcceptsSupplies.cs" />
     <Compile Include="Activities\Attack.cs" />
     <Compile Include="Activities\AttackMoveActivity.cs" />
@@ -120,9 +121,7 @@
     <Compile Include="Activities\Sell.cs" />
     <Compile Include="Activities\Teleport.cs" />
     <Compile Include="Activities\Transform.cs" />
-    <Compile Include="Activities\Turn.cs" />
     <Compile Include="Activities\UnloadCargo.cs" />
-    <Compile Include="Activities\Wait.cs" />
     <Compile Include="ActorExts.cs" />
     <Compile Include="AI\SupportPowerDecision.cs" />
     <Compile Include="Attack\AttackTurreted.cs" />
@@ -200,6 +199,7 @@
     <Compile Include="Traits\Minelayer.cs" />
     <Compile Include="Traits\Mobile.cs" />
     <Compile Include="Activities\Move.cs" />
+    <Compile Include="Traits\SeedsResource.cs" />
     <Compile Include="Traits\World\PathFinder.cs" />
     <Compile Include="Traits\World\PathSearch.cs" />
     <Compile Include="Orders\PlaceBuildingOrderGenerator.cs" />
@@ -240,7 +240,6 @@
     <Compile Include="Repairable.cs" />
     <Compile Include="RepairableNear.cs" />
     <Compile Include="ScaredyCat.cs" />
-    <Compile Include="SeedsResource.cs" />
     <Compile Include="SelfHealing.cs" />
     <Compile Include="Sellable.cs" />
     <Compile Include="SpawnMPUnits.cs" />
@@ -268,7 +267,6 @@
     <Compile Include="Traits\Air\Plane.cs" />
     <Compile Include="Traits\Air\ReturnOnIdle.cs" />
     <Compile Include="Traits\Air\TargetableAircraft.cs" />
-    <Compile Include="Traits\Buildings\BaseBuilding.cs" />
     <Compile Include="Traits\Buildings\Bridge.cs" />
     <Compile Include="Traits\Buildings\BridgeHut.cs" />
     <Compile Include="Traits\Buildings\Fake.cs" />
@@ -287,7 +285,6 @@
     <Compile Include="Traits\TargetableSubmarine.cs" />
     <Compile Include="Traits\TargetableUnit.cs" />
     <Compile Include="Traits\World\BridgeLayer.cs" />
-    <Compile Include="Traits\World\BuildableTerrainLayer.cs" />
     <Compile Include="Traits\World\PathfinderDebugOverlay.cs" />
     <Compile Include="Traits\World\ResourceLayer.cs" />
     <Compile Include="TransformOnCapture.cs" />
@@ -343,7 +340,6 @@
     <Compile Include="Widgets\Logic\SimpleTooltipLogic.cs" />
     <Compile Include="Widgets\Logic\WorldTooltipLogic.cs" />
     <Compile Include="Buildings\Bib.cs" />
-    <Compile Include="Render\WithIdleOverlay.cs" />
     <Compile Include="AI\Squad.cs" />
     <Compile Include="AI\States\StateBase.cs" />
     <Compile Include="AI\States\GroundStates.cs" />
@@ -354,7 +350,6 @@
     <Compile Include="Render\WithCrateBody.cs" />
     <Compile Include="Widgets\Logic\GameTimerLogic.cs" />
     <Compile Include="Widgets\Logic\ReplayControlBarLogic.cs" />
-    <Compile Include="Buildings\LaysTerrain.cs" />
     <Compile Include="Attack\AttackFollow.cs" />
     <Compile Include="Attack\AttackGarrisoned.cs" />
     <Compile Include="Widgets\Logic\LobbyMapPreviewLogic.cs" />

OpenRA.Mods.RA/Scripting/Properties/ProductionProperties.cs

@@ -12,9 +12,9 @@ using Eluant;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.Common.Scripting;
 using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Scripting;
 using OpenRA.Traits;

OpenRA.Mods.RA/Traits/Crates/GiveMcvCrateAction.cs

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

OpenRA.Mods.RA/Traits/SeedsResource.cs

@@ -11,7 +11,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using OpenRA.Mods.RA.Render;
 using OpenRA.Support;
 using OpenRA.Traits;
 

OpenRA.Mods.RA/TraitsInterfaces.cs

@@ -8,9 +8,7 @@
  */
 #endregion
 
-using System.Collections.Generic;
 using OpenRA.Mods.RA.Activities;
-using OpenRA.Mods.Common.Graphics;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
@@ -30,6 +28,5 @@ namespace OpenRA.Mods.RA
 	}
 
 	public interface INotifyParachuteLanded { void OnLanded(); }
-	public interface INotifyTransform { void BeforeTransform(Actor self); void OnTransform(Actor self); void AfterTransform(Actor toActor); }
 	public interface INotifyAttack { void Attacking(Actor self, Target target, Armament a, Barrel barrel); }
 }

OpenRA.Mods.RA/Transforms.cs

@@ -9,6 +9,7 @@
 #endregion
 
 using System.Collections.Generic;
+using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 using OpenRA.Mods.RA.Render;

OpenRA.Mods.TS/Activities/VoxelHarvesterDockSequence.cs

@@ -11,7 +11,7 @@
 using System;
 using System.Collections.Generic;
 using OpenRA.Activities;
-using OpenRA.Mods.RA.Activities;
+using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Mods.TS.Traits;
 using OpenRA.Traits;