Merge pull request #3020 from pchote/shroud-sanity

Refactor per-player shrouds.

OpenRA.Mods.RA/Buildings/BaseProvider.cs

@@ -60,7 +60,7 @@ namespace OpenRA.Mods.RA.Buildings
 		public void RenderBeforeWorld(WorldRenderer wr, Actor self)
 		{
 			// Visible to player and allies
-			if (self.World.RenderedPlayer != null && self.Owner.Stances[self.World.RenderedPlayer] != Stance.Ally)
+			if (!self.Owner.IsAlliedWith(self.World.RenderPlayer))
 				return;
 
 			wr.DrawRangeCircleWithContrast(
@@ -73,7 +73,7 @@ namespace OpenRA.Mods.RA.Buildings
 		public float GetValue()
 		{
 			// Visible to player and allies
-			if (self.World.RenderedPlayer != null && self.Owner.Stances[self.World.RenderedPlayer] != Stance.Ally)
+			if (!self.Owner.IsAlliedWith(self.World.RenderPlayer))
 				return 0f;
 
 			// Ready or delay disabled

OpenRA.Mods.RA/Buildings/BibLayer.cs

@@ -78,7 +78,7 @@ namespace OpenRA.Mods.RA.Buildings
 			{
 				if (!cliprect.Contains(kv.Key.X, kv.Key.Y))
 					continue;
-				if (!world.RenderedShroud.IsExplored(kv.Key))
+				if (world.ShroudObscures(kv.Key))
 					continue;
 
 				bibSprites[kv.Value.type - 1][kv.Value.index].DrawAt(wr, kv.Key.ToPPos().ToFloat2(), "terrain");

OpenRA.Mods.RA/Cloak.cs

@@ -73,7 +73,7 @@ namespace OpenRA.Mods.RA
 			if (remainingTime > 0)
 				return r;
 
-			if (Cloaked && IsVisible(self.World.RenderedShroud, self))
+			if (Cloaked && IsVisible(self, self.World.RenderPlayer))
 				if (string.IsNullOrEmpty(info.Palette))
 					return r;
 				else
@@ -97,17 +97,12 @@ namespace OpenRA.Mods.RA
 			}
 		}
 		
-		public bool IsVisible(Shroud s, Actor self)
+		public bool IsVisible(Actor self, Player byPlayer)
 		{
-			if (!Cloaked)
+			if (!Cloaked || self.Owner.IsAlliedWith(byPlayer))
 				return true;
 
-			if (s.Observing)
-				return true;
-			if (s.Owner != null)
-				if (self.Owner == s.Owner || self.Owner.Stances[s.Owner] == Stance.Ally)
-					return true;
-
+			// TODO: Change this to be per-player? A cloak detector revealing to everyone is dumb
 			return self.World.ActorsWithTrait<DetectCloaked>().Any(a =>
 				a.Actor.Owner.Stances[self.Owner] != Stance.Ally &&
 				(self.Location - a.Actor.Location).Length < a.Actor.Info.Traits.Get<DetectCloakedInfo>().Range);

OpenRA.Mods.RA/ConquestVictoryConditions.cs

@@ -19,13 +19,17 @@ namespace OpenRA.Mods.RA
 		[Desc("Milliseconds")]
 		public int NotificationDelay = 1500;
 
-		public object Create(ActorInitializer init) { return new ConquestVictoryConditions(this); }
+		public object Create(ActorInitializer init) { return new ConquestVictoryConditions(init.world, this); }
 	}
 
 	public class ConquestVictoryConditions : ITick, IResolveOrder
 	{
 		ConquestVictoryConditionsInfo Info;
-		public ConquestVictoryConditions(ConquestVictoryConditionsInfo info) { Info = info; }
+		public ConquestVictoryConditions(World world, ConquestVictoryConditionsInfo info)
+		{
+			world.ObserveAfterWinOrLose = true;
+			Info = info;
+		}
 
 		public void Tick(Actor self)
 		{
@@ -62,15 +66,12 @@ namespace OpenRA.Mods.RA
 			foreach (var a in self.World.Actors.Where(a => a.Owner == self.Owner))
 				a.Kill(a);
 
-			self.Owner.Shroud.Disabled = true;
 			if (self.Owner == self.World.LocalPlayer)
-			{
 				Game.RunAfterDelay(Info.NotificationDelay, () =>
 				{
 					if (Game.IsCurrentWorld(self.World))
 						Sound.PlayNotification(self.Owner, "Speech", "Lose", self.Owner.Country.Race);
 				});
-			}
 		}
 
 		public void Win(Actor self)
@@ -79,11 +80,8 @@ namespace OpenRA.Mods.RA
 			self.Owner.WinState = WinState.Won;
 
 			Game.Debug("{0} is victorious.".F(self.Owner.PlayerName));
-			self.Owner.Shroud.Disabled = true;
 			if (self.Owner == self.World.LocalPlayer)
-			{
 				Game.RunAfterDelay(Info.NotificationDelay, () => Sound.PlayNotification(self.Owner, "Speech", "Win", self.Owner.Country.Race));
-			}
 		}
 	}
 

OpenRA.Mods.RA/Effects/Bullet.cs

@@ -160,7 +160,8 @@ namespace OpenRA.Mods.RA.Effects
 				var altitude = float2.Lerp(Args.srcAltitude, Args.destAltitude, at);
 				var pos = float2.Lerp(Args.src.ToFloat2(), Args.dest.ToFloat2(), at) - new float2(0, altitude);
 
-				if (Args.firedBy.World.RenderedShroud.IsVisible(((PPos) pos.ToInt2()).ToCPos()))
+				var cell = ((PPos)pos.ToInt2()).ToCPos();
+				if (!Args.firedBy.World.FogObscures(cell))
 				{
 					if (Info.High || Info.Angle > 0)
 					{

OpenRA.Mods.RA/Effects/Contrail.cs

@@ -93,8 +93,8 @@ namespace OpenRA.Mods.RA
 				var conPos = WPos.Average(positions[i], positions[i-1], positions[i-2], positions[i-3]);
 				var nextPos = WPos.Average(positions[i-1], positions[i-2], positions[i-3], positions[i-4]);
 
-				if (self.World.RenderedShroud.IsVisible(new CPos(conPos)) ||
-				    self.World.RenderedShroud.IsVisible(new CPos(nextPos)))
+				if (!self.World.FogObscures(new CPos(conPos)) &&
+				    !self.World.FogObscures(new CPos(nextPos)))
 				{
 					Game.Renderer.WorldLineRenderer.DrawLine(wr.ScreenPosition(conPos), wr.ScreenPosition(nextPos), trailStart, trailEnd);
 

OpenRA.Mods.RA/Effects/GpsDot.cs

@@ -69,7 +69,7 @@ namespace OpenRA.Mods.RA.Effects
 			}
 
 			var hasGps = (watcher != null && (watcher.Granted || watcher.GrantedAllies));
-			var hasDot = (huf != null && !huf.IsVisible(self.World.RenderedShroud, self)); // WRONG (why?)
+			var hasDot = (huf != null && !huf.IsVisible(self, self.World.RenderPlayer));
 			var dotHidden = (cloak != null && cloak.Cloaked) || (spy != null && spy.Disguised);
 
 			show = hasGps && hasDot && !dotHidden;

OpenRA.Mods.RA/Effects/Missile.cs

@@ -158,7 +158,7 @@ namespace OpenRA.Mods.RA.Effects
 
 		public IEnumerable<Renderable> Render(WorldRenderer wr)
 		{
-			if (Args.firedBy.World.RenderedShroud.IsVisible(PxPosition.ToCPos()))
+			if (!Args.firedBy.World.FogObscures(PxPosition.ToCPos()))
 				yield return new Renderable(anim.Image, PxPosition.ToFloat2() - 0.5f * anim.Image.size - new float2(0, Altitude),
 					wr.Palette(Args.weapon.Underwater ? "shadow" : "effect"), PxPosition.Y);
 

OpenRA.Mods.RA/FogPalette.cs

@@ -1,46 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2013 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.Drawing;
-using OpenRA.FileFormats;
-using OpenRA.Graphics;
-using OpenRA.Traits;
-
-namespace OpenRA.Mods.RA
-{
-	[Desc("Adds the hard-coded fog palette to the game")]
-	class FogPaletteInfo : ITraitInfo
-	{
-		[Desc("internal palette name")]
-		public readonly string Name = "fog";
-		public object Create(ActorInitializer init) { return new FogPalette(this); }
-	}
-
-	class FogPalette : IPalette
-	{
-		readonly FogPaletteInfo info;
-
-		public FogPalette(FogPaletteInfo info) { this.info = info; }
-
-		public void InitPalette(WorldRenderer wr)
-		{
-			var c = new[] {
-				Color.Transparent, Color.Green,
-				Color.Blue, Color.Yellow,
-				Color.FromArgb(128,0,0,0),
-				Color.FromArgb(128,0,0,0),
-				Color.FromArgb(128,0,0,0),
-				Color.FromArgb(64,0,0,0)
-			};
-
-			wr.AddPalette(info.Name, new Palette(Exts.MakeArray(256, i => (uint)c[i % 8].ToArgb())), false);
-		}
-	}
-}

OpenRA.Mods.RA/GainsExperience.cs

@@ -100,6 +100,7 @@ namespace OpenRA.Mods.RA
 
 		public IEnumerable<Renderable> ModifyRender(Actor self, WorldRenderer wr, IEnumerable<Renderable> r)
 		{
+			// TODO: Make this consistent with everything else that adds animations to RenderSimple.
 			if ((self.Owner == self.World.LocalPlayer || self.World.LocalPlayer == null) && Level > 0)
 				return InnerModifyRender(self, wr, r);
 			else
@@ -112,6 +113,10 @@ namespace OpenRA.Mods.RA
 				yield return rs;
 
 			RankAnim.Tick();	// HACK
+
+			if (self.World.FogObscures(self))
+				yield break;
+
 			var bounds = self.Bounds.Value;
 			yield return new Renderable(RankAnim.Image, new float2(bounds.Right - 6, bounds.Bottom - 8),
 				wr.Palette("effect"), self.CenterLocation.Y);

OpenRA.Mods.RA/MPStartLocations.cs

@@ -47,10 +47,11 @@ namespace OpenRA.Mods.RA
 			}
 
 			// Explore allied shroud
-			foreach (var p in Start)
-				if ((world.LocalPlayer != null ) &&(p.Key == world.LocalPlayer || p.Key.Stances[world.LocalPlayer] == Stance.Ally))
-					world.WorldActor.Trait<Shroud>().Explore(world, p.Value,
-						world.WorldActor.Info.Traits.Get<MPStartLocationsInfo>().InitialExploreRange);
+			var explore = world.WorldActor.Info.Traits.Get<MPStartLocationsInfo>().InitialExploreRange;
+			foreach (var p in Start.Keys)
+				foreach (var q in world.Players)
+					if (p.IsAlliedWith(q))
+						q.Shroud.Explore(world, Start[p], explore);
 
 			// Set viewport
 			if (world.LocalPlayer != null && Start.ContainsKey(world.LocalPlayer))

OpenRA.Mods.RA/Modifiers/FrozenUnderFog.cs

@@ -19,15 +19,15 @@ namespace OpenRA.Mods.RA
 
 	class FrozenUnderFog : IRenderModifier, IVisibilityModifier
 	{
-		public bool IsVisible(Shroud s, Actor self)
+		public bool IsVisible(Actor self, Player byPlayer)
 		{
-			return Shroud.GetVisOrigins(self).Any(o => s.IsVisible(o));
+			return byPlayer == null || Shroud.GetVisOrigins(self).Any(o => byPlayer.Shroud.IsVisible(o));
 		}
 
 		Renderable[] cache = { };
 		public IEnumerable<Renderable> ModifyRender(Actor self, WorldRenderer wr, IEnumerable<Renderable> r)
 		{
-			if (IsVisible(self.World.RenderedShroud, self))
+			if (IsVisible(self, self.World.RenderPlayer))
 				cache = r.ToArray();
 			return cache;
 		}

OpenRA.Mods.RA/Modifiers/HiddenUnderFog.cs

@@ -19,15 +19,15 @@ namespace OpenRA.Mods.RA
 
 	class HiddenUnderFog : IRenderModifier, IVisibilityModifier
 	{
-		public bool IsVisible(Shroud s, Actor self)
+		public bool IsVisible(Actor self, Player byPlayer)
 		{
-			return Shroud.GetVisOrigins(self).Any(o => s.IsVisible(o));
+			return byPlayer == null || Shroud.GetVisOrigins(self).Any(o => byPlayer.Shroud.IsVisible(o));
 		}
 
 		static Renderable[] Nothing = { };
 		public IEnumerable<Renderable> ModifyRender(Actor self, WorldRenderer wr, IEnumerable<Renderable> r)
 		{
-			return IsVisible(self.World.RenderedShroud, self) ? r : Nothing;
+			return IsVisible(self, self.World.RenderPlayer) ? r : Nothing;
 		}
 	}
 }

OpenRA.Mods.RA/Move/Mobile.cs

@@ -485,10 +485,10 @@ namespace OpenRA.Mods.RA.Move
 				IsQueued = forceQueued;
 				cursor = "move";
 
-				if (self.World.LocalPlayer.Shroud.IsExplored(location))
+				if (self.Owner.Shroud.IsExplored(location))
 					cursor = self.World.GetTerrainInfo(location).CustomCursor ?? cursor;
 
-				if (!self.World.Map.IsInMap(location) || (self.World.LocalPlayer.Shroud.IsExplored(location) &&
+				if (!self.World.Map.IsInMap(location) || (self.Owner.Shroud.IsExplored(location) &&
 						unitType.MovementCostForCell(self.World, location) == int.MaxValue))
 					cursor = "move-blocked";
 

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

@@ -417,7 +417,6 @@
     <Compile Include="Widgets\Logic\CheatsLogic.cs" />
     <Compile Include="CloakPaletteEffect.cs" />
     <Compile Include="Widgets\ColorPreviewManagerWidget.cs" />
-    <Compile Include="FogPalette.cs" />
     <Compile Include="Infiltrates.cs" />
     <Compile Include="Armament.cs" />
     <Compile Include="DebugMuzzlePositions.cs" />

OpenRA.Mods.RA/ProductionBar.cs

@@ -29,7 +29,7 @@ namespace OpenRA.Mods.RA
 		public float GetValue()
 		{
 			// only people we like should see our production status.
-			if (self.World.RenderedPlayer != null && self.Owner.Stances[self.World.RenderedPlayer] != Stance.Ally)
+			if (!self.Owner.IsAlliedWith(self.World.RenderPlayer))
 				return 0;
 
 			var queue = self.TraitsImplementing<ProductionQueue>().FirstOrDefault(q => q.CurrentItem() != null);

OpenRA.Mods.RA/ShroudPalette.cs

@@ -15,11 +15,17 @@ using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
 {
+	public enum ShroudPaletteType { Shroud, Fog, Combined };
+
 	[Desc("Adds the hard-coded shroud palette to the game")]
 	class ShroudPaletteInfo : ITraitInfo
 	{
-		[Desc("internal palette name")]
+		[Desc("Internal palette name")]
 		public readonly string Name = "shroud";
+
+		[Desc("Palette type")]
+		public readonly ShroudPaletteType Type = ShroudPaletteType.Combined;
+
 		public object Create(ActorInitializer init) { return new ShroudPalette(this); }
 	}
 
@@ -31,16 +37,37 @@ namespace OpenRA.Mods.RA
 
 		public void InitPalette(WorldRenderer wr)
 		{
-			var c = new[] {
-				Color.Transparent, Color.Green,
-				Color.Blue, Color.Yellow,
-				Color.Black,
-				Color.FromArgb(128,0,0,0),
-				Color.Transparent,
-				Color.Transparent
-			};
+			var c = info.Type == ShroudPaletteType.Shroud ? Shroud :
+					info.Type == ShroudPaletteType.Fog ? Fog : Combined;
 
 			wr.AddPalette(info.Name, new Palette(Exts.MakeArray(256, i => (uint)c[i % 8].ToArgb())), false);
 		}
+
+		static Color[] Shroud = new[] {
+			Color.Transparent, Color.Green,
+			Color.Blue, Color.Yellow,
+			Color.Black,
+			Color.FromArgb(128,0,0,0),
+			Color.Transparent,
+			Color.Transparent
+		};
+
+		static Color[] Fog = new[] {
+			Color.Transparent, Color.Green,
+			Color.Blue, Color.Yellow,
+			Color.FromArgb(128,0,0,0),
+			Color.FromArgb(128,0,0,0),
+			Color.FromArgb(128,0,0,0),
+			Color.FromArgb(64,0,0,0)
+		};
+
+		static Color[] Combined = new[] {
+			Color.Transparent, Color.Green,
+			Color.Blue, Color.Yellow,
+			Color.Black,
+			Color.FromArgb(192,0,0,0),
+			Color.FromArgb(128,0,0,0),
+			Color.FromArgb(64,0,0,0)
+		};
 	}
 }

OpenRA.Mods.RA/SmokeTrailWhenDamaged.cs

@@ -41,7 +41,7 @@ namespace OpenRA.Mods.RA
 			{
 				var position = self.CenterPosition;
 				if (position.Z > 0 && self.GetDamageState() >= DamageState.Heavy &&
-				    self.World.RenderedShroud.IsVisible(new CPos(position)))
+				    !self.World.FogObscures(new CPos(position)))
 				{
 					var offset = info.Offset.Rotate(coords.QuantizeOrientation(self, self.Orientation));
 					var pos = PPos.FromWPosHackZ(position + coords.LocalToWorld(offset));

OpenRA.Mods.RA/Widgets/Logic/IngameChatLogic.cs

@@ -30,7 +30,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 		private bool teamChat = false;
 		internal bool TeamChat
 		{
-			get { return World.Observer ? false : teamChat; }
+			get { return World.LocalPlayer == null ? false : teamChat; }
 			set { teamChat = value; }
 		}
 

OpenRA.Mods.RA/Widgets/Logic/ObserverShroudSelectorLogic.cs

@@ -40,16 +40,16 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 		{
 			var views = world.Players.Where(p => !p.NonCombatant).ToDictionary(p => p.PlayerName,
 				p => new CameraOption("{0}'s view".F(p.PlayerName),
-				      () => world.RenderedPlayer == p,
-				      () => { world.RenderedPlayer = p; world.RenderedShroud.Dirty(); }
+				      () => world.RenderPlayer == p,
+				      () => world.RenderPlayer = p
 			));
 			views.Add("", new CameraOption("World view",
-				() => world.RenderedPlayer == null,
-				() => { world.RenderedPlayer = null; world.RenderedShroud.Dirty(); }
+				() => world.RenderPlayer == null,
+				() => world.RenderPlayer = null
 			));
 
 			var shroudSelector = widget.Get<DropDownButtonWidget>("SHROUD_SELECTOR");
-			shroudSelector.GetText = () => views[world.RenderedPlayer == null ? "" : world.RenderedPlayer.PlayerName].Label;
+			shroudSelector.GetText = () => views[world.RenderPlayer == null ? "" : world.RenderPlayer.PlayerName].Label;
 			shroudSelector.OnMouseDown = _ =>
 			{
 				Func<CameraOption, ScrollItemWidget, ScrollItemWidget> setupItem = (option, template) =>

OpenRA.Mods.RA/Widgets/WorldTooltipWidget.cs

@@ -31,9 +31,10 @@ namespace OpenRA.Mods.RA.Widgets
 				return;
 
 			var cell = Game.viewport.ViewToWorld(Viewport.LastMousePos);
-			if (!world.Map.IsInMap(cell)) return;
+			if (!world.Map.IsInMap(cell))
+				return;
 
-			if (world.LocalPlayer != null && !world.RenderedShroud.IsExplored(cell))
+			if (world.ShroudObscures(cell))
 			{
 				var utext = "Unexplored Terrain";
 				var usz = Game.Renderer.Fonts["Bold"].Measure(utext) + new int2(20, 24);

OpenRA.Mods.RA/World/SmudgeLayer.cs

@@ -78,12 +78,12 @@ namespace OpenRA.Mods.RA
 		public void Render( WorldRenderer wr )
 		{
 			var cliprect = Game.viewport.WorldBounds(world);
-			var localPlayer = world.LocalPlayer;
 			foreach (var kv in tiles)
 			{
 				if (!cliprect.Contains(kv.Key.X,kv.Key.Y))
 					continue;
-				if (localPlayer != null && !world.RenderedShroud.IsExplored(kv.Key))
+
+				if (world.ShroudObscures(kv.Key))
 					continue;
 
 				smudgeSprites[kv.Value.type- 1][kv.Value.index].DrawAt(wr, kv.Key.ToPPos().ToFloat2(), "terrain");