Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit/champion_chariot_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit/champion_chariot_barracks.xml	(revision 24469)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit/champion_chariot_barracks.xml	(nonexistent)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/brit/champion_chariot">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>

Property changes on: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit/champion_chariot_barracks.xml
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/xml
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul/champion_cavalry_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul/champion_cavalry_barracks.xml	(revision 24469)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul/champion_cavalry_barracks.xml	(nonexistent)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/gaul/champion_cavalry">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>

Property changes on: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul/champion_cavalry_barracks.xml
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/xml
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/iber/champion_cavalry_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/iber/champion_cavalry_barracks.xml	(revision 24469)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/iber/champion_cavalry_barracks.xml	(nonexistent)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/iber/champion_cavalry">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>

Property changes on: ps/trunk/binaries/data/mods/public/simulation/templates/units/iber/champion_cavalry_barracks.xml
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/xml
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/champion_cavalry_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/champion_cavalry_barracks.xml	(revision 24469)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/champion_cavalry_barracks.xml	(nonexistent)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/mace/champion_cavalry">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>

Property changes on: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/champion_cavalry_barracks.xml
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/xml
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome/champion_cavalry_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome/champion_cavalry_barracks.xml	(revision 24469)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome/champion_cavalry_barracks.xml	(nonexistent)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/rome/champion_cavalry">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>

Property changes on: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome/champion_cavalry_barracks.xml
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/xml
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/pers.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/civs/pers.json	(revision 24469)
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/pers.json	(revision 24470)
@@ -1,171 +1,162 @@
 {
 	"Code": "pers",
 	"Culture": "pers",
 	"Name": "Persians",
 	"Emblem": "session/portraits/emblems/emblem_persians.png",
 	"History": "The Persian Empire, when ruled by the Achaemenid dynasty, was one of the greatest empires of antiquity, stretching at its zenith from the Indus Valley in the east to Greece in the west. The Persians were the pioneers of empire-building of the ancient world, successfully imposing a centralized rule over various peoples with different customs, laws, religions and languages, and building a cosmopolitan army made up of contingents from each of these nations.",
 	"Music": [
 		{
 			"File": "Eastern_Dreams.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Valley_of_the_Nile.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Land_between_the_two_Seas.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Sands_of_Time.ogg",
 			"Type": "peace"
 		}
 	],
 	"Factions": [
 		{
 			"Name": "",
 			"Description": "",
 			"Technologies": [
 				{
 					"Name": "Archery Tradition",
 					"History": "The Iranian peoples had a tradition of fine archery and a penchant for using massed archers in battle.",
 					"Description": "Archers −10% training time, +8 attack range, and −10% ranged attack spread."
 				},
 				{
 					"Name": "Naval Craftsmanship",
 					"History": "Early Achaemenid rulers acted towards making Persia the first great Asian empire to rule the seas. The Great King behaved favourably towards the various sea peoples in order to secure their services, but also carried out various marine initiatives. During the reign of Darius the Great, for example, a canal was built in Egypt and a Persian navy was sent exploring the Indus river. According to Herodotus, some 300 ships in the Persian navy were retrofitted to carry horses and their riders.",
 					"Description": "Phoenician triremes gain the unique ability to train cavalry."
 				},
 				{
 					"Name": "Persian Architecture",
 					"History": "The Persians built the wonderful 2700 kilometer-long Royal Highway from Sardis to Susa; Darius the Great and Xerxes also built the magnificent Persepolis; Cyrus the Great greatly improved Ecbatana and virtually 'rebuilt' the old Elamite capital of Susa.",
 					"Description": "Increases hitpoints of all structures, but build time increased appropriately."
 				},
 				{
 					"Name": "Immortals",
 					"History": "The Achaemenids maintained a 10,000-strong elite corps, referred to as Athanatoi (“Immortals”) by Greek authors.",
 					"Description": "Anušiya Champion Infantry -50% train time, but also -10% health."
 				},
 				{
 					"Name": "Nisean War Horses",
 					"History": "The beautiful and powerful breed of Nisean horses increases health for Persian cavalry.",
 					"Description": "+25% health for cavalry, but +10% train time."
 				}
 			],
 			"Heroes": [
 				{
 					"Name": "Kurush II",
 					"Class": "",
 					"Armament": "",
 					"Emblem": "",
 					"History": "Cyrus (ruled 559-530 B.C.) The son of a Median princess and the ruler of Anshan; justly called the 'Father of the Empire', Cyrus the Great conquered Media, Lydia, Babylonia and Bactria, thereby establishing the Persian Empire. He was also renown as a benevolent conqueror. (OP - Kurush). Technically the second ruler of the Persians by that name, and so appears as Kurush II on his documents and coins. Kurush I was his grandfather."
 				},
 				{
 					"Name": "Darayavahush I",
 					"Class": "",
 					"Armament": "",
 					"Emblem": "",
 					"History": "Darius (ruled 522-486 B.C.) The son of Vishtaspa (Hystaspes), the satrap of Parthia and Hyrcania; a great administrator as well as a decent general, Darius introduced the division of the empire into satrapies and conquered NW India, Thrace and Macedonia. He was called the 'Merchant of the Empire'."
 				},
 				{
 					"Name": "Xsayarsa I",
 					"Class": "",
 					"Armament": "",
 					"Emblem": "",
 					"History": "Xerxes (ruled 485-465 B.C.) The son of Darius the Great and Atoosa, a daughter of Cyrus the Great, Xerxes was an able administrator, who also extended Imperial rule into Chorasmia. Apart from his failed invasion of Greece, he was famous for his extensive building programme, especially at Persepolis."
 				}
 			]
 		}
 	],
 	"CivBonuses": [
 		{
 			"Name": "Great King's Levy",
 			"History": "The Persians could and did levy a large number of infantry during wartime due to the sheer size of the Achaemenid Empire and the way in which it was set-up. In general the Persian infantry was well trained and fought with great tenacity. However while this was true the infantry were poor hand-to-hand, close combat fighters. Also, with the exception of the elite regiments, the Persian infantry was not a standing professional force.",
 			"Description": "Persians have a +10% population cap bonus (e.g. 330 pop cap instead of the usual 300)."
 		}
 	],
 	"TeamBonuses": [
 		{
 			"Name": "Royal Road",
 			"History": "Coinage was invented by the Lydians in 7th Century B.C., but it was not very common until the Persian period. Darius the Great standardized coined money and his golden coins (known as 'darics') became commonplace not only throughout his empire, but as far to the west as Central Europe.",
 			"Description": "Allied Land Traders +15% trade gain."
 		}
 	],
 	"Structures": [
 		{
-			"Name": "Stable",
-			"Class": "",
-			"Emblem": "",
-			"History": "The Persian Empire's best soldiers were Eastern horsemen.",
-			"Phase": "Village",
-			"Requirements": "",
-			"Special": "Train Cavalry and research Cavalry technologies."
-		},
-		{
 			"Name": "Apadana",
 			"Class": "",
 			"Emblem": "",
 			"History": "The term Apadana designates a large hypostyle palace found in Persia. The best known example, and by far the largest, was the great Apadana at Persepolis. Functioning as the empire's central audience hall, the palace is famous for the reliefs of the tribute-bearers and of the army, including the Immortals.",
 			"Requirements": "",
 			"Phase": "City",
 			"Special": "Train heroes and Persian Immortals. Gives a slow trickle of all resources as 'Satrapy Tribute.'"
 		}
 	],
 	"WallSets": [
 		"structures/wallset_palisade",
 		"structures/pers/wallset_stone"
 	],
 	"StartEntities": [
 		{
 			"Template": "structures/pers/civil_centre"
 		},
 		{
 			"Template": "units/pers/support_female_citizen",
 			"Count": 4
 		},
 		{
 			"Template": "units/pers/infantry_spearman_b",
 			"Count": 2
 		},
 		{
 			"Template": "units/pers/infantry_archer_b",
 			"Count": 2
 		},
 		{
 			"Template": "units/pers/cavalry_javelineer_b"
 		}
 	],
 	"Formations": [
 		"special/formations/null",
 		"special/formations/box",
 		"special/formations/column_closed",
 		"special/formations/line_closed",
 		"special/formations/column_open",
 		"special/formations/line_open",
 		"special/formations/flank",
 		"special/formations/battle_line",
 		"special/formations/skirmish",
 		"special/formations/wedge",
 		"special/formations/phalanx"
 	],
 	"AINames": [
 		"Kurush II the Great",
 		"Darayavahush I",
 		"Cambyses II",
 		"Bardiya",
 		"Xsayarsa I",
 		"Artaxshacha I",
 		"Darayavahush II",
 		"Darayavahush III",
 		"Artaxshacha II",
 		"Artaxshacha III",
 		"Haxamanish",
 		"Xsayarsa II"
 	],
 	"SkirmishReplacements": {
 		"skirmish/units/default_infantry_ranged_b": "units/pers/infantry_archer_b",
 		"skirmish/structures/default_house_10": "structures/{civ}/house"
 	},
 	"SelectableInGameSetup": true
 }
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/unlock_champion_units.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/unlock_champion_units.json	(revision 24469)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/unlock_champion_units.json	(revision 24470)
@@ -1,29 +1,31 @@
 {
-	"genericName": "Unlock Champion Units",
+	"genericName": "Unlock Champion Infantry",
 	"specificName": {
 		"mace": "Agēma",
 		"ptol": "Agēma",
 		"rome": "Regio Cohors",
 		"sele": "Agēma"
 	},
 	"description": "Guard units (Champions) are professionals who wield the best weapons and have the best training.",
-	"cost": { "food": 0, "wood": 0, "stone": 0, "metal": 1000 },
+	"cost": { "food": 0, "wood": 0, "stone": 0, "metal": 700 },
 	"requirements": {
 		"all": [
 			{ "tech": "phase_city" },
-			{ "any": [
-				{ "civ": "brit" },
-				{ "civ": "gaul" },
-				{ "civ": "iber" },
-				{ "civ": "mace" },
-				{ "civ": "maur" },
-				{ "civ": "rome" }
-			]}
+			{
+				"any": [
+					{ "civ": "brit" },
+					{ "civ": "gaul" },
+					{ "civ": "iber" },
+					{ "civ": "mace" },
+					{ "civ": "maur" },
+					{ "civ": "rome" }
+				]
+			}
 		]
 	},
 	"requirementsTooltip": "Unlocked in City Phase.",
 	"icon": "helmet_corinthian_crest.png",
 	"researchTime": 90,
-	"tooltip": "Unlock the ability to train Champions at the Barracks.",
+	"tooltip": "Unlock Champions Infantry at the Barracks.",
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit/fortress.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit/fortress.xml	(revision 24469)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit/fortress.xml	(revision 24470)
@@ -1,42 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_fortress">
   <Footprint replace="">
     <Circle radius="17.0"/>
     <Height>18.0</Height>
   </Footprint>
   <Health>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Dunon</SpecificName>
   </Identity>
   <Obstruction>
     <Static width="29.0" depth="29.0"/>
   </Obstruction>
   <Population>
     <Bonus>12</Bonus>
   </Population>
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}/champion_infantry
-      units/{civ}/champion_chariot
       units/{civ}/hero_boudicca
       units/{civ}/hero_caratacos
       units/{civ}/hero_cunobelin
     </Entities>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_broch.xml</select>
       <constructed>interface/complete/building/complete_broch.xml</constructed>
     </SoundGroups>
   </Sound>
   <VisualActor>
     <Actor>structures/britons/fortress.xml</Actor>
     <FoundationActor>structures/fndn_9x9.xml</FoundationActor>
   </VisualActor>
   <WallPiece>
     <Length>28</Length>
   </WallPiece>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/infantry_spearman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/infantry_spearman_b.xml	(revision 24469)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/infantry_spearman_b.xml	(revision 24470)
@@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee_spearman">
   <Builder>
     <Entities datatype="tokens">
-      structures/pers/stable
       structures/pers/apadana
     </Entities>
   </Builder>
   <Identity>
     <Civ>pers</Civ>
     <Lang>persian</Lang>
     <SelectionGroupName>units/pers/infantry_spearman_b</SelectionGroupName>
     <GenericName>Shield Bearer</GenericName>
     <SpecificName>Sparabara</SpecificName>
     <Icon>units/pers_infantry_spearman.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/pers/infantry_spearman_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/persians/infantry_spearman_b.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart/temple.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart/temple.xml	(revision 24469)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart/temple.xml	(revision 24470)
@@ -1,32 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_temple">
-  <Cost>
-    <Resources>
-      <stone>400</stone>
-    </Resources>
-  </Cost>
   <Footprint>
     <Square width="19.0" depth="32.0"/>
     <Height>12.0</Height>
   </Footprint>
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Maqdaš</SpecificName>
-    <Tooltip>Train Healers and Champions and research healing technologies.</Tooltip>
+    <Tooltip>Train Healers and Champion Infantry and research healing technologies.</Tooltip>
   </Identity>
-  <Loot>
-    <stone>80</stone>
-  </Loot>
   <Obstruction>
     <Static width="17.0" depth="30.0"/>
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}/champion_infantry
-      units/{civ}/champion_cavalry
     </Entities>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/carthaginians/temple_big.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart/tophet.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart/tophet.xml	(revision 24469)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart/tophet.xml	(revision 24470)
@@ -1,39 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_temple">
   <Cost>
     <Resources>
       <stone>200</stone>
       <metal>100</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="24.0" depth="26.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Health>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_4x4</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>cart</Civ>
     <GenericName>Sacrificial Temple</GenericName>
     <SpecificName>Tophet</SpecificName>
-    <Tooltip>Train Healers and Champion Cavalry and research healing technologies.</Tooltip>
   </Identity>
   <Loot>
     <stone>40</stone>
     <metal>20</metal>
   </Loot>
   <Obstruction>
     <Static width="22.0" depth="24.0"/>
   </Obstruction>
-  <ProductionQueue>
-    <Entities datatype="tokens">
-      units/{civ}/champion_cavalry
-    </Entities>
-  </ProductionQueue>
   <TerritoryDecay disable=""/>
   <VisualActor>
     <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
     <Actor>structures/carthaginians/tophet.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul/fortress.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul/fortress.xml	(revision 24469)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul/fortress.xml	(revision 24470)
@@ -1,32 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_fortress">
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Dunon</SpecificName>
   </Identity>
   <Population>
     <Bonus>12</Bonus>
   </Population>
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}/champion_infantry
-      units/{civ}/champion_cavalry
       units/{civ}/hero_brennus
       units/{civ}/hero_viridomarus
       units/{civ}/hero_vercingetorix
     </Entities>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_fortress.xml</select>
       <constructed>interface/complete/building/complete_fortress.xml</constructed>
     </SoundGroups>
   </Sound>
   <VisualActor>
     <Actor>structures/gauls/fortress.xml</Actor>
   </VisualActor>
   <WallPiece>
     <Length>16.8</Length>
     <Indent>5.8</Indent>
   </WallPiece>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber/fortress.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber/fortress.xml	(revision 24469)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber/fortress.xml	(revision 24470)
@@ -1,40 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_fortress">
   <Cost>
     <BuildTime op="mul">1.5</BuildTime>
     <Resources>
       <stone>1200</stone>
     </Resources>
   </Cost>
   <Health>
     <Max>6000</Max>
   </Health>
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Castro</SpecificName>
   </Identity>
   <Loot>
     <stone>240</stone>
   </Loot>
   <Obstruction>
     <Static width="27.0" depth="27.0"/>
   </Obstruction>
   <Population>
     <Bonus>15</Bonus>
   </Population>
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}/champion_infantry
-      units/{civ}/champion_cavalry
       units/{civ}/hero_caros
       units/{civ}/hero_indibil
       units/{civ}/hero_viriato
     </Entities>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/iberians/fortress.xml</Actor>
   </VisualActor>
   <WallPiece>
     <Length>24.5</Length>
   </WallPiece>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush/fortress.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush/fortress.xml	(revision 24469)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush/fortress.xml	(revision 24470)
@@ -1,31 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_fortress">
   <Footprint>
     <Square width="30.0" depth="30.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Identity>
     <Civ>kush</Civ>
     <SpecificName>Htm</SpecificName>
   </Identity>
   <Obstruction>
     <Static width="28.0" depth="28.0"/>
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}/champion_infantry
-      units/{civ}/champion_cavalry
       units/{civ}/champion_elephant
       units/{civ}/hero_nastasen
       units/{civ}/hero_amanirenas
       units/{civ}/hero_arakamani
     </Entities>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/kushites/fortress.xml</Actor>
   </VisualActor>
   <WallPiece>
     <Length>28.5</Length>
     <Indent>6.7</Indent>
   </WallPiece>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace/fortress.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace/fortress.xml	(revision 24469)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace/fortress.xml	(revision 24470)
@@ -1,34 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_fortress">
   <Footprint>
     <Square width="26.0" depth="28.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Identity>
     <Civ>mace</Civ>
     <SpecificName>Phrourion</SpecificName>
   </Identity>
   <Obstruction>
     <Static width="24.0" depth="26.0"/>
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}/champion_infantry_a
       units/{civ}/champion_infantry_swordsman
-      units/{civ}/champion_cavalry
       units/{civ}/hero_philip
       units/{civ}/hero_alexander
       units/{civ}/hero_demetrius
     </Entities>
     <Technologies datatype="tokens">
       successors/upgrade_mace_silvershields
     </Technologies>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/macedonians/fortress.xml</Actor>
   </VisualActor>
   <WallPiece>
     <Length>24.0</Length>
     <Indent>7.6</Indent>
   </WallPiece>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur/fortress.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur/fortress.xml	(revision 24469)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur/fortress.xml	(revision 24470)
@@ -1,26 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_fortress">
   <Identity>
     <Civ>maur</Civ>
     <SpecificName>Durg</SpecificName>
   </Identity>
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}/champion_infantry
       units/{civ}/champion_maiden
-      units/{civ}/champion_chariot
       units/{civ}/hero_chanakya
       units/{civ}/hero_chandragupta
       units/{civ}/hero_ashoka
     </Entities>
     <Technologies datatype="tokens">
       attack_soldiers_will
     </Technologies>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/mauryas/fortress.xml</Actor>
   </VisualActor>
   <WallPiece>
     <Length>22.0</Length>
   </WallPiece>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/barracks.xml	(revision 24469)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/barracks.xml	(revision 24470)
@@ -1,28 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_barracks">
   <Identity>
     <Civ>pers</Civ>
     <SpecificName>Padgan</SpecificName>
-    <Tooltip>Train Infantry.</Tooltip>
-    <Icon>structures/pers_barracks.png</Icon>
   </Identity>
-  <ProductionQueue>
-    <Entities datatype="tokens">
-      -units/{civ}/cavalry_axeman_b
-      -units/{civ}/cavalry_swordsman_b
-      -units/{civ}/cavalry_spearman_b
-      -units/{civ}/cavalry_javelineer_b
-      -units/{civ}/cavalry_archer_b
-      -units/{civ}/champion_cavalry_barracks
-      -units/{civ}/champion_chariot_barracks
-    </Entities>
-    <Technologies datatype="tokens">
-      persians/training_levy_infantry
-      persians/training_conscription_infantry
-      -training_conscription
-    </Technologies>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/persians/barracks.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/fortress.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/fortress.xml	(revision 24469)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers/fortress.xml	(revision 24470)
@@ -1,20 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_fortress">
   <Identity>
     <Civ>pers</Civ>
     <SpecificName>Didā</SpecificName>
     <Tooltip>Research technologies. Garrison Soldiers for additional arrows.</Tooltip>
   </Identity>
-  <ProductionQueue>
-    <Entities datatype="tokens">
-      units/{civ}/champion_chariot
-    </Entities>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/persians/fortress.xml</Actor>
   </VisualActor>
   <WallPiece>
     <Length>24.5</Length>
     <Indent>7.6</Indent>
   </WallPiece>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol/fortress.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol/fortress.xml	(revision 24469)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol/fortress.xml	(revision 24470)
@@ -1,29 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_fortress">
   <Footprint>
     <Square width="26.0" depth="28.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>Phrourion</SpecificName>
     <Tooltip>Train Champions and research technologies. Garrison Soldiers for additional arrows.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="24.0" depth="26.0"/>
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}/champion_infantry_pikeman
-      units/{civ}/champion_cavalry
       units/{civ}/champion_elephant
     </Entities>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/ptolemies/fortress.xml</Actor>
   </VisualActor>
   <WallPiece>
     <Length>24.0</Length>
     <Indent>8.7</Indent>
   </WallPiece>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome/fortress.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome/fortress.xml	(revision 24469)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome/fortress.xml	(revision 24470)
@@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_fortress">
   <Identity>
     <Civ>rome</Civ>
     <SpecificName>Castellum</SpecificName>
   </Identity>
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}/champion_infantry
-      units/{civ}/champion_cavalry
       units/{civ}/hero_marcellus
       units/{civ}/hero_maximus
       units/{civ}/hero_scipio
     </Entities>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/romans/fortress.xml</Actor>
   </VisualActor>
   <WallPiece>
     <Length>25.0</Length>
     <Indent>8.4</Indent>
   </WallPiece>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele/fortress.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele/fortress.xml	(revision 24469)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele/fortress.xml	(revision 24470)
@@ -1,36 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_fortress">
   <Footprint>
     <Square width="26.0" depth="28.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Identity>
     <Civ>sele</Civ>
     <SpecificName>Phrourion</SpecificName>
     <Tooltip>Train Champions and research technologies. Garrison Soldiers for additional arrows.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="24.0" depth="26.0"/>
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}/champion_infantry_pikeman
-      units/{civ}/champion_chariot
       units/{civ}/champion_infantry_swordsman
-      units/{civ}/champion_cavalry
       units/{civ}/champion_elephant
     </Entities>
     <Technologies datatype="tokens">
       successors/pair_unlock_champions
-      successors/special_war_horses
       successors/special_parade_of_daphne
     </Technologies>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/seleucids/fortress.xml</Actor>
   </VisualActor>
   <WallPiece>
     <Length>23</Length>
     <Indent>7.8</Indent>
   </WallPiece>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml	(revision 24469)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml	(revision 24470)
@@ -1,149 +1,150 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic">
   <AlertRaiser>
     <List datatype="tokens">FemaleCitizen</List>
     <RaiseAlertRange>140</RaiseAlertRange>
     <EndOfAlertRange>190</EndOfAlertRange>
     <SearchRange>100</SearchRange>
   </AlertRaiser>
   <Attack>
     <Ranged>
       <AttackName>Bow</AttackName>
       <Damage>
         <Hack>0.0</Hack>
         <Pierce>12.0</Pierce>
         <Crush>0.0</Crush>
       </Damage>
       <MaxRange>72.0</MaxRange>
       <MinRange>0.0</MinRange>
       <PrepareTime>1200</PrepareTime>
       <RepeatTime>2000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
         <Speed>100.0</Speed>
         <Spread>1.5</Spread>
         <Gravity>9.81</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
       <RangeOverlay>
         <LineTexture>outline_border.png</LineTexture>
         <LineTextureMask>outline_border_mask.png</LineTextureMask>
         <LineThickness>0.175</LineThickness>
       </RangeOverlay>
     </Ranged>
   </Attack>
   <BuildingAI>
     <DefaultArrowCount>3</DefaultArrowCount>
     <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
     <GarrisonArrowClasses>Soldier</GarrisonArrowClasses>
   </BuildingAI>
   <BuildRestrictions>
     <Territory>own neutral</Territory>
     <Category>CivilCentre</Category>
     <Distance>
       <FromClass>CivilCentre</FromClass>
       <MinDistance>160</MinDistance>
     </Distance>
   </BuildRestrictions>
   <Capturable>
     <CapturePoints>2500</CapturePoints>
     <RegenRate>5.0</RegenRate>
   </Capturable>
   <Cost>
     <BuildTime>500</BuildTime>
     <Resources>
       <wood>500</wood>
       <stone>500</stone>
       <metal>500</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="32.0" depth="32.0"/>
     <Height>8.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>20</Max>
     <EjectHealth>0.1</EjectHealth>
     <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
     <List datatype="tokens">Support Infantry Cavalry</List>
     <BuffHeal>1</BuffHeal>
     <LoadingRange>1</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>3000</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_6x6</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Civic Center</GenericName>
     <SelectionGroupName>template_structure_civic_civil_centre</SelectionGroupName>
     <Tooltip>Build in own or neutral territory. Acquire large tracts of territory. Territory root. Train Citizens and research technologies. Garrison Soldiers for additional arrows.</Tooltip>
     <Classes datatype="tokens">CivCentre</Classes>
     <VisibleClasses datatype="tokens">Defensive CivilCentre</VisibleClasses>
     <Icon>structures/civic_centre.png</Icon>
   </Identity>
   <Loot>
     <wood>100</wood>
     <stone>100</stone>
     <metal>100</metal>
   </Loot>
   <Obstruction>
     <Static width="30.0" depth="30.0"/>
   </Obstruction>
   <Population>
     <Bonus>20</Bonus>
   </Population>
   <ProductionQueue>
     <BatchTimeModifier>0.8</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}/support_female_citizen
     </Entities>
     <Technologies datatype="tokens">
       phase_town_{civ}
       phase_city_{civ}
       unlock_spies
       spy_counter
+      archery_tradition
     </Technologies>
   </ProductionQueue>
   <Resistance>
     <Entity>
       <Damage>
         <Hack op="add">5</Hack>
         <Pierce op="add">5</Pierce>
       </Damage>
     </Entity>
     <Foundation>
       <Damage>
         <Hack>5</Hack>
         <Pierce>15</Pierce>
         <Crush>3</Crush>
       </Damage>
     </Foundation>
   </Resistance>
   <ResourceDropsite>
     <Types>food wood stone metal</Types>
     <Sharable>true</Sharable>
   </ResourceDropsite>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_civ_center.xml</select>
       <constructed>interface/complete/building/complete_civ_center.xml</constructed>
       <alert_raise>interface/alarm/alarm_alert_0.xml</alert_raise>
       <alert_end>interface/alarm/alarm_alert_1.xml</alert_end>
       <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
       <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
     <Root>true</Root>
     <Radius>140</Radius>
     <Weight>10000</Weight>
   </TerritoryInfluence>
   <Vision>
     <Range>90</Range>
   </Vision>
   <VisualActor>
     <FoundationActor>structures/fndn_8x8.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml	(revision 24469)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml	(revision 24470)
@@ -1,81 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military">
   <Auras datatype="tokens">
     structures/barracks_xp_trickle
   </Auras>
   <Cost>
     <BuildTime>150</BuildTime>
     <Resources>
       <wood>200</wood>
       <stone>100</stone>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="19.0" depth="19.0"/>
     <Height>12.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>10</Max>
     <List datatype="tokens">Infantry Cavalry</List>
   </GarrisonHolder>
   <Health>
     <Max>2000</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_4x4</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Barracks</GenericName>
     <SelectionGroupName>template_structure_military_barracks</SelectionGroupName>
-    <Tooltip>Train Citizen Soldiers and research technologies.</Tooltip>
+    <Tooltip>Train Infantry and research Infantry technologies.</Tooltip>
     <VisibleClasses datatype="tokens">Village Barracks</VisibleClasses>
-    <Icon>structures/barracks.png</Icon>
+    <Icon>structures/pers_barracks.png</Icon>
     <RequiredTechnology>phase_village</RequiredTechnology>
   </Identity>
   <Loot>
     <wood>40</wood>
     <stone>20</stone>
   </Loot>
   <Obstruction>
     <Static width="17.0" depth="17.0"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.8</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}/infantry_spearman_b
       units/{civ}/infantry_pikeman_b
       units/{civ}/infantry_axeman_b
       units/{civ}/infantry_swordsman_b
       units/{civ}/infantry_javelineer_b
       units/{civ}/infantry_slinger_b
       units/{civ}/infantry_archer_b
-      units/{civ}/cavalry_axeman_b
-      units/{civ}/cavalry_swordsman_b
-      units/{civ}/cavalry_spearman_b
-      units/{civ}/cavalry_javelineer_b
-      units/{civ}/cavalry_archer_b
       units/{civ}/champion_infantry_barracks
       units/{civ}/champion_infantry_swordsman_barracks
       units/{civ}/champion_maiden_barracks
-      units/{civ}/champion_cavalry_barracks
-      units/{civ}/champion_chariot_barracks
-      units/{civ}/war_dog
     </Entities>
     <Technologies datatype="tokens">
       heal_barracks
+      persians/training_levy_infantry
+      persians/training_conscription_infantry
       training_conscription
       unlock_champion_units
-      archery_tradition
     </Technologies>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_barracks.xml</select>
       <constructed>interface/complete/building/complete_barracks.xml</constructed>
     </SoundGroups>
   </Sound>
   <Vision>
     <Range>32</Range>
   </Vision>
   <VisualActor>
     <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_range.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_range.xml	(revision 24469)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_range.xml	(revision 24470)
@@ -1,60 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military">
   <Cost>
     <BuildTime>120</BuildTime>
     <Resources>
       <wood>200</wood>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="25.0" depth="25.0"/>
     <Height>12.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>10</Max>
     <List datatype="tokens">Infantry</List>
   </GarrisonHolder>
   <Health>
     <Max>2000</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Practice Range</GenericName>
     <SelectionGroupName>template_structure_military_range</SelectionGroupName>
     <Tooltip>Train Ranged Infantry and research technologies.</Tooltip>
     <VisibleClasses datatype="tokens">Village Range</VisibleClasses>
     <Icon>structures/range.png</Icon>
     <RequiredTechnology>phase_village</RequiredTechnology>
   </Identity>
   <Loot>
     <wood>40</wood>
   </Loot>
   <Obstruction>
     <Static width="24.0" depth="24.0"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.8</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}/infantry_javelineer_b
       units/{civ}/infantry_slinger_b
       units/{civ}/infantry_archer_b
     </Entities>
-    <Technologies datatype="tokens">
-      heal_barracks
-      training_conscription
-      archery_tradition
-    </Technologies>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <constructed>interface/complete/building/complete_range.xml</constructed>
       <select>interface/select/building/sel_barracks.xml</select>
     </SoundGroups>
   </Sound>
   <Vision>
     <Range>32</Range>
   </Vision>
   <VisualActor>
     <FoundationActor>structures/fndn_7x7.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml	(revision 24469)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml	(revision 24470)
@@ -1,64 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military">
   <Cost>
     <BuildTime>120</BuildTime>
     <Resources>
       <wood>200</wood>
       <stone>50</stone>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="25.0" depth="25.0"/>
     <Height>12.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>10</Max>
     <List datatype="tokens">Cavalry</List>
   </GarrisonHolder>
   <Health>
     <Max>2000</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Stable</GenericName>
     <SelectionGroupName>template_structure_military_stable</SelectionGroupName>
     <Tooltip>Train Cavalry and research Cavalry technologies.</Tooltip>
     <VisibleClasses datatype="tokens">Village Stable</VisibleClasses>
     <Icon>structures/pers_stable.png</Icon>
     <RequiredTechnology>phase_village</RequiredTechnology>
   </Identity>
   <Loot>
     <wood>40</wood>
     <stone>10</stone>
   </Loot>
   <Obstruction>
     <Static width="20.0" depth="20.0"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.8</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}/cavalry_axeman_b
       units/{civ}/cavalry_swordsman_b
       units/{civ}/cavalry_spearman_b
       units/{civ}/cavalry_javelineer_b
       units/{civ}/cavalry_archer_b
       units/{civ}/champion_cavalry
+      units/{civ}_champion_chariot
+      units/{civ}_war_dog
     </Entities>
     <Technologies datatype="tokens">
-      heal_barracks
       cavalry_movement_speed
       persians/training_levy_cavalry
       persians/training_conscription_cavalry
       successors/special_war_horses
     </Technologies>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_cavalry_stables.xml</select>
       <constructed>interface/complete/building/complete_cavalry_stables.xml</constructed>
     </SoundGroups>
   </Sound>
   <Vision>
     <Range>32</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml	(revision 24469)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml	(revision 24470)
@@ -1,58 +1,57 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_resource">
   <Cost>
     <BuildTime>50</BuildTime>
     <Resources>
       <wood>100</wood>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="18.0" depth="17.0"/>
     <Height>5.0</Height>
   </Footprint>
   <Health>
     <Max>500</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_3x3</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Corral</GenericName>
     <SelectionGroupName>template_structure_resource_corral</SelectionGroupName>
     <Tooltip>Raise Domestic Animals for food.</Tooltip>
     <VisibleClasses datatype="tokens">Village Corral</VisibleClasses>
     <Icon>structures/corral.png</Icon>
     <RequiredTechnology>phase_village</RequiredTechnology>
   </Identity>
   <Loot>
     <wood>20</wood>
   </Loot>
   <Obstruction>
     <Static width="16.0" depth="15.0"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
       gaia/fauna_sheep_trainable
     </Entities>
     <Technologies datatype="tokens">
       gather_animals_stockbreeding
-      cavalry_movement_speed
     </Technologies>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_corral.xml</select>
       <constructed>interface/complete/building/complete_corral.xml</constructed>
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
     <Root>false</Root>
     <Radius>20</Radius>
     <Weight>30000</Weight>
   </TerritoryInfluence>
   <Vision>
     <Range>20</Range>
   </Vision>
   <VisualActor>
     <FoundationActor>structures/fndn_3x3.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml	(revision 24469)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml	(revision 24470)
@@ -1,129 +1,130 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
   <Attack>
     <Capture>
       <AttackName>Capture</AttackName>
       <Capture>2.5</Capture>
       <MaxRange>4</MaxRange>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">Field Palisade Wall</RestrictedClasses>
     </Capture>
     <Slaughter>
       <AttackName>Slaughter</AttackName>
       <Damage>
         <Hack>1000</Hack>
       </Damage>
       <MaxRange>2</MaxRange>
     </Slaughter>
   </Attack>
   <Builder>
     <Rate>1.0</Rate>
     <Entities datatype="tokens">
       structures/{civ}/civil_centre
       structures/{civ}/crannog
       structures/{civ}/military_colony
       structures/{civ}/house
       structures/{civ}/storehouse
       structures/{civ}/farmstead
       structures/{civ}/field
       structures/{civ}/corral
       structures/{civ}/dock
       structures/{civ}/barracks
+      structures/{civ}/stable
       structures/{civ}/arsenal
       structures/{civ}/forge
       structures/{civ}/temple
       structures/{civ}/market
       structures/{civ}/outpost
       structures/{civ}/sentry_tower
       structures/{civ}/defense_tower
       structures/{civ}/fortress
       structures/wallset_palisade
       structures/{civ}/wallset_siege
       structures/{civ}/wallset_stone
       structures/{civ}/wonder
     </Entities>
   </Builder>
   <Cost>
     <BuildTime>12</BuildTime>
     <Resources>
       <food>50</food>
       <wood>0</wood>
       <stone>0</stone>
       <metal>0</metal>
     </Resources>
   </Cost>
   <Health>
     <Max>80</Max>
   </Health>
   <Identity>
     <Classes datatype="tokens">Human CitizenSoldier</Classes>
     <VisibleClasses datatype="tokens">Citizen Worker Soldier Infantry</VisibleClasses>
     <GenericName>Infantry</GenericName>
     <Rank>Basic</Rank>
   </Identity>
   <Loot>
     <xp>100</xp>
     <food>5</food>
     <wood>0</wood>
     <stone>0</stone>
     <metal>0</metal>
   </Loot>
   <Position>
     <Anchor>upright</Anchor>
   </Position>
   <Promotion>
     <RequiredXp>100</RequiredXp>
   </Promotion>
   <Resistance>
     <Entity>
       <Damage>
         <Hack>2</Hack>
         <Pierce>4</Pierce>
         <Crush>15</Crush>
       </Damage>
     </Entity>
   </Resistance>
   <ResourceGatherer>
     <MaxDistance>2.0</MaxDistance>
     <BaseSpeed>1.0</BaseSpeed>
     <Rates>
       <food.fruit>0.5</food.fruit>
       <food.grain>0.25</food.grain>
       <food.meat>1</food.meat>
       <wood.tree>0.75</wood.tree>
       <wood.ruins>5</wood.ruins>
       <stone.rock>0.5</stone.rock>
       <stone.ruins>2</stone.ruins>
       <metal.ore>0.5</metal.ore>
     </Rates>
   </ResourceGatherer>
   <Sound>
     <SoundGroups>
       <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
       <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
       <order_attack>voice/{lang}/civ/civ_{phenotype}_attack.xml</order_attack>
       <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
       <order_repair>voice/{lang}/civ/civ_{phenotype}_repair.xml</order_repair>
       <order_build>voice/{lang}/civ/civ_{phenotype}_build.xml</order_build>
       <order_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
       <walk>actor/human/movement/walk.xml</walk>
       <run>actor/human/movement/run.xml</run>
       <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
       <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
       <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
       <death>actor/human/death/{phenotype}_death.xml</death>
       <build>resource/construction/con_wood.xml</build>
       <gather_fruit>resource/foraging/forage_leaves.xml</gather_fruit>
       <gather_grain>resource/farming/farm.xml</gather_grain>
       <gather_tree>resource/lumbering/lumbering.xml</gather_tree>
       <gather_rock>resource/mining/pickaxe.xml</gather_rock>
       <gather_ore>resource/mining/mining.xml</gather_ore>
       <gather_ruins>resource/mining/mining.xml</gather_ruins>
       <trained>interface/alarm/alarm_create_infantry.xml</trained>
       <invalid_building_placement>interface/alarm/alarm_invalid_building_placement.xml</invalid_building_placement>
     </SoundGroups>
   </Sound>
   <Vision>
     <Range>80</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml	(revision 24469)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml	(revision 24470)
@@ -1,109 +1,110 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support">
   <Attack>
     <Melee>
       <AttackName>Dagger</AttackName>
       <Damage>
         <Hack>2.0</Hack>
         <Pierce>0</Pierce>
         <Crush>0.0</Crush>
       </Damage>
       <MaxRange>3</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
     </Melee>
     <Slaughter>
       <AttackName>Slaughter</AttackName>
       <Damage>
         <Hack>1000</Hack>
       </Damage>
       <MaxRange>2</MaxRange>
     </Slaughter>
   </Attack>
   <Builder>
     <Rate>1.0</Rate>
     <Entities datatype="tokens">
       structures/{civ}/civil_centre
       structures/{civ}/crannog
       structures/{civ}/military_colony
       structures/{civ}/house
       structures/{civ}/storehouse
       structures/{civ}/farmstead
       structures/{civ}/field
       structures/{civ}/corral
       structures/{civ}/dock
       structures/{civ}/barracks
+      structures/{civ}/stable
       structures/{civ}/arsenal
       structures/{civ}/forge
       structures/{civ}/temple
       structures/{civ}/market
       structures/{civ}/outpost
       structures/{civ}/sentry_tower
       structures/{civ}/defense_tower
       structures/{civ}/fortress
       structures/wallset_palisade
       structures/{civ}/wallset_siege
       structures/{civ}/wallset_stone
       structures/{civ}/wonder
     </Entities>
   </Builder>
   <Cost>
     <BuildTime>9</BuildTime>
     <Resources>
       <food>50</food>
     </Resources>
   </Cost>
   <Health>
     <Max>25</Max>
   </Health>
   <Identity>
     <Classes datatype="tokens">FemaleCitizen</Classes>
     <VisibleClasses datatype="tokens">Citizen Worker</VisibleClasses>
     <GenericName>Female Citizen</GenericName>
     <SelectionGroupName>template_unit_support_female_citizen</SelectionGroupName>
     <Phenotype>female</Phenotype>
     <Formations disable=""/>
   </Identity>
   <ResourceGatherer>
     <MaxDistance>2.0</MaxDistance>
     <BaseSpeed>1.0</BaseSpeed>
     <Rates>
       <food.fruit>1</food.fruit>
       <food.grain>0.5</food.grain>
       <food.meat>1</food.meat>
       <wood.tree>0.7</wood.tree>
       <wood.ruins>5</wood.ruins>
       <stone.rock>0.35</stone.rock>
       <stone.ruins>2</stone.ruins>
       <metal.ore>0.35</metal.ore>
     </Rates>
   </ResourceGatherer>
   <Sound>
     <SoundGroups>
       <trained>interface/alarm/alarm_create_female.xml</trained>
       <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
       <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
       <order_attack>voice/{lang}/civ/civ_{phenotype}_attack.xml</order_attack>
       <order_build>voice/{lang}/civ/civ_{phenotype}_build.xml</order_build>
       <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
       <order_repair>voice/{lang}/civ/civ_{phenotype}_repair.xml</order_repair>
       <order_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
       <attack_melee>attack/weapon/sword.xml</attack_melee>
       <death>actor/human/death/{phenotype}_death.xml</death>
       <build>resource/construction/con_wood.xml</build>
       <gather_fruit>resource/foraging/forage_leaves.xml</gather_fruit>
       <gather_grain>resource/farming/farm.xml</gather_grain>
       <gather_tree>resource/lumbering/lumbering.xml</gather_tree>
       <gather_rock>resource/mining/pickaxe.xml</gather_rock>
       <gather_ore>resource/mining/mining.xml</gather_ore>
       <gather_ruins>resource/mining/mining.xml</gather_ruins>
       <invalid_building_placement>interface/alarm/alarm_invalid_building_placement.xml</invalid_building_placement>
     </SoundGroups>
   </Sound>
   <UnitAI>
     <CanPatrol>false</CanPatrol>
   </UnitAI>
   <Vision>
     <Range>32</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml	(revision 24469)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml	(revision 24470)
@@ -1,86 +1,87 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support">
   <Builder>
     <Rate>0.5</Rate>
     <Entities datatype="tokens">
       structures/{civ}/civil_centre
       structures/{civ}/crannog
       structures/{civ}/military_colony
       structures/{civ}/house
       structures/{civ}/storehouse
       structures/{civ}/farmstead
       structures/{civ}/field
       structures/{civ}/corral
       structures/{civ}/dock
       structures/{civ}/barracks
+      structures/{civ}/stable
       structures/{civ}/arsenal
       structures/{civ}/forge
       structures/{civ}/temple
       structures/{civ}/market
       structures/{civ}/outpost
       structures/{civ}/sentry_tower
       structures/{civ}/defense_tower
       structures/{civ}/fortress
       structures/wallset_palisade
       structures/{civ}/wallset_siege
       structures/{civ}/wallset_stone
       structures/{civ}/wonder
     </Entities>
   </Builder>
   <Cost>
     <Population>0</Population>
     <BuildTime>15</BuildTime>
     <Resources>
       <metal>50</metal>
     </Resources>
   </Cost>
   <Health>
     <RegenRate>-0.25</RegenRate>
     <Unhealable>true</Unhealable>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Slave Worker</VisibleClasses>
     <GenericName>Slave</GenericName>
     <SelectionGroupName>template_unit_support_slave</SelectionGroupName>
     <Tooltip>Gatherer with a finite life span. Bonused at mining and lumbering.</Tooltip>
   </Identity>
   <Loot>
     <xp>1</xp>
     <food>0</food>
   </Loot>
   <ResourceGatherer>
     <BaseSpeed>1.0</BaseSpeed>
     <Rates>
       <food.fish>0.5</food.fish>
       <food.fruit>0.5</food.fruit>
       <food.grain>0.35</food.grain>
       <food.meat>1</food.meat>
       <wood.tree>1.0</wood.tree>
       <wood.ruins>5</wood.ruins>
       <stone.rock>1.0</stone.rock>
       <stone.ruins>5</stone.ruins>
       <metal.ore>1.0</metal.ore>
       <treasure disable=""/>
     </Rates>
   </ResourceGatherer>
   <Sound>
     <SoundGroups>
       <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
       <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
       <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
       <order_repair>voice/{lang}/civ/civ_{phenotype}_repair.xml</order_repair>
       <order_build>voice/{lang}/civ/civ_{phenotype}_build.xml</order_build>
       <order_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
       <walk>actor/human/movement/walk.xml</walk>
       <run>actor/human/movement/run.xml</run>
       <death>actor/human/death/{phenotype}_death.xml</death>
       <build>resource/construction/con_wood.xml</build>
       <gather_fruit>resource/foraging/forage_leaves.xml</gather_fruit>
       <gather_grain>resource/farming/farm.xml</gather_grain>
       <gather_wood>resource/lumbering/lumbering.xml</gather_wood>
       <gather_stone>resource/mining/pickaxe.xml</gather_stone>
       <gather_metal>resource/mining/mining.xml</gather_metal>
       <trained>actor/singlesteps/steps_gravel_trained.xml</trained>
     </SoundGroups>
   </Sound>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/infantry_archer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/infantry_archer_b.xml	(revision 24469)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/infantry_archer_b.xml	(revision 24470)
@@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged_archer">
   <Builder>
     <Entities datatype="tokens">
-      structures/pers/stable
       structures/pers/apadana
     </Entities>
   </Builder>
   <Identity>
     <Civ>pers</Civ>
     <Lang>persian</Lang>
     <SelectionGroupName>units/pers/infantry_archer_b</SelectionGroupName>
     <GenericName>Sogdian Archer</GenericName>
     <SpecificName>Θanuvaniya Suguda</SpecificName>
     <Icon>units/pers_infantry_archer.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/pers/infantry_archer_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/persians/infantry_archer_b.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/infantry_javelineer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/infantry_javelineer_b.xml	(revision 24469)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/infantry_javelineer_b.xml	(revision 24470)
@@ -1,24 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged_javelineer">
   <Builder>
     <Entities datatype="tokens">
-      structures/pers/stable
       structures/pers/apadana
     </Entities>
   </Builder>
   <Identity>
     <Civ>pers</Civ>
     <Lang>persian</Lang>
     <SelectionGroupName>units/pers/infantry_javelineer_b</SelectionGroupName>
     <GenericName>Lydian Auxiliary</GenericName>
     <SpecificName>Pastiš Spardiya</SpecificName>
     <Icon>units/pers_infantry_javelinist.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/pers/infantry_javelineer_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/persians/infantry_javelinist_b.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/support_female_citizen.xml	(revision 24469)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/support_female_citizen.xml	(revision 24470)
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_female_citizen">
   <Builder>
     <Entities datatype="tokens">
-      structures/pers/stable
       structures/pers/apadana
     </Entities>
   </Builder>
   <Identity>
     <Civ>pers</Civ>
     <Lang>persian</Lang>
     <SpecificName>Banu Miyanrudani</SpecificName>
     <GenericName>Mesopotamian Woman</GenericName>
     <Icon>units/pers_support_female_citizen.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/persians/female_citizen.xml</Actor>
   </VisualActor>
 </Entity>