Index: binaries/data/mods/public/globalscripts/Templates.js =================================================================== --- binaries/data/mods/public/globalscripts/Templates.js +++ binaries/data/mods/public/globalscripts/Templates.js @@ -160,12 +160,23 @@ let ret = {}; - if (template.Armour) + if (template.Resistance) { - ret.armour = {}; - for (let damageType in template.Armour) - if (damageType != "Foundation") - ret.armour[damageType] = getEntityValue("Armour/" + damageType); + // Don't show Foundation resistance. + ret.resistance = {}; + if (template.Resistance.Entity) + { + if (template.Resistance.Entity.Damage) + { + ret.resistance.Damage = {}; + for (let damageType in template.Resistance.Entity.Damage) + ret.resistance.Damage[damageType] = getEntityValue("Resistance/Entity/Damage/" + damageType); + } + if (template.Resistance.Entity.Capture) + ret.resistance.Capture = getEntityValue("Resistance/Entity/Capture"); + + // ToDo: Resistance against StatusEffects. + } } 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 @@ -155,37 +155,77 @@ } /** - * Converts an armor level into the actual reduction percentage + * Converts an resistance level into the actual reduction percentage. */ -function armorLevelToPercentageString(level) +function resistanceLevelToPercentageString(level) { return sprintf(translate("%(percentage)s%%"), { "percentage": (100 - Math.round(Math.pow(0.9, level) * 100)) }); } -function getArmorTooltip(template) +function getResistanceTooltip(template) { - if (!template.armour) + if (!template.resistance) + return ""; + + let details = []; + let resistanceTemplate = template.resistance; + if (resistanceTemplate.Damage) + details.push(getDamageResistanceTooltip(resistanceTemplate.Damage)); + + if (resistanceTemplate.Capture) + details.push(getCaptureResistanceTooltip(resistanceTemplate.Capture)); + + // ToDo: Status effects resistance. + + return sprintf(translate("%(label)s:\n %(details)s"), { + "label": headerFont(translate("Resistance")), + "details": details.join("\n ") + }); +} + +function getDamageResistanceTooltip(resistanceTypeTemplate) +{ + if (!resistanceTypeTemplate) return ""; return sprintf(translate("%(label)s %(details)s"), { - "label": headerFont(translate("Armor:")), + "label": headerFont(translate("Damage Resistance:")), "details": - g_DamageTypesMetadata.sort(Object.keys(template.armour)).map( - dmgType => sprintf(translate("%(damage)s %(damageType)s %(armorPercentage)s"), { - "damage": template.armour[dmgType].toFixed(1), + g_DamageTypesMetadata.sort(Object.keys(resistanceTypeTemplate)).map( + dmgType => sprintf(translate("%(damage)s %(damageType)s %(resistancePercentage)s"), { + "damage": resistanceTypeTemplate[dmgType].toFixed(1), "damageType": unitFont(translateWithContext("damage type", g_DamageTypesMetadata.getName(dmgType))), - "armorPercentage": + "resistancePercentage": '[font="sans-10"]' + - sprintf(translate("(%(armorPercentage)s)"), { - "armorPercentage": armorLevelToPercentageString(template.armour[dmgType]) + sprintf(translate("(%(resistancePercentage)s)"), { + "resistancePercentage": resistanceLevelToPercentageString(resistanceTypeTemplate[dmgType]) }) + '[/font]' }) ).join(commaFont(translate(", "))) }); } +function getCaptureResistanceTooltip(resistanceTypeTemplate) +{ + if (!resistanceTypeTemplate) + return ""; + return sprintf(translate("%(label)s %(details)s"), { + "label": headerFont(translate("Capture Resistance:")), + "details": + sprintf(translate("%(damage)s %(damageType)s %(resistancePercentage)s"), { + "damage": resistanceTypeTemplate.toFixed(1), + "damageType": unitFont(translateWithContext("damage type", "Capture")), + "resistancePercentage": + '[font="sans-10"]' + + sprintf(translate("(%(resistancePercentage)s)"), { + "resistancePercentage": resistanceLevelToPercentageString(resistanceTypeTemplate) + }) + '[/font]' + }) + }); +} + function attackRateDetails(interval, projectiles) { if (!interval) Index: binaries/data/mods/public/gui/reference/common/ReferencePage.js =================================================================== --- binaries/data/mods/public/gui/reference/common/ReferencePage.js +++ binaries/data/mods/public/gui/reference/common/ReferencePage.js @@ -55,7 +55,7 @@ getHealerTooltip, getAttackTooltip, getSplashDamageTooltip, - getArmorTooltip, + getResistanceTooltip, getGarrisonTooltip, getProjectilesTooltip, getSpeedTooltip, Index: binaries/data/mods/public/gui/reference/common/TemplateParser.js =================================================================== --- binaries/data/mods/public/gui/reference/common/TemplateParser.js +++ binaries/data/mods/public/gui/reference/common/TemplateParser.js @@ -74,9 +74,9 @@ if (!parsed.upgrades) parsed.upgrades = []; - // Note: An assumption is made here that wall segments all have the same armor and auras + // Note: An assumption is made here that wall segments all have the same resistance and auras let struct = this.getEntity(parsed.wallSet.templates.long, civCode); - parsed.armour = struct.armour; + parsed.resistance = struct.resistance; parsed.auras = struct.auras; // For technology cost multiplier, we need to use the tower Index: binaries/data/mods/public/gui/session/PanelEntity.js =================================================================== --- binaries/data/mods/public/gui/session/PanelEntity.js +++ binaries/data/mods/public/gui/session/PanelEntity.js @@ -86,7 +86,7 @@ PanelEntity.prototype.Tooltips = [ getCurrentHealthTooltip, getAttackTooltip, - getArmorTooltip, + getResistanceTooltip, getEntityTooltip, getAurasTooltip ]; Index: binaries/data/mods/public/gui/session/selection_details.js =================================================================== --- binaries/data/mods/public/gui/session/selection_details.js +++ binaries/data/mods/public/gui/session/selection_details.js @@ -311,11 +311,11 @@ showTemplateDetails(entState.template); }; - Engine.GetGUIObjectByName("attackAndArmorStats").tooltip = [ + Engine.GetGUIObjectByName("attackAndResistanceStats").tooltip = [ getAttackTooltip, getSplashDamageTooltip, getHealerTooltip, - getArmorTooltip, + getResistanceTooltip, getGatherTooltip, getSpeedTooltip, getGarrisonTooltip, Index: binaries/data/mods/public/gui/session/selection_panels.js =================================================================== --- binaries/data/mods/public/gui/session/selection_panels.js +++ binaries/data/mods/public/gui/session/selection_panels.js @@ -980,7 +980,7 @@ getAttackTooltip, getSplashDamageTooltip, getHealerTooltip, - getArmorTooltip, + getResistanceTooltip, getGarrisonTooltip, getProjectilesTooltip, getSpeedTooltip Index: binaries/data/mods/public/gui/session/selection_panels_middle/single_details_area.xml =================================================================== --- binaries/data/mods/public/gui/session/selection_panels_middle/single_details_area.xml +++ binaries/data/mods/public/gui/session/selection_panels_middle/single_details_area.xml @@ -55,9 +55,9 @@ - - - Attack and Armor + + + Attack and Resistance @@ -94,7 +94,7 @@ - + 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 @@ -196,17 +196,39 @@ "getPopulationBonus": function() { return +this.get("Cost/PopulationBonus"); }, - "armourStrengths": function() { - let armourDamageTypes = this.get("Armour"); - if (!armourDamageTypes) + "resistanceStrengths": function() { + let resistanceTypes = this.get("Resistance"); + if (!resistanceTypes || !resistanceTypes.Entity) return undefined; - let armour = {}; - for (let damageType in armourDamageTypes) - if (damageType != "Foundation") - armour[damageType] = +armourDamageTypes[damageType]; + // ToDo: Resistance to StatusEffects. + let resistance = {}; + for (let effectType of g_EffectTypes) + { + let template = resistanceTypes.Entity[effectType]; + if (!template) + continue; + + if (effectType == "Capture") + { + if (!resistance.Capture) + resistance.Capture = 0; + resistance.Capture += +this.get("Resistance/Entity/Capture"); + } + else if (effectType == "Damage") + { + if (!resistance.Damage) + resistance.Damage = {}; + for (let damageType in template) + { + if (!resistance.Damage[damageType]) + resistance.Damage[damageType] = 0; + resistance.Damage[damageType] += +this.get("Resistance/Entity/Damage/" + damageType); + } + } + } - return armour; + return resistance; }, "attackTypes": function() { @@ -754,8 +776,8 @@ return false; let canCapture = allowCapture && this.canCapture(target); - let armourStrengths = target.get("Armour"); - if (!armourStrengths) + let health = target.get("Health"); + if (!health) return canCapture; for (let type in attackTypes) 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 @@ -52,14 +52,19 @@ } } - let armourStrength = ent.armourStrengths(); - for (let str in armourStrength) + let resistanceStrength = ent.resistanceStrengths(); + for (let effectType in resistanceStrength) { - 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)."); + // ToDo: Add support for StatusEffects and Capture. + if (effectType == "Damage") + for (let str in resistanceStrength[effectType]) + { + let val = +resistanceStrength[effectType][str]; + if (DamageTypeImportance[str]) + strength += DamageTypeImportance[str] * val / damageTypes.length; + else if (debugLevel > 0) + API3.warn("Petra: " + str + " unknown resistanceStrength 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,73 +0,0 @@ -function Armour() {} - -Armour.prototype.DamageResistanceSchema = "" + - "" + - "" + - "" + - "Foundation" + - "" + - "" + - "" + - ""; - -Armour.prototype.Schema = - "Controls the damage resistance of the unit." + - "" + - "10.0" + - "0.0" + - "5.0" + - "" + - Armour.prototype.DamageResistanceSchema + - "" + - "" + - Armour.prototype.DamageResistanceSchema + - "" + - ""; - -Armour.prototype.Init = function() -{ - this.invulnerable = false; -}; - -Armour.prototype.IsInvulnerable = function() -{ - return this.invulnerable; -}; - -Armour.prototype.SetInvulnerability = function(invulnerability) -{ - this.invulnerable = invulnerability; - Engine.PostMessage(this.entity, MT_InvulnerabilityChanged, { "entity": this.entity, "invulnerability": invulnerability }); -}; - -Armour.prototype.GetArmourStrengths = function(effectType) -{ - // 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]; - - return ApplyValueModificationsToEntity("Armour/" + type, strength, this.entity); - }; - - let foundation = Engine.QueryInterface(this.entity, IID_Foundation) && this.template.Foundation; - - let ret = {}; - - if (effectType != "Damage") - return ret; - - for (let damageType in this.template) - if (damageType != "Foundation") - ret[damageType] = applyMods(damageType, foundation); - - return ret; -}; - -Engine.RegisterComponentType(IID_Resistance, "Armour", Armour); 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 @@ -454,9 +454,9 @@ } } - let cmpArmour = Engine.QueryInterface(ent, IID_Resistance); - if (cmpArmour) - ret.armour = cmpArmour.GetArmourStrengths("Damage"); + let cmpResistance = Engine.QueryInterface(ent, IID_Resistance); + if (cmpResistance) + ret.resistance = cmpResistance.GetResistanceOfType(cmpFoundation ? "Foundation" : "Entity"); let cmpBuildingAI = Engine.QueryInterface(ent, IID_BuildingAI); if (cmpBuildingAI) Index: binaries/data/mods/public/simulation/components/Resistance.js =================================================================== --- binaries/data/mods/public/simulation/components/Resistance.js +++ binaries/data/mods/public/simulation/components/Resistance.js @@ -1,73 +1,155 @@ -function Armour() {} +class Resistance +{ + Init() + { + this.invulnerable = false; + } + + IsInvulnerable() + { + return this.invulnerable; + } + + SetInvulnerability(invulnerability) + { + this.invulnerable = invulnerability; + Engine.PostMessage(this.entity, MT_InvulnerabilityChanged, { "entity": this.entity, "invulnerability": invulnerability }); + } + + /** + * Calculate the effective resistance of an entity to a particular effect. + * @param {string} effectType - The type of attack effect the resistance has to be calculated for (e.g. "Damage", "Capture"). + * @return {object} - An object of the type { "Damage": { "Crush": 10, "Hack": 2 }, "Capture": 2 } + */ + GetEffectiveResistanceAgainst(effectType) + { + let ret = {}; + + // ToDo: Support resistance against status effects. + if (effectType == "StatusEffects") + return ret; -Armour.prototype.DamageResistanceSchema = "" + - "" + - "" + - "" + - "Foundation" + - "" + - "" + - "" + - ""; + let foundation = Engine.QueryInterface(this.entity, IID_Foundation) && this.template.Foundation; + for (let resistanceType in this.template) + { + if (foundation ? resistanceType != "Foundation" : resistanceType == "Foundation") + continue; -Armour.prototype.Schema = - "Controls the damage resistance of the unit." + - "" + - "10.0" + - "0.0" + - "5.0" + - "" + - Armour.prototype.DamageResistanceSchema + - "" + - "" + - Armour.prototype.DamageResistanceSchema + - "" + - ""; + let template = this.template[resistanceType][effectType]; + if (!template) + continue; + + if (effectType == "Capture") + { + if (!ret.Capture) + ret.Capture = 0; + ret.Capture += ApplyValueModificationsToEntity("Resistance/" + resistanceType + "/Capture", +this.template[resistanceType].Capture, this.entity); + } + else if (effectType == "Damage") + for (let damageType in template) + { + if (!ret[damageType]) + ret[damageType] = 0; + ret[damageType] += ApplyValueModificationsToEntity("Resistance/" + resistanceType + "/" + effectType + "/" + damageType, +(this.template[resistanceType][effectType][damageType] || 0), this.entity); + } + } + return ret; + } -Armour.prototype.Init = function() -{ - this.invulnerable = false; -}; + /** + * Get all separate resistances for showing in the GUI. + * @return {Object} - All resistances ordered by type. + */ + GetFullResistance() + { + let ret = {}; + for (let resistanceType in this.template) + ret[resistanceType] = this.GetResistanceOfType(resistanceType); -Armour.prototype.IsInvulnerable = function() -{ - return this.invulnerable; -}; + return ret; + } -Armour.prototype.SetInvulnerability = function(invulnerability) -{ - this.invulnerable = invulnerability; - Engine.PostMessage(this.entity, MT_InvulnerabilityChanged, { "entity": this.entity, "invulnerability": invulnerability }); -}; + /** + * Get the resistance of a particular type, i.e. Foundation or Entity. + * @param {String} resistanceType - The type to query. + * @return {Object} - An object containing the resistances. + */ + GetResistanceOfType(resistanceType) + { + let ret = {} + let template = this.template[resistanceType]; + if (!template) + return ret; -Armour.prototype.GetArmourStrengths = function(effectType) -{ - // Work out the armour values with technology effects. - let applyMods = (type, foundation) => { - let strength; - if (foundation) + if (template.Damage) { - strength = +this.template.Foundation[type]; - type = "Foundation/" + type; + ret.Damage = {}; + for (let damageType in template.Damage) + ret.Damage[damageType] = ApplyValueModificationsToEntity("Resistance/" + resistanceType + "/Damage/" + damageType, +this.template[resistanceType].Damage[damageType], this.entity); } - else - strength = +this.template[type]; - return ApplyValueModificationsToEntity("Armour/" + type, strength, this.entity); - }; + if (template.Capture) + ret.Capture = ApplyValueModificationsToEntity("Resistance/" + resistanceType + "/Capture", +this.template[resistanceType].Capture, this.entity); - let foundation = Engine.QueryInterface(this.entity, IID_Foundation) && this.template.Foundation; - - let ret = {}; - - if (effectType != "Damage") return ret; + } +} - for (let damageType in this.template) - if (damageType != "Foundation") - ret[damageType] = applyMods(damageType, foundation); - - return ret; +/** + * Builds a RelaxRNG schema of possible attack effects. + * ToDo: Resistance to StatusEffects. + * + * @return {string} - RelaxNG schema string + */ +Resistance.prototype.BuildResistanceSchema = function() +{ + return "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + ""; }; -Engine.RegisterComponentType(IID_Resistance, "Armour", Armour); +Resistance.prototype.Schema = + "Controls the damage resistance of the unit." + + "" + + "" + + "" + + "10.0" + + "0.0" + + "5.0" + + "" + + "10" + + "" + + "" + + "" + + "" + + "0.5" + + "0.75" + + "" + + "" + + "" + + "" + + "" + + "" + + "" + + Resistance.prototype.BuildResistanceSchema() + + "" + + "" + + Resistance.prototype.BuildResistanceSchema() + + "" + + "" + + ""; + +Engine.RegisterComponentType(IID_Resistance, "Resistance", Resistance); Index: binaries/data/mods/public/simulation/data/auras/structures/kush_pyramids_military.json =================================================================== --- binaries/data/mods/public/simulation/data/auras/structures/kush_pyramids_military.json +++ binaries/data/mods/public/simulation/data/auras/structures/kush_pyramids_military.json @@ -3,9 +3,9 @@ "radius": 70, "affects": ["Soldier"], "modifications": [ - { "value": "Armour/Hack", "add": 1 }, - { "value": "Armour/Pierce", "add": 1 }, - { "value": "Armour/Crush", "add": 1 }, + { "value": "Resistance/Entity/Damage/Hack", "add": 1 }, + { "value": "Resistance/Entity/Damage/Pierce", "add": 1 }, + { "value": "Resistance/Entity/Damage/Crush", "add": 1 }, { "value": "Attack/Melee/Damage/Hack", "multiply": 1.1 }, { "value": "Attack/Melee/Damage/Pierce", "multiply": 1.1 }, { "value": "Attack/Melee/Damage/Crush", "multiply": 1.1 }, 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/Hack", "add": 3 }, - { "value": "Armour/Pierce", "add": 3 }, - { "value": "Armour/Crush", "add": 3 }, + { "value": "Resistance/Entity/Damage/Hack", "add": 3 }, + { "value": "Resistance/Entity/Damage/Pierce", "add": 3 }, + { "value": "Resistance/Entity/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/Hack", "add": 1 }, - { "value": "Armour/Pierce", "add": 1 }, - { "value": "Armour/Crush", "add": 1 }, + { "value": "Resistance/Entity/Damage/Hack", "add": 1 }, + { "value": "Resistance/Entity/Damage/Pierce", "add": 1 }, + { "value": "Resistance/Entity/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/Hack", "add": 1 }, - { "value": "Armour/Pierce", "add": 1 }, - { "value": "Armour/Crush", "add": 1 } + { "value": "Resistance/Entity/Damage/Hack", "add": 1 }, + { "value": "Resistance/Entity/Damage/Pierce", "add": 1 }, + { "value": "Resistance/Entity/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/Hack", "add": 3 }, - { "value": "Armour/Pierce", "add": 3 }, - { "value": "Armour/Crush", "add": 3 }, + { "value": "Resistance/Entity/Damage/Hack", "add": 3 }, + { "value": "Resistance/Entity/Damage/Pierce", "add": 3 }, + { "value": "Resistance/Entity/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 @@ -2,9 +2,9 @@ "type": "global", "affects": ["Soldier", "Siege"], "modifications": [ - { "value": "Armour/Hack", "add": 1 }, - { "value": "Armour/Pierce", "add": 1 }, - { "value": "Armour/Crush", "add": 1 }, + { "value": "Resistance/Entity/Damage/Hack", "add": 1 }, + { "value": "Resistance/Entity/Damage/Pierce", "add": 1 }, + { "value": "Resistance/Entity/Damage/Crush", "add": 1 }, { "value": "UnitMotion/WalkSpeed", "multiply": 1.15 } ], "auraName": "Guerrilla Chief", 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/Hack", "add": 1 }, - { "value": "Armour/Pierce", "add": 1 }, - { "value": "Armour/Crush", "add": 1 } + { "value": "Resistance/Entity/Damage/Hack", "add": 1 }, + { "value": "Resistance/Entity/Damage/Pierce", "add": 1 }, + { "value": "Resistance/Entity/Damage/Crush", "add": 1 } ], "auraDescription": "Soldiers +1 armor.", "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/Hack", "add": 1 }, - { "value": "Armour/Pierce", "add": 1 }, - { "value": "Armour/Crush", "add": 1 }, + { "value": "Resistance/Entity/Damage/Hack", "add": 1 }, + { "value": "Resistance/Entity/Damage/Pierce", "add": 1 }, + { "value": "Resistance/Entity/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/Hack", "add": 1 }, - { "value": "Armour/Pierce", "add": 1 }, - { "value": "Armour/Crush", "add": 1 } + { "value": "Resistance/Entity/Damage/Hack", "add": 1 }, + { "value": "Resistance/Entity/Damage/Pierce", "add": 1 }, + { "value": "Resistance/Entity/Damage/Crush", "add": 1 } ], "auraName": "Shield of Rome", "auraDescription": "Humans and Structures +1 armor." 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/Hack", "add": 2 }, - { "value": "Armour/Pierce", "add": 2 }, - { "value": "Armour/Crush", "add": 2 } + { "value": "Resistance/Entity/Damage/Hack", "add": 2 }, + { "value": "Resistance/Entity/Damage/Pierce", "add": 2 }, + { "value": "Resistance/Entity/Damage/Crush", "add": 2 } ], "auraName": "Ilarchès", "auraDescription": "Cavalry +2 armor." 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 @@ -3,9 +3,9 @@ "radius": 60, "affects": ["Citizen Infantry Javelineer"], "modifications": [ - { "value": "Armour/Hack", "add": 1 }, - { "value": "Armour/Pierce", "add": 1 }, - { "value": "Armour/Crush", "add": 1 }, + { "value": "Resistance/Entity/Damage/Hack", "add": 1 }, + { "value": "Resistance/Entity/Damage/Pierce", "add": 1 }, + { "value": "Resistance/Entity/Damage/Crush", "add": 1 }, { "value": "Attack/Ranged/Damage/Pierce", "multiply": 1.25 } ], "auraName": "Helot Reforms", 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": "Resistance/Entity/Damage/Hack", "add": 1 }, + { "value": "Resistance/Entity/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": "Resistance/Entity/Damage/Hack", "add": 1 }, + { "value": "Resistance/Entity/Damage/Pierce", "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": "Resistance/Entity/Damage/Hack", "add": 2 }, + { "value": "Resistance/Entity/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": "Resistance/Entity/Damage/Hack", "add": 1 }, + { "value": "Resistance/Entity/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": "Resistance/Entity/Damage/Hack", "add": 1 }, + { "value": "Resistance/Entity/Damage/Pierce", "add": 1 } ], "affects": ["Infantry"], "soundComplete": "interface/alarm/alarm_upgradearmory.xml" 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": "Resistance/Entity/Damage/Hack", "add": 2 }, + { "value": "Resistance/Entity/Damage/Pierce", "add": 2 }, + { "value": "Resistance/Entity/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": "Resistance/Entity/Damage/Hack", "add": 2 }, + { "value": "Resistance/Entity/Damage/Pierce", "add": 2 }, + { "value": "Resistance/Entity/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": "Resistance/Entity/Damage/Hack", "add": 2 }, + { "value": "Resistance/Entity/Damage/Pierce", "add": 2 }, + { "value": "Resistance/Entity/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 @@ -9,7 +9,7 @@ "researchTime": 40, "tooltip": "Walls −20% build time, but −1 crush armor.", "modifications": [ - { "value": "Armour/Crush", "add": -1 }, + { "value": "Resistance/Entity/Damage/Crush", "add": -1 }, { "value": "Cost/BuildTime", "multiply": 0.8 } ], "affects": ["Wall"], 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 @@ -9,7 +9,7 @@ "researchTime": 40, "tooltip": "Walls +2 crush armor, but +10% build time.", "modifications": [ - { "value": "Armour/Crush", "add": 2 }, + { "value": "Resistance/Entity/Damage/Crush", "add": 2 }, { "value": "Cost/BuildTime", "multiply": 1.1 } ], "affects": ["Wall"], 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": "Resistance/Entity/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": "Towers +2 armor.", "modifications": [ - { "value": "Armour/Hack", "add": 2 }, - { "value": "Armour/Pierce", "add": 2 }, - { "value": "Armour/Crush", "add": 2 } + { "value": "Resistance/Entity/Damage/Hack", "add": 2 }, + { "value": "Resistance/Entity/Damage/Pierce", "add": 2 }, + { "value": "Resistance/Entity/Damage/Crush", "add": 2 } ], "affects": ["Tower"], "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": "Resistance/Entity/Damage/Hack", "add": 2 }, + { "value": "Resistance/Entity/Damage/Pierce", "add": 2 } ], "affects": ["Trader"], "soundComplete": "interface/alarm/alarm_upgradearmory.xml" Index: binaries/data/mods/public/simulation/data/technologies/unit_advanced.json =================================================================== --- binaries/data/mods/public/simulation/data/technologies/unit_advanced.json +++ binaries/data/mods/public/simulation/data/technologies/unit_advanced.json @@ -3,9 +3,9 @@ "icon": "upgrade_advanced.png", "tooltip": "Advanced and Elite units +20% training time, +1 armour level, +10% health, +0.4 capture attack strength, +20% loot, and −30% gather speed; Healers +5 healing strength and +3 healing range; Infantry +0.5 movement speed; Melee units +20% attack damage; Ranged units +4 attack range and −10% spread.", "modifications": [ - { "value": "Armour/Hack", "add": 1 }, - { "value": "Armour/Pierce", "add": 1 }, - { "value": "Armour/Crush", "add": 1 }, + { "value": "Resistance/Entity/Damage/Hack", "add": 1 }, + { "value": "Resistance/Entity/Damage/Pierce", "add": 1 }, + { "value": "Resistance/Entity/Damage/Crush", "add": 1 }, { "value": "Attack/Capture/Capture", "add": 0.7 }, { "value": "Attack/Melee/Damage/Hack", "multiply": 1.2, "affects": "Melee" }, { "value": "Attack/Melee/Damage/Pierce", "multiply": 1.2, "affects": "Melee" }, Index: binaries/data/mods/public/simulation/data/technologies/unit_elite.json =================================================================== --- binaries/data/mods/public/simulation/data/technologies/unit_elite.json +++ binaries/data/mods/public/simulation/data/technologies/unit_elite.json @@ -3,9 +3,9 @@ "icon": "upgrade_elite.png", "tooltip": "Elite units +20% training time, +1 armour level, +10% health, +0.4 capture attack strength, +20% loot, and −30% gather speed; Healers +5 healing strength and +3 healing range; Infantry +0.5 movement speed; Melee units +20% attack damage; Ranged units +4 attack range and −10% spread.", "modifications": [ - { "value": "Armour/Hack", "add": 1 }, - { "value": "Armour/Pierce", "add": 1 }, - { "value": "Armour/Crush", "add": 1 }, + { "value": "Resistance/Entity/Damage/Hack", "add": 1 }, + { "value": "Resistance/Entity/Damage/Pierce", "add": 1 }, + { "value": "Resistance/Entity/Damage/Crush", "add": 1 }, { "value": "Attack/Capture/Capture", "add": 0.8 }, { "value": "Attack/Melee/Damage/Hack", "multiply": 1.2, "affects": "Melee" }, { "value": "Attack/Melee/Damage/Pierce", "multiply": 1.2, "affects": "Melee" }, 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 @@ -7,10 +7,7 @@ "" + "" + "" + - "" + - // Armour requires Foundation to not be a damage type. - "Foundation" + - "" + + "" + "" + "" + "" + @@ -171,10 +168,10 @@ Attacking.prototype.GetTotalAttackEffects = function(effectData, effectType, cmpResistance) { let total = 0; - let armourStrengths = cmpResistance ? cmpResistance.GetArmourStrengths(effectType) : {}; + let resistanceStrengths = cmpResistance ? cmpResistance.GetEffectiveResistanceAgainst(effectType) : {}; for (let type in effectData) - total += effectData[type] * Math.pow(0.9, armourStrengths[type] || 0); + total += effectData[type] * Math.pow(0.9, resistanceStrengths[type] || 0); return total; }; 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,8 +1,12 @@ - - 20 - + + + + 20 + + + 7.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,8 +1,12 @@ - - 20 - + + + + 20 + + + 7.0 Index: binaries/data/mods/public/simulation/templates/gaia/fauna_hippopotamus.xml =================================================================== --- binaries/data/mods/public/simulation/templates/gaia/fauna_hippopotamus.xml +++ binaries/data/mods/public/simulation/templates/gaia/fauna_hippopotamus.xml @@ -1,10 +1,14 @@ - - 3 - 4 - 5 - + + + + 3 + 4 + 5 + + + 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,10 +1,14 @@ - - 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,10 +1,14 @@ - - 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,10 +1,14 @@ - - 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,10 +1,14 @@ - - 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,10 +1,14 @@ - - 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,10 +1,14 @@ - - 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,10 +1,14 @@ - - 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,10 +1,14 @@ - - 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,10 +1,14 @@ - - 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,10 +1,14 @@ - - 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,10 +1,14 @@ - - 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,10 +1,14 @@ - - 1 - 10 - 1 - + + + + 1 + 10 + 1 + + + Special Index: binaries/data/mods/public/simulation/templates/special/filter/foundation.xml =================================================================== --- binaries/data/mods/public/simulation/templates/special/filter/foundation.xml +++ binaries/data/mods/public/simulation/templates/special/filter/foundation.xml @@ -1,7 +1,7 @@ - + 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,8 +1,12 @@ - - 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,15 +1,21 @@ - - 15 - 25 - 2 + + + + 15 + 25 + 2 + + - 1 - 5 - 1 + + 1 + 5 + 1 + - + 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,15 +1,21 @@ - - 15 - 35 - 5 + + + + 15 + 35 + 5 + + - 4 - 7 - 3 + + 4 + 7 + 3 + - + own neutral enemy 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,15 +1,21 @@ - - 15 - 35 - 5 + + + + 15 + 35 + 5 + + - 4 - 7 - 3 + + 4 + 7 + 3 + - + own neutral enemy 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,15 +1,21 @@ - - 15 - 35 - 5 + + + + 15 + 35 + 5 + + - 4 - 7 - 3 + + 4 + 7 + 3 + - + own neutral enemy 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,15 +1,21 @@ - - 15 - 35 - 5 + + + + 15 + 35 + 5 + + - 4 - 7 - 3 + + 4 + 7 + 3 + - + own neutral enemy 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,15 +1,21 @@ - - 15 - 35 - 5 + + + + 15 + 35 + 5 + + - 4 - 7 - 3 + + 4 + 7 + 3 + - + own neutral enemy 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 @@ -1,16 +1,22 @@ - - 1 - 1 - 1 + + + + 1 + 1 + 1 + + - 1 - 1 - 1 + + 1 + 1 + 1 + - + 0 0 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,15 +1,21 @@ - - 20 - 30 - 3 + + + + 20 + 30 + 3 + + - 1 - 5 - 1 + + 1 + 5 + 1 + - + ConquestCritical Civic Structure 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 @@ -6,15 +6,21 @@ 190 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,15 +1,21 @@ - - 25 - 30 - 3 + + + + 25 + 30 + 3 + + - 1 - 5 - 1 + + 1 + 5 + 1 + - + Defensive Structure Defensive 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,10 +1,14 @@ - - 4 - 25 - 2 - + + + + 4 + 25 + 2 + + + land-shore Wall 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,15 +1,21 @@ - - 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,10 +1,14 @@ - - -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,15 +1,21 @@ - - 5 - 20 - 1 + + + + 5 + 20 + 1 + + - 1 - 5 - 1 + + 1 + 5 + 1 + - + Economic Structure Economic 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,15 +1,21 @@ - - 20 - 35 - 3 + + + + 20 + 35 + 3 + + - 1 - 5 - 1 + + 1 + 5 + 1 + - + Military 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,13 +1,19 @@ - - 30 + + + + 30 + + - 3 - 10 - 3 + + 3 + 10 + 3 + - + Embassy 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,10 +1,14 @@ - - 5 - 5 - 3 - + + + + 5 + 5 + 3 + + + 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,15 +1,21 @@ - - 1 - 20 - 1 + + + + 1 + 20 + 1 + + - 1 - 10 - 1 + + 1 + 10 + 1 + - + Resource 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,10 +1,14 @@ - - 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,15 +1,21 @@ - - 20 - 30 - 3 + + + + 20 + 30 + 3 + + - 3 - 10 - 3 + + 3 + 10 + 3 + - + Special 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,15 +1,21 @@ - - 15 - 25 - 3 + + + + 15 + 25 + 3 + + - 2 - 10 - 2 + + 2 + 10 + 2 + - + structures/wonder_pop_1 structures/wonder_pop_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 @@ -1,11 +1,15 @@ - - 1 - 1 - 15 - + + + + 1 + 1 + 15 + + + 1 0 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,10 +1,14 @@ - - 3 - 1 - 15 - + + + + 3 + 1 + 15 + + + 2.5 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,9 +1,13 @@ - - 4 - 3 - + + + + 4 + 3 + + + Index: binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_axeman.xml =================================================================== --- binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_axeman.xml +++ binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_axeman.xml @@ -1,9 +1,13 @@ - - 3 - 2 - + + + + 3 + 2 + + + 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,9 +1,13 @@ - - 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,10 +1,14 @@ - - 7 - 5 - 20 - + + + + 7 + 5 + 20 + + + 1 30 Index: binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_axeman.xml =================================================================== --- binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_axeman.xml +++ binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_axeman.xml @@ -1,8 +1,12 @@ - - 2 - + + + + 2 + + + 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,9 +1,13 @@ - - 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,9 +1,13 @@ - - 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,10 +1,14 @@ - - 10 - 10 - 25 - + + + + 10 + 10 + 25 + + + 3 30 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,10 +1,14 @@ - - 5 - 5 - 20 - + + + + 5 + 5 + 20 + + + 20 Index: binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_axeman.xml =================================================================== --- binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_axeman.xml +++ binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_axeman.xml @@ -1,9 +1,13 @@ - - 2 - 3 - + + + + 2 + 3 + + + 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,9 +1,13 @@ - - 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,10 +1,14 @@ - - 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,9 +1,13 @@ - - 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,9 +1,13 @@ - - 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,10 +1,14 @@ - - 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,10 +1,14 @@ - - 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,10 +1,14 @@ - - 1 - 3 - 1 - + + + + 1 + 3 + 1 + + + 1.5 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,10 +1,14 @@ - - 10 - 20 - 15 - + + + + 10 + 20 + 15 + + + 10 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,10 +1,14 @@ - - 10 - 8 - 25 - + + + + 10 + 8 + 25 + + + 50 Index: binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_axeman.xml =================================================================== --- binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_axeman.xml +++ binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_axeman.xml @@ -1,8 +1,12 @@ - - 1 - + + + + 1 + + + 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,9 +1,13 @@ - - 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,9 +1,13 @@ - - 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,10 +1,14 @@ - - 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,10 +1,14 @@ - - 4 - 8 - 4 - + + + + 4 + 8 + 4 + + + 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,10 +1,14 @@ - - 8 - 8 - 25 - + + + + 8 + 8 + 25 + + + 40 Index: binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_axeman.xml =================================================================== --- binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_axeman.xml +++ binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_axeman.xml @@ -1,9 +1,13 @@ - - 3 - 4 - + + + + 3 + 4 + + + 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,9 +1,13 @@ - - 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,9 +1,13 @@ - - 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,9 +1,13 @@ - - 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,10 +1,14 @@ - - 2 - 4 - 15 - + + + + 2 + 4 + 15 + + + 2.5 Index: binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_axeman.xml =================================================================== --- binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_axeman.xml +++ binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_axeman.xml @@ -1,9 +1,13 @@ - - 4 - 5 - + + + + 4 + 5 + + + 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,9 +1,13 @@ - - 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,9 +1,13 @@ - - 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,9 +1,13 @@ - - 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,10 +1,14 @@ - - 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,9 +1,13 @@ - - 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,9 +1,13 @@ - - 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,9 +1,13 @@ - - 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,10 +1,14 @@ - - 5 - 10 - 5 - + + + + 5 + 10 + 5 + + + 1 20 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,10 +1,14 @@ - - 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,10 +1,14 @@ - - 2 - 5 - 2 - + + + + 2 + 5 + 2 + + + 0 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,10 +1,14 @@ - - 1 - 50 - 5 - + + + + 1 + 50 + 5 + + + 500 10 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,10 +1,14 @@ - - 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,9 +1,13 @@ - - -4 - -4 - + + + + -4 + -4 + + + gaul Naked Fanatic 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,8 +1,12 @@ - - -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,9 +1,13 @@ - - 1 - 2 - + + + + 1 + 2 + + + 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,10 +1,14 @@ - - 5 - 8 - 10 - + + + + 5 + 8 + 10 + + + units/elephant_worker 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,9 +1,13 @@ - - 2 - 2 - + + + + 2 + 2 + + + Index: binaries/data/mods/public/simulation/templates/units/rome_champion_infantry_spear_gladiator.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/rome_champion_infantry_spear_gladiator.xml +++ binaries/data/mods/public/simulation/templates/units/rome_champion_infantry_spear_gladiator.xml @@ -1,8 +1,12 @@ - - -2 - + + + + -2 + + + structures/rome_tower_artillery Index: binaries/data/mods/public/simulation/templates/units/rome_champion_infantry_sword_gladiator.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/rome_champion_infantry_sword_gladiator.xml +++ binaries/data/mods/public/simulation/templates/units/rome_champion_infantry_sword_gladiator.xml @@ -1,9 +1,13 @@ - - -1 - -1 - + + + + -1 + -1 + + + structures/rome_tower_artillery