diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj index 65a2c67cd1..9469a2008a 100644 --- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj +++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj @@ -106,10 +106,13 @@ + + + @@ -141,6 +144,7 @@ + diff --git a/OpenRA.Mods.RA/AppearsOnRadar.cs b/OpenRA.Mods.Common/Traits/AppearsOnRadar.cs old mode 100755 new mode 100644 similarity index 97% rename from OpenRA.Mods.RA/AppearsOnRadar.cs rename to OpenRA.Mods.Common/Traits/AppearsOnRadar.cs index 43ab194a2c..d0c5af178b --- a/OpenRA.Mods.RA/AppearsOnRadar.cs +++ b/OpenRA.Mods.Common/Traits/AppearsOnRadar.cs @@ -13,7 +13,7 @@ using System.Drawing; using System.Linq; using OpenRA.Traits; -namespace OpenRA.Mods.RA +namespace OpenRA.Mods.Common.Traits { public class AppearsOnRadarInfo : ITraitInfo { diff --git a/OpenRA.Mods.RA/Buildings/LineBuild.cs b/OpenRA.Mods.Common/Traits/Buildings/LineBuild.cs old mode 100755 new mode 100644 similarity index 95% rename from OpenRA.Mods.RA/Buildings/LineBuild.cs rename to OpenRA.Mods.Common/Traits/Buildings/LineBuild.cs index bce05a7e88..f7104f600b --- a/OpenRA.Mods.RA/Buildings/LineBuild.cs +++ b/OpenRA.Mods.Common/Traits/Buildings/LineBuild.cs @@ -10,7 +10,7 @@ using OpenRA.Traits; -namespace OpenRA.Mods.RA.Buildings +namespace OpenRA.Mods.Common.Traits { [Desc("Place the second actor in line to build more of the same at once (used for walls).")] public class LineBuildInfo : TraitInfo diff --git a/OpenRA.Mods.RA/Buildings/LineBuildNode.cs b/OpenRA.Mods.Common/Traits/Buildings/LineBuildNode.cs similarity index 94% rename from OpenRA.Mods.RA/Buildings/LineBuildNode.cs rename to OpenRA.Mods.Common/Traits/Buildings/LineBuildNode.cs index e03d1610bd..4beee488f3 100644 --- a/OpenRA.Mods.RA/Buildings/LineBuildNode.cs +++ b/OpenRA.Mods.Common/Traits/Buildings/LineBuildNode.cs @@ -10,7 +10,7 @@ using OpenRA.Traits; -namespace OpenRA.Mods.RA.Buildings +namespace OpenRA.Mods.Common.Traits { [Desc("LineBuild actors attach to LineBuildNodes.")] public class LineBuildNodeInfo : TraitInfo diff --git a/OpenRA.Mods.RA/RadarColorFromTerrain.cs b/OpenRA.Mods.Common/Traits/RadarColorFromTerrain.cs similarity index 96% rename from OpenRA.Mods.RA/RadarColorFromTerrain.cs rename to OpenRA.Mods.Common/Traits/RadarColorFromTerrain.cs index a8541cbe5b..f3c3ba9f9b 100644 --- a/OpenRA.Mods.RA/RadarColorFromTerrain.cs +++ b/OpenRA.Mods.Common/Traits/RadarColorFromTerrain.cs @@ -11,7 +11,7 @@ using System.Drawing; using OpenRA.Traits; -namespace OpenRA.Mods.RA +namespace OpenRA.Mods.Common.Traits { public class RadarColorFromTerrainInfo : ITraitInfo { diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj index c72a2168bc..6f65e2df47 100644 --- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj +++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj @@ -141,7 +141,6 @@ - @@ -157,7 +156,6 @@ - @@ -229,7 +227,6 @@ - @@ -371,7 +368,6 @@ - @@ -479,4 +475,4 @@ copy "FuzzyLogicLibrary.dll" "$(SolutionDir)" cd "$(SolutionDir)" - \ No newline at end of file + diff --git a/OpenRA.Mods.RA/Orders/PlaceBuildingOrderGenerator.cs b/OpenRA.Mods.RA/Orders/PlaceBuildingOrderGenerator.cs index 9659ca659b..595df40712 100644 --- a/OpenRA.Mods.RA/Orders/PlaceBuildingOrderGenerator.cs +++ b/OpenRA.Mods.RA/Orders/PlaceBuildingOrderGenerator.cs @@ -14,6 +14,7 @@ using System.Linq; using OpenRA.Graphics; using OpenRA.Mods.Common; using OpenRA.Mods.Common.Graphics; +using OpenRA.Mods.Common.Traits; using OpenRA.Mods.RA.Buildings; using OpenRA.Mods.RA.Render; using OpenRA.Mods.RA.Traits;