Moves the remaining two ServerTraits and 3 out of 4 Modifiers to Mods.Common

OpenRA.Mods.Common/Modifiers/DisabledOverlay.cs

@@ -0,0 +1,35 @@
+#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 OpenRA.Graphics;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.Common
+{
+	[Desc("Use together with CanPowerDown/RequiresPower on buildings or Husk for vehicles.")]
+	public class DisabledOverlayInfo : TraitInfo<DisabledOverlay> { }
+
+	public class DisabledOverlay : IRenderModifier
+	{
+		public IEnumerable<IRenderable> ModifyRender(Actor self, WorldRenderer wr, IEnumerable<IRenderable> r)
+		{
+			var disabled = self.IsDisabled();
+			foreach (var a in r)
+			{
+				yield return a;
+				if (disabled && !a.IsDecoration)
+					yield return a.WithPalette(wr.Palette("disabled"))
+						.WithZOffset(a.ZOffset + 1)
+						.AsDecoration();
+			}
+		}
+	}
+}

OpenRA.Mods.Common/Modifiers/HiddenUnderFog.cs

@@ -0,0 +1,33 @@
+#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.Graphics;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.Common
+{
+	[Desc("The actor stays invisible under fog of war.")]
+	public class HiddenUnderFogInfo : TraitInfo<HiddenUnderFog> { }
+
+	public class HiddenUnderFog : IRenderModifier, IVisibilityModifier
+	{
+		public bool IsVisible(Actor self, Player byPlayer)
+		{
+			return byPlayer == null || Shroud.GetVisOrigins(self).Any(o => byPlayer.Shroud.IsVisible(o));
+		}
+
+		public IEnumerable<IRenderable> ModifyRender(Actor self, WorldRenderer wr, IEnumerable<IRenderable> r)
+		{
+			return IsVisible(self, self.World.RenderPlayer) ? r : SpriteRenderable.None;
+		}
+	}
+}

OpenRA.Mods.Common/Modifiers/UpgradeOverlay.cs

@@ -0,0 +1,63 @@
+#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 OpenRA.Graphics;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.Common
+{
+	[Desc("Display a colored overlay when a timed upgrade is active.")]
+	public class UpgradeOverlayInfo : ITraitInfo
+	{
+		[Desc("Upgrade that is required before this overlay is rendered")]
+		public readonly string RequiresUpgrade = null;
+
+		[Desc("Palette to use when rendering the overlay")]
+		public readonly string Palette = "invuln";
+
+		public object Create(ActorInitializer init) { return new UpgradeOverlay(this); }
+	}
+
+	public class UpgradeOverlay : IRenderModifier, IUpgradable
+	{
+		readonly UpgradeOverlayInfo info;
+		bool enabled;
+
+		public UpgradeOverlay(UpgradeOverlayInfo info)
+		{
+			this.info = info;
+		}
+
+		public IEnumerable<IRenderable> ModifyRender(Actor self, WorldRenderer wr, IEnumerable<IRenderable> r)
+		{
+			foreach (var a in r)
+			{
+				yield return a;
+
+				if (enabled && !a.IsDecoration)
+					yield return a.WithPalette(wr.Palette(info.Palette))
+						.WithZOffset(a.ZOffset + 1)
+						.AsDecoration();
+			}
+		}
+
+		public bool AcceptsUpgrade(string type)
+		{
+			return type == info.RequiresUpgrade;
+		}
+
+		public void UpgradeAvailable(Actor self, string type, bool available)
+		{
+			if (type == info.RequiresUpgrade)
+				enabled = available;
+		}
+	}
+}