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 27008)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_spearman.xml	(nonexistent)
@@ -1,13 +0,0 @@
-<?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>unlock_champion_cavalry</RequiredTechnology>
-  </Identity>
-  <VisualActor>
-    <Actor>units/han/cavalry_spearman_c_m.xml</Actor>
-  </VisualActor>
-</Entity>

Property changes on: ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_spearman.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/han/champion_infantry_archer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_archer.xml	(revision 27008)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_archer.xml	(nonexistent)
@@ -1,14 +0,0 @@
-<?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>

Property changes on: ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_archer.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/han/champion_cavalry_crossbowman_academy.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_crossbowman_academy.xml	(revision 27008)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_crossbowman_academy.xml	(nonexistent)
@@ -1,6 +0,0 @@
-<?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
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-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 27008)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_chariot.xml	(nonexistent)
@@ -1,18 +0,0 @@
-<?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>Han War Chariot</GenericName>
-    <SpecificName>Zhanche</SpecificName>
-    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
-    <RequiredTechnology>unlock_champion_chariots</RequiredTechnology>
-    <Icon>units/han/chariot.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/han/chariot_archer_m.xml</Actor>
-  </VisualActor>
-</Entity>

Property changes on: ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_chariot.xml
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
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 27008)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_crossbowman.xml	(nonexistent)
@@ -1,13 +0,0 @@
-<?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>unlock_champion_cavalry</RequiredTechnology>
-  </Identity>
-  <VisualActor>
-    <Actor>units/han/cavalry_crossbowman_c_m.xml</Actor>
-  </VisualActor>
-</Entity>

Property changes on: ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_crossbowman.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/han/champion_infantry_spearman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_spearman.xml	(revision 27008)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_spearman.xml	(nonexistent)
@@ -1,14 +0,0 @@
-<?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>

Property changes on: ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_spearman.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/art/actors/units/han/infantry_crossbowman_c.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_c.xml	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_c.xml	(revision 27009)
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant file="biped/base_archer_gastraphetes_relax.xml">
+      <mesh>skeletal/new/m_armor_tunic_long.dae</mesh>
+      <props>
+        <prop actor="props/units/heads/head_china.xml" attachpoint="head"/>
+        <prop actor="props/units/helmets/han_heavy_helmet_b.xml" attachpoint="helmet"/>
+        <prop actor="props/units/helmets/han_advanced_melee_helmet.xml" attachpoint="helmet"/>
+        <prop actor="props/units/weapons/gastraphetes.xml" attachpoint="weapon_L"/>
+        <prop actor="props/units/quiver_back_bamboo.xml" attachpoint="back"/>
+      </props>
+      <textures>
+        <texture file="skeletal/han/lamellar_02_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant name="Han-Officer-01">
+      <textures>
+        <texture file="skeletal/han/officer_01.png" name="baseTex"/>
+        <texture file="skeletal/han/officer_01_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+    <variant name="Han-Officer-02">
+      <textures>
+        <texture file="skeletal/han/officer_02.png" name="baseTex"/>
+        <texture file="skeletal/han/officer_02_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+    <variant name="Han-Officer-03">
+      <textures>
+        <texture file="skeletal/han/officer_03.png" name="baseTex"/>
+        <texture file="skeletal/han/officer_03_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+    <variant name="Han-Officer-04">
+      <textures>
+        <texture file="skeletal/han/officer_04.png" name="baseTex"/>
+        <texture file="skeletal/han/officer_04_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+    <variant name="Han-Officer-05">
+      <textures>
+        <texture file="skeletal/han/officer_05.png" name="baseTex"/>
+        <texture file="skeletal/han/officer_05_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+    <variant name="Han-Officer-06">
+      <textures>
+        <texture file="skeletal/han/officer_06.png" name="baseTex"/>
+        <texture file="skeletal/han/officer_06_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="Idle"/>
+    <variant file="biped/attack_ranged_gastraphetes_fire.xml"/>
+    <variant file="biped/attack_slaughter.xml"/>
+    <variant file="biped/attack_capture.xml"/>
+    <variant file="biped/gather_praise.xml"/>
+    <variant file="biped/death_infantry.xml"/>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/han.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/civs/han.json	(revision 27008)
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/han.json	(revision 27009)
@@ -1,77 +1,77 @@
 {
 	"Code": "han",
 	"Culture": "china",
 	"Music": [
 		{
 			"File": "Red_Dawn.ogg",
 			"Type": "peace"
 		},
 		{
 			"File": "Hill_of_Sorrows.ogg",
 			"Type": "peace"
 		}
 	],
 	"CivBonuses": [],
 	"WallSets": [
 		"structures/han/wallset_stone"
 	],
 	"StartEntities": [
 		{
 			"Template": "structures/han/civil_centre"
 		},
 		{
 			"Template": "units/han/support_female_citizen",
 			"Count": 4
 		},
 		{
 			"Template": "units/han/infantry_spearman_b",
 			"Count": 2
 		},
 		{
-			"Template": "units/han/infantry_archer_b",
+			"Template": "units/han/infantry_crossbowman_b",
 			"Count": 2
 		},
 		{
 			"Template": "units/han/cavalry_swordsman_b"
 		},
 		{
 			"Template": "units/han/support_minister"
 		}
 	],
 	"AINames": [
 		"Liu Ying",
 		"Liu Gong",
 		"Liu Hong",
 		"Liu Heng",
 		"Liu Qi",
 		"Liu Che",
 		"Liu Fuling",
 		"Liu He",
 		"Liu Bingyi",
 		"Liu Shi",
 		"Liu Ao",
 		"Liu Xin",
 		"Liu Kan",
 		"Liu Xuan",
 		"Liu Xiu",
 		"Liu Zhuang",
 		"Liu Da",
 		"Liu Zhao",
 		"Liu Long",
 		"Liu Hu",
 		"Liu Yi",
 		"Liu Bao",
 		"Liu Bing",
 		"Liu Zuan",
 		"Liu Zhi",
 		"Liu Hong",
 		"Liu Bian",
 		"Liu Xie"
 	],
 	"SkirmishReplacements": {
 		"skirmish/units/special_starting_unit": "units/han/support_minister",
-		"skirmish/units/default_infantry_ranged_b": "units/han/infantry_archer_b",
+		"skirmish/units/default_infantry_ranged_b": "units/han/infantry_crossbowman_b",
 		"skirmish/units/default_cavalry": "units/han/cavalry_swordsman_b"
 	},
 	"SelectableInGameSetup": true
 }
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/unlock_champion_cavalry.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/unlock_champion_cavalry.json	(revision 27008)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/unlock_champion_cavalry.json	(revision 27009)
@@ -1,21 +1,22 @@
 {
 	"genericName": "Unlock Champion Cavalry",
 	"description": "Guard units (Champions) are professionals who wield the best weapons and have the best training.",
 	"cost": {
 		"food": 600
 	},
 	"requirements": {
 		"all": [
 			{ "tech": "phase_city" },
 			{ "notciv": "athen" },
 			{ "notciv": "brit" },
+			{ "notciv": "han" },
 			{ "notciv": "maur" },
 			{ "notciv": "spart" }
 		]
 	},
 	"requirementsTooltip": "Unlocked in City Phase.",
 	"icon": "helmet_corinthian_crest.png",
 	"researchTime": 60,
 	"tooltip": "Unlock Champion Cavalry at the Stable.",
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/unlock_champion_infantry.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/unlock_champion_infantry.json	(revision 27008)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/unlock_champion_infantry.json	(revision 27009)
@@ -1,27 +1,28 @@
 {
 	"genericName": "Unlock Champion Infantry",
 	"specificName": {
 		"mace": "Agēma",
 		"ptol": "Agēma",
 		"rome": "Regio Cohors"
 	},
 	"description": "Guard units (Champions) are professionals who wield the best weapons and have the best training.",
 	"cost": {
 		"food": 600
 	},
 	"requirements": {
 		"all": [
 			{ "tech": "phase_city" },
 			{ "notciv": "athen" },
 			{ "notciv": "cart" },
+			{ "notciv": "han" },
 			{ "notciv": "pers" },
 			{ "notciv": "sele" },
 			{ "notciv": "spart" }
 		]
 	},
 	"requirementsTooltip": "Unlocked in City Phase.",
 	"icon": "helmet_corinthian_crest.png",
 	"researchTime": 60,
 	"tooltip": "Unlock Champions Infantry at the Barracks.",
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
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 27008)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/han/academy.xml	(revision 27009)
@@ -1,75 +1,64 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_barracks">
   <BuildRestrictions>
     <Category>Academy</Category>
   </BuildRestrictions>
   <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>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
+    <Entities replace="" datatype="tokens">
       units/{civ}/champion_infantry_spearman_academy
-      units/{civ}/champion_infantry_archer_academy
+      units/{civ}/champion_infantry_crossbowman_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/barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/han/barracks.xml	(revision 27008)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/han/barracks.xml	(revision 27009)
@@ -1,41 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_barracks">
   <Footprint>
     <Square depth="22.0" width="22.0"/>
     <Height>5.0</Height>
   </Footprint>
   <GarrisonHolder>
     <List datatype="tokens">Minister</List>
   </GarrisonHolder>
   <Identity>
     <Civ>han</Civ>
     <SpecificName>Jūn Yíng</SpecificName>
   </Identity>
   <Obstruction>
     <Static depth="20.0" width="20.0"/>
   </Obstruction>
   <Researcher>
     <Technologies datatype="tokens">
       -unlock_champion_infantry
       archer_attack_spread
       crossbow_training
     </Technologies>
   </Researcher>
   <Trainer>
     <Entities datatype="tokens">
       units/{civ}/infantry_crossbowman_b
+      -units/{civ}/infantry_swordsman_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
     </Entities>
   </Trainer>
   <VisualActor>
     <Actor>structures/han/barracks.xml</Actor>
     <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/han/civil_centre.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/han/civil_centre.xml	(revision 27008)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/han/civil_centre.xml	(revision 27009)
@@ -1,47 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_civil_centre">
   <Footprint>
     <Square depth="35.0" width="43.0"/>
     <Height>8.0</Height>
   </Footprint>
   <GarrisonHolder>
     <List datatype="tokens">Minister</List>
   </GarrisonHolder>
   <Identity>
     <Civ>han</Civ>
     <SpecificName>Gōngdiàn</SpecificName>
   </Identity>
   <Obstruction>
     <Static depth="33.0" width="41.0"/>
   </Obstruction>
   <Researcher>
     <Technologies datatype="tokens">
       -unlock_spies
       -spy_counter
     </Technologies>
   </Researcher>
   <Trainer>
     <Entities datatype="tokens">
       units/{civ}/infantry_spearman_b
-      units/{civ}/infantry_archer_b
+      units/{civ}/infantry_crossbowman_b
       units/{civ}/cavalry_swordsman_b
     </Entities>
   </Trainer>
   <Upgrade>
     <ImperialCourt>
       <Entity>structures/{civ}/civil_centre_court</Entity>
       <Tooltip>This greatly increases the health, capture resistance, and garrison capacity of this specific Civic Center. Unlock training of Heroes here and reduce its research and batch training times by half.</Tooltip>
       <RequiredTechnology>phase_city</RequiredTechnology>
       <Cost>
         <stone>300</stone>
         <wood>300</wood>
       </Cost>
       <Time>40</Time>
       <Variant>upgrading</Variant>
     </ImperialCourt>
   </Upgrade>
   <VisualActor>
     <FoundationActor>structures/fndn_8x8.xml</FoundationActor>
     <Actor>structures/han/civil_centre.xml</Actor>
   </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 27008)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/han/stable.xml	(revision 27009)
@@ -1,39 +1,40 @@
 <?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
       archer_attack_spread
       crossbow_training
     </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_unit_champion_infantry_crossbowman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_crossbowman.xml	(revision 27008)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_crossbowman.xml	(revision 27009)
@@ -1,53 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry">
   <Attack>
     <Ranged>
       <AttackName>Crossbow</AttackName>
       <Damage>
         <Pierce>40</Pierce>
       </Damage>
-      <MaxRange>50</MaxRange>
-      <PrepareTime>600</PrepareTime>
+      <MaxRange>60</MaxRange>
+      <PrepareTime>200</PrepareTime>
       <RepeatTime>3000</RepeatTime>
       <Projectile>
-        <Speed>80</Speed>
-        <Spread>3</Spread>
+        <Speed>120</Speed>
+        <Spread>0.8</Spread>
         <Gravity>30</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <Health>
     <Max>120</Max>
   </Health>
   <Identity>
     <GenericName>Champion Infantry Crossbowman</GenericName>
     <VisibleClasses datatype="tokens">Ranged Crossbowman</VisibleClasses>
   </Identity>
   <Resistance>
     <Entity>
       <Damage>
         <Hack op="add">-2</Hack>
         <Pierce op="add">-2</Pierce>
       </Damage>
     </Entity>
   </Resistance>
   <Sound>
     <SoundGroups>
       <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
       <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
     </SoundGroups>
   </Sound>
   <Turretable/>
   <UnitAI>
     <Formations datatype="tokens">
       special/formations/skirmish
     </Formations>
   </UnitAI>
   <UnitMotion>
     <WalkSpeed op="add">0.6</WalkSpeed>
     <Acceleration op="add">1.2</Acceleration>
   </UnitMotion>
 </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	(revision 27008)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_spearman_academy.xml	(revision 27009)
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/han/champion_cavalry_spearman">
+<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>
   </Identity>
+  <VisualActor>
+    <Actor>units/han/cavalry_spearman_c_m.xml</Actor>
+  </VisualActor>
 </Entity>

Property changes on: ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_spearman_academy.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
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	(revision 27008)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_chariot_academy.xml	(revision 27009)
@@ -1,6 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/han/champion_chariot">
+<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>Han War Chariot</GenericName>
+    <SpecificName>Zhanche</SpecificName>
+    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <RequiredTechnology>phase_city</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_infantry_archer_academy.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_archer_academy.xml	(revision 27008)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_archer_academy.xml	(revision 27009)
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/han/champion_infantry_archer">
+<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>phase_city</RequiredTechnology>
   </Identity>
+  <VisualActor>
+    <Actor>units/han/infantry_archer_c.xml</Actor>
+  </VisualActor>
 </Entity>

Property changes on: ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_archer_academy.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_crossbowman_academy.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_crossbowman_academy.xml	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_crossbowman_academy.xml	(revision 27009)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_infantry_crossbowman">
+  <Identity>
+    <Civ>han</Civ>
+    <SpecificName>Juezhang</SpecificName>
+    <Icon>units/mace_champion_infantry_crossbowman.png</Icon>
+    <RequiredTechnology>phase_city</RequiredTechnology>
+  </Identity>
+  <VisualActor>
+    <Actor>units/han/infantry_crossbowman_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	(revision 27008)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_spearman_academy.xml	(revision 27009)
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/han/champion_infantry_spearman">
+<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>phase_city</RequiredTechnology>
+    <Icon>units/han/champion_infantry_swordsman.png</Icon>
   </Identity>
+  <VisualActor>
+    <Actor>units/han/infantry_spearman_c.xml</Actor>
+  </VisualActor>
 </Entity>

Property changes on: ps/trunk/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_spearman_academy.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/han/infantry_archer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/han/infantry_archer_b.xml	(revision 27008)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/han/infantry_archer_b.xml	(revision 27009)
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged_archer">
   <Builder>
     <Entities datatype="tokens">
       -structures/wallset_palisade
     </Entities>
   </Builder>
   <Identity>
     <Civ>han</Civ>
     <SelectionGroupName>units/han/infantry_archer_b</SelectionGroupName>
     <SpecificName>Shè Shǒu</SpecificName>
     <Icon>units/han/infantry_archer.png</Icon>
+    <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/han/infantry_archer_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/han/infantry_archer_b.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/han/infantry_crossbowman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/han/infantry_crossbowman_b.xml	(revision 27008)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/han/infantry_crossbowman_b.xml	(revision 27009)
@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged_crossbowman">
   <Builder>
     <Entities datatype="tokens">
       -structures/wallset_palisade
     </Entities>
   </Builder>
   <Identity>
     <Civ>han</Civ>
     <SelectionGroupName>units/han/infantry_crossbowman_b</SelectionGroupName>
     <SpecificName>Nǔ Shǒu</SpecificName>
     <Icon>units/han/infantry_crossbowman.png</Icon>
-    <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/han/infantry_crossbowman_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/han/infantry_crossbowman_b.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/han/infantry_pikeman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/han/infantry_pikeman_b.xml	(revision 27008)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/han/infantry_pikeman_b.xml	(revision 27009)
@@ -1,43 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee_pikeman">
   <Attack>
     <Melee>
-      <AttackName>Halberdier</AttackName>
+      <AttackName>Ji</AttackName>
       <Damage>
         <Hack op="add">1</Hack>
         <Pierce op="add">1</Pierce>
       </Damage>
     </Melee>
   </Attack>
   <Builder>
     <Entities datatype="tokens">
       -structures/wallset_palisade
     </Entities>
   </Builder>
   <Identity>
     <Civ>han</Civ>
     <SelectionGroupName>units/han/infantry_pikeman_b</SelectionGroupName>
+    <GenericName>Halberdier</GenericName>
     <SpecificName>Jǐ Bīng</SpecificName>
     <Icon>units/han/infantry_halberdman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/han/infantry_pikeman_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/han/infantry_halberdman_b.xml</Actor>
   </VisualActor>
   <Resistance>
     <Entity>
       <Damage>
         <Hack op="add">-2</Hack>
         <Pierce op="add">-2</Pierce>
       </Damage>
     </Entity>
   </Resistance>
   <UnitAI>
     <Formations datatype="tokens">
       special/formations/anti_cavalry
     </Formations>
   </UnitAI>
 </Entity>