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
+++ ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_archer_a.xml
@@ -46,7 +46,6 @@
     <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"/>
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
+++ ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_archer_b.xml
@@ -40,7 +40,6 @@
     <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"/>
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
+++ ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_archer_e.xml
@@ -42,7 +42,6 @@
     <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"/>
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
+++ ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_a.xml
@@ -41,7 +41,6 @@
     <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"/>
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
+++ ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_b.xml
@@ -39,7 +39,6 @@
     <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"/>
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
+++ ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_e.xml
@@ -42,7 +42,6 @@
     <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"/>
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
+++ ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_halberdman_a.xml
@@ -49,7 +49,6 @@
     <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"/>
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
+++ ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_halberdman_b.xml
@@ -46,7 +46,6 @@
     <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"/>
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
+++ ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_halberdman_e.xml
@@ -49,7 +49,6 @@
     <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"/>
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
+++ ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_spearman_a.xml
@@ -43,7 +43,6 @@
     <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"/>
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
+++ ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_spearman_b.xml
@@ -43,7 +43,6 @@
     <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"/>
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
+++ ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_spearman_e.xml
@@ -42,7 +42,6 @@
     <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"/>
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
+++ ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_swordsman_a.xml
@@ -43,7 +43,6 @@
     <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"/>
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
+++ ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_swordsman_b.xml
@@ -40,7 +40,6 @@
     <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"/>
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
+++ ps/trunk/binaries/data/mods/public/art/actors/units/han/infantry_swordsman_e.xml
@@ -42,7 +42,6 @@
     <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"/>
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
+++ ps/trunk/binaries/data/mods/public/art/variants/biped/approach_rice.xml
@@ -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>
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
+++ ps/trunk/binaries/data/mods/public/art/variants/capes/approach_rice.xml
@@ -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>
Index: ps/trunk/binaries/data/mods/public/simulation/ai/petra/researchManager.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/ai/petra/researchManager.js
+++ ps/trunk/binaries/data/mods/public/simulation/ai/petra/researchManager.js
@@ -105,7 +105,7 @@
 				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 };
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
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/gather_farming_chain_pump.json
@@ -15,9 +15,9 @@
 	"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
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/gather_farming_seed_drill.json
@@ -14,9 +14,9 @@
 	"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
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/gather_farming_water_weeding.json
@@ -15,7 +15,7 @@
 	"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 }
 	],