Add visible class names to all common buildings

This was SVN commit r15196.

binaries/data/mods/public/gui/session/unit_commands.js

@@ -556,6 +556,16 @@ function setupUnitPanel(guiName, usedPanels, unitEntState, playerState, items, c
 
 			case CONSTRUCTION:
 				var tooltip = getEntityNamesFormatted(template);
+
+				if (template.visibleIdentityClasses && template.visibleIdentityClasses.length)
+				{
+					tooltip += "\n[font=\"sans-bold-13\"]" + translate("Classes:") + "[/font] ";
+					tooltip += "[font=\"sans-13\"]" + translate(template.visibleIdentityClasses[0]) ;
+					for (var c = 1; c < template.visibleIdentityClasses.length; c++)
+						tooltip += ", " + translate(template.visibleIdentityClasses[c]);
+					tooltip += "[/font]";
+				}
+
 				if (template.tooltip)
 					tooltip += "\n[font=\"sans-13\"]" + template.tooltip + "[/font]";
 

binaries/data/mods/public/simulation/templates/structures/brit_blacksmith.xml

@@ -8,10 +8,10 @@
     <SpecificName>Amoridas</SpecificName>
 	<History>Figured to have it represent an armory; these were common, and not all Celts (truthfully, not even most) had to provide their own weapons. Just, they had to provide their own GOOD weapons and armor, but mass-produced spears and javelins and shields were distributed freely at need. The possession of a armory by the local lord was considered quite prestigious among the Celts, especially the larger examples found in Gaul that could maintain armies.</History>
     <RequiredTechnology>phase_village</RequiredTechnology>
-    <Classes datatype="tokens">
+    <VisibleClasses datatype="tokens">
 	  -Town
 	  Village
-	</Classes>
+	</VisibleClasses>
   </Identity>
   <ProductionQueue>
     <Technologies datatype="tokens">

binaries/data/mods/public/simulation/templates/structures/celt_blacksmith.xml

@@ -8,10 +8,10 @@
     <SpecificName>Amoridas</SpecificName>
 	<History>Figured to have it represent an armory; these were common, and not all Celts (truthfully, not even most) had to provide their own weapons. Just, they had to provide their own GOOD weapons and armor, but mass-produced spears and javelins and shields were distributed freely at need. The possession of a armory by the local lord was considered quite prestigious among the Celts, especially the larger examples found in Gaul that could maintain armies.</History>
     <RequiredTechnology>phase_village</RequiredTechnology>
-    <Classes datatype="tokens">
+    <VisibleClasses datatype="tokens">
 	  -Town
 	  Village
-	</Classes>
+	</VisibleClasses>
   </Identity>
   <ProductionQueue>
     <Technologies datatype="tokens">

binaries/data/mods/public/simulation/templates/structures/gaul_blacksmith.xml

@@ -8,10 +8,10 @@
     <SpecificName>Amoridas</SpecificName>
 	<History>Figured to have it represent an armory; these were common, and not all Celts (truthfully, not even most) had to provide their own weapons. Just, they had to provide their own GOOD weapons and armor, but mass-produced spears and javelins and shields were distributed freely at need. The possession of a armory by the local lord was considered quite prestigious among the Celts, especially the larger examples found in Gaul that could maintain armies.</History>
     <RequiredTechnology>phase_village</RequiredTechnology>
-    <Classes datatype="tokens">
+    <VisibleClasses datatype="tokens">
 	  -Town
 	  Village
-	</Classes>
+	</VisibleClasses>
   </Identity>
   <ProductionQueue>
     <Technologies datatype="tokens">

binaries/data/mods/public/simulation/templates/structures/pers_stables.xml

@@ -17,10 +17,10 @@
     <Civ>pers</Civ>
     <GenericName>Cavalry Stables</GenericName>
     <SpecificName>Paraspa</SpecificName>
-    <Classes datatype="tokens">
+    <VisibleClasses datatype="tokens">
 	  -Barracks
 	  Stables
-	</Classes>
+	</VisibleClasses>
     <History>Cavalry was primarily used as an elite assault force by the Persians.</History>
     <Tooltip>Train citizen-cavalry units.</Tooltip>
     <Icon>structures/pers_stable.png</Icon>

binaries/data/mods/public/simulation/templates/structures/rome_tent.xml

@@ -28,7 +28,7 @@
     <Civ>rome</Civ>
     <GenericName>Tent</GenericName>
     <SpecificName>Tabernāculum</SpecificName>
-    <Classes datatype="tokens">-Village</Classes>
+    <VisibleClasses datatype="tokens">-Village</VisibleClasses>
 	<Tooltip>A temporary shelter for soldiers. +5 population bonus.</Tooltip>
   </Identity>
   <Obstruction>

binaries/data/mods/public/simulation/templates/template_structure_civic.xml

@@ -12,6 +12,6 @@
   </Armour>
   <Identity>
     <GenericName>Civic Structure</GenericName>
-    <Classes datatype="tokens">Civic</Classes>
+    <VisibleClasses datatype="tokens">Civic</VisibleClasses>
   </Identity>
 </Entity>

binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml

@@ -64,8 +64,8 @@
     <Classes datatype="tokens">
       Defensive
       CivCentre
-      CivilCentre
     </Classes>
+    <VisibleClasses datatype="tokens">CivilCentre</VisibleClasses>
     <Icon>structures/civic_centre.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>

binaries/data/mods/public/simulation/templates/template_structure_civic_house.xml

@@ -29,7 +29,8 @@
   <Identity>
     <GenericName>House</GenericName>
     <Tooltip>Increase the population limit.</Tooltip>
-    <Classes datatype="tokens">Village House -ConquestCritical</Classes>
+    <Classes datatype="tokens">-ConquestCritical</Classes>
+    <VisibleClasses datatype="tokens">Village House</VisibleClasses>
     <Icon>structures/house.png</Icon>
   </Identity>
   <Loot>

binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml

@@ -35,10 +35,10 @@
   <Identity>
     <GenericName>Temple</GenericName>
     <Tooltip>Train healers. Garrison up to 20 units to heal them at a quick rate. Research healing and religious improvements. Heals nearby units, but slower than garrisoned units.</Tooltip>
-    <Classes datatype="tokens">
+    <VisibleClasses datatype="tokens">
       Town
       Temple
-    </Classes>
+    </VisibleClasses>
     <Icon>structures/temple.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>

binaries/data/mods/public/simulation/templates/template_structure_defense.xml

@@ -12,6 +12,6 @@
   </Armour>
   <Identity>
     <GenericName>Defensive Structure</GenericName>
-    <Classes datatype="tokens">Defensive</Classes>
+    <VisibleClasses datatype="tokens">Defensive</VisibleClasses>
   </Identity>
 </Entity>

binaries/data/mods/public/simulation/templates/template_structure_defense_defense_tower.xml

@@ -59,7 +59,8 @@
   <Identity>
     <GenericName>Defense Tower</GenericName>
     <Tooltip>Shoots arrows. Garrison to provide extra defense.</Tooltip>
-    <Classes datatype="tokens">DefenseTower Town Tower GarrisonTower -ConquestCritical</Classes>
+    <Classes datatype="tokens">Tower GarrisonTower -ConquestCritical</Classes>
+    <VisibleClasses datatype="tokens">Town DefenseTower</VisibleClasses>
     <Icon>structures/defense_tower.png</Icon>
 	<RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>

binaries/data/mods/public/simulation/templates/template_structure_defense_outpost.xml

@@ -56,7 +56,8 @@
   <Identity>
     <GenericName>Outpost</GenericName>
     <Tooltip>Build in neutral and friendly territories to scout areas of the map. Slowly loses health while in neutral territory.</Tooltip>
-    <Classes datatype="tokens">Outpost Village Defensive -ConquestCritical</Classes>
+    <Classes datatype="tokens">-ConquestCritical</Classes>
+    <VisibleClasses datatype="tokens">Village Outpost</VisibleClasses>
     <Icon>structures/outpost.png</Icon>
   </Identity>
   <Loot>

binaries/data/mods/public/simulation/templates/template_structure_defense_wall_gate.xml

@@ -26,7 +26,7 @@
   <Identity>
     <GenericName>City Gate</GenericName>
     <Tooltip>Allow units access through a city wall. Can be locked to prevent access.</Tooltip>
-    <Classes datatype="tokens">-ConquestCritical Defensive StoneWall Gates</Classes>
+    <Classes datatype="tokens">-ConquestCritical StoneWall Gates</Classes>
     <Icon>structures/gate.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>

binaries/data/mods/public/simulation/templates/template_structure_defense_wall_tower.xml

@@ -54,7 +54,7 @@
   <Identity>
     <GenericName>Wall Turret</GenericName>
     <Tooltip>Shoots arrows. Garrison to defend a city wall against attackers.</Tooltip>
-    <Classes datatype="tokens">Defensive -ConquestCritical StoneWall Tower</Classes>
+    <Classes datatype="tokens">-ConquestCritical StoneWall Tower</Classes>
     <Icon>structures/tower.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>

binaries/data/mods/public/simulation/templates/template_structure_economic.xml

@@ -12,6 +12,6 @@
   </Armour>
   <Identity>
     <GenericName>Economic Structure</GenericName>
-    <Classes datatype="tokens">Economic</Classes>
+    <VisibleClasses datatype="tokens">Economic</VisibleClasses>
   </Identity>
 </Entity>

binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml

@@ -20,7 +20,8 @@
   <Identity>
     <GenericName>Farmstead</GenericName>
     <Tooltip>Dropsite for the food resource. Research food gathering improvements.</Tooltip>
-    <Classes datatype="tokens">Village -ConquestCritical DropsiteFood Farmstead</Classes>
+    <Classes datatype="tokens">-ConquestCritical DropsiteFood</Classes>
+    <VisibleClasses datatype="tokens">Village Farmstead</VisibleClasses>
     <Icon>structures/farmstead.png</Icon>
   </Identity>
   <Loot>

binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml

@@ -20,7 +20,8 @@
   <Identity>
     <GenericName>Market</GenericName>
     <Tooltip>Create trade units to trade between other markets. Barter resources. Research trading and bartering improvements.</Tooltip>
-    <Classes datatype="tokens">Town Market BarterMarket -ConquestCritical</Classes>
+    <Classes datatype="tokens">BarterMarket -ConquestCritical</Classes>
+    <VisibleClasses datatype="tokens">Town Market</VisibleClasses>
     <Icon>structures/market.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>

binaries/data/mods/public/simulation/templates/template_structure_economic_storehouse.xml

@@ -21,13 +21,12 @@
     <GenericName>Storehouse</GenericName>
     <Tooltip>Dropsite for wood, stone, and metal resources. Research gathering improvements for these resources.</Tooltip>
     <Classes datatype="tokens">
-	  Storehouse
-	  Village
 	  DropsiteWood
 	  DropsiteMetal
 	  DropsiteStone
 	  -ConquestCritical
 	</Classes>
+    <VisibleClasses datatype="tokens">Village Storehouse</VisibleClasses>
     <Icon>structures/storehouse.png</Icon>
   </Identity>
   <Loot>

binaries/data/mods/public/simulation/templates/template_structure_military.xml

@@ -12,6 +12,6 @@
   </Armour>
   <Identity>
     <GenericName>Military Structure</GenericName>
-    <Classes datatype="tokens">Military</Classes>
+    <VisibleClasses datatype="tokens">Military</VisibleClasses>
   </Identity>
 </Entity>

binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml

@@ -28,10 +28,10 @@
   <Identity>
     <GenericName>Barracks</GenericName>
     <Tooltip>Train citizen-soldiers. Research training improvements. Garrison: 10.</Tooltip>
-    <Classes datatype="tokens">
+    <VisibleClasses datatype="tokens">
 	  Village
 	  Barracks
-	</Classes>
+	</VisibleClasses>
     <Icon>structures/barracks.png</Icon>
     <RequiredTechnology>phase_village</RequiredTechnology>
   </Identity>

binaries/data/mods/public/simulation/templates/template_structure_military_blacksmith.xml

@@ -28,10 +28,10 @@
   <Identity>
     <GenericName>Blacksmith</GenericName>
     <Tooltip>Research weapons and armor improvements.</Tooltip>
-    <Classes datatype="tokens">
+    <VisibleClasses datatype="tokens">
 	  Town
 	  Blacksmith
-	</Classes>
+	</VisibleClasses>
     <Icon>structures/blacksmith.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>

binaries/data/mods/public/simulation/templates/template_structure_military_dock.xml

@@ -23,7 +23,8 @@
   <Identity>
     <GenericName>Dock</GenericName>
     <Tooltip>Build upon a shoreline to construct naval vessels and to open sea trade. Research naval improvements.</Tooltip>
-    <Classes datatype="tokens">Village Naval Market NavalMarket Dock</Classes>
+    <Classes datatype="tokens">Naval NavalMarket</Classes>
+    <VisibleClasses datatype="tokens">Economic Village Market Dock</VisibleClasses>
     <Icon>structures/dock.png</Icon>
   </Identity>
   <Loot>

binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml

@@ -21,10 +21,10 @@
   </Health>
   <Identity>
     <Civ>cart</Civ>
-    <Classes datatype="tokens">
+    <VisibleClasses datatype="tokens">
 	  Town
 	  Embassy
-	</Classes>
+	</VisibleClasses>
     <GenericName>Embassy</GenericName>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
@@ -57,4 +57,4 @@
   <VisualActor>
     <FoundationActor>structures/fndn_3x3.xml</FoundationActor>
   </VisualActor>
-</Entity>
+</Entity>

binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml

@@ -59,12 +59,12 @@
   <Identity>
     <GenericName>Fortress</GenericName>
     <Tooltip>Train heroes, champions, and siege weapons. Research siege weapon improvements. Garrison: 20.</Tooltip>
-    <Classes datatype="tokens">
+    <Classes datatype="tokens">GarrisonFortress</Classes>
-      City
+    <VisibleClasses datatype="tokens">
       Defensive
-      GarrisonFortress
+      City
       Fortress
-    </Classes>
+    </VisibleClasses>
     <Icon>structures/fortress.png</Icon>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>

binaries/data/mods/public/simulation/templates/template_structure_resource.xml

@@ -15,7 +15,8 @@
   </BuildRestrictions>
   <Identity>
     <GenericName>Resource Structure</GenericName>
-	<Classes datatype="tokens">-ConquestCritical Resource</Classes>
+	<Classes datatype="tokens">-ConquestCritical</Classes>
+	<VisibleClasses datatype="tokens">Resource</VisibleClasses>
   </Identity>
   <Vision>
     <Range>4</Range>

binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml

@@ -25,10 +25,10 @@
   <Identity>
     <GenericName>Corral</GenericName>
     <Tooltip>Raise herd animals for food. Task domestic animals here to gain a trickle of food or other bonus (Not yet implemented).</Tooltip>
-    <Classes datatype="tokens">
+    <VisibleClasses datatype="tokens">
 	  Village
 	  Corral
-	</Classes>
+	</VisibleClasses>
     <Icon>structures/corral.png</Icon>
   </Identity>
   <Loot>

binaries/data/mods/public/simulation/templates/template_structure_resource_field.xml

@@ -22,7 +22,7 @@
   </Health>
   <Identity>
     <GenericName>Field</GenericName>
-	<Classes datatype="tokens">Field</Classes>
+	<VisibleClasses datatype="tokens">Field</VisibleClasses>
     <Tooltip>Harvest vegetables for food. Max gatherers: 5.</Tooltip>
     <History>Farming originated around 9500 BC in India and the Middle East. The history of agriculture is a central element of human history, as agricultural progress has been a crucial factor in worldwide socio-economic change. Wealth-building and militaristic specializations rarely seen in hunter-gatherer cultures are commonplace in agricultural and agro-industrial societies - when farmers became capable of producing food beyond the needs of their own families, others in the tribe/nation/empire were freed to devote themselves to projects other than food acquisition.</History>
     <Icon>structures/field.png</Icon>