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,22 @@
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")
+ {
+ for (let damageType in template.Armour[resistanceType].Damage)
+ {
+ if (!ret.armour[damageType])
+ ret.armour[damageType] = 0;
+ ret.armour[damageType] += getEntityValue("Armour/" + resistanceType + "/Damage/" + damageType);
+ }
+ if (!ret.armour.Capture)
+ ret.armour.Capture = 0;
+ ret.armour.Capture += getEntityValue("Armour/" + resistanceType + "/Capture");
+ }
+
+ }
}
let getAttackEffects = (temp, path) => {
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 = "" +
- "" +
- "" +
- "" +
- "Foundation" +
- "" +
- "" +
- "" +
- "";
-
Armour.prototype.Schema =
"Controls the damage resistance of the unit." +
"" +
- "10.0" +
- "0.0" +
- "5.0" +
+ "" +
+ "" +
+ "10.0" +
+ "0.0" +
+ "5.0" +
+ "" +
+ "10" +
+ "" +
+ "" +
+ "" +
+ "" +
+ "10" +
+ "0" +
+ "5.0" +
+ "" +
+ "" +
+ "" +
"" +
- Armour.prototype.DamageResistanceSchema +
- "" +
- "" +
- Armour.prototype.DamageResistanceSchema +
+ "" +
+ "" +
+ "" +
+ Attacking.BuildAttackEffectsSchema() +
"" +
- "";
+ "";
Armour.prototype.Init = function()
{
@@ -40,33 +44,55 @@
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
+ for (let damageType in template)
+ {
+ if (!ret[damageType])
+ ret[damageType] = 0;
+ ret[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 @@
"" +
"" +
Attacking.BuildAttackEffectsSchema() +
+ Attacking.BuildBonusSchema() +
"" +
"" +
"" +
@@ -113,6 +114,7 @@
"" +
"" +
Attacking.BuildAttackEffectsSchema() +
+ Attacking.BuildBonusSchema() +
"" +
"" +
""+
@@ -141,6 +143,7 @@
"" +
"" +
Attacking.BuildAttackEffectsSchema() +
+ Attacking.BuildBonusSchema() +
"" +
"" +
"" +
@@ -184,6 +187,7 @@
"" +
"" +
Attacking.BuildAttackEffectsSchema() +
+ Attacking.BuildBonusSchema() +
"" +
"" + // TODO: it shouldn't be stretched
"" +
@@ -197,6 +201,7 @@
"" +
"" +
Attacking.BuildAttackEffectsSchema() +
+ Attacking.BuildBonusSchema() +
"" + // TODO: how do these work?
Attack.prototype.preferredClassesSchema +
Attack.prototype.restrictedClassesSchema +
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 =
- "" +
- "" +
- "" +
- "" +
- "" +
- "" +
- "" +
- "" +
- "" +
- "" +
- "" +
- "" +
- "" +
- "" +
- "" +
- "";
-
DeathDamage.prototype.Schema =
"When a unit or building is destroyed, it inflicts damage to nearby units." +
"" +
@@ -33,7 +15,8 @@
"" +
"" +
"" +
- 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,10 @@
let cmpArmour = Engine.QueryInterface(ent, IID_Resistance);
if (cmpArmour)
+ {
ret.armour = cmpArmour.GetArmourStrengths("Damage");
+ ret.armour.Capture = cmpArmour.GetArmourStrengths("Capture").Capture;
+ }
let cmpBuildingAI = Engine.QueryInterface(ent, IID_BuildingAI);
if (cmpBuildingAI)
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
*/
@@ -42,7 +41,18 @@
"" +
"" +
"" +
- "" +
+ "";
+};
+
+/**
+ * Builds a RelaxRNG schema of possible bonuses.
+ * Attacks may also have a "Bonuses" element.
+ *
+ * @return {string} - RelaxNG schema string
+ */
+Attacking.prototype.BuildBonusSchema = function()
+{
+ return "" +
"" +
"" +
"" +
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 @@
- 20.0
+
+
+ 20.0
+
+
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 @@
- 20.0
+
+
+ 20.0
+
+
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 @@
- 3
- 4
- 5
+
+
+ 3
+ 4
+ 5
+
+
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 @@
- 1
- 10
- 1
+
+
+ 1
+ 10
+ 1
+
+
Special
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 @@
- 2
- 5
- 2
+
+
+ 2
+ 5
+ 2
+
+
Fence
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 @@
- 2
- 5
- 2
+
+
+ 2
+ 5
+ 2
+
+
Special
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 @@
- 2
- 5
- 2
+
+
+ 2
+ 5
+ 2
+
+
Special
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 @@
- 1
- 10
- 1
+
+
+ 1
+ 10
+ 1
+
+
Special
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 @@
- 1
- 10
- 1
+
+
+ 1
+ 10
+ 1
+
+
Special
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 @@
- 2
- 10
- 2
+
+
+ 2
+ 10
+ 2
+
+
Special
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 @@
- 2
- 10
- 2
+
+
+ 2
+ 10
+ 2
+
+
Special
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 @@
- 2
- 5
- 2
+
+
+ 2
+ 5
+ 2
+
+
Fence
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 @@
- 1
- 10
- 1
+
+
+ 1
+ 10
+ 1
+
+
Special
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 @@
- 1
- 10
- 1
+
+
+ 1
+ 10
+ 1
+
+
Special
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 @@
- 35
+
+
+ 35
+
+
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 @@
- -5.0
- -5.0
- -1.0
+
+
+ -5.0
+ -5.0
+ -1.0
+
+
- 1.0
- 5.0
- 1.0
+
+ 1.0
+ 5.0
+ 1.0
+
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 @@
- 15.0
- 35.0
- 5.0
+
+
+ 15.0
+ 35.0
+ 5.0
+
+
- 4.0
- 7.0
- 3.0
+
+ 4.0
+ 7.0
+ 3.0
+
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 @@
- 15.0
- 35.0
- 5.0
+
+
+ 15.0
+ 35.0
+ 5.0
+
+
- 4.0
- 7.0
- 3.0
+
+ 4.0
+ 7.0
+ 3.0
+
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 @@
- 15.0
- 35.0
- 5.0
+
+
+ 15.0
+ 35.0
+ 5.0
+
+
- 4.0
- 7.0
- 3.0
+
+ 4.0
+ 7.0
+ 3.0
+
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 @@
- 15.0
- 35.0
- 5.0
+
+
+ 15.0
+ 35.0
+ 5.0
+
+
- 4.0
- 7.0
- 3.0
+
+ 4.0
+ 7.0
+ 3.0
+
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 @@
- 15.0
- 35.0
- 5.0
+
+
+ 15.0
+ 35.0
+ 5.0
+
+
- 4.0
- 7.0
- 3.0
+
+ 4.0
+ 7.0
+ 3.0
+
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 @@
- 1
- 1
- 1
+
+
+ 1
+ 1
+ 1
+
+
- 1
- 1
- 1
+
+ 1
+ 1
+ 1
+
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 @@
- 20
- 30
- 3
+
+
+ 20
+ 30
+ 3
+
+
- 1
- 5
- 1
+
+ 1
+ 5
+ 1
+
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 @@
100
- 5
- 5
+
+
+ 5
+ 5
+
+
- 5
- 15
- 3
+
+ 5
+ 15
+ 3
+
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 @@
- 25
- 30
- 3
+
+
+ 25
+ 30
+ 3
+
+
- 1.0
- 5.0
- 1.0
+
+ 1.0
+ 5.0
+ 1.0
+
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 @@
- 4
- 25
- 2
+
+
+ 4
+ 25
+ 2
+
+
land-shore
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 @@
- 5
- 20
- 1
+
+
+ 5
+ 20
+ 1
+
+
- 1
- 5
- 1
+
+ 1
+ 5
+ 1
+
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 @@
- -5
- -5
- -2
+
+
+ -5
+ -5
+ -2
+
+
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 @@
- 5
- 20
- 1
+
+
+ 5
+ 20
+ 1
+
+
- 1
- 5
- 1
+
+ 1
+ 5
+ 1
+
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 @@
- 20
- 35
- 3
+
+
+ 20
+ 35
+ 3
+
+
- 1
- 5
- 1
+
+ 1
+ 5
+ 1
+
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 @@
- 30
+
+
+ 30
+
+
- 3
- 10
- 3
+
+ 3
+ 10
+ 3
+
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 @@
- 5
- 5
- 3
+
+
+ 5
+ 5
+ 3
+
+
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 @@
- 10
- 40
- 5
+
+
+ 10
+ 40
+ 5
+
+
- 3
- 8
- 2
+
+ 3
+ 8
+ 2
+
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 @@
- 1
- 20
- 1
+
+
+ 1
+ 20
+ 1
+
+
- 1
- 10
- 1
+
+ 1
+ 10
+ 1
+
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 @@
- 15
- 40
- 5
+
+
+ 15
+ 40
+ 5
+
+
Field
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 @@
- 20
- 30
- 3
+
+
+ 20
+ 30
+ 3
+
+
- 3
- 10
- 3
+
+ 3
+ 10
+ 3
+
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 @@
- 15
- 25
- 3
+
+
+ 15
+ 25
+ 3
+
+
- 2
- 10
- 2
+
+ 2
+ 10
+ 2
+
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 @@
- 1
- 1
- 15
+
+
+ 1
+ 1
+ 15
+
+
1
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 @@
- 3
- 1
- 15
+
+
+ 3
+ 1
+ 15
+
+
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 @@
- 4
- 3
+
+
+ 4
+ 3
+
+
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 @@
- 4
- 2
+
+
+ 4
+ 2
+
+
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 @@
- 7
- 5
- 20
+
+
+ 7
+ 5
+ 20
+
+
1
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 @@
- 1
- 2
+
+
+ 1
+ 2
+
+
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 @@
- 1
- 2
+
+
+ 1
+ 2
+
+
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 @@
- 10
- 10
- 25
+
+
+ 10
+ 10
+ 25
+
+
3
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 @@
- 5
- 5
- 20
+
+
+ 5
+ 5
+ 20
+
+
20
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 @@
- 1
- 1
+
+
+ 1
+ 1
+
+
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 @@
- 8
- 8
- 20
+
+
+ 8
+ 8
+ 20
+
+
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 @@
- 3
- 3
+
+
+ 3
+ 3
+
+
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 @@
- 3
- 3
+
+
+ 3
+ 3
+
+
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 @@
- 1
- 2
- 1
+
+
+ 1
+ 2
+ 1
+
+
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 @@
- 3
- 4
- 5
+
+
+ 3
+ 4
+ 5
+
+
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 @@
- 1
- 3
- 1
+
+
+ 1
+ 3
+ 1
+
+
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 @@
- 10.0
- 20.0
- 15.0
+
+
+ 10.0
+ 20.0
+ 15.0
+
+
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 @@
- 10
- 8
- 25
+
+
+ 10
+ 8
+ 25
+
+
50
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 @@
- 1
- 2
+
+
+ 1
+ 2
+
+
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 @@
- 1
- 1
+
+
+ 1
+ 1
+
+
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 @@
- 10
- 10
- 25
+
+
+ 10
+ 10
+ 25
+
+
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 @@
- 4.0
- 8.0
- 4.0
+
+
+ 4.0
+ 8.0
+ 4.0
+
+
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 @@
- 8
- 8
- 25
+
+
+ 8
+ 8
+ 25
+
+
40
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 @@
- 9
- 9
+
+
+ 9
+ 9
+
+
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 @@
- 4
- 4
+
+
+ 4
+ 4
+
+
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 @@
- 4
- 4
+
+
+ 4
+ 4
+
+
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,21 @@
- 2
- 4
- 15
+
+
+ 2
+ 4
+ 15
+
+
+
+
+ 20
+ 40
+ 15
+
+ 10
+
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 @@
- 10
- 10
+
+
+ 10
+ 10
+
+
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 @@
- 5
- 5
+
+
+ 5
+ 5
+
+
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 @@
- 5
- 5
+
+
+ 5
+ 5
+
+
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 @@
- 1
- 1
- 10
+
+
+ 1
+ 1
+ 10
+
+
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 @@
- 1
- 1
+
+
+ 1
+ 1
+
+
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 @@
- 1
- 1
+
+
+ 1
+ 1
+
+
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 @@
- 1
- 1
+
+
+ 1
+ 1
+
+
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 @@
- 5
- 10
- 5
+
+
+ 5
+ 10
+ 5
+
+
1
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 @@
- 2
- 5
- 2
+
+
+ 2
+ 5
+ 2
+
+
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 @@
- 2
- 5
- 2
+
+
+ 2
+ 5
+ 2
+
+
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 @@
- 1
- 50
- 5
+
+
+ 1
+ 50
+ 5
+
+
500
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 @@
- 1
- 1
- 1
+
+
+ 1
+ 1
+ 1
+
+
8
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 @@
- -4
- -4
+
+
+ -4
+ -4
+
+
0.75
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 @@
- -1
- -1
+
+
+ -1
+ -1
+
+
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 @@
- -1
+
+
+ -1
+
+
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 @@
- 1
- 1
+
+
+ 1
+ 1
+
+
1.1
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 @@
- 1.0
- 2.0
+
+
+ 1.0
+ 2.0
+
+
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 @@
- 5
- 8
- 10
+
+
+ 5
+ 8
+ 10
+
+
2.0
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 @@
- 2
- 2
+
+
+ 2
+ 2
+
+