Move Power and PowerdownIndicator effect to Mods.Common

OpenRA.Mods.Common/Effects/PowerdownIndicator.cs

@@ -11,9 +11,9 @@
 using System.Collections.Generic;
 using OpenRA.Effects;
 using OpenRA.Graphics;
-using OpenRA.Mods.RA.Power;
+using OpenRA.Mods.Common.Power;
 
-namespace OpenRA.Mods.RA.Effects
+namespace OpenRA.Mods.Common.Effects
 {
 	class PowerdownIndicator : IEffect
 	{

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

@@ -59,6 +59,7 @@
     <Compile Include="Effects\GravityBomb.cs" />
     <Compile Include="Effects\LaserZap.cs" />
     <Compile Include="Effects\Missile.cs" />
+    <Compile Include="Effects\PowerdownIndicator.cs" />
     <Compile Include="Effects\RallyPoint.cs" />
     <Compile Include="Effects\Smoke.cs" />
     <Compile Include="Commands\ChatCommands.cs" />
@@ -85,6 +86,12 @@
     <Compile Include="Traits\BlocksBullets.cs" />
     <Compile Include="Traits\JamsMissiles.cs" />
     <Compile Include="Traits\ProvidesRadar.cs" />
+    <Compile Include="Traits\Power\AffectedByPowerOutage.cs" />
+    <Compile Include="Traits\Power\CanPowerDown.cs" />
+    <Compile Include="Traits\Power\Player\PowerManager.cs" />
+    <Compile Include="Traits\Power\Power.cs" />
+    <Compile Include="Traits\Power\RequiresPower.cs" />
+    <Compile Include="Traits\Power\ScalePowerWithHealth.cs" />
     <Compile Include="Traits\Render\RenderSprites.cs" />
     <Compile Include="Traits\Sound\ActorLostNotification.cs" />
     <Compile Include="Traits\Sound\AnnounceOnBuild.cs" />

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

@@ -11,7 +11,7 @@
 using System.Drawing;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Power
+namespace OpenRA.Mods.Common.Power
 {
 	public class AffectedByPowerOutageInfo : ITraitInfo
 	{

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

@@ -8,10 +8,10 @@
  */
 #endregion
 
-using OpenRA.Mods.RA.Effects;
+using OpenRA.Mods.Common.Effects;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Power
+namespace OpenRA.Mods.Common.Power
 {
 	[Desc("The player can disable the power individually on this actor.")]
 	public class CanPowerDownInfo : 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.RA.Power
+namespace OpenRA.Mods.Common.Power
 {
 	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.RA.Power
+namespace OpenRA.Mods.Common.Power
 {
 	public class PowerInfo : ITraitInfo
 	{

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

@@ -10,7 +10,7 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Power
+namespace OpenRA.Mods.Common.Power
 {
 	class RequiresPowerInfo : ITraitInfo
 	{

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

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

OpenRA.Mods.D2k/Widgets/BuildPaletteWidget.cs

@@ -16,7 +16,7 @@ using OpenRA.Graphics;
 using OpenRA.Mods.RA;
 using OpenRA.Mods.RA.Buildings;
 using OpenRA.Mods.RA.Orders;
-using OpenRA.Mods.RA.Power;
+using OpenRA.Mods.Common.Power;
 using OpenRA.Mods.RA.Render;
 using OpenRA.Network;
 using OpenRA.Primitives;

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

@@ -12,7 +12,7 @@ using System;
 using System.Drawing;
 using System.Linq;
 using OpenRA.Mods.RA;
-using OpenRA.Mods.RA.Power;
+using OpenRA.Mods.Common.Power;
 using OpenRA.Mods.RA.Widgets;
 using OpenRA.Mods.RA.Widgets.Logic;
 using OpenRA.Mods.D2k.Widgets;

OpenRA.Mods.RA/AI/BaseBuilder.cs

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

OpenRA.Mods.RA/AI/HackyAI.cs

@@ -17,7 +17,7 @@ using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Air;
 using OpenRA.Mods.RA.Buildings;
 using OpenRA.Mods.RA.Move;
-using OpenRA.Mods.RA.Power;
+using OpenRA.Mods.Common.Power;
 using OpenRA.Primitives;
 using OpenRA.Support;
 using OpenRA.Traits;

OpenRA.Mods.RA/Infiltration/InfiltrateForPowerOutage.cs

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

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

@@ -124,8 +124,6 @@
     <Compile Include="TeslaZapRenderable.cs" />
     <Compile Include="GainsExperience.cs" />
     <Compile Include="Infiltration\InfiltrateForPowerOutage.cs" />
-    <Compile Include="Power\AffectedByPowerOutage.cs" />
-    <Compile Include="Power\Power.cs" />
     <Compile Include="Player\PlaceBeacon.cs" />
     <Compile Include="MenuPaletteEffect.cs" />
     <Compile Include="EjectOnDeath.cs" />
@@ -167,15 +165,12 @@
     <Compile Include="CaptureNotification.cs" />
     <Compile Include="Buildings\Building.cs" />
     <Compile Include="Buildings\BuildingInfluence.cs" />
-    <Compile Include="Power\CanPowerDown.cs" />
     <Compile Include="Buildings\CustomSellValue.cs" />
     <Compile Include="Buildings\CustomBuildTimeValue.cs" />
     <Compile Include="Buildings\DeadBuildingState.cs" />
     <Compile Include="Buildings\FootprintUtils.cs" />
     <Compile Include="Buildings\LineBuild.cs" />
-    <Compile Include="Power\Player\PowerManager.cs" />
     <Compile Include="Buildings\RepairableBuilding.cs" />
-    <Compile Include="Power\RequiresPower.cs" />
     <Compile Include="Buildings\ShakeOnDeath.cs" />
     <Compile Include="Buildings\SoundOnDamageTransition.cs" />
     <Compile Include="Buildings\Util.cs" />
@@ -209,7 +204,6 @@
     <Compile Include="Effects\GpsDot.cs" />
     <Compile Include="Effects\NukeLaunch.cs" />
     <Compile Include="Effects\Parachute.cs" />
-    <Compile Include="Effects\PowerdownIndicator.cs" />
     <Compile Include="Effects\RepairIndicator.cs" />
     <Compile Include="EmitInfantryOnSell.cs" />
     <Compile Include="EngineerRepair.cs" />
@@ -265,7 +259,6 @@
     <Compile Include="PortableChrono.cs" />
     <Compile Include="Scripting\Properties\GuardProperties.cs" />
     <Compile Include="Scripting\Properties\PlayerProperties.cs" />
-    <Compile Include="Power\ScalePowerWithHealth.cs" />
     <Compile Include="Warheads\DestroyResourceWarhead.cs" />
     <Compile Include="Warheads\CreateEffectWarhead.cs" />
     <Compile Include="Warheads\CreateResourceWarhead.cs" />

OpenRA.Mods.RA/Orders/PowerDownOrderGenerator.cs

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

OpenRA.Mods.RA/Player/ClassicProductionQueue.cs

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

OpenRA.Mods.RA/Player/ProductionQueue.cs

@@ -12,7 +12,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Mods.RA.Buildings;
-using OpenRA.Mods.RA.Power;
+using OpenRA.Mods.Common.Power;
 using OpenRA.Traits;
 
 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.RA.Power;
+using OpenRA.Mods.Common.Power;
 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.RA.Power;
+using OpenRA.Mods.Common.Power;
 using OpenRA.Widgets;
 
 namespace OpenRA.Mods.RA.Widgets.Logic

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

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

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

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