diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj index c687c7e184..4edd76a40f 100644 --- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj +++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj @@ -82,9 +82,14 @@ + + + + + diff --git a/OpenRA.Mods.RA/BlocksBullets.cs b/OpenRA.Mods.Common/Traits/BlocksBullets.cs similarity index 94% rename from OpenRA.Mods.RA/BlocksBullets.cs rename to OpenRA.Mods.Common/Traits/BlocksBullets.cs index 0709b28e23..2dc94917f2 100644 --- a/OpenRA.Mods.RA/BlocksBullets.cs +++ b/OpenRA.Mods.Common/Traits/BlocksBullets.cs @@ -11,7 +11,7 @@ using System.Linq; using OpenRA.Traits; -namespace OpenRA.Mods.RA +namespace OpenRA.Mods.Common.Traits { //TODO: Add functionality like a customizable Height that is compared to projectile altitude [Desc("This actor blocks bullets and missiles without 'High' property.")] diff --git a/OpenRA.Mods.RA/ActorLostNotification.cs b/OpenRA.Mods.Common/Traits/Sound/ActorLostNotification.cs similarity index 96% rename from OpenRA.Mods.RA/ActorLostNotification.cs rename to OpenRA.Mods.Common/Traits/Sound/ActorLostNotification.cs index bf2e3b9633..7bf6746d83 100644 --- a/OpenRA.Mods.RA/ActorLostNotification.cs +++ b/OpenRA.Mods.Common/Traits/Sound/ActorLostNotification.cs @@ -10,7 +10,7 @@ using OpenRA.Traits; -namespace OpenRA.Mods.RA +namespace OpenRA.Mods.Common.Traits { class ActorLostNotificationInfo : ITraitInfo { diff --git a/OpenRA.Mods.RA/AnnounceOnBuild.cs b/OpenRA.Mods.Common/Traits/Sound/AnnounceOnBuild.cs similarity index 94% rename from OpenRA.Mods.RA/AnnounceOnBuild.cs rename to OpenRA.Mods.Common/Traits/Sound/AnnounceOnBuild.cs index 68c25f0d19..180f7ea13c 100644 --- a/OpenRA.Mods.RA/AnnounceOnBuild.cs +++ b/OpenRA.Mods.Common/Traits/Sound/AnnounceOnBuild.cs @@ -10,7 +10,7 @@ using OpenRA.Traits; -namespace OpenRA.Mods.RA +namespace OpenRA.Mods.Common.Traits { [Desc("Play the Build voice of this actor when trained.")] public class AnnounceOnBuildInfo : TraitInfo { } diff --git a/OpenRA.Mods.RA/AnnounceOnKill.cs b/OpenRA.Mods.Common/Traits/Sound/AnnounceOnKill.cs similarity index 97% rename from OpenRA.Mods.RA/AnnounceOnKill.cs rename to OpenRA.Mods.Common/Traits/Sound/AnnounceOnKill.cs index fc5ef1c245..d5ec7015af 100644 --- a/OpenRA.Mods.RA/AnnounceOnKill.cs +++ b/OpenRA.Mods.Common/Traits/Sound/AnnounceOnKill.cs @@ -10,7 +10,7 @@ using OpenRA.Traits; -namespace OpenRA.Mods.RA +namespace OpenRA.Mods.Common.Traits { [Desc("Play the Kill voice of this actor when eliminating enemies.")] public class AnnounceOnKillInfo : ITraitInfo diff --git a/OpenRA.Mods.RA/DeathSounds.cs b/OpenRA.Mods.Common/Traits/Sound/DeathSounds.cs similarity index 97% rename from OpenRA.Mods.RA/DeathSounds.cs rename to OpenRA.Mods.Common/Traits/Sound/DeathSounds.cs index 7f7bf60435..f87bc59b4b 100644 --- a/OpenRA.Mods.RA/DeathSounds.cs +++ b/OpenRA.Mods.Common/Traits/Sound/DeathSounds.cs @@ -11,7 +11,7 @@ using System.Linq; using OpenRA.Traits; -namespace OpenRA.Mods.RA +namespace OpenRA.Mods.Common.Traits { [Desc("Sounds to play when killed.")] public class DeathSoundsInfo : ITraitInfo diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj index 346f772b98..3c37b073ca 100644 --- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj +++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj @@ -112,7 +112,6 @@ - @@ -147,8 +146,6 @@ - - @@ -182,7 +179,6 @@ - @@ -209,7 +205,6 @@ - @@ -567,4 +562,4 @@ copy "FuzzyLogicLibrary.dll" "$(SolutionDir)" cd "$(SolutionDir)" - \ No newline at end of file +