Moves traits from Common and Power namespaces to Common.Traits namespace

OpenRA.Mods.Cnc/Traits/PoisonedByTiberium.cs

@@ -11,9 +11,9 @@
 using System.Linq;
 using OpenRA.Traits;
 using OpenRA.Mods.RA;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.GameRules;
-using OpenRA.Mods.Common;
 
 namespace OpenRA.Mods.Cnc.Traits
 {

OpenRA.Mods.Common/CommonTraitsInterfaces.cs

@@ -10,6 +10,7 @@
 
 using System.Collections.Generic;
 using OpenRA.Mods.Common.Graphics;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.Common

OpenRA.Mods.Common/Effects/PowerdownIndicator.cs

@@ -11,7 +11,7 @@
 using System.Collections.Generic;
 using OpenRA.Effects;
 using OpenRA.Graphics;
-using OpenRA.Mods.Common.Power;
+using OpenRA.Mods.Common.Traits;
 
 namespace OpenRA.Mods.Common.Effects
 {

OpenRA.Mods.Common/Effects/RallyPoint.cs

@@ -12,13 +12,14 @@ using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Effects;
 using OpenRA.Graphics;
+using OpenRA.Mods.Common.Traits;
 
 namespace OpenRA.Mods.Common.Effects
 {
 	class RallyPoint : IEffect
 	{
 		readonly Actor building;
-		readonly Common.RallyPoint rp;
+		readonly Common.Traits.RallyPoint rp;
 		readonly string palettePrefix;
 		readonly Animation flag;
 		readonly Animation circles;
@@ -28,7 +29,7 @@ namespace OpenRA.Mods.Common.Effects
 			this.building = building;
 			this.palettePrefix = palettePrefix;
 
-			rp = building.Trait<Common.RallyPoint>();
+			rp = building.Trait<Common.Traits.RallyPoint>();
 
 			flag = new Animation(building.World, "rallypoint");
 			circles = new Animation(building.World, "rallypoint");

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

@@ -80,7 +80,6 @@
     <Compile Include="LoadWidgetAtGameStart.cs" />
     <Compile Include="ModChooserLoadScreen.cs" />
     <Compile Include="NullLoadScreen.cs" />
-    <Compile Include="Modifiers\TimedUpgradeBar.cs" />
     <Compile Include="Orders\DeployOrderTargeter.cs" />
     <Compile Include="Orders\EnterAlliedActorTargeter.cs" />
     <Compile Include="Orders\UnitOrderTargeter.cs" />
@@ -117,8 +116,10 @@
     <Compile Include="Traits\GlobalUpgradable.cs" />
     <Compile Include="Traits\Immobile.cs" />
     <Compile Include="Traits\JamsMissiles.cs" />
+    <Compile Include="Traits\KillsSelf.cs" />
     <Compile Include="Traits\Modifiers\DisabledOverlay.cs" />
     <Compile Include="Traits\Modifiers\HiddenUnderFog.cs" />
+    <Compile Include="Traits\Modifiers\TimedUpgradeBar.cs" />
     <Compile Include="Traits\Modifiers\UpgradeOverlay.cs" />
     <Compile Include="Traits\PaletteEffects\CloakPaletteEffect.cs" />
     <Compile Include="Traits\PaletteEffects\LightPaletteRotator.cs" />
@@ -155,6 +156,8 @@
     <Compile Include="Traits\Sound\AnnounceOnKill.cs" />
     <Compile Include="Traits\Sound\DeathSounds.cs" />
     <Compile Include="Traits\Sound\SoundOnDamageTransition.cs" />
+    <Compile Include="Traits\Upgrades\UpgradableTrait.cs" />
+    <Compile Include="Traits\Upgrades\UpgradeManager.cs" />
     <Compile Include="Traits\Valued.cs" />
     <Compile Include="Traits\World\CreateMPPlayers.cs" />
     <Compile Include="Traits\World\MPStartLocations.cs" />
@@ -173,8 +176,6 @@
     <Compile Include="Traits\World\SpawnMapActors.cs" />
     <Compile Include="Traits\World\StartGameNotification.cs" />
     <Compile Include="Traits\World\TerrainGeometryOverlay.cs" />
-    <Compile Include="Upgrades\UpgradableTrait.cs" />
-    <Compile Include="Upgrades\UpgradeManager.cs" />
     <Compile Include="UtilityCommands\ConvertPngToShpCommand.cs" />
     <Compile Include="UtilityCommands\ConvertSpriteToPngCommand.cs" />
     <Compile Include="UtilityCommands\ExtractFilesCommand.cs" />

OpenRA.Mods.Common/Scripting/Global/ActorGlobal.cs

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

OpenRA.Mods.Common/Scripting/Global/MapGlobal.cs

@@ -11,6 +11,7 @@
 using System;
 using System.Linq;
 using Eluant;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Scripting;
 
 namespace OpenRA.Mods.Common.Scripting

OpenRA.Mods.Common/Scripting/LuaScript.cs

@@ -10,7 +10,7 @@
 
 using System;
 using OpenRA.Graphics;
-using OpenRA.Mods.Common;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Scripting;
 using OpenRA.Traits;
 

OpenRA.Mods.Common/Scripting/Properties/PowerProperties.cs

@@ -12,7 +12,8 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Eluant;
-using OpenRA.Mods.Common.Power;
+using OpenRA.Mods.Common.Traits;
+using PowerTrait = OpenRA.Mods.Common.Traits.Power;
 using OpenRA.Scripting;
 using OpenRA.Traits;
 
@@ -58,12 +59,12 @@ namespace OpenRA.Mods.Common.Scripting
 	[ScriptPropertyGroup("Power")]
 	public class ActorPowerProperties : ScriptActorProperties, Requires<PowerInfo>
 	{
-		readonly IEnumerable<Power.Power> power;
+		readonly IEnumerable<PowerTrait> power;
 
 		public ActorPowerProperties(ScriptContext context, Actor self)
 			: base(context, self)
 		{
-			power = self.TraitsImplementing<Power.Power>();
+			power = self.TraitsImplementing<PowerTrait>();
 		}
 
 		[Desc("Returns the power drained/provided by this actor.")]

OpenRA.Mods.Common/Scripting/Properties/UpgradeProperties.cs

@@ -8,6 +8,7 @@
  */
 #endregion
 
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Scripting;
 using OpenRA.Traits;
 

OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs

@@ -13,11 +13,11 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using OpenRA.Graphics;
+using OpenRA.Mods.Common;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Network;
 using OpenRA.Server;
 using S = OpenRA.Server.Server;
-using OpenRA.Mods.Common.Server;
-using OpenRA.Mods.Common;
 
 namespace OpenRA.Mods.Common.Server
 {

OpenRA.Mods.Common/ServerTraits/LobbySettingsNotification.cs

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

OpenRA.Mods.Common/Traits/Burns.cs

@@ -9,10 +9,9 @@
 #endregion
 
 using OpenRA.Graphics;
-using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("This actor will play a fire animation over its body and take damage over time.")]
 	class BurnsInfo : ITraitInfo, Requires<RenderSpritesInfo>

OpenRA.Mods.Common/Traits/CustomBuildTimeValue.cs

@@ -10,7 +10,7 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Overrides the build time calculated by actor value.")]
 	public class CustomBuildTimeValueInfo : TraitInfo<CustomBuildTimeValue>

OpenRA.Mods.Common/Traits/CustomSellValue.cs

@@ -10,7 +10,7 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Allow a non-standard sell/repair value to avoid buy-sell exploits.")]
 	public class CustomSellValueInfo : TraitInfo<CustomSellValue>

OpenRA.Mods.Common/Traits/Demolishable.cs

@@ -10,7 +10,7 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Handle demolitions from C4 explosives.")]
 	public class DemolishableInfo : IDemolishableInfo, ITraitInfo

OpenRA.Mods.Common/Traits/Immobile.cs

@@ -12,7 +12,7 @@ using System.Collections.Generic;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	class ImmobileInfo : ITraitInfo, IOccupySpaceInfo
 	{

OpenRA.Mods.Common/Traits/KillsSelf.cs

@@ -13,11 +13,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using OpenRA.Effects;
-using OpenRA.Mods.Common;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common.Traits
 {
 	class KillsSelfInfo : UpgradableTraitInfo, ITraitInfo
 	{

OpenRA.Mods.Common/Traits/Modifiers/TimedUpgradeBar.cs

@@ -13,7 +13,7 @@ using System.Drawing;
 using System.Linq;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Visualizes the remaining time for an upgrade.")]
 	class TimedUpgradeBarInfo : ITraitInfo, Requires<UpgradeManagerInfo>

OpenRA.Mods.Common/Traits/Power/AffectedByPowerOutage.cs

@@ -11,7 +11,7 @@
 using System.Drawing;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common.Power
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Disables the actor when a power outage is triggered (see `InfiltrateForPowerOutage` for more information).")]
 	public class AffectedByPowerOutageInfo : ITraitInfo

OpenRA.Mods.Common/Traits/Power/CanPowerDown.cs

@@ -11,7 +11,7 @@
 using OpenRA.Mods.Common.Effects;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common.Power
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("The player can disable the power individually on this actor.")]
 	public class CanPowerDownInfo : UpgradableTraitInfo, ITraitInfo, Requires<PowerInfo>

OpenRA.Mods.Common/Traits/Power/Player/PowerManager.cs

@@ -12,7 +12,7 @@ using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common.Power
+namespace OpenRA.Mods.Common.Traits
 {
 	public class PowerManagerInfo : ITraitInfo, Requires<DeveloperModeInfo>
 	{

OpenRA.Mods.Common/Traits/Power/Power.cs

@@ -12,7 +12,7 @@ using System;
 using System.Linq;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common.Power
+namespace OpenRA.Mods.Common.Traits
 {
 	public class PowerInfo : UpgradableTraitInfo, ITraitInfo
 	{

OpenRA.Mods.Common/Traits/Power/RequiresPower.cs

@@ -10,7 +10,7 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common.Power
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Needs power to operate.")]
 	class RequiresPowerInfo : ITraitInfo

OpenRA.Mods.Common/Traits/Power/ScalePowerWithHealth.cs

@@ -10,7 +10,7 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common.Power
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Scale power amount with the current health.")]
 	public class ScalePowerWithHealthInfo : ITraitInfo, Requires<PowerInfo>, Requires<HealthInfo>

OpenRA.Mods.Common/Traits/RallyPoint.cs

@@ -11,7 +11,7 @@
 using System.Collections.Generic;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Used to waypoint units after production or repair is finished.")]
 	public class RallyPointInfo : ITraitInfo

OpenRA.Mods.Common/Traits/ShakeOnDeath.cs

@@ -10,7 +10,7 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	public class ShakeOnDeathInfo : ITraitInfo
 	{

OpenRA.Mods.Common/Traits/Sound/SoundOnDamageTransition.cs

@@ -10,7 +10,7 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	public class SoundOnDamageTransitionInfo : ITraitInfo
 	{

OpenRA.Mods.Common/Traits/Upgrades/UpgradableTrait.cs

@@ -11,7 +11,7 @@ using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	/// <summary>Use as base class for *Info to subclass of UpgradableTrait. (See UpgradableTrait.)</summary>
 	public abstract class UpgradableTraitInfo

OpenRA.Mods.Common/Traits/Upgrades/UpgradeManager.cs

@@ -16,7 +16,7 @@ using OpenRA.Graphics;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Attach this to a unit to enable dynamic upgrades by warheads, experience, crates, support powers, etc.")]
 	public class UpgradeManagerInfo : ITraitInfo

OpenRA.Mods.Common/Traits/Valued.cs

@@ -10,7 +10,7 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("How much the unit is worth.")]
 	public class ValuedInfo : TraitInfo<Valued>

OpenRA.Mods.Common/Traits/World/CreateMPPlayers.cs

@@ -12,7 +12,7 @@ using System.Linq;
 using OpenRA.Network;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Attach this to the world actor.")]
 	public class CreateMPPlayersInfo : TraitInfo<CreateMPPlayers> { }

OpenRA.Mods.Common/Traits/World/MPStartLocations.cs

@@ -15,7 +15,7 @@ using OpenRA.Graphics;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	public class MPStartLocationsInfo : TraitInfo<MPStartLocations>
 	{

OpenRA.Mods.Common/Traits/World/MPStartUnits.cs

@@ -10,7 +10,7 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Used by SpawnMPUnits. Attach these to the world actor. You can have multiple variants by adding @suffixes.")]
 	public class MPStartUnitsInfo : TraitInfo<MPStartUnits>

OpenRA.Mods.Common/Traits/World/PaletteFromCurrentTileset.cs

@@ -12,7 +12,7 @@ using OpenRA.FileSystem;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Loads the palette specified in the tileset definition")]
 	class PaletteFromCurrentTilesetInfo : ITraitInfo

OpenRA.Mods.Common/Traits/World/PaletteFromFile.cs

@@ -12,7 +12,7 @@ using OpenRA.FileSystem;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	class PaletteFromFileInfo : ITraitInfo
 	{

OpenRA.Mods.Common/Traits/World/PaletteFromRGBA.cs

@@ -12,7 +12,7 @@ using System.Linq;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Creates a single color palette without any base palette file.")]
 	class PaletteFromRGBAInfo : ITraitInfo

OpenRA.Mods.Common/Traits/World/PlayMusicOnMapLoad.cs

@@ -12,7 +12,7 @@ using System;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	class PlayMusicOnMapLoadInfo : ITraitInfo
 	{

OpenRA.Mods.Common/Traits/World/PlayerPaletteFromCurrentTileset.cs

@@ -12,7 +12,7 @@ using OpenRA.FileSystem;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	class PlayerPaletteFromCurrentTilesetInfo : ITraitInfo
 	{

OpenRA.Mods.Common/Traits/World/RadarPings.cs

@@ -13,7 +13,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	public class RadarPingsInfo : ITraitInfo
 	{

OpenRA.Mods.Common/Traits/World/ResourceClaim.cs

@@ -8,7 +8,7 @@
  */
 #endregion
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	public sealed class ResourceClaim
 	{

OpenRA.Mods.Common/Traits/World/ResourceClaimLayer.cs

@@ -12,7 +12,7 @@ using System.Collections.Generic;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Allows harvesters to coordinate their operations. Attach this to the world actor.")]
 	public sealed class ResourceClaimLayerInfo : TraitInfo<ResourceClaimLayer> { }

OpenRA.Mods.Common/Traits/World/ShroudPalette.cs

@@ -13,7 +13,7 @@ using System.Linq;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Adds the hard-coded shroud palette to the game")]
 	class ShroudPaletteInfo : ITraitInfo

OpenRA.Mods.Common/Traits/World/ShroudRenderer.cs

@@ -12,7 +12,7 @@ using System;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	public class ShroudRendererInfo : ITraitInfo
 	{

OpenRA.Mods.Common/Traits/World/SmudgeLayer.cs

@@ -14,7 +14,7 @@ using OpenRA.Graphics;
 using OpenRA.Mods.Common.Effects;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Attach this to the world actor.", "Order of the layers defines the Z sorting.")]
 	public class SmudgeLayerInfo : ITraitInfo

OpenRA.Mods.Common/Traits/World/SpawnMapActors.cs

@@ -13,7 +13,7 @@ using System.Linq;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Spawns the initial units for each player upon game start.")]
 	public class SpawnMapActorsInfo : TraitInfo<SpawnMapActors> { }

OpenRA.Mods.Common/Traits/World/StartGameNotification.cs

@@ -11,7 +11,7 @@
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	class StartGameNotificationInfo : ITraitInfo
 	{

OpenRA.Mods.Common/Traits/World/TerrainGeometryOverlay.cs

@@ -15,7 +15,7 @@ using System.Linq;
 using OpenRA.Traits;
 using OpenRA.Graphics;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Renders a debug overlay showing the terrain cells. Attach this to the world actor.")]
 	public class TerrainGeometryOverlayInfo : ITraitInfo

OpenRA.Mods.Common/Warheads/LeaveSmudgeWarhead.cs

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

OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs

@@ -15,6 +15,7 @@ using System.IO;
 using System.Linq;
 using OpenRA.FileSystem;
 using OpenRA.Graphics;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Widgets;
 
 namespace OpenRA.Mods.Common.Widgets.Logic

OpenRA.Mods.Common/Widgets/RadarWidget.cs

@@ -12,6 +12,7 @@ using System;
 using System.Drawing;
 using System.Linq;
 using OpenRA.Graphics;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 using OpenRA.Widgets;
 

OpenRA.Mods.D2k/Widgets/BuildPaletteWidget.cs

@@ -14,7 +14,6 @@ using System.Drawing;
 using System.Linq;
 using OpenRA.Graphics;
 using OpenRA.Mods.Common;
-using OpenRA.Mods.Common.Power;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA;
 using OpenRA.Mods.RA.Buildings;

OpenRA.Mods.D2k/Widgets/Logic/IngameChromeLogic.cs

@@ -11,15 +11,14 @@
 using System;
 using System.Drawing;
 using System.Linq;
-using OpenRA.Mods.RA;
-using OpenRA.Mods.Common.Power;
-using OpenRA.Mods.RA.Widgets;
-using OpenRA.Mods.RA.Widgets.Logic;
-using OpenRA.Mods.D2k.Widgets;
-using OpenRA.Traits;
-using OpenRA.Widgets;
 using OpenRA.Mods.Common.Widgets;
 using OpenRA.Mods.Common.Traits;
+using OpenRA.Mods.D2k.Widgets;
+using OpenRA.Mods.RA;
+using OpenRA.Mods.RA.Widgets;
+using OpenRA.Mods.RA.Widgets.Logic;
+using OpenRA.Traits;
+using OpenRA.Widgets;
 
 namespace OpenRA.Mods.D2k.Widgets.Logic
 {

OpenRA.Mods.RA/AI/BaseBuilder.cs

@@ -11,7 +11,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using OpenRA.Mods.Common.Power;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Buildings;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;

OpenRA.Mods.RA/AI/HackyAI.cs

@@ -13,11 +13,11 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Mods.Common;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Activities;
-using OpenRA.Mods.RA.Traits;
 using OpenRA.Mods.RA.Buildings;
+using OpenRA.Mods.RA.Traits;
 using OpenRA.Mods.RA.Move;
-using OpenRA.Mods.Common.Power;
 using OpenRA.Primitives;
 using OpenRA.Support;
 using OpenRA.Traits;

OpenRA.Mods.RA/AI/SupportPowerDecision.cs

@@ -13,7 +13,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using OpenRA;
-using OpenRA.Mods.Common;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.AI;
 using OpenRA.Traits;
 

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

@@ -8,7 +8,7 @@
  */
 #endregion
 
-using OpenRA.Mods.Common;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 

OpenRA.Mods.RA/Activities/FindResources.cs

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

OpenRA.Mods.RA/Activities/Repair.cs

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

OpenRA.Mods.RA/Activities/Sell.cs

@@ -8,7 +8,7 @@
  */
 #endregion
 
-using OpenRA.Mods.Common;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.Common.Effects;
 using OpenRA.Traits;
 

OpenRA.Mods.RA/Activities/Transform.cs

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

OpenRA.Mods.RA/Armament.cs

@@ -12,7 +12,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.GameRules;
-using OpenRA.Mods.Common;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 

OpenRA.Mods.RA/Attack/AttackPopupTurreted.cs

@@ -10,7 +10,7 @@
 
 using System.Linq;
 using OpenRA.GameRules;
-using OpenRA.Mods.Common;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Buildings;
 using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;

OpenRA.Mods.RA/Buildings/Building.cs

@@ -11,10 +11,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using OpenRA.Mods.Common;
+using OpenRA.Mods.Common.Traits;
+using OpenRA.Mods.RA.Render;
 using OpenRA.Primitives;
 using OpenRA.Traits;
-using OpenRA.Mods.Common;
-using OpenRA.Mods.RA.Render;
 
 namespace OpenRA.Mods.RA.Buildings
 {

OpenRA.Mods.RA/Buildings/RepairableBuilding.cs

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

OpenRA.Mods.RA/Cargo.cs

@@ -13,10 +13,11 @@ using System.Linq;
 using System.Collections.Generic;
 using OpenRA.Traits;
 using OpenRA.Primitives;
+using OpenRA.Mods.Common.Orders;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Traits;
-using OpenRA.Mods.Common;
-using OpenRA.Mods.Common.Orders;
+
 
 namespace OpenRA.Mods.RA
 {

OpenRA.Mods.RA/Crates/DuplicateUnitCrateAction.cs

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

OpenRA.Mods.RA/Crates/GrantUpgradeCrateAction.cs

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

OpenRA.Mods.RA/DisableUpgrade.cs

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

OpenRA.Mods.RA/EmitInfantryOnSell.cs

@@ -9,7 +9,7 @@
 #endregion
 
 using System.Linq;
-using OpenRA.Mods.Common;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Buildings;
 using OpenRA.Primitives;
 using OpenRA.Traits;

OpenRA.Mods.RA/GainsExperience.cs

@@ -11,7 +11,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using OpenRA.Mods.Common;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.Common.Effects;
 using OpenRA.Mods.RA.Effects;
 using OpenRA.Primitives;

OpenRA.Mods.RA/GivesBounty.cs

@@ -9,7 +9,7 @@
 #endregion
 
 using System.Linq;
-using OpenRA.Mods.Common;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.Common.Effects;
 using OpenRA.Traits;
 

OpenRA.Mods.RA/GivesExperience.cs

@@ -8,7 +8,7 @@
  */
 #endregion
 
-using OpenRA.Mods.Common;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA

OpenRA.Mods.RA/Infiltration/InfiltrateForPowerOutage.cs

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

OpenRA.Mods.RA/InvulnerabilityUpgrade.cs

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

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

@@ -431,7 +431,6 @@
     <Compile Include="SupportPowers\GrantUpgradePower.cs" />
     <Compile Include="InvulnerabilityUpgrade.cs" />
     <Compile Include="DisableUpgrade.cs" />
-    <Compile Include="KillsSelf.cs" />
     <Compile Include="Warheads\GrantUpgradeWarhead.cs" />
     <Compile Include="Crates\GrantUpgradeCrateAction.cs" />
     <Compile Include="UpgradeActorsNear.cs" />

OpenRA.Mods.RA/Orders/GlobalButtonOrderGenerator.cs

@@ -11,7 +11,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Graphics;
-using OpenRA.Mods.Common.Power;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Orders

OpenRA.Mods.RA/Player/BaseAttackNotifier.cs

@@ -9,7 +9,7 @@
 #endregion
 
 using System.Drawing;
-using OpenRA.Mods.Common;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Buildings;
 using OpenRA.Traits;
 

OpenRA.Mods.RA/Player/ClassicProductionQueue.cs

@@ -10,8 +10,6 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using OpenRA.Mods.Common;
-using OpenRA.Mods.Common.Power;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Buildings;
 using OpenRA.Mods.RA.Traits;

OpenRA.Mods.RA/Player/HarvesterAttackNotifier.cs

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

OpenRA.Mods.RA/Player/PlaceBeacon.cs

@@ -8,7 +8,7 @@
  */
 #endregion
 
-using OpenRA.Mods.Common;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.Common.Effects;
 using OpenRA.Traits;
 

OpenRA.Mods.RA/Player/PlayerStatistics.cs

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

OpenRA.Mods.RA/Player/ProductionQueue.cs

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

OpenRA.Mods.RA/Production.cs

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

OpenRA.Mods.RA/Repairable.cs

@@ -11,11 +11,12 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
+using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Orders;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Buildings;
 using OpenRA.Traits;
-using OpenRA.Mods.Common;
 
 namespace OpenRA.Mods.RA
 {

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

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

OpenRA.Mods.RA/SelfHealing.cs

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

OpenRA.Mods.RA/Sellable.cs

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

OpenRA.Mods.RA/SpawnMPUnits.cs

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

OpenRA.Mods.RA/SupportPowers/GrantUpgradePower.cs

@@ -12,7 +12,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using OpenRA.Graphics;
-using OpenRA.Mods.Common;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
 

OpenRA.Mods.RA/SupportPowers/SupportPower.cs

@@ -8,7 +8,7 @@
  */
 #endregion
 
-using OpenRA.Mods.Common;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA

OpenRA.Mods.RA/Traits/Cloak.cs

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

OpenRA.Mods.RA/Traits/Harvester.cs

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

OpenRA.Mods.RA/Traits/LeavesHusk.cs

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

OpenRA.Mods.RA/UpgradeActorsNear.cs

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

OpenRA.Mods.RA/UtilityCommands/ActorStatsExport.cs

@@ -13,7 +13,6 @@ using System.Collections.Generic;
 using System.Data;
 using System.Linq;
 using OpenRA.GameRules;
-using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 

OpenRA.Mods.RA/Warheads/GrantUpgradeWarhead.cs

@@ -13,7 +13,7 @@ using System.Linq;
 using OpenRA.Effects;
 using OpenRA.GameRules;
 using OpenRA.Traits;
-using OpenRA.Mods.Common;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Effects;
 
 namespace OpenRA.Mods.RA

OpenRA.Mods.RA/Widgets/Logic/Ingame/IngamePowerBarLogic.cs

@@ -10,7 +10,7 @@
 
 using System.Drawing;
 using OpenRA.Mods.Common.Widgets;
-using OpenRA.Mods.Common.Power;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Widgets;
 
 namespace OpenRA.Mods.RA.Widgets.Logic

OpenRA.Mods.RA/Widgets/Logic/Ingame/IngamePowerCounterLogic.cs

@@ -10,7 +10,7 @@
 
 using System.Drawing;
 using OpenRA.Mods.Common.Widgets;
-using OpenRA.Mods.Common.Power;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Widgets;
 
 namespace OpenRA.Mods.RA.Widgets.Logic

OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs

@@ -14,7 +14,6 @@ using System.Drawing;
 using System.Linq;
 using System.Threading;
 using OpenRA.Graphics;
-using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.Common.Widgets;
 using OpenRA.Network;