Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/unit_elephant_african.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/unit_elephant_african.json	(revision 27240)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/unit_elephant_african.json	(nonexistent)
@@ -1,22 +0,0 @@
-{
-	"autoResearch": true,
-	"icon": "armor_elephant.png",
-	"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"]
-}

Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/unit_elephant_african.json
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/json
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/unit_elephant_indian.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/unit_elephant_indian.json	(revision 27240)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/unit_elephant_indian.json	(nonexistent)
@@ -1,22 +0,0 @@
-{
-	"autoResearch": true,
-	"icon": "armor_elephant.png",
-	"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"]
-}

Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/unit_elephant_indian.json
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/json
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/templates/mixins/elephant_african.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/mixins/elephant_african.xml	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/mixins/elephant_african.xml	(revision 27241)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<Entity>
+  <Attack>
+    <Melee>
+      <Damage>
+        <Hack op="mul">0.9</Hack>
+        <Pierce op="mul">0.9</Pierce>
+        <Crush op="mul">0.9</Crush>
+      </Damage>
+    </Melee>
+  </Attack>
+  <Cost>
+    <BuildTime op="mul">0.9</BuildTime>
+    <Resources>
+      <food op="mul">0.9</food>
+      <wood op="mul">0.9</wood>
+      <stone op="mul">0.9</stone>
+      <metal op="mul">0.9</metal>
+    </Resources>
+  </Cost>
+  <Health>
+    <Max op="mul">0.9</Max>
+  </Health>
+  <Loot>
+    <food op="mul">0.9</food>
+    <wood op="mul">0.9</wood>
+    <stone op="mul">0.9</stone>
+    <metal op="mul">0.9</metal>
+    <xp op="mul">0.9</xp>
+  </Loot>
+</Entity>

Property changes on: ps/trunk/binaries/data/mods/public/simulation/templates/mixins/elephant_african.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/templates/mixins/elephant_indian.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/mixins/elephant_indian.xml	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/mixins/elephant_indian.xml	(revision 27241)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<Entity>
+  <Attack>
+    <Melee>
+      <Damage>
+        <Hack op="mul">1.1</Hack>
+        <Pierce op="mul">1.1</Pierce>
+        <Crush op="mul">1.1</Crush>
+      </Damage>
+    </Melee>
+  </Attack>
+  <Cost>
+    <BuildTime op="mul">1.1</BuildTime>
+    <Resources>
+      <food op="mul">1.1</food>
+      <wood op="mul">1.1</wood>
+      <stone op="mul">1.1</stone>
+      <metal op="mul">1.1</metal>
+    </Resources>
+  </Cost>
+  <Health>
+    <Max op="mul">1.1</Max>
+  </Health>
+  <Loot>
+    <food op="mul">1.1</food>
+    <wood op="mul">1.1</wood>
+    <stone op="mul">1.1</stone>
+    <metal op="mul">1.1</metal>
+    <xp op="mul">1.1</xp>
+  </Loot>
+</Entity>

Property changes on: ps/trunk/binaries/data/mods/public/simulation/templates/mixins/elephant_indian.xml
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/champion_elephant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/champion_elephant.xml	(revision 27240)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/champion_elephant.xml	(revision 27241)
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_elephant_melee">
+<Entity parent="elephant_african|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>
     <Actor>units/carthaginians/elephantry_c_m.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush/champion_elephant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush/champion_elephant.xml	(revision 27240)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush/champion_elephant.xml	(revision 27241)
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_elephant_melee">
+<Entity parent="elephant_african|template_unit_champion_elephant_melee">
   <Identity>
     <Civ>kush</Civ>
     <Lang>napatan</Lang>
     <GenericName>Meroitic War Elephant</GenericName>
     <SpecificName>Abore ʿhȝ</SpecificName>
     <Classes datatype="tokens">AfricanElephant</Classes>
     <Icon>units/kush/champion_elephant.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/kushites/elephantry_c_m.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur/champion_elephant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur/champion_elephant.xml	(revision 27240)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur/champion_elephant.xml	(revision 27241)
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_elephant_melee">
+<Entity parent="elephant_indian|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>
     <Actor>units/mauryas/elephantry_c_m.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/champion_elephant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/champion_elephant.xml	(revision 27240)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/champion_elephant.xml	(revision 27241)
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_elephant_melee">
+<Entity parent="elephant_indian|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>
     <Actor>units/persians/elephantry_c_m.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/champion_elephant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/champion_elephant.xml	(revision 27240)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/champion_elephant.xml	(revision 27241)
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_elephant_melee">
+<Entity parent="elephant_african|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>
     <Actor>units/ptolemies/elephantry_c_m.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/champion_elephant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/champion_elephant.xml	(revision 27240)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/champion_elephant.xml	(revision 27241)
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_elephant_melee">
+<Entity parent="elephant_indian|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>
     <Actor>units/seleucids/elephantry_c_m.xml</Actor>
   </VisualActor>
 </Entity>