Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/han/academy.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/han/academy.xml	(revision 26631)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/han/academy.xml	(revision 26632)
@@ -1,86 +1,76 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_barracks">
   <BuildRestrictions>
     <Category>Academy</Category>
   </BuildRestrictions>
-  <Capturable>
-    <CapturePoints op="mul">3.0</CapturePoints>
-  </Capturable>
+  <Capturable disable=""/>
   <Cost>
     <BuildTime>200</BuildTime>
     <Resources>
       <wood>0</wood>
       <stone>300</stone>
       <metal>300</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Square depth="24.0" width="24.0"/>
     <Height>10.0</Height>
   </Footprint>
   <GarrisonHolder>
     <List datatype="tokens">Minister</List>
   </GarrisonHolder>
   <Health>
-    <Max>2500</Max>
+    <Max>2000</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>han</Civ>
     <GenericName>Imperial Academy</GenericName>
     <SpecificName>Dìguó Xuéyuàn</SpecificName>
     <SelectionGroupName>structures/han/academy</SelectionGroupName>
     <Tooltip>Train Champions and research their technologies.</Tooltip>
     <VisibleClasses datatype="tokens">-Village City Academy</VisibleClasses>
     <Icon>structures/embassy_italic.png</Icon>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Obstruction>
     <Static depth="22.0" width="22.0"/>
   </Obstruction>
   <Researcher>
     <Technologies datatype="tokens">
       -barracks_batch_training
       -unlock_champion_infantry
     </Technologies>
   </Researcher>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_tholos.xml</select>
       <constructed>interface/complete/building/complete_tholos.xml</constructed>
       <upgraded>interface/complete/building/complete_tholos.xml</upgraded>
     </SoundGroups>
   </Sound>
   <Trainer>
     <BatchTimeModifier>0.8</BatchTimeModifier>
     <Entities datatype="tokens">
       -units/{civ}/infantry_spearman_b
       -units/{civ}/infantry_pikeman_b
       -units/{civ}/infantry_maceman_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}/champion_infantry_spearman
-      units/{civ}/champion_infantry_pikeman
-      units/{civ}/champion_infantry_maceman
-      units/{civ}/champion_infantry_axeman
-      units/{civ}/champion_infantry_swordsman
-      units/{civ}/champion_infantry_javelineer
-      units/{civ}/champion_infantry_slinger
-      units/{civ}/champion_infantry_archer
-      units/{civ}/champion_cavalry
-      units/{civ}/champion_cavalry_spearman
-      units/{civ}/champion_cavalry_swordsman
-      units/{civ}/champion_cavalry_javelineer
-      units/{civ}/champion_cavalry_archer
-      units/{civ}/champion_chariot
-      units/{civ}/war_dog
+      units/{civ}/champion_infantry_spearman_academy
+      units/{civ}/champion_infantry_archer_academy
+      units/{civ}/champion_cavalry_spearman_academy
+      units/{civ}/champion_cavalry_crossbowman_academy
+      units/{civ}/champion_chariot_academy
+      -units/{civ}/champion_infantry_spearman
+      -units/{civ}/champion_infantry_archer
     </Entities>
   </Trainer>
   <VisualActor>
     <Actor>structures/han/academy.xml</Actor>
     <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/han/stable.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/han/stable.xml	(revision 26631)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/han/stable.xml	(revision 26632)
@@ -1,35 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_stable">
   <Footprint>
     <Square depth="25.0" width="25.0"/>
     <Height>12.0</Height>
   </Footprint>
   <GarrisonHolder>
     <List datatype="tokens">Minister</List>
   </GarrisonHolder>
   <Identity>
     <Civ>han</Civ>
     <SpecificName>Mǎ Jiù</SpecificName>
   </Identity>
   <Obstruction>
     <Static depth="20.0" width="20.0"/>
   </Obstruction>
   <Researcher>
     <Technologies datatype="tokens">
       -unlock_champion_cavalry
     </Technologies>
   </Researcher>
   <Trainer>
     <BatchTimeModifier>0.8</BatchTimeModifier>
     <Entities datatype="tokens">
-      units/{civ}/cavalry_crossbowman_b
       -units/{civ}/champion_cavalry
+      -units/{civ}/champion_cavalry_spearman
+      -units/{civ}/champion_cavalry_archer
+      -units/{civ}/champion_cavalry_crossbowman
       -units/{civ}/champion_chariot
       -units/{civ}/war_dog
     </Entities>
   </Trainer>
   <VisualActor>
     <Actor>structures/han/stable.xml</Actor>
     <FoundationActor>structures/fndn_6x6.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 26631)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml	(revision 26632)
@@ -1,74 +1,80 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military">
   <Auras datatype="tokens">
     structures/xp_trickle
   </Auras>
   <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/stable_01.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/>
   <Researcher>
     <Technologies datatype="tokens">
       stable_batch_training
       cavalry_cost_time
       cavalry_movement_speed
       cavalry_health
       nisean_horses
       unlock_champion_cavalry
       unlock_champion_chariots
     </Technologies>
   </Researcher>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_stable.xml</select>
       <constructed>interface/complete/building/complete_stable.xml</constructed>
     </SoundGroups>
   </Sound>
   <Trainer>
     <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}/cavalry_crossbowman_b
       units/{civ}/champion_cavalry
+      units/{civ}/champion_cavalry_spearman
+      units/{civ}/champion_cavalry_swordsman
+      units/{civ}/champion_cavalry_javelineer
+      units/{civ}/champion_cavalry_archer
+      units/{civ}/champion_cavalry_crossbowman
       units/{civ}/champion_chariot
       units/{civ}/war_dog
     </Entities>
   </Trainer>
   <Vision>
     <Range>32</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_crossbowman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_crossbowman.xml	(revision 26631)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_crossbowman.xml	(revision 26632)
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry_crossbowman">
   <Identity>
     <Civ>han</Civ>
     <SpecificName>Sun Wu Trouble Freeing Forces</SpecificName>
     <SelectionGroupName>units/han/cavalry_crossbowman</SelectionGroupName>
     <Icon>units/han/champion_cavalry_crossbowman.png</Icon>
-    <RequiredTechnology>phase_city</RequiredTechnology>
+    <RequiredTechnology>unlock_champion_cavalry</RequiredTechnology>
   </Identity>
   <VisualActor>
     <Actor>units/han/cavalry_crossbowman_c_m.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_crossbowman_academy.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_crossbowman_academy.xml	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_crossbowman_academy.xml	(revision 26632)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/han/champion_cavalry_crossbowman">
+  <Identity>
+    <RequiredTechnology>phase_city</RequiredTechnology>
+  </Identity>
+</Entity>

Property changes on: ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_crossbowman_academy.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_spearman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_spearman.xml	(revision 26631)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_spearman.xml	(revision 26632)
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry_spearman">
   <Identity>
     <Civ>han</Civ>
     <SpecificName>Wu Wei Yin Cao Cao Guard</SpecificName>
     <SelectionGroupName>units/han/champion_cavalry</SelectionGroupName>
     <Icon>units/han/champion_cavalry_spearman.png</Icon>
-    <RequiredTechnology>phase_city</RequiredTechnology>
+    <RequiredTechnology>unlock_champion_cavalry</RequiredTechnology>
   </Identity>
   <VisualActor>
     <Actor>units/han/cavalry_spearman_c_m.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_spearman_academy.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_spearman_academy.xml	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_spearman_academy.xml	(revision 26632)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/han/champion_cavalry_spearman">
+  <Identity>
+    <RequiredTechnology>phase_city</RequiredTechnology>
+  </Identity>
+</Entity>

Property changes on: ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_spearman_academy.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_chariot.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_chariot.xml	(revision 26631)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_chariot.xml	(revision 26632)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry_archer">
   <Footprint replace="">
     <Square depth="10.0" width="10.0"/>
     <Height>5.0</Height>
   </Footprint>
   <Identity>
     <Civ>han</Civ>
     <GenericName>Chinese War Chariot</GenericName>
     <SpecificName>Zhanche</SpecificName>
     <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
-    <RequiredTechnology>phase_city</RequiredTechnology>
+    <RequiredTechnology>unlock_champion_chariots</RequiredTechnology>
     <Icon>units/han/chariot.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/han/chariot_archer_m.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_chariot_academy.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_chariot_academy.xml	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_chariot_academy.xml	(revision 26632)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/han/champion_chariot">
+  <Identity>
+    <RequiredTechnology>phase_city</RequiredTechnology>
+  </Identity>
+</Entity>

Property changes on: ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_chariot_academy.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_archer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_archer.xml	(revision 26631)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_archer.xml	(revision 26632)
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_archer">
   <Identity>
     <Civ>han</Civ>
     <GenericName>Palace Guard Archer</GenericName>
     <SpecificName>Yǔ Lín</SpecificName>
     <SelectionGroupName>units/han/champion_infantry_archer</SelectionGroupName>
     <Icon>units/han/champion_infantry_archer.png</Icon>
+    <RequiredTechnology>unlock_champion_infantry</RequiredTechnology>
   </Identity>
   <VisualActor>
     <Actor>units/han/infantry_archer_c.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_archer_academy.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_archer_academy.xml	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_archer_academy.xml	(revision 26632)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/han/champion_infantry_archer">
+  <Identity>
+    <RequiredTechnology>phase_city</RequiredTechnology>
+  </Identity>
+</Entity>

Property changes on: ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_archer_academy.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_spearman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_spearman.xml	(revision 26631)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_spearman.xml	(revision 26632)
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_spearman">
   <Identity>
     <Civ>han</Civ>
     <GenericName>Palace Guard Spearman</GenericName>
     <SpecificName>Hǔ Bēn</SpecificName>
     <SelectionGroupName>units/han/champion_infantry_spearman</SelectionGroupName>
+    <RequiredTechnology>unlock_champion_infantry</RequiredTechnology>
     <Icon>units/han/champion_infantry_swordsman.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/han/infantry_spearman_c.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_spearman_academy.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_spearman_academy.xml	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_spearman_academy.xml	(revision 26632)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/han/champion_infantry_spearman">
+  <Identity>
+    <RequiredTechnology>phase_city</RequiredTechnology>
+  </Identity>
+</Entity>

Property changes on: ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_spearman_academy.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property