From 2a7318b69f03a40626551392fbd3e4e023233c6d Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Sat, 17 Aug 2013 17:31:46 +1200
Subject: [PATCH] Add GPSDot for RA structures. Fixes #3631.

---
 OpenRA.Game/Traits/Player/FrozenActorLayer.cs |   2 +
 OpenRA.Mods.RA/Effects/GpsDot.cs              |  63 +++++++++++-------
 mods/ra/bits/gpsdot.shp                       | Bin 480 -> 555 bytes
 mods/ra/rules/defaults.yaml                   |   3 +
 mods/ra/sequences/misc.yaml                   |   2 +
 5 files changed, 45 insertions(+), 25 deletions(-)

diff --git a/OpenRA.Game/Traits/Player/FrozenActorLayer.cs b/OpenRA.Game/Traits/Player/FrozenActorLayer.cs
index 850d69d865..bbb099ca2d 100755
--- a/OpenRA.Game/Traits/Player/FrozenActorLayer.cs
+++ b/OpenRA.Game/Traits/Player/FrozenActorLayer.cs
@@ -84,6 +84,8 @@ namespace OpenRA.Traits
 			}
 			return Renderables;
 		}
+
+		public bool HasRenderables { get { return Renderables != null; } }
 	}
 
 	public class FrozenActorLayer : IRender, ITick, ISync
diff --git a/OpenRA.Mods.RA/Effects/GpsDot.cs b/OpenRA.Mods.RA/Effects/GpsDot.cs
index 9e9e3e1b34..d336e46b65 100644
--- a/OpenRA.Mods.RA/Effects/GpsDot.cs
+++ b/OpenRA.Mods.RA/Effects/GpsDot.cs
@@ -10,6 +10,7 @@
 
 using System.Collections.Generic;
 using OpenRA.Effects;
+using OpenRA.FileFormats;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
@@ -32,9 +33,12 @@ namespace OpenRA.Mods.RA.Effects
 		GpsDotInfo info;
 		Animation anim;
 
-		GpsWatcher watcher;
-		HiddenUnderFog huf;
-		Spy spy;
+		Lazy<HiddenUnderFog> huf;
+		Lazy<FrozenUnderFog> fuf;
+		Lazy<Spy> spy;
+		Cache<Player, GpsWatcher> watcher;
+		Cache<Player, FrozenActorLayer> frozen;
+
 		bool show = false;
 
 		public GpsDot(Actor self, GpsDotInfo info)
@@ -45,36 +49,45 @@ namespace OpenRA.Mods.RA.Effects
 			anim.PlayRepeating(info.String);
 
 			self.World.AddFrameEndTask(w => w.Add(this));
+
+			huf = Lazy.New(() => self.TraitOrDefault<HiddenUnderFog>());
+			fuf = Lazy.New(() => self.TraitOrDefault<FrozenUnderFog>());
+			spy = Lazy.New(() => self.TraitOrDefault<Spy>());
+			watcher = new Cache<Player, GpsWatcher>(p => p.PlayerActor.Trait<GpsWatcher>());
+			frozen = new Cache<Player, FrozenActorLayer>(p => p.PlayerActor.Trait<FrozenActorLayer>());
+		}
+
+		bool ShouldShowIndicator()
+		{
+			// Can be granted at runtime via a crate, so can't cache
+			var cloak = self.TraitOrDefault<Cloak>();
+			if (cloak != null && cloak.Cloaked)
+				return false;
+
+			if (spy.Value != null && spy.Value.Disguised)
+				return false;
+
+			if (huf.Value != null && !huf.Value.IsVisible(self, self.World.RenderPlayer))
+				return true;
+
+			if (fuf.Value == null)
+				return false;
+
+			var f = frozen[self.World.RenderPlayer].FromID(self.ActorID);
+			return f.Visible && !f.HasRenderables;
 		}
 
-		bool firstTick = true;
 		public void Tick(World world)
 		{
 			if (self.Destroyed)
 				world.AddFrameEndTask(w => w.Remove(this));
 
-			if (!self.IsInWorld || self.Destroyed)
+			show = false;
+			if (!self.IsInWorld || self.Destroyed || self.World.RenderPlayer == null)
 				return;
 
-			// Can be granted at runtime via a crate, so can't cache
-			var cloak = self.TraitOrDefault<Cloak>();
-
-			if (firstTick)
-			{
-				huf = self.TraitOrDefault<HiddenUnderFog>();
-				spy = self.TraitOrDefault<Spy>();
-				firstTick = false;
-			}
-
-			// Can change with the Shroud selector for observers so don't cache.
-			if (self.World.RenderPlayer != null)
-				watcher = self.World.RenderPlayer.PlayerActor.Trait<GpsWatcher>();
-
-			var hasGps = (watcher != null && (watcher.Granted || watcher.GrantedAllies));
-			var hasDot = (huf != null && !huf.IsVisible(self, self.World.RenderPlayer));
-			var dotHidden = (cloak != null && cloak.Cloaked) || (spy != null && spy.Disguised);
-
-			show = hasGps && hasDot && !dotHidden;
+			var gps = watcher[self.World.RenderPlayer];
+			show = (gps.Granted || gps.GrantedAllies) && ShouldShowIndicator();
 		}
 
 		public IEnumerable<IRenderable> Render(WorldRenderer wr)
@@ -82,7 +95,7 @@ namespace OpenRA.Mods.RA.Effects
 			if (!show || self.Destroyed)
 				return SpriteRenderable.None;
 
-			var palette = wr.Palette(info.IndicatorPalettePrefix+self.Owner.InternalName);
+			var palette = wr.Palette(info.IndicatorPalettePrefix + self.Owner.InternalName);
 			return anim.Render(self.CenterPosition, palette);
 		}
 	}
diff --git a/mods/ra/bits/gpsdot.shp b/mods/ra/bits/gpsdot.shp
index cc42692f55ffd940235ce42e13a0483cfc689ba1..40c47ee7ec802ad98d6d05f88ad4f7eb32318b96 100644
GIT binary patch
literal 555
zcmZut+Y!P*2t?;*v<nNc8Gf(;D@n?*0PC<33rHDR7D)6i<gpyXF3VlS<BG@QAu>6>
z62FPJQ`Db{@5CkXes<O#pFJHi)y7)k(15}$)1d^Z>Ol=6kN8O>A$}n7JJxe*XmgED
zLeo;`qK1=#mQ4^zO{Wr$e8)wS@<(+i2rwdOjg55HdKYHqJCdVniR9KI&_a)Y1|ieA
X@j7!lT1x;4iBXBQLuqrB?%-ktc(_T5

literal 480
zcmZus+Y!Pr40A7cTsL4V&OiR?H0cNoz$`4m0E~j9I24kq4>>+dRxU=Yc!-->CEt@@
z$=9Xzx8z6id*Sqf=TT0Tdr`0RG=Ro#_0&RAC*&d45kG51Ge5ETUCUY?Ug$Acct#ph
z^yQLZ<ZFncZ<iB}dgqIz<WI^Z02B?1ra>huV~U929i?%PWNG_F;Ds4}0i*D})DH~^
BJo5km

diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml
index d105ef291a..081acf3827 100644
--- a/mods/ra/rules/defaults.yaml
+++ b/mods/ra/rules/defaults.yaml
@@ -237,6 +237,8 @@
 		Range: 3
 	BodyOrientation:
 	FrozenUnderFog:
+	GpsDot:
+		String:Structure
 
 ^Wall:
 	AppearsOnRadar:
@@ -292,6 +294,7 @@
 	-CapturableBar:
 	FrozenUnderFog:
 		StartsRevealed: true
+	-GpsDot:
 
 ^AmmoBox:
 	Inherits: ^TechBuilding
diff --git a/mods/ra/sequences/misc.yaml b/mods/ra/sequences/misc.yaml
index d8a96aa2c1..f45fe3f9ed 100644
--- a/mods/ra/sequences/misc.yaml
+++ b/mods/ra/sequences/misc.yaml
@@ -394,3 +394,5 @@ gpsdot:
 		Start: 4
 	Harvester:
 		Start: 5
+	Structure:
+		Start: 6