From 5063adb30fa42e4dadd371e2fd17e2b42b6a225b Mon Sep 17 00:00:00 2001
From: Stan <stan@wildfiregames.com>
Date: Fri, 27 Mar 2020 08:29:39 +0000
Subject: [PATCH] Move Persian cavalry to the persian folder.

Use the Persian cavalry for pers as well (Currently only used by
Seleucids)
Move the chariot to an unused unit
Fix the specicif names,
Move the icon from sele_ to pers_

Patch by: @Nescio
Differential Revision: https://code.wildfiregames.com/D2530
This was SVN commit r23553.
---
 .../cavalry_archer_a_m.xml                    | 70 +++++++++----------
 .../cavalry_archer_a_r.xml                    |  0
 .../cavalry_archer_b_m.xml                    | 70 +++++++++----------
 .../cavalry_archer_b_r.xml                    |  0
 .../units/persians/cavalry_archer_c_m.xml     | 62 ++++++++--------
 .../cavalry_archer_e_m.xml                    | 70 +++++++++----------
 .../cavalry_archer_e_r.xml                    |  0
 ...lry_archer.png => pers_cavalry_archer.png} |  0
 .../templates/units/pers_cavalry_archer_a.xml |  2 +-
 .../templates/units/pers_cavalry_archer_b.xml | 12 ++--
 .../templates/units/pers_cavalry_archer_e.xml |  2 +-
 .../templates/units/pers_chariot.xml          | 18 +++++
 .../templates/units/sele_cavalry_archer_a.xml |  2 +-
 .../templates/units/sele_cavalry_archer_b.xml |  4 +-
 .../templates/units/sele_cavalry_archer_e.xml |  2 +-
 15 files changed, 164 insertions(+), 150 deletions(-)
 rename binaries/data/mods/public/art/actors/units/{seleucids => persians}/cavalry_archer_a_m.xml (87%)
 rename binaries/data/mods/public/art/actors/units/{seleucids => persians}/cavalry_archer_a_r.xml (100%)
 rename binaries/data/mods/public/art/actors/units/{seleucids => persians}/cavalry_archer_b_m.xml (87%)
 rename binaries/data/mods/public/art/actors/units/{seleucids => persians}/cavalry_archer_b_r.xml (100%)
 rename binaries/data/mods/public/art/actors/units/{seleucids => persians}/cavalry_archer_e_m.xml (87%)
 rename binaries/data/mods/public/art/actors/units/{seleucids => persians}/cavalry_archer_e_r.xml (100%)
 rename binaries/data/mods/public/art/textures/ui/session/portraits/units/{sele_cavalry_archer.png => pers_cavalry_archer.png} (100%)
 create mode 100644 binaries/data/mods/public/simulation/templates/units/pers_chariot.xml

diff --git a/binaries/data/mods/public/art/actors/units/seleucids/cavalry_archer_a_m.xml b/binaries/data/mods/public/art/actors/units/persians/cavalry_archer_a_m.xml
similarity index 87%
rename from binaries/data/mods/public/art/actors/units/seleucids/cavalry_archer_a_m.xml
rename to binaries/data/mods/public/art/actors/units/persians/cavalry_archer_a_m.xml
index c8b2da8018..ca1f373621 100644
--- a/binaries/data/mods/public/art/actors/units/seleucids/cavalry_archer_a_m.xml
+++ b/binaries/data/mods/public/art/actors/units/persians/cavalry_archer_a_m.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <mesh>skeletal/horse_persian.dae</mesh>
-      <props>
-        <prop actor="units/seleucids/cavalry_archer_a_r.xml" attachpoint="rider"/>
-        <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
-        <prop actor="props/horse/chest_colorband_01.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant file="quadraped/horse/brown.xml" frequency="1" name="brown"/>
-    <variant file="quadraped/horse/black.xml" frequency="1" name="black"/>
-    <variant file="quadraped/horse/beige.xml" frequency="1" name="beige"/>
-    <variant file="quadraped/horse/tan.xml" frequency="1" name="tan"/>
-    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="cherrybay"/>
-    <variant file="quadraped/horse/pure_white.xml" frequency="1" name="pure_white"/>
-    <variant file="quadraped/horse/white.xml" frequency="1" name="white"/>
-    <variant file="quadraped/horse/gray.xml" frequency="1" name="gray"/>
-  </group>
-  <group>
-    <variant file="quadraped/base_horse_archer.xml" name="Archer-Horse" frequency="1"/>
-    <variant file="quadraped/base_horse_death.xml"/>
-    <variant file="quadraped/base_horse_run.xml"/>
-    <variant file="quadraped/base_horse_gather_meat.xml" name="gather_meat">
-      <props>
-        <prop actor="units/seleucids/cavalry_archer_a_r.xml" attachpoint="rider_R"/>
-      </props>
-    </variant>
-  </group>
-  <material>no_trans_parallax_spec.xml</material>
-</actor>
+<?xml version="1.0" encoding="UTF-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_persian.dae</mesh>
+      <props>
+        <prop actor="units/persians/cavalry_archer_a_r.xml" attachpoint="rider"/>
+        <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
+        <prop actor="props/horse/chest_colorband_01.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/brown.xml" frequency="1" name="brown"/>
+    <variant file="quadraped/horse/black.xml" frequency="1" name="black"/>
+    <variant file="quadraped/horse/beige.xml" frequency="1" name="beige"/>
+    <variant file="quadraped/horse/tan.xml" frequency="1" name="tan"/>
+    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="cherrybay"/>
+    <variant file="quadraped/horse/pure_white.xml" frequency="1" name="pure_white"/>
+    <variant file="quadraped/horse/white.xml" frequency="1" name="white"/>
+    <variant file="quadraped/horse/gray.xml" frequency="1" name="gray"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_archer.xml" name="Archer-Horse" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+    <variant file="quadraped/base_horse_gather_meat.xml" name="gather_meat">
+      <props>
+        <prop actor="units/persians/cavalry_archer_a_r.xml" attachpoint="rider_R"/>
+      </props>
+    </variant>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/seleucids/cavalry_archer_a_r.xml b/binaries/data/mods/public/art/actors/units/persians/cavalry_archer_a_r.xml
similarity index 100%
rename from binaries/data/mods/public/art/actors/units/seleucids/cavalry_archer_a_r.xml
rename to binaries/data/mods/public/art/actors/units/persians/cavalry_archer_a_r.xml
diff --git a/binaries/data/mods/public/art/actors/units/seleucids/cavalry_archer_b_m.xml b/binaries/data/mods/public/art/actors/units/persians/cavalry_archer_b_m.xml
similarity index 87%
rename from binaries/data/mods/public/art/actors/units/seleucids/cavalry_archer_b_m.xml
rename to binaries/data/mods/public/art/actors/units/persians/cavalry_archer_b_m.xml
index fcd3b2ee8c..6e67b93631 100644
--- a/binaries/data/mods/public/art/actors/units/seleucids/cavalry_archer_b_m.xml
+++ b/binaries/data/mods/public/art/actors/units/persians/cavalry_archer_b_m.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <mesh>skeletal/horse_persian.dae</mesh>
-      <props>
-        <prop actor="units/seleucids/cavalry_archer_b_r.xml" attachpoint="rider"/>
-        <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
-        <prop actor="props/horse/chest_colorband_01.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant file="quadraped/horse/brown.xml" frequency="1" name="brown"/>
-    <variant file="quadraped/horse/black.xml" frequency="1" name="black"/>
-    <variant file="quadraped/horse/beige.xml" frequency="1" name="beige"/>
-    <variant file="quadraped/horse/tan.xml" frequency="1" name="tan"/>
-    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="cherrybay"/>
-    <variant file="quadraped/horse/pure_white.xml" frequency="1" name="pure_white"/>
-    <variant file="quadraped/horse/white.xml" frequency="1" name="white"/>
-    <variant file="quadraped/horse/gray.xml" frequency="1" name="gray"/>
-  </group>
-  <group>
-    <variant file="quadraped/base_horse_archer.xml" name="Archer-Horse" frequency="1"/>
-    <variant file="quadraped/base_horse_death.xml"/>
-    <variant file="quadraped/base_horse_run.xml"/>
-    <variant file="quadraped/base_horse_gather_meat.xml" name="gather_meat">
-      <props>
-        <prop actor="units/seleucids/cavalry_archer_b_r.xml" attachpoint="rider_R"/>
-      </props>
-    </variant>
-  </group>
-  <material>no_trans_parallax_spec.xml</material>
-</actor>
+<?xml version="1.0" encoding="UTF-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_persian.dae</mesh>
+      <props>
+        <prop actor="units/persians/cavalry_archer_b_r.xml" attachpoint="rider"/>
+        <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
+        <prop actor="props/horse/chest_colorband_01.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/brown.xml" frequency="1" name="brown"/>
+    <variant file="quadraped/horse/black.xml" frequency="1" name="black"/>
+    <variant file="quadraped/horse/beige.xml" frequency="1" name="beige"/>
+    <variant file="quadraped/horse/tan.xml" frequency="1" name="tan"/>
+    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="cherrybay"/>
+    <variant file="quadraped/horse/pure_white.xml" frequency="1" name="pure_white"/>
+    <variant file="quadraped/horse/white.xml" frequency="1" name="white"/>
+    <variant file="quadraped/horse/gray.xml" frequency="1" name="gray"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_archer.xml" name="Archer-Horse" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+    <variant file="quadraped/base_horse_gather_meat.xml" name="gather_meat">
+      <props>
+        <prop actor="units/persians/cavalry_archer_b_r.xml" attachpoint="rider_R"/>
+      </props>
+    </variant>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/seleucids/cavalry_archer_b_r.xml b/binaries/data/mods/public/art/actors/units/persians/cavalry_archer_b_r.xml
similarity index 100%
rename from binaries/data/mods/public/art/actors/units/seleucids/cavalry_archer_b_r.xml
rename to binaries/data/mods/public/art/actors/units/persians/cavalry_archer_b_r.xml
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_archer_c_m.xml b/binaries/data/mods/public/art/actors/units/persians/cavalry_archer_c_m.xml
index d844f001bb..70d0cc392d 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_archer_c_m.xml
+++ b/binaries/data/mods/public/art/actors/units/persians/cavalry_archer_c_m.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <mesh>skeletal/horse_persian.dae</mesh>
-      <props>
-        <prop actor="units/persians/cavalry_archer_c_r.xml" attachpoint="rider"/>
-        <prop actor="props/horse/pers_cav_knot.xml" attachpoint="head"/>
-        <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
-        <prop actor="props/horse/cav_blanket_pers.xml" attachpoint="root"/>
-        <prop actor="props/horse/cav_winged_armor_02.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant file="quadraped/horse/brown.xml" frequency="1" name="brown"/>
-    <variant file="quadraped/horse/black.xml" frequency="1" name="black"/>
-    <variant file="quadraped/horse/beige.xml" frequency="1" name="beige"/>
-    <variant file="quadraped/horse/tan.xml" frequency="1" name="tan"/>
-    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="cherrybay"/>
-    <variant file="quadraped/horse/white.xml" frequency="1" name="white"/>
-    <variant file="quadraped/horse/gray.xml" frequency="1" name="gray"/>
-  </group>
-  <group>
-    <variant file="quadraped/base_horse_archer_fast.xml" name="Archer-Fast-Horse" frequency="1"/>
-    <variant file="quadraped/base_horse_death.xml"/>
-    <variant file="quadraped/base_horse_run.xml"/>
-  </group>
-  <material>no_trans_parallax_spec.xml</material>
-</actor>
+<?xml version="1.0" encoding="UTF-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_persian.dae</mesh>
+      <props>
+        <prop actor="units/persians/cavalry_archer_c_r.xml" attachpoint="rider"/>
+        <prop actor="props/horse/pers_cav_knot.xml" attachpoint="head"/>
+        <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
+        <prop actor="props/horse/cav_blanket_pers.xml" attachpoint="root"/>
+        <prop actor="props/horse/cav_winged_armor_02.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/brown.xml" frequency="1" name="brown"/>
+    <variant file="quadraped/horse/black.xml" frequency="1" name="black"/>
+    <variant file="quadraped/horse/beige.xml" frequency="1" name="beige"/>
+    <variant file="quadraped/horse/tan.xml" frequency="1" name="tan"/>
+    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="cherrybay"/>
+    <variant file="quadraped/horse/white.xml" frequency="1" name="white"/>
+    <variant file="quadraped/horse/gray.xml" frequency="1" name="gray"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_archer_fast.xml" name="Archer-Fast-Horse" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/seleucids/cavalry_archer_e_m.xml b/binaries/data/mods/public/art/actors/units/persians/cavalry_archer_e_m.xml
similarity index 87%
rename from binaries/data/mods/public/art/actors/units/seleucids/cavalry_archer_e_m.xml
rename to binaries/data/mods/public/art/actors/units/persians/cavalry_archer_e_m.xml
index 0fb30fadfc..57d98cbb82 100644
--- a/binaries/data/mods/public/art/actors/units/seleucids/cavalry_archer_e_m.xml
+++ b/binaries/data/mods/public/art/actors/units/persians/cavalry_archer_e_m.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <mesh>skeletal/horse_persian.dae</mesh>
-      <props>
-        <prop actor="units/seleucids/cavalry_archer_e_r.xml" attachpoint="rider"/>
-        <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
-        <prop actor="props/horse/cav_peytral_pers_iron.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant file="quadraped/horse/brown.xml" frequency="1" name="brown"/>
-    <variant file="quadraped/horse/black.xml" frequency="1" name="black"/>
-    <variant file="quadraped/horse/beige.xml" frequency="1" name="beige"/>
-    <variant file="quadraped/horse/tan.xml" frequency="1" name="tan"/>
-    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="cherrybay"/>
-    <variant file="quadraped/horse/pure_white.xml" frequency="1" name="pure_white"/>
-    <variant file="quadraped/horse/white.xml" frequency="1" name="white"/>
-    <variant file="quadraped/horse/gray.xml" frequency="1" name="gray"/>
-  </group>
-  <group>
-    <variant file="quadraped/base_horse_archer.xml" name="Archer-Horse" frequency="1"/>
-    <variant file="quadraped/base_horse_death.xml"/>
-    <variant file="quadraped/base_horse_run.xml"/>
-    <variant file="quadraped/base_horse_gather_meat.xml" name="gather_meat">
-      <props>
-        <prop actor="units/seleucids/cavalry_archer_e_r.xml" attachpoint="rider_R"/>
-      </props>
-    </variant>
-  </group>
-  <material>no_trans_parallax_spec.xml</material>
-</actor>
+<?xml version="1.0" encoding="UTF-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_persian.dae</mesh>
+      <props>
+        <prop actor="units/persians/cavalry_archer_e_r.xml" attachpoint="rider"/>
+        <prop actor="props/horse/cav_rein_leather.xml" attachpoint="root"/>
+        <prop actor="props/horse/cav_peytral_pers_iron.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/brown.xml" frequency="1" name="brown"/>
+    <variant file="quadraped/horse/black.xml" frequency="1" name="black"/>
+    <variant file="quadraped/horse/beige.xml" frequency="1" name="beige"/>
+    <variant file="quadraped/horse/tan.xml" frequency="1" name="tan"/>
+    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="cherrybay"/>
+    <variant file="quadraped/horse/pure_white.xml" frequency="1" name="pure_white"/>
+    <variant file="quadraped/horse/white.xml" frequency="1" name="white"/>
+    <variant file="quadraped/horse/gray.xml" frequency="1" name="gray"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_archer.xml" name="Archer-Horse" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+    <variant file="quadraped/base_horse_gather_meat.xml" name="gather_meat">
+      <props>
+        <prop actor="units/persians/cavalry_archer_e_r.xml" attachpoint="rider_R"/>
+      </props>
+    </variant>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/seleucids/cavalry_archer_e_r.xml b/binaries/data/mods/public/art/actors/units/persians/cavalry_archer_e_r.xml
similarity index 100%
rename from binaries/data/mods/public/art/actors/units/seleucids/cavalry_archer_e_r.xml
rename to binaries/data/mods/public/art/actors/units/persians/cavalry_archer_e_r.xml
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_cavalry_archer.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_cavalry_archer.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/sele_cavalry_archer.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/pers_cavalry_archer.png
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_a.xml b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_a.xml
index f2db8e625a..6a94f5f53f 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_a.xml
@@ -7,6 +7,6 @@
     <Entity>units/pers_cavalry_archer_e</Entity>
   </Promotion>
   <VisualActor>
-    <Actor>units/persians/chariot_archer_a_m.xml</Actor>
+    <Actor>units/persians/cavalry_archer_a_m.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_b.xml
index 503aea11c7..4284c9d26d 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_b.xml
@@ -1,23 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry_ranged_archer">
-  <Footprint replace="">
-    <Square width="5.5" depth="10.0"/>
-    <Height>5.0</Height>
-  </Footprint>
   <Identity>
     <Civ>pers</Civ>
     <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <Lang>persian</Lang>
     <SelectionGroupName>units/pers_cavalry_archer_b</SelectionGroupName>
-    <GenericName>Babylonian Scythed Chariot</GenericName>
-    <SpecificName>Raθa Bābiruviya</SpecificName>
-    <Icon>units/pers_chariot_archer.png</Icon>
+    <GenericName>Parthian Horse Archer</GenericName>
+    <SpecificName>Asabāra Parθava</SpecificName>
+    <Icon>units/pers_cavalry_archer.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/pers_cavalry_archer_a</Entity>
   </Promotion>
   <VisualActor>
-    <Actor>units/persians/chariot_archer_b_m.xml</Actor>
+    <Actor>units/persians/cavalry_archer_b_m.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_e.xml b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_e.xml
index 0fa890fc98..0ab3f6dbff 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_e.xml
@@ -5,6 +5,6 @@
   </Identity>
   <Promotion disable=""/>
   <VisualActor>
-    <Actor>units/persians/chariot_archer_e_m.xml</Actor>
+    <Actor>units/persians/cavalry_archer_e_m.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_chariot.xml b/binaries/data/mods/public/simulation/templates/units/pers_chariot.xml
new file mode 100644
index 0000000000..3570da87d8
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/pers_chariot.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_cavalry_archer">
+  <Footprint replace="">
+    <Square width="8" depth="16"/>
+    <Height>6</Height>
+  </Footprint>
+  <Identity>
+    <Civ>pers</Civ>
+    <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
+    <Lang>persian</Lang>
+    <GenericName>Babylonian Scythed Chariot</GenericName>
+    <SpecificName>Raθa Bābiruviya</SpecificName>
+    <Icon>units/pers_chariot_archer.png</Icon>
+  </Identity>
+  <VisualActor>
+    <Actor>units/persians/chariot_archer_e_m.xml</Actor>
+  </VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele_cavalry_archer_a.xml b/binaries/data/mods/public/simulation/templates/units/sele_cavalry_archer_a.xml
index b439af37fa..d4d8fbcdff 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele_cavalry_archer_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele_cavalry_archer_a.xml
@@ -7,6 +7,6 @@
     <Entity>units/sele_cavalry_archer_e</Entity>
   </Promotion>
   <VisualActor>
-    <Actor>units/seleucids/cavalry_archer_a_m.xml</Actor>
+    <Actor>units/persians/cavalry_archer_a_m.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele_cavalry_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/sele_cavalry_archer_b.xml
index 3361738265..5839682aab 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele_cavalry_archer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele_cavalry_archer_b.xml
@@ -6,13 +6,13 @@
     <SelectionGroupName>units/sele_cavalry_archer_b</SelectionGroupName>
     <GenericName>Dahae Horse Archer</GenericName>
     <SpecificName>Hippotoxotès Dahae</SpecificName>
-    <Icon>units/sele_cavalry_archer.png</Icon>
+    <Icon>units/pers_cavalry_archer.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/sele_cavalry_archer_a</Entity>
   </Promotion>
   <VisualActor>
-    <Actor>units/seleucids/cavalry_archer_b_m.xml</Actor>
+    <Actor>units/persians/cavalry_archer_b_m.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele_cavalry_archer_e.xml b/binaries/data/mods/public/simulation/templates/units/sele_cavalry_archer_e.xml
index 02b1cb31d1..c2a01ede12 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele_cavalry_archer_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele_cavalry_archer_e.xml
@@ -5,6 +5,6 @@
   </Identity>
   <Promotion disable=""/>
   <VisualActor>
-    <Actor>units/seleucids/cavalry_archer_e_m.xml</Actor>
+    <Actor>units/persians/cavalry_archer_e_m.xml</Actor>
   </VisualActor>
 </Entity>