Index: ps/trunk/binaries/data/mods/public/art/variants/biped/female_gather_rice.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/variants/biped/female_gather_rice.xml	(revision 26936)
+++ ps/trunk/binaries/data/mods/public/art/variants/biped/female_gather_rice.xml	(nonexistent)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<variant name="gather_rice">
-  <animations>
-    <animation file="biped/gatherer/farming.dae" name="gather_rice" speed="100"/>
-  </animations>
-  <props>
-    <prop actor="props/units/tools/hoe.xml" attachpoint="weapon_R"/>
-  </props>
-</variant>

Property changes on: ps/trunk/binaries/data/mods/public/art/variants/biped/female_gather_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/biped/gather_rice.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/variants/biped/gather_rice.xml	(revision 26936)
+++ ps/trunk/binaries/data/mods/public/art/variants/biped/gather_rice.xml	(nonexistent)
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<variant name="gather_rice">
-  <animations>
-    <animation file="biped/gatherer/farming.dae" name="gather_rice" speed="100"/>
-  </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/gather_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/female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/actors/units/han/female_citizen.xml	(revision 26936)
+++ ps/trunk/binaries/data/mods/public/art/actors/units/han/female_citizen.xml	(revision 26937)
@@ -1,72 +1,66 @@
 <?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
   <castshadow/>
   <group>
     <variant>
       <mesh>skeletal/new/f_dress.dae</mesh>
       <props>
         <prop actor="props/units/heads/head_female_han.xml" attachpoint="head"/>
         <prop actor="props/units/helmets/han_ricehat.xml" attachpoint="helmet"/>
       </props>
     </variant>
   </group>
   <group>
     <variant file="clothes/han/female_01.xml"/>
     <variant file="clothes/han/female_02.xml"/>
   </group>
   <group>
     <variant file="biped/female_base_walk.xml"/>
     <variant file="biped/female_carry_food.xml"/>
     <variant file="biped/female_carry_meat.xml"/>
     <variant file="biped/female_carry_wood.xml"/>
     <variant file="biped/female_carry_stone.xml"/>
     <variant file="biped/female_carry_metal.xml"/>
     <variant file="biped/approach_tree.xml"/>
     <variant file="biped/approach_grain.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_melee_female.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
     <variant file="biped/female_death.xml"/>
     <variant file="biped/female_gather_tree.xml">
       <props>
         <prop actor="props/units/helmets/han_ricehat.xml" attachpoint="helmet"/>
       </props>
     </variant>
     <variant file="biped/female_gather_grain.xml">
       <props>
         <prop actor="props/units/helmets/han_ricehat.xml" attachpoint="helmet"/>
       </props>
     </variant>
-    <variant file="biped/female_gather_rice.xml">
-      <props>
-        <prop actor="props/units/helmets/han_ricehat.xml" attachpoint="helmet"/>
-      </props>
-    </variant>
     <variant file="biped/female_gather_fruit.xml">
       <props>
         <prop actor="props/units/helmets/han_ricehat.xml" attachpoint="helmet"/>
       </props>
     </variant>
     <variant file="biped/female_gather_meat.xml">
       <props>
         <prop actor="props/units/helmets/han_ricehat.xml" attachpoint="helmet"/>
       </props>
     </variant>
     <variant file="biped/female_gather_rock.xml"/>
     <variant file="biped/female_gather_ore.xml"/>
     <variant file="biped/female_gather_ruins.xml"/>
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/female_build.xml"/>
     <variant file="biped/female_build_farm.xml"/>
   </group>
   <material>player_trans.xml</material>
 </actor>
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 26936)
+++ ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_archer_a.xml	(revision 26937)
@@ -1,76 +1,75 @@
 <?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.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.xml"/>
-    <variant file="biped/gather_rice.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 26936)
+++ ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_archer_b.xml	(revision 26937)
@@ -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_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.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.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.xml"/>
-    <variant file="biped/gather_rice.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 26936)
+++ ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_archer_e.xml	(revision 26937)
@@ -1,76 +1,75 @@
 <?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.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.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.xml"/>
-    <variant file="biped/gather_rice.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 26936)
+++ ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_a.xml	(revision 26937)
@@ -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_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.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.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.xml"/>
-    <variant file="biped/gather_rice.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 26936)
+++ ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_b.xml	(revision 26937)
@@ -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_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.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.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.xml"/>
-    <variant file="biped/gather_rice.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 26936)
+++ ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_e.xml	(revision 26937)
@@ -1,76 +1,75 @@
 <?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.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.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.xml"/>
-    <variant file="biped/gather_rice.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 26936)
+++ ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_halberdman_a.xml	(revision 26937)
@@ -1,76 +1,75 @@
 <?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/carry_food.xml">
       <props>
         <prop actor="props/units/helmets/han_ricehat.xml" attachpoint="helmet"/>
       </props>
     </variant>
     <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.xml"/>
-    <variant file="biped/gather_rice.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"/>
     <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.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 name="Idle"/>
   </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 26936)
+++ ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_halberdman_b.xml	(revision 26937)
@@ -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/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/carry_food.xml">
       <props>
         <prop actor="props/units/helmets/han_ricehat.xml" attachpoint="helmet"/>
       </props>
     </variant>
     <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.xml"/>
-    <variant file="biped/gather_rice.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"/>
     <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.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 name="Idle"/>
   </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 26936)
+++ ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_halberdman_e.xml	(revision 26937)
@@ -1,76 +1,75 @@
 <?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/carry_food.xml">
       <props>
         <prop actor="props/units/helmets/han_ricehat.xml" attachpoint="helmet"/>
       </props>
     </variant>
     <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.xml"/>
-    <variant file="biped/gather_rice.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"/>
     <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.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 name="Idle"/>
   </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 26936)
+++ ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_spearman_a.xml	(revision 26937)
@@ -1,78 +1,77 @@
 <?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.xml">
       <props>
         <prop actor="props/units/helmets/han_ricehat.xml" attachpoint="helmet"/>
       </props>
     </variant>
     <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.xml"/>
-    <variant file="biped/gather_rice.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"/>
     <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.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 name="Idle"/>
   </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 26936)
+++ ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_spearman_b.xml	(revision 26937)
@@ -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_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 file="biped/base_spearman_shield_relax.xml"/>
     <variant file="biped/carry_food.xml">
       <props>
         <prop actor="props/units/helmets/han_ricehat.xml" attachpoint="helmet"/>
       </props>
     </variant>
     <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.xml"/>
-    <variant file="biped/gather_rice.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"/>
     <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.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 name="Idle"/>
   </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 26936)
+++ ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_spearman_e.xml	(revision 26937)
@@ -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_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.xml">
       <props>
         <prop actor="props/units/helmets/han_ricehat.xml" attachpoint="helmet"/>
       </props>
     </variant>
     <variant file="biped/formations/anti_cavalry_front.xml"/>
     <variant file="biped/formations/anti_cavalry_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.xml"/>
-    <variant file="biped/gather_rice.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"/>
     <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.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 name="Idle"/>
   </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 26936)
+++ ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_swordsman_a.xml	(revision 26937)
@@ -1,76 +1,75 @@
 <?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.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.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.xml"/>
-    <variant file="biped/gather_rice.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 26936)
+++ ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_swordsman_b.xml	(revision 26937)
@@ -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/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.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.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.xml"/>
-    <variant file="biped/gather_rice.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 26936)
+++ ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_swordsman_e.xml	(revision 26937)
@@ -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_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.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.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.xml"/>
-    <variant file="biped/gather_rice.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/data/resources/food.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/resources/food.json	(revision 26936)
+++ ps/trunk/binaries/data/mods/public/simulation/data/resources/food.json	(revision 26937)
@@ -1,16 +1,15 @@
 {
 	"code": "food",
 	"name": "Food",
 	"description": "Harvest from animals, berry bushes, fish, or fields.",
 	"order": 1,
 	"subtypes": {
 		"fish": "Fish",
 		"fruit": "Fruit",
 		"grain": "Grain",
-		"meat": "Meat",
-		"rice": "Rice"
+		"meat": "Meat"
 	},
 	"properties": ["barterable", "tradable", "tributable"],
 	"truePrice": 100,
 	"aiAnalysisInfluenceGroup": "ignore"
 }
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 26936)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/gather_farming_water_weeding.json	(revision 26937)
@@ -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 +25% rice gather rate.",
 	"modifications": [
-		{ "value": "ResourceGatherer/Rates/food.rice", "multiply": 1.25 }
+		{ "value": "ResourceGatherer/Rates/food.grain", "multiply": 1.25 }
 	],
 	"affects": ["Worker"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
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 26936)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/han/field.xml	(revision 26937)
@@ -1,32 +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"/>
   </Obstruction>
   <ResourceSupply>
-    <KillBeforeGather>false</KillBeforeGather>
-    <Max>Infinity</Max>
-    <Type>food.rice</Type>
     <MaxGatherers>3</MaxGatherers>
-    <DiminishingReturns>0.90</DiminishingReturns>
   </ResourceSupply>
   <VisualActor>
     <Actor>structures/rice_paddy.xml</Actor>
     <FoundationActor>props/structures/decals/rice_paddy_6x6.xml</FoundationActor>
   </VisualActor>
 </Entity>
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 26936)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/han/infantry_archer_b.xml	(revision 26937)
@@ -1,25 +1,20 @@
 <?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>
   </Identity>
   <Promotion>
     <Entity>units/han/infantry_archer_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/han/infantry_archer_b.xml</Actor>
   </VisualActor>
-  <ResourceGatherer>
-    <Rates>
-      <food.rice>0.35</food.rice>
-    </Rates>
-  </ResourceGatherer>
 </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 26936)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/han/infantry_crossbowman_b.xml	(revision 26937)
@@ -1,26 +1,21 @@
 <?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>
-  <ResourceGatherer>
-    <Rates>
-      <food.rice>0.35</food.rice>
-    </Rates>
-  </ResourceGatherer>
 </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 26936)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/han/infantry_pikeman_b.xml	(revision 26937)
@@ -1,48 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee_pikeman">
   <Attack>
     <Melee>
       <AttackName>Halberdier</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>
     <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>
-  <ResourceGatherer>
-    <Rates>
-      <food.rice>0.35</food.rice>
-    </Rates>
-  </ResourceGatherer>
   <UnitAI>
     <Formations datatype="tokens">
       special/formations/anti_cavalry
     </Formations>
   </UnitAI>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/han/infantry_spearman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/han/infantry_spearman_b.xml	(revision 26936)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/han/infantry_spearman_b.xml	(revision 26937)
@@ -1,30 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee_spearman">
   <Builder>
     <Entities datatype="tokens">
       -structures/wallset_palisade
     </Entities>
   </Builder>
   <Identity>
     <Civ>han</Civ>
     <SelectionGroupName>units/han/infantry_spearman_b</SelectionGroupName>
     <SpecificName>Máo Bīng</SpecificName>
     <Icon>units/han/infantry_spearman.png</Icon>
   </Identity>
   <Promotion>
     <Entity>units/han/infantry_spearman_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/han/infantry_spearman_b.xml</Actor>
   </VisualActor>
-  <ResourceGatherer>
-    <Rates>
-      <food.rice>0.35</food.rice>
-    </Rates>
-  </ResourceGatherer>
   <UnitAI>
     <Formations datatype="tokens">
       special/formations/anti_cavalry
     </Formations>
   </UnitAI>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/han/infantry_swordsman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/han/infantry_swordsman_b.xml	(revision 26936)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/han/infantry_swordsman_b.xml	(revision 26937)
@@ -1,26 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee_swordsman">
   <Builder>
     <Entities datatype="tokens">
       -structures/wallset_palisade
     </Entities>
   </Builder>
   <Identity>
     <Civ>han</Civ>
     <SelectionGroupName>units/han/infantry_swordsman_b</SelectionGroupName>
     <SpecificName>Dāo Bīng</SpecificName>
     <Icon>units/han/infantry_swordsman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/han/infantry_swordsman_a</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/han/infantry_swordsman_b.xml</Actor>
   </VisualActor>
-  <ResourceGatherer>
-    <Rates>
-      <food.rice>0.35</food.rice>
-    </Rates>
-  </ResourceGatherer>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/han/support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/han/support_female_citizen.xml	(revision 26936)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/han/support_female_citizen.xml	(revision 26937)
@@ -1,21 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_female_citizen">
   <Builder>
     <Entities datatype="tokens">
       -structures/wallset_palisade
     </Entities>
   </Builder>
   <Identity>
     <Civ>han</Civ>
     <SpecificName>Fù Nǚ</SpecificName>
     <Icon>units/han/support_female_citizen.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/han/female_citizen.xml</Actor>
   </VisualActor>
-  <ResourceGatherer>
-    <Rates>
-      <food.rice>0.6</food.rice>
-    </Rates>
-  </ResourceGatherer>
 </Entity>