diff --git a/OpenRA.Mods.RA/Effects/Parachute.cs b/OpenRA.Mods.Common/Effects/Parachute.cs similarity index 98% rename from OpenRA.Mods.RA/Effects/Parachute.cs rename to OpenRA.Mods.Common/Effects/Parachute.cs index d3981152f8..d58cbe57a3 100644 --- a/OpenRA.Mods.RA/Effects/Parachute.cs +++ b/OpenRA.Mods.Common/Effects/Parachute.cs @@ -13,10 +13,9 @@ using System.Linq; using OpenRA.Effects; using OpenRA.Graphics; using OpenRA.Mods.Common.Traits; -using OpenRA.Mods.RA.Traits; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Effects +namespace OpenRA.Mods.Common.Effects { public class Parachute : IEffect { diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj index 6e421ed102..60c2d787f1 100644 --- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj +++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj @@ -121,6 +121,7 @@ + @@ -280,6 +281,8 @@ + + diff --git a/OpenRA.Mods.RA/Traits/ParaDrop.cs b/OpenRA.Mods.Common/Traits/ParaDrop.cs similarity index 95% rename from OpenRA.Mods.RA/Traits/ParaDrop.cs rename to OpenRA.Mods.Common/Traits/ParaDrop.cs index 4a99936df5..efd9e34f0c 100644 --- a/OpenRA.Mods.RA/Traits/ParaDrop.cs +++ b/OpenRA.Mods.Common/Traits/ParaDrop.cs @@ -10,12 +10,10 @@ using System; using System.Collections.Generic; -using OpenRA.Mods.Common.Traits; -using OpenRA.Mods.RA.Activities; -using OpenRA.Mods.RA.Effects; +using OpenRA.Mods.Common.Effects; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Traits +namespace OpenRA.Mods.Common.Traits { [Desc("This unit can spawn and eject other actors while flying.")] public class ParaDropInfo : ITraitInfo, Requires diff --git a/OpenRA.Mods.RA/Traits/Parachutable.cs b/OpenRA.Mods.Common/Traits/Parachutable.cs similarity index 97% rename from OpenRA.Mods.RA/Traits/Parachutable.cs rename to OpenRA.Mods.Common/Traits/Parachutable.cs index 682c493f1c..56d20afae1 100644 --- a/OpenRA.Mods.RA/Traits/Parachutable.cs +++ b/OpenRA.Mods.Common/Traits/Parachutable.cs @@ -9,10 +9,9 @@ #endregion using OpenRA.Mods.Common.Effects; -using OpenRA.Mods.Common.Traits; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Traits +namespace OpenRA.Mods.Common.Traits { [Desc("Can be paradropped by a ParaDrop actor.")] class ParachutableInfo : ITraitInfo diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj index 2c5c7a8877..73e5d25c3c 100644 --- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj +++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj @@ -110,11 +110,9 @@ - - @@ -173,7 +171,6 @@ - diff --git a/OpenRA.Mods.RA/Traits/EjectOnDeath.cs b/OpenRA.Mods.RA/Traits/EjectOnDeath.cs index c22cda9607..42b797a9ed 100644 --- a/OpenRA.Mods.RA/Traits/EjectOnDeath.cs +++ b/OpenRA.Mods.RA/Traits/EjectOnDeath.cs @@ -8,6 +8,7 @@ */ #endregion +using OpenRA.Mods.Common.Effects; using OpenRA.Mods.Common.Traits; using OpenRA.Mods.RA.Effects; using OpenRA.Primitives;