diff --git a/OpenRA.Mods.RA/Activities/ExternalCaptureActor.cs b/OpenRA.Mods.Common/Activities/ExternalCaptureActor.cs similarity index 95% rename from OpenRA.Mods.RA/Activities/ExternalCaptureActor.cs rename to OpenRA.Mods.Common/Activities/ExternalCaptureActor.cs index c77a412f23..ace8a01f15 100644 --- a/OpenRA.Mods.RA/Activities/ExternalCaptureActor.cs +++ b/OpenRA.Mods.Common/Activities/ExternalCaptureActor.cs @@ -10,12 +10,10 @@ using OpenRA.Activities; using OpenRA.Effects; -using OpenRA.Mods.Common.Activities; using OpenRA.Mods.Common.Traits; -using OpenRA.Mods.RA.Traits; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Activities +namespace OpenRA.Mods.Common.Activities { class ExternalCaptureActor : Activity { diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj index b329e3b195..a37fc65ae2 100644 --- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj +++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj @@ -74,6 +74,7 @@ + @@ -201,6 +202,9 @@ + + + diff --git a/OpenRA.Mods.RA/ExternalCapturable.cs b/OpenRA.Mods.Common/Traits/ExternalCapturable.cs similarity index 97% rename from OpenRA.Mods.RA/ExternalCapturable.cs rename to OpenRA.Mods.Common/Traits/ExternalCapturable.cs index 658f1d9ec2..2ce38578c8 100644 --- a/OpenRA.Mods.RA/ExternalCapturable.cs +++ b/OpenRA.Mods.Common/Traits/ExternalCapturable.cs @@ -9,10 +9,9 @@ #endregion using System.Linq; -using OpenRA.Mods.Common.Traits; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Traits +namespace OpenRA.Mods.Common.Traits { [Desc("This actor can be captured by a unit with ExternalCaptures: trait.")] public class ExternalCapturableInfo : ITraitInfo diff --git a/OpenRA.Mods.RA/ExternalCapturableBar.cs b/OpenRA.Mods.Common/Traits/ExternalCapturableBar.cs similarity index 96% rename from OpenRA.Mods.RA/ExternalCapturableBar.cs rename to OpenRA.Mods.Common/Traits/ExternalCapturableBar.cs index 1884196d2b..cea82c2500 100644 --- a/OpenRA.Mods.RA/ExternalCapturableBar.cs +++ b/OpenRA.Mods.Common/Traits/ExternalCapturableBar.cs @@ -11,7 +11,7 @@ using System.Drawing; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Traits +namespace OpenRA.Mods.Common.Traits { [Desc("Visualize the remaining CaptureCompleteTime from ExternalCapturable: trait.")] class ExternalCapturableBarInfo : ITraitInfo, Requires diff --git a/OpenRA.Mods.RA/ExternalCaptures.cs b/OpenRA.Mods.Common/Traits/ExternalCaptures.cs similarity index 97% rename from OpenRA.Mods.RA/ExternalCaptures.cs rename to OpenRA.Mods.Common/Traits/ExternalCaptures.cs index f095578495..1e1e562728 100644 --- a/OpenRA.Mods.RA/ExternalCaptures.cs +++ b/OpenRA.Mods.Common/Traits/ExternalCaptures.cs @@ -10,12 +10,11 @@ using System.Collections.Generic; using System.Drawing; -using OpenRA.Mods.Common; +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("This actor can capture other actors which have the ExternalCapturable: trait.")] class ExternalCapturesInfo : ITraitInfo diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj index cf7ecbe72b..9129df9763 100644 --- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj +++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj @@ -84,7 +84,6 @@ - @@ -108,10 +107,7 @@ - - -