diff --git a/OpenRA.Mods.RA/Activities/RepairBridge.cs b/OpenRA.Mods.Common/Activities/RepairBridge.cs similarity index 90% rename from OpenRA.Mods.RA/Activities/RepairBridge.cs rename to OpenRA.Mods.Common/Activities/RepairBridge.cs index e916eee3f2..f2be9db852 100644 --- a/OpenRA.Mods.RA/Activities/RepairBridge.cs +++ b/OpenRA.Mods.Common/Activities/RepairBridge.cs @@ -8,11 +8,10 @@ */ #endregion -using OpenRA.Mods.Common.Activities; -using OpenRA.Mods.RA.Traits; +using OpenRA.Mods.Common.Traits; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Activities +namespace OpenRA.Mods.Common.Activities { class RepairBridge : Enter { diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj index 779933ec0b..4fcb332309 100644 --- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj +++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj @@ -85,6 +85,7 @@ + @@ -177,6 +178,8 @@ + + @@ -277,6 +280,7 @@ + @@ -296,6 +300,7 @@ + diff --git a/OpenRA.Mods.RA/Traits/Buildings/Bridge.cs b/OpenRA.Mods.Common/Traits/Buildings/Bridge.cs similarity index 99% rename from OpenRA.Mods.RA/Traits/Buildings/Bridge.cs rename to OpenRA.Mods.Common/Traits/Buildings/Bridge.cs index 294e113a9c..c48e2ce27f 100644 --- a/OpenRA.Mods.RA/Traits/Buildings/Bridge.cs +++ b/OpenRA.Mods.Common/Traits/Buildings/Bridge.cs @@ -12,13 +12,11 @@ using System; using System.Collections.Generic; using System.Linq; using OpenRA.Effects; -using OpenRA.GameRules; using OpenRA.Graphics; -using OpenRA.Mods.Common.Traits; using OpenRA.Primitives; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Traits +namespace OpenRA.Mods.Common.Traits { class BridgeInfo : ITraitInfo, Requires, Requires { diff --git a/OpenRA.Mods.RA/Traits/Buildings/BridgeHut.cs b/OpenRA.Mods.Common/Traits/Buildings/BridgeHut.cs similarity index 95% rename from OpenRA.Mods.RA/Traits/Buildings/BridgeHut.cs rename to OpenRA.Mods.Common/Traits/Buildings/BridgeHut.cs index c8749909c3..678ca0bf6d 100644 --- a/OpenRA.Mods.RA/Traits/Buildings/BridgeHut.cs +++ b/OpenRA.Mods.Common/Traits/Buildings/BridgeHut.cs @@ -8,12 +8,10 @@ */ #endregion -using System; using System.Linq; -using OpenRA.Mods.Common.Traits; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Traits +namespace OpenRA.Mods.Common.Traits { [Desc("Allows bridges to be targeted for demolition and repair.")] class BridgeHutInfo : IDemolishableInfo, ITraitInfo diff --git a/OpenRA.Mods.RA/Traits/RepairsBridges.cs b/OpenRA.Mods.Common/Traits/RepairsBridges.cs similarity index 97% rename from OpenRA.Mods.RA/Traits/RepairsBridges.cs rename to OpenRA.Mods.Common/Traits/RepairsBridges.cs index 2d6fbaa349..d3bcd9794f 100644 --- a/OpenRA.Mods.RA/Traits/RepairsBridges.cs +++ b/OpenRA.Mods.Common/Traits/RepairsBridges.cs @@ -10,11 +10,11 @@ using System.Collections.Generic; using System.Drawing; +using OpenRA.Mods.Common.Activities; using OpenRA.Mods.Common.Orders; -using OpenRA.Mods.RA.Activities; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Traits +namespace OpenRA.Mods.Common.Traits { [Desc("Can enter a BridgeHut to trigger a repair.")] class RepairsBridgesInfo : TraitInfo { } diff --git a/OpenRA.Mods.RA/Traits/World/BridgeLayer.cs b/OpenRA.Mods.Common/Traits/World/BridgeLayer.cs similarity index 98% rename from OpenRA.Mods.RA/Traits/World/BridgeLayer.cs rename to OpenRA.Mods.Common/Traits/World/BridgeLayer.cs index fa8c094d0b..6c8d663b35 100644 --- a/OpenRA.Mods.RA/Traits/World/BridgeLayer.cs +++ b/OpenRA.Mods.Common/Traits/World/BridgeLayer.cs @@ -14,7 +14,7 @@ using OpenRA.Graphics; using OpenRA.Primitives; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Traits +namespace OpenRA.Mods.Common.Traits { class BridgeLayerInfo : ITraitInfo { diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj index c6db94d7f3..4a37483d54 100644 --- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj +++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj @@ -175,8 +175,6 @@ - - @@ -184,9 +182,7 @@ - - @@ -228,7 +224,6 @@ - @@ -344,5 +339,4 @@ cd "$(SolutionDir)thirdparty/" copy "FuzzyLogicLibrary.dll" "$(SolutionDir)" cd "$(SolutionDir)" - \ No newline at end of file