Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant_melee_african.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant_melee_african.xml	(revision 23809)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant_melee_african.xml	(nonexistent)
@@ -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>

Property changes on: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant_melee_african.xml
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/xml
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant_melee_indian.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant_melee_indian.xml	(revision 23809)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant_melee_indian.xml	(nonexistent)
@@ -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>

Property changes on: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant_melee_indian.xml
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/xml
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/variants/biped/female_base_walk.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/variants/biped/female_base_walk.xml	(revision 23809)
+++ ps/trunk/binaries/data/mods/public/art/variants/biped/female_base_walk.xml	(revision 23810)
@@ -1,14 +1,12 @@
 <?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"/>
     <animation file="biped/citizen/run.dae" name="Run" id="run3" speed="10"/>
   </animations>
 </variant>

Property changes on: ps/trunk/binaries/data/mods/public/art/variants/biped/female_base_walk.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/components/Identity.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/components/Identity.js	(revision 23809)
+++ ps/trunk/binaries/data/mods/public/simulation/components/Identity.js	(revision 23810)
@@ -1,187 +1,187 @@
 function Identity() {}
 
 Identity.prototype.Schema =
 	"<a:help>Specifies various names and values associated with the entity, typically for GUI display to users.</a:help>" +
 	"<a:example>" +
 		"<Civ>athen</Civ>" +
 		"<GenericName>Athenian Hoplite</GenericName>" +
 		"<SpecificName>Hoplī́tēs Athēnaïkós</SpecificName>" +
 		"<Icon>units/athen_infantry_spearman.png</Icon>" +
 	"</a:example>" +
 	"<element name='Civ' a:help='Civilization that this unit is primarily associated with, typically a 4-letter code. Choices include: gaia (world objects), skirm (skirmish map placeholders), athen (Athenians), brit (Britons), cart (Carthaginians), gaul (Gauls), iber (Iberians), kush (Kushites), mace (Macedonians), maur (Mauryas), pers (Persians), ptol (Ptolemies), rome (Romans), sele (Seleucids), spart (Spartans).'>" +
 		"<text/>" +
 	"</element>" +
 	"<optional>" +
 		"<element name='Lang' a:help='Unit language for voices.'>" +
 			"<text/>" +
 		"</element>" +
 	"</optional>" +
 	"<optional>" +
 		"<element name='Phenotype' a:help='Unit phenotype for voices and visual. If more than one is specified a random one will be chosen.'>" +
 			"<attribute name='datatype'>" +
 				"<value>tokens</value>" +
 			"</attribute>" +
 			"<text/>" +
 		"</element>" +
 	"</optional>" +
 	"<element name='GenericName' a:help='Generic English-language name for this entity.'>" +
 		"<text/>" +
 	"</element>" +
 	"<optional>" +
 		"<element name='SpecificName' a:help='Specific native-language name for this entity.'>" +
 			"<text/>" +
 		"</element>" +
 	"</optional>" +
 	"<optional>" +
 		"<element name='SelectionGroupName' a:help='Name used to group ranked entities.'>" +
 			"<text/>" +
 		"</element>" +
 	"</optional>" +
 	"<optional>" +
 		"<element name='Tooltip'>" +
 			"<text/>" +
 		"</element>" +
 	"</optional>" +
 	"<optional>" +
 		"<element name='History'>" +
 			"<text/>" +
 		"</element>" +
 	"</optional>" +
 	"<optional>" +
 		"<element name='Rank'>" +
 			"<choice>" +
 				"<value>Basic</value>" +
 				"<value>Advanced</value>" +
 				"<value>Elite</value>" +
 			"</choice>" +
 		"</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>" +
 			"<text/>" +
 		"</element>" +
 	"</optional>" +
 	"<optional>" +
 		"<element name='VisibleClasses' a:help='Optional list of space-separated classes applying to this entity. These classes will also be visible in various GUI elements. If the classes need spaces, underscores will be replaced with spaces. Choices include: Archer, Axeman, Barracks, Bireme, Blacksmith, BoltShooter, Camel, Cavalry, Champion, Chariot, Citizen, City, Civic, CivilCentre, Clubman, Corral, Crossbowman, DefenseTower, Dock, Dog, Economic, Elephant, ElephantStable, Embassy, Farmstead, Field, Fireship, Healer, Hero, House, Infantry, Javelinist, Maceman, Melee, Market, Mercenary, Military, Outpost, Pikeman, Quadrireme, Quinquereme, Ram, Range, Ranged, Relic, Resource, SentryTower, Ship, Shipyard, Siege, SiegeTower, Slave, Slinger, Soldier, Spearman, Stable, StoneThrower, Storehouse, Support, Swordsman, Temple, Town, Trader, Trireme, Village, Warship, Wonder, Worker, Workshop.'>" +
 			"<attribute name='datatype'>" +
 				"<value>tokens</value>" +
 			"</attribute>" +
 			"<text/>" +
 		"</element>" +
 	"</optional>" +
 	"<optional>" +
 		"<element name='Formations' a:help='Optional list of space-separated formations this unit is allowed to use. Choices include: Scatter, Box, ColumnClosed, LineClosed, ColumnOpen, LineOpen, Flank, Skirmish, Wedge, Testudo, Phalanx, Syntagma, BattleLine.'>" +
 			"<attribute name='datatype'>" +
 				"<value>tokens</value>" +
 			"</attribute>" +
 			"<text/>" +
 		"</element>" +
 	"</optional>" +
 	"<optional>" +
 		"<element name='Icon'>" +
 			"<text/>" +
 		"</element>" +
 	"</optional>" +
 	"<optional>" +
 		"<element name='RequiredTechnology' a:help='Optional name of a technology which must be researched before the entity can be produced.'>" +
 			"<text/>" +
 		"</element>" +
 	"</optional>" +
 	"<element name='Undeletable' a:help='Prevent players from deleting this entity.'>" +
 		"<data type='boolean'/>" +
 	"</element>";
 
 Identity.prototype.Init = function()
 {
 	this.classesList = GetIdentityClasses(this.template);
 	this.visibleClassesList = GetVisibleIdentityClasses(this.template);
 	if (this.template.Phenotype)
 		this.phenotype = pickRandom(this.GetPossiblePhenotypes());
 	else
 		this.phenotype = "default";
 };
 
 Identity.prototype.HasSomeFormation = function()
 {
 	return this.GetFormationsList().length > 0;
 };
 
 Identity.prototype.GetCiv = function()
 {
 	return this.template.Civ;
 };
 
 Identity.prototype.GetLang = function()
 {
 	return this.template.Lang || "greek"; // ugly default
 };
 
 /**
  * Get a list of possible Phenotypes.
  * @return {string[]} A list of possible phenotypes.
  */
 Identity.prototype.GetPossiblePhenotypes = function()
 {
 	return this.template.Phenotype._string.split(/\s+/);
 };
 
 /**
  * Get the current Phenotype.
  * @return {string} The current phenotype.
  */
 Identity.prototype.GetPhenotype = function()
 {
 	return this.phenotype;
 };
 
 Identity.prototype.GetRank = function()
 {
 	return this.template.Rank || "";
 };
 
 Identity.prototype.GetClassesList = function()
 {
 	return this.classesList;
 };
 
 Identity.prototype.GetVisibleClassesList = function()
 {
 	return this.visibleClassesList;
 };
 
 Identity.prototype.HasClass = function(name)
 {
 	return this.GetClassesList().indexOf(name) != -1;
 };
 
 Identity.prototype.GetFormationsList = function()
 {
 	if (this.template.Formations && this.template.Formations._string)
 		return this.template.Formations._string.split(/\s+/);
 	return [];
 };
 
 Identity.prototype.CanUseFormation = function(template)
 {
 	return this.GetFormationsList().indexOf(template) != -1;
 };
 
 Identity.prototype.GetSelectionGroupName = function()
 {
 	return this.template.SelectionGroupName || "";
 };
 
 Identity.prototype.GetGenericName = function()
 {
 	return this.template.GenericName;
 };
 
 Identity.prototype.IsUndeletable = function()
 {
 	return this.template.Undeletable == "true";
 };
 
 Engine.RegisterComponentType(IID_Identity, "Identity", Identity);
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	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/unit_elephant_african.json	(revision 23810)
@@ -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"]
+}

Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/unit_elephant_african.json
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ 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	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/unit_elephant_indian.json	(revision 23810)
@@ -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"]
+}

Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/unit_elephant_indian.json
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ 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 23809)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_champion_elephant.xml	(revision 23810)
@@ -1,12 +1,13 @@
 <?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>
     <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 23809)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_champion_elephant.xml	(revision 23810)
@@ -1,12 +1,13 @@
 <?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>
     <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 23809)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_champion_elephant.xml	(revision 23810)
@@ -1,12 +1,13 @@
 <?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>
     <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 23809)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_champion_elephant.xml	(revision 23810)
@@ -1,13 +1,14 @@
 <?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>
     <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 23809)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_champion_elephant.xml	(revision 23810)
@@ -1,12 +1,13 @@
 <?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>
     <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 23809)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_champion_elephant.xml	(revision 23810)
@@ -1,13 +1,14 @@
 <?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>
     <Actor>units/seleucids/elephantry_c_m.xml</Actor>
   </VisualActor>
 </Entity>