Dissolve Crates namespace, move CrateActions and Crate trait to Traits/Crates

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/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" />
@@ -165,18 +164,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="Traits\Crates\CrateAction.cs" />
-    <Compile Include="Crates\GiveCashCrateAction.cs" />
+    <Compile Include="Traits\Crates\Crate.cs" />
-    <Compile Include="Crates\GiveMcvCrateAction.cs" />
+    <Compile Include="Traits\Crates\DuplicateUnitCrateAction.cs" />
-    <Compile Include="Crates\GiveUnitCrateAction.cs" />
+    <Compile Include="Traits\Crates\ExplodeCrateAction.cs" />
-    <Compile Include="Crates\HealUnitsCrateAction.cs" />
+    <Compile Include="Traits\Crates\GiveCashCrateAction.cs" />
-    <Compile Include="Crates\HideMapCrateAction.cs" />
+    <Compile Include="Traits\Crates\GiveMcvCrateAction.cs" />
-    <Compile Include="Crates\LevelUpCrateAction.cs" />
+    <Compile Include="Traits\Crates\GiveUnitCrateAction.cs" />
-    <Compile Include="Crates\RevealMapCrateAction.cs" />
+    <Compile Include="Traits\Crates\GrantUpgradeCrateAction.cs" />
-    <Compile Include="Crates\SupportPowerCrateAction.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" />
@@ -409,7 +410,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/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.Traits;
 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.Traits;
 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