Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/crossbow_training.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/crossbow_training.json	(revision 27405)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/crossbow_training.json	(revision 27406)
@@ -1,23 +1,23 @@
 {
 	"genericName": "Crossbow Training",
 	"description": "The Han had a penchant for using massed crossbowmen in battle.",
 	"cost": {
 		"food": 400,
 		"wood": 400
 	},
 	"requirements": {
 		"all": [
 			{ "tech": "phase_town" },
 			{ "civ": "han" }
 		]
 	},
 	"requirementsTooltip": "Unlocked in Town Phase.",
 	"icon": "armor_plates_ranged.png",
 	"researchTime": 40,
-	"tooltip": "Crossbow Infantry and Cavalry −20% train time.",
+	"tooltip": "Crossbow Infantry −20% train time.",
 	"modifications": [
 		{ "value": "Cost/BuildTime", "multiply": 0.8 }
 	],
 	"affects": ["Crossbowman"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/poison_arrows.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/poison_arrows.json	(revision 27405)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/poison_arrows.json	(revision 27406)
@@ -1,25 +1,25 @@
 {
 	"genericName": "Poison Arrows",
 	"description": "",
 	"cost": {
 		"food": 1200,
-		"wood": 1200
+		"metal": 1200
 	},
 	"requirements": {
 		"all": [
 			{ "tech": "phase_city" },
 			{ "civ": "han" }
 		]
 	},
 	"requirementsTooltip": "Unlocked in City Phase.",
 	"icon": "arrow_poison.png",
 	"researchTime": 50,
 	"tooltip": "Ranged Soldiers +20% attack damage.",
 	"modifications": [
 		{ "value": "Attack/Ranged/Damage/Hack", "multiply": 1.2 },
 		{ "value": "Attack/Ranged/Damage/Pierce", "multiply": 1.2 },
 		{ "value": "Attack/Ranged/Damage/Crush", "multiply": 1.2 }
 	],
 	"affects": ["Soldier"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/poison_blades.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/poison_blades.json	(revision 27405)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/poison_blades.json	(revision 27406)
@@ -1,25 +1,25 @@
 {
 	"genericName": "Poison Blades",
 	"description": "",
 	"cost": {
 		"food": 1200,
-		"metal": 1200
+		"wood": 1200
 	},
 	"requirements": {
 		"all": [
 			{ "tech": "phase_city" },
 			{ "civ": "han" }
 		]
 	},
 	"requirementsTooltip": "Unlocked in City Phase.",
 	"icon": "sword_poison.png",
 	"researchTime": 50,
 	"tooltip": "Melee Soldiers +20% attack damage.",
 	"modifications": [
 		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.2 },
 		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.2 },
 		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.2 }
  	],
 	"affects": ["Soldier"],
 	"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 27405)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/han/academy.xml	(revision 27406)
@@ -1,66 +1,67 @@
 <?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>
     <Requirements>
       <Techs>phase_city</Techs>
     </Requirements>
   </Identity>
   <Obstruction>
     <Static depth="22.0" width="22.0"/>
   </Obstruction>
   <Researcher>
     <Technologies datatype="tokens">
       -barracks_batch_training
+      -crossbow_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 replace="" datatype="tokens">
       units/{civ}/champion_infantry_spearman_academy
       units/{civ}/champion_infantry_crossbowman_academy
       units/{civ}/champion_cavalry_spearman_academy
       units/{civ}/champion_chariot_academy
     </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/field.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/han/field.xml	(revision 27405)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/han/field.xml	(revision 27406)
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_resource_field">
   <Cost>
     <BuildTime>30</BuildTime>
     <Resources>
       <wood>60</wood>
     </Resources>
   </Cost>
   <Footprint>
     <Square depth="22.0" width="22.0"/>
     <Height>2.0</Height>
   </Footprint>
   <Identity>
     <Civ>han</Civ>
     <SpecificName>Dàotián</SpecificName>
     <GenericName>Rice Paddy</GenericName>
   </Identity>
   <Obstruction>
-    <Static depth="20.0" width="20.0"/>
+    <Static depth="18.0" width="18.0"/>
   </Obstruction>
   <ResourceSupply>
     <MaxGatherers>3</MaxGatherers>
   </ResourceSupply>
   <VisualActor>
     <Actor>structures/rice_paddy.xml</Actor>
     <FoundationActor>props/structures/decals/rice_paddy_6x6.xml</FoundationActor>
   </VisualActor>
 </Entity>