diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj index 999cd8ac3d..1ae2893963 100755 --- a/OpenRA.Game/OpenRA.Game.csproj +++ b/OpenRA.Game/OpenRA.Game.csproj @@ -86,7 +86,6 @@ - diff --git a/OpenRA.Game/Traits/ConstructionYard.cs b/OpenRA.Game/Traits/ConstructionYard.cs index 72bff2d784..58dfaf62d8 100644 --- a/OpenRA.Game/Traits/ConstructionYard.cs +++ b/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 { } + class BaseBuilding { } } diff --git a/OpenRA.Game/Traits/Player/ConquestVictoryConditions.cs b/OpenRA.Mods.RA/ConquestVictoryConditions.cs similarity index 91% rename from OpenRA.Game/Traits/Player/ConquestVictoryConditions.cs rename to OpenRA.Mods.RA/ConquestVictoryConditions.cs index c85f67e6fa..9be1395a75 100644 --- a/OpenRA.Game/Traits/Player/ConquestVictoryConditions.cs +++ b/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 { } class MustBeDestroyed { } - - /* tag trait for "bases": mcv/fact */ - - class BaseBuildingInfo : TraitInfo { } - class BaseBuilding { } } diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj index 80269e5734..664b488efd 100644 --- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj +++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj @@ -87,6 +87,7 @@ +