Index: binaries/data/mods/public/globalscripts/Templates.js
===================================================================
--- binaries/data/mods/public/globalscripts/Templates.js	(révision 17965)
+++ binaries/data/mods/public/globalscripts/Templates.js	(copie de travail)
@@ -66,14 +66,15 @@ function MatchesClassList(classes, match
 }
 
 /**
  * Get information about a template with or without technology modifications.
  * @param template A valid template as returned by the template loader.
- * @param player An optional player id to get the technology modifications 
+ * @param player An optional player id to get the technology modifications
  *               of properties.
+ * @param aurasTemplate An object An object in the form of {key: {auraName: "", auraDescription: ""}}
  */
-function GetTemplateDataHelper(template, player)
+function GetTemplateDataHelper(template, player, aurasTemplate)
 {
 	var ret = {};
 
 	var func;
 	if (player)
@@ -118,17 +119,17 @@ function GetTemplateDataHelper(template,
 	}
 
 	if (template.Auras)
 	{
 		ret.auras = {};
-		for (let auraID in template.Auras)
+		for (let auraID in aurasTemplate)
 		{
-			let aura = template.Auras[auraID];
-			if (aura.AuraName)
+			let aura = aurasTemplate[auraID];
+			if (aura.auraName)
 				ret.auras[auraID] = {
-					"name": aura.AuraName,
-					"description": aura.AuraDescription || null
+					"name": aura.auraName || null,
+					"description": aura.auraDescription || null
 				};
 		}
 	}
 
 	if (template.BuildRestrictions)
Index: binaries/data/mods/public/simulation/components/Auras.js
===================================================================
--- binaries/data/mods/public/simulation/components/Auras.js	(révision 17965)
+++ binaries/data/mods/public/simulation/components/Auras.js	(copie de travail)
@@ -1,116 +1,56 @@
 function Auras() {}
 
-var modificationSchema =
-	"<element name='Modifications' a:help='Modification list'>" +
-		"<oneOrMore>" +
-			"<element a:help='Name of the value to modify'>" +
-				"<anyName/>" +
-				"<choice>" +
-					"<element name='Add'>" +
-						"<data type='decimal'/>" +
-					"</element>" +
-					"<element name='Multiply'>" +
-						"<data type='decimal'/>" +
-					"</element>" +
-				"</choice>" +
-			"</element>" +
-		"</oneOrMore>" +
-	"</element>";
-
 Auras.prototype.Schema =
-	"<oneOrMore>" +
-		"<element a:help='Any name you want'>" +
-			"<anyName/>" +
-			"<interleave>" +
-				"<optional>" +
-					"<element name='Radius' a:help='Define the radius this aura affects, if it is a range aura'>" +
-						"<data type='nonNegativeInteger'/>" +
-					"</element>" +
-				"</optional>" +
-				"<element name='Type' a:help='Controls how this aura affects nearby units'>" +
-					"<choice>" +
-						"<value a:help='Affects units in the same formation'>formation</value>" +
-						"<value a:help='Affects units in a certain range'>range</value>" +
-						"<value a:help='Affects the structure or unit this unit is garrisoned in'>garrison</value>" +
-						"<value a:help='Affects the units that are garrisoned on a certain structure'>garrisonedUnits</value>" +
-						"<value a:help='Affects all units while this unit is alive'>global</value>" +
-					"</choice>" +
-				"</element>" +
-				modificationSchema +
-				"<optional>" +
-					"<element name='AuraName' a:help='name to display in the GUI'>" +
-						"<text/>" +
-					"</element>" +
-				"</optional>" +
-				"<optional>" +
-					"<element name='AuraDescription' a:help='description to display in the GUI, requires a name'>" +
-						"<text/>" +
-					"</element>" +
-				"</optional>" +
-				"<optional>" +
-					"<element name='OverlayIcon' a:help='Icon to show on the entities affected by this aura'>" +
-						"<text/>" +
-					"</element>" +
-				"</optional>" +
-				"<element name='Affects' a:help='Affected classes'>" +
-					"<text/>" +
-				"</element>" +
-				"<optional>" +
-					"<element name='AffectedPlayers' a:help='Affected players'>" +
-						"<text/>" +
-					"</element>" +
-				"</optional>" +
-			"</interleave>" +
-		"</element>" +
-	"</oneOrMore>";
+			"<attribute name='datatype'>" +
+				"<value>tokens</value>" +
+			"</attribute>" +
+			"<text/>";
 
 Auras.prototype.Init = function()
 {
-	var cmpTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TemplateManager);
-	this.templateName = cmpTemplateManager.GetCurrentTemplateName(this.entity);
+	let cmpTechnologyTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TechnologyTemplateManager);
 	this.auras = {};
 	this.affectedPlayers = {};
-	for (var name in this.template)
+	let auraNames = this.GetAuraNames();
+	for (let name of auraNames)
 	{
-		this.affectedPlayers[name] = []; // will be calculated on ownership change
-		var aura = {};
-		aura.affects = this.template[name].Affects;
-		if (this.template[name].AffectedPlayers)
-			aura.affectedPlayers = this.template[name].AffectedPlayers.split(/\s+/);
-		this.auras[name] = aura;
+		this.affectedPlayers[name] = [];
+		this.auras[name] = cmpTechnologyTemplateManager.GetAuraTemplate(name);
 	}
-	// In case of autogarrisoning, this component can be called before ownership is set.
-	// So it needs to be completely initialised from the start.
+    // In case of autogarrisoning, this component can be called before ownership is set.
+    // So it needs to be completely initialised from the start.
 	this.Clean();
 };
 
-Auras.prototype.GetModifierIdentifier = function(name, mod)
+// We can modify identifier if we want stackable auras in some case.
+Auras.prototype.GetModifierIdentifier = function(name)
 {
-		return this.templateName + "/" + name + "/" + mod.value;
+		return name;
 };
 
 Auras.prototype.GetDescriptions = function()
 {
+	let auraNames = this.GetAuraNames();
 	var ret = {};
-	for (let name in this.template)
+	for (let name of auraNames)
 	{
-		let aura = this.template[name];
-		if (aura.AuraName)
-			ret[aura.AuraName] = aura.AuraDescription || null;
+		let aura = this.auras[name];
+		if (aura.auraName)
+			ret[aura.auraName] = aura.auraDescription || null;
 	}
 	return ret;
 };
 
 Auras.prototype.GetAuraNames = function()
 {
-	return Object.keys(this.template);
+	return this.template._string.split(/\s+/);
 };
 
 Auras.prototype.GetOverlayIcon = function(name)
 {
-	return this.template[name].OverlayIcon || "";
+	return this.auras[name].overlayIcon || "";
 };
 
 Auras.prototype.GetAffectedEntities = function(name)
 {
 	return this[name].targetUnits;
@@ -120,11 +60,11 @@ Auras.prototype.GetRange = function(name
 {
 	if (!this.IsRangeAura(name))
 		return undefined;
 	if (this.IsGlobalAura(name))
 		return -1; // -1 is infinite range
-	return +this.template[name].Radius;
+	return +this.auras[name].radius;
 };
 
 Auras.prototype.GetClasses = function(name)
 {
 	return this.auras[name].affects;
@@ -161,10 +101,20 @@ Auras.prototype.CalculateAffectedPlayers
 			}
 		}
 	}
 };
 
+Auras.prototype.CanApply = function(name)
+{
+	if (!this.auras[name].requiredTechnology)
+		return true;
+	let cmpTechnologyManager = QueryOwnerInterface(this.entity, IID_TechnologyManager);
+	if (!cmpTechnologyManager || !cmpTechnologyManager.IsTechnologyResearched(this.auras[name].requiredTechnology))
+		return false;
+	return true;
+};
+
 Auras.prototype.HasFormationAura = function()
 {
 	return this.GetAuraNames().some(n => this.IsFormationAura(n));
 };
 
@@ -178,11 +128,11 @@ Auras.prototype.HasGarrisonedUnitsAura =
 	return this.GetAuraNames().some(n => this.IsGarrisonedUnitsAura(n));
 };
 
 Auras.prototype.GetType = function(name)
 {
-	return this.template[name].Type;
+	return this.auras[name].type;
 };
 
 Auras.prototype.IsFormationAura = function(name)
 {
 	return this.GetType(name) == "formation";
@@ -234,29 +184,10 @@ Auras.prototype.Clean = function()
 
 		if (this[name].rangeQuery)
 			cmpRangeManager.DestroyActiveQuery(this[name].rangeQuery);
 	}
 
-	for (let name in this.template)
-	{
-		let modifications = [];
-		for (let value in this.template[name].Modifications)
-		{
-			let mod = {};
-			mod.value = value.replace(/\./g, "/").replace(/\/\//g, ".");
-			let templateModifications = this.template[name].Modifications[value];
-			if (templateModifications.Add)
-				mod.add = ApplyValueModificationsToEntity("Auras/"+name+"/Modifications/"+mod.value+"/Add",
-					+templateModifications.Add, this.entity);
-			else if (templateModifications.Multiply)
-				mod.multiply = ApplyValueModificationsToEntity("Auras/"+name+"/Modifications/"+mod.value+"/Multiply",
-					+templateModifications.Multiply, this.entity);
-			modifications.push(mod);
-		}
-		this.auras[name].modifications = modifications;
-	}
-
 	for (let name of auraNames)
 	{
 		// only calculate the affected players on re-applying the bonuses
 		// this makes sure the template bonuses are removed from the correct players
 		this.CalculateAffectedPlayers(name);
@@ -341,19 +272,22 @@ Auras.prototype.ApplyGarrisonBonus = fun
 		this.ApplyBonus(name, [structure]);
 };
 
 Auras.prototype.ApplyTemplateBonus = function(name, players)
 {
+	if (!this.CanApply(name))
+		return;
+
 	if (!this.IsGlobalAura(name))
 		return;
 	var modifications = this.GetModifications(name);
 	var cmpAuraManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_AuraManager);
 	var classes = this.GetClasses(name);
 
 	for (let mod of modifications)
 		for (let player of players)
-			cmpAuraManager.ApplyTemplateBonus(mod.value, player, classes, mod, this.GetModifierIdentifier(name, mod));
+			cmpAuraManager.ApplyTemplateBonus(mod.value, player, classes, mod, this.GetModifierIdentifier(name));
 };
 
 Auras.prototype.RemoveFormationBonus = function(memberList)
 {
 	var auraNames = this.GetAuraNames().filter(n => this.IsFormationAura(n));
@@ -368,36 +302,41 @@ Auras.prototype.RemoveGarrisonBonus = fu
 		this.RemoveBonus(name, [structure]);
 };
 
 Auras.prototype.RemoveTemplateBonus = function(name)
 {
+	if (!this.CanApply(name))
+		return;
 	if (!this.IsGlobalAura(name))
 		return;
 
 	var modifications = this.GetModifications(name);
 	var cmpAuraManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_AuraManager);
 	var classes = this.GetClasses(name);
 	var players = this.GetAffectedPlayers(name);
 
 	for (let mod of modifications)
 		for (let player of players)
-			cmpAuraManager.RemoveTemplateBonus(mod.value, player, classes, this.GetModifierIdentifier(name, mod));
+			cmpAuraManager.RemoveTemplateBonus(mod.value, player, classes, this.GetModifierIdentifier(name));
 };
 
 Auras.prototype.ApplyBonus = function(name, ents)
 {
 	var validEnts = this.GiveMembersWithValidClass(name, ents);
 	if (!validEnts.length)
 		return;
 
 	this[name].targetUnits = this[name].targetUnits.concat(validEnts);
+
+	if (!this.CanApply(name))
+		return;
+
 	var modifications = this.GetModifications(name);
 	var cmpAuraManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_AuraManager);
 
 	for (let mod of modifications)
-		cmpAuraManager.ApplyBonus(mod.value, validEnts, mod, this.GetModifierIdentifier(name, mod));
-
+		cmpAuraManager.ApplyBonus(mod.value, validEnts, mod, this.GetModifierIdentifier(name));
 	// update status bars if this has an icon
 	if (!this.GetOverlayIcon(name))
 		return;
 
 	for (let ent of validEnts)
@@ -413,15 +352,19 @@ Auras.prototype.RemoveBonus = function(n
 	var validEnts = this.GiveMembersWithValidClass(name, ents);
 	if (!validEnts.length)
 		return;
 
 	this[name].targetUnits = this[name].targetUnits.filter(v => validEnts.indexOf(v) == -1);
+
+	if (!this.CanApply(name))
+		return;
+
 	var modifications = this.GetModifications(name);
 	var cmpAuraManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_AuraManager);
 
 	for (let mod of modifications)
-		cmpAuraManager.RemoveBonus(mod.value, validEnts, this.GetModifierIdentifier(name, mod));
+		cmpAuraManager.RemoveBonus(mod.value, validEnts, this.GetModifierIdentifier(name));
 
 	// update status bars if this has an icon
 	if (!this.GetOverlayIcon(name))
 		return;
 
@@ -443,12 +386,21 @@ Auras.prototype.OnDiplomacyChanged = fun
 	var cmpOwnership = Engine.QueryInterface(this.entity, IID_Ownership);
 	if (cmpOwnership && cmpOwnership.GetOwner() == msg.player)
 		this.Clean();
 };
 
-Auras.prototype.OnValueModification = function(msg)
+Auras.prototype.OnGlobalResearchFinished = function(msg)
 {
-	if (msg.component == "Auras")
-		this.Clean();
+	let cmpOwnership = Engine.QueryInterface(this.entity, IID_Ownership);
+	if (!cmpOwnership || cmpOwnership.GetOwner() != msg.player)
+		return;
+	let auraNames = this.GetAuraNames();
+	for (let name of auraNames)
+	{
+		if (this.auras[name].requiredTechnology === undefined)
+			continue;
+		if (this.auras[name].requiredTechnology == msg.tech)
+			this.Clean();
+	}
 };
 
 Engine.RegisterComponentType(IID_Auras, "Auras", Auras);
Index: binaries/data/mods/public/simulation/components/GuiInterface.js
===================================================================
--- binaries/data/mods/public/simulation/components/GuiInterface.js	(révision 17965)
+++ binaries/data/mods/public/simulation/components/GuiInterface.js	(copie de travail)
@@ -574,11 +574,32 @@ GuiInterface.prototype.GetTemplateData =
 	let template = cmpTemplateManager.GetTemplate(name);
 
 	if (!template)
 		return null;
 
-	return GetTemplateDataHelper(template, player);
+	let aurasTemplate = {};
+
+	if (!template.Auras)
+		return GetTemplateDataHelper(template, player, aurasTemplate);
+
+	// Add aura name and description loaded from JSON file
+	let auraNames = template.Auras._string.split(/\s+/);
+	let cmpTechnologyTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TechnologyTemplateManager);
+	for (let name of auraNames)
+	{
+		let auraTemplate = cmpTechnologyTemplateManager.GetAuraTemplate(name);
+		if (!auraTemplate)
+		{
+			// the following warning is perhaps useless since it's yet done in TechnologyTemplateManager
+			warn("Tried to get data for invalid aura: " + name);
+			continue;
+		}
+		aurasTemplate[name] = {};
+		aurasTemplate[name].auraName = auraTemplate.auraName || null;
+		aurasTemplate[name].auraDescription = auraTemplate.auraDescription || null;
+	}
+	return GetTemplateDataHelper(template, player, aurasTemplate);
 };
 
 GuiInterface.prototype.GetTechnologyData = function(player, name)
 {
 	let cmpTechnologyTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TechnologyTemplateManager);
Index: binaries/data/mods/public/simulation/components/TechnologyTemplateManager.js
===================================================================
--- binaries/data/mods/public/simulation/components/TechnologyTemplateManager.js	(révision 17965)
+++ binaries/data/mods/public/simulation/components/TechnologyTemplateManager.js	(copie de travail)
@@ -1,7 +1,7 @@
 /**
- * System component which loads the technology data files
+ * System component which loads the technology and the aura data files
  */
 function TechnologyTemplateManager() {}
 
 TechnologyTemplateManager.prototype.Schema =
 	"<a:component type='system'/><empty/>";
Index: binaries/data/mods/public/simulation/data/technologies/pop_wonder.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/pop_wonder.json	(révision 17965)
+++ binaries/data/mods/public/simulation/data/technologies/pop_wonder.json	(copie de travail)
@@ -8,14 +8,14 @@
 		"ptol": "Peristyle",
 		"rome": "Peristyle",
 		"pers": "Paradise"
 	},
 	"description": "The wonder attracts many more people to your civilization.",
-	"cost": { "food": 3000, "wood": 3000, "stone": 500, "metal": 500 },
+	"cost": { "food": 2000, "wood": 3000, "stone": 500, "metal": 500 },
 	"requirements": { "tech": "phase_city" },
 	"requirementsTooltip": "Unlocked in City Phase.",
 	"icon": "special_treasure.png",
 	"researchTime": 40,
-	"tooltip": "+50 maximum population cap.",
-	"modifications": [{ "value": "Player/MaxPopulation", "add": 50 }],
+	"tooltip": "enable +50 wonder aura",
+	"modifications": [],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
Index: binaries/data/mods/public/simulation/helpers/ValueModification.js
===================================================================
--- binaries/data/mods/public/simulation/helpers/ValueModification.js	(révision 17965)
+++ binaries/data/mods/public/simulation/helpers/ValueModification.js	(copie de travail)
@@ -30,11 +30,11 @@ function ApplyValueModificationsToTempla
 	if (cmpTechnologyManager)
 		value = cmpTechnologyManager.ApplyModificationsTemplate(tech_type, current_value, template);
 
 	let cmpAuraManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_AuraManager); 
 	if (!cmpAuraManager)
-		return value; 
+		return value;
 	return cmpAuraManager.ApplyTemplateModifications(tech_type, value, playerID, template);
 }
 
 Engine.RegisterGlobal("ApplyValueModificationsToEntity", ApplyValueModificationsToEntity);
 Engine.RegisterGlobal("ApplyValueModificationsToPlayer", ApplyValueModificationsToPlayer);
Index: binaries/data/mods/public/simulation/templates/structures/athen_theatron.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/athen_theatron.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/structures/athen_theatron.xml	(copie de travail)
@@ -1,16 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
-  <Auras>
-    <Aura1>
-      <Type>global</Type>
-      <Affects>Structure</Affects>
-      <Modifications>
-        <TerritoryInfluence.Radius> <Multiply>1.2</Multiply> </TerritoryInfluence.Radius>
-      </Modifications>
-    </Aura1>
-  </Auras>
+  <Auras datatype="tokens">theatron</Auras>
   <BuildRestrictions>
     <Category>Theater</Category>
   </BuildRestrictions>
   <Cost>
     <BuildTime>500</BuildTime>
Index: binaries/data/mods/public/simulation/templates/structures/brit_rotarymill.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_rotarymill.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/structures/brit_rotarymill.xml	(copie de travail)
@@ -1,30 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
+  <Auras datatype="tokens">rotary_mill</Auras>
   <Cost>
     <BuildTime>100</BuildTime>
     <PopulationBonus>2</PopulationBonus>
     <Resources>
       <food>0</food>
       <wood>200</wood>
       <stone>100</stone>
       <metal>0</metal>
     </Resources>
   </Cost>
-  <Auras>
-    <Aura1>
-    <Type>range</Type>
-      <Radius>60</Radius>
-      <Affects>Worker</Affects>
-      <Modifications>
-        <ResourceGatherer.Rates.food..grain> <Multiply>1.25</Multiply> </ResourceGatherer.Rates.food..grain>
-      </Modifications>
-      <AuraName>Farming bonus</AuraName>
-      <AuraDescription>Boosts nearby farming with +25% gathering rate.</AuraDescription>
-      <OverlayIcon>art/textures/ui/session/auras/farming.png</OverlayIcon>
-    </Aura1>
-  </Auras>
   <Footprint replace="">
     <Circle radius="9.0"/>
     <Height>6.0</Height>
   </Footprint>
   <GarrisonHolder disable=""/>
Index: binaries/data/mods/public/simulation/templates/structures/cart_super_dock.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart_super_dock.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/structures/cart_super_dock.xml	(copie de travail)
@@ -1,18 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
-  <Auras>
-    <Aura1>
-      <Type>garrisonedUnits</Type>
-      <Affects>Ship</Affects>
-      <Modifications>
-        <Health.RegenRate> <Add>3</Add> </Health.RegenRate>
-      </Modifications>
-      <AuraName>Repairing ship Aura</AuraName>
-      <AuraDescription>Heals garrisoned ship at 3 HP per second.</AuraDescription>
-    </Aura1>
-  </Auras>
+  <Auras datatype="tokens">cart_super_dock_repair</Auras>
   <BuildRestrictions>
     <Territory>own ally neutral</Territory>
     <PlacementType>shore</PlacementType>
     <Category>Dock</Category>
   </BuildRestrictions>
Index: binaries/data/mods/public/simulation/templates/structures/gaul_rotarymill.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_rotarymill.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/structures/gaul_rotarymill.xml	(copie de travail)
@@ -1,30 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
+  <Auras datatype="tokens">rotary_mill</Auras>
   <Cost>
     <BuildTime>100</BuildTime>
     <PopulationBonus>2</PopulationBonus>
     <Resources>
       <food>0</food>
       <wood>200</wood>
       <stone>100</stone>
       <metal>0</metal>
     </Resources>
   </Cost>
-  <Auras>
-    <Aura1>
-    <Type>range</Type>
-      <Radius>60</Radius>
-      <Affects>Worker</Affects>
-      <Modifications>
-        <ResourceGatherer.Rates.food..grain> <Multiply>1.25</Multiply> </ResourceGatherer.Rates.food..grain>
-      </Modifications>
-      <AuraName>Farming bonus</AuraName>
-      <AuraDescription>Boosts nearby farming with +25% gathering rate.</AuraDescription>
-      <OverlayIcon>art/textures/ui/session/auras/farming.png</OverlayIcon>
-    </Aura1>
-  </Auras>
   <Footprint replace="">
     <Circle radius="9.0"/>
     <Height>6.0</Height>
   </Footprint>
   <GarrisonHolder disable=""/>
Index: binaries/data/mods/public/simulation/templates/structures/iber_monument.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/iber_monument.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/structures/iber_monument.xml	(copie de travail)
@@ -1,19 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
-  <Auras>
-    <Aura1>
-      <Type>range</Type>
-      <Radius>50</Radius>
-      <Affects>Unit</Affects>
-      <Modifications>
-        <Attack.Melee.Hack> <Add>2</Add> </Attack.Melee.Hack>
-        <Attack.Ranged.Pierce> <Add>3</Add> </Attack.Ranged.Pierce>
-      </Modifications>
-      <OverlayIcon>art/textures/ui/session/auras/attack_bonus.png</OverlayIcon>
-    </Aura1>
-  </Auras>
+  <Auras datatype="tokens">iber_monument</Auras>
   <BuildRestrictions>
     <Category>Monument</Category>
   </BuildRestrictions>
   <Cost>
     <BuildTime>120</BuildTime>
Index: binaries/data/mods/public/simulation/templates/structures/mace_theatron.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mace_theatron.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/structures/mace_theatron.xml	(copie de travail)
@@ -1,16 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
-  <Auras>
-    <Aura1>
-      <Type>global</Type>
-      <Affects>Structure</Affects>
-      <Modifications>
-        <TerritoryInfluence.Radius> <Multiply>1.2</Multiply> </TerritoryInfluence.Radius>
-      </Modifications>
-    </Aura1>
-  </Auras>
+  <Auras datatype="tokens">theatron</Auras>
   <BuildRestrictions>
     <Category>Theater</Category>
   </BuildRestrictions>
   <Cost>
     <BuildTime>550</BuildTime>
Index: binaries/data/mods/public/simulation/templates/structures/maur_pillar_ashoka.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur_pillar_ashoka.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/structures/maur_pillar_ashoka.xml	(copie de travail)
@@ -1,19 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
-  <Auras>
-    <Aura1>
-      <Type>range</Type>
-      <Radius>75</Radius>
-      <Affects>Trader</Affects>
-      <Modifications>
-        <UnitMotion.WalkSpeed> <Multiply>1.20</Multiply> </UnitMotion.WalkSpeed>
-      </Modifications>
-      <AuraDescription>All traders in range +20% walk speed.</AuraDescription>
-      <OverlayIcon>art/textures/ui/session/auras/build_bonus.png</OverlayIcon>
-    </Aura1>
-  </Auras>
+  <Auras datatype="tokens">maur_pillar</Auras>
   <BuildRestrictions>
     <Category>Pillar</Category>
   </BuildRestrictions>
   <Cost>
     <BuildTime>80</BuildTime>
Index: binaries/data/mods/public/simulation/templates/structures/spart_theatron.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/spart_theatron.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/structures/spart_theatron.xml	(copie de travail)
@@ -1,16 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
-  <Auras>
-    <Aura1>
-      <Type>global</Type>
-      <Affects>Structure</Affects>
-      <Modifications>
-        <TerritoryInfluence.Radius> <Multiply>1.2</Multiply> </TerritoryInfluence.Radius>
-      </Modifications>
-    </Aura1>
-  </Auras>
+  <Auras datatype="tokens">theatron</Auras>
   <BuildRestrictions>
     <Category>Theater</Category>
   </BuildRestrictions>
   <Cost>
     <BuildTime>500</BuildTime>
Index: binaries/data/mods/public/simulation/templates/structures/theb_theatron.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/theb_theatron.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/structures/theb_theatron.xml	(copie de travail)
@@ -1,16 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
-  <Auras>
-    <Aura1>
-      <Type>global</Type>
-      <Affects>Structure</Affects>
-      <Modifications>
-        <TerritoryInfluence.Radius> <Multiply>1.2</Multiply> </TerritoryInfluence.Radius>
-      </Modifications>
-    </Aura1>
-  </Auras>
+  <Auras datatype="tokens">theatron</Auras>
   <BuildRestrictions>
     <Category>Theater</Category>
   </BuildRestrictions>
   <Cost>
     <BuildTime>500</BuildTime>
Index: binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml	(copie de travail)
@@ -1,20 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic">
-  <Auras>
-    <heal>
-      <Type>range</Type>
-      <Radius>40</Radius>
-      <Affects>Human</Affects>
-      <Modifications>
-        <Health.RegenRate> <Add>1</Add> </Health.RegenRate>
-      </Modifications>
-      <AuraName>Healing Aura</AuraName>
-      <AuraDescription>Heals nearby units at 1 HP per second.</AuraDescription>
-      <OverlayIcon>art/textures/ui/session/auras/heal.png</OverlayIcon>
-    </heal>
-  </Auras>
+  <Auras datatype="tokens">temple_heal</Auras>
   <BuildRestrictions>
     <Category>Temple</Category>
   </BuildRestrictions>
   <Cost>
     <PopulationBonus>5</PopulationBonus>
Index: binaries/data/mods/public/simulation/templates/template_structure_defense_wall_long.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defense_wall_long.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/template_structure_defense_wall_long.xml	(copie de travail)
@@ -3,24 +3,11 @@
   <Armour>
     <Hack>18.0</Hack>
     <Pierce>40.0</Pierce>
     <Crush>4.0</Crush>
   </Armour>
-  <Auras>
-    <Aura1>
-      <Type>garrisonedUnits</Type>
-      <Affects>Unit</Affects>
-      <Modifications>
-        <Armour.Pierce> <Add>3</Add> </Armour.Pierce>
-        <Armour.Hack> <Add>3</Add> </Armour.Hack>
-        <Armour.Crush> <Add>3</Add> </Armour.Crush>
-        <Vision.Range> <Add>20</Add> </Vision.Range>
-      </Modifications>
-      <AuraName>Wall Protection</AuraName>
-      <AuraDescription>Units on walls have 3 extra Armor levels</AuraDescription>
-    </Aura1>
-  </Auras>
+  <Auras datatype="tokens">wall_garrisoned</Auras>
   <Cost>
     <BuildTime>45</BuildTime>
     <Resources>
       <stone>28</stone>
     </Resources>
Index: binaries/data/mods/public/simulation/templates/template_structure_defense_wall_medium.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defense_wall_medium.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/template_structure_defense_wall_medium.xml	(copie de travail)
@@ -3,24 +3,11 @@
   <Armour>
     <Hack>18.0</Hack>
     <Pierce>40.0</Pierce>
     <Crush>4.0</Crush>
   </Armour>
-  <Auras>
-    <Aura1>
-      <Type>garrisonedUnits</Type>
-      <Affects>Unit</Affects>
-      <Modifications>
-        <Armour.Pierce> <Add>3</Add> </Armour.Pierce>
-        <Armour.Hack> <Add>3</Add> </Armour.Hack>
-        <Armour.Crush> <Add>3</Add> </Armour.Crush>
-        <Vision.Range> <Add>20</Add> </Vision.Range>
-      </Modifications>
-      <AuraName>Wall Protection</AuraName>
-      <AuraDescription>Units on walls have 3 extra Armor levels</AuraDescription>
-    </Aura1>
-  </Auras>
+  <Auras datatype="tokens">wall_garrisoned</Auras>
   <Cost>
     <BuildTime>30</BuildTime>
     <Resources>
       <stone>22</stone>
     </Resources>
Index: binaries/data/mods/public/simulation/templates/template_structure_wonder.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_wonder.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/template_structure_wonder.xml	(copie de travail)
@@ -8,21 +8,22 @@
       <Hack>2</Hack>
       <Pierce>10</Pierce>
       <Crush>2</Crush>
     </Foundation>
   </Armour>
+  <Auras datatype="tokens">wonder_pop_1 wonder_pop_2</Auras>
   <BuildRestrictions>
     <Category>Wonder</Category>
   </BuildRestrictions>
   <Capturable>
-    <CapturePoints>1500</CapturePoints>
+    <CapturePoints>2000</CapturePoints>
     <RegenRate>5.0</RegenRate>
   </Capturable>
   <Cost>
     <BuildTime>1000</BuildTime>
     <Resources>
-      <food>0</food>
+      <food>1000</food>
       <wood>1000</wood>
       <stone>1000</stone>
       <metal>1000</metal>
     </Resources>
   </Cost>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/template_unit_hero.xml	(copie de travail)
@@ -1,18 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
-  <Auras>
-    <AuraA>
-      <Type>garrison</Type>
-      <Affects>Structure Mechanical</Affects>
-      <Modifications>
-        <Capturable.GarrisonRegenRate> <Add>2</Add> </Capturable.GarrisonRegenRate>
-      </Modifications>
-      <AuraName>Garrisoned Capture Aura</AuraName>
-      <AuraDescription>When garrisoned in a structure or a siege, the hero gives it a bonus of +2 capture points recovery rate.</AuraDescription>
-    </AuraA>    
-  </Auras>
   <Attack> 
     <Capture>
       <Value>15</Value> 
       <MaxRange>4</MaxRange> 
       <RepeatTime>1000</RepeatTime> 
@@ -21,10 +10,11 @@
   <Armour>
     <Hack>10.0</Hack>
     <Pierce>20.0</Pierce>
     <Crush>15.0</Crush>
   </Armour>
+  <Auras datatype="tokens">hero_garrison</Auras>
   <Cost>
     <Population>2</Population>
     <BuildTime>40</BuildTime>
     <Resources>
       <food>100</food>
Index: binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml	(copie de travail)
@@ -1,21 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support">
-  <Auras>
-    <Aura1>
-      <Type>range</Type>
-      <Radius>10</Radius>
-      <Affects>Citizen+Soldier</Affects>
-      <Modifications>
-        <Builder.Rate> <Multiply>1.1</Multiply> </Builder.Rate>
-        <ResourceGatherer.BaseSpeed> <Multiply>1.1</Multiply> </ResourceGatherer.BaseSpeed>
-      </Modifications>
-      <AuraName>Inspiration Aura</AuraName>
-      <AuraDescription>Nearby males work 10% faster.</AuraDescription>
-      <OverlayIcon>art/textures/ui/session/auras/buildgather_bonus.png</OverlayIcon>
-    </Aura1>
-  </Auras>
   <Attack>
     <Melee>
       <Hack>2.0</Hack>
       <Pierce>0</Pierce>
       <Crush>0.0</Crush>
@@ -28,10 +14,11 @@
       <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>4.0</MaxRange>
     </Slaughter>
   </Attack>
+  <Auras datatype="tokens">female_inspiration</Auras>
   <Builder>
     <Rate>1.0</Rate>
     <Entities datatype="tokens">
       structures/{civ}_house
       structures/{civ}_storehouse
Index: binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml	(copie de travail)
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support">
+  <Cost>
+    <Resources>
+      <food>250</food>
+    </Resources>
+  </Cost>
   <Heal>
     <Range>12</Range>
     <HP>5</HP>
     <Rate>2000</Rate>
     <UnhealableClasses datatype="tokens"/>
     <HealableClasses datatype="tokens">Human</HealableClasses>
   </Heal>
-  <Cost>
-    <Resources>
-      <food>250</food>
-    </Resources>
-  </Cost>
   <Health>
     <Max>85</Max>
   </Health>
   <Identity>
     <Classes datatype="tokens">Healer</Classes>
Index: binaries/data/mods/public/simulation/templates/units/athen_hero_iphicrates.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen_hero_iphicrates.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/units/athen_hero_iphicrates.xml	(copie de travail)
@@ -1,30 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_javelinist">
-  <Auras>
-	<Aura1>
-      <Type>formation</Type>
-      <Affects>Unit</Affects>
-      <Modifications>
-        <UnitMotion.WalkSpeed> <Multiply>1.15</Multiply> </UnitMotion.WalkSpeed>
-        <Armour.Pierce> <Add>1</Add> </Armour.Pierce>
-        <Armour.Hack>   <Add>1</Add> </Armour.Hack>
-        <Armour.Crush>  <Add>1</Add> </Armour.Crush>
-      </Modifications>
-      <AuraName>Formation Reforms</AuraName>
-      <AuraDescription>All units in his formation +15% speed and +1 armor.</AuraDescription>
-    </Aura1>
-	<Aura2>
-      <Type>global</Type>
-      <Affects>Javelin</Affects>
-      <Modifications>
-        <UnitMotion.WalkSpeed><Multiply>1.15</Multiply></UnitMotion.WalkSpeed>
-      </Modifications>
-      <AuraName>Peltast Reforms</AuraName>
-      <AuraDescription>All Peltasts +15% speed.</AuraDescription>
-    </Aura2>
-  </Auras>
+  <Auras datatype="tokens">athen_hero_iphicrates_1 athen_hero_iphicrates_2</Auras>
   <Identity>
     <Civ>athen</Civ>
     <Lang>greek</Lang>
 	<GenericName>Iphicrates</GenericName>
     <SpecificName>Iphikratēs</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/athen_hero_pericles.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen_hero_pericles.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/units/athen_hero_pericles.xml	(copie de travail)
@@ -1,29 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_spearman">
-  <Auras>
-    <Aura1>
-      <Type>range</Type>
-      <Radius>60</Radius>
-      <Affects>Worker</Affects>
-      <Modifications>
-        <Builder.Rate> <Multiply>1.15</Multiply> </Builder.Rate>
-      </Modifications>
-      <AuraName>Builder Aura</AuraName>
-      <AuraDescription>Buildings construct 15% faster within his vision.</AuraDescription>
-      <OverlayIcon>art/textures/ui/session/auras/build_bonus.png</OverlayIcon>
-    </Aura1>
-    <Aura2>
-      <Type>global</Type>
-      <Affects>Temple</Affects>
-      <Modifications>
-        <Cost.Resources.stone> <Add>-50</Add> </Cost.Resources.stone>
-      </Modifications>
-      <AuraName>Acropolis Aura</AuraName>
-      <AuraDescription>Temples are 50 stone cheaper during his lifetime.</AuraDescription>
-    </Aura2>
-  </Auras>
+  <Auras datatype="tokens">athen_hero_pericles_1 athen_hero_pericles_2</Auras>
   <Identity>
     <Civ>athen</Civ>
     <Lang>greek</Lang>
     <GenericName>Pericles</GenericName>
     <SpecificName>Periklēs</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/athen_hero_themistocles.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen_hero_themistocles.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/units/athen_hero_themistocles.xml	(copie de travail)
@@ -1,28 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_swordsman">
-  <Auras>
-    <Aura1>
-      <Type>garrison</Type>
-      <Affects>Ship</Affects>
-      <AffectedPlayers>Player MutualAlly</AffectedPlayers>
-      <Modifications>
-        <UnitMotion.WalkSpeed> <Multiply>1.5</Multiply> </UnitMotion.WalkSpeed>
-      </Modifications>
-      <AuraName>Naval Commander Aura</AuraName>
-      <AuraDescription>When garrisoned in a ship, his ship is +50% faster.</AuraDescription>
-    </Aura1>
-    <Aura2>
-      <Type>global</Type>
-      <Affects>Ship</Affects>
-      <Modifications>
-        <Cost.BuildTime> <Multiply>0.8</Multiply> </Cost.BuildTime>
-      </Modifications>
-      <AuraName>Naval Architect Aura</AuraName>
-      <AuraDescription>-20% build time for ships during his lifespan.</AuraDescription>
-    </Aura2>
-  </Auras>
+  <Auras datatype="tokens">athen_hero_themistocles_1 athen_hero_themistocles_2</Auras>
   <Identity>
     <Civ>athen</Civ>
     <Lang>greek</Lang>
 	<GenericName>Themistocles</GenericName>
     <SpecificName>Themistoklês</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca.xml	(copie de travail)
@@ -1,23 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_javelinist">
-  <Auras>
-    <Aura1>
-      <Type>range</Type>
-      <Radius>60</Radius>
-      <Affects>Champion</Affects>
-      <Modifications>
-        <UnitMotion.WalkSpeed> <Multiply>1.25</Multiply> </UnitMotion.WalkSpeed>
-        <Attack.Ranged.Pierce> <Add>5</Add> </Attack.Ranged.Pierce>
-        <Attack.Melee.Hack> <Add>5</Add> </Attack.Melee.Hack>
-        <Attack.Capture.Value> <Add>2</Add> </Attack.Capture.Value>
-      </Modifications>
-      <AuraName>Champion Army</AuraName>
-      <AuraDescription>+5 Attack, +2 Capture and +25% Speed for Champion Units.</AuraDescription>
-      <OverlayIcon>art/textures/ui/session/auras/attack_bonus.png</OverlayIcon>
-    </Aura1>
-  </Auras>
+  <Auras datatype="tokens">brit_hero_boudicca</Auras>
   <Footprint replace="">
     <Square width="4.5" depth="9.0"/>
     <Height>5.0</Height>
   </Footprint>
   <Identity>
Index: binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca_sword.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca_sword.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca_sword.xml	(copie de travail)
@@ -1,21 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_swordsman">
-  <Auras>
-    <Aura1>
-      <Type>global</Type>
-      <Affects>Champion</Affects>
-      <Modifications>
-        <UnitMotion.WalkSpeed> <Multiply>1.25</Multiply> </UnitMotion.WalkSpeed>
-        <Attack.Ranged.Pierce> <Add>5</Add> </Attack.Ranged.Pierce>
-        <Attack.Melee.Hack> <Add>5</Add> </Attack.Melee.Hack>
-        <Attack.Capture.Value> <Add>2</Add> </Attack.Capture.Value>
-      </Modifications>
-      <AuraName>Champion Army</AuraName>
-      <AuraDescription>+5 Attack, +2 Capture and +25% Speed for Champion Units.</AuraDescription>
-    </Aura1>
-  </Auras>
+  <Auras datatype="tokens">brit_hero_boudicca</Auras>
   <Identity>
     <Civ>brit</Civ>
     <Gender>female</Gender>
     <SpecificName>Boudicca</SpecificName>
     <GenericName>Heroine</GenericName>
Index: binaries/data/mods/public/simulation/templates/units/brit_hero_caratacos.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/brit_hero_caratacos.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/units/brit_hero_caratacos.xml	(copie de travail)
@@ -1,18 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_swordsman">
-  <Auras>
-	<Aura1>
-      <Type>global</Type>
-      <Affects>Unit</Affects>
-      <Modifications>
-        <UnitMotion.WalkSpeed> <Multiply>1.15</Multiply> </UnitMotion.WalkSpeed>
-      </Modifications>
-      <AuraName>Hero Aura</AuraName>
-      <AuraDescription>All Units +15% speed.</AuraDescription>
-    </Aura1>
-  </Auras>
+  <Auras datatype="tokens">brit_hero_caratacos</Auras>
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Caratacos</SpecificName>
     <History>Caratacos's name is better known in its Romanized form, Caratacus. Under this name he is remembered as a fierce defender of Britain against the Romans after their invasion in 43 AD. Son of King Cunobelin of the Catuvellauni tribe, Caratacos fought for nine years against the Romans with little success, eventually fleeing to the tribes in Wales, where he was defeated decisively. Finally he entered Northern Britain, where was handed over to the Romans. Taken to Rome, Caratacos was allowed to live by the Emperor Claudius and died in Italy.</History>
     <Icon>units/celt_hero_caratacos.png</Icon>
Index: binaries/data/mods/public/simulation/templates/units/brit_hero_cunobelin.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/brit_hero_cunobelin.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/units/brit_hero_cunobelin.xml	(copie de travail)
@@ -1,20 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_swordsman">
-  <Auras>
-    <Aura1>
-      <Type>range</Type>
-      <Radius>60</Radius>
-      <Affects>Unit</Affects>
-      <Modifications>
-        <Health.RegenRate> <Add>1</Add> </Health.RegenRate>
-      </Modifications>
-      <AuraName>Hero Aura</AuraName>
-      <AuraDescription>+1 HP per second healing rate for all units.</AuraDescription>
-      <OverlayIcon>art/textures/ui/session/auras/heal.png</OverlayIcon>
-    </Aura1>
-  </Auras>
+  <Auras datatype="tokens">brit_hero_cunobelin</Auras>
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Cunobelin</SpecificName>
     <History>Cunobelin was a powerful ruler centered in the territory around modern day London. Ruling the Catuvellauni from Camulodunum, he was a warrior king who conquered a neighboring tribe and was referred to by the Romans as the King of the Britons. Eventually Cunobelin retired to become the arch-druid of Siluria, but was taken to Rome with his son upon Caratacos's capture. According to legend, the Apostle Paul baptized Cunobelin into Christianity before he died in Italy.</History>
     <Icon>units/celt_hero_cunobelin.png</Icon>
Index: binaries/data/mods/public/simulation/templates/units/cart_hero_hamilcar.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart_hero_hamilcar.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/units/cart_hero_hamilcar.xml	(copie de travail)
@@ -1,18 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_swordsman">
-  <Auras>
-	<Aura1>
-      <Type>global</Type>
-      <Affects>Unit</Affects>
-      <Modifications>
-        <UnitMotion.WalkSpeed> <Multiply>1.15</Multiply> </UnitMotion.WalkSpeed>
-      </Modifications>
-      <AuraName>Lightning Aura</AuraName>
-      <AuraDescription>All Units +15% speed.</AuraDescription>
-    </Aura1>
-  </Auras>
+  <Auras datatype="tokens">cart_hero_hamilcar</Auras>
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Ḥimelqart Baraq</SpecificName>
     <GenericName>Hamilcar Barca</GenericName>
     <History>Father of Hannibal and virtual military dictator of Carthage. Hamilcar Barca was a soldier and politician who excelled along his entire career. Lived 275-228 BC. While overshadowed by his sons, Hamilcar was great general in his own right, earning the nickname Baraq or Barca for the "lightning" speed of his advance.</History>
Index: binaries/data/mods/public/simulation/templates/units/cart_hero_hannibal.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart_hero_hannibal.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/units/cart_hero_hannibal.xml	(copie de travail)
@@ -1,23 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_elephant_melee">
-  <Auras>
-    <Aura1>
-      <Type>range</Type>
-      <Radius>60</Radius>
-      <Affects>Unit</Affects>
-      <AffectedPlayers>Player Ally</AffectedPlayers>
-      <Modifications>
-        <Attack.Ranged.Pierce> <Add>2</Add> </Attack.Ranged.Pierce>
-        <Attack.Melee.Hack> <Add>2</Add> </Attack.Melee.Hack>
-        <Attack.Capture.Value> <Add>1</Add> </Attack.Capture.Value>
-      </Modifications>
-      <AuraName>Tactician Aura</AuraName>
-      <AuraDescription>All allied units +2 Attack and +1 Capture within his vision range.</AuraDescription>
-      <OverlayIcon>art/textures/ui/session/auras/attack_bonus.png</OverlayIcon>
-    </Aura1>
-  </Auras>
+  <Auras datatype="tokens">cart_hero_hannibal</Auras>
   <Identity>
     <Civ>cart</Civ>
     <GenericName>Hannibal Barca</GenericName>
     <SpecificName>Ḥannibaʿal Baraq</SpecificName>
     <History>Carthage's most famous son. Hannibal Barca was the eldest son of Hamilcar Barca and proved an even greater commander than his father. Lived 247-182 BC. While he ultimately lost the Second Punic War, his victories at Trebia, Lake Trasimene, and Cannae, and the feat of crossing the Alps have secured his position as among the best tacticians and strategists in history.</History>
Index: binaries/data/mods/public/simulation/templates/units/cart_hero_maharbal.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart_hero_maharbal.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/units/cart_hero_maharbal.xml	(copie de travail)
@@ -1,19 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_spearman">
-  <Auras>
-    <Aura1>
-      <Type>range</Type>
-      <Radius>60</Radius>
-      <Affects>Cavalry</Affects>
-      <Modifications>
-        <Attack.Charge.Hack> <Add>5</Add> </Attack.Charge.Hack>
-      </Modifications>
-      <AuraName>Commander Aura</AuraName>
-      <AuraDescription> +5 Cavalry charge attack within vision range of him (currently useless).</AuraDescription>
-    </Aura1>
-  </Auras>
+  <Auras datatype="tokens">cart_hero_maharbal</Auras>
   <Identity>
     <Civ>cart</Civ>
 	<GenericName>Maharbal</GenericName>
     <SpecificName>Maharbaʿal</SpecificName>
     <History>Maharbal was Hannibal Barca's "brash young cavalry commander" during the 2nd Punic War. He is credited with turning the wing of the legions at Cannae resulting in defeat in which 30,000 of 50,000 Romans were lost, as well as significant contributions to the winning of many other battles during the 2nd Punic War. He is known for having said, after the battle of Cannae, "Hannibal, you know how to win the victory; just not what to do with it."</History>
Index: binaries/data/mods/public/simulation/templates/units/gaul_hero_brennus.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/gaul_hero_brennus.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/units/gaul_hero_brennus.xml	(copie de travail)
@@ -1,18 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_swordsman">
-  <Auras>
-    <Aura1>
-      <Type>global</Type>
-      <Affects>Unit</Affects>
-      <Modifications>
-        <Looter.Resource.metal> <Add>10</Add> </Looter.Resource.metal>
-      </Modifications>
-      <AuraName>Hero Aura</AuraName>
-      <AuraDescription>+10 Metal loot for every enemy unit killed.</AuraDescription>
-    </Aura1>
-  </Auras>
+  <Auras datatype="tokens">gaul_hero_brennus</Auras>
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Brennus</SpecificName>
     <History>Brennus is the name which the Roman historians give to the famous leader of the Gauls who took Rome in the time of Camillus. According to Geoffrey of Monmouth, the cleric who wrote “History of the Kings of Britain”, Brennus and his brother Belinus invaded Gaul and sacked Rome in 390 B.C., 'proving' that Britons had conquered Rome, the greatest civilization in the world, long before Rome conquered the Britons. We know from many ancient sources which predate Geoffrey that Rome was indeed sacked, but in 387 not 390, and that the raid was led by a man named Brennos (which was latinized to Brennus), but he and his invading horde were Gallic Senones, not British. In this episode several features of Geoffrey's editing method can be seen: he modified the historical Brennus/Brennos, created the brother Belinus, borrowed the Gallic invasion, but omitted the parts where the Celts seemed weak or foolish. His technique is both additive and subtractive. Like the tale of Trojan origin, the story of the sack of Rome is not pure fabrication; it is a creative rearrangement of the available facts, with details added as necessary. By virtue of their historical association, Beli and Bran are often muddled with the earlier brothers Belinus and Brennus (the sons of Dunvallo Molmutius) who contended for power in northern Britain in around 390 B.C., and were regarded as gods in old Celtic tradition.</History>
     <Icon>units/celt_hero_brennus.png</Icon>
Index: binaries/data/mods/public/simulation/templates/units/gaul_hero_britomartus.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/gaul_hero_britomartus.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/units/gaul_hero_britomartus.xml	(copie de travail)
@@ -1,18 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_spearman">
-  <Auras>
-    <Aura1>
-      <Type>global</Type>
-      <Affects>Worker</Affects>
-      <Modifications>
-        <ResourceGatherer.BaseSpeed> <Multiply>1.15</Multiply> </ResourceGatherer.BaseSpeed>
-      </Modifications>
-      <AuraName>Hero Aura</AuraName>
-      <AuraDescription>Gathering rates increased with +15% during his lifetime.</AuraDescription>
-    </Aura1>
-  </Auras>
+  <Auras datatype="tokens">gaul_hero_britomartus</Auras>
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Britomartus</SpecificName>
     <History> The story of how Marcus Claudius Marcellus killed a Gallic leader at Clastidium (222 BC) is typical of such encounters. Advancing with a smallish army, Marcellus met a combined force of Insubrian Gauls and Gaesatae at Clastidium. The Gallic army advanced with the usual rush and terrifying cries, and their king, Britomartus, picking out Marcellus by means of his badges of rank, made for him, shouting a challenge and brandishing his spear. Britomartus was an outstanding figure not only for his size but also for his adornments; for he was resplendent in bright colors and his armor shone with gold and silver. This armor, thought Marcellus, would be a fitting offering to the gods. He charged the Gaul, pierced his bright breastplate and cast him to the ground. It was an easy task to kill Britomartus and strip him of his armor.</History>
     <Icon>units/celt_hero_britomartus.png</Icon>
Index: binaries/data/mods/public/simulation/templates/units/gaul_hero_vercingetorix.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/gaul_hero_vercingetorix.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/units/gaul_hero_vercingetorix.xml	(copie de travail)
@@ -1,22 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_swordsman">
-  <Auras>
-    <Aura1>
-      <Type>range</Type>
-      <Radius>60</Radius>
-      <Affects>Unit</Affects>
-      <Modifications>
-        <Attack.Ranged.Pierce> <Add>2</Add> </Attack.Ranged.Pierce>
-        <Attack.Melee.Hack> <Add>2</Add> </Attack.Melee.Hack>
-        <Attack.Capture.Value> <Add>1</Add> </Attack.Capture.Value>
-      </Modifications>
-      <AuraName>Hero Aura</AuraName>
-      <AuraDescription>+2 Attack and +1 Capture for all units within his aura.</AuraDescription>
-      <OverlayIcon>art/textures/ui/session/auras/attack_bonus.png</OverlayIcon>
-    </Aura1>
-  </Auras>
+  <Auras datatype="tokens">gaul_hero_vercingetorix</Auras>
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Vercingetorix</SpecificName>
     <History>The most famous of all Celts, Vercingetorix lead the rebelling Gallic tribes against the might of Rome and Julius Caesar's veteran army in 54 BC. Although successful in defeating several Roman forces, Vercingetorix was unable to defeat Caesar, who eventually surrounded the Celtic leaders in the town of Alesia along with 100,000 men. When a relief army arrived to lift the epic siege, the Romans were out numbered 7 to 1 but still defeated the Celts. Vercingetorix surrendered and was executed.</History>
     <Icon>units/celt_hero_vercingetorix.png</Icon>
Index: binaries/data/mods/public/simulation/templates/units/iber_hero_caros.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/iber_hero_caros.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/units/iber_hero_caros.xml	(copie de travail)
@@ -2,11 +2,11 @@
 <Entity parent="template_unit_hero_infantry_swordsman">
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Caros</SpecificName>
     <Icon>units/iber_hero_caros.png</Icon>
-	<Tooltip>Hero Aura: "Tactica Guerilla." TBD.</Tooltip>
+    <Tooltip>Hero Aura: "Tactica Guerilla." TBD.</Tooltip>
     <History>Caros was a chief of the Belli tribe located just east of the Celtiberi (Numantines at the center). Leading the confederated tribes of the meseta central (central upland plain) he concealed 20,000 foot and 5,000 mounted troops along a densely wooded track. Q. Fulvius Nobilior neglected proper reconnaissance and lead his army into the trap strung out in a long column. Some 10,000 of 15,000 Roman legionaries fell in the massive ambush that was sprung upon them. The date was 23 August of 153 BCE, the day when Rome celebrated the feast of Vulcan. By later Senatorial Decree it was ever thereafter known as dies ater, a 'sinister day', and Rome never again fought a battle on the 23rd of August. Caros was wounded in a small cavalry action the same evening and died soon thereafter, but he had carried off one of the most humiliating defeats that Rome ever suffered.</History>
   </Identity>
   <VisualActor>
     <Actor>units/iberians/hero_caros.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/units/iber_hero_indibil.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/iber_hero_indibil.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/units/iber_hero_indibil.xml	(copie de travail)
@@ -2,11 +2,11 @@
 <Entity parent="template_unit_hero_cavalry_spearman">
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Indibil</SpecificName>
     <Icon>units/iber_hero_indibil.png</Icon>
-	<Tooltip>Hero Aura: "Tactica Guerilla." TBD.</Tooltip>
+    <Tooltip>Hero Aura: "Tactica Guerilla." TBD.</Tooltip>
     <History>Indibil was king of the Ilegetes, a large federation ranged principally along the Ebro River in the northwest of the Iberian Peninsula. During the Barcid expansion, from 212 BCE he had initially been talked into allying himself with the Carthaginians who hade taken control of a lot of territory to the south and west, however after loss and his capture in a major battle he was convinced, some say tricked, to switch to the Roman side by Scipio Africanus. But that alliance didn't last long, as Roman promises were hollow and the Romans acted more like conquerors than allies. So, while the Romans and their allies had ended Carthaginian presence in 'Hispania' in 206 BCE, Indibil and another tribal prince by the name of Mandonio, who may have been his brother, rose up in rebellion against the Romans. They were defeated in battle, but rose up in a 2nd even larger rebellion that had unified all the Ilergetes again in 205 BCE. Outnumbered and outarmed they were again defeated, Indibil losing his life in the final battle and Mandonio being captured then later put to death. From that date onward the Ilergetes remained a pacified tribe under Roman rule.</History>
   </Identity>
   <VisualActor>
     <Actor>units/iberians/hero_indibil_horse.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/units/iber_hero_viriato.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/iber_hero_viriato.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/units/iber_hero_viriato.xml	(copie de travail)
@@ -2,11 +2,11 @@
 <Entity parent="template_unit_hero_infantry_swordsman">
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Viriato</SpecificName>
     <Icon>units/iber_hero_viriato.png</Icon>
-	<Tooltip>Hero Aura: "Tactica Guerilla." TBD.</Tooltip>
+    <Tooltip>Hero Aura: "Tactica Guerilla." TBD.</Tooltip>
     <History>Viriato, like Vercingentorix amongst the Gauls, was the most famous of the Iberian tribal war leaders, having conducted at least 7 campaigns against the Romans in the southern half of the peninsula during the 'Lusitani Wars' from 147 to 139 BCE. He surfaced as a survivor of the treacherous massacre of 9,000 men and the selling into slavery of 21,000 elderly, women, and children of the Lusitani. They had signed a treaty of peace with the Romans, conducted by Servius Sulpicius Galba, governor of Hispania Ulterior, as the 'final solution' to the Lusitani problem. He emerged from humble beginnings in 151 BCE to become war chief of the Lusitani. He was intelligent and a superior tactician, never really defeated in any encounter (though suffered losses in some requiring retreat). He succumbed instead to another treachery arranged by a later Roman commander, Q. Servilius Caepio, to have him assassinated by three comrades that were close to him.</History>
   </Identity>
   <VisualActor>
     <Actor>units/iberians/hero_viriato.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/units/mace_hero_alexander.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_hero_alexander.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/units/mace_hero_alexander.xml	(copie de travail)
@@ -1,18 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_swordsman">
-  <Auras>
-    <Aura1>
-      <Type>global</Type>
-      <Affects>Structure</Affects>
-      <Modifications>
-        <TerritoryInfluence.Radius> <Multiply>1.10</Multiply> </TerritoryInfluence.Radius>
-      </Modifications>
-      <AuraName>Imperialism Aura</AuraName>
-      <AuraDescription>+10% territory effect for all buildings while he lives.</AuraDescription>
-    </Aura1>
-  </Auras>
+  <Auras datatype="tokens">mace_hero_alexander</Auras>
   <Attack>
     <Melee>
 	  <Bonuses>
 		<Herocide>
 		  <Classes>Hero</Classes>
Index: binaries/data/mods/public/simulation/templates/units/mace_hero_demetrius.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_hero_demetrius.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/units/mace_hero_demetrius.xml	(copie de travail)
@@ -1,21 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_swordsman">
-  <Auras>
-    <Aura1>
-      <Type>global</Type>
-      <Affects>Siege</Affects>
-      <Modifications>
-        <Attack.Ranged.Crush> <Add>10</Add> </Attack.Ranged.Crush>
-        <Attack.Melee.Crush> <Add>10</Add> </Attack.Melee.Crush>
-        <Attack.Ranged.MaxRange> <Multiply>1.15</Multiply> </Attack.Ranged.MaxRange>
-      </Modifications>
-      <AuraName>Hero Aura</AuraName>
-      <AuraDescription>+15% Range and +10 Crush Attack for Siege Engines.</AuraDescription>
-      <OverlayIcon>art/textures/ui/session/auras/attack_bonus.png</OverlayIcon>
-    </Aura1>
-  </Auras>
+  <Auras datatype="tokens">mace_hero_demetrius</Auras>
   <Identity>
     <Civ>mace</Civ>
     <Lang>greek</Lang>
     <GenericName>Demetrius The Besieger</GenericName>
     <SpecificName>Dēmḗtrios Poliorkḗtēs</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/mace_hero_philip.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_hero_philip.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/units/mace_hero_philip.xml	(copie de travail)
@@ -1,22 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_spearman">
-  <Auras>
-    <Aura1>
-      <Type>range</Type>
-      <Radius>60</Radius>
-      <Affects>Champion</Affects>
-      <Modifications>
-        <Attack.Ranged.Pierce> <Add>5</Add> </Attack.Ranged.Pierce>
-        <Attack.Melee.Hack> <Add>5</Add> </Attack.Melee.Hack>
-	<Attack.Capture.Value> <Add>2</Add> </Attack.Capture.Value>
-      </Modifications>
-      <AuraName>Hero Aura</AuraName>
-      <AuraDescription>+5 Attack and +2 Capture for Champion Units.</AuraDescription>
-      <OverlayIcon>art/textures/ui/session/auras/attack_bonus.png</OverlayIcon>
-    </Aura1>
-  </Auras>
+  <Auras datatype="tokens">mace_hero_philip</Auras>
   <Identity>
     <Civ>mace</Civ>
     <Lang>greek</Lang>
     <GenericName>Philip II of Macedon</GenericName>
     <SpecificName>Phílippos B' ho Makedṓn</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/maur_hero_ashoka.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur_hero_ashoka.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/units/maur_hero_ashoka.xml	(copie de travail)
@@ -9,12 +9,11 @@
     <GenericName>Ashoka the Great</GenericName>
     <SpecificName>Aśoka Devānāmpriya</SpecificName>
     <Classes datatype="tokens">Ashoka</Classes>
     <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <Icon>units/maur_hero_ashoka.png</Icon>
-    <Tooltip>Hero Aura: TBD.
-Hero Special: "Edicts of Ashoka" - Edict Pillars of Ashoka can be built during Ashoka's lifetime.</Tooltip>
+    <Tooltip>Hero Special: "Edicts of Ashoka" - Edict Pillars of Ashoka can be built during Ashoka's lifetime.</Tooltip>
     <History>TBD.</History>
   </Identity>
   <VisualActor>
     <Actor>units/mauryans/hero_chariot.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/units/maur_hero_maurya.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur_hero_maurya.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/units/maur_hero_maurya.xml	(copie de travail)
@@ -2,11 +2,10 @@
 <Entity parent="template_unit_hero_elephant_melee">
   <Identity>
     <Civ>maur</Civ>
     <GenericName>Chandragupta Maurya</GenericName>
     <SpecificName>Chandragupta Maurya</SpecificName>
-    <Tooltip>Hero Aura: TBD.</Tooltip>
     <History>TBD.</History>
     <Icon>units/maur_hero_chandragupta.png</Icon>
   </Identity>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
Index: binaries/data/mods/public/simulation/templates/units/pers_hero_cyrus.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_hero_cyrus.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/units/pers_hero_cyrus.xml	(copie de travail)
@@ -1,22 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_spearman">
-  <Auras>
-    <Aura1>
-      <Type>range</Type>
-      <Radius>60</Radius>
-      <Affects>Cavalry</Affects>
-      <Modifications>
-        <Attack.Ranged.Pierce> <Add>2</Add> </Attack.Ranged.Pierce>
-        <Attack.Melee.Hack> <Add>2</Add> </Attack.Melee.Hack>
-        <Attack.Capture.Value> <Add>1</Add> </Attack.Capture.Value>
-      </Modifications>
-      <AuraName>Lead from the Front Aura</AuraName>
-      <AuraDescription>+2 Attack and +1 Capture for nearby cavalry units.</AuraDescription>
-      <OverlayIcon>art/textures/ui/session/auras/attack_bonus.png</OverlayIcon>
-    </Aura1>
-  </Auras>
+  <Auras datatype="tokens">pers_hero_cyrus</Auras>
   <Identity>
     <Civ>pers</Civ>
     <GenericName>Cyrus II The Great</GenericName>
     <SpecificName>Kurush II</SpecificName>
     <Icon>units/pers_hero_cyrus.png</Icon>
Index: binaries/data/mods/public/simulation/templates/units/pers_hero_darius.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_hero_darius.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/units/pers_hero_darius.xml	(copie de travail)
@@ -1,19 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_archer">
-  <Auras>
-    <Aura1>
-      <Type>global</Type>
-      <Affects>Unit</Affects>
-      <AffectedPlayers>Player</AffectedPlayers>
-      <Modifications>
-        <UnitMotion.WalkSpeed> <Multiply>1.15</Multiply> </UnitMotion.WalkSpeed>
-      </Modifications>
-      <AuraName>Leadership Aura</AuraName>
-      <AuraDescription>+15% Movement Speed of all units.</AuraDescription>
-    </Aura1>
-  </Auras>
+  <Auras datatype="tokens">pers_hero_darius</Auras>
   <Footprint replace="">
     <Square width="6.0" depth="12.0"/>
     <Height>5.0</Height>
   </Footprint>
   <Identity>
Index: binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes.xml	(copie de travail)
@@ -1,21 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_archer">
-  <Auras>
-    <Aura1>
-      <Type>range</Type>
-      <Radius>60</Radius>
-      <Affects>Worker</Affects>
-      <Modifications>
-        <Builder.Rate> <Multiply>1.15</Multiply> </Builder.Rate>
-        <ResourceGatherer.BaseSpeed> <Multiply>1.15</Multiply> </ResourceGatherer.BaseSpeed>
-      </Modifications>
-      <AuraName>Administrator Aura</AuraName>
-      <AuraDescription> +15% Gather Rate and Build Rate of nearby units.</AuraDescription>
-      <OverlayIcon>art/textures/ui/session/auras/buildgather_bonus.png</OverlayIcon>
-    </Aura1>
-  </Auras>
+  <Auras datatype="tokens">pers_hero_xerxes</Auras>
   <Identity>
     <Civ>pers</Civ>
 	<GenericName>Xerxes I</GenericName>
     <SpecificName>Xsayarsa I</SpecificName>
     <Icon>units/pers_hero_xerxes.png</Icon>
Index: binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes_chariot.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes_chariot.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes_chariot.xml	(copie de travail)
@@ -1,21 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_archer">
-  <Auras>
-    <Aura1>
-      <Type>range</Type>
-      <Radius>60</Radius>
-      <Affects>Worker</Affects>
-      <Modifications>
-        <Builder.Rate> <Multiply>1.15</Multiply> </Builder.Rate>
-        <ResourceGatherer.BaseSpeed> <Multiply>1.15</Multiply> </ResourceGatherer.BaseSpeed>
-      </Modifications>
-      <AuraName>Administrator Aura</AuraName>
-      <AuraDescription> +15% Gather Rate and Build Rate of nearby units.</AuraDescription>
-      <OverlayIcon>art/textures/ui/session/auras/buildgather_bonus.png</OverlayIcon>
-    </Aura1>
-  </Auras>
+  <Auras datatype="tokens">pers_hero_xerxes</Auras>
   <Footprint replace="">
     <Square width="6.0" depth="12.0"/>
     <Height>5.0</Height>
   </Footprint>
   <Identity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_hero_cleopatra.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_hero_cleopatra.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/units/ptol_hero_cleopatra.xml	(copie de travail)
@@ -1,21 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_archer">
-  <Auras>
-    <unit_attack_speed_20>
-      <Type>range</Type>
-      <Radius>60</Radius>
-      <Affects>Unit</Affects>
-      <Modifications>
-        <Attack.Melee.RepeatTime> <Multiply>0.8</Multiply> </Attack.Melee.RepeatTime>
-        <Attack.Ranged.RepeatTime> <Multiply>0.8</Multiply> </Attack.Ranged.RepeatTime>
-      </Modifications>
-      <AuraName>Patriot Aura</AuraName>
-      <AuraDescription>Egyptian units fight 25% faster in her vision range.</AuraDescription>
-      <OverlayIcon>art/textures/ui/session/auras/attack_bonus.png</OverlayIcon>
-    </unit_attack_speed_20>
-  </Auras>
+  <Auras datatype="tokens">ptol_hero_cleopatra</Auras>
   <Identity>
     <Civ>ptol</Civ>
     <Gender>female</Gender>
     <GenericName>Cleopatra VII</GenericName>
     <SpecificName>Kleopatra H' Philopator</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/ptol_hero_ptolemy_I.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_hero_ptolemy_I.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/units/ptol_hero_ptolemy_I.xml	(copie de travail)
@@ -1,32 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_elephant_melee">
-  <Auras>
-    <Aura1>
-      <Type>range</Type>
-      <Radius>77</Radius>
-      <Affects>Worker</Affects>
-      <Modifications>
-        <Builder.Rate> <Multiply>1.10</Multiply> </Builder.Rate>
-      </Modifications>
-      <AuraName>Construction Aura</AuraName>
-      <AuraDescription>Buildings construct 10% faster within his vision.</AuraDescription>
-      <OverlayIcon>art/textures/ui/session/auras/build_bonus.png</OverlayIcon>
-    </Aura1>
-    <Aura2>
-      <Type>global</Type>
-      <Affects>Mercenary</Affects>
-      <Modifications>
-		<Cost.Resources.food> <Multiply>0.5</Multiply> </Cost.Resources.food>
-		<Cost.Resources.wood> <Multiply>0.5</Multiply> </Cost.Resources.wood>
-        <Cost.Resources.stone> <Multiply>0.5</Multiply> </Cost.Resources.stone>
-        <Cost.Resources.metal> <Multiply>0.5</Multiply> </Cost.Resources.metal>
-      </Modifications>
-      <AuraName>Mercenary Patron Aura</AuraName>
-      <AuraDescription>Mercenaries cost -50% resources during his lifetime.</AuraDescription>
-    </Aura2>
-  </Auras>
+  <Auras datatype="tokens">ptol_hero_ptolemy_I_1 ptol_hero_ptolemy_I_2</Auras>
   <Identity>
     <Civ>ptol</Civ>
     <GenericName>Ptolemy I "Savior"</GenericName>
     <SpecificName>Ptolemaios A' Soter</SpecificName>
     <History>Born in 367 BCE, Ptolemy I grew to become one of Alexander the Great's closest friends and generals. He was instrumental in Alexander's later campaigns in Bactria (modern Afghanistan) and India. After Alexander's death, Ptolemy took control of the Satrap of Egypt, and after the Battle of Ipsus became sole ruler of Egypt as "Pharaoh," founding the Ptolemy Dynasty that would rule Egypt for nearly 3 centuries. Ptolemaic Egypt reached the height of its territorial boundaries under his reign as he added Syria, Judea, Cyprus, and parts of Asia Minor to his realm. His reputation for bonhomie and liberality attached the floating soldier-class of Macedonians and Hellenes to his service, and was not insignificant; nor did he wholly neglect conciliation of the native Egyptians. He was a ready patron of letters, founding the Great Library of Alexandria. He himself wrote a history of Alexander's campaigns that has not survived. This used to be considered an objective work, distinguished by its straightforward honesty and sobriety. However, Ptolemy may have exaggerated his own role, and had propagandist aims in writing his History. Although now lost, it was a principal source for the surviving account by Arrian of Nicomedia. Ptolemy died in 283 BCE, the last of the Diodachoi, leaving a well-ordered and stable kingdom to his progeny.</History>
Index: binaries/data/mods/public/simulation/templates/units/ptol_hero_ptolemy_IV.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_hero_ptolemy_IV.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/units/ptol_hero_ptolemy_IV.xml	(copie de travail)
@@ -1,18 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_swordsman">
-  <Auras>
-	<Aura1>
-      <Type>global</Type>
-      <Affects>Pike</Affects>
-      <Modifications>
-        <Health.Max> <Multiply>1.40</Multiply> </Health.Max>
-      </Modifications>
-      <AuraName>Raphia Aura</AuraName>
-      <AuraDescription>Egyptian Pikemen have 40% greater health during his lifetime.</AuraDescription>
-	</Aura1>
-  </Auras>
+  <Auras datatype="tokens">ptol_hero_ptolemy_IV</Auras>
   <Identity>
     <Civ>ptol</Civ>
     <GenericName>Ptolemy IV "Father Loving"</GenericName>
     <SpecificName>Ptolemaios D' Philopator</SpecificName>
     <Classes datatype="tokens">PtolemyIV</Classes>
Index: binaries/data/mods/public/simulation/templates/units/rome_hero_marcellus.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome_hero_marcellus.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/units/rome_hero_marcellus.xml	(copie de travail)
@@ -1,22 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_swordsman">
-  <Auras>
-    <Aura1>
-      <Type>range</Type>
-      <Radius>60</Radius>
-      <Affects>Unit</Affects>
-      <Modifications>
-        <Attack.Ranged.Pierce> <Add>5</Add> </Attack.Ranged.Pierce>
-        <Attack.Melee.Hack> <Add>5</Add> </Attack.Melee.Hack>
-        <Attack.Capture.Value> <Add>2</Add> </Attack.Capture.Value>
-      </Modifications>
-      <AuraName>Sword of Rome Aura</AuraName>
-      <AuraDescription>+5 Attack and +2 Capture for Roman units within his vision range.</AuraDescription>
-      <OverlayIcon>art/textures/ui/session/auras/attack_bonus.png</OverlayIcon>
-    </Aura1>
-  </Auras>
+  <Auras datatype="tokens">rome_hero_marcellus</Auras>
   <Identity>
     <Civ>rome</Civ>
     <Lang>latin</Lang>
     <SpecificName>Marcus Claudius Marcellus</SpecificName>
     <Icon>units/rome_hero_marcellus.png</Icon>
Index: binaries/data/mods/public/simulation/templates/units/rome_hero_maximus.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome_hero_maximus.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/units/rome_hero_maximus.xml	(copie de travail)
@@ -1,20 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_swordsman">
-  <Auras>
-    <Aura1>
-      <Type>global</Type>
-      <Affects>Unit Structure</Affects>
-      <Modifications>
-        <Armour.Pierce> <Add>1</Add> </Armour.Pierce>
-        <Armour.Hack> <Add>1</Add> </Armour.Hack>
-        <Armour.Crush> <Add>1</Add> </Armour.Crush>
-      </Modifications>
-      <AuraName>Shield of Rome Aura</AuraName>
-      <AuraDescription>+1 armour for all units and structures.</AuraDescription>
-    </Aura1>
-  </Auras>
+  <Auras datatype="tokens">rome_hero_maximus</Auras>
   <Identity>
     <Civ>rome</Civ>
     <Lang>latin</Lang>
     <SpecificName>Quintus Fabius Maximus</SpecificName>
     <Icon>units/rome_hero_maximus.png</Icon>
Index: binaries/data/mods/public/simulation/templates/units/sele_hero_antiochus_great.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/sele_hero_antiochus_great.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/units/sele_hero_antiochus_great.xml	(copie de travail)
@@ -1,20 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_spearman">
-  <Auras>
-    <Aura1>
-      <Type>global</Type>
-      <Affects>Cavalry</Affects>
-      <Modifications>
-        <Armour.Pierce> <Add>2</Add> </Armour.Pierce>
-        <Armour.Hack> <Add>2</Add> </Armour.Hack>
-        <Armour.Crush> <Add>2</Add> </Armour.Crush>
-      </Modifications>
-      <AuraName>Ilarchès Aura</AuraName>
-      <AuraDescription>All cavalry gains +2 levels of all armour types.</AuraDescription>
-    </Aura1>
-  </Auras>
+  <Auras datatype="tokens">sele_hero_antiochus_great</Auras>
   <Identity>
     <Civ>sele</Civ>
     <Lang>greek</Lang>
     <GenericName>Antiochus III "The Great"</GenericName>
     <SpecificName>Antiokhos G' Mégās</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/sele_hero_antiochus_righteous.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/sele_hero_antiochus_righteous.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/units/sele_hero_antiochus_righteous.xml	(copie de travail)
@@ -1,21 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_swordsman">
-  <Auras>
-    <Aura1>
-      <Type>range</Type>
-      <Radius>70</Radius>
-      <AffectedPlayers>Enemy</AffectedPlayers>
-      <Affects>Structure Mechanical</Affects>
-      <Modifications>
-        <Health.Max> <Multiply>0.8</Multiply> </Health.Max>
-      </Modifications>
-      <AuraName>Conquest Aura</AuraName>
-      <AuraDescription>All nearby enemy buildings, siege engines, and ships have their health reduced by 20%.</AuraDescription>
-      <OverlayIcon>art/textures/ui/session/auras/health_bonus.png</OverlayIcon>
-    </Aura1>
-  </Auras>
+  <Auras datatype="tokens">sele_hero_antiochus_righteous</Auras>
   <Identity>
     <Civ>sele</Civ>
     <Lang>greek</Lang>
     <GenericName>Antiochus IV "The Righteous"</GenericName>
     <SpecificName>Antiokhos D' Epiphanes</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/sele_hero_seleucus_victor.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/sele_hero_seleucus_victor.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/units/sele_hero_seleucus_victor.xml	(copie de travail)
@@ -1,22 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_elephant_melee">
-  <Auras>
-    <Aura1>
-      <Type>range</Type>
-      <Radius>80</Radius>
-      <Affects>Elephant</Affects>
-      <Modifications>
-        <UnitMotion.WalkSpeed> <Multiply>1.20</Multiply> </UnitMotion.WalkSpeed>
-        <Attack.Melee.Hack> <Multiply>1.20</Multiply> </Attack.Melee.Hack>
-        <Attack.Melee.Crush> <Multiply>1.20</Multiply> </Attack.Melee.Crush>
-      </Modifications>
-      <AuraName>Zooiarchos Aura</AuraName>
-      <AuraDescription>Boosts War Elephant attack and speed +20% within his vision.</AuraDescription>
-      <OverlayIcon>art/textures/ui/session/auras/attack_bonus.png</OverlayIcon>
-    </Aura1>
-  </Auras>
+  <Auras datatype="tokens">sele_hero_seleucus_victor</Auras>
   <Identity>
     <Civ>sele</Civ>
     <Lang>greek</Lang>
     <GenericName>Seleucus I "The Victor"</GenericName>
     <SpecificName>Seleukos A' Nikator</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/spart_hero_agis.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/spart_hero_agis.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/units/spart_hero_agis.xml	(copie de travail)
@@ -6,11 +6,10 @@
   <Identity>
     <Civ>spart</Civ>
     <Lang>greek</Lang>
 	<GenericName>Agis III</GenericName>
     <SpecificName>Agis</SpecificName>
-    <Tooltip>No hero aura. Has 2x health of other infantry heroes. Basically a very tough hoplite.</Tooltip>
     <History>Agis III was the 20th Spartan king of the Eurypontid lineage. Agis cobbled together an alliance of Southern Greek states to fight off Macedonian hegemony while Alexander the Great was away in Asia on his conquest march. After securing Crete as a Spartan tributary, Agis then moved to besiege the city of Megalopolis in the Peloponnese, who was an ally of Macedon. Antipater, the Macedonian regent, lead an army to stop this new uprising. In the Battle of Megalopolis, the Macedonians prevailed in a long and bloody battle. Much like Leonidas 150 years earlier, instead of surrendering, Agis made a heroic final stand in order to buy time for his troops to retreat.</History>
     <Icon>units/spart_hero_agis.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/spartans/agis.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/units/spart_hero_brasidas.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/spart_hero_brasidas.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/units/spart_hero_brasidas.xml	(copie de travail)
@@ -1,23 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_swordsman">
-  <Auras>
-	<Aura1>
-      <Type>range</Type>
-      <Radius>60</Radius>
-      <Affects>Javelin</Affects>
-      <Modifications>
-        <Attack.Ranged.Pierce> <Add>2</Add> </Attack.Ranged.Pierce>
-        <Armour.Pierce> <Add>1</Add> </Armour.Pierce>
-        <Armour.Hack>   <Add>1</Add> </Armour.Hack>
-        <Armour.Crush>  <Add>1</Add> </Armour.Crush>
-      </Modifications>
-      <AuraName>Helot Reforms</AuraName>
-      <AuraDescription>Helot Skirmishers within sight of him gain +2 attack and +1 all armor types.</AuraDescription>
-      <OverlayIcon>art/textures/ui/session/auras/attack_bonus.png</OverlayIcon>
-    </Aura1>
-  </Auras>
+  <Auras datatype="tokens">spart_hero_brasidas</Auras>
   <Identity>
     <Civ>spart</Civ>
     <Lang>greek</Lang>
 	<GenericName>Brasidas</GenericName>
     <SpecificName>Brasidas</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/spart_hero_leonidas.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/spart_hero_leonidas.xml	(révision 17965)
+++ binaries/data/mods/public/simulation/templates/units/spart_hero_leonidas.xml	(copie de travail)
@@ -1,23 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_spearman">
-  <Auras>
-    <Aura1>
-      <Type>range</Type>
-      <Radius>30</Radius>
-      <Affects>Spear</Affects>
-      <Modifications>
-        <Attack.Melee.Hack> <Multiply>1.20</Multiply> </Attack.Melee.Hack>
-        <Attack.Melee.Pierce> <Multiply>1.20</Multiply> </Attack.Melee.Pierce>
-        <Attack.Melee.Crush> <Multiply>1.20</Multiply> </Attack.Melee.Crush>
-        <Attack.Capture.Value> <Add>1</Add> </Attack.Capture.Value>
-      </Modifications>
-      <AuraName>Last Stand Aura</AuraName>
-      <AuraDescription>+20% Attack and +1 Capture for nearby Hoplites and Spartiates.</AuraDescription>
-      <OverlayIcon>art/textures/ui/session/auras/attack_bonus.png</OverlayIcon>
-    </Aura1>
-  </Auras>
+  <Auras datatype="tokens">spart_hero_leonidas</Auras>
   <Identity>
     <Civ>spart</Civ>
     <Lang>greek</Lang>
     <GenericName>Leonidas I</GenericName>
     <SpecificName>Leōnídēs</SpecificName>
