Merge pull request #7161 from reaperrr/dissolve-namespaces03

Dissolve Move, Infiltration and Crates namespaces

OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj

@@ -70,6 +70,7 @@
     <Compile Include="Activities\HarvesterDockSequence.cs" />
     <Compile Include="CncLoadScreen.cs" />
     <Compile Include="Effects\IonCannon.cs" />
+    <Compile Include="Traits\AttackPopupTurreted.cs" />
     <Compile Include="Traits\Buildings\ProductionAirdrop.cs" />
     <Compile Include="Traits\Buildings\TiberiumRefinery.cs" />
     <Compile Include="Traits\PoisonedByTiberium.cs" />

OpenRA.Mods.Cnc/Traits/AttackPopupTurreted.cs

@@ -12,11 +12,12 @@ using System.Linq;
 using OpenRA.Activities;
 using OpenRA.GameRules;
 using OpenRA.Mods.Common.Traits;
+using OpenRA.Mods.RA;
 using OpenRA.Mods.RA.Buildings;
 using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Cnc.Traits
 {
 	[Desc("Actor's turret rises from the ground before attacking.")]
 	class AttackPopupTurretedInfo : AttackTurretedInfo, Requires<BuildingInfo>, Requires<RenderBuildingInfo>

OpenRA.Mods.D2k/Activities/SwallowActor.cs

@@ -14,7 +14,8 @@ using OpenRA.Activities;
 using OpenRA.GameRules;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.D2k.Traits;
-using OpenRA.Mods.RA.Move;
+using OpenRA.Mods.RA.Activities;
+using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.D2k.Activities

OpenRA.Mods.D2k/OpenRA.Mods.D2k.sln

@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Mods.D2k", "OpenRA.Mods.D2k.csproj", "{C0B0465C-6BE2-409C-8770-3A9BF64C4344}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C0B0465C-6BE2-409C-8770-3A9BF64C4344}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C0B0465C-6BE2-409C-8770-3A9BF64C4344}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C0B0465C-6BE2-409C-8770-3A9BF64C4344}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C0B0465C-6BE2-409C-8770-3A9BF64C4344}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = OpenRA.Mods.D2k.csproj
-	EndGlobalSection
-EndGlobal

OpenRA.Mods.D2k/Traits/Render/WithProductionOverlay.cs

@@ -14,6 +14,7 @@ using OpenRA.Graphics;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA;
 using OpenRA.Mods.RA.Buildings;
+using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.D2k.Traits

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

@@ -11,6 +11,7 @@
 using System.Linq;
 using OpenRA.Mods.D2k.Widgets;
 using OpenRA.Mods.RA;
+using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 using OpenRA.Widgets;
 

OpenRA.Mods.RA/AI/AttackOrFleeFuzzy.cs

@@ -12,7 +12,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using AI.Fuzzy.Library;
-using OpenRA.Mods.RA.Move;
+using OpenRA.Mods.RA.Traits;
 using OpenRA.GameRules;
 using OpenRA.Traits;
 

OpenRA.Mods.RA/AI/HackyAI.cs

@@ -16,7 +16,6 @@ using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Buildings;
 using OpenRA.Mods.RA.Traits;
-using OpenRA.Mods.RA.Move;
 using OpenRA.Primitives;
 using OpenRA.Support;
 using OpenRA.Traits;

OpenRA.Mods.RA/Activities/Attack.cs

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

OpenRA.Mods.RA/Activities/AttackMoveActivity.cs

@@ -10,7 +10,6 @@
 
 using System.Collections.Generic;
 using OpenRA.Activities;
-using OpenRA.Mods.RA.Move;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 

OpenRA.Mods.RA/Activities/Enter.cs

@@ -12,7 +12,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Activities;
-using OpenRA.Mods.RA.Move;
+using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Activities

OpenRA.Mods.RA/Activities/ExternalCaptureActor.cs

@@ -10,7 +10,7 @@
 
 using OpenRA.Activities;
 using OpenRA.Effects;
-using OpenRA.Mods.RA.Move;
+using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Activities

OpenRA.Mods.RA/Activities/FindResources.cs

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

OpenRA.Mods.RA/Activities/Hunt.cs

@@ -43,7 +43,7 @@ namespace OpenRA.Mods.RA.Activities
 				return this;
 
 			return Util.SequenceActivities(
-				new AttackMoveActivity(self, new Move.Move(self, target.Location, WRange.FromCells(2))),
+				new AttackMoveActivity(self, new Move(self, target.Location, WRange.FromCells(2))),
 				new Wait(25),
 				this);
 		}

OpenRA.Mods.RA/Activities/Infiltrate.cs

@@ -10,8 +10,8 @@
 
 using OpenRA.Activities;
 using OpenRA.Mods.RA.Buildings;
-using OpenRA.Traits;
 using OpenRA.Mods.RA.Traits;
+using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Activities
 {

OpenRA.Mods.RA/Activities/Leap.cs

@@ -12,7 +12,7 @@ using System;
 using System.Linq;
 using OpenRA.Activities;
 using OpenRA.GameRules;
-using OpenRA.Mods.RA.Move;
+using OpenRA.Mods.RA.Traits;
 using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
 

OpenRA.Mods.RA/Activities/Move.cs

@@ -13,12 +13,11 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using OpenRA.Activities;
-using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Move
+namespace OpenRA.Mods.RA.Activities
 {
 	class Move : Activity
 	{

OpenRA.Mods.RA/Activities/MoveAdjacentTo.cs

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

OpenRA.Mods.RA/Activities/MoveWithinRange.cs

@@ -11,7 +11,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Activities;
-using OpenRA.Mods.RA.Move;
+using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Activities

OpenRA.Mods.RA/Activities/UnloadCargo.cs

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

OpenRA.Mods.RA/Attack/AttackFollow.cs

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

OpenRA.Mods.RA/Attack/AttackTurreted.cs

@@ -15,12 +15,12 @@ using OpenRA.Traits;
 namespace OpenRA.Mods.RA
 {
 	[Desc("Actor has a visual turret used to attack.")]
-	class AttackTurretedInfo : AttackFollowInfo, Requires<TurretedInfo>
+	public class AttackTurretedInfo : AttackFollowInfo, Requires<TurretedInfo>
 	{
 		public override object Create(ActorInitializer init) { return new AttackTurreted(init.self, this); }
 	}
 
-	class AttackTurreted : AttackFollow, ITick, ISync
+	public class AttackTurreted : AttackFollow, ITick, ISync
 	{
 		protected IEnumerable<Turreted> turrets;
 

OpenRA.Mods.RA/Buildings/ClonesProducedUnits.cs

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

OpenRA.Mods.RA/CrateSpawner.cs

@@ -13,11 +13,10 @@ using System.Linq;
 using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Buildings;
-using OpenRA.Mods.RA.Traits;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.RA.Traits
 {
 	public class CrateSpawnerInfo : ITraitInfo
 	{

OpenRA.Mods.RA/Crushable.cs

@@ -10,10 +10,9 @@
 
 using System.Linq;
 using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.RA.Move;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.RA.Traits
 {
 	[Desc("This actor is crushable.")]
 	class CrushableInfo : ITraitInfo

OpenRA.Mods.RA/EjectOnDeath.cs

@@ -9,11 +9,10 @@
 #endregion
 
 using OpenRA.Mods.RA.Effects;
-using OpenRA.Mods.RA.Move;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.RA.Traits
 {
 	[Desc("Eject a ground soldier or a paratrooper while in the air.")]
 	public class EjectOnDeathInfo : TraitInfo<EjectOnDeath>

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

@@ -126,7 +126,6 @@
     <Compile Include="ActorExts.cs" />
     <Compile Include="AI\SupportPowerDecision.cs" />
     <Compile Include="Attack\AttackTurreted.cs" />
-    <Compile Include="Crates\DuplicateUnitCrateAction.cs" />
     <Compile Include="Crushable.cs" />
     <Compile Include="Effects\GpsSatellite.cs" />
     <Compile Include="Effects\Rank.cs" />
@@ -135,17 +134,15 @@
     <Compile Include="Render\RenderUnitReload.cs" />
     <Compile Include="Graphics\TeslaZapRenderable.cs" />
     <Compile Include="GainsExperience.cs" />
-    <Compile Include="Infiltration\InfiltrateForPowerOutage.cs" />
     <Compile Include="EjectOnDeath.cs" />
     <Compile Include="AI\RushFuzzy.cs" />
     <Compile Include="AI\StateMachine.cs" />
     <Compile Include="Traits\AttackMove.cs" />
     <Compile Include="Attack\AttackBase.cs" />
     <Compile Include="Attack\AttackFrontal.cs" />
-    <Compile Include="Attack\AttackLeap.cs" />
+    <Compile Include="Traits\Attack\AttackLeap.cs" />
     <Compile Include="Attack\AttackMedic.cs" />
     <Compile Include="Attack\AttackOmni.cs" />
-    <Compile Include="Attack\AttackPopupTurreted.cs" />
     <Compile Include="Attack\AttackCharge.cs" />
     <Compile Include="Attack\AttackWander.cs" />
     <Compile Include="AutoHeal.cs" />
@@ -166,18 +163,20 @@
     <Compile Include="CashTrickler.cs" />
     <Compile Include="Traits\PaletteEffects\ChronoshiftPaletteEffect.cs" />
     <Compile Include="Traits\Chronoshiftable.cs" />
-    <Compile Include="Crate.cs" />
-    <Compile Include="CrateAction.cs" />
     <Compile Include="CrateSpawner.cs" />
-    <Compile Include="Crates\ExplodeCrateAction.cs" />
-    <Compile Include="Crates\GiveCashCrateAction.cs" />
-    <Compile Include="Crates\GiveMcvCrateAction.cs" />
-    <Compile Include="Crates\GiveUnitCrateAction.cs" />
-    <Compile Include="Crates\HealUnitsCrateAction.cs" />
-    <Compile Include="Crates\HideMapCrateAction.cs" />
-    <Compile Include="Crates\LevelUpCrateAction.cs" />
-    <Compile Include="Crates\RevealMapCrateAction.cs" />
-    <Compile Include="Crates\SupportPowerCrateAction.cs" />
+    <Compile Include="Traits\Crates\CrateAction.cs" />
+    <Compile Include="Traits\Crates\Crate.cs" />
+    <Compile Include="Traits\Crates\DuplicateUnitCrateAction.cs" />
+    <Compile Include="Traits\Crates\ExplodeCrateAction.cs" />
+    <Compile Include="Traits\Crates\GiveCashCrateAction.cs" />
+    <Compile Include="Traits\Crates\GiveMcvCrateAction.cs" />
+    <Compile Include="Traits\Crates\GiveUnitCrateAction.cs" />
+    <Compile Include="Traits\Crates\GrantUpgradeCrateAction.cs" />
+    <Compile Include="Traits\Crates\HealUnitsCrateAction.cs" />
+    <Compile Include="Traits\Crates\HideMapCrateAction.cs" />
+    <Compile Include="Traits\Crates\LevelUpCrateAction.cs" />
+    <Compile Include="Traits\Crates\RevealMapCrateAction.cs" />
+    <Compile Include="Traits\Crates\SupportPowerCrateAction.cs" />
     <Compile Include="Traits\DemoTruck.cs" />
     <Compile Include="DetectCloaked.cs" />
     <Compile Include="Effects\GpsDot.cs" />
@@ -189,7 +188,6 @@
     <Compile Include="GivesBounty.cs" />
     <Compile Include="GivesExperience.cs" />
     <Compile Include="Guard.cs" />
-    <Compile Include="Infiltration\InfiltrateForSupportPower.cs" />
     <Compile Include="Invulnerable.cs" />
     <Compile Include="Captures.cs" />
     <Compile Include="LimitedAmmo.cs" />
@@ -200,10 +198,10 @@
     <Compile Include="Traits\MadTank.cs" />
     <Compile Include="Traits\Mine.cs" />
     <Compile Include="Traits\Minelayer.cs" />
-    <Compile Include="Move\Mobile.cs" />
-    <Compile Include="Move\Move.cs" />
-    <Compile Include="Move\PathFinder.cs" />
-    <Compile Include="Move\PathSearch.cs" />
+    <Compile Include="Traits\Mobile.cs" />
+    <Compile Include="Activities\Move.cs" />
+    <Compile Include="Traits\World\PathFinder.cs" />
+    <Compile Include="Traits\World\PathSearch.cs" />
     <Compile Include="Orders\PlaceBuildingOrderGenerator.cs" />
     <Compile Include="Orders\GlobalButtonOrderGenerator.cs" />
     <Compile Include="Orders\RepairOrderGenerator.cs" />
@@ -326,10 +324,12 @@
     <Compile Include="Widgets\WorldCommandWidget.cs" />
     <Compile Include="Player\BaseAttackNotifier.cs" />
     <Compile Include="Player\HarvesterAttackNotifier.cs" />
-    <Compile Include="Infiltration\InfiltrateForExploration.cs" />
-    <Compile Include="Infiltration\InfiltrateForCash.cs" />
     <Compile Include="RenderShroudCircle.cs" />
-    <Compile Include="Infiltration\Infiltrates.cs" />
+    <Compile Include="Traits\Infiltration\InfiltrateForCash.cs" />
+    <Compile Include="Traits\Infiltration\InfiltrateForExploration.cs" />
+    <Compile Include="Traits\Infiltration\InfiltrateForPowerOutage.cs" />
+    <Compile Include="Traits\Infiltration\InfiltrateForSupportPower.cs" />
+    <Compile Include="Traits\Infiltration\Infiltrates.cs" />
     <Compile Include="Armament.cs" />
     <Compile Include="Widgets\Logic\ObserverShroudSelectorLogic.cs" />
     <Compile Include="Activities\RepairBridge.cs" />
@@ -409,7 +409,6 @@
     <Compile Include="InvulnerabilityUpgrade.cs" />
     <Compile Include="DisableUpgrade.cs" />
     <Compile Include="Warheads\GrantUpgradeWarhead.cs" />
-    <Compile Include="Crates\GrantUpgradeCrateAction.cs" />
     <Compile Include="UpgradeActorsNear.cs" />
     <Compile Include="WithRangeCircle.cs" />
     <Compile Include="Scripting\Properties\TransformProperties.cs" />

OpenRA.Mods.RA/Player/ProductionQueue.cs

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

OpenRA.Mods.RA/Production.cs

@@ -14,12 +14,10 @@ using System.Linq;
 using OpenRA.Activities;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Activities;
-using OpenRA.Mods.RA.Move;
-using OpenRA.Mods.RA.Traits;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.RA.Traits
 {
 	[Desc("This unit has access to build queues.")]
 	public class ProductionInfo : ITraitInfo

OpenRA.Mods.RA/ProductionBar.cs

@@ -11,6 +11,7 @@
 using System;
 using System.Drawing;
 using System.Linq;
+using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA

OpenRA.Mods.RA/ProductionQueueFromSelection.cs

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

OpenRA.Mods.RA/ScaredyCat.cs

@@ -8,10 +8,9 @@
  */
 #endregion
 
-using OpenRA.Mods.RA.Move;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.RA.Traits
 {
 	[Desc("Makes the unit automatically run around when taking damage.")]
 	class ScaredyCatInfo : ITraitInfo

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

@@ -8,7 +8,8 @@
  */
 #endregion
 
-using OpenRA.Mods.RA.Move;
+using OpenRA.Mods.RA.Activities;
+using OpenRA.Mods.RA.Traits;
 using OpenRA.Scripting;
 using OpenRA.Traits;
 
@@ -30,14 +31,14 @@ namespace OpenRA.Mods.RA.Scripting
 			"(in cells) that will be considered close enough to complete the activity.")]
 		public void Move(CPos cell, int closeEnough = 0)
 		{
-			self.QueueActivity(new Move.Move(self, cell, WRange.FromCells(closeEnough)));
+			self.QueueActivity(new Move(self, cell, WRange.FromCells(closeEnough)));
 		}
 
 		[ScriptActorPropertyActivity]
 		[Desc("Moves within the cell grid, ignoring lane biases.")]
 		public void ScriptedMove(CPos cell)
 		{
-			self.QueueActivity(new Move.Move(self, cell));
+			self.QueueActivity(new Move(self, cell));
 		}
 
 		[ScriptActorPropertyActivity]

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

@@ -12,7 +12,7 @@ using System;
 using System.Linq;
 using Eluant;
 using OpenRA.Scripting;
-using OpenRA.Mods.RA.Move;
+using OpenRA.Mods.RA.Traits;
 
 namespace OpenRA.Mods.RA.Scripting
 {

OpenRA.Mods.RA/SpawnMPUnits.cs

@@ -12,11 +12,10 @@ using System;
 using System.Linq;
 using OpenRA.Graphics;
 using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.RA.Move;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.RA.Traits
 {
 	[Desc("Spawn base actor at the spawnpoint and support units in an annulus around the base actor. Both are defined at MPStartUnits. Attach this to the world actor.")]
 	public class SpawnMPUnitsInfo : TraitInfo<SpawnMPUnits>, Requires<MPStartLocationsInfo>, Requires<MPStartUnitsInfo> { }

OpenRA.Mods.RA/Traits/Attack/AttackLeap.cs

@@ -12,7 +12,7 @@ using OpenRA.Activities;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.RA.Traits
 {
 	[Desc("Dogs use this attack model.")]
 	class AttackLeapInfo : AttackFrontalInfo

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

@@ -12,11 +12,10 @@ using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Buildings;
-using OpenRA.Mods.RA.Move;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.RA.Traits
 {
 	class CrateInfo : ITraitInfo, IOccupySpaceInfo, Requires<RenderSpritesInfo>
 	{

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

@@ -13,7 +13,7 @@ using OpenRA.Mods.Common.Effects;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.RA.Traits
 {
 	public class CrateActionInfo : ITraitInfo
 	{

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

@@ -12,11 +12,10 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.RA.Move;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Crates
+namespace OpenRA.Mods.RA.Traits
 {
 	[Desc("Creates duplicates of the actor that collects the crate.")]
 	class DuplicateUnitCrateActionInfo : CrateActionInfo

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

@@ -12,7 +12,7 @@ using System.Linq;
 using OpenRA.GameRules;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.RA.Traits
 {
 	[Desc("Fires a weapon at the location when collected.")]
 	class ExplodeCrateActionInfo : CrateActionInfo

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

@@ -11,7 +11,7 @@
 using OpenRA.Mods.Common.Effects;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.RA.Traits
 {
 	[Desc("Gives cash to the collector.")]
 	class GiveCashCrateActionInfo : CrateActionInfo

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

@@ -8,10 +8,9 @@
  */
 #endregion
 
-using OpenRA.Mods.RA.Traits;
 using System.Linq;
 
-namespace OpenRA.Mods.RA.Crates
+namespace OpenRA.Mods.RA.Traits
 {
 	[Desc("Spawns units when collected.", "Adjust selection shares when player has no base.")]
 	class GiveMcvCrateActionInfo : GiveUnitCrateActionInfo

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

@@ -10,11 +10,10 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using OpenRA.Mods.RA.Move;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Crates
+namespace OpenRA.Mods.RA.Traits
 {
 	[Desc("Spawns units when collected.")]
 	class GiveUnitCrateActionInfo : CrateActionInfo

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

@@ -12,7 +12,7 @@ using System.Linq;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Crates
+namespace OpenRA.Mods.RA.Traits
 {
 	[Desc("Grants an upgrade to the collector.")]
 	public class GrantUpgradeCrateActionInfo : CrateActionInfo

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

@@ -11,7 +11,7 @@
 using System.Linq;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Crates
+namespace OpenRA.Mods.RA.Traits
 {
 	[Desc("Heals all actors that belong to the owner of the collector.")]
 	class HealUnitsCrateActionInfo : CrateActionInfo

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

@@ -8,7 +8,7 @@
  */
 #endregion
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.RA.Traits
 {
 	[Desc("Hides the entire map in shroud.")]
 	class HideMapCrateActionInfo : CrateActionInfo

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

@@ -10,7 +10,7 @@
 
 using System.Linq;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.RA.Traits
 {
 	[Desc("Gives experience levels to the collector.")]
 	class LevelUpCrateActionInfo : CrateActionInfo

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

@@ -10,7 +10,7 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.RA.Traits
 {
 	[Desc("Reveals the entire map.")]
 	class RevealMapCrateActionInfo : CrateActionInfo

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

@@ -11,7 +11,7 @@
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Crates
+namespace OpenRA.Mods.RA.Traits
 {
 	[Desc("Gives a supportpower to the collector.")]
 	class SupportPowerCrateActionInfo : CrateActionInfo

OpenRA.Mods.RA/Traits/Harvester.cs

@@ -16,7 +16,6 @@ using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.Common.Orders;
 using OpenRA.Mods.RA.Activities;
-using OpenRA.Mods.RA.Move;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Traits

OpenRA.Mods.RA/Traits/Infiltration/InfiltrateForCash.cs

@@ -12,7 +12,7 @@ using System;
 using OpenRA.Mods.Common.Effects;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Infiltration
+namespace OpenRA.Mods.RA.Traits
 {
 	[Desc("This structure can be infiltrated causing funds to be stolen.")]
 	class InfiltrateForCashInfo : ITraitInfo
@@ -47,4 +47,3 @@ namespace OpenRA.Mods.RA.Infiltration
 		}
 	}
 }
-

OpenRA.Mods.RA/Traits/Infiltration/InfiltrateForExploration.cs

@@ -10,7 +10,7 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Infiltration
+namespace OpenRA.Mods.RA.Traits
 {
 	[Desc("Steal and reset the owner's exploration.")]
 	class InfiltrateForExplorationInfo : TraitInfo<InfiltrateForExploration> { }

OpenRA.Mods.RA/Traits/Infiltration/InfiltrateForPowerOutage.cs

@@ -12,7 +12,7 @@ using System.Linq;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Infiltration
+namespace OpenRA.Mods.RA.Traits
 {
 	class InfiltrateForPowerOutageInfo : ITraitInfo
 	{

OpenRA.Mods.RA/Traits/Infiltration/InfiltrateForSupportPower.cs

@@ -11,7 +11,7 @@
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Infiltration
+namespace OpenRA.Mods.RA.Traits
 {
 	class InfiltrateForSupportPowerInfo : ITraitInfo
 	{

OpenRA.Mods.RA/Traits/Infiltration/Infiltrates.cs

@@ -15,7 +15,7 @@ using OpenRA.Mods.Common.Orders;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Infiltration
+namespace OpenRA.Mods.RA.Traits
 {
 	class InfiltratesInfo : ITraitInfo
 	{

OpenRA.Mods.RA/Traits/LeavesHusk.cs

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

OpenRA.Mods.RA/Traits/MadTank.cs

@@ -16,7 +16,6 @@ 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.Primitives;
 using OpenRA.Traits;
 

OpenRA.Mods.RA/Traits/Mine.cs

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

OpenRA.Mods.RA/Traits/Mobile.cs

@@ -18,7 +18,7 @@ using OpenRA.Mods.RA.Activities;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Move
+namespace OpenRA.Mods.RA.Traits
 {
 	[Flags]
 	public enum CellConditions

OpenRA.Mods.RA/Traits/World/DomainIndex.cs

@@ -13,7 +13,6 @@ using System.Diagnostics;
 using System.Drawing;
 using System.Linq;
 using OpenRA.Graphics;
-using OpenRA.Mods.RA.Move;
 using OpenRA.Traits;
 using OpenRA.Support;
 

OpenRA.Mods.RA/Traits/World/PathFinder.cs

@@ -12,13 +12,12 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using OpenRA.Mods.RA.Traits;
 using OpenRA;
 using OpenRA.Primitives;
 using OpenRA.Support;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Move
+namespace OpenRA.Mods.RA.Traits
 {
 	[Desc("Calculates routes for mobile units based on the A* search algorithm.", " Attach this to the world actor.")]
 	public class PathFinderInfo : ITraitInfo

OpenRA.Mods.RA/Traits/World/PathSearch.cs

@@ -15,7 +15,7 @@ using System.Linq;
 using OpenRA;
 using OpenRA.Primitives;
 
-namespace OpenRA.Mods.RA.Move
+namespace OpenRA.Mods.RA.Traits
 {
 	public sealed class PathSearch : IDisposable
 	{