From ea4c22fc0e6cde6952c51ba6cdf51c67259311c2 Mon Sep 17 00:00:00 2001
From: Ykkrosh <philip@wildfiregames.com>
Date: Sun, 7 Feb 2010 19:54:58 +0000
Subject: [PATCH] Convert walking speed data in entity templates

This was SVN commit r7312.
---
 .../mods/public/simulation/templates/gaia/fauna_deer.xml   | 3 +++
 .../public/simulation/templates/gaia/fauna_gazelle.xml     | 3 +++
 .../mods/public/simulation/templates/gaia/fauna_zebra.xml  | 3 +++
 .../simulation/templates/other/camp_mace_hypaspist.xml     | 3 +++
 .../mods/public/simulation/templates/template_unit.xml     | 4 +++-
 .../public/simulation/templates/template_unit_cavalry.xml  | 3 +++
 .../templates/template_unit_cavalry_ranged_archer.xml      | 3 +++
 .../templates/template_unit_cavalry_ranged_javelinist.xml  | 3 +++
 .../public/simulation/templates/template_unit_hero.xml     | 3 +++
 .../simulation/templates/template_unit_hero_cavalry.xml    | 3 +++
 .../simulation/templates/template_unit_hero_infantry.xml   | 3 +++
 .../simulation/templates/template_unit_hero_ranged.xml     | 3 +++
 .../public/simulation/templates/template_unit_infantry.xml | 3 +++
 .../templates/template_unit_infantry_melee_swordsman.xml   | 3 +++
 .../templates/template_unit_infantry_ranged_slinger.xml    | 3 +++
 .../templates/template_unit_mechanical_siege_ballista.xml  | 3 +++
 .../templates/template_unit_mechanical_siege_onager.xml    | 3 +++
 .../templates/template_unit_mechanical_siege_ram.xml       | 3 +++
 .../simulation/templates/template_unit_super_cavalry.xml   | 3 +++
 .../simulation/templates/template_unit_super_infantry.xml  | 3 +++
 .../simulation/templates/template_unit_super_ranged.xml    | 3 +++
 .../templates/template_unit_support_female_citizen.xml     | 3 +++
 .../simulation/templates/template_unit_support_healer.xml  | 3 +++
 .../simulation/templates/template_unit_support_trader.xml  | 3 +++
 .../templates/units/celt_cavalry_javelinist_a.xml          | 3 +++
 .../templates/units/celt_cavalry_javelinist_b.xml          | 3 +++
 .../templates/units/celt_cavalry_javelinist_e.xml          | 3 +++
 .../simulation/templates/units/celt_cavalry_spearman_a.xml | 3 +++
 .../simulation/templates/units/celt_cavalry_spearman_b.xml | 3 +++
 .../simulation/templates/units/celt_cavalry_spearman_e.xml | 3 +++
 .../templates/units/celt_cavalry_swordsman_a.xml           | 3 +++
 .../templates/units/celt_cavalry_swordsman_b.xml           | 3 +++
 .../templates/units/celt_cavalry_swordsman_e.xml           | 3 +++
 .../simulation/templates/units/celt_hero_boudicca.xml      | 3 +++
 .../simulation/templates/units/celt_hero_brennus.xml       | 3 +++
 .../simulation/templates/units/celt_hero_britomartus.xml   | 3 +++
 .../simulation/templates/units/celt_hero_caratacos.xml     | 3 +++
 .../simulation/templates/units/celt_hero_cynvelin.xml      | 3 +++
 .../simulation/templates/units/celt_hero_vercingetorix.xml | 3 +++
 .../templates/units/celt_infantry_javelinist_a.xml         | 3 +++
 .../templates/units/celt_infantry_javelinist_b.xml         | 3 +++
 .../templates/units/celt_infantry_javelinist_e.xml         | 3 +++
 .../templates/units/celt_infantry_spearman_a.xml           | 3 +++
 .../templates/units/celt_infantry_spearman_b.xml           | 3 +++
 .../templates/units/celt_infantry_spearman_e.xml           | 3 +++
 .../simulation/templates/units/celt_super_cavalry_brit.xml | 3 +++
 .../simulation/templates/units/celt_super_cavalry_gaul.xml | 3 +++
 .../templates/units/celt_super_infantry_brit.xml           | 3 +++
 .../templates/units/celt_super_infantry_gaul.xml           | 3 +++
 .../templates/units/hele_cavalry_swordsman_a.xml           | 3 +++
 .../templates/units/hele_cavalry_swordsman_b.xml           | 3 +++
 .../templates/units/hele_cavalry_swordsman_e.xml           | 3 +++
 .../simulation/templates/units/hele_hero_alexander.xml     | 3 +++
 .../simulation/templates/units/hele_hero_demetrius.xml     | 3 +++
 .../simulation/templates/units/hele_hero_leonidas.xml      | 3 +++
 .../public/simulation/templates/units/hele_hero_philip.xml | 3 +++
 .../simulation/templates/units/hele_hero_themistocles.xml  | 3 +++
 .../simulation/templates/units/hele_hero_xenophon.xml      | 3 +++
 .../simulation/templates/units/hele_infantry_archer_b.xml  | 3 +++
 .../simulation/templates/units/hele_infantry_archer_e.xml  | 3 +++
 .../templates/units/hele_infantry_javelinist_a.xml         | 3 +++
 .../templates/units/hele_infantry_javelinist_b.xml         | 3 +++
 .../templates/units/hele_infantry_spearman_a.xml           | 3 +++
 .../templates/units/hele_infantry_spearman_b.xml           | 3 +++
 .../templates/units/hele_infantry_spearman_e.xml           | 3 +++
 .../templates/units/hele_mechanical_siege_helepolis.xml    | 3 +++
 .../templates/units/hele_mechanical_siege_lithobolos.xml   | 3 +++
 .../templates/units/hele_mechanical_siege_oxybeles.xml     | 3 +++
 .../public/simulation/templates/units/hele_ship_bireme.xml | 3 +++
 .../simulation/templates/units/hele_ship_trireme.xml       | 3 +++
 .../templates/units/hele_ship_trireme_corinthian.xml       | 3 +++
 .../simulation/templates/units/hele_super_cavalry_mace.xml | 3 +++
 .../templates/units/hele_super_infantry_mace.xml           | 3 +++
 .../templates/units/hele_super_infantry_polis.xml          | 3 +++
 .../simulation/templates/units/hele_super_ranged_polis.xml | 3 +++
 .../simulation/templates/units/hele_support_trader.xml     | 3 +++
 source/tools/entconvert/entconvert.pl                      | 7 ++++++-
 77 files changed, 234 insertions(+), 2 deletions(-)

diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_deer.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_deer.xml
index f99a6bb604..0bd785d40a 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_deer.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_deer.xml
@@ -3,6 +3,9 @@
   <Identity>
     <SpecificName>Deer</SpecificName>
   </Identity>
+  <UnitMotion>
+    <WalkSpeed>5.0</WalkSpeed>
+  </UnitMotion>
   <VisualActor>
     <Actor>fauna/deer.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_gazelle.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_gazelle.xml
index c8a3f5774f..f35effc5d2 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_gazelle.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_gazelle.xml
@@ -3,6 +3,9 @@
   <Identity>
     <SpecificName>Gazelle</SpecificName>
   </Identity>
+  <UnitMotion>
+    <WalkSpeed>5.0</WalkSpeed>
+  </UnitMotion>
   <VisualActor>
     <Actor>fauna/gazelle.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_zebra.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_zebra.xml
index abd6c1373b..5f84c831cd 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_zebra.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_zebra.xml
@@ -3,6 +3,9 @@
   <Identity>
     <SpecificName>Zebra</SpecificName>
   </Identity>
+  <UnitMotion>
+    <WalkSpeed>6.0</WalkSpeed>
+  </UnitMotion>
   <VisualActor>
     <Actor>fauna/zebra.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/other/camp_mace_hypaspist.xml b/binaries/data/mods/public/simulation/templates/other/camp_mace_hypaspist.xml
index 1b7946a613..3fbfb349ae 100644
--- a/binaries/data/mods/public/simulation/templates/other/camp_mace_hypaspist.xml
+++ b/binaries/data/mods/public/simulation/templates/other/camp_mace_hypaspist.xml
@@ -12,6 +12,9 @@
     <Pierce>11.0</Pierce>
     <Crush>14.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>5.5</WalkSpeed>
+  </UnitMotion>
   <Attack>
     <Hack>18.0</Hack>
     <Pierce>22.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit.xml b/binaries/data/mods/public/simulation/templates/template_unit.xml
index 5a54cf108d..f9c1efd055 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit.xml
@@ -4,7 +4,6 @@
     <GenericName>Unit</GenericName>
     <IconSheet>PortraitSheet</IconSheet>
   </Identity>
-  <UnitMotion/>
   <UnitAI/>
   <Cost>
     <Population>1</Population>
@@ -15,6 +14,9 @@
   <Armour>
     <Crush>1.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>7.0</WalkSpeed>
+  </UnitMotion>
   <Footprint>
     <Circle radius="0.5"/>
     <Height>2.5</Height>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
index 2d72b02a92..97878c121b 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
@@ -15,6 +15,9 @@
     <Pierce>0.0</Pierce>
     <Crush>12.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>8.5</WalkSpeed>
+  </UnitMotion>
   <Footprint>
     <Circle radius="1.2"/>
     <Height>7.5</Height>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml
index e73f815ae2..342a7f839d 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml
@@ -12,4 +12,7 @@
     <Pierce>5.0</Pierce>
     <Crush>8.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>8.0</WalkSpeed>
+  </UnitMotion>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml
index de4a818374..2cce90c056 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml
@@ -12,4 +12,7 @@
     <Pierce>4.0</Pierce>
     <Crush>8.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>8.5</WalkSpeed>
+  </UnitMotion>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero.xml
index 1096da8113..f591defcb0 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero.xml
@@ -14,6 +14,9 @@
     <Pierce>12.0</Pierce>
     <Crush>12.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>8.5</WalkSpeed>
+  </UnitMotion>
   <Attack>
     <Hack>40.0</Hack>
     <Pierce>0.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml
index e3dfda1b6e..6085dcbc72 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml
@@ -15,6 +15,9 @@
     <Pierce>0.0</Pierce>
     <Crush>15.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>9.0</WalkSpeed>
+  </UnitMotion>
   <Attack>
     <Hack>1.0</Hack>
     <Pierce>0.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml
index bc214a2d29..60f96fe658 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml
@@ -14,6 +14,9 @@
     <Pierce>0.0</Pierce>
     <Crush>12.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>7.0</WalkSpeed>
+  </UnitMotion>
   <Attack>
     <Hack>10.0</Hack>
     <Pierce>0.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_ranged.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_ranged.xml
index 8f814df22c..226d0c1786 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_ranged.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_ranged.xml
@@ -12,4 +12,7 @@
     <Pierce>10.0</Pierce>
     <Crush>10.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>8.0</WalkSpeed>
+  </UnitMotion>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
index d03c52551a..d0038cd49e 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
@@ -14,6 +14,9 @@
     <Pierce>1.0</Pierce>
     <Crush>9.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>7.0</WalkSpeed>
+  </UnitMotion>
   <Builder>
     <Entities datatype="tokens">
       structures/{civ}_barracks
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
index 3ccdefc6b0..b494ada223 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
@@ -12,6 +12,9 @@
     <Pierce>3.0</Pierce>
     <Crush>10.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>5.5</WalkSpeed>
+  </UnitMotion>
   <Attack>
     <Hack>17.0</Hack>
     <Pierce>0.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
index 51e84d8931..94c3669eb4 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
@@ -12,4 +12,7 @@
     <Pierce>2.0</Pierce>
     <Crush>2.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>7.5</WalkSpeed>
+  </UnitMotion>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ballista.xml b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ballista.xml
index da2c6d73c4..f175024348 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ballista.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ballista.xml
@@ -12,4 +12,7 @@
     <Pierce>4.0</Pierce>
     <Crush>2.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>5.75</WalkSpeed>
+  </UnitMotion>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_onager.xml b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_onager.xml
index 9e9d9ccbd4..93108fc388 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_onager.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_onager.xml
@@ -12,4 +12,7 @@
     <Pierce>6.0</Pierce>
     <Crush>4.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>4.75</WalkSpeed>
+  </UnitMotion>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ram.xml b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ram.xml
index 10e75acf5a..9bcb86cd8e 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ram.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ram.xml
@@ -12,6 +12,9 @@
     <Pierce>20.0</Pierce>
     <Crush>6.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>3.0</WalkSpeed>
+  </UnitMotion>
   <Attack>
     <Hack>0.0</Hack>
     <Pierce>0.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_super_cavalry.xml b/binaries/data/mods/public/simulation/templates/template_unit_super_cavalry.xml
index e1e91e0ad9..e0a15c2f9e 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_super_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_super_cavalry.xml
@@ -15,6 +15,9 @@
     <Pierce>8.0</Pierce>
     <Crush>14.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>8.0</WalkSpeed>
+  </UnitMotion>
   <Attack>
     <Hack>35.0</Hack>
     <Pierce>0.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_super_infantry.xml b/binaries/data/mods/public/simulation/templates/template_unit_super_infantry.xml
index 6458abb99d..bda7bfecb7 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_super_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_super_infantry.xml
@@ -14,6 +14,9 @@
     <Pierce>0.0</Pierce>
     <Crush>12.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>7.0</WalkSpeed>
+  </UnitMotion>
   <Attack>
     <Hack>5.0</Hack>
     <Pierce>0.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_super_ranged.xml b/binaries/data/mods/public/simulation/templates/template_unit_super_ranged.xml
index 7818f0e85a..a7305330d4 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_super_ranged.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_super_ranged.xml
@@ -13,6 +13,9 @@
     <Pierce>0.0</Pierce>
     <Crush>12.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>7.0</WalkSpeed>
+  </UnitMotion>
   <Footprint>
     <Circle radius="0.5"/>
     <Height>2.5</Height>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml b/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
index 378b11a1fa..50b89b68e4 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
@@ -13,6 +13,9 @@
     <Pierce>1.0</Pierce>
     <Crush>5.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>6.0</WalkSpeed>
+  </UnitMotion>
   <Builder>
     <Entities datatype="tokens">
       structures/{civ}_civil_centre
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml b/binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml
index b684e65ee0..467b834dd3 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml
@@ -13,4 +13,7 @@
     <Pierce>2.0</Pierce>
     <Crush>2.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>6.0</WalkSpeed>
+  </UnitMotion>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml b/binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml
index f9dc525c7b..5a8dbaa6ae 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml
@@ -14,4 +14,7 @@
     <Pierce>8.0</Pierce>
     <Crush>5.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>8.0</WalkSpeed>
+  </UnitMotion>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_javelinist_a.xml b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_javelinist_a.xml
index 5d45ffa1db..0f9874000f 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_javelinist_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_javelinist_a.xml
@@ -8,6 +8,9 @@
     <Pierce>4.2</Pierce>
     <Crush>8.2</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>11.2</WalkSpeed>
+  </UnitMotion>
   <VisualActor>
     <Actor>units/celts/cavalry_javelinist_a.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_javelinist_b.xml b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_javelinist_b.xml
index 5033211208..a9ca8342fa 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_javelinist_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_javelinist_b.xml
@@ -8,6 +8,9 @@
     <Pierce>3.0</Pierce>
     <Crush>7.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>15.0</WalkSpeed>
+  </UnitMotion>
   <VisualActor>
     <Actor>units/celts/cavalry_javelinist_b.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_javelinist_e.xml b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_javelinist_e.xml
index ab73174f0d..537a796603 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_javelinist_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_javelinist_e.xml
@@ -8,6 +8,9 @@
     <Pierce>4.4</Pierce>
     <Crush>8.4</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>11.3</WalkSpeed>
+  </UnitMotion>
   <VisualActor>
     <Actor>units/celts/cavalry_javelinist_e.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_spearman_a.xml b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_spearman_a.xml
index d43b8af29b..7dcc0819d9 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_spearman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_spearman_a.xml
@@ -11,6 +11,9 @@
     <Pierce>10.2</Pierce>
     <Crush>12.2</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>6.05</WalkSpeed>
+  </UnitMotion>
   <Attack>
     <Hack>16.0</Hack>
     <Pierce>6.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_spearman_b.xml
index ae622a6bec..396cfe262b 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_spearman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_spearman_b.xml
@@ -14,6 +14,9 @@
     <Pierce>1.0</Pierce>
     <Crush>1.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>10.0</WalkSpeed>
+  </UnitMotion>
   <Attack>
     <Hack>20.0</Hack>
     <Pierce>0.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_spearman_e.xml b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_spearman_e.xml
index a23d217488..6d08f47110 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_spearman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_spearman_e.xml
@@ -11,6 +11,9 @@
     <Pierce>10.4</Pierce>
     <Crush>12.4</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>6.15</WalkSpeed>
+  </UnitMotion>
   <Attack>
     <Hack>17.0</Hack>
     <Pierce>7.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_swordsman_a.xml b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_swordsman_a.xml
index e5d505cfe3..136df06d37 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_swordsman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_swordsman_a.xml
@@ -11,6 +11,9 @@
     <Pierce>10.2</Pierce>
     <Crush>12.2</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>10.2</WalkSpeed>
+  </UnitMotion>
   <Attack>
     <Hack>19.0</Hack>
   </Attack>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_swordsman_b.xml b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_swordsman_b.xml
index 8849e3473a..bd905a2873 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_swordsman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_swordsman_b.xml
@@ -9,6 +9,9 @@
     <Pierce>9.0</Pierce>
     <Crush>10.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>14.0</WalkSpeed>
+  </UnitMotion>
   <Attack>
     <Hack>18.0</Hack>
     <Pierce>0.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_swordsman_e.xml b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_swordsman_e.xml
index feb0992bb5..7fddb82dc1 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_swordsman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_swordsman_e.xml
@@ -11,6 +11,9 @@
     <Pierce>10.4</Pierce>
     <Crush>12.4</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>10.3</WalkSpeed>
+  </UnitMotion>
   <Attack>
     <Hack>21.0</Hack>
   </Attack>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_hero_boudicca.xml b/binaries/data/mods/public/simulation/templates/units/celt_hero_boudicca.xml
index 9f3816c75c..515d67fba6 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_hero_boudicca.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_hero_boudicca.xml
@@ -16,6 +16,9 @@
     <Pierce>12.0</Pierce>
     <Crush>12.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>14.0</WalkSpeed>
+  </UnitMotion>
   <VisualActor>
     <Actor>units/celts/boudicca_chariot.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_hero_brennus.xml b/binaries/data/mods/public/simulation/templates/units/celt_hero_brennus.xml
index 850725cc89..158453b322 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_hero_brennus.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_hero_brennus.xml
@@ -13,6 +13,9 @@
     <Pierce>8.0</Pierce>
     <Crush>10.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>10.0</WalkSpeed>
+  </UnitMotion>
   <Attack>
     <Hack>20.0</Hack>
     <Pierce>0.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_hero_britomartus.xml b/binaries/data/mods/public/simulation/templates/units/celt_hero_britomartus.xml
index 5bfb1f7c22..55948ede34 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_hero_britomartus.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_hero_britomartus.xml
@@ -15,6 +15,9 @@
     <Pierce>14.0</Pierce>
     <Crush>20.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>7.0</WalkSpeed>
+  </UnitMotion>
   <Attack>
     <Hack>0.0</Hack>
     <Pierce>50.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_hero_caratacos.xml b/binaries/data/mods/public/simulation/templates/units/celt_hero_caratacos.xml
index 238bf4d819..187287e100 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_hero_caratacos.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_hero_caratacos.xml
@@ -13,6 +13,9 @@
     <Pierce>10.0</Pierce>
     <Crush>14.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>6.5</WalkSpeed>
+  </UnitMotion>
   <Attack>
     <Hack>50.0</Hack>
     <Pierce>0.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_hero_cynvelin.xml b/binaries/data/mods/public/simulation/templates/units/celt_hero_cynvelin.xml
index 3f68035cbb..a3df44ca03 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_hero_cynvelin.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_hero_cynvelin.xml
@@ -16,6 +16,9 @@
     <Pierce>14.0</Pierce>
     <Crush>14.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>9.0</WalkSpeed>
+  </UnitMotion>
   <Attack>
     <Hack>40.0</Hack>
     <Pierce>0.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_hero_vercingetorix.xml b/binaries/data/mods/public/simulation/templates/units/celt_hero_vercingetorix.xml
index 9503dbbe45..742cbeeba2 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_hero_vercingetorix.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_hero_vercingetorix.xml
@@ -13,6 +13,9 @@
     <Pierce>13.0</Pierce>
     <Crush>13.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>9.0</WalkSpeed>
+  </UnitMotion>
   <Attack>
     <Hack>50.0</Hack>
   </Attack>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_infantry_javelinist_a.xml b/binaries/data/mods/public/simulation/templates/units/celt_infantry_javelinist_a.xml
index 582e6035f0..307f96fa64 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_infantry_javelinist_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_infantry_javelinist_a.xml
@@ -11,6 +11,9 @@
     <Pierce>5.2</Pierce>
     <Crush>2.2</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>9.2</WalkSpeed>
+  </UnitMotion>
   <VisualActor>
     <Actor>units/celts/infantry_javelinist_a.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_infantry_javelinist_b.xml b/binaries/data/mods/public/simulation/templates/units/celt_infantry_javelinist_b.xml
index efe3b4d88f..b0575ff513 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_infantry_javelinist_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_infantry_javelinist_b.xml
@@ -4,6 +4,9 @@
     <Civ>celt</Civ>
     <SpecificName>Baguada</SpecificName>
   </Identity>
+  <UnitMotion>
+    <WalkSpeed>9.0</WalkSpeed>
+  </UnitMotion>
   <VisualActor>
     <Actor>units/celts/infantry_javelinist_b.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_infantry_javelinist_e.xml b/binaries/data/mods/public/simulation/templates/units/celt_infantry_javelinist_e.xml
index 78eb9f8346..2cff545069 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_infantry_javelinist_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_infantry_javelinist_e.xml
@@ -11,6 +11,9 @@
     <Pierce>5.4</Pierce>
     <Crush>2.4</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>9.3</WalkSpeed>
+  </UnitMotion>
   <VisualActor>
     <Actor>units/celts/infantry_javelinist_e.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_a.xml b/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_a.xml
index 6114285765..85e3aaa31c 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_a.xml
@@ -11,6 +11,9 @@
     <Pierce>3.2</Pierce>
     <Crush>10.2</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>7.2</WalkSpeed>
+  </UnitMotion>
   <Attack>
     <Hack>16.0</Hack>
     <Pierce>6.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_b.xml
index 8d3d2a1d60..109b08fe61 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_b.xml
@@ -12,6 +12,9 @@
     <Pierce>3.0</Pierce>
     <Crush>10.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>7.0</WalkSpeed>
+  </UnitMotion>
   <VisualActor>
     <Actor>units/celts/infantry_spearman_b.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_e.xml b/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_e.xml
index 0ccdfeed55..63b66aae34 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_e.xml
@@ -11,6 +11,9 @@
     <Pierce>3.4</Pierce>
     <Crush>10.4</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>7.3</WalkSpeed>
+  </UnitMotion>
   <Attack>
     <Hack>17.0</Hack>
     <Pierce>7.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_super_cavalry_brit.xml b/binaries/data/mods/public/simulation/templates/units/celt_super_cavalry_brit.xml
index 2cdb631958..86d09a1bb7 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_super_cavalry_brit.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_super_cavalry_brit.xml
@@ -16,6 +16,9 @@
     <Pierce>7.0</Pierce>
     <Crush>8.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>9.0</WalkSpeed>
+  </UnitMotion>
   <VisualActor>
     <Actor>units/celts/super_unit_4.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_super_cavalry_gaul.xml b/binaries/data/mods/public/simulation/templates/units/celt_super_cavalry_gaul.xml
index f7e620a802..12423342b5 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_super_cavalry_gaul.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_super_cavalry_gaul.xml
@@ -4,6 +4,9 @@
     <Civ>celt</Civ>
     <SpecificName>Gallic Brihent</SpecificName>
   </Identity>
+  <UnitMotion>
+    <WalkSpeed>9.0</WalkSpeed>
+  </UnitMotion>
   <VisualActor>
     <Actor>units/celts/super_unit_2.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_super_infantry_brit.xml b/binaries/data/mods/public/simulation/templates/units/celt_super_infantry_brit.xml
index 348086d09e..055880a01e 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_super_infantry_brit.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_super_infantry_brit.xml
@@ -13,6 +13,9 @@
     <Pierce>2.0</Pierce>
     <Crush>10.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>7.0</WalkSpeed>
+  </UnitMotion>
   <Attack>
     <Hack>35.0</Hack>
     <Pierce>0.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_super_infantry_gaul.xml b/binaries/data/mods/public/simulation/templates/units/celt_super_infantry_gaul.xml
index 1259018ab5..830865c4f0 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_super_infantry_gaul.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_super_infantry_gaul.xml
@@ -11,6 +11,9 @@
     <Hack>5.0</Hack>
     <Crush>10.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>6.5</WalkSpeed>
+  </UnitMotion>
   <VisualActor>
     <Actor>units/celts/super_unit_1.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_cavalry_swordsman_a.xml b/binaries/data/mods/public/simulation/templates/units/hele_cavalry_swordsman_a.xml
index 86ff1aeff7..793a1dc6c1 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_cavalry_swordsman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_cavalry_swordsman_a.xml
@@ -9,6 +9,9 @@
     <Pierce>1.0</Pierce>
     <Crush>10.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>8.0</WalkSpeed>
+  </UnitMotion>
   <Attack>
     <Hack>19.0</Hack>
     <Crush>4.0</Crush>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_cavalry_swordsman_b.xml b/binaries/data/mods/public/simulation/templates/units/hele_cavalry_swordsman_b.xml
index ab304f58b6..7e6d6fa199 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_cavalry_swordsman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_cavalry_swordsman_b.xml
@@ -13,6 +13,9 @@
     <Pierce>1.0</Pierce>
     <Crush>6.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>8.4</WalkSpeed>
+  </UnitMotion>
   <Attack>
     <Hack>17.0</Hack>
     <Crush>3.0</Crush>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_cavalry_swordsman_e.xml b/binaries/data/mods/public/simulation/templates/units/hele_cavalry_swordsman_e.xml
index 2675161a27..1c5e47bfa0 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_cavalry_swordsman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_cavalry_swordsman_e.xml
@@ -9,6 +9,9 @@
     <Pierce>5.0</Pierce>
     <Crush>16.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>7.5</WalkSpeed>
+  </UnitMotion>
   <Attack>
     <Hack>19.0</Hack>
     <Crush>7.0</Crush>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_hero_alexander.xml b/binaries/data/mods/public/simulation/templates/units/hele_hero_alexander.xml
index df477c7a64..5b873a12d8 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_hero_alexander.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_hero_alexander.xml
@@ -13,6 +13,9 @@
     <Pierce>7.0</Pierce>
     <Crush>19.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>7.4</WalkSpeed>
+  </UnitMotion>
   <Attack>
     <Hack>45.0</Hack>
   </Attack>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_hero_demetrius.xml b/binaries/data/mods/public/simulation/templates/units/hele_hero_demetrius.xml
index 81812636df..8ebfc4460c 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_hero_demetrius.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_hero_demetrius.xml
@@ -13,6 +13,9 @@
     <Pierce>10.0</Pierce>
     <Crush>22.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>4.7</WalkSpeed>
+  </UnitMotion>
   <Attack>
     <Hack>20.0</Hack>
     <Pierce>24.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_hero_leonidas.xml b/binaries/data/mods/public/simulation/templates/units/hele_hero_leonidas.xml
index b4ae60923e..136a54e173 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_hero_leonidas.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_hero_leonidas.xml
@@ -10,6 +10,9 @@
     <Pierce>14.0</Pierce>
     <Crush>21.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>5.0</WalkSpeed>
+  </UnitMotion>
   <Attack>
     <Hack>20.0</Hack>
     <Pierce>20.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_hero_philip.xml b/binaries/data/mods/public/simulation/templates/units/hele_hero_philip.xml
index 0217bc7dd8..0b42b78093 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_hero_philip.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_hero_philip.xml
@@ -13,6 +13,9 @@
     <Pierce>11.0</Pierce>
     <Crush>22.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>6.9</WalkSpeed>
+  </UnitMotion>
   <Attack>
     <Hack>32.0</Hack>
     <Crush>3.0</Crush>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_hero_themistocles.xml b/binaries/data/mods/public/simulation/templates/units/hele_hero_themistocles.xml
index f74ad280ea..deeef55d64 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_hero_themistocles.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_hero_themistocles.xml
@@ -13,6 +13,9 @@
     <Pierce>14.0</Pierce>
     <Crush>21.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>6.0</WalkSpeed>
+  </UnitMotion>
   <Attack>
     <Hack>27.0</Hack>
     <Crush>3.0</Crush>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_hero_xenophon.xml b/binaries/data/mods/public/simulation/templates/units/hele_hero_xenophon.xml
index d3cbcd1e0a..b316a95475 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_hero_xenophon.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_hero_xenophon.xml
@@ -13,6 +13,9 @@
     <Pierce>10.0</Pierce>
     <Crush>22.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>9.0</WalkSpeed>
+  </UnitMotion>
   <VisualActor>
     <Actor>units/hellenes/xenophon.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_infantry_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/hele_infantry_archer_b.xml
index 0be1253d06..e3bb8f21b2 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_infantry_archer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_infantry_archer_b.xml
@@ -14,6 +14,9 @@
     <Pierce>1.0</Pierce>
     <Crush>1.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>6.8</WalkSpeed>
+  </UnitMotion>
   <VisualActor>
     <Actor>units/hellenes/infantry_archer_b.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_infantry_archer_e.xml b/binaries/data/mods/public/simulation/templates/units/hele_infantry_archer_e.xml
index 9733f8ea91..c9d1498f77 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_infantry_archer_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_infantry_archer_e.xml
@@ -9,6 +9,9 @@
     <Pierce>2.0</Pierce>
     <Crush>6.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>6.7</WalkSpeed>
+  </UnitMotion>
   <VisualActor>
     <Actor>units/hellenes/infantry_archer_e.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_infantry_javelinist_a.xml b/binaries/data/mods/public/simulation/templates/units/hele_infantry_javelinist_a.xml
index ec4e7cda1f..4ad2a33bf1 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_infantry_javelinist_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_infantry_javelinist_a.xml
@@ -12,6 +12,9 @@
     <Pierce>2.0</Pierce>
     <Crush>8.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>7.2</WalkSpeed>
+  </UnitMotion>
   <VisualActor>
     <Actor>units/hellenes/infantry_javelinist_a.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_infantry_javelinist_b.xml b/binaries/data/mods/public/simulation/templates/units/hele_infantry_javelinist_b.xml
index 82c8dc3027..5c118f3d3d 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_infantry_javelinist_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_infantry_javelinist_b.xml
@@ -10,6 +10,9 @@
     <Pierce>2.0</Pierce>
     <Crush>6.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>6.7</WalkSpeed>
+  </UnitMotion>
   <VisualActor>
     <Actor>units/hellenes/infantry_javelinist_b.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_infantry_spearman_a.xml b/binaries/data/mods/public/simulation/templates/units/hele_infantry_spearman_a.xml
index 40a8334320..c3272bc392 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_infantry_spearman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_infantry_spearman_a.xml
@@ -12,6 +12,9 @@
     <Pierce>17.0</Pierce>
     <Crush>18.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>5.0</WalkSpeed>
+  </UnitMotion>
   <Attack>
     <Hack>6.0</Hack>
     <Pierce>16.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_infantry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/hele_infantry_spearman_b.xml
index 6ad8498cb1..b1de415ee9 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_infantry_spearman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_infantry_spearman_b.xml
@@ -10,6 +10,9 @@
     <Pierce>8.0</Pierce>
     <Crush>9.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>6.1</WalkSpeed>
+  </UnitMotion>
   <Attack>
     <Hack>5.0</Hack>
     <Pierce>15.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_infantry_spearman_e.xml b/binaries/data/mods/public/simulation/templates/units/hele_infantry_spearman_e.xml
index df1b463a92..30005a1f72 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_infantry_spearman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_infantry_spearman_e.xml
@@ -12,6 +12,9 @@
     <Pierce>16.0</Pierce>
     <Crush>15.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>5.4</WalkSpeed>
+  </UnitMotion>
   <Attack>
     <Hack>7.0</Hack>
     <Pierce>17.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_helepolis.xml b/binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_helepolis.xml
index 50f82b1fc4..10eb52db8e 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_helepolis.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_helepolis.xml
@@ -13,6 +13,9 @@
     <Pierce>25.0</Pierce>
     <Crush>10.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>3.0</WalkSpeed>
+  </UnitMotion>
   <Attack>
     <Hack>0.0</Hack>
     <Pierce>0.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_lithobolos.xml b/binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_lithobolos.xml
index 70ccae4498..ac6698b3df 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_lithobolos.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_lithobolos.xml
@@ -8,6 +8,9 @@
   <Health>
     <Max>300</Max>
   </Health>
+  <UnitMotion>
+    <WalkSpeed>5.0</WalkSpeed>
+  </UnitMotion>
   <VisualActor>
     <Actor>units/hellenes/siege_rock.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_oxybeles.xml b/binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_oxybeles.xml
index c260b6dd0b..320c04c002 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_oxybeles.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_oxybeles.xml
@@ -8,6 +8,9 @@
   <Health>
     <Max>200</Max>
   </Health>
+  <UnitMotion>
+    <WalkSpeed>6.0</WalkSpeed>
+  </UnitMotion>
   <VisualActor>
     <Actor>units/hellenes/siege_spear.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_ship_bireme.xml b/binaries/data/mods/public/simulation/templates/units/hele_ship_bireme.xml
index 25a7aa93fd..ae0d7f361d 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_ship_bireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_ship_bireme.xml
@@ -4,6 +4,9 @@
     <Civ>hele</Civ>
     <SpecificName>Pentekontor</SpecificName>
   </Identity>
+  <UnitMotion>
+    <WalkSpeed>20.0</WalkSpeed>
+  </UnitMotion>
   <VisualActor>
     <Actor>structures/hellenes/bireme.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_ship_trireme.xml b/binaries/data/mods/public/simulation/templates/units/hele_ship_trireme.xml
index c5a3b66246..7200b71123 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_ship_trireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_ship_trireme.xml
@@ -4,6 +4,9 @@
     <Civ>hele</Civ>
     <SpecificName>Trireme</SpecificName>
   </Identity>
+  <UnitMotion>
+    <WalkSpeed>14.0</WalkSpeed>
+  </UnitMotion>
   <VisualActor>
     <Actor>structures/hellenes/trireme.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_ship_trireme_corinthian.xml b/binaries/data/mods/public/simulation/templates/units/hele_ship_trireme_corinthian.xml
index 45ffd544a3..3bfe1c6d5d 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_ship_trireme_corinthian.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_ship_trireme_corinthian.xml
@@ -4,6 +4,9 @@
     <Civ>hele</Civ>
     <SpecificName>Trireme</SpecificName>
   </Identity>
+  <UnitMotion>
+    <WalkSpeed>14.0</WalkSpeed>
+  </UnitMotion>
   <VisualActor>
     <Actor>structures/hellenes/trireme_cor.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_super_cavalry_mace.xml b/binaries/data/mods/public/simulation/templates/units/hele_super_cavalry_mace.xml
index 0ea936d7a9..6c4a34f128 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_super_cavalry_mace.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_super_cavalry_mace.xml
@@ -10,6 +10,9 @@
     <Pierce>4.0</Pierce>
     <Crush>16.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>8.3</WalkSpeed>
+  </UnitMotion>
   <Attack>
     <Hack>11.0</Hack>
     <Pierce>15.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_super_infantry_mace.xml b/binaries/data/mods/public/simulation/templates/units/hele_super_infantry_mace.xml
index 572b1699eb..fc56c1c419 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_super_infantry_mace.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_super_infantry_mace.xml
@@ -13,6 +13,9 @@
     <Pierce>7.0</Pierce>
     <Crush>16.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>5.2</WalkSpeed>
+  </UnitMotion>
   <Attack>
     <Hack>15.0</Hack>
     <Pierce>25.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_super_infantry_polis.xml b/binaries/data/mods/public/simulation/templates/units/hele_super_infantry_polis.xml
index bb3509bd40..b7494517c0 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_super_infantry_polis.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_super_infantry_polis.xml
@@ -13,6 +13,9 @@
     <Pierce>14.0</Pierce>
     <Crush>21.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>5.0</WalkSpeed>
+  </UnitMotion>
   <Attack>
     <Hack>15.0</Hack>
     <Pierce>20.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_super_ranged_polis.xml b/binaries/data/mods/public/simulation/templates/units/hele_super_ranged_polis.xml
index 5af9de4c22..c07ff4b577 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_super_ranged_polis.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_super_ranged_polis.xml
@@ -13,6 +13,9 @@
     <Pierce>9.0</Pierce>
     <Crush>14.0</Crush>
   </Armour>
+  <UnitMotion>
+    <WalkSpeed>9.0</WalkSpeed>
+  </UnitMotion>
   <VisualActor>
     <Actor>units/hellenes/super_unit_2.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_support_trader.xml b/binaries/data/mods/public/simulation/templates/units/hele_support_trader.xml
index 374389323d..ba46c47cf7 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_support_trader.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_support_trader.xml
@@ -4,6 +4,9 @@
     <Civ>hele</Civ>
     <SpecificName>Emporos</SpecificName>
   </Identity>
+  <UnitMotion>
+    <WalkSpeed>12.25</WalkSpeed>
+  </UnitMotion>
   <VisualActor>
     <Actor>units/hellenes/trader.xml</Actor>
   </VisualActor>
diff --git a/source/tools/entconvert/entconvert.pl b/source/tools/entconvert/entconvert.pl
index 6537b743f9..e6e8dbd176 100644
--- a/source/tools/entconvert/entconvert.pl
+++ b/source/tools/entconvert/entconvert.pl
@@ -74,7 +74,6 @@ sub convert {
     }
 
     if ($name eq 'template_unit') {
-        $out .= qq{$i<UnitMotion/>\n};
         $out .= qq{$i<UnitAI/>\n};
         $out .= qq{$i<Cost>\n};
         $out .= qq{$i$i<Population>1</Population>\n};
@@ -104,6 +103,12 @@ sub convert {
         $out .= qq{$i</Armour>\n};
     }
 
+    if ($data->{Actions}[0]{Move}) {
+        $out .= qq{$i<UnitMotion>\n};
+        $out .= qq{$i$i<WalkSpeed>$data->{Actions}[0]{Move}[0]{Speed}[0]</WalkSpeed>\n} if $data->{Actions}[0]{Move}[0]{Speed};
+        $out .= qq{$i</UnitMotion>\n};
+    }
+
     if ($data->{Actions}[0]{Attack}[0]{Melee}) {
         $out .= qq{$i<Attack>\n};
         for my $n (qw(Hack Pierce Crush Range)) {