From 8bd7a4f4b54655fb95afdcfd7c4372c3cc08ab06 Mon Sep 17 00:00:00 2001
From: wraitii <wraitii@wildfiregames.com>
Date: Fri, 26 Mar 2021 17:03:45 +0000
Subject: [PATCH] Reduce cavalry training time and increase movement speed for
 ranged cavalry.

The early-game cavalry rush was overly nerfed in A24 with longer train
time, slower speed, and the need for stables.
This rolls that back slightly by reducing train tim from 16 to 15, and
increasing the movement speed of ranged cavalry from 15 to 16.

Patch by: borg-
Differential Revision: https://code.wildfiregames.com/D3664
This was SVN commit r25129.
---
 .../mods/public/simulation/templates/template_unit_cavalry.xml | 2 +-
 .../simulation/templates/template_unit_cavalry_ranged.xml      | 3 ---
 .../templates/template_unit_cavalry_ranged_archer.xml          | 3 +++
 .../templates/template_unit_cavalry_ranged_javelineer.xml      | 3 +++
 .../simulation/templates/template_unit_champion_cavalry.xml    | 2 +-
 .../templates/template_unit_champion_cavalry_archer.xml        | 2 +-
 .../templates/template_unit_champion_cavalry_javelineer.xml    | 2 +-
 .../simulation/templates/template_unit_hero_cavalry_archer.xml | 2 +-
 .../templates/template_unit_hero_cavalry_javelineer.xml        | 2 +-
 9 files changed, 12 insertions(+), 9 deletions(-)

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 b90d8d6757..d5e999b512 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
@@ -17,7 +17,7 @@
     </Slaughter>
   </Attack>
   <Cost>
-    <BuildTime>16</BuildTime>
+    <BuildTime>15</BuildTime>
     <Resources>
       <food>100</food>
     </Resources>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml
index 2043bb42c4..f1546075b9 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml
@@ -10,7 +10,4 @@
       special/formations/skirmish
     </Formations>
   </Identity>
-  <UnitMotion>
-    <WalkSpeed op="mul">0.835</WalkSpeed>
-  </UnitMotion>
 </Entity>
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 94f9d1e500..645377e0c0 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
@@ -36,4 +36,7 @@
       <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
     </SoundGroups>
   </Sound>
+  <UnitMotion>
+    <WalkSpeed op="mul">0.89</WalkSpeed>
+  </UnitMotion>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelineer.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelineer.xml
index beba6d157d..c8af25b8d2 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelineer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelineer.xml
@@ -36,4 +36,7 @@
       <attack_impact_ranged>attack/impact/javelin_impact.xml</attack_impact_ranged>
     </SoundGroups>
   </Sound>
+  <UnitMotion>
+    <WalkSpeed op="mul">0.89</WalkSpeed>
+  </UnitMotion>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml
index 4fb7bc9ef8..48faac68ce 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion">
   <Cost>
-    <BuildTime>27</BuildTime>
+    <BuildTime>25</BuildTime>
     <Resources>
       <food>150</food>
       <wood>80</wood>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml
index 3cacd7cf08..96a0ed140a 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml
@@ -43,6 +43,6 @@
     </SoundGroups>
   </Sound>
   <UnitMotion>
-    <WalkSpeed op="mul">0.835</WalkSpeed>
+    <WalkSpeed op="mul">0.89</WalkSpeed>
   </UnitMotion>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelineer.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelineer.xml
index 2a7d05e75d..4e4e9040a6 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelineer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelineer.xml
@@ -43,6 +43,6 @@
     </SoundGroups>
   </Sound>
   <UnitMotion>
-    <WalkSpeed op="mul">0.835</WalkSpeed>
+    <WalkSpeed op="mul">0.89</WalkSpeed>
   </UnitMotion>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml
index 023d8fc3fe..36c025aa08 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml
@@ -43,6 +43,6 @@
     </SoundGroups>
   </Sound>
   <UnitMotion>
-    <WalkSpeed op="mul">0.835</WalkSpeed>
+    <WalkSpeed op="mul">0.89</WalkSpeed>
   </UnitMotion>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelineer.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelineer.xml
index ad92c1bcb2..5a2514aa55 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelineer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelineer.xml
@@ -43,6 +43,6 @@
     </SoundGroups>
   </Sound>
   <UnitMotion>
-    <WalkSpeed op="mul">0.835</WalkSpeed>
+    <WalkSpeed op="mul">0.89</WalkSpeed>
   </UnitMotion>
 </Entity>