Moves SupportPowers and related Widgets to Mods.Common

OpenRA.Mods.Cnc/Traits/SupportPowers/IonCannonPower.cs

@@ -10,7 +10,7 @@
 
 using OpenRA.Mods.Cnc.Effects;
 using OpenRA.Mods.Common.Activities;
-using OpenRA.Mods.RA.Traits;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 

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

@@ -289,6 +289,7 @@
     <Compile Include="Traits\Render\RenderSimple.cs" />
     <Compile Include="Traits\Render\RenderSprites.cs" />
     <Compile Include="Traits\Render\RenderUnit.cs" />
+    <Compile Include="Traits\Render\SupportPowerChargeBar.cs" />
     <Compile Include="Traits\Render\TimedUpgradeBar.cs" />
     <Compile Include="Traits\Render\WithBarrel.cs" />
     <Compile Include="Traits\Render\WithBuildingExplosion.cs" />
@@ -326,6 +327,12 @@
     <Compile Include="Traits\Sound\AnnounceOnKill.cs" />
     <Compile Include="Traits\Sound\DeathSounds.cs" />
     <Compile Include="Traits\Sound\SoundOnDamageTransition.cs" />
+    <Compile Include="Traits\SupportPowers\AirstrikePower.cs" />
+    <Compile Include="Traits\SupportPowers\GrantUpgradePower.cs" />
+    <Compile Include="Traits\SupportPowers\NukePower.cs" />
+    <Compile Include="Traits\SupportPowers\SupportPower.cs" />
+    <Compile Include="Traits\SupportPowers\SupportPowerManager.cs" />
+    <Compile Include="Traits\SupportPowers\SpawnActorPower.cs" />
     <Compile Include="Traits\TargetableUnit.cs" />
     <Compile Include="Traits\ThrowsParticle.cs" />
     <Compile Include="Traits\Tooltip.cs" />
@@ -401,13 +408,18 @@
     <Compile Include="Widgets\Logic\Ingame\LoadIngamePlayerOrObserverUILogic.cs" />
     <Compile Include="Widgets\Logic\ModBrowserLogic.cs" />
     <Compile Include="Widgets\Logic\ProductionTooltipLogic.cs" />
+    <Compile Include="Widgets\Logic\SupportPowerTooltipLogic.cs" />
+    <Compile Include="Widgets\Logic\SupportPowerBinLogic.cs" />
     <Compile Include="Widgets\MenuButtonWidget.cs" />
+    <Compile Include="Widgets\ObserverSupportPowerIconsWidget.cs" />
     <Compile Include="Widgets\ProductionPaletteWidget.cs" />
     <Compile Include="Widgets\ProductionTabsWidget.cs" />
     <Compile Include="Widgets\ProductionTypeButtonWidget.cs" />
     <Compile Include="Widgets\RadarWidget.cs" />
     <Compile Include="Widgets\ResourceBarWidget.cs" />
     <Compile Include="Widgets\StrategicProgressWidget.cs" />
+    <Compile Include="Widgets\SupportPowersWidget.cs" />
+    <Compile Include="Widgets\SupportPowerTimerWidget.cs" />
     <Compile Include="SpriteLoaders\ShpTDLoader.cs" />
     <Compile Include="SpriteLoaders\ShpTSLoader.cs" />
     <Compile Include="SpriteLoaders\TmpRALoader.cs" />

OpenRA.Mods.Common/Traits/Render/SupportPowerChargeBar.cs

@@ -12,7 +12,7 @@ using System.Drawing;
 using System.Linq;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Display the time remaining until the super weapon attached to the actor is ready to the player and his allies.")]
 	class SupportPowerChargeBarInfo : ITraitInfo

OpenRA.Mods.Common/Traits/SupportPowers/AirstrikePower.cs

@@ -14,13 +14,12 @@ using System.Linq;
 using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.Common.Effects;
 using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.RA.Activities;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
 {
-	class AirstrikePowerInfo : SupportPowerInfo
+	public class AirstrikePowerInfo : SupportPowerInfo
 	{
 		[ActorReference]
 		public readonly string UnitType = "badr.bomber";
@@ -43,7 +42,7 @@ namespace OpenRA.Mods.RA.Traits
 		public override object Create(ActorInitializer init) { return new AirstrikePower(init.Self, this); }
 	}
 
-	class AirstrikePower : SupportPower
+	public class AirstrikePower : SupportPower
 	{
 		public AirstrikePower(Actor self, AirstrikePowerInfo info)
 			: base(self, info) { }

OpenRA.Mods.Common/Traits/SupportPowers/GrantUpgradePower.cs

@@ -12,10 +12,9 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using OpenRA.Graphics;
-using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
 {
 	class GrantUpgradePowerInfo : SupportPowerInfo
 	{

OpenRA.Mods.Common/Traits/SupportPowers/NukePower.cs

@@ -12,12 +12,10 @@ using System;
 using OpenRA.Effects;
 using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.Common.Effects;
-using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.RA.Activities;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
 {
 	class NukePowerInfo : SupportPowerInfo, Requires<IBodyOrientationInfo>
 	{

OpenRA.Mods.Common/Traits/SupportPowers/SpawnActorPower.cs

@@ -10,11 +10,10 @@
 
 using OpenRA.Effects;
 using OpenRA.Mods.Common.Activities;
-using OpenRA.Mods.RA.Activities;
-using OpenRA.Mods.RA.Effects;
+using OpenRA.Mods.Common.Effects;
 using OpenRA.Primitives;
 
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Spawns an actor that stays for a limited amount of time.")]
 	public class SpawnActorPowerInfo : SupportPowerInfo

OpenRA.Mods.Common/Traits/SupportPowers/SupportPower.cs

@@ -8,10 +8,9 @@
  */
 #endregion
 
-using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
 {
 	public abstract class SupportPowerInfo : ITraitInfo
 	{

OpenRA.Mods.Common/Traits/SupportPowers/SupportPowerManager.cs

@@ -12,10 +12,9 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Graphics;
-using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Attach this to the player actor.")]
 	public class SupportPowerManagerInfo : ITraitInfo, Requires<DeveloperModeInfo>, Requires<TechTreeInfo>

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

@@ -11,7 +11,7 @@
 using System;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class SupportPowerBinLogic
 	{

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

@@ -9,10 +9,10 @@
 #endregion
 
 using System;
-using OpenRA.Mods.RA.Traits;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class SupportPowerTooltipLogic
 	{

OpenRA.Mods.Common/Widgets/ObserverSupportPowerIconsWidget.cs

@@ -13,10 +13,10 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using OpenRA.Graphics;
-using OpenRA.Mods.RA.Traits;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets
+namespace OpenRA.Mods.Common.Widgets
 {
 	public class ObserverSupportPowerIconsWidget : Widget
 	{

OpenRA.Mods.Common/Widgets/SupportPowerTimerWidget.cs

@@ -11,11 +11,11 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
-using OpenRA.Mods.RA.Traits;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Primitives;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets
+namespace OpenRA.Mods.Common.Widgets
 {
 	public class SupportPowerTimerWidget : Widget
 	{

OpenRA.Mods.Common/Widgets/SupportPowersWidget.cs

@@ -13,10 +13,10 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using OpenRA.Graphics;
-using OpenRA.Mods.RA.Traits;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets
+namespace OpenRA.Mods.Common.Widgets
 {
 	public class SupportPowersWidget : Widget
 	{

OpenRA.Mods.D2k/Widgets/SupportPowerBinWidget.cs

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

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

@@ -140,14 +140,9 @@
     <Compile Include="Traits\Render\RenderLandingCraft.cs" />
     <Compile Include="Disguise.cs" />
     <Compile Include="Traits\SupplyTruck.cs" />
-    <Compile Include="SupportPowers\AirstrikePower.cs" />
     <Compile Include="Traits\SupportPowers\ChronoshiftPower.cs" />
     <Compile Include="Traits\SupportPowers\GpsPower.cs" />
     <Compile Include="Traits\SupportPowers\ParatroopersPower.cs" />
-    <Compile Include="SupportPowers\NukePower.cs" />
-    <Compile Include="SupportPowers\SupportPower.cs" />
-    <Compile Include="SupportPowers\SupportPowerChargeBar.cs" />
-    <Compile Include="SupportPowers\SupportPowerManager.cs" />
     <Compile Include="TraitsInterfaces.cs" />
     <Compile Include="Traits\Buildings\Fake.cs" />
     <Compile Include="Traits\Buildings\OreRefinery.cs" />
@@ -183,8 +178,6 @@
     <Compile Include="Widgets\Logic\ServerBrowserLogic.cs" />
     <Compile Include="Widgets\Logic\ServerCreationLogic.cs" />
     <Compile Include="Widgets\ObserverProductionIconsWidget.cs" />
-    <Compile Include="Widgets\ObserverSupportPowerIconsWidget.cs" />
-    <Compile Include="Widgets\SupportPowerTimerWidget.cs" />
     <Compile Include="Widgets\WorldCommandWidget.cs" />
     <Compile Include="Player\BaseAttackNotifier.cs" />
     <Compile Include="Player\HarvesterAttackNotifier.cs" />
@@ -229,7 +222,6 @@
     <Compile Include="Parachutable.cs" />
     <Compile Include="Widgets\Logic\InstallFromCDLogic.cs" />
     <Compile Include="Widgets\Logic\InstallMusicLogic.cs" />
-    <Compile Include="SupportPowers\SpawnActorPower.cs" />
     <Compile Include="Traits\Buildings\ClonesProducedUnits.cs" />
     <Compile Include="Cloneable.cs" />
     <Compile Include="Widgets\Logic\Ingame\IngameCashCounterLogic.cs" />
@@ -238,16 +230,12 @@
     <Compile Include="Widgets\Logic\Ingame\IngameSiloBarLogic.cs" />
     <Compile Include="Widgets\Logic\Ingame\AddRaceSuffixLogic.cs" />
     <Compile Include="Widgets\Logic\ClassicProductionLogic.cs" />
-    <Compile Include="Widgets\SupportPowersWidget.cs" />
-    <Compile Include="Widgets\Logic\SupportPowerTooltipLogic.cs" />
-    <Compile Include="Widgets\Logic\SupportPowerBinLogic.cs" />
     <Compile Include="Widgets\Logic\DebugMenuLogic.cs" />
     <Compile Include="Warheads\PerCellDamageWarhead.cs" />
     <Compile Include="Scripting\Properties\HarvesterProperties.cs" />
     <Compile Include="Scripting\Properties\HelicopterProperties.cs" />
     <Compile Include="Scripting\Properties\PlaneProperties.cs" />
     <Compile Include="Traits\InvulnerabilityUpgrade.cs" />
-    <Compile Include="SupportPowers\GrantUpgradePower.cs" />
     <Compile Include="Scripting\Properties\TransformProperties.cs" />
     <Compile Include="UtilityCommands\ActorStatsExport.cs" />
     <Compile Include="UtilityCommands\ExportCharacterSeparatedRules.cs" />

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

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

OpenRA.Mods.RA/Traits/SupportPowers/ChronoshiftPower.cs

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

OpenRA.Mods.RA/Traits/SupportPowers/GpsPower.cs

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

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

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