Index: ps/trunk/binaries/data/mods/public/art/variants/biped/approach_rice.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/variants/biped/approach_rice.xml	(revision 27143)
+++ ps/trunk/binaries/data/mods/public/art/variants/biped/approach_rice.xml	(nonexistent)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<variant name="approach_rice">
-  <animations>
-    <animation file="biped/gatherer/idle_hoe_01.dae" name="Idle" speed="20"/>
-    <animation file="biped/gatherer/walk_hoe.dae" name="Walk" speed="20"/>
-    <animation file="biped/gatherer/walk_hoe.dae" name="Run" speed="20"/>
-  </animations>
-  <props>
-    <prop actor="props/units/tools/hoe.xml" attachpoint="weapon_R"/>
-    <prop actor="props/units/helmets/han_ricehat.xml" attachpoint="helmet"/>
-    <prop attachpoint="weapon_L"/>
-    <prop attachpoint="shield"/>
-    <prop attachpoint="shield_arm"/>
-    <prop attachpoint="ammo"/>
-    <prop attachpoint="weapon_bow"/>
-  </props>
-</variant>

Property changes on: ps/trunk/binaries/data/mods/public/art/variants/biped/approach_rice.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/variants/capes/approach_rice.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/variants/capes/approach_rice.xml	(revision 27143)
+++ ps/trunk/binaries/data/mods/public/art/variants/capes/approach_rice.xml	(nonexistent)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<variant name="approach_rice">
-  <animations>
-    <animation file="biped/gatherer/idle_hoe_01.dae" name="Idle" speed="20"/>
-    <animation file="biped/gatherer/walk_hoe.dae" name="Walk" speed="20"/>
-    <animation file="biped/gatherer/walk_hoe.dae" name="Run" speed="20"/>
-  </animations>
-</variant>

Property changes on: ps/trunk/binaries/data/mods/public/art/variants/capes/approach_rice.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_archer_a.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_archer_a.xml	(revision 27143)
+++ ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_archer_a.xml	(revision 27144)
@@ -1,75 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
   <castshadow/>
   <group>
     <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_tunic_long.dae</mesh>
       <props>
         <prop actor="props/units/heads/head_china.xml" attachpoint="head"/>
         <prop actor="props/units/helmets/han_ricehat.xml" attachpoint="helmet"/>
         <prop actor="props/units/weapons/arrow_back.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/weapons/bow/han_bow.xml" attachpoint="weapon_bow"/>
         <prop actor="props/units/quivers/han_quiver_hip.xml" attachpoint="sheath_L"/>
       </props>
       <textures>
         <texture file="skeletal/han/lamellar_01_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
   <group>
     <variant name="Han-Armor-Lamellar-01-Lacqurered-01">
       <textures>
         <texture file="skeletal/han/lamellar_01_lacquered_01.png" name="baseTex"/>
       </textures>
     </variant>
     <variant name="Han-Armor-Lamellar-01-Lacqurered-02">
       <textures>
         <texture file="skeletal/han/lamellar_01_lacquered_02.png" name="baseTex"/>
       </textures>
     </variant>
     <variant name="Han-Armor-Lamellar-01-Lacqurered-03">
       <textures>
         <texture file="skeletal/han/lamellar_01_lacquered_03.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
   <group>
     <variant file="biped/base_archer_relax.xml"/>
     <variant file="biped/carry_food.xml">
       <props>
         <prop actor="props/units/helmets/han_ricehat.xml" attachpoint="helmet"/>
       </props>
     </variant>
     <variant file="biped/carry_meat.xml"/>
     <variant file="biped/carry_wood.xml"/>
     <variant file="biped/carry_stone.xml"/>
     <variant file="biped/carry_metal.xml"/>
     <variant file="biped/approach_tree.xml"/>
     <variant file="biped/approach_grain_han.xml"/>
-    <variant file="biped/approach_rice.xml"/>
     <variant file="biped/approach_fruit.xml"/>
     <variant file="biped/approach_meat.xml"/>
     <variant file="biped/approach_rock.xml"/>
     <variant file="biped/approach_ore.xml"/>
     <variant file="biped/approach_ruins.xml"/>
     <variant file="biped/approach_praise.xml"/>
   </group>
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_ranged_archer_hip.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
     <variant file="biped/gather_tree.xml"/>
     <variant file="biped/gather_grain_han.xml"/>
     <variant file="biped/gather_fruit.xml"/>
     <variant file="biped/gather_meat.xml"/>
     <variant file="biped/gather_rock.xml"/>
     <variant file="biped/gather_ore.xml"/>
     <variant file="biped/gather_ruins.xml"/>
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
     <variant file="biped/death_infantry.xml"/>
   </group>
   <material>player_trans_spec.xml</material>
 </actor>
Index: ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_archer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_archer_b.xml	(revision 27143)
+++ ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_archer_b.xml	(revision 27144)
@@ -1,69 +1,68 @@
 <?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
   <castshadow/>
   <group>
     <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_tunic_short.dae</mesh>
       <props>
         <prop actor="props/units/heads/head_china.xml" attachpoint="head"/>
         <prop actor="props/units/helmets/headband_generic.xml" attachpoint="helmet"/>
         <prop actor="props/units/helmets/han_hairbun.xml" attachpoint="helmet"/>
         <prop actor="props/units/weapons/arrow_back.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/weapons/bow/han_bow.xml" attachpoint="weapon_bow"/>
         <prop actor="props/units/quivers/han_quiver_hip.xml" attachpoint="sheath_L"/>
       </props>
     </variant>
   </group>
   <group>
     <variant name="Han-Tunic-01">
       <textures>
         <texture file="skeletal/han/tunic_01_01.png" name="baseTex"/>
       </textures>
     </variant>
     <variant name="Han-Tunic-02">
       <textures>
         <texture file="skeletal/han/tunic_01_02.png" name="baseTex"/>
       </textures>
     </variant>
     <variant name="Han-Tunic-03">
       <textures>
         <texture file="skeletal/han/tunic_01_03.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
   <group>
     <variant file="biped/base_archer_relax.xml"/>
     <variant file="biped/carry_food_han.xml"/>
     <variant file="biped/carry_meat.xml"/>
     <variant file="biped/carry_wood.xml"/>
     <variant file="biped/carry_stone.xml"/>
     <variant file="biped/carry_metal.xml"/>
     <variant file="biped/approach_tree.xml"/>
     <variant file="biped/approach_grain_han.xml"/>
-    <variant file="biped/approach_rice.xml"/>
     <variant file="biped/approach_fruit.xml"/>
     <variant file="biped/approach_meat.xml"/>
     <variant file="biped/approach_rock.xml"/>
     <variant file="biped/approach_ore.xml"/>
     <variant file="biped/approach_ruins.xml"/>
     <variant file="biped/approach_praise.xml"/>
   </group>
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_ranged_archer_hip.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
     <variant file="biped/gather_tree.xml"/>
     <variant file="biped/gather_grain_han.xml"/>
     <variant file="biped/gather_fruit.xml"/>
     <variant file="biped/gather_meat.xml"/>
     <variant file="biped/gather_rock.xml"/>
     <variant file="biped/gather_ore.xml"/>
     <variant file="biped/gather_ruins.xml"/>
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
     <variant file="biped/death_infantry.xml"/>
   </group>
   <material>player_trans.xml</material>
 </actor>
Index: ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_archer_e.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_archer_e.xml	(revision 27143)
+++ ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_archer_e.xml	(revision 27144)
@@ -1,71 +1,70 @@
 <?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
   <castshadow/>
   <group>
     <variant frequency="1" name="Base">
       <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_cap.xml" attachpoint="helmet"/>
         <prop actor="props/units/weapons/arrow_back.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/weapons/bow/han_bow.xml" attachpoint="weapon_bow"/>
         <prop actor="props/units/quivers/han_quiver_hip.xml" attachpoint="sheath_L"/>
       </props>
       <textures>
         <texture file="skeletal/han/scale_01_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
   <group>
     <variant name="Han-Armor-Scale-01-Lacquered-01">
       <textures>
         <texture file="skeletal/han/scale_01_lacquered_01.png" name="baseTex"/>
       </textures>
     </variant>
     <variant name="Han-Armor-Scale-01-Lacquered-02">
       <textures>
         <texture file="skeletal/han/scale_01_lacquered_02.png" name="baseTex"/>
       </textures>
     </variant>
     <variant name="Han-Armor-Scale-01-Lacquered-03">
       <textures>
         <texture file="skeletal/han/scale_01_lacquered_03.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
   <group>
     <variant file="biped/base_archer_relax.xml"/>
     <variant file="biped/carry_food_han.xml"/>
     <variant file="biped/carry_meat.xml"/>
     <variant file="biped/carry_wood.xml"/>
     <variant file="biped/carry_stone.xml"/>
     <variant file="biped/carry_metal.xml"/>
     <variant file="biped/approach_tree.xml"/>
     <variant file="biped/approach_grain_han.xml"/>
-    <variant file="biped/approach_rice.xml"/>
     <variant file="biped/approach_fruit.xml"/>
     <variant file="biped/approach_meat.xml"/>
     <variant file="biped/approach_rock.xml"/>
     <variant file="biped/approach_ore.xml"/>
     <variant file="biped/approach_ruins.xml"/>
     <variant file="biped/approach_praise.xml"/>
   </group>
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_ranged_archer_hip.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
     <variant file="biped/gather_tree.xml"/>
     <variant file="biped/gather_grain_han.xml"/>
     <variant file="biped/gather_fruit.xml"/>
     <variant file="biped/gather_meat.xml"/>
     <variant file="biped/gather_rock.xml"/>
     <variant file="biped/gather_ore.xml"/>
     <variant file="biped/gather_ruins.xml"/>
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
     <variant file="biped/death_infantry.xml"/>
   </group>
   <material>player_trans_spec.xml</material>
 </actor>
Index: ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_a.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_a.xml	(revision 27143)
+++ ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_a.xml	(revision 27144)
@@ -1,70 +1,69 @@
 <?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
   <castshadow/>
   <group>
     <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_tunic_long.dae</mesh>
       <props>
         <prop actor="props/units/heads/head_china.xml" attachpoint="head"/>
         <prop actor="props/units/helmets/han_cap.xml" attachpoint="helmet"/>
         <prop actor="props/units/weapons/crossbow/han_nu.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/quivers/han_bolt_quiver.xml" attachpoint="back"/>
       </props>
       <textures>
         <texture file="skeletal/han/lamellar_01_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
   <group>
     <variant name="Han-Armor-Lamellar-01-Lacqurered-01">
       <textures>
         <texture file="skeletal/han/lamellar_01_lacquered_01.png" name="baseTex"/>
       </textures>
     </variant>
     <variant name="Han-Armor-Lamellar-01-Lacqurered-02">
       <textures>
         <texture file="skeletal/han/lamellar_01_lacquered_02.png" name="baseTex"/>
       </textures>
     </variant>
     <variant name="Han-Armor-Lamellar-01-Lacqurered-03">
       <textures>
         <texture file="skeletal/han/lamellar_01_lacquered_03.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
   <group>
     <variant file="biped/base_crossbowman_ready.xml"/>
     <variant file="biped/carry_food_han.xml"/>
     <variant file="biped/carry_meat.xml"/>
     <variant file="biped/carry_wood.xml"/>
     <variant file="biped/carry_stone.xml"/>
     <variant file="biped/carry_metal.xml"/>
     <variant file="biped/approach_tree.xml"/>
     <variant file="biped/approach_grain_han.xml"/>
-    <variant file="biped/approach_rice.xml"/>
     <variant file="biped/approach_fruit.xml"/>
     <variant file="biped/approach_meat.xml"/>
     <variant file="biped/approach_rock.xml"/>
     <variant file="biped/approach_ore.xml"/>
     <variant file="biped/approach_ruins.xml"/>
     <variant file="biped/approach_praise.xml"/>
   </group>
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_ranged_crossbowman_back.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
     <variant file="biped/gather_tree.xml"/>
     <variant file="biped/gather_grain_han.xml"/>
     <variant file="biped/gather_fruit.xml"/>
     <variant file="biped/gather_meat.xml"/>
     <variant file="biped/gather_rock.xml"/>
     <variant file="biped/gather_ore.xml"/>
     <variant file="biped/gather_ruins.xml"/>
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
     <variant file="biped/death_infantry.xml"/>
   </group>
   <material>player_trans_spec.xml</material>
 </actor>
Index: ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_b.xml	(revision 27143)
+++ ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_b.xml	(revision 27144)
@@ -1,68 +1,67 @@
 <?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
   <castshadow/>
   <group>
     <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_armor_tunic_short.dae</mesh>
       <props>
         <prop actor="props/units/heads/head_china.xml" attachpoint="head"/>
         <prop actor="props/units/helmets/han_hairbun.xml" attachpoint="helmet"/>
         <prop actor="props/units/helmets/headband_generic.xml" attachpoint="helmet"/>
         <prop actor="props/units/weapons/crossbow/han_nu.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/quivers/han_bolt_quiver.xml" attachpoint="back"/>
       </props>
     </variant>
   </group>
   <group>
     <variant name="Tunic-01">
       <textures>
         <texture file="skeletal/han/tunic_01_01.png" name="baseTex"/>
       </textures>
     </variant>
     <variant name="Tunic-02">
       <textures>
         <texture file="skeletal/han/tunic_01_02.png" name="baseTex"/>
       </textures>
     </variant>
     <variant name="Tunic-03">
       <textures>
         <texture file="skeletal/han/tunic_01_03.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
   <group>
     <variant file="biped/base_crossbowman_ready.xml"/>
     <variant file="biped/carry_food_han.xml"/>
     <variant file="biped/carry_meat.xml"/>
     <variant file="biped/carry_wood.xml"/>
     <variant file="biped/carry_stone.xml"/>
     <variant file="biped/carry_metal.xml"/>
     <variant file="biped/approach_tree.xml"/>
     <variant file="biped/approach_grain_han.xml"/>
-    <variant file="biped/approach_rice.xml"/>
     <variant file="biped/approach_fruit.xml"/>
     <variant file="biped/approach_meat.xml"/>
     <variant file="biped/approach_rock.xml"/>
     <variant file="biped/approach_ore.xml"/>
     <variant file="biped/approach_ruins.xml"/>
     <variant file="biped/approach_praise.xml"/>
   </group>
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_ranged_crossbowman_back.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
     <variant file="biped/gather_tree.xml"/>
     <variant file="biped/gather_grain_han.xml"/>
     <variant file="biped/gather_fruit.xml"/>
     <variant file="biped/gather_meat.xml"/>
     <variant file="biped/gather_rock.xml"/>
     <variant file="biped/gather_ore.xml"/>
     <variant file="biped/gather_ruins.xml"/>
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
     <variant file="biped/death_infantry.xml"/>
   </group>
   <material>player_trans.xml</material>
 </actor>
Index: ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_e.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_e.xml	(revision 27143)
+++ ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_e.xml	(revision 27144)
@@ -1,71 +1,70 @@
 <?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
   <castshadow/>
   <group>
     <variant frequency="1" name="Base">
       <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_hairbun.xml" attachpoint="helmet"/>
         <prop actor="props/units/helmets/han_advanced_melee_helmet.xml" attachpoint="helmet"/>
         <prop actor="props/units/weapons/crossbow/han_nu.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/quivers/han_bolt_quiver.xml" attachpoint="back"/>
       </props>
       <textures>
         <texture file="skeletal/han/lamellar_02_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
   <group>
     <variant name="Han-Armor-Lamellar-02-Lacqurered-01">
       <textures>
         <texture file="skeletal/han/lamellar_02_lacquered_01.png" name="baseTex"/>
       </textures>
     </variant>
     <variant name="Han-Armor-Lamellar-02-Lacqurered-02">
       <textures>
         <texture file="skeletal/han/lamellar_02_lacquered_02.png" name="baseTex"/>
       </textures>
     </variant>
     <variant name="Han-Armor-Lamellar-02-Lacqurered-03">
       <textures>
         <texture file="skeletal/han/lamellar_02_lacquered_03.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
   <group>
     <variant file="biped/base_crossbowman_ready.xml"/>
     <variant file="biped/carry_food_han.xml"/>
     <variant file="biped/carry_meat.xml"/>
     <variant file="biped/carry_wood.xml"/>
     <variant file="biped/carry_stone.xml"/>
     <variant file="biped/carry_metal.xml"/>
     <variant file="biped/approach_tree.xml"/>
     <variant file="biped/approach_grain_han.xml"/>
-    <variant file="biped/approach_rice.xml"/>
     <variant file="biped/approach_fruit.xml"/>
     <variant file="biped/approach_meat.xml"/>
     <variant file="biped/approach_rock.xml"/>
     <variant file="biped/approach_ore.xml"/>
     <variant file="biped/approach_ruins.xml"/>
     <variant file="biped/approach_praise.xml"/>
   </group>
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_ranged_crossbowman_back.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
     <variant file="biped/gather_tree.xml"/>
     <variant file="biped/gather_grain_han.xml"/>
     <variant file="biped/gather_fruit.xml"/>
     <variant file="biped/gather_meat.xml"/>
     <variant file="biped/gather_rock.xml"/>
     <variant file="biped/gather_ore.xml"/>
     <variant file="biped/gather_ruins.xml"/>
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
     <variant file="biped/death_infantry.xml"/>
   </group>
   <material>player_trans_spec.xml</material>
 </actor>
Index: ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_halberdman_a.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_halberdman_a.xml	(revision 27143)
+++ ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_halberdman_a.xml	(revision 27144)
@@ -1,77 +1,76 @@
 <?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
   <castshadow/>
   <group>
     <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_pants_tunic_long.dae</mesh>
       <props>
         <prop actor="props/units/heads/head_china.xml" attachpoint="head"/>
         <prop actor="props/units/helmets/han_hairbun.xml" attachpoint="helmet"/>
         <prop actor="props/units/helmets/han_advanced_melee_helmet.xml" attachpoint="helmet"/>
         <prop actor="props/units/weapons/spear/han_ji.xml" attachpoint="weapon_R"/>
       </props>
       <textures>
         <texture file="skeletal/han/lamellar_01_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
   <group>
     <variant name="Han-Armor-Lamellar-01-Lacqurered-01">
       <textures>
         <texture file="skeletal/han/lamellar_01_lacquered_01.png" name="baseTex"/>
       </textures>
     </variant>
     <variant name="Han-Armor-Lamellar-01-Lacqurered-02">
       <textures>
         <texture file="skeletal/han/lamellar_01_lacquered_02.png" name="baseTex"/>
       </textures>
     </variant>
     <variant name="Han-Armor-Lamellar-01-Lacqurered-03">
       <textures>
         <texture file="skeletal/han/lamellar_01_lacquered_03.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
   <group>
     <variant file="biped/base_pikeman_relax.xml" frequency="1" name="Pikeman-Shield-Relax"/>
     <variant file="biped/formations/syntagma_front.xml"/>
     <variant file="biped/formations/syntagma_01.xml"/>
     <variant file="biped/formations/syntagma_02.xml"/>
     <variant file="biped/formations/syntagma_03.xml"/>
     <variant file="biped/formations/syntagma_04.xml"/>
     <variant file="biped/formations/syntagma_back.xml"/>
     <variant file="biped/formations/anti_cavalry_front.xml"/>
     <variant file="biped/formations/anti_cavalry_back.xml"/>
     <variant file="biped/carry_food_han.xml"/>
     <variant file="biped/carry_meat.xml"/>
     <variant file="biped/carry_wood.xml"/>
     <variant file="biped/carry_stone.xml"/>
     <variant file="biped/carry_metal.xml"/>
     <variant file="biped/approach_tree.xml"/>
     <variant file="biped/approach_grain_han.xml"/>
-    <variant file="biped/approach_rice.xml"/>
     <variant file="biped/approach_fruit.xml"/>
     <variant file="biped/approach_meat.xml"/>
     <variant file="biped/approach_rock.xml"/>
     <variant file="biped/approach_ore.xml"/>
     <variant file="biped/approach_ruins.xml"/>
     <variant file="biped/approach_praise.xml"/>
   </group>
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
     <variant file="biped/gather_tree.xml"/>
     <variant file="biped/gather_grain_han.xml"/>
     <variant file="biped/gather_fruit.xml"/>
     <variant file="biped/gather_meat.xml"/>
     <variant file="biped/gather_rock.xml"/>
     <variant file="biped/gather_ore.xml"/>
     <variant file="biped/gather_ruins.xml"/>
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
     <variant file="biped/death_infantry.xml"/>
   </group>
   <material>player_trans_spec.xml</material>
 </actor>
Index: ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_halberdman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_halberdman_b.xml	(revision 27143)
+++ ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_halberdman_b.xml	(revision 27144)
@@ -1,74 +1,73 @@
 <?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
   <castshadow/>
   <group>
     <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_pants_tunic_long.dae</mesh>
       <props>
         <prop actor="props/units/heads/head_china.xml" attachpoint="head"/>
         <prop actor="props/units/helmets/han_hairbun.xml" attachpoint="helmet"/>
         <prop actor="props/units/helmets/headband_generic.xml" attachpoint="helmet"/>
         <prop actor="props/units/weapons/spear/han_ji.xml" attachpoint="weapon_R"/>
       </props>
     </variant>
   </group>
   <group>
     <variant name="Tunic-01">
       <textures>
         <texture file="skeletal/han/tunic_01_01.png" name="baseTex"/>
       </textures>
     </variant>
     <variant name="Tunic-02">
       <textures>
         <texture file="skeletal/han/tunic_01_02.png" name="baseTex"/>
       </textures>
     </variant>
     <variant name="Tunic-03">
       <textures>
         <texture file="skeletal/han/tunic_01_03.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
   <group>
     <variant file="biped/base_pikeman_relax.xml" frequency="1" name="Pikeman-Shield-Relax"/>
     <variant file="biped/formations/syntagma_front.xml"/>
     <variant file="biped/formations/syntagma_01.xml"/>
     <variant file="biped/formations/syntagma_02.xml"/>
     <variant file="biped/formations/syntagma_03.xml"/>
     <variant file="biped/formations/syntagma_04.xml"/>
     <variant file="biped/formations/syntagma_back.xml"/>
     <variant file="biped/formations/anti_cavalry_front.xml"/>
     <variant file="biped/formations/anti_cavalry_back.xml"/>
     <variant file="biped/carry_food_han.xml"/>
     <variant file="biped/carry_meat.xml"/>
     <variant file="biped/carry_wood.xml"/>
     <variant file="biped/carry_stone.xml"/>
     <variant file="biped/carry_metal.xml"/>
     <variant file="biped/approach_tree.xml"/>
     <variant file="biped/approach_grain_han.xml"/>
-    <variant file="biped/approach_rice.xml"/>
     <variant file="biped/approach_fruit.xml"/>
     <variant file="biped/approach_meat.xml"/>
     <variant file="biped/approach_rock.xml"/>
     <variant file="biped/approach_ore.xml"/>
     <variant file="biped/approach_ruins.xml"/>
     <variant file="biped/approach_praise.xml"/>
   </group>
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
     <variant file="biped/gather_tree.xml"/>
     <variant file="biped/gather_grain_han.xml"/>
     <variant file="biped/gather_fruit.xml"/>
     <variant file="biped/gather_meat.xml"/>
     <variant file="biped/gather_rock.xml"/>
     <variant file="biped/gather_ore.xml"/>
     <variant file="biped/gather_ruins.xml"/>
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
     <variant file="biped/death_infantry.xml"/>
   </group>
   <material>player_trans.xml</material>
 </actor>
Index: ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_halberdman_e.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_halberdman_e.xml	(revision 27143)
+++ ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_halberdman_e.xml	(revision 27144)
@@ -1,77 +1,76 @@
 <?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
   <castshadow/>
   <group>
     <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_armor_pants_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/weapons/spear/han_ji.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/weapons/sheath/han_jian_sheath_left_b.xml" attachpoint="sheath_L"/>
       </props>
       <textures>
         <texture file="skeletal/han/scale_01_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
   <group>
     <variant name="Han-Armor-Scale-01-Lacquered-01">
       <textures>
         <texture file="skeletal/han/scale_01_lacquered_01.png" name="baseTex"/>
       </textures>
     </variant>
     <variant name="Han-Armor-Scale-01-Lacquered-02">
       <textures>
         <texture file="skeletal/han/scale_01_lacquered_02.png" name="baseTex"/>
       </textures>
     </variant>
     <variant name="Han-Armor-Scale-01-Lacquered-03">
       <textures>
         <texture file="skeletal/han/scale_01_lacquered_03.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
   <group>
     <variant file="biped/base_pikeman_relax.xml" frequency="1" name="Pikeman-Shield-Relax"/>
     <variant file="biped/formations/syntagma_front.xml"/>
     <variant file="biped/formations/syntagma_01.xml"/>
     <variant file="biped/formations/syntagma_02.xml"/>
     <variant file="biped/formations/syntagma_03.xml"/>
     <variant file="biped/formations/syntagma_04.xml"/>
     <variant file="biped/formations/syntagma_back.xml"/>
     <variant file="biped/formations/anti_cavalry_front.xml"/>
     <variant file="biped/formations/anti_cavalry_back.xml"/>
     <variant file="biped/carry_food_han.xml"/>
     <variant file="biped/carry_meat.xml"/>
     <variant file="biped/carry_wood.xml"/>
     <variant file="biped/carry_stone.xml"/>
     <variant file="biped/carry_metal.xml"/>
     <variant file="biped/approach_tree.xml"/>
     <variant file="biped/approach_grain_han.xml"/>
-    <variant file="biped/approach_rice.xml"/>
     <variant file="biped/approach_fruit.xml"/>
     <variant file="biped/approach_meat.xml"/>
     <variant file="biped/approach_rock.xml"/>
     <variant file="biped/approach_ore.xml"/>
     <variant file="biped/approach_ruins.xml"/>
     <variant file="biped/approach_praise.xml"/>
   </group>
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
     <variant file="biped/gather_tree.xml"/>
     <variant file="biped/gather_grain_han.xml"/>
     <variant file="biped/gather_fruit.xml"/>
     <variant file="biped/gather_meat.xml"/>
     <variant file="biped/gather_rock.xml"/>
     <variant file="biped/gather_ore.xml"/>
     <variant file="biped/gather_ruins.xml"/>
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
     <variant file="biped/death_infantry.xml"/>
   </group>
   <material>player_trans_spec.xml</material>
 </actor>
Index: ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_spearman_a.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_spearman_a.xml	(revision 27143)
+++ ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_spearman_a.xml	(revision 27144)
@@ -1,73 +1,72 @@
 <?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
   <castshadow/>
   <group>
     <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_pants_tunic_long.dae</mesh>
       <props>
         <prop actor="props/units/heads/head_china.xml" attachpoint="head"/>
         <prop actor="props/units/helmets/han_hairbun.xml" attachpoint="helmet"/>
         <prop actor="props/units/helmets/han_advanced_melee_helmet.xml" attachpoint="helmet"/>
         <prop actor="props/units/shields/han_shield_03.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/spear/han_standard_spear.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/weapons/sheath/han_jian_sheath_left_b.xml" attachpoint="sheath_L"/>
       </props>
       <textures>
         <texture file="skeletal/han/lamellar_01_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
   <group>
     <variant name="Han-Armor-Lamellar-01-Lacqurered-01">
       <textures>
         <texture file="skeletal/han/lamellar_01_lacquered_01.png" name="baseTex"/>
       </textures>
     </variant>
     <variant name="Han-Armor-Lamellar-01-Lacqurered-02">
       <textures>
         <texture file="skeletal/han/lamellar_01_lacquered_02.png" name="baseTex"/>
       </textures>
     </variant>
     <variant name="Han-Armor-Lamellar-01-Lacqurered-03">
       <textures>
         <texture file="skeletal/han/lamellar_01_lacquered_03.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
   <group>
     <variant file="biped/base_spearman_shield_relax.xml"/>
     <variant file="biped/carry_food_han.xml"/>
     <variant file="biped/carry_meat.xml"/>
     <variant file="biped/carry_wood.xml"/>
     <variant file="biped/carry_stone.xml"/>
     <variant file="biped/carry_metal.xml"/>
     <variant file="biped/approach_tree.xml"/>
     <variant file="biped/approach_grain_han.xml"/>
-    <variant file="biped/approach_rice.xml"/>
     <variant file="biped/approach_fruit.xml"/>
     <variant file="biped/approach_meat.xml"/>
     <variant file="biped/approach_rock.xml"/>
     <variant file="biped/approach_ore.xml"/>
     <variant file="biped/approach_ruins.xml"/>
     <variant file="biped/approach_praise.xml"/>
   </group>
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/formations/anti_cavalry_front.xml"/>
     <variant file="biped/formations/anti_cavalry_back.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
     <variant file="biped/gather_tree.xml"/>
     <variant file="biped/gather_grain_han.xml"/>
     <variant file="biped/gather_fruit.xml"/>
     <variant file="biped/gather_meat.xml"/>
     <variant file="biped/gather_rock.xml"/>
     <variant file="biped/gather_ore.xml"/>
     <variant file="biped/gather_ruins.xml"/>
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
     <variant file="biped/death_infantry.xml"/>
   </group>
   <material>player_trans_spec.xml</material>
 </actor>
Index: ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_spearman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_spearman_b.xml	(revision 27143)
+++ ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_spearman_b.xml	(revision 27144)
@@ -1,73 +1,72 @@
 <?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
   <castshadow/>
   <group>
     <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_tunic_long.dae</mesh>
       <props>
         <prop actor="props/units/heads/head_china.xml" attachpoint="head"/>
         <prop actor="props/units/helmets/han_hairbun.xml" attachpoint="helmet"/>
         <prop actor="props/units/helmets/headband_generic.xml" attachpoint="helmet"/>
         <prop actor="props/units/shields/han_shield_03.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/spear/han_standard_spear.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/weapons/sheath/han_jian_sheath_left_b.xml" attachpoint="sheath_L"/>
       </props>
     </variant>
   </group>
   <group>
     <variant name="Tunic-01">
       <textures>
         <texture file="skeletal/han/tunic_01_01.png" name="baseTex"/>
       </textures>
     </variant>
     <variant name="Tunic-02">
       <textures>
         <texture file="skeletal/han/tunic_01_02.png" name="baseTex"/>
       </textures>
     </variant>
     <variant name="Tunic-03">
       <textures>
         <texture file="skeletal/han/tunic_01_03.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
     <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/carry_food_han.xml"/>
     <variant file="biped/carry_meat.xml"/>
     <variant file="biped/carry_wood.xml"/>
     <variant file="biped/carry_stone.xml"/>
     <variant file="biped/carry_metal.xml"/>
   </group>
   <group>
     <variant file="biped/base_spearman_shield_relax.xml"/>
     <variant file="biped/approach_tree.xml"/>
     <variant file="biped/approach_grain_han.xml"/>
-    <variant file="biped/approach_rice.xml"/>
     <variant file="biped/approach_fruit.xml"/>
     <variant file="biped/approach_meat.xml"/>
     <variant file="biped/approach_rock.xml"/>
     <variant file="biped/approach_ore.xml"/>
     <variant file="biped/approach_ruins.xml"/>
     <variant file="biped/approach_praise.xml"/>
   </group>
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/formations/anti_cavalry_front.xml"/>
     <variant file="biped/formations/anti_cavalry_back.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
     <variant file="biped/gather_tree.xml"/>
     <variant file="biped/gather_grain_han.xml"/>
     <variant file="biped/gather_fruit.xml"/>
     <variant file="biped/gather_meat.xml"/>
     <variant file="biped/gather_rock.xml"/>
     <variant file="biped/gather_ore.xml"/>
     <variant file="biped/gather_ruins.xml"/>
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
     <variant file="biped/death_infantry.xml"/>
   </group>
   <material>player_trans.xml</material>
 </actor>
Index: ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_spearman_e.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_spearman_e.xml	(revision 27143)
+++ ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_spearman_e.xml	(revision 27144)
@@ -1,72 +1,71 @@
 <?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
   <castshadow/>
   <group>
     <variant frequency="1" name="Base">
       <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/shields/han_shield_03.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/spear/han_standard_spear.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/weapons/sheath/han_jian_sheath_left_b.xml" attachpoint="sheath_L"/>
       </props>
       <textures>
         <texture file="skeletal/han/lamellar_02_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
   <group>
     <variant name="Han-Armor-Lamellar-02-Lacqurered-01">
       <textures>
         <texture file="skeletal/han/lamellar_02_lacquered_01.png" name="baseTex"/>
       </textures>
     </variant>
     <variant name="Han-Armor-Lamellar-02-Lacqurered-02">
       <textures>
         <texture file="skeletal/han/lamellar_02_lacquered_02.png" name="baseTex"/>
       </textures>
     </variant>
     <variant name="Han-Armor-Lamellar-02-Lacqurered-03">
       <textures>
         <texture file="skeletal/han/lamellar_02_lacquered_03.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
   <group>
     <variant file="biped/base_spearman_shield_relax.xml"/>
     <variant file="biped/carry_food_han.xml"/>
     <variant file="biped/carry_meat.xml"/>
     <variant file="biped/carry_wood.xml"/>
     <variant file="biped/carry_stone.xml"/>
     <variant file="biped/carry_metal.xml"/>
     <variant file="biped/approach_tree.xml"/>
     <variant file="biped/approach_grain_han.xml"/>
-    <variant file="biped/approach_rice.xml"/>
     <variant file="biped/approach_fruit.xml"/>
     <variant file="biped/approach_meat.xml"/>
     <variant file="biped/approach_rock.xml"/>
     <variant file="biped/approach_ore.xml"/>
     <variant file="biped/approach_ruins.xml"/>
     <variant file="biped/approach_praise.xml"/>
   </group>
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/formations/anti_cavalry_front.xml"/>
     <variant file="biped/formations/anti_cavalry_back.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
     <variant file="biped/gather_tree.xml"/>
     <variant file="biped/gather_grain_han.xml"/>
     <variant file="biped/gather_fruit.xml"/>
     <variant file="biped/gather_meat.xml"/>
     <variant file="biped/gather_rock.xml"/>
     <variant file="biped/gather_ore.xml"/>
     <variant file="biped/gather_ruins.xml"/>
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
     <variant file="biped/death_infantry.xml"/>
   </group>
   <material>player_trans_spec.xml</material>
 </actor>
Index: ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_swordsman_a.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_swordsman_a.xml	(revision 27143)
+++ ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_swordsman_a.xml	(revision 27144)
@@ -1,71 +1,70 @@
 <?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
   <castshadow/>
   <group>
     <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_tunic_long.dae</mesh>
       <props>
         <prop actor="props/units/heads/head_china.xml" attachpoint="head"/>
         <prop actor="props/units/helmets/han_hairbun.xml" attachpoint="helmet"/>
         <prop actor="props/units/helmets/han_advanced_melee_helmet.xml" attachpoint="helmet"/>
         <prop actor="props/units/shields/han_shield_02.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/sword/han_jian_a.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/weapons/sheath/han_jian_sheath_left_a_e.xml" attachpoint="sheath_L"/>
       </props>
       <textures>
         <texture file="skeletal/han/lamellar_01_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
   <group>
     <variant name="Han-Armor-Lamellar-01-Lacqurered-01">
       <textures>
         <texture file="skeletal/han/lamellar_01_lacquered_01.png" name="baseTex"/>
       </textures>
     </variant>
     <variant name="Han-Armor-Lamellar-01-Lacqurered-02">
       <textures>
         <texture file="skeletal/han/lamellar_01_lacquered_02.png" name="baseTex"/>
       </textures>
     </variant>
     <variant name="Han-Armor-Lamellar-01-Lacqurered-03">
       <textures>
         <texture file="skeletal/han/lamellar_01_lacquered_03.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
   <group>
     <variant file="biped/base_swordsman_shield_relax_celt.xml"/>
     <variant file="biped/carry_food_han.xml"/>
     <variant file="biped/carry_meat.xml"/>
     <variant file="biped/carry_wood.xml"/>
     <variant file="biped/carry_stone.xml"/>
     <variant file="biped/carry_metal.xml"/>
     <variant file="biped/approach_tree.xml"/>
     <variant file="biped/approach_grain_han.xml"/>
-    <variant file="biped/approach_rice.xml"/>
     <variant file="biped/approach_fruit.xml"/>
     <variant file="biped/approach_meat.xml"/>
     <variant file="biped/approach_rock.xml"/>
     <variant file="biped/approach_ore.xml"/>
     <variant file="biped/approach_ruins.xml"/>
     <variant file="biped/approach_praise.xml"/>
   </group>
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
     <variant file="biped/gather_tree.xml"/>
     <variant file="biped/gather_grain_han.xml"/>
     <variant file="biped/gather_fruit.xml"/>
     <variant file="biped/gather_meat.xml"/>
     <variant file="biped/gather_rock.xml"/>
     <variant file="biped/gather_ore.xml"/>
     <variant file="biped/gather_ruins.xml"/>
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
     <variant file="biped/death_infantry.xml"/>
   </group>
   <material>player_trans_spec.xml</material>
 </actor>
Index: ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_swordsman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_swordsman_b.xml	(revision 27143)
+++ ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_swordsman_b.xml	(revision 27144)
@@ -1,68 +1,67 @@
 <?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
   <castshadow/>
   <group>
     <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_tunic_long.dae</mesh>
       <props>
         <prop actor="props/units/heads/head_china.xml" attachpoint="head"/>
         <prop actor="props/units/helmets/han_hairbun.xml" attachpoint="helmet"/>
         <prop actor="props/units/helmets/headband_generic.xml" attachpoint="helmet"/>
         <prop actor="props/units/weapons/sword/han_jian_a.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/shields/han_shield_03.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/sheath/han_jian_sheath_left_a_e.xml" attachpoint="sheath_L"/>
       </props>
     </variant>
   </group>
   <group>
     <variant name="Tunic-01">
       <textures>
         <texture file="skeletal/han/tunic_01_01.png" name="baseTex"/>
       </textures>
     </variant>
     <variant name="Tunic-02">
       <textures>
         <texture file="skeletal/han/tunic_01_02.png" name="baseTex"/>
       </textures>
     </variant>
     <variant name="Tunic-03">
       <textures>
         <texture file="skeletal/han/tunic_01_03.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
   <group>
     <variant file="biped/base_swordsman_shield_relax_celt.xml"/>
     <variant file="biped/carry_food_han.xml"/>
     <variant file="biped/carry_meat.xml"/>
     <variant file="biped/carry_wood.xml"/>
     <variant file="biped/carry_stone.xml"/>
     <variant file="biped/carry_metal.xml"/>
     <variant file="biped/approach_tree.xml"/>
     <variant file="biped/approach_grain_han.xml"/>
-    <variant file="biped/approach_rice.xml"/>
     <variant file="biped/approach_fruit.xml"/>
     <variant file="biped/approach_meat.xml"/>
     <variant file="biped/approach_rock.xml"/>
     <variant file="biped/approach_ore.xml"/>
     <variant file="biped/approach_ruins.xml"/>
     <variant file="biped/approach_praise.xml"/>
   </group>
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
     <variant file="biped/gather_tree.xml"/>
     <variant file="biped/gather_grain_han.xml"/>
     <variant file="biped/gather_fruit.xml"/>
     <variant file="biped/gather_meat.xml"/>
     <variant file="biped/gather_rock.xml"/>
     <variant file="biped/gather_ore.xml"/>
     <variant file="biped/gather_ruins.xml"/>
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
     <variant file="biped/death_infantry.xml"/>
   </group>
   <material>player_trans.xml</material>
 </actor>
Index: ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_swordsman_e.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_swordsman_e.xml	(revision 27143)
+++ ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_swordsman_e.xml	(revision 27144)
@@ -1,70 +1,69 @@
 <?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
   <castshadow/>
   <group>
     <variant frequency="1" name="Base">
       <mesh>skeletal/new/m_armor_pants_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/shields/han_shield_03.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/sword/han_jian_a.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/weapons/sheath/han_jian_sheath_left_a_e.xml" attachpoint="sheath_L"/>
       </props>
       <textures>
         <texture file="skeletal/han/lamellar_02_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
   <group>
     <variant name="Han-Armor-Lamellar-02-Lacqurered-01">
       <textures>
         <texture file="skeletal/han/lamellar_02_lacquered_01.png" name="baseTex"/>
       </textures>
     </variant>
     <variant name="Han-Armor-Lamellar-02-Lacqurered-02">
       <textures>
         <texture file="skeletal/han/lamellar_02_lacquered_02.png" name="baseTex"/>
       </textures>
     </variant>
     <variant name="Han-Armor-Lamellar-02-Lacqurered-03">
       <textures>
         <texture file="skeletal/han/lamellar_02_lacquered_03.png" name="baseTex"/>
       </textures>
     </variant>
   </group>
   <group>
     <variant file="biped/base_swordsman_shield_relax_celt.xml"/>
     <variant file="biped/carry_food_han.xml"/>
     <variant file="biped/carry_meat.xml"/>
     <variant file="biped/carry_wood.xml"/>
     <variant file="biped/carry_stone.xml"/>
     <variant file="biped/carry_metal.xml"/>
     <variant file="biped/approach_tree.xml"/>
     <variant file="biped/approach_grain_han.xml"/>
-    <variant file="biped/approach_rice.xml"/>
     <variant file="biped/approach_fruit.xml"/>
     <variant file="biped/approach_meat.xml"/>
     <variant file="biped/approach_rock.xml"/>
     <variant file="biped/approach_ore.xml"/>
     <variant file="biped/approach_ruins.xml"/>
     <variant file="biped/approach_praise.xml"/>
   </group>
   <group>
     <variant frequency="1" name="Idle"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
     <variant file="biped/gather_tree.xml"/>
     <variant file="biped/gather_grain_han.xml"/>
     <variant file="biped/gather_fruit.xml"/>
     <variant file="biped/gather_meat.xml"/>
     <variant file="biped/gather_rock.xml"/>
     <variant file="biped/gather_ore.xml"/>
     <variant file="biped/gather_ruins.xml"/>
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
     <variant file="biped/death_infantry.xml"/>
   </group>
   <material>player_trans_spec.xml</material>
 </actor>
Index: ps/trunk/binaries/data/mods/public/simulation/ai/petra/researchManager.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/ai/petra/researchManager.js	(revision 27143)
+++ ps/trunk/binaries/data/mods/public/simulation/ai/petra/researchManager.js	(revision 27144)
@@ -1,242 +1,242 @@
 /**
  * Manage the research
  */
 PETRA.ResearchManager = function(Config)
 {
 	this.Config = Config;
 };
 
 /**
  * Check if we can go to the next phase
  */
 PETRA.ResearchManager.prototype.checkPhase = function(gameState, queues)
 {
 	if (queues.majorTech.hasQueuedUnits())
 		return;
 	// Don't try to phase up if already trying to gather resources for a civil-centre or wonder
 	if (queues.civilCentre.hasQueuedUnits() || queues.wonder.hasQueuedUnits())
 		return;
 
 	let currentPhaseIndex = gameState.currentPhase();
 	let nextPhaseName = gameState.getPhaseName(currentPhaseIndex+1);
 	if (!nextPhaseName)
 		return;
 
 	let petraRequirements =
 		currentPhaseIndex == 1 && gameState.ai.HQ.getAccountedPopulation(gameState) >= this.Config.Economy.popPhase2 ||
 		currentPhaseIndex == 2 && gameState.ai.HQ.getAccountedWorkers(gameState) > this.Config.Economy.workPhase3 ||
 		currentPhaseIndex >= 3 && gameState.ai.HQ.getAccountedWorkers(gameState) > this.Config.Economy.workPhase4;
 	if (petraRequirements && gameState.hasResearchers(nextPhaseName, true))
 	{
 		gameState.ai.HQ.phasing = currentPhaseIndex + 1;
 		// Reset the queue priority in case it was changed during a previous phase update
 		gameState.ai.queueManager.changePriority("majorTech", gameState.ai.Config.priorities.majorTech);
 		queues.majorTech.addPlan(new PETRA.ResearchPlan(gameState, nextPhaseName, true));
 	}
 };
 
 PETRA.ResearchManager.prototype.researchPopulationBonus = function(gameState, queues)
 {
 	if (queues.minorTech.hasQueuedUnits())
 		return;
 
 	let techs = gameState.findAvailableTech();
 	for (let tech of techs)
 	{
 		if (!tech[1]._template.modifications)
 			continue;
 		// TODO may-be loop on all modifs and check if the effect if positive ?
 		if (tech[1]._template.modifications[0].value !== "Population/Bonus")
 			continue;
 		queues.minorTech.addPlan(new PETRA.ResearchPlan(gameState, tech[0]));
 		break;
 	}
 };
 
 PETRA.ResearchManager.prototype.researchTradeBonus = function(gameState, queues)
 {
 	if (queues.minorTech.hasQueuedUnits())
 		return;
 
 	let techs = gameState.findAvailableTech();
 	for (let tech of techs)
 	{
 		if (!tech[1]._template.modifications || !tech[1]._template.affects)
 			continue;
 		if (tech[1]._template.affects.indexOf("Trader") === -1)
 			continue;
 		// TODO may-be loop on all modifs and check if the effect if positive ?
 		if (tech[1]._template.modifications[0].value !== "UnitMotion/WalkSpeed" &&
                     tech[1]._template.modifications[0].value !== "Trader/GainMultiplier")
 			continue;
 		queues.minorTech.addPlan(new PETRA.ResearchPlan(gameState, tech[0]));
 		break;
 	}
 };
 
 /** Techs to be searched for as soon as they are available */
 PETRA.ResearchManager.prototype.researchWantedTechs = function(gameState, techs)
 {
 	let phase1 = gameState.currentPhase() === 1;
 	let available = phase1 ? gameState.ai.queueManager.getAvailableResources(gameState) : null;
 	const numWorkers = phase1 ? gameState.getOwnEntitiesByRole(PETRA.Worker.ROLE_WORKER, true).length : 0;
 	for (let tech of techs)
 	{
 		if (tech[0].indexOf("unlock_champion") == 0)
 			return { "name": tech[0], "increasePriority": true };
 		if (tech[0] == "traditional_army_sele" || tech[0] == "reformed_army_sele")
 			return { "name": pickRandom(["traditional_army_sele", "reformed_army_sele"]), "increasePriority": true };
 
 		if (!tech[1]._template.modifications)
 			continue;
 		let template = tech[1]._template;
 		if (phase1)
 		{
 			let cost = template.cost;
 			let costMax = 0;
 			for (let res in cost)
 				costMax = Math.max(costMax, Math.max(cost[res]-available[res], 0));
 			if (10*numWorkers < costMax)
 				continue;
 		}
 		for (let i in template.modifications)
 		{
 			if (gameState.ai.HQ.navalMap && template.modifications[i].value === "ResourceGatherer/Rates/food.fish")
 				return { "name": tech[0], "increasePriority": this.CostSum(template.cost) < 400 };
 			else if (template.modifications[i].value === "ResourceGatherer/Rates/food.fruit")
 				return { "name": tech[0], "increasePriority": this.CostSum(template.cost) < 400 };
-			else if (template.modifications[i].value === "ResourceGatherer/Rates/food.grain" || template.modifications[i].value === "ResourceGatherer/Rates/food.rice")
+			else if (template.modifications[i].value === "ResourceGatherer/Rates/food.grain")
 				return { "name": tech[0], "increasePriority": false };
 			else if (template.modifications[i].value === "ResourceGatherer/Rates/wood.tree")
 				return { "name": tech[0], "increasePriority": this.CostSum(template.cost) < 400 };
 			else if (template.modifications[i].value.startsWith("ResourceGatherer/Capacities"))
 				return { "name": tech[0], "increasePriority": false };
 			else if (template.modifications[i].value === "Attack/Ranged/MaxRange")
 				return { "name": tech[0], "increasePriority": false };
 		}
 	}
 	return null;
 };
 
 /** Techs to be searched for as soon as they are available, but only after phase 2 */
 PETRA.ResearchManager.prototype.researchPreferredTechs = function(gameState, techs)
 {
 	let phase2 = gameState.currentPhase() === 2;
 	let available = phase2 ? gameState.ai.queueManager.getAvailableResources(gameState) : null;
 	const numWorkers = phase2 ? gameState.getOwnEntitiesByRole(PETRA.Worker.ROLE_WORKER, true).length : 0;
 	for (let tech of techs)
 	{
 		if (!tech[1]._template.modifications)
 			continue;
 		let template = tech[1]._template;
 		if (phase2)
 		{
 			let cost = template.cost;
 			let costMax = 0;
 			for (let res in cost)
 				costMax = Math.max(costMax, Math.max(cost[res]-available[res], 0));
 			if (10*numWorkers < costMax)
 				continue;
 		}
 		for (let i in template.modifications)
 		{
 			if (template.modifications[i].value === "ResourceGatherer/Rates/stone.rock")
 				return { "name": tech[0], "increasePriority": this.CostSum(template.cost) < 400 };
 			else if (template.modifications[i].value === "ResourceGatherer/Rates/metal.ore")
 				return { "name": tech[0], "increasePriority": this.CostSum(template.cost) < 400 };
 			else if (template.modifications[i].value === "BuildingAI/DefaultArrowCount")
 				return { "name": tech[0], "increasePriority": this.CostSum(template.cost) < 400 };
 			else if (template.modifications[i].value === "Health/RegenRate")
 				return { "name": tech[0], "increasePriority": false };
 			else if (template.modifications[i].value === "Health/IdleRegenRate")
 				return { "name": tech[0], "increasePriority": false };
 		}
 	}
 	return null;
 };
 
 PETRA.ResearchManager.prototype.update = function(gameState, queues)
 {
 	if (queues.minorTech.hasQueuedUnits() || queues.majorTech.hasQueuedUnits())
 		return;
 
 	let techs = gameState.findAvailableTech();
 
 	let techName = this.researchWantedTechs(gameState, techs);
 	if (techName)
 	{
 		if (techName.increasePriority)
 		{
 			gameState.ai.queueManager.changePriority("minorTech", 2*this.Config.priorities.minorTech);
 			let plan = new PETRA.ResearchPlan(gameState, techName.name);
 			plan.queueToReset = "minorTech";
 			queues.minorTech.addPlan(plan);
 		}
 		else
 			queues.minorTech.addPlan(new PETRA.ResearchPlan(gameState, techName.name));
 		return;
 	}
 
 	if (gameState.currentPhase() < 2)
 		return;
 
 	techName = this.researchPreferredTechs(gameState, techs);
 	if (techName)
 	{
 		if (techName.increasePriority)
 		{
 			gameState.ai.queueManager.changePriority("minorTech", 2*this.Config.priorities.minorTech);
 			let plan = new PETRA.ResearchPlan(gameState, techName.name);
 			plan.queueToReset = "minorTech";
 			queues.minorTech.addPlan(plan);
 		}
 		else
 			queues.minorTech.addPlan(new PETRA.ResearchPlan(gameState, techName.name));
 		return;
 	}
 
 	if (gameState.currentPhase() < 3)
 		return;
 
 	// remove some techs not yet used by this AI
 	// remove also sharedLos if we have no ally
 	for (let i = 0; i < techs.length; ++i)
 	{
 		let template = techs[i][1]._template;
 		if (template.affects && template.affects.length === 1 &&
 			(template.affects[0] === "Healer" || template.affects[0] === "Outpost" || template.affects[0] === "Wall"))
 		{
 			techs.splice(i--, 1);
 			continue;
 		}
 		if (template.modifications && template.modifications.length === 1 &&
 			this.Config.unusedNoAllyTechs.includes(template.modifications[0].value) &&
 			!gameState.hasAllies())
 		{
 			techs.splice(i--, 1);
 			continue;
 		}
 	}
 	if (!techs.length)
 		return;
 
 	// randomly pick one. No worries about pairs in that case.
 	queues.minorTech.addPlan(new PETRA.ResearchPlan(gameState, pickRandom(techs)[0]));
 };
 
 PETRA.ResearchManager.prototype.CostSum = function(cost)
 {
 	let costSum = 0;
 	for (let res in cost)
 		costSum += cost[res];
 	return costSum;
 };
 
 PETRA.ResearchManager.prototype.Serialize = function()
 {
 	return {};
 };
 
 PETRA.ResearchManager.prototype.Deserialize = function(data)
 {
 };
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/gather_farming_chain_pump.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/gather_farming_chain_pump.json	(revision 27143)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/gather_farming_chain_pump.json	(revision 27144)
@@ -1,24 +1,24 @@
 {
 	"genericName": "Chain Pump",
 	"description": "Install a chain pump for improved irrigation.",
 	"cost": {
 		"wood": 400,
 		"metal": 300
 	},
 	"supersedes": "gather_farming_water_weeding",
 	"requirements": {
 		"all": [
 			{ "tech": "phase_city" },
 			{ "civ": "han" }
 		]
 	},
 	"requirementsTooltip": "Unlocked in City Phase.",
 	"icon": "flood_control.png",
 	"researchTime": 70,
-	"tooltip": "Workers +20% rice gather rate.",
+	"tooltip": "Workers +20% grain gather rate.",
 	"modifications": [
-		{ "value": "ResourceGatherer/Rates/food.rice", "multiply": 1.2 }
+		{ "value": "ResourceGatherer/Rates/food.grain", "multiply": 1.2 }
 	],
 	"affects": ["Worker"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/gather_farming_seed_drill.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/gather_farming_seed_drill.json	(revision 27143)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/gather_farming_seed_drill.json	(revision 27144)
@@ -1,23 +1,23 @@
 {
 	"genericName": "Seed Drill",
 	"description": "Equip your workers with seed drills.",
 	"cost": {
 		"wood": 200,
 		"metal": 100
 	},
 	"requirements": {
 		"all": [
 			{ "tech": "phase_village" },
 			{ "civ": "han" }
 		]
 	},
 	"requirementsTooltip": "Unlocked in Village Phase.",
 	"icon": "torsion_springs.png",
 	"researchTime": 50,
-	"tooltip": "Workers +20% rice gather rate.",
+	"tooltip": "Workers +20% grain gather rate.",
 	"modifications": [
-		{ "value": "ResourceGatherer/Rates/food.rice", "multiply": 1.2 }
+		{ "value": "ResourceGatherer/Rates/food.grain", "multiply": 1.2 }
 	],
 	"affects": ["Worker"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/gather_farming_water_weeding.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/gather_farming_water_weeding.json	(revision 27143)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/gather_farming_water_weeding.json	(revision 27144)
@@ -1,24 +1,24 @@
 {
 	"genericName": "Water Weeding",
 	"description": "Remove water weeds to preserve nutrients for the rice plants.",
 	"cost": {
 		"wood": 300,
 		"metal": 200
 	},
 	"supersedes": "gather_farming_seed_drill",
 	"requirements": {
 		"all": [
 			{ "tech": "phase_town" },
 			{ "civ": "han" }
 		]
 	},
 	"requirementsTooltip": "Unlocked in Town Phase.",
 	"icon": "irrigation.png",
 	"researchTime": 60,
-	"tooltip": "Workers +20% rice gather rate.",
+	"tooltip": "Workers +20% grain gather rate.",
 	"modifications": [
 		{ "value": "ResourceGatherer/Rates/food.grain", "multiply": 1.2 }
 	],
 	"affects": ["Worker"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }