From cd00fdeaccf6069424287066d9249fc00e96ea6d Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Fri, 7 Nov 2014 00:04:16 +0100
Subject: [PATCH] Moves the remaining two ServerTraits and 3 out of 4 Modifiers
 to Mods.Common

---
 .../Modifiers/DisabledOverlay.cs                           | 2 +-
 .../Modifiers/HiddenUnderFog.cs                            | 2 +-
 .../Modifiers/UpgradeOverlay.cs                            | 2 +-
 OpenRA.Mods.Common/OpenRA.Mods.Common.csproj               | 5 +++++
 .../ServerTraits/LobbyCommands.cs                          | 2 +-
 .../ServerTraits/LobbySettingsNotification.cs              | 2 +-
 OpenRA.Mods.RA/Effects/GpsDot.cs                           | 1 +
 OpenRA.Mods.RA/OpenRA.Mods.RA.csproj                       | 7 +------
 8 files changed, 12 insertions(+), 11 deletions(-)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Modifiers/DisabledOverlay.cs (97%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Modifiers/HiddenUnderFog.cs (97%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Modifiers/UpgradeOverlay.cs (98%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/ServerTraits/LobbyCommands.cs (99%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/ServerTraits/LobbySettingsNotification.cs (98%)

diff --git a/OpenRA.Mods.RA/Modifiers/DisabledOverlay.cs b/OpenRA.Mods.Common/Modifiers/DisabledOverlay.cs
similarity index 97%
rename from OpenRA.Mods.RA/Modifiers/DisabledOverlay.cs
rename to OpenRA.Mods.Common/Modifiers/DisabledOverlay.cs
index bce5fbb368..2036ed3b13 100644
--- a/OpenRA.Mods.RA/Modifiers/DisabledOverlay.cs
+++ b/OpenRA.Mods.Common/Modifiers/DisabledOverlay.cs
@@ -12,7 +12,7 @@ using System.Collections.Generic;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common
 {
 	[Desc("Use together with CanPowerDown/RequiresPower on buildings or Husk for vehicles.")]
 	public class DisabledOverlayInfo : TraitInfo<DisabledOverlay> { }
diff --git a/OpenRA.Mods.RA/Modifiers/HiddenUnderFog.cs b/OpenRA.Mods.Common/Modifiers/HiddenUnderFog.cs
similarity index 97%
rename from OpenRA.Mods.RA/Modifiers/HiddenUnderFog.cs
rename to OpenRA.Mods.Common/Modifiers/HiddenUnderFog.cs
index b60e053008..94915d7935 100644
--- a/OpenRA.Mods.RA/Modifiers/HiddenUnderFog.cs
+++ b/OpenRA.Mods.Common/Modifiers/HiddenUnderFog.cs
@@ -13,7 +13,7 @@ using System.Linq;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common
 {
 	[Desc("The actor stays invisible under fog of war.")]
 	public class HiddenUnderFogInfo : TraitInfo<HiddenUnderFog> { }
diff --git a/OpenRA.Mods.RA/Modifiers/UpgradeOverlay.cs b/OpenRA.Mods.Common/Modifiers/UpgradeOverlay.cs
similarity index 98%
rename from OpenRA.Mods.RA/Modifiers/UpgradeOverlay.cs
rename to OpenRA.Mods.Common/Modifiers/UpgradeOverlay.cs
index 2443df4b76..3801461cfa 100644
--- a/OpenRA.Mods.RA/Modifiers/UpgradeOverlay.cs
+++ b/OpenRA.Mods.Common/Modifiers/UpgradeOverlay.cs
@@ -12,7 +12,7 @@ using System.Collections.Generic;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common
 {
 	[Desc("Display a colored overlay when a timed upgrade is active.")]
 	public class UpgradeOverlayInfo : ITraitInfo
diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index cde0c6f705..e2943e07b9 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -76,12 +76,17 @@
     <Compile Include="Graphics\VoxelActorPreview.cs" />
     <Compile Include="Graphics\VoxelRenderable.cs" />
     <Compile Include="ModChooserLoadScreen.cs" />
+    <Compile Include="Modifiers\DisabledOverlay.cs" />
+    <Compile Include="Modifiers\HiddenUnderFog.cs" />
+    <Compile Include="Modifiers\UpgradeOverlay.cs" />
     <Compile Include="Orders\DeployOrderTargeter.cs" />
     <Compile Include="Orders\EnterAlliedActorTargeter.cs" />
     <Compile Include="Orders\UnitOrderTargeter.cs" />
     <Compile Include="PaletteFromFile.cs" />
     <Compile Include="RallyPoint.cs" />
     <Compile Include="ServerTraits\ColorValidator.cs" />
+    <Compile Include="ServerTraits\LobbyCommands.cs" />
+    <Compile Include="ServerTraits\LobbySettingsNotification.cs" />
     <Compile Include="ServerTraits\MasterServerPinger.cs" />
     <Compile Include="ServerTraits\PlayerPinger.cs" />
     <Compile Include="Traits\BlocksBullets.cs" />
diff --git a/OpenRA.Mods.RA/ServerTraits/LobbyCommands.cs b/OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs
similarity index 99%
rename from OpenRA.Mods.RA/ServerTraits/LobbyCommands.cs
rename to OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs
index 67f67140a1..d37251cf7e 100644
--- a/OpenRA.Mods.RA/ServerTraits/LobbyCommands.cs
+++ b/OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs
@@ -19,7 +19,7 @@ using S = OpenRA.Server.Server;
 using OpenRA.Mods.Common.Server;
 using OpenRA.Mods.Common;
 
-namespace OpenRA.Mods.RA.Server
+namespace OpenRA.Mods.Common.Server
 {
 	public class LobbyCommands : ServerTrait, IInterpretCommand, INotifyServerStart
 	{
diff --git a/OpenRA.Mods.RA/ServerTraits/LobbySettingsNotification.cs b/OpenRA.Mods.Common/ServerTraits/LobbySettingsNotification.cs
similarity index 98%
rename from OpenRA.Mods.RA/ServerTraits/LobbySettingsNotification.cs
rename to OpenRA.Mods.Common/ServerTraits/LobbySettingsNotification.cs
index d77dbbfcd2..a229760ffa 100644
--- a/OpenRA.Mods.RA/ServerTraits/LobbySettingsNotification.cs
+++ b/OpenRA.Mods.Common/ServerTraits/LobbySettingsNotification.cs
@@ -13,7 +13,7 @@ using OpenRA.Mods.Common;
 using OpenRA.Network;
 using OpenRA.Server;
 
-namespace OpenRA.Mods.RA.Server
+namespace OpenRA.Mods.Common.Server
 {
 	public class LobbySettingsNotification : ServerTrait, IClientJoined
 	{
diff --git a/OpenRA.Mods.RA/Effects/GpsDot.cs b/OpenRA.Mods.RA/Effects/GpsDot.cs
index 345dfc2a6e..1228c70912 100644
--- a/OpenRA.Mods.RA/Effects/GpsDot.cs
+++ b/OpenRA.Mods.RA/Effects/GpsDot.cs
@@ -12,6 +12,7 @@ using System;
 using System.Collections.Generic;
 using OpenRA.Effects;
 using OpenRA.Graphics;
+using OpenRA.Mods.Common;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index 1de1084be4..5537d0be87 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -230,7 +230,6 @@
     <Compile Include="Mine.cs" />
     <Compile Include="Minelayer.cs" />
     <Compile Include="Modifiers\FrozenUnderFog.cs" />
-    <Compile Include="Modifiers\HiddenUnderFog.cs" />
     <Compile Include="Move\Drag.cs" />
     <Compile Include="Move\Mobile.cs" />
     <Compile Include="Move\Move.cs" />
@@ -305,7 +304,6 @@
     <Compile Include="SeedsResource.cs" />
     <Compile Include="SelfHealing.cs" />
     <Compile Include="Sellable.cs" />
-    <Compile Include="ServerTraits\LobbyCommands.cs" />
     <Compile Include="ShroudPalette.cs" />
     <Compile Include="SmokeTrailWhenDamaged.cs" />
     <Compile Include="SpawnMPUnits.cs" />
@@ -408,7 +406,6 @@
     <Compile Include="Render\WithCrateBody.cs" />
     <Compile Include="Buildings\Demolishable.cs" />
     <Compile Include="Activities\FlyFollow.cs" />
-    <Compile Include="Modifiers\DisabledOverlay.cs" />
     <Compile Include="Widgets\Logic\GameTimerLogic.cs" />
     <Compile Include="Immobile.cs" />
     <Compile Include="Widgets\Logic\ReplayControlBarLogic.cs" />
@@ -480,7 +477,6 @@
     <Compile Include="Player\GlobalUpgradeManager.cs" />
     <Compile Include="GainsStatUpgrades.cs" />
     <Compile Include="Player\Extensions.cs" />
-    <Compile Include="ServerTraits\LobbySettingsNotification.cs" />
     <Compile Include="Warheads\HealthPercentageDamageWarhead.cs" />
     <Compile Include="Warheads\PerCellDamageWarhead.cs" />
     <Compile Include="Warheads\SpreadDamageWarhead.cs" />
@@ -490,7 +486,6 @@
     <Compile Include="Scripting\Properties\HelicopterProperties.cs" />
     <Compile Include="Scripting\Properties\PlaneProperties.cs" />
     <Compile Include="SupportPowers\GrantUpgradePower.cs" />
-    <Compile Include="Modifiers\UpgradeOverlay.cs" />
     <Compile Include="TimedUpgradeBar.cs" />
     <Compile Include="InvulnerabilityUpgrade.cs" />
     <Compile Include="DisableUpgrade.cs" />
@@ -502,9 +497,9 @@
     <Compile Include="UpgradeActorsNear.cs" />
     <Compile Include="WithRangeCircle.cs" />
     <Compile Include="Scripting\Properties\TransformProperties.cs" />
+    <Compile Include="UtilityCommands\ActorStatsExport.cs" />
     <Compile Include="UtilityCommands\ExportCharacterSeparatedRules.cs" />
     <Compile Include="UtilityCommands\Extensions.cs" />
-    <Compile Include="UtilityCommands\ActorStatsExport.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj">