Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/upgrade_rank_advanced_mercenary.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/upgrade_rank_advanced_mercenary.json	(revision 25623)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/upgrade_rank_advanced_mercenary.json	(revision 25624)
@@ -1,31 +1,11 @@
 {
+	"autoResearch": true,
 	"genericName": "Expertise In War",
 	"description": "Hire professional mercenaries to fight in your army.",
-	"cost": {
-		"metal": 600
-	},
-	"requirements": {
-		"all": [
-			{ "tech": "phase_town" },
-			{
-				"any": [
-					{ "civ": "athen" },
-					{ "civ": "cart" },
-					{ "civ": "kush" },
-					{ "civ": "mace" },
-					{ "civ": "ptol" },
-					{ "civ": "sele" }
-				]
-			}
-		]
-	},
-	"requirementsTooltip": "Unlocked in Town Phase.",
 	"icon": "upgrade_advanced.png",
-	"researchTime": 40,
-	"tooltip": "Mercenaries are promoted to Advanced rank.",
+	"tooltip": "Mercenaries start at Advanced rank.",
 	"modifications": [
-		{ "value": "Promotion/RequiredXp", "replace": 0, "affects": "Basic" }
+		{ "value": "Promotion/RequiredXp", "replace": 0 }
 	],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml",
-	"affects": ["Mercenary"]
+	"affects": ["Mercenary Basic"]
 }
Index: ps/trunk/binaries/data/mods/public/simulation/templates/mixins/mercenary.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/mixins/mercenary.xml	(revision 25623)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/mixins/mercenary.xml	(revision 25624)
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <Entity>
   <Cost>
     <BuildTime op="mul">0.7</BuildTime>
     <Resources>
-      <food op="mul_round">0.4</food>
+      <food>0</food>
       <wood>0</wood>
       <stone>0</stone>
       <!-- Metal is specified on a per-class basis in derived templates. -->
     </Resources>
   </Cost>
   <Identity>
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
   </Identity>
   <Loot>
-    <food op="mul_round">0.4</food>
+    <food>0</food>
     <wood>0</wood>
     <stone>0</stone>
   </Loot>
   <ResourceGatherer disable=""/>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen/barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen/barracks.xml	(revision 25623)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen/barracks.xml	(revision 25624)
@@ -1,26 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_barracks">
   <Footprint>
     <Square width="25.0" depth="25.0"/>
     <Height>12.0</Height>
   </Footprint>
   <Health>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>athen</Civ>
     <SpecificName>Stratopedon</SpecificName>
   </Identity>
   <Obstruction>
     <Static width="20.0" depth="20.0"/>
   </Obstruction>
-  <ProductionQueue>
-    <Technologies datatype="tokens">
-      upgrade_rank_advanced_mercenary
-    </Technologies>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/athenians/barracks.xml</Actor>
     <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace/barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace/barracks.xml	(revision 25623)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace/barracks.xml	(revision 25624)
@@ -1,26 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_barracks">
   <Footprint>
     <Square width="25.0" depth="25.0"/>
     <Height>12.0</Height>
   </Footprint>
   <Health>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>mace</Civ>
     <SpecificName>Stratopedon</SpecificName>
   </Identity>
   <Obstruction>
     <Static width="20.0" depth="20.0"/>
   </Obstruction>
-  <ProductionQueue>
-    <Technologies datatype="tokens">
-      upgrade_rank_advanced_mercenary
-    </Technologies>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/macedonians/barracks.xml</Actor>
     <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml	(revision 25623)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml	(revision 25624)
@@ -1,55 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_civil_centre">
   <BuildingAI>
     <DefaultArrowCount>1</DefaultArrowCount>
   </BuildingAI>
   <BuildRestrictions>
     <Territory>own neutral</Territory>
     <Category>Colony</Category>
     <Distance>
       <FromClass>CivilCentre</FromClass>
       <MinDistance>120</MinDistance>
     </Distance>
   </BuildRestrictions>
   <Cost>
     <BuildTime>300</BuildTime>
     <Resources>
       <wood>200</wood>
       <stone>200</stone>
       <metal>200</metal>
     </Resources>
   </Cost>
   <Health>
     <Max>2000</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Military Colony</GenericName>
     <SelectionGroupName>template_structure_civic_civil_centre_military_colony</SelectionGroupName>
     <VisibleClasses datatype="tokens">Colony</VisibleClasses>
     <Icon>structures/military_settlement.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Loot>
     <wood>40</wood>
     <stone>40</stone>
     <metal>40</metal>
   </Loot>
   <ProductionQueue>
     <Technologies datatype="tokens">
       -phase_town_{civ}
       -phase_city_{civ}
       -hellenistic_metropolis
-      upgrade_rank_advanced_mercenary
     </Technologies>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_gymnasium.xml</select>
       <constructed>interface/complete/building/complete_gymnasium.xml</constructed>
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
     <Radius>80</Radius>
   </TerritoryInfluence>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml	(revision 25623)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml	(revision 25624)
@@ -1,58 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military">
   <BuildRestrictions>
     <Category>Embassy</Category>
   </BuildRestrictions>
   <Cost>
     <BuildTime>150</BuildTime>
   </Cost>
   <Footprint>
     <Square width="16.0" depth="16.0"/>
     <Height>12.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>6</Max>
     <List datatype="tokens">Support Infantry Cavalry</List>
   </GarrisonHolder>
   <Health>
     <Max>2000</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_3x3</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Embassy</GenericName>
     <SelectionGroupName>template_structure_military_embassy</SelectionGroupName>
     <VisibleClasses datatype="tokens">Town Embassy</VisibleClasses>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Obstruction>
     <Static width="16.0" depth="16.0"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.8</BatchTimeModifier>
-    <Technologies datatype="tokens">
-      upgrade_rank_advanced_mercenary
-    </Technologies>
   </ProductionQueue>
   <Resistance>
     <Entity>
       <Damage>
         <Pierce>30</Pierce>
       </Damage>
     </Entity>
   </Resistance>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_gymnasium.xml</select>
       <constructed>interface/complete/building/complete_gymnasium.xml</constructed>
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
     <Radius>25</Radius>
   </TerritoryInfluence>
   <Vision>
     <Range>24</Range>
   </Vision>
   <VisualActor>
     <FoundationActor>structures/fndn_4x4.xml</FoundationActor>
   </VisualActor>
 </Entity>