Merge pull request #7133 from reaperrr/ra-reorg10

Reorganise Mods.D2k, more reorganisation for Mods.RA

OpenRA.Mods.D2k/Activities/CarryUnit.cs

@@ -11,12 +11,13 @@ using System;
 using System.Drawing;
 using System.Linq;
 using OpenRA.Activities;
+using OpenRA.Mods.D2k.Traits;
 using OpenRA.Mods.RA;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.D2k
+namespace OpenRA.Mods.D2k.Activities
 {
 	public class CarryUnit : Activity
 	{

OpenRA.Mods.D2k/Activities/SwallowActor.cs

@@ -14,10 +14,11 @@ using OpenRA.Activities;
 using OpenRA.GameRules;
 using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Traits;
+using OpenRA.Mods.D2k.Traits;
 using OpenRA.Mods.RA.Move;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.D2k
+namespace OpenRA.Mods.D2k.Activities
 {
 	enum AttackState { Burrowed, EmergingAboveGround, ReturningUnderground }
 

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

@@ -68,32 +68,32 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AttackSwallow.cs" />
+    <Compile Include="Activities\CarryUnit.cs" />
-    <Compile Include="SwallowActor.cs" />
+    <Compile Include="Activities\SwallowActor.cs" />
     <Compile Include="SpriteLoaders\R8Loader.cs" />
+    <Compile Include="Traits\AttackSwallow.cs" />
+    <Compile Include="Traits\AutoCarryall.cs" />
     <Compile Include="Traits\Buildings\DamagedWithoutFoundation.cs" />
+    <Compile Include="Traits\Carryable.cs" />
     <Compile Include="Traits\Render\WithBuildingPlacedOverlay.cs" />
     <Compile Include="Traits\Render\WithCrumbleOverlay.cs" />
-    <Compile Include="Traits\Render\WithProductionOverlay.cs" />
     <Compile Include="Traits\Render\WithDockingOverlay.cs" />
     <Compile Include="Traits\Render\WithDeliveryOverlay.cs" />
+    <Compile Include="Traits\Render\WithProductionOverlay.cs" />
+    <Compile Include="Traits\TemporaryOwnerManager.cs" />
     <Compile Include="Traits\ThrowsShrapnel.cs" />
     <Compile Include="Traits\World\ChooseBuildTabOnSelect.cs" />
-    <Compile Include="Traits\World\PaletteFromR8.cs" />
-    <Compile Include="Traits\World\FogPaletteFromR8.cs" />
     <Compile Include="Traits\World\D2kResourceLayer.cs" />
+    <Compile Include="Traits\World\FogPaletteFromR8.cs" />
+    <Compile Include="Traits\World\PaletteFromR8.cs" />
     <Compile Include="Traits\World\PaletteFromScaledPalette.cs" />
+    <Compile Include="Traits\World\WormManager.cs" />
+    <Compile Include="Warheads\ChangeOwnerWarhead.cs" />
+    <Compile Include="Widgets\BuildPaletteWidget.cs" />
+    <Compile Include="Widgets\Logic\IngameChromeLogic.cs" />
     <Compile Include="Widgets\MoneyBinWidget.cs" />
     <Compile Include="Widgets\SupportPowerBinWidget.cs" />
-    <Compile Include="Widgets\BuildPaletteWidget.cs" />
     <Compile Include="Widgets\SlidingContainerWidget.cs" />
-    <Compile Include="Widgets\Logic\IngameChromeLogic.cs" />
-    <Compile Include="AutoCarryall\AutoCarryall.cs" />
-    <Compile Include="AutoCarryall\Carryable.cs" />
-    <Compile Include="AutoCarryall\CarryUnit.cs" />
-    <Compile Include="WormManager.cs" />
-    <Compile Include="ChangeOwnerWarhead.cs" />
-    <Compile Include="TemporaryOwnerManager.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

OpenRA.Mods.D2k/Traits/AttackSwallow.cs

@@ -8,10 +8,11 @@
  */
 #endregion
 
+using OpenRA.Mods.D2k.Activities;
 using OpenRA.Mods.RA;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.D2k
+namespace OpenRA.Mods.D2k.Traits
 {
 	[Desc("Sandworms use this attack model.")]
 	class AttackSwallowInfo : AttackFrontalInfo

OpenRA.Mods.D2k/Traits/AutoCarryall.cs

@@ -12,12 +12,13 @@ using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Graphics;
 using OpenRA.Mods.Common.Traits;
+using OpenRA.Mods.D2k.Activities;
 using OpenRA.Mods.RA;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.D2k
+namespace OpenRA.Mods.D2k.Traits
 {
 	[Desc("Automatically transports harvesters with the Carryable trait between resource fields and refineries")]
 	public class AutoCarryallInfo : ITraitInfo, Requires<IBodyOrientationInfo>

OpenRA.Mods.D2k/Traits/Carryable.cs

@@ -12,9 +12,10 @@ using System.Linq;
 using OpenRA.Activities;
 using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Traits;
+using OpenRA.Mods.D2k.Activities;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.D2k
+namespace OpenRA.Mods.D2k.Traits
 {
 	[Desc("Can be carried by units with the trait `AutoCarryall`.")]
 	public class CarryableInfo : ITraitInfo

OpenRA.Mods.D2k/Traits/TemporaryOwnerManager.cs

@@ -11,7 +11,7 @@
 using System.Drawing;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.D2k
+namespace OpenRA.Mods.D2k.Traits
 {
 	[Desc("Interacts with the ChangeOwner warhead.",
 		"Displays a bar how long this actor is affected and reverts back to the old owner on temporary changes.")]

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

@@ -16,7 +16,7 @@ using OpenRA.Mods.Common.Traits;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.D2k
+namespace OpenRA.Mods.D2k.Traits
 {
 	[Desc("Controls the spawning of sandworms. Attach this to the world actor.")]
 	class WormManagerInfo : ITraitInfo

OpenRA.Mods.D2k/Warheads/ChangeOwnerWarhead.cs

@@ -10,9 +10,10 @@
 
 using System.Collections.Generic;
 using OpenRA.GameRules;
+using OpenRA.Mods.D2k.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.D2k
+namespace OpenRA.Mods.D2k.Warheads
 {
 	[Desc("Interacts with the DynamicOwnerChange trait.")]
 	public class ChangeOwnerWarhead : Warhead

OpenRA.Mods.RA/Activities/LayMines.cs

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

OpenRA.Mods.RA/Effects/TeslaZap.cs

@@ -12,6 +12,7 @@ using System.Collections.Generic;
 using OpenRA.Effects;
 using OpenRA.GameRules;
 using OpenRA.Graphics;
+using OpenRA.Mods.RA.Graphics;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Effects

OpenRA.Mods.RA/Graphics/TeslaZapRenderable.cs

@@ -13,7 +13,7 @@ using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Graphics;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.RA.Graphics
 {
 	struct TeslaZapRenderable : IRenderable
 	{

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

@@ -97,7 +97,7 @@
     <Compile Include="AI\AttackOrFleeFuzzy.cs" />
     <Compile Include="AI\BaseBuilder.cs" />
     <Compile Include="AI\HackyAI.cs" />
-    <Compile Include="AcceptsSupplies.cs" />
+    <Compile Include="Traits\AcceptsSupplies.cs" />
     <Compile Include="Activities\Attack.cs" />
     <Compile Include="Activities\AttackMoveActivity.cs" />
     <Compile Include="Activities\ExternalCaptureActor.cs" />
@@ -133,7 +133,7 @@
     <Compile Include="Effects\SatelliteLaunch.cs" />
     <Compile Include="Effects\TeslaZap.cs" />
     <Compile Include="Render\RenderUnitReload.cs" />
-    <Compile Include="TeslaZapRenderable.cs" />
+    <Compile Include="Graphics\TeslaZapRenderable.cs" />
     <Compile Include="GainsExperience.cs" />
     <Compile Include="Infiltration\InfiltrateForPowerOutage.cs" />
     <Compile Include="EjectOnDeath.cs" />
@@ -199,8 +199,8 @@
     <Compile Include="Lint\CheckTraitPrerequisites.cs" />
     <Compile Include="Lint\LintBuildablePrerequisites.cs" />
     <Compile Include="Traits\MadTank.cs" />
-    <Compile Include="Mine.cs" />
+    <Compile Include="Traits\Mine.cs" />
-    <Compile Include="Minelayer.cs" />
+    <Compile Include="Traits\Minelayer.cs" />
     <Compile Include="Move\Mobile.cs" />
     <Compile Include="Move\Move.cs" />
     <Compile Include="Move\PathFinder.cs" />
@@ -252,7 +252,7 @@
     <Compile Include="Disguise.cs" />
     <Compile Include="StoresResources.cs" />
     <Compile Include="StrategicVictoryConditions.cs" />
-    <Compile Include="SupplyTruck.cs" />
+    <Compile Include="Traits\SupplyTruck.cs" />
     <Compile Include="SupportPowers\AirstrikePower.cs" />
     <Compile Include="Traits\SupportPowers\ChronoshiftPower.cs" />
     <Compile Include="Traits\SupportPowers\GpsPower.cs" />

OpenRA.Mods.RA/Traits/AcceptsSupplies.cs

@@ -10,7 +10,7 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.RA.Traits
 {
 	[Desc("Tag trait for SupplyTruck: actors.")]
 	class AcceptsSuppliesInfo : TraitInfo<AcceptsSupplies> {}

OpenRA.Mods.RA/Traits/Mine.cs

@@ -12,7 +12,7 @@ using System.Linq;
 using OpenRA.Mods.RA.Move;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.RA.Traits
 {
 	class MineInfo : ITraitInfo, IOccupySpaceInfo
 	{

OpenRA.Mods.RA/Traits/Minelayer.cs

@@ -11,12 +11,12 @@
 using System;
 using System.Linq;
 using System.Collections.Generic;
-using OpenRA.Traits;
 using OpenRA.Graphics;
-using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.Common.Orders;
+using OpenRA.Mods.RA.Activities;
+using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.RA.Traits
 {
 	class MinelayerInfo : ITraitInfo
 	{

OpenRA.Mods.RA/Traits/SupplyTruck.cs

@@ -14,7 +14,7 @@ using OpenRA.Mods.Common.Orders;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.RA.Traits
 {
 	[Desc("Donate money to building if it has the AcceptSupplies: trait.")]
 	class SupplyTruckInfo : ITraitInfo