Merge pull request #6613 from pchote/remove-mp-tooltips

Remove the MP tooltip row from campaign missions.

OpenRA.Game/Traits/Player/FrozenActorLayer.cs

@@ -32,7 +32,7 @@ namespace OpenRA.Traits
 		public IRenderable[] Renderables { private get; set; }
 		public Player Owner;
 
-		public string TooltipName;
+		public ITooltipInfo TooltipInfo;
 		public Player TooltipOwner;
 
 		public int HP;

OpenRA.Game/Traits/TraitsInterfaces.cs

@@ -26,6 +26,7 @@ namespace OpenRA.Traits
 	[Flags]
 	public enum Stance
 	{
+		None = 0,
 		Enemy = 1,
 		Neutral = 2,
 		Ally = 4,
@@ -126,10 +127,17 @@ namespace OpenRA.Traits
 		bool Disguised { get; }
 		Player Owner { get; }
 	}
+
 	public interface IToolTip
 	{
-		string Name();
+		ITooltipInfo TooltipInfo { get; }
-		Player Owner();
+		Player Owner { get; }
+	}
+
+	public interface ITooltipInfo
+	{
+		string TooltipForPlayerStance(Stance stance);
+		bool IsOwnerRowVisible { get; }
 	}
 
 	public interface IDisable { bool Disabled { get; } }

OpenRA.Game/Widgets/ViewportControllerWidget.cs

@@ -114,7 +114,7 @@ namespace OpenRA.Widgets
 			}
 
 			var frozen = world.ScreenMap.FrozenActorsAt(world.RenderPlayer, worldRenderer.Viewport.ViewToWorldPx(Viewport.LastMousePos))
-				.Where(a => a.TooltipName != null && a.IsValid)
+				.Where(a => a.TooltipInfo != null && a.IsValid)
 				.WithHighestSelectionPriority();
 
 			if (frozen != null)

OpenRA.Mods.RA/Disguise.cs

@@ -36,19 +36,17 @@ namespace OpenRA.Mods.RA
 			disguise = self.Trait<Disguise>();
 		}
 
-		public string Name()
+		public ITooltipInfo TooltipInfo
 		{
-			if (disguise.Disguised)
+			get
 			{
-				if (self.Owner == self.World.LocalPlayer)
+				return disguise.Disguised ? disguise.AsTooltipInfo : info;
-					return "{0} ({1})".F(info.Name, disguise.AsName);
-
-				return disguise.AsName;
 			}
-			return info.Name;
 		}
 
-		public Player Owner()
+		public Player Owner
+		{
+			get
 			{
 				if (disguise.Disguised)
 				{
@@ -57,17 +55,19 @@ namespace OpenRA.Mods.RA
 
 					return disguise.AsPlayer;
 				}
+
 				return self.Owner;
 			}
 		}
+	}
 
 	class DisguiseInfo : TraitInfo<Disguise> { }
 
 	class Disguise : IEffectiveOwner, IIssueOrder, IResolveOrder, IOrderVoice, IRadarColorModifier, INotifyAttack
 	{
-		public Player AsPlayer;
+		public Player AsPlayer { get; private set; }
-		public string AsSprite;
+		public string AsSprite { get; private set; }
-		public string AsName;
+		public ITooltipInfo AsTooltipInfo { get; private set; }
 
 		public bool Disguised { get { return AsPlayer != null; } }
 		public Player Owner { get { return AsPlayer; } }
@@ -117,13 +117,13 @@ namespace OpenRA.Mods.RA
 			if (target != null)
 			{
 				var tooltip = target.TraitsImplementing<IToolTip>().FirstOrDefault();
-				AsName = tooltip.Name();
+				AsTooltipInfo = tooltip.TooltipInfo;
-				AsPlayer = tooltip.Owner();
+				AsPlayer = tooltip.Owner;
 				AsSprite = target.Trait<RenderSprites>().GetImage(target);
 			}
 			else
 			{
-				AsName = null;
+				AsTooltipInfo = null;
 				AsPlayer = null;
 				AsSprite = null;
 			}

OpenRA.Mods.RA/Modifiers/FrozenUnderFog.cs

@@ -101,8 +101,8 @@ namespace OpenRA.Mods.RA
 
 				if (tooltip.Value != null)
 				{
-					actor.TooltipName = tooltip.Value.Name();
+					actor.TooltipInfo = tooltip.Value.TooltipInfo;
-					actor.TooltipOwner = tooltip.Value.Owner();
+					actor.TooltipOwner = tooltip.Value.Owner;
 				}
 			}
 		}

OpenRA.Mods.RA/Tooltip.cs

@@ -13,29 +13,58 @@ using OpenRA.Traits;
 namespace OpenRA.Mods.RA
 {
 	[Desc("Shown in the build palette widget.")]
-	public class TooltipInfo : ITraitInfo
+	public class TooltipInfo : ITraitInfo, ITooltipInfo
 	{
 		[Translate] public readonly string Description = "";
 		[Translate] public readonly string Name = "";
 
+		[Desc("An optional generic name (i.e. \"Soldier\" or \"Structure\")" +
+			"to be shown to chosen players.")]
+		[Translate] public readonly string GenericName = null;
+
+		[Desc("Prefix generic tooltip name with 'Enemy' or 'Allied'.")]
+		public readonly bool GenericStancePrefix = true;
+
+		[Desc("Player stances that the generic name should be shown to.")]
+		public readonly Stance GenericVisibility = Stance.None;
+
+		[Desc("Show the actor's owner and their faction flag")]
+		public readonly bool ShowOwnerRow = true;
+
 		[Desc("Sequence of the actor that contains the cameo.")]
 		public readonly string Icon = "icon";
 
 		public virtual object Create(ActorInitializer init) { return new Tooltip(init.self, this); }
+
+		public string TooltipForPlayerStance(Stance stance)
+		{
+			if (stance == Stance.None || !GenericVisibility.HasFlag(stance))
+				return Name;
+
+			if (GenericStancePrefix && stance == Stance.Ally)
+				return "Allied " + GenericName;
+
+			if (GenericStancePrefix && stance == Stance.Enemy)
+				return "Enemy " + GenericName;
+
+			return GenericName;
+		}
+
+		public bool IsOwnerRowVisible { get { return ShowOwnerRow; } }
 	}
 
 	public class Tooltip : IToolTip
 	{
-		Actor self;
+		readonly Actor self;
-		TooltipInfo Info;
+		readonly TooltipInfo info;
 
-		public string Name() { return Info.Name; }
+		public ITooltipInfo TooltipInfo { get { return info; } }
-		public Player Owner() { return self.Owner; }
+		public Player Owner { get { return self.Owner; } }
 
 		public Tooltip(Actor self, TooltipInfo info)
 		{
 			this.self = self;
-			Info = info;
+			this.info = info;
 		}
 	}
 }

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

@@ -10,6 +10,7 @@
 
 using System;
 using System.Drawing;
+using OpenRA.Traits;
 using OpenRA.Widgets;
 
 namespace OpenRA.Mods.RA.Widgets.Logic
@@ -17,7 +18,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 	public class WorldTooltipLogic
 	{
 		[ObjectCreator.UseCtor]
-		public WorldTooltipLogic(Widget widget, TooltipContainerWidget tooltipContainer, ViewportControllerWidget viewport)
+		public WorldTooltipLogic(Widget widget, World world, TooltipContainerWidget tooltipContainer, ViewportControllerWidget viewport)
 		{
 			widget.IsVisible = () => viewport.TooltipType != WorldTooltipType.None;
 			var label = widget.Get<LabelWidget>("LABEL");
@@ -41,6 +42,8 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 				if (viewport == null || viewport.TooltipType == WorldTooltipType.None)
 					return;
 
+				showOwner = false;
+
 				Player o = null;
 				switch (viewport.TooltipType)
 				{
@@ -48,14 +51,24 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 						labelText = "Unexplored Terrain";
 						break;
 					case WorldTooltipType.Actor:
-					labelText = viewport.ActorTooltip.Name();
+					{
-					o = viewport.ActorTooltip.Owner();
+						o = viewport.ActorTooltip.Owner;
+						showOwner = !o.NonCombatant && viewport.ActorTooltip.TooltipInfo.IsOwnerRowVisible;
+
+						var stance = o == null || world.RenderPlayer == null? Stance.None : o.Stances[world.RenderPlayer];
+						labelText = viewport.ActorTooltip.TooltipInfo.TooltipForPlayerStance(stance);
 						break;
+					}
 					case WorldTooltipType.FrozenActor:
-					labelText = viewport.FrozenActorTooltip.TooltipName;
+					{
 						o = viewport.FrozenActorTooltip.TooltipOwner;
+						showOwner = !o.NonCombatant && viewport.FrozenActorTooltip.TooltipInfo.IsOwnerRowVisible;
+
+						var stance = o == null || world.RenderPlayer == null? Stance.None : o.Stances[world.RenderPlayer];
+						labelText = viewport.FrozenActorTooltip.TooltipInfo.TooltipForPlayerStance(stance);
 						break;
 					}
+				}
 
 				var textWidth = font.Measure(labelText).X;
 				if (textWidth != cachedWidth)
@@ -64,8 +77,6 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 					widget.Bounds.Width = 2*label.Bounds.X + textWidth;
 				}
 
-				showOwner = o != null && !o.NonCombatant;
-
 				if (showOwner)
 				{
 					flagRace = o.Country.Race;

mods/cnc/maps/gdi01/map.yaml

@@ -465,10 +465,48 @@ Rules:
 		-ConquestVictoryConditions:
 		MissionObjectives:
 			EarlyGameOver: true
-	^Infantry:
-		MustBeDestroyed:
 	^Vehicle:
 		MustBeDestroyed:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Tank:
+		MustBeDestroyed:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Helicopter:
+		MustBeDestroyed:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Infantry:
+		MustBeDestroyed:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Plane:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Ship:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Building:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Wall:
+		Tooltip:
+			ShowOwnerRow: false
+	^Husk:
+		Tooltip:
+			GenericVisibility: Enemy, Ally, Neutral
+			GenericStancePrefix: false
+			ShowOwnerRow: false
+	HARV:
+		-MustBeDestroyed:
 	PROC:
 		Buildable:
 			Prerequisites: ~disabled

mods/cnc/maps/gdi02/map.yaml

@@ -747,10 +747,48 @@ Rules:
 		-ConquestVictoryConditions:
 		MissionObjectives:
 			EarlyGameOver: true
-	^Infantry:
-		MustBeDestroyed:
 	^Vehicle:
 		MustBeDestroyed:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Tank:
+		MustBeDestroyed:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Helicopter:
+		MustBeDestroyed:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Infantry:
+		MustBeDestroyed:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Plane:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Ship:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Building:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Wall:
+		Tooltip:
+			ShowOwnerRow: false
+	^Husk:
+		Tooltip:
+			GenericVisibility: Enemy, Ally, Neutral
+			GenericStancePrefix: false
+			ShowOwnerRow: false
+	HARV:
+		-MustBeDestroyed:
 	PROC:
 		Buildable:
 			Prerequisites: ~disabled

mods/cnc/maps/gdi03/map.yaml

@@ -908,8 +908,48 @@ Rules:
 		-ConquestVictoryConditions:
 		MissionObjectives:
 			EarlyGameOver: true
+	^Vehicle:
+		MustBeDestroyed:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Tank:
+		MustBeDestroyed:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Helicopter:
+		MustBeDestroyed:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
 	^Infantry:
 		MustBeDestroyed:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Plane:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Ship:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Building:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Wall:
+		Tooltip:
+			ShowOwnerRow: false
+	^Husk:
+		Tooltip:
+			GenericVisibility: Enemy, Ally, Neutral
+			GenericStancePrefix: false
+			ShowOwnerRow: false
+	HARV:
+		-MustBeDestroyed:
 	WEAP:
 		Buildable:
 			Prerequisites: ~disabled

mods/cnc/maps/gdi04a/map.yaml

@@ -553,12 +553,48 @@ Rules:
 		-ConquestVictoryConditions:
 		MissionObjectives:
 			EarlyGameOver: true
-	^Infantry:
-		MustBeDestroyed:
 	^Vehicle:
 		MustBeDestroyed:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
 	^Tank:
 		MustBeDestroyed:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Helicopter:
+		MustBeDestroyed:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Infantry:
+		MustBeDestroyed:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Plane:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Ship:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Building:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Wall:
+		Tooltip:
+			ShowOwnerRow: false
+	^Husk:
+		Tooltip:
+			GenericVisibility: Enemy, Ally, Neutral
+			GenericStancePrefix: false
+			ShowOwnerRow: false
+	HARV:
+		-MustBeDestroyed:
 	CRATE:
 		Crate:
 			Lifetime: 9999

mods/cnc/maps/gdi04b/map.yaml

@@ -632,12 +632,48 @@ Rules:
 		-ConquestVictoryConditions:
 		MissionObjectives:
 			EarlyGameOver: true
-	^Infantry:
-		MustBeDestroyed:
 	^Vehicle:
 		MustBeDestroyed:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
 	^Tank:
 		MustBeDestroyed:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Helicopter:
+		MustBeDestroyed:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Infantry:
+		MustBeDestroyed:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Plane:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Ship:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Building:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Wall:
+		Tooltip:
+			ShowOwnerRow: false
+	^Husk:
+		Tooltip:
+			GenericVisibility: Enemy, Ally, Neutral
+			GenericStancePrefix: false
+			ShowOwnerRow: false
+	HARV:
+		-MustBeDestroyed:
 	E3:
 		AutoTarget:
 			ScanRadius: 5

mods/cnc/maps/gdi04c/map.yaml

@@ -899,12 +899,48 @@ Rules:
 		-ConquestVictoryConditions:
 		MissionObjectives:
 			EarlyGameOver: true
-	^Infantry:
-		MustBeDestroyed:
 	^Vehicle:
 		MustBeDestroyed:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
 	^Tank:
 		MustBeDestroyed:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Helicopter:
+		MustBeDestroyed:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Infantry:
+		MustBeDestroyed:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Plane:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Ship:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Building:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Wall:
+		Tooltip:
+			ShowOwnerRow: false
+	^Husk:
+		Tooltip:
+			GenericVisibility: Enemy, Ally, Neutral
+			GenericStancePrefix: false
+			ShowOwnerRow: false
+	HARV:
+		-MustBeDestroyed:
 	^CivInfantry:
 		Health:
 			HP: 125

mods/cnc/maps/nod01/map.yaml

@@ -323,11 +323,48 @@ Rules:
 		MustBeDestroyed:
 	^CivInfantry:
 		MustBeDestroyed:
-	^Infantry:
-		MustBeDestroyed:
 	^Vehicle:
 		MustBeDestroyed:
-
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Tank:
+		MustBeDestroyed:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Helicopter:
+		MustBeDestroyed:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Infantry:
+		MustBeDestroyed:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Plane:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Ship:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Building:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Wall:
+		Tooltip:
+			ShowOwnerRow: false
+	^Husk:
+		Tooltip:
+			GenericVisibility: Enemy, Ally, Neutral
+			GenericStancePrefix: false
+			ShowOwnerRow: false
+	HARV:
+		-MustBeDestroyed:
 Sequences:
 
 VoxelSequences:

mods/cnc/maps/nod03a/map.yaml

@@ -537,10 +537,48 @@ Rules:
 			Scripts: nod03a.lua
 		ObjectivesPanel:
 			PanelName: MISSION_OBJECTIVES
-	^Infantry:
-		MustBeDestroyed:
 	^Vehicle:
 		MustBeDestroyed:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Tank:
+		MustBeDestroyed:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Helicopter:
+		MustBeDestroyed:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Infantry:
+		MustBeDestroyed:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Plane:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Ship:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Building:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Wall:
+		Tooltip:
+			ShowOwnerRow: false
+	^Husk:
+		Tooltip:
+			GenericVisibility: Enemy, Ally, Neutral
+			GenericStancePrefix: false
+			ShowOwnerRow: false
+	HARV:
+		-MustBeDestroyed:
 	NUK2:
 		Buildable:
 			Prerequisites: ~disabled

mods/cnc/maps/nod03b/map.yaml

@@ -582,10 +582,48 @@ Rules:
 			Scripts: nod03b.lua
 		ObjectivesPanel:
 			PanelName: MISSION_OBJECTIVES
-	^Infantry:
-		MustBeDestroyed:
 	^Vehicle:
 		MustBeDestroyed:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Tank:
+		MustBeDestroyed:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Helicopter:
+		MustBeDestroyed:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Infantry:
+		MustBeDestroyed:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Plane:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Ship:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Building:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Wall:
+		Tooltip:
+			ShowOwnerRow: false
+	^Husk:
+		Tooltip:
+			GenericVisibility: Enemy, Ally, Neutral
+			GenericStancePrefix: false
+			ShowOwnerRow: false
+	HARV:
+		-MustBeDestroyed:
 	NUK2:
 		Buildable:
 			Prerequisites: ~disabled

mods/cnc/rules/defaults.yaml

@@ -30,6 +30,8 @@
 	Guard:
 	Guardable:
 	BodyOrientation:
+	Tooltip:
+		GenericName: Vehicle
 	UpdatesPlayerStatistics:
 	Cloak:
 		RequiresUpgrade: cloak
@@ -84,6 +86,8 @@
 	Guard:
 	Guardable:
 	BodyOrientation:
+	Tooltip:
+		GenericName: Tank
 	UpdatesPlayerStatistics:
 	Cloak:
 		RequiresUpgrade: cloak
@@ -133,6 +137,8 @@
 	Huntable:
 	LuaScriptEvents:
 	ScriptTriggers:
+	Tooltip:
+		GenericName: Helicopter
 	GainsStatUpgrades:
 	SelfHealing@ELITE:
 		Step: 2
@@ -191,6 +197,8 @@
 	Guard:
 	Guardable:
 	BodyOrientation:
+	Tooltip:
+		GenericName: Soldier
 	SelfHealing@HOSPITAL:
 		Step: 5
 		Ticks: 100
@@ -236,6 +244,7 @@
 		Cost: 70
 	Tooltip:
 		Name: Civilian
+		GenericVisibility: None
 	Mobile:
 		Speed: 56
 	Health:
@@ -400,6 +409,8 @@
 	Guardable:
 		Range: 3
 	BodyOrientation:
+	Tooltip:
+		GenericName: Structure
 	FrozenUnderFog:
 	UpdatesPlayerStatistics:
 	Huntable:
@@ -430,6 +441,7 @@
 	Building:
 	Tooltip:
 		Name: Civilian Building
+		GenericVisibility: None
 	FrozenUnderFog:
 		StartsRevealed: true
 
@@ -443,6 +455,7 @@
 		RelativeToTopLeft: yes
 	Tooltip:
 		Name: Civilian Building (Destroyed)
+		GenericVisibility: None
 	BodyOrientation:
 	FrozenUnderFog:
 		StartsRevealed: true
@@ -485,6 +498,7 @@
 		RelativeToTopLeft: yes
 	Tooltip:
 		Name: Field (Destroyed)
+		GenericVisibility: None
 	BelowUnits:
 	BodyOrientation:
 	RenderBuilding:
@@ -614,6 +628,8 @@
 		ForceHealthPercentage: 25
 	BelowUnits:
 	BodyOrientation:
+	Tooltip:
+		GenericName: Destroyed Vehicle
 	LuaScriptEvents:
 	DisabledOverlay:
 	ScriptTriggers:

mods/cnc/rules/vehicles.yaml

@@ -43,6 +43,7 @@ HARV:
 		Cost: 1000
 	Tooltip:
 		Name: Harvester
+		GenericName: Harvester
 		Description: Collects Tiberium for processing.\n  Unarmed
 	Buildable:
 		BuildPaletteOrder: 10

mods/ra/maps/allies-01-classic/map.yaml

@@ -604,6 +604,42 @@ Rules:
 	EINSTEIN:
 		Passenger:
 			CargoType: Einstein
+	^Vehicle:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Tank:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Infantry:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Ship:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Plane:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Helicopter:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Building:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Wall:
+		Tooltip:
+			ShowOwnerRow: false
+	^Husk:
+		Tooltip:
+			GenericVisibility: Enemy, Ally, Neutral
+			GenericStancePrefix: false
+			ShowOwnerRow: false
 	^CivInfantry:
 		RevealsShroud:
 			Range: 0c0

mods/ra/maps/allies-02-classic/map.yaml

@@ -879,12 +879,45 @@ Rules:
 			LuaScripts: allies02.lua
 		ObjectivesPanel:
 			PanelName: MISSION_OBJECTIVES
-	^Infantry:
-		MustBeDestroyed:
-	^Tank:
-		MustBeDestroyed:
 	^Vehicle:
 		MustBeDestroyed:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Tank:
+		MustBeDestroyed:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Infantry:
+		MustBeDestroyed:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Ship:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Plane:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Helicopter:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Building:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Wall:
+		Tooltip:
+			ShowOwnerRow: false
+	^Husk:
+		Tooltip:
+			GenericVisibility: Enemy, Ally, Neutral
+			GenericStancePrefix: false
+			ShowOwnerRow: false
 	APWR:
 		Buildable:
 			Prerequisites: ~disabled

mods/ra/rules/defaults.yaml

@@ -37,6 +37,8 @@
 	Guard:
 	Guardable:
 	BodyOrientation:
+	Tooltip:
+		GenericName: Vehicle
 	EjectOnDeath:
 		PilotActor: e1
 		SuccessRate: 20
@@ -106,6 +108,8 @@
 	Guard:
 	Guardable:
 	BodyOrientation:
+	Tooltip:
+		GenericName: Tank
 	EjectOnDeath:
 		PilotActor: e1
 		SuccessRate: 20
@@ -183,6 +187,8 @@
 	Guard:
 	Guardable:
 	BodyOrientation:
+	Tooltip:
+		GenericName: Soldier
 	SelfHealing@HOSPITAL:
 		Step: 5
 		Ticks: 100
@@ -250,6 +256,8 @@
 	Guard:
 	Guardable:
 	BodyOrientation:
+	Tooltip:
+		GenericName: Ship
 	Huntable:
 	LuaScriptEvents:
 	ScriptTriggers:
@@ -300,6 +308,8 @@
 	UpdatesPlayerStatistics:
 	CombatDebugOverlay:
 	BodyOrientation:
+	Tooltip:
+		GenericName: Plane
 	Huntable:
 	LuaScriptEvents:
 	ScriptTriggers:
@@ -320,6 +330,8 @@
 
 ^Helicopter:
 	Inherits: ^Plane
+	Tooltip:
+		GenericName: Helicopter
 	GpsDot:
 		String: Helicopter
 
@@ -366,6 +378,8 @@
 		Range: 3
 	BodyOrientation:
 	FrozenUnderFog:
+	Tooltip:
+		GenericName: Structure
 	GpsDot:
 		String: Structure
 	Huntable:
@@ -434,6 +448,7 @@
 		Type: Wood
 	Tooltip:
 		Name: Civilian Building
+		GenericVisibility: None
 	ProximityCaptor:
 		Types: CivilianBuilding
 	-WithMakeAnimation:
@@ -472,6 +487,7 @@
 		Cost: 70
 	Tooltip:
 		Name: Civilian
+		GenericVisibility: None
 	Health:
 		HP: 20
 	Mobile:
@@ -551,6 +567,8 @@
 	TargetableUnit:
 		TargetTypes: Ground
 		RequiresForceFire: true
+	Tooltip:
+		GenericName: Destroyed Vehicle
 	AutoTargetIgnore:
 	Capturable:
 		Type: husk

mods/ra/rules/vehicles.yaml

@@ -245,6 +245,7 @@ HARV:
 		Cost: 1100
 	Tooltip:
 		Name: Ore Truck
+		GenericName: Harvester
 		Description: Collects Ore and Gems for processing.\n  Unarmed
 	Selectable:
 		Priority: 7