Index: binaries/data/mods/public/globalscripts/Templates.js
===================================================================
--- binaries/data/mods/public/globalscripts/Templates.js
+++ binaries/data/mods/public/globalscripts/Templates.js
@@ -165,9 +165,30 @@
 	if (template.Armour)
 	{
 		ret.armour = {};
-		for (let damageType in template.Armour)
-			if (damageType != "Foundation")
-				ret.armour[damageType] = getEntityValue("Armour/" + damageType);
+		for (let resistanceType in template.Armour)
+		{
+			if (resistanceType != "Foundation")
+			{
+				if (template.Armour[resistanceType].Damage)
+				{
+					if (!ret.armour.Damage)
+						ret.armour.Damage = {};
+					for (let damageType in template.Armour[resistanceType].Damage)
+					{
+						if (!ret.armour.Damage[damageType])
+							ret.armour.Damage[damageType] = 0;
+						ret.armour.Damage[damageType] += getEntityValue("Armour/" + resistanceType + "/Damage/" + damageType);
+					}
+				}
+				if (template.Armour[resistanceType].Capture)
+				{
+					if (!ret.armour.Capture)
+						ret.armour.Capture = 0;
+					ret.armour.Capture += getEntityValue("Armour/" + resistanceType + "/Capture");
+				}
+			}
+
+		}
 	}
 
 	let getAttackEffects = (temp, path) => {
Index: binaries/data/mods/public/gui/common/tooltips.js
===================================================================
--- binaries/data/mods/public/gui/common/tooltips.js
+++ binaries/data/mods/public/gui/common/tooltips.js
@@ -213,22 +213,54 @@
 {
 	if (!template.armour)
 		return "";
+	let tooltips = [];
 
-	return sprintf(translate("%(label)s %(details)s"), {
-		"label": headerFont(translate("Armor:")),
-		"details":
-			Object.keys(template.armour).map(
-				dmgType => sprintf(translate("%(damage)s %(damageType)s %(armorPercentage)s"), {
-					"damage": template.armour[dmgType].toFixed(1),
-					"damageType": unitFont(translateWithContext("damage type", dmgType)),
+	if (template.armour.Damage)
+		tooltips.push(sprintf(translate("%(label)s %(details)s"), {
+			"label": headerFont(translate("Damage Resistance:")),
+			"details":
+				Object.keys(template.armour.Damage).map(
+					dmgType => sprintf(translate("%(damage)s %(damageType)s %(armorPercentage)s"), {
+						"damage": template.armour.Damage[dmgType].toFixed(1),
+						"damageType": unitFont(translateWithContext("damage type", dmgType)),
+						"armorPercentage":
+							'[font="sans-10"]' +
+							sprintf(translate("(%(armorPercentage)s)"), {
+								"armorPercentage": armorLevelToPercentageString(template.armour.Damage[dmgType])
+							}) + '[/font]'
+					})
+				).join(commaFont(translate(", ")))
+		}));
+	if (template.armour.Capture)
+		tooltips.push(sprintf(translate("%(label)s %(details)s"), {
+			"label": headerFont(translate("Capture Resistance:")),
+			"details":
+				sprintf(translate("%(damage)s %(damageType)s %(armorPercentage)s"), {
+					"damage": template.armour.Capture.toFixed(1),
+					"damageType": unitFont(translateWithContext("damage type", "Capture")),
 					"armorPercentage":
 						'[font="sans-10"]' +
 						sprintf(translate("(%(armorPercentage)s)"), {
-							"armorPercentage": armorLevelToPercentageString(template.armour[dmgType])
+							"armorPercentage": armorLevelToPercentageString(template.armour.Capture)
 						}) + '[/font]'
 				})
-			).join(commaFont(translate(", ")))
-	});
+		}));
+	if (template.armour.StatusEffects)
+		tooltips.push(sprintf(translate("%(label)s %(details)s"), {
+			"label": headerFont(translate("Status Effects Resistance:")),
+			"details": "ToDo."
+				//sprintf(translate("%(damage)s %(damageType)s %(armorPercentage)s"), {
+				//	"damage": template.armour.Capture.toFixed(1),
+				//	"damageType": unitFont(translateWithContext("damage type", "Capture")),
+				//	"armorPercentage":
+				//		'[font="sans-10"]' +
+				//		sprintf(translate("(%(armorPercentage)s)"), {
+				//			"armorPercentage": armorLevelToPercentageString(template.armour.Capture)
+				//		}) + '[/font]'
+				//})
+		}));
+
+	return tooltips.join("\n");
 }
 
 function damageTypesToText(dmg)
Index: binaries/data/mods/public/simulation/ai/common-api/entity.js
===================================================================
--- binaries/data/mods/public/simulation/ai/common-api/entity.js
+++ binaries/data/mods/public/simulation/ai/common-api/entity.js
@@ -203,9 +203,33 @@
 			return undefined;
 
 		let armour = {};
-		for (let damageType in armourDamageTypes)
-			if (damageType != "Foundation")
-				armour[damageType] = +armourDamageTypes[damageType];
+		let effectTypes = ["Damage", "Capture"];
+		for (let effectType of effectTypes)
+			for (let resistanceType in armourDamageTypes)
+			{
+				let template = armourDamageTypes[resistanceType][effectType];
+				if (template)
+				{
+					if (effectType == "Capture")
+					{
+						if (!armour.Capture)
+							armour.Capture = 0;
+						armour.Capture += +this.get("Armour/" + resistanceType + "/Capture");
+					}
+					else if (effectType == "Damage")
+					{
+						if (!armour.Damage)
+							armour.Damage = {};
+						for (let damageType in template)
+						{
+							if (!armour.Damage[damageType])
+								armour.Damage[damageType] = 0;
+							armour.Damage[damageType] += +this.get("Armour/" + resistanceType + "/Damage/" + damageType);
+						}
+					}
+				}
+
+			}
 
 		return armour;
 	},
Index: binaries/data/mods/public/simulation/ai/petra/entityExtend.js
===================================================================
--- binaries/data/mods/public/simulation/ai/petra/entityExtend.js
+++ binaries/data/mods/public/simulation/ai/petra/entityExtend.js
@@ -56,13 +56,17 @@
 	}
 
 	let armourStrength = ent.armourStrengths();
-	for (let str in armourStrength)
+	for (let effectType in armourStrength)
 	{
-		let val = parseFloat(armourStrength[str]);
-		if (DamageTypeImportance[str])
-			strength += DamageTypeImportance[str] * val / damageTypes.length;
-		else if (debugLevel > 0)
-			API3.warn("Petra: " + str + " unknown armourStrength in getMaxStrength (please add " + str + "  to config.js).");
+		if (effectType == "Damage")
+			for (let str in armourStrength[effectType])
+			{
+				let val = parseFloat(armourStrength[effectType][str]);
+				if (DamageTypeImportance[str])
+					strength += DamageTypeImportance[str] * val / damageTypes.length;
+				else if (debugLevel > 0)
+					API3.warn("Petra: " + str + " unknown armourStrength in getMaxStrength (please add " + str + "  to config.js).");
+			}
 	}
 
 	return strength * ent.maxHitpoints() / 100.0;
Index: binaries/data/mods/public/simulation/components/Armour.js
===================================================================
--- binaries/data/mods/public/simulation/components/Armour.js
+++ binaries/data/mods/public/simulation/components/Armour.js
@@ -1,28 +1,32 @@
 function Armour() {}
 
-Armour.prototype.DamageResistanceSchema = "" +
-	"<oneOrMore>" +
-		"<element a:help='Resistance against any number of damage types'>" +
-			"<anyName>" +
-				"<except><name>Foundation</name></except>" +
-			"</anyName>" +
-			"<ref name='nonNegativeDecimal' />" +
-		"</element>" +
-	"</oneOrMore>";
-
 Armour.prototype.Schema =
 	"<a:help>Controls the damage resistance of the unit.</a:help>" +
 	"<a:example>" +
-		"<Hack>10.0</Hack>" +
-		"<Pierce>0.0</Pierce>" +
-		"<Crush>5.0</Crush>" +
+		"<Foundation>" +
+			"<Damage>" +
+				"<Hack>10.0</Hack>" +
+				"<Pierce>0.0</Pierce>" +
+				"<Crush>5.0</Crush>" +
+			"</Damage>" +
+			"<Capture>10</Capture>" +
+		"</Foundation>" +
+		"<MagicShield>" +
+			"<StatusEffects>" +
+				"<Poison>" +
+					"<Duration>10</Duration>" +
+					"<Interval>0</Interval>" +
+					"<Damage>5.0</Damage>" +
+				"</Poison>" +
+			"</StatusEffects>" +
+		"</MagicShield>" +
 	"</a:example>" +
-	Armour.prototype.DamageResistanceSchema +
-	"<optional>" +
-		"<element name='Foundation' a:help='Armour given to building foundations'>" +
-			Armour.prototype.DamageResistanceSchema +
+	"<oneOrMore>" +
+		"<element a:help='Resistance with name (e.g. shield, armour, foundation etc.).'>" +
+			"<anyName/>" +
+			Attacking.BuildAttackEffectsSchema() +
 		"</element>" +
-	"</optional>";
+	"</oneOrMore>";
 
 Armour.prototype.Init = function()
 {
@@ -40,33 +44,59 @@
 	Engine.PostMessage(this.entity, MT_InvulnerabilityChanged, { "entity": this.entity, "invulnerability": invulnerability });
 };
 
-Armour.prototype.GetArmourStrengths = function(effectType)
+/**
+ * Calculate the armour strength of an entity.
+ * @param {string} effectType - The type of attack effect the armour has to be calculated for (e.g. "Damage", "Capture").
+ * @param {string} circumvent - An optional array consisting of the resistance types not to use in calculation (e.g. "Shield").
+ * @return {object} - An object of the type { "Crush": 10, "Hack": 2 }
+ */
+Armour.prototype.GetArmourStrengths = function(effectType, circumvent = [])
 {
 	// Work out the armour values with technology effects.
-	let applyMods = (type, foundation) => {
-		let strength;
-		if (foundation)
-		{
-			strength = +this.template.Foundation[type];
-			type = "Foundation/" + type;
-		}
-		else
-			strength = +this.template[type];
+	let applyMods = (resistanceType, damageType) => {
+		let strength = +this.template[resistanceType][effectType][damageType];
 
-		return ApplyValueModificationsToEntity("Armour/" + type, strength, this.entity);
+		return ApplyValueModificationsToEntity("Armour/" + resistanceType + "/" + effectType + "/" + damageType, strength, this.entity);
 	};
 
 	let foundation = Engine.QueryInterface(this.entity, IID_Foundation) && this.template.Foundation;
 
 	let ret = {};
 
-	if (effectType != "Damage")
+	if (effectType == "StatusEffects")
 		return ret;
 
-	for (let damageType in this.template)
-		if (damageType != "Foundation")
-			ret[damageType] = applyMods(damageType, foundation);
+	for (let resistanceType in this.template)
+	{
+		if (circumvent.length && circumvent.indexOf(resistanceType) == -1)
+			continue;
+		if (!foundation && resistanceType == "Foundation")
+			continue;
+		if (foundation && resistanceType != "Foundation")
+			continue;
+		let template = this.template[resistanceType][effectType];
+		if (template)
+		{
+			if (effectType == "Capture")
+			{
+				if (!ret.Capture)
+					ret.Capture = 0;
+				ret.Capture += ApplyValueModificationsToEntity("Armour/" + resistanceType + "/Capture", +this.template[resistanceType].Capture, this.entity);
+			}
+			else if (effectType == "Damage")
+			{
+				if (!ret.Damage)
+					ret.Damage = {};
+				for (let damageType in template)
+				{
+					if (!ret.Damage[damageType])
+						ret.Damage[damageType] = 0;
+					ret.Damage[damageType] += applyMods(resistanceType, damageType);
+				}
+			}
+		}
 
+	}
 	return ret;
 };
 
Index: binaries/data/mods/public/simulation/components/Attack.js
===================================================================
--- binaries/data/mods/public/simulation/components/Attack.js
+++ binaries/data/mods/public/simulation/components/Attack.js
@@ -97,6 +97,7 @@
 		"<element name='Melee'>" +
 			"<interleave>" +
 				Attacking.BuildAttackEffectsSchema() +
+				Attacking.BuildBonusSchema() +
 				"<element name='MaxRange' a:help='Maximum attack range (in metres)'><ref name='nonNegativeDecimal'/></element>" +
 				"<element name='PrepareTime' a:help='Time from the start of the attack command until the attack actually occurs (in milliseconds). This value relative to RepeatTime should closely match the \"event\" point in the actor&apos;s attack animation'>" +
 					"<data type='nonNegativeInteger'/>" +
@@ -113,6 +114,7 @@
 		"<element name='Ranged'>" +
 			"<interleave>" +
 				Attacking.BuildAttackEffectsSchema() +
+				Attacking.BuildBonusSchema() +
 				"<element name='MaxRange' a:help='Maximum attack range (in metres)'><ref name='nonNegativeDecimal'/></element>" +
 				"<element name='MinRange' a:help='Minimum attack range (in metres)'><ref name='nonNegativeDecimal'/></element>" +
 				"<optional>"+
@@ -141,6 +143,7 @@
 							"<element name='Range' a:help='Size of the area affected by the splash'><ref name='nonNegativeDecimal'/></element>" +
 							"<element name='FriendlyFire' a:help='Whether the splash damage can hurt non enemy units'><data type='boolean'/></element>" +
 							Attacking.BuildAttackEffectsSchema() +
+							Attacking.BuildBonusSchema() +
 						"</interleave>" +
 					"</element>" +
 				"</optional>" +
@@ -184,6 +187,7 @@
 		"<element name='Capture'>" +
 			"<interleave>" +
 				Attacking.BuildAttackEffectsSchema() +
+				Attacking.BuildBonusSchema() +
 				"<element name='MaxRange' a:help='Maximum attack range (in meters)'><ref name='nonNegativeDecimal'/></element>" +
 				"<element name='RepeatTime' a:help='Time between attacks (in milliseconds). The attack animation will be stretched to match this time'>" + // TODO: it shouldn't be stretched
 					"<data type='positiveInteger'/>" +
@@ -197,6 +201,7 @@
 		"<element name='Slaughter' a:help='A special attack to kill domestic animals'>" +
 			"<interleave>" +
 				Attacking.BuildAttackEffectsSchema() +
+				Attacking.BuildBonusSchema() +
 				"<element name='MaxRange'><ref name='nonNegativeDecimal'/></element>" + // TODO: how do these work?
 				Attack.prototype.preferredClassesSchema +
 				Attack.prototype.restrictedClassesSchema +
Index: binaries/data/mods/public/simulation/components/Capturable.js
===================================================================
--- binaries/data/mods/public/simulation/components/Capturable.js
+++ binaries/data/mods/public/simulation/components/Capturable.js
@@ -58,7 +58,7 @@
 
 	bonusMultiplier *= cmpHealth.GetMaxHitpoints() / (0.1 * cmpHealth.GetMaxHitpoints() + 0.9 * cmpHealth.GetHitpoints());
 
-	let total = Attacking.GetTotalAttackEffects({ "Capture": effectData }, "Capture") * bonusMultiplier;
+	let total = Attacking.GetTotalAttackEffects({ "Capture": effectData }, "Capture", this.entity) * bonusMultiplier;
 
 	let change = this.Reduce(total, attackerOwner);
 	// TODO: implement loot
Index: binaries/data/mods/public/simulation/components/DeathDamage.js
===================================================================
--- binaries/data/mods/public/simulation/components/DeathDamage.js
+++ binaries/data/mods/public/simulation/components/DeathDamage.js
@@ -1,23 +1,5 @@
 function DeathDamage() {}
 
-DeathDamage.prototype.bonusesSchema =
-	"<optional>" +
-		"<element name='Bonuses'>" +
-			"<zeroOrMore>" +
-				"<element>" +
-					"<anyName/>" +
-					"<interleave>" +
-						"<optional>" +
-							"<element name='Civ' a:help='If an entity has this civ then the bonus is applied'><text/></element>" +
-						"</optional>" +
-						"<element name='Classes' a:help='If an entity has all these classes then the bonus is applied'><text/></element>" +
-						"<element name='Multiplier' a:help='The attackers attack strength is multiplied by this'><ref name='nonNegativeDecimal'/></element>" +
-					"</interleave>" +
-				"</element>" +
-			"</zeroOrMore>" +
-		"</element>" +
-	"</optional>";
-
 DeathDamage.prototype.Schema =
 	"<a:help>When a unit or building is destroyed, it inflicts damage to nearby units.</a:help>" +
 	"<a:example>" +
@@ -33,7 +15,8 @@
 	"<element name='Shape' a:help='Shape of the splash damage, can be circular'><text/></element>" +
 	"<element name='Range' a:help='Size of the area affected by the splash'><ref name='nonNegativeDecimal'/></element>" +
 	"<element name='FriendlyFire' a:help='Whether the splash damage can hurt non enemy units'><data type='boolean'/></element>" +
-	Attacking.BuildAttackEffectsSchema();
+	Attacking.BuildAttackEffectsSchema() +
+	Attacking.BuildBonusSchema();
 
 DeathDamage.prototype.Init = function()
 {
Index: binaries/data/mods/public/simulation/components/GuiInterface.js
===================================================================
--- binaries/data/mods/public/simulation/components/GuiInterface.js
+++ binaries/data/mods/public/simulation/components/GuiInterface.js
@@ -434,7 +434,11 @@
 
 	let cmpArmour = Engine.QueryInterface(ent, IID_Resistance);
 	if (cmpArmour)
-		ret.armour = cmpArmour.GetArmourStrengths("Damage");
+	{
+		ret.armour = {}
+		Object.assign(ret.armour, cmpArmour.GetArmourStrengths("Damage"));
+		Object.assign(ret.armour, cmpArmour.GetArmourStrengths("Capture"));
+	}
 
 	let cmpBuildingAI = Engine.QueryInterface(ent, IID_BuildingAI);
 	if (cmpBuildingAI)
Index: binaries/data/mods/public/simulation/components/Health.js
===================================================================
--- binaries/data/mods/public/simulation/components/Health.js
+++ binaries/data/mods/public/simulation/components/Health.js
@@ -186,11 +186,10 @@
 Health.prototype.TakeDamage = function(effectData, attacker, attackerOwner, bonusMultiplier)
 {
 	let cmpResistance = Engine.QueryInterface(this.entity, IID_Resistance);
-
 	if (cmpResistance && cmpResistance.IsInvulnerable())
 		return { "killed": false };
 
-	let total = Attacking.GetTotalAttackEffects(effectData, "Damage", cmpResistance) * bonusMultiplier;
+	let total = Attacking.GetTotalAttackEffects(effectData, "Damage", this.entity) * bonusMultiplier;
 
 	// Reduce health
 	let change = this.Reduce(total);
Index: binaries/data/mods/public/simulation/data/auras/structures/wall_garrisoned.json
===================================================================
--- binaries/data/mods/public/simulation/data/auras/structures/wall_garrisoned.json
+++ binaries/data/mods/public/simulation/data/auras/structures/wall_garrisoned.json
@@ -2,9 +2,9 @@
 	"type": "garrisonedUnits",
 	"affects": ["Soldier"],
 	"modifications": [
-		{ "value": "Armour/Pierce", "add": 3 },
-		{ "value": "Armour/Hack", "add": 3 },
-		{ "value": "Armour/Crush", "add": 3 },
+		{ "value": "Armour/Armour/Damage/Pierce", "add": 3 },
+		{ "value": "Armour/Armour/Damage/Hack", "add": 3 },
+		{ "value": "Armour/Armour/Damage/Crush", "add": 3 },
 		{ "value": "Vision/Range", "add": 20 }
 	],
 	"auraName": "Wall Protection",
Index: binaries/data/mods/public/simulation/data/auras/units/catafalques/cart_catafalque.json
===================================================================
--- binaries/data/mods/public/simulation/data/auras/units/catafalques/cart_catafalque.json
+++ binaries/data/mods/public/simulation/data/auras/units/catafalques/cart_catafalque.json
@@ -2,9 +2,9 @@
 	"type": "global",
 	"affects": ["Melee Cavalry"],
 	"modifications": [
-		{ "value": "Armour/Pierce", "add": 1 },
-		{ "value": "Armour/Hack", "add": 1 },
-		{ "value": "Armour/Crush", "add": 1 },
+		{ "value": "Armour/Armour/Damage/Pierce", "add": 1 },
+		{ "value": "Armour/Armour/Damage/Hack", "add": 1 },
+		{ "value": "Armour/Armour/Damage/Crush", "add": 1 },
 		{ "value": "Health/Max", "multiply": 1.1 }
 	],
 	"auraName": "Commander of Heavy Cavalry",
Index: binaries/data/mods/public/simulation/data/auras/units/catafalques/rome_catafalque_2.json
===================================================================
--- binaries/data/mods/public/simulation/data/auras/units/catafalques/rome_catafalque_2.json
+++ binaries/data/mods/public/simulation/data/auras/units/catafalques/rome_catafalque_2.json
@@ -2,9 +2,9 @@
 	"type": "global",
 	"affects": ["Human", "Siege"],
 	"modifications": [
-		{ "value": "Armour/Pierce", "add": 1 },
-		{ "value": "Armour/Hack", "add": 1 },
-		{ "value": "Armour/Crush", "add": 1 }
+		{ "value": "Armour/Armour/Damage/Pierce", "add": 1 },
+		{ "value": "Armour/Armour/Damage/Hack", "add": 1 },
+		{ "value": "Armour/Armour/Damage/Crush", "add": 1 }
 	],
 	"auraName": "Founder and Defender of the Republic",
 	"auraDescription": "Brutus was one of the key figures in the overthrow of the monarchy and the founding of the Roman Republic. Later, as consul he led a Roman army to victory against the Etruscan King Tarquinius who sought to retake the throne.\nHumans and Siege Engines +1 armor."
Index: binaries/data/mods/public/simulation/data/auras/units/heroes/athen_hero_iphicrates_1.json
===================================================================
--- binaries/data/mods/public/simulation/data/auras/units/heroes/athen_hero_iphicrates_1.json
+++ binaries/data/mods/public/simulation/data/auras/units/heroes/athen_hero_iphicrates_1.json
@@ -2,9 +2,9 @@
 	"type": "formation",
 	"affects": ["Soldier"],
 	"modifications": [
-		{ "value": "Armour/Pierce", "add": 3 },
-		{ "value": "Armour/Hack", "add": 3 },
-		{ "value": "Armour/Crush", "add": 3 },
+		{ "value": "Armour/Armour/Damage/Pierce", "add": 3 },
+		{ "value": "Armour/Armour/Damage/Hack", "add": 3 },
+		{ "value": "Armour/Armour/Damage/Crush", "add": 3 },
 		{ "value": "UnitMotion/WalkSpeed", "multiply": 1.15 }
 	],
 	"auraName": "Formation Reforms",
Index: binaries/data/mods/public/simulation/data/auras/units/heroes/brit_hero_caratacos.json
===================================================================
--- binaries/data/mods/public/simulation/data/auras/units/heroes/brit_hero_caratacos.json
+++ binaries/data/mods/public/simulation/data/auras/units/heroes/brit_hero_caratacos.json
@@ -3,9 +3,9 @@
 	"affects": ["Soldier", "Siege"],
 	"modifications": [
 		{ "value": "UnitMotion/WalkSpeed", "multiply": 1.15 },
-		{ "value": "Armour/Pierce", "add": 1 },
-		{ "value": "Armour/Hack", "add": 1 },
-		{ "value": "Armour/Crush", "add": 1 }
+		{ "value": "Armour/Armour/Damage/Pierce", "add": 1 },
+		{ "value": "Armour/Armour/Damage/Hack", "add": 1 },
+		{ "value": "Armour/Armour/Damage/Crush", "add": 1 }
 	],
 	"auraName": "Guerrilla Chief",
 	"auraDescription": "All soldiers and siege engines +15% speed and +1 armor."
Index: binaries/data/mods/public/simulation/data/auras/units/heroes/iber_hero_caros_2.json
===================================================================
--- binaries/data/mods/public/simulation/data/auras/units/heroes/iber_hero_caros_2.json
+++ binaries/data/mods/public/simulation/data/auras/units/heroes/iber_hero_caros_2.json
@@ -3,9 +3,9 @@
 	"radius": 50,
 	"affects": ["Soldier"],
 	"modifications": [
-		{ "value": "Armour/Pierce", "add": 1 },
-		{ "value": "Armour/Hack", "add": 1 },
-		{ "value": "Armour/Crush", "add": 1 }
+		{ "value": "Armour/Armour/Damage/Pierce", "add": 1 },
+		{ "value": "Armour/Armour/Damage/Hack", "add": 1 },
+		{ "value": "Armour/Armour/Damage/Crush", "add": 1 }
 	],
 	"auraDescription": "+1 armor for soldiers.",
 	"auraName": "Battle Fervor",
Index: binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_demetrius.json
===================================================================
--- binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_demetrius.json
+++ binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_demetrius.json
@@ -3,9 +3,9 @@
 	"radius": 60,
 	"affects": ["Siege"],
 	"modifications": [
-		{ "value": "Armour/Pierce", "add": 1 },
-		{ "value": "Armour/Hack", "add": 1 },
-		{ "value": "Armour/Crush", "add": 1 },
+		{ "value": "Armour/Armour/Damage/Pierce", "add": 1 },
+		{ "value": "Armour/Armour/Damage/Hack", "add": 1 },
+		{ "value": "Armour/Armour/Damage/Crush", "add": 1 },
 		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.2 },
 		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.2 },
 		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.2 },
Index: binaries/data/mods/public/simulation/data/auras/units/heroes/rome_hero_maximus.json
===================================================================
--- binaries/data/mods/public/simulation/data/auras/units/heroes/rome_hero_maximus.json
+++ binaries/data/mods/public/simulation/data/auras/units/heroes/rome_hero_maximus.json
@@ -2,9 +2,9 @@
 	"type": "global",
 	"affects": ["Human", "Structure"],
 	"modifications": [
-		{ "value": "Armour/Pierce", "add": 1 },
-		{ "value": "Armour/Hack", "add": 1 },
-		{ "value": "Armour/Crush", "add": 1 }
+		{ "value": "Armour/Armour/Damage/Pierce", "add": 1 },
+		{ "value": "Armour/Armour/Damage/Hack", "add": 1 },
+		{ "value": "Armour/Armour/Damage/Crush", "add": 1 }
 	],
 	"auraName": "Shield of Rome",
 	"auraDescription": "+1 armor for all units and structures."
Index: binaries/data/mods/public/simulation/data/auras/units/heroes/sele_hero_antiochus_great.json
===================================================================
--- binaries/data/mods/public/simulation/data/auras/units/heroes/sele_hero_antiochus_great.json
+++ binaries/data/mods/public/simulation/data/auras/units/heroes/sele_hero_antiochus_great.json
@@ -3,9 +3,9 @@
 	"radius": 45,
 	"affects": ["Cavalry"],
 	"modifications": [
-		{ "value": "Armour/Pierce", "add": 2 },
-		{ "value": "Armour/Hack", "add": 2 },
-		{ "value": "Armour/Crush", "add": 2 }
+		{ "value": "Armour/Armour/Damage/Pierce", "add": 2 },
+		{ "value": "Armour/Armour/Damage/Hack", "add": 2 },
+		{ "value": "Armour/Armour/Damage/Crush", "add": 2 }
 	],
 	"auraName": "Ilarchès",
 	"auraDescription": "Nearby cavalry gains +2 levels of all armor types."
Index: binaries/data/mods/public/simulation/data/auras/units/heroes/spart_hero_brasidas.json
===================================================================
--- binaries/data/mods/public/simulation/data/auras/units/heroes/spart_hero_brasidas.json
+++ binaries/data/mods/public/simulation/data/auras/units/heroes/spart_hero_brasidas.json
@@ -4,9 +4,9 @@
 	"affects": ["Javelin Infantry Citizen"],
 	"modifications": [
 		{ "value": "Attack/Ranged/Damage/Pierce", "multiply": 1.25 },
-		{ "value": "Armour/Pierce", "add": 1 },
-		{ "value": "Armour/Hack", "add": 1 },
-		{ "value": "Armour/Crush", "add": 1 }
+		{ "value": "Armour/Armour/Damage/Pierce", "add": 1 },
+		{ "value": "Armour/Armour/Damage/Hack", "add": 1 },
+		{ "value": "Armour/Armour/Damage/Crush", "add": 1 }
 	],
 	"auraName": "Helot Reforms",
 	"auraDescription": "+25% attack and +1 armor for javelin infantry citizen-soldiers.",
Index: binaries/data/mods/public/simulation/data/technologies/advanced_unit_bonus.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/advanced_unit_bonus.json
+++ binaries/data/mods/public/simulation/data/technologies/advanced_unit_bonus.json
@@ -4,9 +4,9 @@
 	"tooltip": "Units promoted to the advanced class gain a lot of quality: 20% extra health, 1 extra armor level of every type, 20% extra loot, 20% extra attack for melee units, 4m extra range and better precision for ranged units, faster movement speeds and extra heal speed and range for healers.",
 	"modifications": [
 		{ "value": "Health/Max", "multiply": 1.2 },
-		{ "value": "Armour/Hack", "add": 1 },
-		{ "value": "Armour/Pierce", "add": 1 },
-		{ "value": "Armour/Crush", "add": 1 },
+		{ "value": "Armour/Armour/Damage/Hack", "add": 1 },
+		{ "value": "Armour/Armour/Damage/Pierce", "add": 1 },
+		{ "value": "Armour/Armour/Damage/Crush", "add": 1 },
 		{ "value": "Attack/Capture/Capture", "add": 0.4 },
 		{ "value": "ResourceGatherer/BaseSpeed", "multiply": 0.5 },
 		{ "value": "UnitMotion/WalkSpeed", "add": 0.5, "affects": "Infantry" },
Index: binaries/data/mods/public/simulation/data/technologies/armor_cav_01.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/armor_cav_01.json
+++ binaries/data/mods/public/simulation/data/technologies/armor_cav_01.json
@@ -15,8 +15,8 @@
 	"researchTime": 40,
 	"tooltip": "Equip your cavalry mounts with armor. All Cavalry +1 Hack and Pierce armor level.",
 	"modifications": [
-		{ "value": "Armour/Hack", "add": 1 },
-		{ "value": "Armour/Pierce", "add": 1 }
+		{ "value": "Armour/Armour/Damage/Hack", "add": 1 },
+		{ "value": "Armour/Armour/Damage/Pierce", "add": 1 }
 	],
 	"affects": ["Cavalry"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
Index: binaries/data/mods/public/simulation/data/technologies/armor_cav_02.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/armor_cav_02.json
+++ binaries/data/mods/public/simulation/data/technologies/armor_cav_02.json
@@ -9,8 +9,8 @@
 	"researchTime": 40,
 	"tooltip": "Equip your cavalry mounts with armor. All Cavalry +1 Hack and Pierce armor level.",
 	"modifications": [
-		{ "value": "Armour/Hack", "add": 1 },
-		{ "value": "Armour/Pierce", "add": 1 }
+		{ "value": "Armour/Armour/Damage/Hack", "add": 1 },
+		{ "value": "Armour/Armour/Damage/Pierce", "add": 1 }
 	],
 	"affects": ["Cavalry"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
Index: binaries/data/mods/public/simulation/data/technologies/armor_cav_chamfron.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/armor_cav_chamfron.json
+++ binaries/data/mods/public/simulation/data/technologies/armor_cav_chamfron.json
@@ -16,7 +16,7 @@
 	"researchTime": 40,
 	"tooltip": "Equip your cavalry mounts with armor. All Cavalry +1 Hack armor level.",
 	"modifications": [
-		{ "value": "Armour/Hack", "add": 1 }
+		{ "value": "Armour/Armour/Damage/Hack", "add": 1 }
 	],
 	"affects": ["Cavalry"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
Index: binaries/data/mods/public/simulation/data/technologies/armor_hero_01.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/armor_hero_01.json
+++ binaries/data/mods/public/simulation/data/technologies/armor_hero_01.json
@@ -16,8 +16,8 @@
 	"researchTime": 40,
 	"tooltip": "All heroes +2 Hack Armor Levels and +2 Pierce Armor Levels, but also +50 Metal Cost.",
 	"modifications": [
-		{ "value": "Armour/Hack", "add": 2 },
-		{ "value": "Armour/Pierce", "add": 2 },
+		{ "value": "Armour/Armour/Damage/Hack", "add": 2 },
+		{ "value": "Armour/Armour/Damage/Pierce", "add": 2 },
 		{ "value": "Cost/Resources/metal", "add": 50 }
 	],
 	"affects": ["Hero"],
Index: binaries/data/mods/public/simulation/data/technologies/armor_infantry_01.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/armor_infantry_01.json
+++ binaries/data/mods/public/simulation/data/technologies/armor_infantry_01.json
@@ -21,8 +21,8 @@
 	"researchTime": 40,
 	"tooltip": "All Infantry +1 Hack and Pierce Armor Level.",
 	"modifications": [
-		{ "value": "Armour/Hack", "add": 1 },
-		{ "value": "Armour/Pierce", "add": 1 }
+		{ "value": "Armour/Armour/Damage/Hack", "add": 1 },
+		{ "value": "Armour/Armour/Damage/Pierce", "add": 1 }
 	],
 	"affects": ["Infantry"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
Index: binaries/data/mods/public/simulation/data/technologies/armor_infantry_02.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/armor_infantry_02.json
+++ binaries/data/mods/public/simulation/data/technologies/armor_infantry_02.json
@@ -19,8 +19,8 @@
 	"researchTime": 40,
 	"tooltip": "All Infantry +1 Hack and Pierce Armor Level.",
 	"modifications": [
-		{ "value": "Armour/Hack", "add": 1 },
-		{ "value": "Armour/Pierce", "add": 1 }
+		{ "value": "Armour/Armour/Damage/Hack", "add": 1 },
+		{ "value": "Armour/Armour/Damage/Pierce", "add": 1 }
 	],
 	"affects": ["Infantry"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
Index: binaries/data/mods/public/simulation/data/technologies/armor_infantry_hack_01.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/armor_infantry_hack_01.json
+++ binaries/data/mods/public/simulation/data/technologies/armor_infantry_hack_01.json
@@ -22,7 +22,7 @@
 	"researchTime": 40,
 	"tooltip": "All Infantry +1 Hack Armor Level.",
 	"modifications": [
-		{ "value": "Armour/Hack", "add": 1 }
+		{ "value": "Armour/Armour/Damage/Hack", "add": 1 }
 	],
 	"affects": ["Infantry"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
Index: binaries/data/mods/public/simulation/data/technologies/armor_infantry_hack_02.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/armor_infantry_hack_02.json
+++ binaries/data/mods/public/simulation/data/technologies/armor_infantry_hack_02.json
@@ -19,7 +19,7 @@
 	"researchTime": 40,
 	"tooltip": "All Infantry +1 Hack Armor Level.",
 	"modifications": [
-		{ "value": "Armour/Hack", "add": 1 }
+		{ "value": "Armour/Armour/Damage/Hack", "add": 1 }
 	],
 	"affects": ["Infantry"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
Index: binaries/data/mods/public/simulation/data/technologies/armor_infantry_hack_03.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/armor_infantry_hack_03.json
+++ binaries/data/mods/public/simulation/data/technologies/armor_infantry_hack_03.json
@@ -12,7 +12,7 @@
 	"researchTime": 40,
 	"tooltip": "All Infantry +1 Hack Armor Level.",
 	"modifications": [
-		{ "value": "Armour/Hack", "add": 1 }
+		{ "value": "Armour/Armour/Damage/Hack", "add": 1 }
 	],
 	"affects": ["Infantry"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
Index: binaries/data/mods/public/simulation/data/technologies/armor_infantry_hack_04.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/armor_infantry_hack_04.json
+++ binaries/data/mods/public/simulation/data/technologies/armor_infantry_hack_04.json
@@ -12,7 +12,7 @@
 	"researchTime": 40,
 	"tooltip": "Champions +2 Hack Armor Levels, but also +10 Metal Cost.",
 	"modifications": [
-		{ "value": "Armour/Hack", "add": 2 },
+		{ "value": "Armour/Armour/Damage/Hack", "add": 2 },
 		{ "value": "Cost/Resources/metal", "add": 10 }
 	],
 	"affects": ["Champion"],
Index: binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_01.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_01.json
+++ binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_01.json
@@ -16,7 +16,7 @@
 	"researchTime": 40,
 	"tooltip": "Infantry Spearmen +2 Pierce Armor Levels.",
 	"modifications": [
-		{ "value": "Armour/Pierce", "add": 2 }
+		{ "value": "Armour/Armour/Damage/Pierce", "add": 2 }
 	],
 	"affects": ["Infantry Spear"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
Index: binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_02.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_02.json
+++ binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_02.json
@@ -16,7 +16,7 @@
 	"researchTime": 40,
 	"tooltip": "Infantry Spearmen +1 Pierce Armor Level.",
 	"modifications": [
-		{ "value": "Armour/Pierce", "add": 1 }
+		{ "value": "Armour/Armour/Damage/Pierce", "add": 1 }
 	],
 	"affects": ["Infantry Spear"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
Index: binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_03.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_03.json
+++ binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_03.json
@@ -16,7 +16,7 @@
 	"researchTime": 40,
 	"tooltip": "Infantry Spearmen +1 Pierce Armor Level.",
 	"modifications": [
-		{ "value": "Armour/Pierce", "add": 1 }
+		{ "value": "Armour/Armour/Damage/Pierce", "add": 1 }
 	],
 	"affects": ["Infantry Spear"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
Index: binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_04.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_04.json
+++ binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_04.json
@@ -16,7 +16,7 @@
 	"researchTime": 40,
 	"tooltip": "Champions +2 Pierce Armor Levels, but also +10 Metal Cost.",
 	"modifications": [
-		{ "value": "Armour/Pierce", "add": 2 },
+		{ "value": "Armour/Armour/Damage/Pierce", "add": 2 },
 		{ "value": "Cost/Resources/metal", "add": 10 }
 	],
 	"affects": ["Champion"],
Index: binaries/data/mods/public/simulation/data/technologies/armor_ship_hullsheathing.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/armor_ship_hullsheathing.json
+++ binaries/data/mods/public/simulation/data/technologies/armor_ship_hullsheathing.json
@@ -9,9 +9,9 @@
 	"researchTime": 40,
 	"tooltip": "Lead sheathing protects ship hulls. +2 levels to all ship armor types.",
 	"modifications": [
-		{ "value": "Armour/Hack", "add": 2 },
-		{ "value": "Armour/Pierce", "add": 2 },
-		{ "value": "Armour/Crush", "add": 2 }
+		{ "value": "Armour/Armour/Damage/Hack", "add": 2 },
+		{ "value": "Armour/Armour/Damage/Pierce", "add": 2 },
+		{ "value": "Armour/Armour/Damage/Crush", "add": 2 }
 	],
 	"affects": ["Ship"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
Index: binaries/data/mods/public/simulation/data/technologies/armor_ship_hypozomata.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/armor_ship_hypozomata.json
+++ binaries/data/mods/public/simulation/data/technologies/armor_ship_hypozomata.json
@@ -9,9 +9,9 @@
 	"researchTime": 40,
 	"tooltip": "The hypozomata braces the ship's structure. +2 levels to all ship armor types.",
 	"modifications": [
-		{ "value": "Armour/Hack", "add": 2 },
-		{ "value": "Armour/Pierce", "add": 2 },
-		{ "value": "Armour/Crush", "add": 2 }
+		{ "value": "Armour/Armour/Damage/Hack", "add": 2 },
+		{ "value": "Armour/Armour/Damage/Pierce", "add": 2 },
+		{ "value": "Armour/Armour/Damage/Crush", "add": 2 }
 	],
 	"affects": ["Ship"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
Index: binaries/data/mods/public/simulation/data/technologies/armor_ship_reinforcedhull.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/armor_ship_reinforcedhull.json
+++ binaries/data/mods/public/simulation/data/technologies/armor_ship_reinforcedhull.json
@@ -8,9 +8,9 @@
 	"researchTime": 40,
 	"tooltip": "Wooden reinforcement beams for hulls. +2 levels to all ship armor types.",
 	"modifications": [
-		{ "value": "Armour/Hack", "add": 2 },
-		{ "value": "Armour/Pierce", "add": 2 },
-		{ "value": "Armour/Crush", "add": 2 }
+		{ "value": "Armour/Armour/Damage/Hack", "add": 2 },
+		{ "value": "Armour/Armour/Damage/Pierce", "add": 2 },
+		{ "value": "Armour/Armour/Damage/Crush", "add": 2 }
 	],
 	"affects": ["Ship"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
Index: binaries/data/mods/public/simulation/data/technologies/buildtime_walls_rubble.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/buildtime_walls_rubble.json
+++ binaries/data/mods/public/simulation/data/technologies/buildtime_walls_rubble.json
@@ -10,7 +10,7 @@
 	"tooltip": "City walls -20% build time, but -1 crush armor level.",
 	"modifications": [
 		{ "value": "Cost/BuildTime", "multiply": 0.8 },
-		{ "value": "Armour/Crush", "add": -1 }
+		{ "value": "Armour/Armour/Damage/Crush", "add": -1 }
 	],
 	"affects": ["StoneWall"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
Index: binaries/data/mods/public/simulation/data/technologies/elite_unit_bonus.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/elite_unit_bonus.json
+++ binaries/data/mods/public/simulation/data/technologies/elite_unit_bonus.json
@@ -4,9 +4,9 @@
 	"tooltip": "Units promoted to the elite class gain a lot of quality: 20% extra health, 1 extra armor level of every type, 20% extra loot, 20% extra attack for melee units, 4m extra range and better precision for ranged units, faster movement speeds and extra heal speed and range for healers.",
 	"modifications": [
 		{ "value": "Health/Max", "multiply": 1.2 },
-		{ "value": "Armour/Hack", "add": 1 },
-		{ "value": "Armour/Pierce", "add": 1 },
-		{ "value": "Armour/Crush", "add": 1 },
+		{ "value": "Armour/Armour/Damage/Hack", "add": 1 },
+		{ "value": "Armour/Armour/Damage/Pierce", "add": 1 },
+		{ "value": "Armour/Armour/Damage/Crush", "add": 1 },
 		{ "value": "Attack/Capture/Capture", "add": 0.4 },
 		{ "value": "ResourceGatherer/BaseSpeed", "multiply": 0.5 },
 		{ "value": "UnitMotion/WalkSpeed", "add": 0.5, "affects": "Infantry" },
Index: binaries/data/mods/public/simulation/data/technologies/health_walls_geometric_masonry.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/health_walls_geometric_masonry.json
+++ binaries/data/mods/public/simulation/data/technologies/health_walls_geometric_masonry.json
@@ -10,7 +10,7 @@
 	"tooltip": "City walls +2 crush armor levels, but +10% build time.",
 	"modifications": [
 		{ "value": "Cost/BuildTime", "multiply": 1.1 },
-		{ "value": "Armour/Crush", "add": 2 }
+		{ "value": "Armour/Armour/Damage/Crush", "add": 2 }
 	],
 	"affects": ["StoneWall"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
Index: binaries/data/mods/public/simulation/data/technologies/siege_armor.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/siege_armor.json
+++ binaries/data/mods/public/simulation/data/technologies/siege_armor.json
@@ -8,7 +8,7 @@
 	"researchTime": 40,
 	"tooltip": "Siege Engines +2 hack armor.",
 	"modifications": [
-		{ "value": "Armour/Hack", "add": 2 }
+		{ "value": "Armour/Armour/Damage/Hack", "add": 2 }
 	],
 	"affects": ["Siege"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
Index: binaries/data/mods/public/simulation/data/technologies/tower_armour.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/tower_armour.json
+++ binaries/data/mods/public/simulation/data/technologies/tower_armour.json
@@ -8,9 +8,9 @@
 	"researchTime": 40,
 	"tooltip": "Increases armor of defensive towers by 2 levels.",
 	"modifications": [
-		{ "value": "Armour/Hack", "add": 2 },
-		{ "value": "Armour/Pierce", "add": 2 },
-		{ "value": "Armour/Crush", "add": 2 }
+		{ "value": "Armour/Armour/Damage/Hack", "add": 2 },
+		{ "value": "Armour/Armour/Damage/Pierce", "add": 2 },
+		{ "value": "Armour/Armour/Damage/Crush", "add": 2 }
 	],
 	"affects": ["DefenseTower"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
Index: binaries/data/mods/public/simulation/data/technologies/trade_convoys_armor.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/trade_convoys_armor.json
+++ binaries/data/mods/public/simulation/data/technologies/trade_convoys_armor.json
@@ -9,8 +9,8 @@
 	"researchTime": 40,
 	"tooltip": "Traders +2 Hack and Pierce armor levels.",
 	"modifications": [
-		{ "value": "Armour/Hack", "add": 2 },
-		{ "value": "Armour/Pierce", "add": 2 }
+		{ "value": "Armour/Armour/Damage/Hack", "add": 2 },
+		{ "value": "Armour/Armour/Damage/Pierce", "add": 2 }
 	],
 	"affects": ["Trader"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
Index: binaries/data/mods/public/simulation/helpers/Attacking.js
===================================================================
--- binaries/data/mods/public/simulation/helpers/Attacking.js
+++ binaries/data/mods/public/simulation/helpers/Attacking.js
@@ -6,7 +6,6 @@
 /**
  * Builds a RelaxRNG schema of possible attack effects.
  * Currently harcoded to "Damage", "Capture" and "StatusEffects".
- * Attacks may also have a "Bonuses" element.
  *
  * @return {string}	- RelaxNG schema string
  */
@@ -18,10 +17,7 @@
 			"<element name='Damage'>" +
 				"<oneOrMore>" +
 					"<element a:help='One or more elements describing damage types'>" +
-						"<anyName>" +
-							// Armour requires Foundation to not be a damage type.
-							"<except><name>Foundation</name></except>" +
-						"</anyName>" +
+						"<anyName/>" +
 						"<ref name='nonNegativeDecimal' />" +
 					"</element>" +
 				"</oneOrMore>" +
@@ -42,7 +38,18 @@
 				"</oneOrMore>" +
 			"</element>" +
 		"</choice>" +
-	"</oneOrMore>" +
+	"</oneOrMore>";
+};
+
+/**
+ * Builds a RelaxRNG schema of possible bonuses.
+ * Attacks may also have a "Bonuses" element.
+ *
+ * @return {string}	- RelaxNG schema string
+ */
+Attacking.prototype.BuildBonusSchema = function()
+{
+	return "" +
 	"<optional>" +
 		"<element name='Bonuses'>" +
 			"<zeroOrMore>" +
@@ -88,11 +95,18 @@
 	return ret;
 };
 
-Attacking.prototype.GetTotalAttackEffects = function(effectData, effectType, cmpResistance)
+Attacking.prototype.GetTotalAttackEffects = function(effectData, effectType, target)
 {
+	let cmpResistance = Engine.QueryInterface(target, IID_Resistance);
 	let total = 0;
-	let armourStrengths = cmpResistance ? cmpResistance.GetArmourStrengths(effectType) : {};
-
+	let armourStrengths = {};
+	if (cmpResistance)
+	{
+		if (effectType == "Capture")
+			armourStrengths = cmpResistance.GetArmourStrengths(effectType);
+		else
+			armourStrengths = cmpResistance.GetArmourStrengths(effectType)[effectType];
+	}
 	for (let type in effectData)
 		total += effectData[type] * Math.pow(0.9, armourStrengths[type] || 0);
 
Index: binaries/data/mods/public/simulation/templates/campaigns/army_mace_hero_alexander.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/campaigns/army_mace_hero_alexander.xml
+++ binaries/data/mods/public/simulation/templates/campaigns/army_mace_hero_alexander.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_swordsman">
   <Armour>
-    <Crush>20.0</Crush>
+    <Armour>
+      <Damage>
+        <Crush>20.0</Crush>
+      </Damage>
+    </Armour>
   </Armour>
   <Attack>
     <Melee>
Index: binaries/data/mods/public/simulation/templates/campaigns/army_spart_hero_leonidas.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/campaigns/army_spart_hero_leonidas.xml
+++ binaries/data/mods/public/simulation/templates/campaigns/army_spart_hero_leonidas.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_swordsman">
   <Armour>
-    <Crush>20.0</Crush>
+    <Armour>
+      <Damage>
+        <Crush>20.0</Crush>
+      </Damage>
+    </Armour>
   </Armour>
   <Attack>
     <Melee>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_walrus.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_walrus.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_walrus.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_defensive">
   <Armour>
-    <Hack>3</Hack>
-    <Pierce>4</Pierce>
-    <Crush>5</Crush>
+    <Skin>
+      <Damage>
+        <Hack>3</Hack>
+        <Pierce>4</Pierce>
+        <Crush>5</Crush>
+      </Damage>
+    </Skin>
   </Armour>
   <Attack>
     <Melee>
Index: binaries/data/mods/public/simulation/templates/other/bench.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/other/bench.xml
+++ binaries/data/mods/public/simulation/templates/other/bench.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
   <Armour>
-    <Hack>1</Hack>
-    <Pierce>10</Pierce>
-    <Crush>1</Crush>
+    <Stone>
+      <Damage>
+        <Hack>1</Hack>
+        <Pierce>10</Pierce>
+        <Crush>1</Crush>
+      </Damage>
+    </Stone>
   </Armour>
   <BuildRestrictions>
     <Category>Special</Category>
Index: binaries/data/mods/public/simulation/templates/other/column_doric.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/other/column_doric.xml
+++ binaries/data/mods/public/simulation/templates/other/column_doric.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
   <Armour>
-    <Hack>2</Hack>
-    <Pierce>5</Pierce>
-    <Crush>2</Crush>
+    <Stone>
+      <Damage>
+        <Hack>2</Hack>
+        <Pierce>5</Pierce>
+        <Crush>2</Crush>
+      </Damage>
+    </Stone>
   </Armour>
   <BuildRestrictions>
     <Category>Fence</Category>
Index: binaries/data/mods/public/simulation/templates/other/column_doric_fallen.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/other/column_doric_fallen.xml
+++ binaries/data/mods/public/simulation/templates/other/column_doric_fallen.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
   <Armour>
-    <Hack>2</Hack>
-    <Pierce>5</Pierce>
-    <Crush>2</Crush>
+    <Stone>
+      <Damage>
+        <Hack>2</Hack>
+        <Pierce>5</Pierce>
+        <Crush>2</Crush>
+      </Damage>
+    </Stone>
   </Armour>
   <BuildRestrictions>
     <Category>Special</Category>
Index: binaries/data/mods/public/simulation/templates/other/column_doric_fallen_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/other/column_doric_fallen_b.xml
+++ binaries/data/mods/public/simulation/templates/other/column_doric_fallen_b.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
   <Armour>
-    <Hack>2</Hack>
-    <Pierce>5</Pierce>
-    <Crush>2</Crush>
+    <Stone>
+      <Damage>
+        <Hack>2</Hack>
+        <Pierce>5</Pierce>
+        <Crush>2</Crush>
+      </Damage>
+    </Stone>
   </Armour>
   <BuildRestrictions>
     <Category>Special</Category>
Index: binaries/data/mods/public/simulation/templates/other/fence_long.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/other/fence_long.xml
+++ binaries/data/mods/public/simulation/templates/other/fence_long.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
   <Armour>
-    <Hack>1</Hack>
-    <Pierce>10</Pierce>
-    <Crush>1</Crush>
+    <Stone>
+      <Damage>
+        <Hack>1</Hack>
+        <Pierce>10</Pierce>
+        <Crush>1</Crush>
+      </Damage>
+    </Stone>
   </Armour>
   <BuildRestrictions>
     <Category>Special</Category>
Index: binaries/data/mods/public/simulation/templates/other/fence_short.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/other/fence_short.xml
+++ binaries/data/mods/public/simulation/templates/other/fence_short.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
   <Armour>
-    <Hack>1</Hack>
-    <Pierce>10</Pierce>
-    <Crush>1</Crush>
+    <Stone>
+      <Damage>
+        <Hack>1</Hack>
+        <Pierce>10</Pierce>
+        <Crush>1</Crush>
+      </Damage>
+    </Stone>
   </Armour>
   <BuildRestrictions>
     <Category>Special</Category>
Index: binaries/data/mods/public/simulation/templates/other/fence_stone.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/other/fence_stone.xml
+++ binaries/data/mods/public/simulation/templates/other/fence_stone.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
   <Armour>
-    <Hack>2</Hack>
-    <Pierce>10</Pierce>
-    <Crush>2</Crush>
+    <Stone>
+      <Damage>
+        <Hack>2</Hack>
+        <Pierce>10</Pierce>
+        <Crush>2</Crush>
+      </Damage>
+    </Stone>
   </Armour>
   <BuildRestrictions>
     <Category>Special</Category>
Index: binaries/data/mods/public/simulation/templates/other/obelisk.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/other/obelisk.xml
+++ binaries/data/mods/public/simulation/templates/other/obelisk.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
   <Armour>
-    <Hack>2</Hack>
-    <Pierce>10</Pierce>
-    <Crush>2</Crush>
+    <Stone>
+      <Damage>
+        <Hack>2</Hack>
+        <Pierce>10</Pierce>
+        <Crush>2</Crush>
+      </Damage>
+    </Stone>
   </Armour>
   <BuildRestrictions>
     <Category>Special</Category>
Index: binaries/data/mods/public/simulation/templates/other/sele_colonnade.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/other/sele_colonnade.xml
+++ binaries/data/mods/public/simulation/templates/other/sele_colonnade.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
   <Armour>
-    <Hack>2</Hack>
-    <Pierce>5</Pierce>
-    <Crush>2</Crush>
+    <Stone>
+      <Damage>
+        <Hack>2</Hack>
+        <Pierce>5</Pierce>
+        <Crush>2</Crush>
+      </Damage>
+    </Stone>
   </Armour>
   <BuildRestrictions>
     <Category>Fence</Category>
Index: binaries/data/mods/public/simulation/templates/other/table_rectangle.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/other/table_rectangle.xml
+++ binaries/data/mods/public/simulation/templates/other/table_rectangle.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
   <Armour>
-    <Hack>1</Hack>
-    <Pierce>10</Pierce>
-    <Crush>1</Crush>
+    <Stone>
+      <Damage>
+        <Hack>1</Hack>
+        <Pierce>10</Pierce>
+        <Crush>1</Crush>
+      </Damage>
+    </Stone>
   </Armour>
   <BuildRestrictions>
     <Category>Special</Category>
Index: binaries/data/mods/public/simulation/templates/other/table_square.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/other/table_square.xml
+++ binaries/data/mods/public/simulation/templates/other/table_square.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
   <Armour>
-    <Hack>1</Hack>
-    <Pierce>10</Pierce>
-    <Crush>1</Crush>
+    <Stone>
+      <Damage>
+        <Hack>1</Hack>
+        <Pierce>10</Pierce>
+        <Crush>1</Crush>
+      </Damage>
+    </Stone>
   </Armour>
   <BuildRestrictions>
     <Category>Special</Category>
Index: binaries/data/mods/public/simulation/templates/structures/cart_super_dock.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart_super_dock.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart_super_dock.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
   <Armour>
-    <Pierce>35</Pierce>
+    <Stone>
+      <Damage>
+        <Pierce>35</Pierce>
+      </Damage>
+    </Stone>
   </Armour>
   <Auras datatype="tokens">
     structures/cart_super_dock_repair
Index: binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
   <Armour>
-    <Hack op="add">-5.0</Hack>
-    <Pierce op="add">-5.0</Pierce>
-    <Crush op="add">-1.0</Crush>
+    <Stone>
+      <Damage>
+        <Hack op="add">-5.0</Hack>
+        <Pierce op="add">-5.0</Pierce>
+        <Crush op="add">-1.0</Crush>
+      </Damage>
+    </Stone>
     <Foundation>
-      <Hack>1.0</Hack>
-      <Pierce>5.0</Pierce>
-      <Crush>1.0</Crush>
+      <Damage>
+        <Hack>1.0</Hack>
+        <Pierce>5.0</Pierce>
+        <Crush>1.0</Crush>
+      </Damage>
     </Foundation>
   </Armour>
   <Attack>
Index: binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_gate.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_gate.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_gate.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defensive_wall_gate">
   <Armour>
-    <Hack>15.0</Hack>
-    <Pierce>35.0</Pierce>
-    <Crush>5.0</Crush>
+    <Stone>
+      <Damage>
+        <Hack>15.0</Hack>
+        <Pierce>35.0</Pierce>
+        <Crush>5.0</Crush>
+      </Damage>
+    </Stone>
     <Foundation>
-      <Hack>4.0</Hack>
-      <Pierce>7.0</Pierce>
-      <Crush>3.0</Crush>
+      <Damage>
+        <Hack>4.0</Hack>
+        <Pierce>7.0</Pierce>
+        <Crush>3.0</Crush>
+      </Damage>
     </Foundation>
   </Armour>
   <BuildRestrictions>
Index: binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_long.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_long.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_long.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defensive_wall_long">
   <Armour>
-    <Hack>15.0</Hack>
-    <Pierce>35.0</Pierce>
-    <Crush>5.0</Crush>
+    <Stone>
+      <Damage>
+        <Hack>15.0</Hack>
+        <Pierce>35.0</Pierce>
+        <Crush>5.0</Crush>
+      </Damage>
+    </Stone>
     <Foundation>
-      <Hack>4.0</Hack>
-      <Pierce>7.0</Pierce>
-      <Crush>3.0</Crush>
+      <Damage>
+        <Hack>4.0</Hack>
+        <Pierce>7.0</Pierce>
+        <Crush>3.0</Crush>
+      </Damage>
     </Foundation>
   </Armour>
   <BuildRestrictions>
Index: binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_medium.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_medium.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_medium.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defensive_wall_medium">
   <Armour>
-    <Hack>15.0</Hack>
-    <Pierce>35.0</Pierce>
-    <Crush>5.0</Crush>
+    <Stone>
+      <Damage>
+        <Hack>15.0</Hack>
+        <Pierce>35.0</Pierce>
+        <Crush>5.0</Crush>
+      </Damage>
+    </Stone>
     <Foundation>
-      <Hack>4.0</Hack>
-      <Pierce>7.0</Pierce>
-      <Crush>3.0</Crush>
+      <Damage>
+        <Hack>4.0</Hack>
+        <Pierce>7.0</Pierce>
+        <Crush>3.0</Crush>
+      </Damage>
     </Foundation>
   </Armour>
   <BuildRestrictions>
Index: binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_short.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_short.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_short.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defensive_wall_short">
   <Armour>
-    <Hack>15.0</Hack>
-    <Pierce>35.0</Pierce>
-    <Crush>5.0</Crush>
+    <Stone>
+      <Damage>
+        <Hack>15.0</Hack>
+        <Pierce>35.0</Pierce>
+        <Crush>5.0</Crush>
+      </Damage>
+    </Stone>
     <Foundation>
-      <Hack>4.0</Hack>
-      <Pierce>7.0</Pierce>
-      <Crush>3.0</Crush>
+      <Damage>
+        <Hack>4.0</Hack>
+        <Pierce>7.0</Pierce>
+        <Crush>3.0</Crush>
+      </Damage>
     </Foundation>
   </Armour>
   <BuildRestrictions>
Index: binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_tower.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defensive_wall_tower">
   <Armour>
-    <Hack>15.0</Hack>
-    <Pierce>35.0</Pierce>
-    <Crush>5.0</Crush>
+    <Stone>
+      <Damage>
+        <Hack>15.0</Hack>
+        <Pierce>35.0</Pierce>
+        <Crush>5.0</Crush>
+      </Damage>
+    </Stone>
     <Foundation>
-      <Hack>4.0</Hack>
-      <Pierce>7.0</Pierce>
-      <Crush>3.0</Crush>
+      <Damage>
+        <Hack>4.0</Hack>
+        <Pierce>7.0</Pierce>
+        <Crush>3.0</Crush>
+      </Damage>
     </Foundation>
   </Armour>
   <BuildRestrictions>
Index: binaries/data/mods/public/simulation/templates/template_structure.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure.xml
+++ binaries/data/mods/public/simulation/templates/template_structure.xml
@@ -2,13 +2,19 @@
 <Entity>
   <AIProxy/>
   <Armour>
-    <Hack>1</Hack>
-    <Pierce>1</Pierce>
-    <Crush>1</Crush>
+    <Stone>
+      <Damage>
+        <Hack>1</Hack>
+        <Pierce>1</Pierce>
+        <Crush>1</Crush>
+      </Damage>
+    </Stone>
     <Foundation>
-      <Hack>1</Hack>
-      <Pierce>1</Pierce>
-      <Crush>1</Crush>
+      <Damage>
+        <Hack>1</Hack>
+        <Pierce>1</Pierce>
+        <Crush>1</Crush>
+      </Damage>
     </Foundation>
   </Armour>
   <BuildingAI>
Index: binaries/data/mods/public/simulation/templates/template_structure_civic.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_civic.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_civic.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
   <Armour>
-    <Hack>20</Hack>
-    <Pierce>30</Pierce>
-    <Crush>3</Crush>
+    <Stone>
+      <Damage>
+        <Hack>20</Hack>
+        <Pierce>30</Pierce>
+        <Crush>3</Crush>
+      </Damage>
+    </Stone>
     <Foundation>
-      <Hack>1</Hack>
-      <Pierce>5</Pierce>
-      <Crush>1</Crush>
+      <Damage>
+        <Hack>1</Hack>
+        <Pierce>5</Pierce>
+        <Crush>1</Crush>
+      </Damage>
     </Foundation>
   </Armour>
   <Identity>
Index: binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
@@ -7,12 +7,18 @@
     <SearchRange>100</SearchRange>
   </AlertRaiser>
   <Armour>
-    <Hack op="add">5</Hack>
-    <Pierce op="add">5</Pierce>
+    <Stone>
+      <Damage>
+        <Hack op="add">5</Hack>
+        <Pierce op="add">5</Pierce>
+      </Damage>
+    </Stone>
     <Foundation>
-      <Hack>5</Hack>
-      <Pierce>15</Pierce>
-      <Crush>3</Crush>
+      <Damage>
+        <Hack>5</Hack>
+        <Pierce>15</Pierce>
+        <Crush>3</Crush>
+      </Damage>
     </Foundation>
   </Armour>
   <Attack>
Index: binaries/data/mods/public/simulation/templates/template_structure_defensive.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defensive.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defensive.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
   <Armour>
-    <Hack>25</Hack>
-    <Pierce>30</Pierce>
-    <Crush>3</Crush>
+    <Stone>
+      <Damage>
+        <Hack>25</Hack>
+        <Pierce>30</Pierce>
+        <Crush>3</Crush>
+      </Damage>
+    </Stone>
     <Foundation>
-      <Hack>1.0</Hack>
-      <Pierce>5.0</Pierce>
-      <Crush>1.0</Crush>
+      <Damage>
+        <Hack>1.0</Hack>
+        <Pierce>5.0</Pierce>
+        <Crush>1.0</Crush>
+      </Damage>
     </Foundation>
   </Armour>
   <Identity>
Index: binaries/data/mods/public/simulation/templates/template_structure_defensive_palisade.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defensive_palisade.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defensive_palisade.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defensive">
   <Armour>
-    <Hack>4</Hack>
-    <Pierce>25</Pierce>
-    <Crush>2</Crush>
+    <Stone>
+      <Damage>
+        <Hack>4</Hack>
+        <Pierce>25</Pierce>
+        <Crush>2</Crush>
+      </Damage>
+    </Stone>
   </Armour>
   <BuildRestrictions>
     <PlacementType>land-shore</PlacementType>
Index: binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_outpost.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_outpost.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_outpost.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defensive_tower">
   <Armour>
-    <Hack>5</Hack>
-    <Pierce>20</Pierce>
-    <Crush>1</Crush>
+    <Stone>
+      <Damage>
+        <Hack>5</Hack>
+        <Pierce>20</Pierce>
+        <Crush>1</Crush>
+      </Damage>
+    </Stone>
     <Foundation>
-      <Hack>1</Hack>
-      <Pierce>5</Pierce>
-      <Crush>1</Crush>
+      <Damage>
+        <Hack>1</Hack>
+        <Pierce>5</Pierce>
+        <Crush>1</Crush>
+      </Damage>
     </Foundation>
   </Armour>
   <Attack>
Index: binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_sentry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_sentry.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_sentry.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defensive_tower">
   <Armour>
-    <Hack op="add">-5</Hack>
-    <Pierce op="add">-5</Pierce>
-    <Crush op="add">-2</Crush>
+    <Stone>
+      <Damage>
+        <Hack op="add">-5</Hack>
+        <Pierce op="add">-5</Pierce>
+        <Crush op="add">-2</Crush>
+      </Damage>
+    </Stone>
   </Armour>
   <Attack>
     <Ranged>
Index: binaries/data/mods/public/simulation/templates/template_structure_economic.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_economic.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_economic.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
   <Armour>
-    <Hack>5</Hack>
-    <Pierce>20</Pierce>
-    <Crush>1</Crush>
+    <Stone>
+      <Damage>
+        <Hack>5</Hack>
+        <Pierce>20</Pierce>
+        <Crush>1</Crush>
+      </Damage>
+    </Stone>
     <Foundation>
-      <Hack>1</Hack>
-      <Pierce>5</Pierce>
-      <Crush>1</Crush>
+      <Damage>
+        <Hack>1</Hack>
+        <Pierce>5</Pierce>
+        <Crush>1</Crush>
+      </Damage>
     </Foundation>
   </Armour>
   <Identity>
Index: binaries/data/mods/public/simulation/templates/template_structure_military.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_military.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
   <Armour>
-    <Hack>20</Hack>
-    <Pierce>35</Pierce>
-    <Crush>3</Crush>
+    <Stone>
+      <Damage>
+        <Hack>20</Hack>
+        <Pierce>35</Pierce>
+        <Crush>3</Crush>
+      </Damage>
+    </Stone>
     <Foundation>
-      <Hack>1</Hack>
-      <Pierce>5</Pierce>
-      <Crush>1</Crush>
+      <Damage>
+        <Hack>1</Hack>
+        <Pierce>5</Pierce>
+        <Crush>1</Crush>
+      </Damage>
     </Foundation>
   </Armour>
   <BuildRestrictions>
Index: binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military">
   <Armour>
-    <Pierce>30</Pierce>
+    <Stone>
+      <Damage>
+        <Pierce>30</Pierce>
+      </Damage>
+    </Stone>
     <Foundation>
-      <Hack>3</Hack>
-      <Pierce>10</Pierce>
-      <Crush>3</Crush>
+      <Damage>
+        <Hack>3</Hack>
+        <Pierce>10</Pierce>
+        <Crush>3</Crush>
+      </Damage>
     </Foundation>
   </Armour>
   <BuildRestrictions>
Index: binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military">
   <Armour>
-    <Hack op="add">5</Hack>
-    <Pierce op="add">5</Pierce>
-    <Crush op="add">3</Crush>
+    <Stone>
+      <Damage>
+        <Hack op="add">5</Hack>
+        <Pierce op="add">5</Pierce>
+        <Crush op="add">3</Crush>
+      </Damage>
+    </Stone>
   </Armour>
   <Attack>
     <Ranged>
Index: binaries/data/mods/public/simulation/templates/template_structure_military_kennel.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_kennel.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_military_kennel.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military">
   <Armour>
-    <Hack>10</Hack>
-    <Pierce>40</Pierce>
-    <Crush>5</Crush>
+    <Stone>
+      <Damage>
+        <Hack>10</Hack>
+        <Pierce>40</Pierce>
+        <Crush>5</Crush>
+      </Damage>
+    </Stone>
     <Foundation>
-      <Hack>3</Hack>
-      <Pierce>8</Pierce>
-      <Crush>2</Crush>
+      <Damage>
+        <Hack>3</Hack>
+        <Pierce>8</Pierce>
+        <Crush>2</Crush>
+      </Damage>
     </Foundation>
   </Armour>
   <BuildRestrictions>
Index: binaries/data/mods/public/simulation/templates/template_structure_resource.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_resource.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_resource.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
   <Armour>
-    <Hack>1</Hack>
-    <Pierce>20</Pierce>
-    <Crush>1</Crush>
+    <Stone>
+      <Damage>
+        <Hack>1</Hack>
+        <Pierce>20</Pierce>
+        <Crush>1</Crush>
+      </Damage>
+    </Stone>
     <Foundation>
-      <Hack>1</Hack>
-      <Pierce>10</Pierce>
-      <Crush>1</Crush>
+      <Damage>
+        <Hack>1</Hack>
+        <Pierce>10</Pierce>
+        <Crush>1</Crush>
+      </Damage>
     </Foundation>
   </Armour>
   <BuildRestrictions>
Index: binaries/data/mods/public/simulation/templates/template_structure_resource_field.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_resource_field.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_resource_field.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_resource">
   <Armour>
-    <Hack>15</Hack>
-    <Pierce>40</Pierce>
-    <Crush>5</Crush>
+    <Stone>
+      <Damage>
+        <Hack>15</Hack>
+        <Pierce>40</Pierce>
+        <Crush>5</Crush>
+      </Damage>
+    </Stone>
   </Armour>
   <BuildRestrictions>
     <Category>Field</Category>
Index: binaries/data/mods/public/simulation/templates/template_structure_special.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_special.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_special.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
   <Armour>
-    <Hack>20</Hack>
-    <Pierce>30</Pierce>
-    <Crush>3</Crush>
+    <Stone>
+      <Damage>
+        <Hack>20</Hack>
+        <Pierce>30</Pierce>
+        <Crush>3</Crush>
+      </Damage>
+    </Stone>
     <Foundation>
-      <Hack>3</Hack>
-      <Pierce>10</Pierce>
-      <Crush>3</Crush>
+      <Damage>
+        <Hack>3</Hack>
+        <Pierce>10</Pierce>
+        <Crush>3</Crush>
+      </Damage>
     </Foundation>
   </Armour>
   <BuildRestrictions>
Index: binaries/data/mods/public/simulation/templates/template_structure_wonder.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_wonder.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_wonder.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
   <Armour>
-    <Hack>15</Hack>
-    <Pierce>25</Pierce>
-    <Crush>3</Crush>
+    <Stone>
+      <Damage>
+        <Hack>15</Hack>
+        <Pierce>25</Pierce>
+        <Crush>3</Crush>
+      </Damage>
+    </Stone>
     <Foundation>
-      <Hack>2</Hack>
-      <Pierce>10</Pierce>
-      <Crush>2</Crush>
+      <Damage>
+        <Hack>2</Hack>
+        <Pierce>10</Pierce>
+        <Crush>2</Crush>
+      </Damage>
     </Foundation>
   </Armour>
   <Auras datatype="tokens">
Index: binaries/data/mods/public/simulation/templates/template_unit.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit.xml
+++ binaries/data/mods/public/simulation/templates/template_unit.xml
@@ -2,9 +2,13 @@
 <Entity>
   <AIProxy/>
   <Armour>
-    <Hack>1</Hack>
-    <Pierce>1</Pierce>
-    <Crush>15</Crush>
+    <Armour>
+      <Damage>
+        <Hack>1</Hack>
+        <Pierce>1</Pierce>
+        <Crush>15</Crush>
+      </Damage>
+    </Armour>
   </Armour>
   <Cost>
     <Population>1</Population>
Index: binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
   <Armour>
-    <Hack>3</Hack>
-    <Pierce>1</Pierce>
-    <Crush>15</Crush>
+    <Armour>
+      <Damage>
+        <Hack>3</Hack>
+        <Pierce>1</Pierce>
+        <Crush>15</Crush>
+      </Damage>
+    </Armour>
   </Armour>
   <Attack>
     <Capture>
Index: binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry">
   <Armour>
-    <Hack>4</Hack>
-    <Pierce>3</Pierce>
+    <Armour>
+      <Damage>
+        <Hack>4</Hack>
+        <Pierce>3</Pierce>
+      </Damage>
+    </Armour>
   </Armour>
   <Attack>
     <Melee>
Index: binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry_melee">
   <Armour>
-    <Hack>4</Hack>
-    <Pierce>2</Pierce>
+    <Armour>
+      <Damage>
+        <Hack>4</Hack>
+        <Pierce>2</Pierce>
+      </Damage>
+    </Armour>
   </Armour>
   <Attack>
     <Melee>
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion">
   <Armour>
-    <Hack>7</Hack>
-    <Pierce>5</Pierce>
-    <Crush>20</Crush>
+    <Armour>
+      <Damage>
+        <Hack>7</Hack>
+        <Pierce>5</Pierce>
+        <Crush>20</Crush>
+      </Damage>
+    </Armour>
   </Armour>
   <Cost>
     <Population>1</Population>
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry">
   <Armour>
-    <Hack op="add">1</Hack>
-    <Pierce op="add">2</Pierce>
+    <Armour>
+      <Damage>
+        <Hack op="add">1</Hack>
+        <Pierce op="add">2</Pierce>
+      </Damage>
+    </Armour>
   </Armour>
   <Attack>
     <Melee>
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry">
   <Armour>
-    <Hack op="add">1</Hack>
-    <Pierce op="add">2</Pierce>
+    <Armour>
+      <Damage>
+        <Hack op="add">1</Hack>
+        <Pierce op="add">2</Pierce>
+      </Damage>
+    </Armour>
   </Armour>
   <Attack>
     <Melee>
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion">
   <Armour>
-    <Hack>10</Hack>
-    <Pierce>10</Pierce>
-    <Crush>25</Crush>
+    <Armour>
+      <Damage>
+        <Hack>10</Hack>
+        <Pierce>10</Pierce>
+        <Crush>25</Crush>
+      </Damage>
+    </Armour>
   </Armour>
   <Cost>
     <Population>3</Population>
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_infantry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion_infantry.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_infantry.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion">
   <Armour>
-    <Hack>5</Hack>
-    <Pierce>5</Pierce>
-    <Crush>20</Crush>
+    <Armour>
+      <Damage>
+        <Hack>5</Hack>
+        <Pierce>5</Pierce>
+        <Crush>20</Crush>
+      </Damage>
+    </Armour>
   </Armour>
   <Cost>
     <BuildTime>20</BuildTime>
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_maceman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_maceman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_maceman.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry">
   <Armour>
-    <Hack op="add">1</Hack>
-    <Pierce op="add">1</Pierce>
+    <Armour>
+      <Damage>
+        <Hack op="add">1</Hack>
+        <Pierce op="add">1</Pierce>
+      </Damage>
+    </Armour>
   </Armour>
   <Attack>
     <Melee>
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry">
   <Armour>
-    <Hack op="add">8</Hack>
-    <Pierce op="add">8</Pierce>
-    <Crush>20</Crush>
+    <Armour>
+      <Damage>
+        <Hack op="add">8</Hack>
+        <Pierce op="add">8</Pierce>
+        <Crush>20</Crush>
+      </Damage>
+    </Armour>
   </Armour>
   <Attack>
     <Melee>
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry">
   <Armour>
-    <Hack op="add">3</Hack>
-    <Pierce op="add">3</Pierce>
+    <Armour>
+      <Damage>
+        <Hack op="add">3</Hack>
+        <Pierce op="add">3</Pierce>
+      </Damage>
+    </Armour>
   </Armour>
   <Attack>
     <Melee>
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry">
   <Armour>
-    <Hack op="add">3</Hack>
-    <Pierce op="add">3</Pierce>
+    <Armour>
+      <Damage>
+        <Hack op="add">3</Hack>
+        <Pierce op="add">3</Pierce>
+      </Damage>
+    </Armour>
   </Armour>
   <Attack>
     <Melee>
Index: binaries/data/mods/public/simulation/templates/template_unit_dog.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_dog.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_dog.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
   <Armour>
-    <Hack>1</Hack>
-    <Pierce>2</Pierce>
-    <Crush>1</Crush>
+    <Armour>
+      <Damage>
+        <Hack>1</Hack>
+        <Pierce>2</Pierce>
+        <Crush>1</Crush>
+      </Damage>
+    </Armour>
   </Armour>
   <Attack>
     <Melee>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_defensive">
   <Armour>
-    <Hack>3</Hack>
-    <Pierce>4</Pierce>
-    <Crush>5</Crush>
+    <Armour>
+      <Damage>
+        <Hack>3</Hack>
+        <Pierce>4</Pierce>
+        <Crush>5</Crush>
+      </Damage>
+    </Armour>
   </Armour>
   <Attack>
     <Melee>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_skittish_elephant_infant.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_skittish_elephant_infant.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_skittish_elephant_infant.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
   <Armour>
-    <Hack>1</Hack>
-    <Pierce>3</Pierce>
-    <Crush>1</Crush>
+    <Armour>
+      <Damage>
+        <Hack>1</Hack>
+        <Pierce>3</Pierce>
+        <Crush>1</Crush>
+      </Damage>
+    </Armour>
   </Armour>
   <Footprint>
     <Square width="1.7" depth="3.4"/>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
   <Armour>
-    <Hack>10.0</Hack>
-    <Pierce>20.0</Pierce>
-    <Crush>15.0</Crush>
+    <Armour>
+      <Damage>
+        <Hack>10.0</Hack>
+        <Pierce>20.0</Pierce>
+        <Crush>15.0</Crush>
+      </Damage>
+    </Armour>
   </Armour>
   <Attack>
     <Capture>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero">
   <Armour>
-    <Hack>10</Hack>
-    <Pierce>8</Pierce>
-    <Crush>25</Crush>
+    <Armour>
+      <Damage>
+        <Hack>10</Hack>
+        <Pierce>8</Pierce>
+        <Crush>25</Crush>
+      </Damage>
+    </Armour>
   </Armour>
   <Cost>
     <BuildTime>50</BuildTime>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry">
   <Armour>
-    <Hack op="add">1</Hack>
-    <Pierce op="add">2</Pierce>
+    <Armour>
+      <Damage>
+        <Hack op="add">1</Hack>
+        <Pierce op="add">2</Pierce>
+      </Damage>
+    </Armour>
   </Armour>
   <Attack>
     <Melee>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry">
   <Armour>
-    <Hack op="add">1</Hack>
-    <Pierce op="add">1</Pierce>
+    <Armour>
+      <Damage>
+        <Hack op="add">1</Hack>
+        <Pierce op="add">1</Pierce>
+      </Damage>
+    </Armour>
   </Armour>
   <Attack>
     <Melee>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero">
   <Armour>
-    <Hack>10</Hack>
-    <Pierce>10</Pierce>
-    <Crush>25</Crush>
+    <Armour>
+      <Damage>
+        <Hack>10</Hack>
+        <Pierce>10</Pierce>
+        <Crush>25</Crush>
+      </Damage>
+    </Armour>
   </Armour>
   <Attack replace="">
     <Melee>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_healer.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_healer.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_healer.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero">
   <Armour>
-    <Hack>4.0</Hack>
-    <Pierce>8.0</Pierce>
-    <Crush>4.0</Crush>
+    <Armour>
+      <Damage>
+        <Hack>4.0</Hack>
+        <Pierce>8.0</Pierce>
+        <Crush>4.0</Crush>
+      </Damage>
+    </Armour>
   </Armour>
   <Attack disable=""/>
   <Cost>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero">
   <Armour>
-    <Hack>8</Hack>
-    <Pierce>8</Pierce>
-    <Crush>25</Crush>
+    <Armour>
+      <Damage>
+        <Hack>8</Hack>
+        <Pierce>8</Pierce>
+        <Crush>25</Crush>
+      </Damage>
+    </Armour>
   </Armour>
   <Cost>
     <BuildTime>40</BuildTime>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry">
   <Armour>
-    <Hack op="add">9</Hack>
-    <Pierce op="add">9</Pierce>
+    <Armour>
+      <Damage>
+        <Hack op="add">9</Hack>
+        <Pierce op="add">9</Pierce>
+      </Damage>
+    </Armour>
   </Armour>
   <Attack>
     <Melee>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry">
   <Armour>
-    <Hack op="add">4</Hack>
-    <Pierce op="add">4</Pierce>
+    <Armour>
+      <Damage>
+        <Hack op="add">4</Hack>
+        <Pierce op="add">4</Pierce>
+      </Damage>
+    </Armour>
   </Armour>
   <Attack>
     <Melee>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry">
   <Armour>
-    <Hack op="add">4</Hack>
-    <Pierce op="add">4</Pierce>
+    <Armour>
+      <Damage>
+        <Hack op="add">4</Hack>
+        <Pierce op="add">4</Pierce>
+      </Damage>
+    </Armour>
   </Armour>
   <Attack>
     <Melee>
Index: binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
   <Armour>
-    <Hack>2</Hack>
-    <Pierce>4</Pierce>
-    <Crush>15</Crush>
+    <Armour>
+      <Damage>
+        <Hack>2</Hack>
+        <Pierce>4</Pierce>
+        <Crush>15</Crush>
+      </Damage>
+    </Armour>
   </Armour>
   <Attack>
     <Capture>
Index: binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee">
   <Armour>
-    <Hack>10</Hack>
-    <Pierce>10</Pierce>
+    <Armour>
+      <Damage>
+        <Hack>10</Hack>
+        <Pierce>10</Pierce>
+      </Damage>
+    </Armour>
   </Armour>
   <Attack>
     <Melee>
Index: binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee">
   <Armour>
-    <Hack>5</Hack>
-    <Pierce>5</Pierce>
+    <Armour>
+      <Damage>
+        <Hack>5</Hack>
+        <Pierce>5</Pierce>
+      </Damage>
+    </Armour>
   </Armour>
   <Attack>
     <Melee>
Index: binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee">
   <Armour>
-    <Hack>5</Hack>
-    <Pierce>5</Pierce>
+    <Armour>
+      <Damage>
+        <Hack>5</Hack>
+        <Pierce>5</Pierce>
+      </Damage>
+    </Armour>
   </Armour>
   <Attack>
     <Melee>
Index: binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry">
   <Armour>
-    <Hack>1</Hack>
-    <Pierce>1</Pierce>
-    <Crush>10</Crush>
+    <Armour>
+      <Damage>
+        <Hack>1</Hack>
+        <Pierce>1</Pierce>
+        <Crush>10</Crush>
+      </Damage>
+    </Armour>
   </Armour>
   <Attack>
     <Ranged>
Index: binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged">
   <Armour>
-    <Hack>1</Hack>
-    <Pierce>1</Pierce>
+    <Armour>
+      <Damage>
+        <Hack>1</Hack>
+        <Pierce>1</Pierce>
+      </Damage>
+    </Armour>
   </Armour>
   <Attack>
     <Ranged>
Index: binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged">
   <Armour>
-    <Hack>1</Hack>
-    <Pierce>1</Pierce>
+    <Armour>
+      <Damage>
+        <Hack>1</Hack>
+        <Pierce>1</Pierce>
+      </Damage>
+    </Armour>
   </Armour>
   <Attack>
     <Ranged>
Index: binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged">
   <Armour>
-    <Hack>1</Hack>
-    <Pierce>1</Pierce>
+    <Armour>
+      <Damage>
+        <Hack>1</Hack>
+        <Pierce>1</Pierce>
+      </Damage>
+    </Armour>
   </Armour>
   <Attack>
     <Ranged>
Index: binaries/data/mods/public/simulation/templates/template_unit_ship.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_ship.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_ship.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
   <Armour>
-    <Hack>5</Hack>
-    <Pierce>10</Pierce>
-    <Crush>5</Crush>
+    <Armour>
+      <Damage>
+        <Hack>5</Hack>
+        <Pierce>10</Pierce>
+        <Crush>5</Crush>
+      </Damage>
+    </Armour>
   </Armour>
   <Cost>
     <Population>1</Population>
Index: binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship">
   <Armour>
-    <Hack>2</Hack>
-    <Pierce>5</Pierce>
-    <Crush>2</Crush>
+    <Armour>
+      <Damage>
+        <Hack>2</Hack>
+        <Pierce>5</Pierce>
+        <Crush>2</Crush>
+      </Damage>
+    </Armour>
   </Armour>
   <Attack>
     <Melee>
Index: binaries/data/mods/public/simulation/templates/template_unit_ship_merchant.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_ship_merchant.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_ship_merchant.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship">
   <Armour>
-    <Hack>2</Hack>
-    <Pierce>5</Pierce>
-    <Crush>2</Crush>
+    <Armour>
+      <Damage>
+        <Hack>2</Hack>
+        <Pierce>5</Pierce>
+        <Crush>2</Crush>
+      </Damage>
+    </Armour>
   </Armour>
   <Cost>
     <Resources>
Index: binaries/data/mods/public/simulation/templates/template_unit_siege.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_siege.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_siege.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
   <Armour>
-    <Hack>1</Hack>
-    <Pierce>50</Pierce>
-    <Crush>5</Crush>
+    <Armour>
+      <Damage>
+        <Hack>1</Hack>
+        <Pierce>50</Pierce>
+        <Crush>5</Crush>
+      </Damage>
+    </Armour>
   </Armour>
   <Capturable>
     <CapturePoints>500</CapturePoints>
Index: binaries/data/mods/public/simulation/templates/template_unit_support.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_support.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_support.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
   <Armour>
-    <Hack>1</Hack>
-    <Pierce>1</Pierce>
-    <Crush>1</Crush>
+    <Armour>
+      <Damage>
+        <Hack>1</Hack>
+        <Pierce>1</Pierce>
+        <Crush>1</Crush>
+      </Damage>
+    </Armour>
   </Armour>
   <Cost>
     <BuildTime>8</BuildTime>
Index: binaries/data/mods/public/simulation/templates/units/gaul_champion_fanatic.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/gaul_champion_fanatic.xml
+++ binaries/data/mods/public/simulation/templates/units/gaul_champion_fanatic.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_spearman">
   <Armour>
-    <Hack op="add">-4</Hack>
-    <Pierce op="add">-4</Pierce>
+    <Armour>
+      <Damage>
+        <Hack op="add">-4</Hack>
+        <Pierce op="add">-4</Pierce>
+      </Damage>
+    </Armour>
   </Armour>
   <Cost>
     <BuildTime op="mul">0.75</BuildTime>
Index: binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_apedemak.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_apedemak.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_apedemak.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_swordsman">
   <Armour>
-    <Hack op="add">-1</Hack>
-    <Pierce op="add">-1</Pierce>
+    <Armour>
+      <Damage>
+        <Hack op="add">-1</Hack>
+        <Pierce op="add">-1</Pierce>
+      </Damage>
+    </Armour>
   </Armour>
   <Attack>
     <Melee>
Index: binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee_swordsman">
   <Armour>
-    <Hack op="add">-1</Hack>
+    <Armour>
+      <Damage>
+        <Hack op="add">-1</Hack>
+      </Damage>
+    </Armour>
   </Armour>
   <Attack>
     <Melee>
Index: binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_e.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_e.xml
+++ binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_e.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/mace_champion_infantry_a">
   <Armour>
-    <Hack op="add">1</Hack>
-    <Pierce op="add">1</Pierce>
+    <Armour>
+      <Damage>
+        <Hack op="add">1</Hack>
+        <Pierce op="add">1</Pierce>
+      </Damage>
+    </Armour>
   </Armour>
   <Health>
     <Max op="mul">1.1</Max>
Index: binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry_ranged_archer">
   <Armour>
-    <Hack op="add">1.0</Hack>
-    <Pierce op="add">2.0</Pierce>
+    <Armour>
+      <Damage>
+        <Hack op="add">1.0</Hack>
+        <Pierce op="add">2.0</Pierce>
+      </Damage>
+    </Armour>
   </Armour>
   <Attack>
     <Capture disable=""/>
Index: binaries/data/mods/public/simulation/templates/units/maur_support_elephant.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur_support_elephant.xml
+++ binaries/data/mods/public/simulation/templates/units/maur_support_elephant.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support">
   <Armour>
-    <Hack>5</Hack>
-    <Pierce>8</Pierce>
-    <Crush>10</Crush>
+    <Armour>
+      <Damage>
+        <Hack>5</Hack>
+        <Pierce>8</Pierce>
+        <Crush>10</Crush>
+      </Damage>
+    </Armour>
   </Armour>
   <Builder>
     <Rate>2.0</Rate>
Index: binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml
+++ binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_swordsman">
   <Armour>
-    <Hack op="add">2</Hack>
-    <Pierce op="add">2</Pierce>
+    <Armour>
+      <Damage>
+        <Hack op="add">2</Hack>
+        <Pierce op="add">2</Pierce>
+      </Damage>
+    </Armour>
   </Armour>
   <Attack>
     <Melee>