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	(revision 27242)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/mixins/elephant_african.xml	(revision 27243)
@@ -1,31 +1,34 @@
 <?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>
+      <food op="mul_round">0.9</food>
+      <wood op="mul_round">0.9</wood>
+      <stone op="mul_round">0.9</stone>
+      <metal op="mul_round">0.9</metal>
     </Resources>
   </Cost>
   <Health>
     <Max op="mul">0.9</Max>
   </Health>
+  <Identity>
+    <Classes datatype="tokens">AfricanElephant</Classes>
+  </Identity>
   <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>
+    <food op="mul_round">0.9</food>
+    <wood op="mul_round">0.9</wood>
+    <stone op="mul_round">0.9</stone>
+    <metal op="mul_round">0.9</metal>
+    <xp op="mul_round">0.9</xp>
   </Loot>
 </Entity>
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	(revision 27242)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/mixins/elephant_indian.xml	(revision 27243)
@@ -1,31 +1,34 @@
 <?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>
+      <food op="mul_round">1.1</food>
+      <wood op="mul_round">1.1</wood>
+      <stone op="mul_round">1.1</stone>
+      <metal op="mul_round">1.1</metal>
     </Resources>
   </Cost>
   <Health>
     <Max op="mul">1.1</Max>
   </Health>
+  <Identity>
+    <Classes datatype="tokens">IndianElephant</Classes>
+  </Identity>
   <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>
+    <food op="mul_round">1.1</food>
+    <wood op="mul_round">1.1</wood>
+    <stone op="mul_round">1.1</stone>
+    <metal op="mul_round">1.1</metal>
+    <xp op="mul_round">1.1</xp>
   </Loot>
 </Entity>
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 27242)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/champion_elephant.xml	(revision 27243)
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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 27242)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush/champion_elephant.xml	(revision 27243)
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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 27242)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur/champion_elephant.xml	(revision 27243)
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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 27242)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/champion_elephant.xml	(revision 27243)
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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 27242)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/champion_elephant.xml	(revision 27243)
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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 27242)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/champion_elephant.xml	(revision 27243)
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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>