move victory conditions

OpenRA.Game/OpenRA.Game.csproj

@@ -86,7 +86,6 @@
     <Compile Include="Traits\Player\ActorGroupProxy.cs" />
     <Compile Include="Traits\Player\PlayerResources.cs" />
     <Compile Include="Traits\Player\TechTreeCache.cs" />
-    <Compile Include="Traits\Player\ConquestVictoryConditions.cs" />
     <Compile Include="Traits\Modifiers\HiddenUnderFog.cs" />
     <Compile Include="Traits\Render\RenderBuilding.cs" />
     <Compile Include="Traits\Render\RenderBuildingTurreted.cs" />

OpenRA.Game/Traits/ConstructionYard.cs

@@ -92,4 +92,9 @@ namespace OpenRA.Traits
 				.GetCost(GetMovementType()) < float.PositiveInfinity;
 		}
 	}
+
+	/* tag trait for "bases": mcv/fact */
+
+	class BaseBuildingInfo : TraitInfo<BaseBuilding> { }
+	class BaseBuilding { }
 }

OpenRA.Mods.RA/ConquestVictoryConditions.cs

@@ -19,8 +19,9 @@
 #endregion
 
 using System.Linq;
+using OpenRA.Traits;
 
-namespace OpenRA.Traits
+namespace OpenRA.Mods.RA
 {
 	class ConquestVictoryConditionsInfo : ITraitInfo
 	{
@@ -68,9 +69,4 @@ namespace OpenRA.Traits
 
 	class MustBeDestroyedInfo : TraitInfo<MustBeDestroyed> { }
 	class MustBeDestroyed { }
-
-	/* tag trait for "bases": mcv/fact */
-
-	class BaseBuildingInfo : TraitInfo<BaseBuilding> { }
-	class BaseBuilding { }
 }

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

@@ -87,6 +87,7 @@
     <Compile Include="Cargo.cs" />
     <Compile Include="CarpetBomb.cs" />
     <Compile Include="Chronoshiftable.cs" />
+    <Compile Include="ConquestVictoryConditions.cs" />
     <Compile Include="Crate.cs" />
     <Compile Include="CrateAction.cs" />
     <Compile Include="CrateDrop.cs" />