From 2c4a230ad52b38f44965b1ef287fb90ec70ac850 Mon Sep 17 00:00:00 2001
From: wowgetoffyourcellphone <wowgetoffyourcellphone@wildfiregames.com>
Date: Tue, 26 Dec 2023 04:15:40 +0000
Subject: [PATCH] [Gameplay] Move Persian Immortals to the Barracks, make them
 cheaper, weaker. Now they can be massed more easily, but not be OP.

Patch by: @real_tabasco_sauce
Comments from: @borg-
Accepted by: @wowgetoffyourcellphone

Differential Revision: https://code.wildfiregames.com/D5202
This was SVN commit r27990.
---
 .../unlock_champion_infantry.json             |  1 -
 .../templates/structures/pers/barracks.xml    |  1 +
 .../units/pers/champion_infantry.xml          | 34 +++++++++++++++----
 .../pers/champion_infantry_archer_upgrade.xml | 25 ++++++++++++--
 4 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/binaries/data/mods/public/simulation/data/technologies/unlock_champion_infantry.json b/binaries/data/mods/public/simulation/data/technologies/unlock_champion_infantry.json
index da8b6a7ac7..d3ba5e22d3 100644
--- a/binaries/data/mods/public/simulation/data/technologies/unlock_champion_infantry.json
+++ b/binaries/data/mods/public/simulation/data/technologies/unlock_champion_infantry.json
@@ -15,7 +15,6 @@
 			{ "notciv": "athen" },
 			{ "notciv": "cart" },
 			{ "notciv": "han" },
-			{ "notciv": "pers" },
 			{ "notciv": "sele" },
 			{ "notciv": "spart" }
 		]
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers/barracks.xml b/binaries/data/mods/public/simulation/templates/structures/pers/barracks.xml
index b7f1e32af3..fc8f93b28b 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers/barracks.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/pers/barracks.xml
@@ -7,6 +7,7 @@
   <Trainer>
     <Entities datatype="tokens">
       -units/{civ}/champion_infantry_archer
+      units/{civ}/champion_infantry
     </Entities>
   </Trainer>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/champion_infantry.xml b/binaries/data/mods/public/simulation/templates/units/pers/champion_infantry.xml
index 279ba1b350..ab7120456c 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/champion_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers/champion_infantry.xml
@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_spearman">
+  <Attack>
+    <Melee>
+      <Damage>
+        <Hack op="mul">0.85</Hack>
+        <Pierce op="mul">0.85</Pierce>
+      </Damage>
+    </Melee>
+  </Attack>
   <Health>
-    <Max>140</Max>
+    <Max>120</Max>
   </Health>
   <Identity>
     <Civ>pers</Civ>
@@ -10,26 +18,38 @@
     <SpecificName>Anušiya</SpecificName>
     <VisibleClasses datatype="tokens">Immortal</VisibleClasses>
     <Icon>units/pers/champion_infantry.png</Icon>
+    <Requirements>
+      <Techs datatype="tokens">-phase_city unlock_champion_infantry</Techs>
+    </Requirements>
   </Identity>
+  <Cost>
+    <Resources>
+      <food>50</food>
+      <wood>30</wood>
+      <metal>50</metal>
+    </Resources>
+  </Cost>
   <Resistance>
     <Entity>
       <Damage>
-        <Hack op="add">-3</Hack>
-        <Pierce op="add">-3</Pierce>
+        <Hack op="add">-2</Hack>
+        <Pierce op="add">-1</Pierce>
       </Damage>
     </Entity>
   </Resistance>
+  <Loot>
+    <food>5</food>
+    <wood>3</wood>
+    <metal>5</metal>
+  </Loot>
   <Upgrade>
     <Immortal_archer>
       <Entity>units/pers/champion_infantry_archer_upgrade</Entity>
       <Tooltip>Switch to using the bow and arrow.</Tooltip>
       <Variant>upgrading</Variant>
-      <Time>8</Time>
+      <Time>6</Time>
     </Immortal_archer>
   </Upgrade>
-  <UnitMotion>
-    <WalkSpeed op="mul">0.9</WalkSpeed>
-  </UnitMotion>
   <VisualActor>
     <Actor>units/persians/infantry_spearman_c2.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/champion_infantry_archer_upgrade.xml b/binaries/data/mods/public/simulation/templates/units/pers/champion_infantry_archer_upgrade.xml
index b2212fd0cd..2330a86e5d 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/champion_infantry_archer_upgrade.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers/champion_infantry_archer_upgrade.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_archer">
+  <Attack>
+    <Ranged>
+      <Damage>
+        <Pierce op="mul">0.85</Pierce>
+      </Damage>
+    </Ranged>
+  </Attack>
   <Health>
-    <Max>140</Max>
+    <Max>120</Max>
   </Health>
   <Identity>
     <Civ>pers</Civ>
@@ -11,16 +18,28 @@
     <VisibleClasses datatype="tokens">Immortal</VisibleClasses>
     <Icon>units/pers/champion_infantry_archer.png</Icon>
   </Identity>
+  <Loot>
+    <food>5</food>
+    <wood>3</wood>
+    <metal>5</metal>
+  </Loot>
+  <Resistance>
+    <Entity>
+      <Damage>
+        <Hack op="add">-1</Hack>
+      </Damage>
+    </Entity>
+  </Resistance>
   <Upgrade>
     <Immortal_spearman>
       <Entity>units/pers/champion_infantry</Entity>
       <Tooltip>Switch to using a spear and shield.</Tooltip>
       <Variant>upgrading</Variant>
-      <Time>8</Time>
+      <Time>6</Time>
     </Immortal_spearman>
   </Upgrade>
   <UnitMotion>
-    <WalkSpeed op="mul">0.79</WalkSpeed>
+    <WalkSpeed op="mul">0.88</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>units/persians/infantry_archer_c.xml</Actor>