Moves traits from Common and Power namespaces to Common.Traits namespace

OpenRA.Mods.Common/Traits/Burns.cs

@@ -9,10 +9,9 @@
 #endregion
 
 using OpenRA.Graphics;
-using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("This actor will play a fire animation over its body and take damage over time.")]
 	class BurnsInfo : ITraitInfo, Requires<RenderSpritesInfo>

OpenRA.Mods.Common/Traits/CustomBuildTimeValue.cs

@@ -10,7 +10,7 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Overrides the build time calculated by actor value.")]
 	public class CustomBuildTimeValueInfo : TraitInfo<CustomBuildTimeValue>

OpenRA.Mods.Common/Traits/CustomSellValue.cs

@@ -10,7 +10,7 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Allow a non-standard sell/repair value to avoid buy-sell exploits.")]
 	public class CustomSellValueInfo : TraitInfo<CustomSellValue>

OpenRA.Mods.Common/Traits/Demolishable.cs

@@ -10,7 +10,7 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Handle demolitions from C4 explosives.")]
 	public class DemolishableInfo : IDemolishableInfo, ITraitInfo

OpenRA.Mods.Common/Traits/Immobile.cs

@@ -12,7 +12,7 @@ using System.Collections.Generic;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	class ImmobileInfo : ITraitInfo, IOccupySpaceInfo
 	{

OpenRA.Mods.Common/Traits/KillsSelf.cs

@@ -0,0 +1,51 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using OpenRA.Effects;
+using OpenRA.Primitives;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.Common.Traits
+{
+	class KillsSelfInfo : UpgradableTraitInfo, ITraitInfo
+	{
+		[Desc("Remove the actor from the world (and destroy it) instead of killing it.")]
+		public readonly bool RemoveInstead = false;
+
+		public object Create(ActorInitializer init) { return new KillsSelf(this); }
+	}
+
+	class KillsSelf : UpgradableTrait<KillsSelfInfo>, INotifyAddedToWorld
+	{
+		public KillsSelf(KillsSelfInfo info)
+			: base(info) { }
+
+		public void AddedToWorld(Actor self)
+		{
+			if (!IsTraitDisabled)
+				UpgradeEnabled(self);
+		}
+
+		protected override void UpgradeEnabled(Actor self)
+		{
+			if (self.IsDead)
+				return;
+
+			if (Info.RemoveInstead || !self.HasTrait<Health>())
+				self.Destroy();
+			else
+				self.Kill(self);
+		}
+	}
+}

OpenRA.Mods.Common/Traits/Modifiers/TimedUpgradeBar.cs

@@ -0,0 +1,58 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System;
+using System.Drawing;
+using System.Linq;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.Common.Traits
+{
+	[Desc("Visualizes the remaining time for an upgrade.")]
+	class TimedUpgradeBarInfo : ITraitInfo, Requires<UpgradeManagerInfo>
+	{
+		[Desc("Upgrade that this bar corresponds to")]
+		public readonly string Upgrade = null;
+
+		public readonly Color Color = Color.Red;
+
+		public object Create(ActorInitializer init) { return new TimedUpgradeBar(init.self, this); }
+	}
+
+	class TimedUpgradeBar : ISelectionBar
+	{
+		readonly TimedUpgradeBarInfo info;
+		readonly Actor self;
+		float value;
+
+		public TimedUpgradeBar(Actor self, TimedUpgradeBarInfo info)
+		{
+			this.self = self;
+			this.info = info;
+
+			self.Trait<UpgradeManager>().RegisterWatcher(info.Upgrade, Update);
+		}
+
+		public void Update(int duration, int remaining)
+		{
+			value = remaining * 1f / duration;
+		}
+
+		public float GetValue()
+		{
+			if (!self.Owner.IsAlliedWith(self.World.RenderPlayer))
+				return 0;
+
+			return value;
+		}
+
+		public Color GetColor() { return info.Color; }
+	}
+}

OpenRA.Mods.Common/Traits/Power/AffectedByPowerOutage.cs

@@ -11,7 +11,7 @@
 using System.Drawing;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common.Power
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Disables the actor when a power outage is triggered (see `InfiltrateForPowerOutage` for more information).")]
 	public class AffectedByPowerOutageInfo : ITraitInfo

OpenRA.Mods.Common/Traits/Power/CanPowerDown.cs

@@ -11,7 +11,7 @@
 using OpenRA.Mods.Common.Effects;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common.Power
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("The player can disable the power individually on this actor.")]
 	public class CanPowerDownInfo : UpgradableTraitInfo, ITraitInfo, Requires<PowerInfo>

OpenRA.Mods.Common/Traits/Power/Player/PowerManager.cs

@@ -12,7 +12,7 @@ using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common.Power
+namespace OpenRA.Mods.Common.Traits
 {
 	public class PowerManagerInfo : ITraitInfo, Requires<DeveloperModeInfo>
 	{

OpenRA.Mods.Common/Traits/Power/Power.cs

@@ -12,7 +12,7 @@ using System;
 using System.Linq;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common.Power
+namespace OpenRA.Mods.Common.Traits
 {
 	public class PowerInfo : UpgradableTraitInfo, ITraitInfo
 	{

OpenRA.Mods.Common/Traits/Power/RequiresPower.cs

@@ -10,7 +10,7 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common.Power
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Needs power to operate.")]
 	class RequiresPowerInfo : ITraitInfo

OpenRA.Mods.Common/Traits/Power/ScalePowerWithHealth.cs

@@ -10,7 +10,7 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common.Power
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Scale power amount with the current health.")]
 	public class ScalePowerWithHealthInfo : ITraitInfo, Requires<PowerInfo>, Requires<HealthInfo>

OpenRA.Mods.Common/Traits/RallyPoint.cs

@@ -11,7 +11,7 @@
 using System.Collections.Generic;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Used to waypoint units after production or repair is finished.")]
 	public class RallyPointInfo : ITraitInfo

OpenRA.Mods.Common/Traits/ShakeOnDeath.cs

@@ -10,7 +10,7 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	public class ShakeOnDeathInfo : ITraitInfo
 	{

OpenRA.Mods.Common/Traits/Sound/SoundOnDamageTransition.cs

@@ -10,7 +10,7 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	public class SoundOnDamageTransitionInfo : ITraitInfo
 	{

OpenRA.Mods.Common/Traits/Upgrades/UpgradableTrait.cs

@@ -0,0 +1,86 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+using System.Collections.Generic;
+using System.Linq;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.Common.Traits
+{
+	/// <summary>Use as base class for *Info to subclass of UpgradableTrait. (See UpgradableTrait.)</summary>
+	public abstract class UpgradableTraitInfo
+	{
+		[Desc("The upgrade types which can enable or disable this trait.")]
+		public readonly string[] UpgradeTypes = { };
+
+		[Desc("The minimum upgrade level at which this trait is enabled.", "Defaults to 0 (enabled by default).")]
+		public readonly int UpgradeMinEnabledLevel = 0;
+
+		[Desc("The maximum upgrade level at which the trait is enabled.",
+			"Defaults to UpgradeMaxAcceptedLevel (enabled for all levels greater than UpgradeMinEnabledLevel).",
+			"Set this to a value smaller than UpgradeMaxAcceptedLevel to disable the trait at higher levels.",
+			"Use UpgradeMaxAcceptedLevel: 2 (1 more) to be able to extend upgrade time.")]
+		public readonly int UpgradeMaxEnabledLevel = int.MaxValue;
+
+		[Desc("The maximum upgrade level that this trait will accept.")]
+		public readonly int UpgradeMaxAcceptedLevel = 1;
+	}
+
+	/// <summary>
+	/// Abstract base for enabling and disabling trait using upgrades.
+	/// Requires basing *Info on UpgradableTraitInfo and using base(info) constructor.
+	/// Note that EnabledByUpgrade is not called at creation even if this starts as enabled.
+	/// </summary>,
+	public abstract class UpgradableTrait<InfoType> : IUpgradable, IDisabledTrait, ISync where InfoType : UpgradableTraitInfo
+	{
+		public readonly InfoType Info;
+		public IEnumerable<string> UpgradeTypes { get { return Info.UpgradeTypes; } }
+		[Sync] public bool IsTraitDisabled { get; private set; }
+
+		public UpgradableTrait(InfoType info)
+		{
+			Info = info;
+			IsTraitDisabled = info.UpgradeTypes != null && info.UpgradeTypes.Length > 0 && info.UpgradeMinEnabledLevel > 0;
+		}
+
+		public bool AcceptsUpgradeLevel(Actor self, string type, int level)
+		{
+			return level > 0 && level <= Info.UpgradeMaxAcceptedLevel;
+		}
+
+		public void UpgradeLevelChanged(Actor self, string type, int oldLevel, int newLevel)
+		{
+			if (!Info.UpgradeTypes.Contains(type))
+				return;
+
+			// Restrict the levels to the allowed range
+			oldLevel = oldLevel.Clamp(0, Info.UpgradeMaxAcceptedLevel);
+			newLevel = newLevel.Clamp(0, Info.UpgradeMaxAcceptedLevel);
+			if (oldLevel == newLevel)
+				return;
+
+			var wasDisabled = IsTraitDisabled;
+			IsTraitDisabled = newLevel < Info.UpgradeMinEnabledLevel || newLevel > Info.UpgradeMaxEnabledLevel;
+			UpgradeLevelChanged(self, oldLevel, newLevel);
+
+			if (IsTraitDisabled != wasDisabled)
+			{
+				if (wasDisabled)
+					UpgradeEnabled(self);
+				else
+					UpgradeDisabled(self);
+			}
+		}
+
+		// Subclasses can add upgrade support by querying IsTraitDisabled and/or overriding these methods.
+		protected virtual void UpgradeLevelChanged(Actor self, int oldLevel, int newLevel) { }
+		protected virtual void UpgradeEnabled(Actor self) { }
+		protected virtual void UpgradeDisabled(Actor self) { }
+	}
+}

OpenRA.Mods.Common/Traits/Upgrades/UpgradeManager.cs

@@ -0,0 +1,161 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using OpenRA.Graphics;
+using OpenRA.Primitives;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.Common.Traits
+{
+	[Desc("Attach this to a unit to enable dynamic upgrades by warheads, experience, crates, support powers, etc.")]
+	public class UpgradeManagerInfo : ITraitInfo
+	{
+		public object Create(ActorInitializer init) { return new UpgradeManager(init); }
+	}
+
+	public class UpgradeManager : ITick
+	{
+		class TimedUpgrade
+		{
+			public readonly string Upgrade;
+			public readonly int Duration;
+			public int Remaining;
+
+			public TimedUpgrade(string upgrade, int duration)
+			{
+				Upgrade = upgrade;
+				Duration = duration;
+				Remaining = duration;
+			}
+
+			public void Tick() { Remaining--; }
+		}
+
+		class UpgradeState
+		{
+			public readonly List<IUpgradable> Traits = new List<IUpgradable>();
+			public readonly List<object> Sources = new List<object>();
+			public readonly List<Action<int, int>> Watchers = new List<Action<int, int>>();
+		}
+
+		readonly List<TimedUpgrade> timedUpgrades = new List<TimedUpgrade>();
+		readonly Lazy<Dictionary<string, UpgradeState>> upgrades;
+		readonly Dictionary<IUpgradable, int> levels = new Dictionary<IUpgradable, int>();
+
+		public UpgradeManager(ActorInitializer init)
+		{
+			upgrades = Exts.Lazy(() =>
+			{
+				var ret = new Dictionary<string, UpgradeState>();
+				foreach (var up in init.self.TraitsImplementing<IUpgradable>())
+					foreach (var t in up.UpgradeTypes)
+						ret.GetOrAdd(t).Traits.Add(up);
+
+				return ret;
+			});
+		}
+
+		public void GrantTimedUpgrade(Actor self, string upgrade, int duration)
+		{
+			var timed = timedUpgrades.FirstOrDefault(u => u.Upgrade == upgrade);
+			if (timed == null)
+			{
+				timed = new TimedUpgrade(upgrade, duration);
+				timedUpgrades.Add(timed);
+				GrantUpgrade(self, upgrade, timed);
+			}
+			else
+				timed.Remaining = Math.Max(duration, timed.Remaining);
+		}
+
+		// Different upgradeable traits may define (a) different level ranges for the same upgrade type,
+		// and (b) multiple upgrade types for the same trait. The unrestricted level for each trait is
+		// tracked independently so that we can can correctly revoke levels without adding the burden of
+		// tracking both the overall (unclamped) and effective (clamped) levels on each individual trait.
+		void NotifyUpgradeLevelChanged(IEnumerable<IUpgradable> traits, Actor self, string upgrade, int levelAdjust)
+		{
+			foreach (var up in traits)
+			{
+				var oldLevel = levels.GetOrAdd(up);
+				var newLevel = levels[up] = oldLevel + levelAdjust;
+
+				// This will internally clamp the levels to its own restricted range
+				up.UpgradeLevelChanged(self, upgrade, oldLevel, newLevel);
+			}
+		}
+
+		int GetOverallLevel(IUpgradable upgradable)
+		{
+			int level;
+			return levels.TryGetValue(upgradable, out level) ? level : 0;
+		}
+
+		public void GrantUpgrade(Actor self, string upgrade, object source)
+		{
+			UpgradeState s;
+			if (!upgrades.Value.TryGetValue(upgrade, out s))
+				return;
+
+			// Track the upgrade source so that the upgrade can be removed without conflicts
+			s.Sources.Add(source);
+
+			NotifyUpgradeLevelChanged(s.Traits, self, upgrade, 1);
+		}
+
+		public void RevokeUpgrade(Actor self, string upgrade, object source)
+		{
+			UpgradeState s;
+			if (!upgrades.Value.TryGetValue(upgrade, out s))
+				return;
+
+			if (!s.Sources.Remove(source))
+				throw new InvalidOperationException("Object <{0}> revoked more levels of upgrade {1} than it granted for {2}.".F(source, upgrade, self));
+
+			NotifyUpgradeLevelChanged(s.Traits, self, upgrade, -1);
+		}
+
+		public bool AcceptsUpgrade(Actor self, string upgrade)
+		{
+			UpgradeState s;
+			if (!upgrades.Value.TryGetValue(upgrade, out s))
+				return false;
+
+			return s.Traits.Any(up => up.AcceptsUpgradeLevel(self, upgrade, GetOverallLevel(up) + 1));
+		}
+
+		public void RegisterWatcher(string upgrade, Action<int, int> action)
+		{
+			UpgradeState s;
+			if (!upgrades.Value.TryGetValue(upgrade, out s))
+				return;
+
+			s.Watchers.Add(action);
+		}
+
+		public void Tick(Actor self)
+		{
+			foreach (var u in timedUpgrades)
+			{
+				u.Tick();
+				if (u.Remaining <= 0)
+					RevokeUpgrade(self, u.Upgrade, u);
+
+				foreach (var a in upgrades.Value[u.Upgrade].Watchers)
+					a(u.Duration, u.Remaining);
+			}
+
+			timedUpgrades.RemoveAll(u => u.Remaining <= 0);
+		}
+	}
+}

OpenRA.Mods.Common/Traits/Valued.cs

@@ -10,7 +10,7 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("How much the unit is worth.")]
 	public class ValuedInfo : TraitInfo<Valued>

OpenRA.Mods.Common/Traits/World/CreateMPPlayers.cs

@@ -12,7 +12,7 @@ using System.Linq;
 using OpenRA.Network;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Attach this to the world actor.")]
 	public class CreateMPPlayersInfo : TraitInfo<CreateMPPlayers> { }

OpenRA.Mods.Common/Traits/World/MPStartLocations.cs

@@ -15,7 +15,7 @@ using OpenRA.Graphics;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	public class MPStartLocationsInfo : TraitInfo<MPStartLocations>
 	{

OpenRA.Mods.Common/Traits/World/MPStartUnits.cs

@@ -10,7 +10,7 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Used by SpawnMPUnits. Attach these to the world actor. You can have multiple variants by adding @suffixes.")]
 	public class MPStartUnitsInfo : TraitInfo<MPStartUnits>

OpenRA.Mods.Common/Traits/World/PaletteFromCurrentTileset.cs

@@ -12,7 +12,7 @@ using OpenRA.FileSystem;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Loads the palette specified in the tileset definition")]
 	class PaletteFromCurrentTilesetInfo : ITraitInfo

OpenRA.Mods.Common/Traits/World/PaletteFromFile.cs

@@ -12,7 +12,7 @@ using OpenRA.FileSystem;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	class PaletteFromFileInfo : ITraitInfo
 	{

OpenRA.Mods.Common/Traits/World/PaletteFromRGBA.cs

@@ -12,7 +12,7 @@ using System.Linq;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Creates a single color palette without any base palette file.")]
 	class PaletteFromRGBAInfo : ITraitInfo

OpenRA.Mods.Common/Traits/World/PlayMusicOnMapLoad.cs

@@ -12,7 +12,7 @@ using System;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	class PlayMusicOnMapLoadInfo : ITraitInfo
 	{

OpenRA.Mods.Common/Traits/World/PlayerPaletteFromCurrentTileset.cs

@@ -12,7 +12,7 @@ using OpenRA.FileSystem;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	class PlayerPaletteFromCurrentTilesetInfo : ITraitInfo
 	{

OpenRA.Mods.Common/Traits/World/RadarPings.cs

@@ -13,7 +13,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	public class RadarPingsInfo : ITraitInfo
 	{

OpenRA.Mods.Common/Traits/World/ResourceClaim.cs

@@ -8,7 +8,7 @@
  */
 #endregion
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	public sealed class ResourceClaim
 	{

OpenRA.Mods.Common/Traits/World/ResourceClaimLayer.cs

@@ -12,7 +12,7 @@ using System.Collections.Generic;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Allows harvesters to coordinate their operations. Attach this to the world actor.")]
 	public sealed class ResourceClaimLayerInfo : TraitInfo<ResourceClaimLayer> { }

OpenRA.Mods.Common/Traits/World/ShroudPalette.cs

@@ -13,7 +13,7 @@ using System.Linq;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Adds the hard-coded shroud palette to the game")]
 	class ShroudPaletteInfo : ITraitInfo

OpenRA.Mods.Common/Traits/World/ShroudRenderer.cs

@@ -12,7 +12,7 @@ using System;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	public class ShroudRendererInfo : ITraitInfo
 	{

OpenRA.Mods.Common/Traits/World/SmudgeLayer.cs

@@ -14,7 +14,7 @@ using OpenRA.Graphics;
 using OpenRA.Mods.Common.Effects;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Attach this to the world actor.", "Order of the layers defines the Z sorting.")]
 	public class SmudgeLayerInfo : ITraitInfo

OpenRA.Mods.Common/Traits/World/SpawnMapActors.cs

@@ -13,7 +13,7 @@ using System.Linq;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Spawns the initial units for each player upon game start.")]
 	public class SpawnMapActorsInfo : TraitInfo<SpawnMapActors> { }

OpenRA.Mods.Common/Traits/World/StartGameNotification.cs

@@ -11,7 +11,7 @@
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	class StartGameNotificationInfo : ITraitInfo
 	{

OpenRA.Mods.Common/Traits/World/TerrainGeometryOverlay.cs

@@ -15,7 +15,7 @@ using System.Linq;
 using OpenRA.Traits;
 using OpenRA.Graphics;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Renders a debug overlay showing the terrain cells. Attach this to the world actor.")]
 	public class TerrainGeometryOverlayInfo : ITraitInfo