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

OpenRA.Game/Graphics/Minimap.cs

@@ -119,9 +119,12 @@ namespace OpenRA.Graphics
 			unsafe
 			{
 				int* c = (int*)bitmapData.Scan0;
-
+				
 				foreach (var t in world.Queries.WithTraitMultiple<IRadarSignature>())
 				{
+					if (!t.Actor.IsVisible())
+						continue;
+					
 					var color = t.Trait.RadarSignatureColor(t.Actor);
 					foreach (var cell in t.Trait.RadarSignatureCells(t.Actor))
 						if (world.Map.IsInMap(cell))

OpenRA.Game/OpenRA.Game.csproj

@@ -82,10 +82,8 @@
     <Compile Include="Server\ProtocolVersion.cs" />
     <Compile Include="Traits\BaseBuilding.cs" />
     <Compile Include="Traits\LintAttributes.cs" />
-    <Compile Include="Traits\Modifiers\FrozenUnderFog.cs" />
     <Compile Include="Traits\Player\PlayerResources.cs" />
     <Compile Include="Traits\Player\TechTreeCache.cs" />
-    <Compile Include="Traits\Modifiers\HiddenUnderFog.cs" />
     <Compile Include="Traits\World\Shroud.cs" />
     <Compile Include="Widgets\ChatEntryWidget.cs" />
     <Compile Include="Widgets\Delegates\ConnectionDialogsDelegate.cs" />
@@ -179,7 +177,6 @@
     <Compile Include="Traits\Production.cs" />
     <Compile Include="Traits\RallyPoint.cs" />
     <Compile Include="Traits\Render\RenderSimple.cs" />
-    <Compile Include="Traits\Cloak.cs" />
     <Compile Include="Traits\TraitsInterfaces.cs" />
     <Compile Include="Traits\Turreted.cs" />
     <Compile Include="Traits\Unit.cs" />
@@ -266,4 +263,7 @@
   <Target Name="AfterBuild">
   </Target>
   -->
+  <ItemGroup>
+    <Folder Include="Traits\" />
+  </ItemGroup>
 </Project>

OpenRA.Game/Traits/Building.cs

@@ -162,11 +162,7 @@ namespace OpenRA.Traits
 		}
 		
 		public IEnumerable<int2> RadarSignatureCells(Actor self)
-		{
+		{				
-			foreach (var mod in self.traits.WithInterface<IRadarVisibilityModifier>())
-				if (!mod.VisibleOnRadar(self))
-					return new int2[] {};
-				
 			return Footprint.Tiles(self);
 		}
 		

OpenRA.Game/Traits/TraitsInterfaces.cs

@@ -57,7 +57,7 @@ namespace OpenRA.Traits
 		Color RadarSignatureColor(Actor self);
 	}
 	
-	public interface IRadarVisibilityModifier { bool VisibleOnRadar(Actor self); }
+	public interface IVisibilityModifier { bool IsVisible(Actor self); }
 	public interface IRadarColorModifier { Color RadarColorOverride(Actor self); }
 	public interface IRevealShroud {}
 	public interface IOccupySpace

OpenRA.Game/Traits/Unit.cs

@@ -48,11 +48,7 @@ namespace OpenRA.Traits
 		}
 		
 		public IEnumerable<int2> RadarSignatureCells(Actor self)
-		{
+		{	
-			foreach (var mod in self.traits.WithInterface<IRadarVisibilityModifier>())
-				if (!mod.VisibleOnRadar(self))
-					yield break;
-			
 			yield return self.Location;
 		}
 		

OpenRA.Game/WorldUtils.cs

@@ -121,12 +121,7 @@ namespace OpenRA
 			if (!Shroud.GetVisOrigins(a).Any(o => a.World.Map.IsInMap(o) && shroud.exploredCells[o.X, o.Y]))		// covered by shroud
 				return false;
 
-			var huf = a.traits.GetOrDefault<HiddenUnderFog>();							// hidden under fog
+			if (a.traits.WithInterface<IVisibilityModifier>().Any(t => !t.IsVisible(a)))
-			if (huf != null && !huf.IsVisible(a))
-				return false;
-
-			var cloak = a.traits.GetOrDefault<Cloak>();
-			if (cloak != null && cloak.Cloaked && a.Owner != a.World.LocalPlayer)
 				return false;
 
 			return true;

OpenRA.Mods.RA/Cloak.cs

@@ -12,8 +12,9 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Drawing;
+using OpenRA.Traits;
 
-namespace OpenRA.Traits
+namespace OpenRA.Mods.RA
 {
 	class CloakInfo : ITraitInfo
 	{
@@ -25,7 +26,7 @@ namespace OpenRA.Traits
 		public object Create(ActorInitializer init) { return new Cloak(init.self); }
 	}
 
-	public class Cloak : IRenderModifier, INotifyAttack, ITick, INotifyDamage, IRadarVisibilityModifier, IRadarColorModifier
+	public class Cloak : IRenderModifier, INotifyAttack, ITick, INotifyDamage, IVisibilityModifier, IRadarColorModifier
 	{
 		[Sync]
 		int remainingTime;
@@ -80,7 +81,7 @@ namespace OpenRA.Traits
 		public bool Cloaked { get { return remainingTime == 0; } }
 
 		
-		public bool VisibleOnRadar(Actor self)
+		public bool IsVisible(Actor self)
 		{
 			return !Cloaked || self.Owner == self.World.LocalPlayer;
 		}

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

@@ -10,15 +10,16 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using OpenRA.Traits;
 
-namespace OpenRA.Traits
+namespace OpenRA.Mods.RA
 {
 	class FrozenUnderFogInfo : ITraitInfo
 	{
 		public object Create(ActorInitializer init) { return new FrozenUnderFog(init.self); }
 	}
 
-	class FrozenUnderFog : IRenderModifier, IRadarVisibilityModifier
+	class FrozenUnderFog : IRenderModifier, IVisibilityModifier
 	{
 		Shroud shroud;
 		Renderable[] cache = { };
@@ -28,18 +29,13 @@ namespace OpenRA.Traits
 			shroud = self.World.WorldActor.traits.Get<Shroud>();
 		}
 
-		bool IsVisible(Actor self)
+		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 bool VisibleOnRadar(Actor self)
-		{
-			return IsVisible(self);
-		}
 
 		public IEnumerable<Renderable> ModifyRender(Actor self, IEnumerable<Renderable> r)
 		{

OpenRA.Mods.RA/Modifiers/HiddenUnderFog.cs

@@ -9,15 +9,16 @@
 #endregion
 
 using System.Collections.Generic;
+using OpenRA.Traits;
 
-namespace OpenRA.Traits
+namespace OpenRA.Mods.RA
 {
 	class HiddenUnderFogInfo : ITraitInfo
 	{
 		public object Create(ActorInitializer init) { return new HiddenUnderFog(init.self); }
 	}
 
-	class HiddenUnderFog : IRenderModifier, IRadarVisibilityModifier
+	class HiddenUnderFog : IRenderModifier, IVisibilityModifier
 	{
 		Shroud shroud;
 
@@ -33,11 +34,6 @@ namespace OpenRA.Traits
 				|| self.World.LocalPlayer.Shroud.Disabled
 				|| shroud.visibleCells[self.Location.X, self.Location.Y] > 0;
 		}
-		
-		public bool VisibleOnRadar(Actor self)
-		{
-			return IsVisible(self);
-		}
 
 		static Renderable[] Nothing = { };
 		public IEnumerable<Renderable> ModifyRender(Actor self, IEnumerable<Renderable> r)

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">