diff --git a/OpenRA.Mods.RA/Effects/Rank.cs b/OpenRA.Mods.Common/Effects/Rank.cs similarity index 95% rename from OpenRA.Mods.RA/Effects/Rank.cs rename to OpenRA.Mods.Common/Effects/Rank.cs index eb4d52cd17..e004e7062d 100644 --- a/OpenRA.Mods.RA/Effects/Rank.cs +++ b/OpenRA.Mods.Common/Effects/Rank.cs @@ -11,8 +11,9 @@ using System.Collections.Generic; using OpenRA.Effects; using OpenRA.Graphics; +using OpenRA.Mods.Common.Traits; -namespace OpenRA.Mods.RA.Effects +namespace OpenRA.Mods.Common.Effects { class Rank : IEffect { diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj index c9b4327873..d462dd4a34 100644 --- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj +++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj @@ -75,6 +75,7 @@ + @@ -134,6 +135,9 @@ + + + @@ -284,4 +288,4 @@ cd "$(SolutionDir)" --> - + \ No newline at end of file diff --git a/OpenRA.Mods.RA/GainsExperience.cs b/OpenRA.Mods.Common/Traits/GainsExperience.cs similarity index 96% rename from OpenRA.Mods.RA/GainsExperience.cs rename to OpenRA.Mods.Common/Traits/GainsExperience.cs index 2393252601..a4cf300aaf 100644 --- a/OpenRA.Mods.RA/GainsExperience.cs +++ b/OpenRA.Mods.Common/Traits/GainsExperience.cs @@ -12,12 +12,10 @@ using System; using System.Collections.Generic; using System.Linq; using OpenRA.Mods.Common.Effects; -using OpenRA.Mods.Common.Traits; -using OpenRA.Mods.RA.Effects; using OpenRA.Primitives; using OpenRA.Traits; -namespace OpenRA.Mods.RA +namespace OpenRA.Mods.Common.Traits { [Desc("This actor's experience increases when it has killed a GivesExperience actor.")] public class GainsExperienceInfo : ITraitInfo, Requires @@ -125,7 +123,7 @@ namespace OpenRA.Mods.RA class ExperienceInit : IActorInit { - [FieldFromYamlKey] public readonly int value = 0; + [FieldFromYamlKey] readonly int value; public ExperienceInit() { } public ExperienceInit(int init) { value = init; } public int Value(World world) { return value; } diff --git a/OpenRA.Mods.RA/GivesBounty.cs b/OpenRA.Mods.Common/Traits/GivesBounty.cs similarity index 98% rename from OpenRA.Mods.RA/GivesBounty.cs rename to OpenRA.Mods.Common/Traits/GivesBounty.cs index 447c506b2c..88b7117eb8 100644 --- a/OpenRA.Mods.RA/GivesBounty.cs +++ b/OpenRA.Mods.Common/Traits/GivesBounty.cs @@ -13,7 +13,7 @@ using OpenRA.Mods.Common.Effects; using OpenRA.Mods.Common.Traits; using OpenRA.Traits; -namespace OpenRA.Mods.RA +namespace OpenRA.Mods.Common.Traits { [Desc("You get money for playing this actor.")] class GivesBountyInfo : TraitInfo diff --git a/OpenRA.Mods.RA/GivesExperience.cs b/OpenRA.Mods.Common/Traits/GivesExperience.cs similarity index 96% rename from OpenRA.Mods.RA/GivesExperience.cs rename to OpenRA.Mods.Common/Traits/GivesExperience.cs index d3cb6527ed..82047a6e8b 100644 --- a/OpenRA.Mods.RA/GivesExperience.cs +++ b/OpenRA.Mods.Common/Traits/GivesExperience.cs @@ -8,10 +8,9 @@ */ #endregion -using OpenRA.Mods.Common.Traits; using OpenRA.Traits; -namespace OpenRA.Mods.RA +namespace OpenRA.Mods.Common.Traits { [Desc("This actor gives experience to a GainsExperience actor when they are killed.")] class GivesExperienceInfo : ITraitInfo diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj index dd600f772f..d204fefbed 100644 --- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj +++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj @@ -127,12 +127,10 @@ - - @@ -179,8 +177,6 @@ - - @@ -444,4 +440,4 @@ copy "FuzzyLogicLibrary.dll" "$(SolutionDir)" cd "$(SolutionDir)" - + \ No newline at end of file diff --git a/OpenRA.Mods.RA/Traits/Crates/LevelUpCrateAction.cs b/OpenRA.Mods.RA/Traits/Crates/LevelUpCrateAction.cs index d0b9760717..b9f26edf37 100644 --- a/OpenRA.Mods.RA/Traits/Crates/LevelUpCrateAction.cs +++ b/OpenRA.Mods.RA/Traits/Crates/LevelUpCrateAction.cs @@ -9,6 +9,7 @@ #endregion using System.Linq; +using OpenRA.Mods.Common.Traits; namespace OpenRA.Mods.RA.Traits {