Move Cloak, HiddenUnderFog, FrozenUnderFog into Mods.RA; Simplify a pile of related stuff.

OpenRA.Mods.RA/Cloak.cs

@@ -0,0 +1,103 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 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 LICENSE.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Drawing;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.RA
+{
+	class CloakInfo : ITraitInfo
+	{
+		public readonly float InitialDelay = .4f;	// seconds
+		public readonly float CloakDelay = 1.2f; // Seconds
+		public readonly string CloakSound = "subshow1.aud";
+		public readonly string UncloakSound = "subshow1.aud";
+
+		public object Create(ActorInitializer init) { return new Cloak(init.self); }
+	}
+
+	public class Cloak : IRenderModifier, INotifyAttack, ITick, INotifyDamage, IVisibilityModifier, IRadarColorModifier
+	{
+		[Sync]
+		int remainingTime;
+		
+		Actor self;
+		public Cloak(Actor self)
+		{
+			remainingTime = (int)(self.Info.Traits.Get<CloakInfo>().InitialDelay * 25);
+			this.self = self;
+		}
+
+		void DoSurface()
+		{
+			if (remainingTime <= 0)
+				OnSurface();
+
+			remainingTime = Math.Max(remainingTime, (int)(self.Info.Traits.Get<CloakInfo>().CloakDelay * 25));
+		}
+
+		public void Attacking(Actor self) { DoSurface(); }
+		public void Damaged(Actor self, AttackInfo e) { DoSurface(); }
+
+		public IEnumerable<Renderable>
+			ModifyRender(Actor self, IEnumerable<Renderable> rs)
+		{
+			if (remainingTime > 0)
+				return rs;
+
+			if (self.Owner == self.World.LocalPlayer)
+				return rs.Select(a => a.WithPalette("shadow"));
+			else
+				return new Renderable[] { };
+		}
+
+		public void Tick(Actor self)
+		{
+			if (remainingTime > 0)
+				if (--remainingTime <= 0)
+					OnDive();
+		}
+
+		void OnSurface()
+		{
+			Sound.Play(self.Info.Traits.Get<CloakInfo>().UncloakSound, self.CenterLocation);
+		}
+
+		void OnDive()
+		{
+			Sound.Play(self.Info.Traits.Get<CloakInfo>().CloakSound, self.CenterLocation);
+		}
+
+		public bool Cloaked { get { return remainingTime == 0; } }
+
+		
+		public bool IsVisible(Actor self)
+		{
+			return !Cloaked || self.Owner == self.World.LocalPlayer;
+		}
+		
+		public Color RadarColorOverride(Actor self)
+		{
+			var c = self.Owner.Color;
+			if (self.Owner == self.World.LocalPlayer && Cloaked)
+				c = Color.FromArgb(128, c);
+			return c;
+		}
+		
+		public void Decloak(int time)
+		{
+			DoSurface();
+			remainingTime = Math.Max(remainingTime, time);
+		}
+	}
+}

OpenRA.Mods.RA/InvisibleToOthers.cs

@@ -9,14 +9,25 @@
 #endregion
 
 using System.Collections.Generic;
+using System.Drawing;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
 {
 	class InvisibleToOthersInfo : TraitInfo<InvisibleToOthers> { }
 
-	class InvisibleToOthers : IRenderModifier
+	class InvisibleToOthers : IRenderModifier, IVisibilityModifier, IRadarColorModifier
 	{
+		public bool IsVisible(Actor self)
+		{
+			return self.Owner == self.World.LocalPlayer;
+		}
+		
+		public Color RadarColorOverride(Actor self)
+		{
+			return Color.FromArgb(128, self.Owner.Color);
+		}
+		
 		public IEnumerable<Renderable> ModifyRender(Actor self, IEnumerable<Renderable> r)
 		{
 			return self.World.LocalPlayer == self.Owner

OpenRA.Mods.RA/Mine.cs

@@ -11,7 +11,6 @@
 using System.Collections.Generic;
 using OpenRA.Traits;
 using OpenRA.Traits.Activities;
-using System.Drawing;
 
 namespace OpenRA.Mods.RA
 {
@@ -25,7 +24,7 @@ namespace OpenRA.Mods.RA
 		public object Create(ActorInitializer init) { return new Mine(init, this); }
 	}
 
-	class Mine : ICrushable, IOccupySpace, IRadarVisibilityModifier, IRadarColorModifier
+	class Mine : ICrushable, IOccupySpace
 	{
 		readonly Actor self;
 		readonly MineInfo info;
@@ -56,16 +55,6 @@ namespace OpenRA.Mods.RA
 		public int2 TopLeft { get { return location; } }
 
 		public IEnumerable<int2> OccupiedCells() { yield return TopLeft; }
-		
-		public bool VisibleOnRadar(Actor self)
-		{
-			return self.Owner == self.World.LocalPlayer;
-		}
-		
-		public Color RadarColorOverride(Actor self)
-		{
-			return Color.FromArgb(128, self.Owner.Color);
-		}
 	}
 
 	/* tag trait for stuff that shouldnt trigger mines */

OpenRA.Mods.RA/Modifiers/FrozenUnderFog.cs

@@ -0,0 +1,48 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 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 LICENSE.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.Linq;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.RA
+{
+	class FrozenUnderFogInfo : ITraitInfo
+	{
+		public object Create(ActorInitializer init) { return new FrozenUnderFog(init.self); }
+	}
+
+	class FrozenUnderFog : IRenderModifier, IVisibilityModifier
+	{
+		Shroud shroud;
+		Renderable[] cache = { };
+
+		public FrozenUnderFog(Actor self)
+		{
+			shroud = self.World.WorldActor.traits.Get<Shroud>();
+		}
+
+		public bool IsVisible(Actor self)
+		{
+			return self.World.LocalPlayer == null
+				|| self.Owner == self.World.LocalPlayer
+				|| self.World.LocalPlayer.Shroud.Disabled
+				|| Shroud.GetVisOrigins(self).Any(o => self.World.Map.IsInMap(o) && shroud.visibleCells[o.X, o.Y] != 0);
+		}
+
+		public IEnumerable<Renderable> ModifyRender(Actor self, IEnumerable<Renderable> r)
+		{
+			if (IsVisible(self))
+				cache = r.ToArray();
+
+			return cache;
+		}
+	}
+}

OpenRA.Mods.RA/Modifiers/HiddenUnderFog.cs

@@ -0,0 +1,44 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 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 LICENSE.
+ */
+#endregion
+
+using System.Collections.Generic;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.RA
+{
+	class HiddenUnderFogInfo : ITraitInfo
+	{
+		public object Create(ActorInitializer init) { return new HiddenUnderFog(init.self); }
+	}
+
+	class HiddenUnderFog : IRenderModifier, IVisibilityModifier
+	{
+		Shroud shroud;
+
+		public HiddenUnderFog(Actor self)
+		{
+			shroud = self.World.WorldActor.traits.Get<Shroud>();
+		}
+
+		public bool IsVisible(Actor self)
+		{
+			return self.World.LocalPlayer == null
+				|| self.Owner == self.World.LocalPlayer
+				|| self.World.LocalPlayer.Shroud.Disabled
+				|| shroud.visibleCells[self.Location.X, self.Location.Y] > 0;
+		}
+
+		static Renderable[] Nothing = { };
+		public IEnumerable<Renderable> ModifyRender(Actor self, IEnumerable<Renderable> r)
+		{
+			return IsVisible(self) ? r : Nothing;
+		}
+	}
+}

OpenRA.Mods.RA/OpenRA.Mods.RA.csproj

@@ -222,6 +222,9 @@
     <Compile Include="ChronoshiftDeploy.cs" />
     <Compile Include="DemoTruck.cs" />
     <Compile Include="Orders\SetChronoTankDestination.cs" />
+    <Compile Include="Cloak.cs" />
+    <Compile Include="Modifiers\FrozenUnderFog.cs" />
+    <Compile Include="Modifiers\HiddenUnderFog.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">