Merge pull request #10372 from Mailaender/cnc-tooltips

Added tooltips for civilian buildings to Tiberian Dawn
2016-02-21 10:01:30 +01:00
parent eedf5ce6f4 c420d24fb3
commit 5db994b83f
16 changed files with 237 additions and 19 deletions
--- a/mods/cnc/maps/funpark01/map.yaml
+++ b/mods/cnc/maps/funpark01/map.yaml
@@ -479,7 +479,7 @@ Rules:
 			ShowOwnerRow: false
 	^Building:
 		Tooltip:
-			GenericVisibility: Enemy
+			GenericVisibility: Enemy, Neutral
 			ShowOwnerRow: false
 	^Wall:
 		Tooltip:
@@ -493,6 +493,13 @@ Rules:
 		-ActorLostNotification:
 	^CivBuilding:
 		AnnounceOnSeen:
+		Tooltip:
+			GenericVisibility: Enemy, Neutral
+			ShowOwnerRow: false
+	^CivBuildingHusk:
+		Tooltip:
+			GenericVisibility: Enemy, Neutral
+			ShowOwnerRow: false
 	OLDLST:
 		Inherits: LST
 		-WithRoof:
--- a/mods/cnc/maps/gdi03/map.yaml
+++ b/mods/cnc/maps/gdi03/map.yaml
@@ -780,7 +780,15 @@ Rules:
 			ShowOwnerRow: false
 	^Building:
 		Tooltip:
-			GenericVisibility: Enemy
+			GenericVisibility: Enemy, Neutral
+			ShowOwnerRow: false
+	^CivBuilding:
+		Tooltip:
+			GenericVisibility: Enemy, Neutral
+			ShowOwnerRow: false
+	^CivBuildingHusk:
+		Tooltip:
+			GenericVisibility: Enemy, Neutral
 			ShowOwnerRow: false
 	^Wall:
 		Tooltip:
--- a/mods/cnc/maps/gdi04c/map.yaml
+++ b/mods/cnc/maps/gdi04c/map.yaml
@@ -839,7 +839,7 @@ Rules:
 			ShowOwnerRow: false
 	^Building:
 		Tooltip:
-			GenericVisibility: Enemy
+			GenericVisibility: Enemy, Neutral
 			ShowOwnerRow: false
 	^Wall:
 		Tooltip:
@@ -854,6 +854,14 @@ Rules:
 	^CivInfantry:
 		Health:
 			HP: 125
+	^CivBuilding:
+		Tooltip:
+			GenericVisibility: Enemy, Neutral
+			ShowOwnerRow: false
+	^CivBuildingHusk:
+		Tooltip:
+			GenericVisibility: Enemy, Neutral
+			ShowOwnerRow: false
 	^Bridge:
 		DamageMultiplier@INVULNERABLE:
 			Modifier: 0
--- a/mods/cnc/maps/gdi06/map.yaml
+++ b/mods/cnc/maps/gdi06/map.yaml
@@ -1123,7 +1123,7 @@ Rules:
 			ShowOwnerRow: false
 	^Building:
 		Tooltip:
-			GenericVisibility: Enemy
+			GenericVisibility: Enemy, Neutral
 			ShowOwnerRow: false
 	^Wall:
 		Tooltip:
--- a/mods/cnc/maps/nod01/map.yaml
+++ b/mods/cnc/maps/nod01/map.yaml
@@ -314,6 +314,13 @@ Rules:
 			Modifier: 0
 	^CivBuilding:
 		MustBeDestroyed:
+		Tooltip:
+			GenericVisibility: Enemy, Neutral
+			ShowOwnerRow: false
+	^CivBuildingHusk:
+		Tooltip:
+			GenericVisibility: Enemy, Neutral
+			ShowOwnerRow: false
 	^CivInfantry:
 		MustBeDestroyed:
 	^Vehicle:
@@ -350,7 +357,7 @@ Rules:
 			ShowOwnerRow: false
 	^Building:
 		Tooltip:
-			GenericVisibility: Enemy
+			GenericVisibility: Enemy, Neutral
 			ShowOwnerRow: false
 	^Wall:
 		Tooltip:
--- a/mods/cnc/maps/nod03a/map.yaml
+++ b/mods/cnc/maps/nod03a/map.yaml
@@ -516,7 +516,15 @@ Rules:
 			ShowOwnerRow: false
 	^Building:
 		Tooltip:
-			GenericVisibility: Enemy
+			GenericVisibility: Enemy, Neutral
+			ShowOwnerRow: false
+	^CivBuilding:
+		Tooltip:
+			GenericVisibility: Enemy, Neutral
+			ShowOwnerRow: false
+	^CivBuildingHusk:
+		Tooltip:
+			GenericVisibility: Enemy, Neutral
 			ShowOwnerRow: false
 	^Wall:
 		Tooltip:
--- a/mods/cnc/maps/nod03b/map.yaml
+++ b/mods/cnc/maps/nod03b/map.yaml
@@ -560,7 +560,15 @@ Rules:
 			ShowOwnerRow: false
 	^Building:
 		Tooltip:
-			GenericVisibility: Enemy
+			GenericVisibility: Enemy, Neutral
+			ShowOwnerRow: false
+	^CivBuilding:
+		Tooltip:
+			GenericVisibility: Enemy, Neutral
+			ShowOwnerRow: false
+	^CivBuildingHusk:
+		Tooltip:
+			GenericVisibility: Enemy, Neutral
 			ShowOwnerRow: false
 	^Wall:
 		Tooltip:
--- a/mods/cnc/maps/nod04a/map.yaml
+++ b/mods/cnc/maps/nod04a/map.yaml
@@ -625,17 +625,19 @@ Rules:
 			ShowOwnerRow: false
 	^Building:
 		Tooltip:
-			GenericVisibility: Enemy
+			GenericVisibility: Enemy, Neutral
 			ShowOwnerRow: false
 	^Wall:
 		Tooltip:
 			ShowOwnerRow: false
 	^CivBuilding:
 		Tooltip:
+			GenericVisibility: Enemy, Neutral
 			ShowOwnerRow: false
 		AnnounceOnSeen:
 	^CivBuildingHusk:
 		Tooltip:
+			GenericVisibility: Enemy, Neutral
 			ShowOwnerRow: false
 		AnnounceOnSeen:
 	^CommonHuskDefaults:
--- a/mods/cnc/maps/nod04b/map.yaml
+++ b/mods/cnc/maps/nod04b/map.yaml
@@ -555,16 +555,18 @@ Rules:
 			PlayerPalette: player-units
 	^Building:
 		Tooltip:
-			GenericVisibility: Enemy
+			GenericVisibility: Enemy, Neutral
 			ShowOwnerRow: false
 	^Wall:
 		Tooltip:
 			ShowOwnerRow: false
 	^CivBuilding:
 		Tooltip:
+			GenericVisibility: Enemy, Neutral
 			ShowOwnerRow: false
 	^CivBuildingHusk:
 		Tooltip:
+			GenericVisibility: Enemy, Neutral
 			ShowOwnerRow: false
 	^CommonHuskDefaults:
 		Tooltip:
--- a/mods/cnc/maps/nod05/map.yaml
+++ b/mods/cnc/maps/nod05/map.yaml
@@ -459,7 +459,15 @@ Rules:
 			ShowOwnerRow: false
 	^Building:
 		Tooltip:
-			GenericVisibility: Enemy
+			GenericVisibility: Enemy, Neutral
+			ShowOwnerRow: false
+	^CivBuilding:
+		Tooltip:
+			GenericVisibility: Enemy, Neutral
+			ShowOwnerRow: false
+	^CivBuildingHusk:
+		Tooltip:
+			GenericVisibility: Enemy, Neutral
 			ShowOwnerRow: false
 	^Wall:
 		Tooltip:
--- a/mods/cnc/maps/nod06a/map.yaml
+++ b/mods/cnc/maps/nod06a/map.yaml
@@ -730,7 +730,11 @@ Rules:
 			ShowOwnerRow: false
 	^Building:
 		Tooltip:
-			GenericVisibility: Enemy
+			GenericVisibility: Enemy, Neutral
+			ShowOwnerRow: false
+	^CivBuilding:
+		Tooltip:
+			GenericVisibility: Enemy, Neutral
 			ShowOwnerRow: false
 	^CommonHuskDefaults:
 		Tooltip:
@@ -740,6 +744,7 @@ Rules:
 			PlayerPalette: player-units
 	^CivBuildingHusk:
 		Tooltip:
+			GenericVisibility: Enemy, Neutral
 			ShowOwnerRow: false
 	HARV:
 		Harvester:
--- a/mods/cnc/maps/nod06b/map.yaml
+++ b/mods/cnc/maps/nod06b/map.yaml
@@ -673,7 +673,11 @@ Rules:
 			ShowOwnerRow: false
 	^Building:
 		Tooltip:
-			GenericVisibility: Enemy
+			GenericVisibility: Enemy, Neutral
+			ShowOwnerRow: false
+	^CivBuilding:
+		Tooltip:
+			GenericVisibility: Enemy, Neutral
 			ShowOwnerRow: false
 	^CommonHuskDefaults:
 		Tooltip:
@@ -683,6 +687,7 @@ Rules:
 			PlayerPalette: player-units
 	^CivBuildingHusk:
 		Tooltip:
+			GenericVisibility: Enemy, Neutral
 			ShowOwnerRow: false
 	FLARE:
 		Tooltip:
--- a/mods/cnc/maps/nod06c/map.yaml
+++ b/mods/cnc/maps/nod06c/map.yaml
@@ -557,7 +557,11 @@ Rules:
 			ShowOwnerRow: false
 	^Building:
 		Tooltip:
-			GenericVisibility: Enemy
+			GenericVisibility: Enemy, Neutral
+			ShowOwnerRow: false
+	^CivBuilding:
+		Tooltip:
+			GenericVisibility: Enemy, Neutral
 			ShowOwnerRow: false
 	^CommonHuskDefaults:
 		Tooltip:
@@ -565,6 +569,10 @@ Rules:
 			ShowOwnerRow: false
 		RenderSprites:
 			PlayerPalette: player-units
+	^CivBuildingHusk:
+		Tooltip:
+			GenericVisibility: Enemy, Neutral
+			ShowOwnerRow: false
 	^Bridge:
 		DamageMultiplier@INVULNERABLE:
 			Modifier: 0
--- a/mods/cnc/rules/civilian-desert.yaml
+++ b/mods/cnc/rules/civilian-desert.yaml
@@ -7,6 +7,8 @@ V20:
 		Actor: V20.Husk
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
+	Tooltip:
+		Name: Sala's House

 V20.Husk:
 	Inherits: ^CivBuildingHusk
@@ -15,6 +17,8 @@ V20.Husk:
 		Dimensions: 2,2
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
+	Tooltip:
+		Name: Sala's House (Destroyed)

 V21:
 	Inherits: ^CivBuilding
@@ -25,6 +29,8 @@ V21:
 		Actor: V21.Husk
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
+	Tooltip:
+		Name: Abdul's House

 V21.Husk:
 	Inherits: ^CivBuildingHusk
@@ -33,6 +39,8 @@ V21.Husk:
 		Dimensions: 2,2
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
+	Tooltip:
+		Name: Abdul's House (Destroyed)

 V22:
 	Inherits: ^CivBuilding
@@ -43,6 +51,8 @@ V22:
 		Actor: V22.Husk
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
+	Tooltip:
+		Name: Pablo's Wicked Pub

 V22.Husk:
 	Inherits: ^CivBuildingHusk
@@ -51,6 +61,8 @@ V22.Husk:
 		Dimensions: 2,1
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
+	Tooltip:
+		Name: Pablo's Wicked Pub (Destroyed)

 V23:
 	Inherits: ^CivBuilding
@@ -58,11 +70,15 @@ V23:
 		Actor: V23.Husk
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
+	Tooltip:
+		Name: Village Well

 V23.Husk:
 	Inherits: ^CivBuildingHusk
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
+	Tooltip:
+		Name: Village Well (Destroyed)

 V24:
 	Inherits: ^CivBuilding
@@ -73,6 +89,8 @@ V24:
 		Actor: V24.Husk
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
+	Tooltip:
+		Name: Camel Trader

 V24.Husk:
 	Inherits: ^CivBuildingHusk
@@ -81,6 +99,8 @@ V24.Husk:
 		Dimensions: 2,2
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
+	Tooltip:
+		Name: Camel Trader (Destroyed)

 V25:
 	Inherits: ^CivBuilding
@@ -113,6 +133,8 @@ V26:
 		Actor: V26.Husk
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
+	Tooltip:
+		Name: Ali's House

 V26.Husk:
 	Inherits: ^CivBuildingHusk
@@ -121,6 +143,8 @@ V26.Husk:
 		Dimensions: 2,1
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
+	Tooltip:
+		Name: Ali's House (Destroyed)

 V27:
 	Inherits: ^CivBuilding
@@ -128,11 +152,15 @@ V27:
 		Actor: V27.Husk
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
+	Tooltip:
+		Name: Trader Ted's

 V27.Husk:
 	Inherits: ^CivBuildingHusk
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
+	Tooltip:
+		Name: Trader Ted's (Destroyed)

 V28:
 	Inherits: ^CivBuilding
@@ -140,11 +168,15 @@ V28:
 		Actor: V28.Husk
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
+	Tooltip:
+		Name: Menelik's House

 V28.Husk:
 	Inherits: ^CivBuildingHusk
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
+	Tooltip:
+		Name: Menelik's House (Destroyed)

 V29:
 	Inherits: ^CivBuilding
@@ -152,11 +184,15 @@ V29:
 		Actor: V29.Husk
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
+	Tooltip:
+		Name: Prestor John's House

 V29.Husk:
 	Inherits: ^CivBuildingHusk
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
+	Tooltip:
+		Name: Prestor John's House (Destroyed)

 V30:
 	Inherits: ^CivBuilding
@@ -167,6 +203,8 @@ V30:
 		Actor: V30.Husk
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
+	Tooltip:
+		Name: Village Well

 V30.Husk:
 	Inherits: ^CivBuildingHusk
@@ -175,6 +213,8 @@ V30.Husk:
 		Dimensions: 2,1
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
+	Tooltip:
+		Name: Village Well (Destroyed)

 V31:
 	Inherits: ^CivBuilding
@@ -185,6 +225,8 @@ V31:
 		Actor: V31.Husk
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
+	Tooltip:
+		Name: Witch Doctor's Hut

 V31.Husk:
 	Inherits: ^CivBuildingHusk
@@ -193,6 +235,8 @@ V31.Husk:
 		Dimensions: 2,1
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
+	Tooltip:
+		Name: Witch Doctor's Hut (Destroyed)

 V32:
 	Inherits: ^CivBuilding
@@ -203,6 +247,8 @@ V32:
 		Actor: V32.Husk
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
+	Tooltip:
+		Name: Rikitikitembo's Hut

 V32.Husk:
 	Inherits: ^CivBuildingHusk
@@ -211,6 +257,8 @@ V32.Husk:
 		Dimensions: 2,1
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
+	Tooltip:
+		Name: Rikitikitembo's Hut (Destroyed)

 V33:
 	Inherits: ^CivBuilding
@@ -221,6 +269,8 @@ V33:
 		Actor: V33.Husk
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
+	Tooltip:
+		Name: Roarke's Hut

 V33.Husk:
 	Inherits: ^CivBuildingHusk
@@ -229,6 +279,8 @@ V33.Husk:
 		Dimensions: 2,1
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
+	Tooltip:
+		Name: Roarke's Hut (Destroyed)

 V34:
 	Inherits: ^CivBuilding
@@ -236,11 +288,15 @@ V34:
 		Actor: V34.Husk
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
+	Tooltip:
+		Name: Mubasa's Hut

 V34.Husk:
 	Inherits: ^CivBuildingHusk
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
+	Tooltip:
+		Name: Mubasa's Hut (Destroyed)

 V35:
 	Inherits: ^CivBuilding
@@ -248,11 +304,15 @@ V35:
 		Actor: V35.Husk
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
+	Tooltip:
+		Name: Aksum's Hut

 V35.Husk:
 	Inherits: ^CivBuildingHusk
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
+	Tooltip:
+		Name: Aksum's Hut (Destroyed)

 V36:
 	Inherits: ^CivBuilding
@@ -260,11 +320,15 @@ V36:
 		Actor: V36.Husk
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
+	Tooltip:
+		Name: Mambo's Hut

 V36.Husk:
 	Inherits: ^CivBuildingHusk
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
+	Tooltip:
+		Name: Mambo's Hut (Destroyed)

 V37:
 	Inherits: ^CivBuilding
@@ -275,6 +339,8 @@ V37:
 		Dimensions: 5,2
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
+	Tooltip:
+		Name: The Studio

 V37.Husk:
 	Inherits: ^CivBuildingHusk
@@ -283,3 +349,5 @@ V37.Husk:
 		Dimensions: 5,2
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
+	Tooltip:
+		Name: The Studio (Destroyed)
--- a/mods/cnc/rules/civilian.yaml
+++ b/mods/cnc/rules/civilian.yaml
@@ -29,6 +29,8 @@ V02:
 		Actor: V02.Husk
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
+	Tooltip:
+		Name: Han's and Gretel's

 V02.Husk:
 	Inherits: ^CivBuildingHusk
@@ -37,6 +39,8 @@ V02.Husk:
 		Dimensions: 2,2
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
+	Tooltip:
+		Name: Han's and Gretel's (Destroyed)

 V03:
 	Inherits: ^CivBuilding
@@ -47,6 +51,8 @@ V03:
 		Actor: V03.Husk
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
+	Tooltip:
+		Name: Hewitt's House

 V03.Husk:
 	Inherits: ^CivBuildingHusk
@@ -55,6 +61,8 @@ V03.Husk:
 		Dimensions: 2,2
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
+	Tooltip:
+		Name: Hewitt's House (Destroyed)

 V04:
 	Inherits: ^CivBuilding
@@ -65,6 +73,8 @@ V04:
 		Actor: V04.Husk
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
+	Tooltip:
+		Name: Ricktor's House

 V04.Husk:
 	Inherits: ^CivBuildingHusk
@@ -73,6 +83,8 @@ V04.Husk:
 		Dimensions: 2,2
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
+	Tooltip:
+		Name: Ricktor's House (Destroyed)

 V05:
 	Inherits: ^CivBuilding
@@ -83,6 +95,8 @@ V05:
 		Actor: V05.Husk
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
+	Tooltip:
+		Name: Gretchkin's house

 V05.Husk:
 	Inherits: ^CivBuildingHusk
@@ -91,6 +105,8 @@ V05.Husk:
 		Dimensions: 2,1
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
+	Tooltip:
+		Name: Gretchkin's house (Destroyed)

 V06:
 	Inherits: ^CivBuilding
@@ -101,6 +117,8 @@ V06:
 		Actor: V06.Husk
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
+	Tooltip:
+		Name: The Barn

 V06.Husk:
 	Inherits: ^CivBuildingHusk
@@ -109,6 +127,8 @@ V06.Husk:
 		Dimensions: 2,1
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
+	Tooltip:
+		Name: The Barn (Destroyed)

 V07:
 	Inherits: ^CivBuilding
@@ -119,6 +139,8 @@ V07:
 		Actor: V07.Husk
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
+	Tooltip:
+		Name: Damon's Pub

 V07.Husk:
 	Inherits: ^CivBuildingHusk
@@ -127,6 +149,8 @@ V07.Husk:
 		Dimensions: 2,1
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
+	Tooltip:
+		Name: Damon's Pub (Destroyed)

 V08:
 	Inherits: ^CivBuilding
@@ -134,11 +158,15 @@ V08:
 		Actor: V08.Husk
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
+	Tooltip:
+		Name: Fran's House

 V08.Husk:
 	Inherits: ^CivBuildingHusk
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
+	Tooltip:
+		Name: Fran's House (Destroyed)

 V09:
 	Inherits: ^CivBuilding
@@ -146,11 +174,15 @@ V09:
 		Actor: V09.Husk
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
+	Tooltip:
+		Name: Music Factory

 V09.Husk:
 	Inherits: ^CivBuildingHusk
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
+	Tooltip:
+		Name: Music Factory (Destroyed)

 V10:
 	Inherits: ^CivBuilding
@@ -158,11 +190,15 @@ V10:
 		Actor: V10.Husk
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
+	Tooltip:
+		Name: Toymaker's

 V10.Husk:
 	Inherits: ^CivBuildingHusk
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
+	Tooltip:
+		Name: Toymaker's (Destroyed)

 V11:
 	Inherits: ^CivBuilding
@@ -170,11 +206,15 @@ V11:
 		Actor: V11.Husk
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
+	Tooltip:
+		Name: Ludwig's House

 V11.Husk:
 	Inherits: ^CivBuildingHusk
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
+	Tooltip:
+		Name: Ludwig's House (Destroyed)

 V12:
 	Inherits: ^CivField
@@ -182,11 +222,15 @@ V12:
 		Actor: V12.Husk
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
+	Tooltip:
+		Name: Haystacks

 V12.Husk:
 	Inherits: ^CivBuildingHusk
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
+	Tooltip:
+		Name: Haystacks (Destroyed)

 V13:
 	Inherits: ^CivField
@@ -194,11 +238,15 @@ V13:
 		Actor: V13.Husk
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
+	Tooltip:
+		Name: Haystacks

 V13.Husk:
 	Inherits: ^CivBuildingHusk
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
+	Tooltip:
+		Name: Haystacks (Destroyed)

 V14:
 	Inherits: ^CivField
@@ -206,11 +254,15 @@ V14:
 		Actor: V14.Husk
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
+	Tooltip:
+		Name: Wheat Field

 V14.Husk:
 	Inherits: ^CivFieldHusk
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
+	Tooltip:
+		Name: Wheat Field (Destroyed)

 V15:
 	Inherits: ^CivField
@@ -218,11 +270,15 @@ V15:
 		Actor: V15.Husk
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
+	Tooltip:
+		Name: Fallow Field

 V15.Husk:
 	Inherits: ^CivFieldHusk
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
+	Tooltip:
+		Name: Fallow Field (Destroyed)

 V16:
 	Inherits: ^CivField
@@ -230,11 +286,15 @@ V16:
 		Actor: V16.Husk
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
+	Tooltip:
+		Name: Corn Field

 V16.Husk:
 	Inherits: ^CivFieldHusk
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
+	Tooltip:
+		Name: Corn Field (Destroyed)

 V17:
 	Inherits: ^CivField
@@ -242,11 +302,15 @@ V17:
 		Actor: V17.Husk
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
+	Tooltip:
+		Name: Celery Field

 V17.Husk:
 	Inherits: ^CivFieldHusk
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
+	Tooltip:
+		Name: Celery Field (Destroyed)

 V18:
 	Inherits: ^CivField
@@ -254,11 +318,15 @@ V18:
 		Actor: V18.Husk
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
+	Tooltip:
+		Name: Potato Field

 V18.Husk:
 	Inherits: ^CivFieldHusk
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
+	Tooltip:
+		Name: Potato Field (Destroyed)

 ARCO:
 	Inherits: ^CivBuilding
@@ -267,19 +335,23 @@ ARCO:
 		Dimensions: 2,1
 	SpawnActorOnDeath:
 		Actor: ARCO.Husk
+	Tooltip:
+		Name: Oil Pump

 ARCO.Husk:
 	Inherits: ^CivBuildingHusk
 	Building:
 		Footprint: xx
 		Dimensions: 2,1
+	Tooltip:
+		Name: Oil Pump (Destroyed)

 BARB:
 	Inherits: ^Wall
 	Armor:
 		Type: Light
 	Tooltip:
-		Name: Wire Fence
+		Name: Barbwire Fence
 		Icon: barbicnh
 	LineBuild:
 		NodeTypes: barbwire
--- a/mods/cnc/rules/defaults.yaml
+++ b/mods/cnc/rules/defaults.yaml
@@ -508,8 +508,9 @@
 	Health:
 		HP: 400
 	Tooltip:
-		Name: Civilian Building
-		GenericVisibility: None
+		GenericName: Civilian Building
+		GenericStancePrefix: false
+		ShowOwnerRow: false
 	FrozenUnderFog:
 		StartsRevealed: true

@@ -521,8 +522,9 @@
 		Footprint: x
 	WithSpriteBody:
 	Tooltip:
-		Name: Civilian Building (Destroyed)
-		GenericVisibility: None
+		GenericName: Civilian Building (Destroyed)
+		GenericStancePrefix: false
+		ShowOwnerRow: false
 	FrozenUnderFog:
 		StartsRevealed: true
 	ScriptTriggers:
@@ -543,7 +545,7 @@
 	Inherits: ^CivBuilding
 	-Selectable:
 	Tooltip:
-		Name: Field
+		GenericName: Field
 	-WithBuildingExplosion:
 	-Targetable:
 	-Demolishable: