From d4b567ca85eb2d46cc397e53d583c6a44675151e Mon Sep 17 00:00:00 2001
From: Stan <stan@wildfiregames.com>
Date: Wed, 8 Jul 2020 11:21:10 +0000
Subject: [PATCH] Fix broken templates following 33042ad23d while retaining the
 same functionnality

Patch by: @Nescio
Differential Revision: https://code.wildfiregames.com/D2864
This was SVN commit r23810.
---
 .../art/variants/biped/female_base_walk.xml   |  8 ++----
 .../public/simulation/components/Identity.js  |  2 +-
 .../technologies/unit_elephant_african.json   | 21 ++++++++++++++
 .../technologies/unit_elephant_indian.json    | 21 ++++++++++++++
 ...e_unit_champion_elephant_melee_african.xml | 28 -------------------
 ...te_unit_champion_elephant_melee_indian.xml | 28 -------------------
 .../units/cart_champion_elephant.xml          |  3 +-
 .../units/kush_champion_elephant.xml          |  3 +-
 .../units/maur_champion_elephant.xml          |  3 +-
 .../units/pers_champion_elephant.xml          |  3 +-
 .../units/ptol_champion_elephant.xml          |  3 +-
 .../units/sele_champion_elephant.xml          |  3 +-
 12 files changed, 58 insertions(+), 68 deletions(-)
 create mode 100644 binaries/data/mods/public/simulation/data/technologies/unit_elephant_african.json
 create mode 100644 binaries/data/mods/public/simulation/data/technologies/unit_elephant_indian.json
 delete mode 100644 binaries/data/mods/public/simulation/templates/template_unit_champion_elephant_melee_african.xml
 delete mode 100644 binaries/data/mods/public/simulation/templates/template_unit_champion_elephant_melee_indian.xml

diff --git a/binaries/data/mods/public/art/variants/biped/female_base_walk.xml b/binaries/data/mods/public/art/variants/biped/female_base_walk.xml
index c14fe682e4..72619143de 100644
--- a/binaries/data/mods/public/art/variants/biped/female_base_walk.xml
+++ b/binaries/data/mods/public/art/variants/biped/female_base_walk.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <variant frequency="1" name="Base">
   <animations>
-    <animation file="biped/citizen/idle_relax_f_long.dae" name="Idle" speed="100"/>
-    <animation file="biped/citizen/idle_relax_f_short.dae" name="Idle" speed="100"/>
-    <animation file="biped/citizen/idle_relax_f.dae" name="Idle" speed="100"/>
-    <animation file="biped/citizen/idle_relax_f.dae" name="Idle" speed="100"/>
-    <animation file="biped/citizen/idle_relax_f_long.dae" name="Idle" speed="100"/>
+    <animation file="biped/citizen/idle_relax_f_long.dae" name="Idle" id="idle1" speed="100"/>
+    <animation file="biped/citizen/idle_relax_f_short.dae" name="Idle" id="idle2" speed="100"/>
+    <animation file="biped/citizen/idle_relax_f.dae" name="Idle"  id="idle3" speed="100"/>
     <animation file="biped/citizen/walk_relax_f.dae" name="Walk" speed="20"/>
     <animation file="biped/citizen/run.dae" name="Run" id="run1" speed="8"/>
     <animation file="biped/citizen/run.dae" name="Run" id="run2" speed="9"/>
diff --git a/binaries/data/mods/public/simulation/components/Identity.js b/binaries/data/mods/public/simulation/components/Identity.js
index 0626e52321..f43673ee23 100644
--- a/binaries/data/mods/public/simulation/components/Identity.js
+++ b/binaries/data/mods/public/simulation/components/Identity.js
@@ -57,7 +57,7 @@ Identity.prototype.Schema =
 		"</element>" +
 	"</optional>" +
 	"<optional>" +
-		"<element name='Classes' a:help='Optional list of space-separated classes applying to this entity. Choices include: Animal, Apadana, ArmyCamp, Ashoka, BarterMarket, Celt, CitizenSoldier, CivCentre, Colony, ConquestCritical, Defensive, Domestic, DropsiteFood, DropsiteMetal, DropsiteStone, DropsiteWood, FemaleCitizen, FishingBoat, ForestPlant, Fortress, GarrisonFortress, GarrisonTower, Gates, Human, Iberian, Immortal, Italian, Juggernaut, Kennel, Lighthouse, LongWall, MercenaryCamp, Naval, NavalMarket, Organic, Palace, Palisade, Player, PtolemyIV, SeaCreature, SiegeWall, SpecialBuilding, StoneWall, Structure, Syssiton, Theater, Tower, Unit.'>" +
+		"<element name='Classes' a:help='Optional list of space-separated classes applying to this entity. Choices include: AfricanElephant, Animal, Apadana, ArmyCamp, Ashoka, BarterMarket, Celt, CitizenSoldier, CivCentre, Colony, ConquestCritical, Defensive, Domestic, DropsiteFood, DropsiteMetal, DropsiteStone, DropsiteWood, FemaleCitizen, FishingBoat, ForestPlant, Fortress, GarrisonFortress, GarrisonTower, Gates, Human, Iberian, Immortal, IndianElephant, Italian, Juggernaut, Kennel, Lighthouse, LongWall, MercenaryCamp, Naval, NavalMarket, Organic, Palace, Palisade, Player, PtolemyIV, SeaCreature, SiegeWall, SpecialBuilding, StoneWall, Structure, Syssiton, Theater, Tower, Unit.'>" +
 			"<attribute name='datatype'>" +
 				"<value>tokens</value>" +
 			"</attribute>" +
diff --git a/binaries/data/mods/public/simulation/data/technologies/unit_elephant_african.json b/binaries/data/mods/public/simulation/data/technologies/unit_elephant_african.json
new file mode 100644
index 0000000000..88fd360ca9
--- /dev/null
+++ b/binaries/data/mods/public/simulation/data/technologies/unit_elephant_african.json
@@ -0,0 +1,21 @@
+{
+	"autoResearch": true,
+	"tooltip": "African Elephants −10% resource costs, training time, health, attack damage, and loot.",
+	"modifications": [
+		{ "value": "Attack/Melee/Damage/Hack", "multiply": 0.9 },
+		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 0.9 },
+		{ "value": "Attack/Melee/Damage/Crush", "multiply": 0.9 },
+		{ "value": "Cost/BuildTime", "multiply": 0.9 },
+		{ "value": "Cost/Resources/food", "multiply": 0.9 },
+		{ "value": "Cost/Resources/wood", "multiply": 0.9 },
+		{ "value": "Cost/Resources/stone", "multiply": 0.9 },
+		{ "value": "Cost/Resources/metal", "multiply": 0.9 },
+		{ "value": "Health/Max", "multiply": 0.9 },
+		{ "value": "Loot/food", "multiply": 0.9 },
+		{ "value": "Loot/wood", "multiply": 0.9 },
+		{ "value": "Loot/stone", "multiply": 0.9 },
+		{ "value": "Loot/metal", "multiply": 0.9 },
+		{ "value": "Loot/xp", "multiply": 0.9 }
+	],
+	"affects": ["AfricanElephant"]
+}
diff --git a/binaries/data/mods/public/simulation/data/technologies/unit_elephant_indian.json b/binaries/data/mods/public/simulation/data/technologies/unit_elephant_indian.json
new file mode 100644
index 0000000000..5a09f76fbb
--- /dev/null
+++ b/binaries/data/mods/public/simulation/data/technologies/unit_elephant_indian.json
@@ -0,0 +1,21 @@
+{
+	"autoResearch": true,
+	"tooltip": "Indian Elephants +10% resource costs, training time, health, attack damage, and loot.",
+	"modifications": [
+		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.1 },
+		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.1 },
+		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.1 },
+		{ "value": "Cost/BuildTime", "multiply": 1.1 },
+		{ "value": "Cost/Resources/food", "multiply": 1.1 },
+		{ "value": "Cost/Resources/wood", "multiply": 1.1 },
+		{ "value": "Cost/Resources/stone", "multiply": 1.1 },
+		{ "value": "Cost/Resources/metal", "multiply": 1.1 },
+		{ "value": "Health/Max", "multiply": 1.1 },
+		{ "value": "Loot/food", "multiply": 1.1 },
+		{ "value": "Loot/wood", "multiply": 1.1 },
+		{ "value": "Loot/stone", "multiply": 1.1 },
+		{ "value": "Loot/metal", "multiply": 1.1 },
+		{ "value": "Loot/xp", "multiply": 1.1 }
+	],
+	"affects": ["IndianElephant"]
+}
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant_melee_african.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant_melee_african.xml
deleted file mode 100644
index f140b3c7dd..0000000000
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant_melee_african.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_elephant_melee">
-  <Attack>
-    <Melee>
-      <Damage>
-        <Hack op="mul">0.9</Hack>
-        <Crush op="mul">0.9</Crush>
-      </Damage>
-    </Melee>
-  </Attack>
-  <Cost>
-    <BuildTime op="mul">0.9</BuildTime>
-    <Resources>
-      <food op="mul">0.9</food>
-      <metal op="mul">0.9</metal>
-    </Resources>
-  </Cost>
-  <Health>
-    <Max op="mul">0.9</Max>
-  </Health>
-  <Identity>
-    <GenericName>African War Elephant</GenericName>
-  </Identity>
-  <Loot>
-    <food op="mul">0.9</food>
-    <metal op="mul">0.9</metal>
-  </Loot>
-</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant_melee_indian.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant_melee_indian.xml
deleted file mode 100644
index ebbad77eae..0000000000
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant_melee_indian.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_elephant_melee">
-  <Attack>
-    <Melee>
-      <Damage>
-        <Hack op="mul">1.1</Hack>
-        <Crush op="mul">1.1</Crush>
-      </Damage>
-    </Melee>
-  </Attack>
-  <Cost>
-    <BuildTime op="mul">1.1</BuildTime>
-    <Resources>
-      <food op="mul">1.1</food>
-      <metal op="mul">1.1</metal>
-    </Resources>
-  </Cost>
-  <Health>
-    <Max op="mul">1.1</Max>
-  </Health>
-  <Identity>
-    <GenericName>Indian War Elephant</GenericName>
-  </Identity>
-  <Loot>
-    <food op="mul">1.1</food>
-    <metal op="mul">1.1</metal>
-  </Loot>
-</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_champion_elephant.xml b/binaries/data/mods/public/simulation/templates/units/cart_champion_elephant.xml
index f4b3ac9d43..c9cf9012bd 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_champion_elephant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_champion_elephant.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_elephant_melee_african">
+<Entity parent="template_unit_champion_elephant_melee">
   <Identity>
     <Civ>cart</Civ>
     <GenericName>North African War Elephant</GenericName>
     <SpecificName>Pil Malḥamit</SpecificName>
+    <Classes datatype="tokens">AfricanElephant</Classes>
     <Icon>units/cart_champion_elephant.png</Icon>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush_champion_elephant.xml b/binaries/data/mods/public/simulation/templates/units/kush_champion_elephant.xml
index 72f1254c30..3047c37ca6 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush_champion_elephant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush_champion_elephant.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_elephant_melee_african">
+<Entity parent="template_unit_champion_elephant_melee">
   <Identity>
     <Civ>kush</Civ>
     <GenericName>Meroitic War Elephant</GenericName>
     <SpecificName>Abore ʿhȝ</SpecificName>
+    <Classes datatype="tokens">AfricanElephant</Classes>
     <Icon>units/kush_champion_elephant.png</Icon>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_champion_elephant.xml b/binaries/data/mods/public/simulation/templates/units/maur_champion_elephant.xml
index a8bb55b642..ecbdc5a9c8 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur_champion_elephant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur_champion_elephant.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_elephant_melee_indian">
+<Entity parent="template_unit_champion_elephant_melee">
   <Identity>
     <Civ>maur</Civ>
     <GenericName>Indian War Elephant</GenericName>
     <SpecificName>Gajendra</SpecificName>
+    <Classes datatype="tokens">IndianElephant</Classes>
     <Icon>units/maur_champion_elephant.png</Icon>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_champion_elephant.xml b/binaries/data/mods/public/simulation/templates/units/pers_champion_elephant.xml
index 0eda3e891c..885cc8b2b8 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_champion_elephant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_champion_elephant.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_elephant_melee_indian">
+<Entity parent="template_unit_champion_elephant_melee">
   <Identity>
     <Civ>pers</Civ>
     <Lang>persian</Lang>
     <GenericName>Indian War Elephant</GenericName>
     <SpecificName>Pila Hinduya</SpecificName>
+    <Classes datatype="tokens">IndianElephant</Classes>
     <Icon>units/pers_champion_elephant.png</Icon>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_champion_elephant.xml b/binaries/data/mods/public/simulation/templates/units/ptol_champion_elephant.xml
index 3b27a3da01..ce79779736 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_champion_elephant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_champion_elephant.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_elephant_melee_african">
+<Entity parent="template_unit_champion_elephant_melee">
   <Identity>
     <Civ>ptol</Civ>
     <GenericName>Towered War Elephant</GenericName>
     <SpecificName>Polémou Eléphantos</SpecificName>
+    <Classes datatype="tokens">AfricanElephant</Classes>
     <Icon>units/ptol_champion_elephant.png</Icon>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele_champion_elephant.xml b/binaries/data/mods/public/simulation/templates/units/sele_champion_elephant.xml
index 7613abdf0c..369e45a43b 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele_champion_elephant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele_champion_elephant.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_elephant_melee_indian">
+<Entity parent="template_unit_champion_elephant_melee">
   <Identity>
     <Civ>sele</Civ>
     <Lang>greek</Lang>
     <GenericName>Armored War Elephant</GenericName>
     <SpecificName>Thorakisménos Eléphantos</SpecificName>
+    <Classes datatype="tokens">IndianElephant</Classes>
     <Icon>units/sele_champion_elephant.png</Icon>
   </Identity>
   <VisualActor>