From 8471062bbb56d996859ede1d1a6da14e6721d1cc Mon Sep 17 00:00:00 2001
From: Stan <stan@wildfiregames.com>
Date: Sun, 19 Jun 2022 19:27:31 +0000
Subject: [PATCH] Fix missing animations for grain gathering for han units.
 This workarounds a bug in UnitAI and improves consistency with other actors.
 Show the rice hat for approaching, returning and gathering grain.

Refs #6566

This was SVN commit r26961.
---
 .../art/actors/units/han/female_citizen.xml   | 10 ++--
 .../actors/units/han/infantry_archer_a.xml    |  4 +-
 .../actors/units/han/infantry_archer_b.xml    | 10 ++--
 .../actors/units/han/infantry_archer_e.xml    | 10 ++--
 .../units/han/infantry_crossbowman_a.xml      | 10 ++--
 .../units/han/infantry_crossbowman_b.xml      | 10 ++--
 .../units/han/infantry_crossbowman_e.xml      | 10 ++--
 .../units/han/infantry_halberdman_a.xml       | 40 +++++++---------
 .../units/han/infantry_halberdman_b.xml       | 40 +++++++---------
 .../units/han/infantry_halberdman_e.xml       | 40 +++++++---------
 .../actors/units/han/infantry_spearman_a.xml  | 40 +++++++---------
 .../actors/units/han/infantry_spearman_b.xml  | 47 +++++++++----------
 .../actors/units/han/infantry_spearman_e.xml  | 40 +++++++---------
 .../actors/units/han/infantry_swordsman_a.xml | 10 ++--
 .../actors/units/han/infantry_swordsman_b.xml | 10 ++--
 .../actors/units/han/infantry_swordsman_e.xml | 10 ++--
 .../art/variants/biped/approach_grain_han.xml |  6 +++
 .../art/variants/biped/carry_food_han.xml     |  6 +++
 .../biped/female_gather_grain_han.xml         |  6 +++
 .../art/variants/biped/gather_grain_han.xml   |  6 +++
 20 files changed, 166 insertions(+), 199 deletions(-)
 create mode 100644 binaries/data/mods/public/art/variants/biped/approach_grain_han.xml
 create mode 100644 binaries/data/mods/public/art/variants/biped/carry_food_han.xml
 create mode 100644 binaries/data/mods/public/art/variants/biped/female_gather_grain_han.xml
 create mode 100644 binaries/data/mods/public/art/variants/biped/gather_grain_han.xml

diff --git a/binaries/data/mods/public/art/actors/units/han/female_citizen.xml b/binaries/data/mods/public/art/actors/units/han/female_citizen.xml
index 6822e46b4a..f0f84909e1 100644
--- a/binaries/data/mods/public/art/actors/units/han/female_citizen.xml
+++ b/binaries/data/mods/public/art/actors/units/han/female_citizen.xml
@@ -16,13 +16,13 @@
   </group>
   <group>
     <variant file="biped/female_base_walk.xml"/>
-    <variant file="biped/female_carry_food.xml"/>
+    <variant file="biped/female_carry_food_han.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_grain_han.xml"/>
     <variant file="biped/approach_fruit.xml"/>
     <variant file="biped/approach_meat.xml"/>
     <variant file="biped/approach_rock.xml"/>
@@ -40,11 +40,7 @@
         <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_grain_han.xml"/>
     <variant file="biped/female_gather_fruit.xml">
       <props>
         <prop actor="props/units/helmets/han_ricehat.xml" attachpoint="helmet"/>
diff --git a/binaries/data/mods/public/art/actors/units/han/infantry_archer_a.xml b/binaries/data/mods/public/art/actors/units/han/infantry_archer_a.xml
index 2b8fc5d042..94c5e1692c 100644
--- a/binaries/data/mods/public/art/actors/units/han/infantry_archer_a.xml
+++ b/binaries/data/mods/public/art/actors/units/han/infantry_archer_a.xml
@@ -45,7 +45,7 @@
     <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_grain_han.xml"/>
     <variant file="biped/approach_rice.xml"/>
     <variant file="biped/approach_fruit.xml"/>
     <variant file="biped/approach_meat.xml"/>
@@ -60,7 +60,7 @@
     <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_grain_han.xml"/>
     <variant file="biped/gather_fruit.xml"/>
     <variant file="biped/gather_meat.xml"/>
     <variant file="biped/gather_rock.xml"/>
diff --git a/binaries/data/mods/public/art/actors/units/han/infantry_archer_b.xml b/binaries/data/mods/public/art/actors/units/han/infantry_archer_b.xml
index 7aec068547..6344416093 100644
--- a/binaries/data/mods/public/art/actors/units/han/infantry_archer_b.xml
+++ b/binaries/data/mods/public/art/actors/units/han/infantry_archer_b.xml
@@ -33,17 +33,13 @@
   </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_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.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"/>
@@ -58,7 +54,7 @@
     <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_grain_han.xml"/>
     <variant file="biped/gather_fruit.xml"/>
     <variant file="biped/gather_meat.xml"/>
     <variant file="biped/gather_rock.xml"/>
diff --git a/binaries/data/mods/public/art/actors/units/han/infantry_archer_e.xml b/binaries/data/mods/public/art/actors/units/han/infantry_archer_e.xml
index fe12ca4de0..0185e16ef9 100644
--- a/binaries/data/mods/public/art/actors/units/han/infantry_archer_e.xml
+++ b/binaries/data/mods/public/art/actors/units/han/infantry_archer_e.xml
@@ -35,17 +35,13 @@
   </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_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.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"/>
@@ -60,7 +56,7 @@
     <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_grain_han.xml"/>
     <variant file="biped/gather_fruit.xml"/>
     <variant file="biped/gather_meat.xml"/>
     <variant file="biped/gather_rock.xml"/>
diff --git a/binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_a.xml b/binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_a.xml
index 0d734297d5..31b396e563 100644
--- a/binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_a.xml
+++ b/binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_a.xml
@@ -34,17 +34,13 @@
   </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_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.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"/>
@@ -59,7 +55,7 @@
     <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_grain_han.xml"/>
     <variant file="biped/gather_fruit.xml"/>
     <variant file="biped/gather_meat.xml"/>
     <variant file="biped/gather_rock.xml"/>
diff --git a/binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_b.xml b/binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_b.xml
index 3f27cf969c..38e94b934f 100644
--- a/binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_b.xml
+++ b/binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_b.xml
@@ -32,17 +32,13 @@
   </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_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.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"/>
@@ -57,7 +53,7 @@
     <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_grain_han.xml"/>
     <variant file="biped/gather_fruit.xml"/>
     <variant file="biped/gather_meat.xml"/>
     <variant file="biped/gather_rock.xml"/>
diff --git a/binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_e.xml b/binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_e.xml
index c084591fe9..76ef8dce35 100644
--- a/binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_e.xml
+++ b/binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_e.xml
@@ -35,17 +35,13 @@
   </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_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.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"/>
@@ -60,7 +56,7 @@
     <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_grain_han.xml"/>
     <variant file="biped/gather_fruit.xml"/>
     <variant file="biped/gather_meat.xml"/>
     <variant file="biped/gather_rock.xml"/>
diff --git a/binaries/data/mods/public/art/actors/units/han/infantry_halberdman_a.xml b/binaries/data/mods/public/art/actors/units/han/infantry_halberdman_a.xml
index 7604414722..9232646a5c 100644
--- a/binaries/data/mods/public/art/actors/units/han/infantry_halberdman_a.xml
+++ b/binaries/data/mods/public/art/actors/units/han/infantry_halberdman_a.xml
@@ -34,32 +34,13 @@
   </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_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_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.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"/>
@@ -69,7 +50,22 @@
     <variant file="biped/approach_praise.xml"/>
   </group>
   <group>
-    <variant name="Idle"/>
+    <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>
diff --git a/binaries/data/mods/public/art/actors/units/han/infantry_halberdman_b.xml b/binaries/data/mods/public/art/actors/units/han/infantry_halberdman_b.xml
index bfc1e9ebed..f64f9e1f66 100644
--- a/binaries/data/mods/public/art/actors/units/han/infantry_halberdman_b.xml
+++ b/binaries/data/mods/public/art/actors/units/han/infantry_halberdman_b.xml
@@ -31,32 +31,13 @@
   </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_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_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.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"/>
@@ -66,7 +47,22 @@
     <variant file="biped/approach_praise.xml"/>
   </group>
   <group>
-    <variant name="Idle"/>
+    <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>
diff --git a/binaries/data/mods/public/art/actors/units/han/infantry_halberdman_e.xml b/binaries/data/mods/public/art/actors/units/han/infantry_halberdman_e.xml
index 196dfbd362..d091cfd5a0 100644
--- a/binaries/data/mods/public/art/actors/units/han/infantry_halberdman_e.xml
+++ b/binaries/data/mods/public/art/actors/units/han/infantry_halberdman_e.xml
@@ -34,32 +34,13 @@
   </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_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_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.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"/>
@@ -69,7 +50,22 @@
     <variant file="biped/approach_praise.xml"/>
   </group>
   <group>
-    <variant name="Idle"/>
+    <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>
diff --git a/binaries/data/mods/public/art/actors/units/han/infantry_spearman_a.xml b/binaries/data/mods/public/art/actors/units/han/infantry_spearman_a.xml
index 3b8bcbf322..3a64fec6f5 100644
--- a/binaries/data/mods/public/art/actors/units/han/infantry_spearman_a.xml
+++ b/binaries/data/mods/public/art/actors/units/han/infantry_spearman_a.xml
@@ -36,32 +36,13 @@
   </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_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_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.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"/>
@@ -71,7 +52,22 @@
     <variant file="biped/approach_praise.xml"/>
   </group>
   <group>
-    <variant name="Idle"/>
+    <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>
diff --git a/binaries/data/mods/public/art/actors/units/han/infantry_spearman_b.xml b/binaries/data/mods/public/art/actors/units/han/infantry_spearman_b.xml
index c16b0f8332..31ca3f5c3b 100644
--- a/binaries/data/mods/public/art/actors/units/han/infantry_spearman_b.xml
+++ b/binaries/data/mods/public/art/actors/units/han/infantry_spearman_b.xml
@@ -31,34 +31,18 @@
       </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_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>
+    <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.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"/>
@@ -68,7 +52,22 @@
     <variant file="biped/approach_praise.xml"/>
   </group>
   <group>
-    <variant name="Idle"/>
+    <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>
diff --git a/binaries/data/mods/public/art/actors/units/han/infantry_spearman_e.xml b/binaries/data/mods/public/art/actors/units/han/infantry_spearman_e.xml
index 2f31a2ac2f..a1459759c4 100644
--- a/binaries/data/mods/public/art/actors/units/han/infantry_spearman_e.xml
+++ b/binaries/data/mods/public/art/actors/units/han/infantry_spearman_e.xml
@@ -35,32 +35,13 @@
   </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_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_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.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"/>
@@ -70,7 +51,22 @@
     <variant file="biped/approach_praise.xml"/>
   </group>
   <group>
-    <variant name="Idle"/>
+    <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>
diff --git a/binaries/data/mods/public/art/actors/units/han/infantry_swordsman_a.xml b/binaries/data/mods/public/art/actors/units/han/infantry_swordsman_a.xml
index ae84aa748e..27b0024f91 100644
--- a/binaries/data/mods/public/art/actors/units/han/infantry_swordsman_a.xml
+++ b/binaries/data/mods/public/art/actors/units/han/infantry_swordsman_a.xml
@@ -36,17 +36,13 @@
   </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_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.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"/>
@@ -60,7 +56,7 @@
     <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_grain_han.xml"/>
     <variant file="biped/gather_fruit.xml"/>
     <variant file="biped/gather_meat.xml"/>
     <variant file="biped/gather_rock.xml"/>
diff --git a/binaries/data/mods/public/art/actors/units/han/infantry_swordsman_b.xml b/binaries/data/mods/public/art/actors/units/han/infantry_swordsman_b.xml
index 558a443456..00a6827e8d 100644
--- a/binaries/data/mods/public/art/actors/units/han/infantry_swordsman_b.xml
+++ b/binaries/data/mods/public/art/actors/units/han/infantry_swordsman_b.xml
@@ -33,17 +33,13 @@
   </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_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.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"/>
@@ -57,7 +53,7 @@
     <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_grain_han.xml"/>
     <variant file="biped/gather_fruit.xml"/>
     <variant file="biped/gather_meat.xml"/>
     <variant file="biped/gather_rock.xml"/>
diff --git a/binaries/data/mods/public/art/actors/units/han/infantry_swordsman_e.xml b/binaries/data/mods/public/art/actors/units/han/infantry_swordsman_e.xml
index 20930c7a04..3eb8b3ef8d 100644
--- a/binaries/data/mods/public/art/actors/units/han/infantry_swordsman_e.xml
+++ b/binaries/data/mods/public/art/actors/units/han/infantry_swordsman_e.xml
@@ -35,17 +35,13 @@
   </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_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.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"/>
@@ -59,7 +55,7 @@
     <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_grain_han.xml"/>
     <variant file="biped/gather_fruit.xml"/>
     <variant file="biped/gather_meat.xml"/>
     <variant file="biped/gather_rock.xml"/>
diff --git a/binaries/data/mods/public/art/variants/biped/approach_grain_han.xml b/binaries/data/mods/public/art/variants/biped/approach_grain_han.xml
new file mode 100644
index 0000000000..8baeac6577
--- /dev/null
+++ b/binaries/data/mods/public/art/variants/biped/approach_grain_han.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<variant file="biped/approach_grain.xml">
+  <props>
+    <prop actor="props/units/helmets/han_ricehat.xml" attachpoint="helmet"/>
+  </props>
+</variant>
diff --git a/binaries/data/mods/public/art/variants/biped/carry_food_han.xml b/binaries/data/mods/public/art/variants/biped/carry_food_han.xml
new file mode 100644
index 0000000000..4fee562017
--- /dev/null
+++ b/binaries/data/mods/public/art/variants/biped/carry_food_han.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<variant file="biped/carry_food.xml">
+  <props>
+    <prop actor="props/units/helmets/han_ricehat.xml" attachpoint="helmet"/>
+  </props>
+</variant>
diff --git a/binaries/data/mods/public/art/variants/biped/female_gather_grain_han.xml b/binaries/data/mods/public/art/variants/biped/female_gather_grain_han.xml
new file mode 100644
index 0000000000..9a8a45670e
--- /dev/null
+++ b/binaries/data/mods/public/art/variants/biped/female_gather_grain_han.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<variant file="biped/female_gather_grain.xml">
+  <props>
+    <prop actor="props/units/helmets/han_ricehat.xml" attachpoint="helmet"/>
+  </props>
+</variant>
diff --git a/binaries/data/mods/public/art/variants/biped/gather_grain_han.xml b/binaries/data/mods/public/art/variants/biped/gather_grain_han.xml
new file mode 100644
index 0000000000..d6e1b454a7
--- /dev/null
+++ b/binaries/data/mods/public/art/variants/biped/gather_grain_han.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<variant file="biped/gather_grain.xml">
+  <props>
+    <prop actor="props/units/helmets/han_ricehat.xml" attachpoint="helmet"/>
+  </props>
+</variant>