Merge pull request #6894 from reaperrr/common06

Moved a few start location/spawn traits to Mods.Common

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

@@ -123,11 +123,15 @@
     <Compile Include="Widgets\MenuButtonWidget.cs" />
     <Compile Include="Widgets\RadarWidget.cs" />
     <Compile Include="Widgets\ResourceBarWidget.cs" />
+    <Compile Include="World\CreateMPPlayers.cs" />
+    <Compile Include="World\MPStartLocations.cs" />
+    <Compile Include="World\MPStartUnits.cs" />
     <Compile Include="World\PlayMusicOnMapLoad.cs" />
     <Compile Include="World\RadarPings.cs" />
     <Compile Include="World\ResourceClaim.cs" />
     <Compile Include="World\ResourceClaimLayer.cs" />
     <Compile Include="World\SmudgeLayer.cs" />
+    <Compile Include="World\SpawnMapActors.cs" />
     <Compile Include="SpriteLoaders\ShpTDLoader.cs" />
     <Compile Include="SpriteLoaders\ShpTSLoader.cs" />
     <Compile Include="SpriteLoaders\TmpRALoader.cs" />

OpenRA.Mods.Common/World/CreateMPPlayers.cs

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

OpenRA.Mods.Common/World/MPStartLocations.cs

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

OpenRA.Mods.Common/World/MPStartUnits.cs

@@ -10,7 +10,7 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common
 {
 	[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/World/SpawnMapActors.cs

@@ -13,7 +13,7 @@ using System.Linq;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common
 {
 	public class SpawnMapActorsInfo : TraitInfo<SpawnMapActors> { }
 

OpenRA.Mods.D2k/Render/WithCrumbleOverlay.cs

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

OpenRA.Mods.RA/Activities/Transform.cs

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

OpenRA.Mods.RA/Attack/AttackPopupTurreted.cs

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

OpenRA.Mods.RA/Buildings/Building.cs

@@ -13,6 +13,7 @@ using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Primitives;
 using OpenRA.Traits;
+using OpenRA.Mods.Common;
 using OpenRA.Mods.RA.Render;
 
 namespace OpenRA.Mods.RA.Buildings

OpenRA.Mods.RA/LeavesHusk.cs

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

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

@@ -203,7 +203,6 @@
     <Compile Include="Crates\LevelUpCrateAction.cs" />
     <Compile Include="Crates\RevealMapCrateAction.cs" />
     <Compile Include="Crates\SupportPowerCrateAction.cs" />
-    <Compile Include="CreateMPPlayers.cs" />
     <Compile Include="Crushable.cs" />
     <Compile Include="DemoTruck.cs" />
     <Compile Include="DetectCloaked.cs" />
@@ -234,7 +233,6 @@
     <Compile Include="Lint\CheckTraitPrerequisites.cs" />
     <Compile Include="Lint\LintBuildablePrerequisites.cs" />
     <Compile Include="MadTank.cs" />
-    <Compile Include="MPStartLocations.cs" />
     <Compile Include="Mine.cs" />
     <Compile Include="Minelayer.cs" />
     <Compile Include="Modifiers\FrozenUnderFog.cs" />
@@ -318,7 +316,6 @@
     <Compile Include="ShroudPalette.cs" />
     <Compile Include="SmokeTrailWhenDamaged.cs" />
     <Compile Include="SpawnMPUnits.cs" />
-    <Compile Include="SpawnMapActors.cs" />
     <Compile Include="Disguise.cs" />
     <Compile Include="StoresResources.cs" />
     <Compile Include="StrategicVictoryConditions.cs" />
@@ -401,7 +398,6 @@
     <Compile Include="Render\WithHarvestAnimation.cs" />
     <Compile Include="Widgets\Logic\SimpleTooltipLogic.cs" />
     <Compile Include="World\DomainIndex.cs" />
-    <Compile Include="MPStartUnits.cs" />
     <Compile Include="Widgets\Logic\WorldTooltipLogic.cs" />
     <Compile Include="Buildings\Bib.cs" />
     <Compile Include="Render\WithIdleOverlay.cs" />

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

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

OpenRA.Mods.RA/Scripting/LuaScript.cs

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

OpenRA.Mods.RA/ServerTraits/LobbyCommands.cs

@@ -17,6 +17,7 @@ using OpenRA.Network;
 using OpenRA.Server;
 using S = OpenRA.Server.Server;
 using OpenRA.Mods.Common.Server;
+using OpenRA.Mods.Common;
 
 namespace OpenRA.Mods.RA.Server
 {

OpenRA.Mods.RA/ServerTraits/LobbySettingsNotification.cs

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

OpenRA.Mods.RA/SpawnMPUnits.cs

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

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

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