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 @@ -113,9 +113,6 @@ "" + "" + "" + - "1000.0" + - "0.0" + - "0.0" + "4.0" + "" + "" + @@ -227,9 +224,7 @@ "" + "" + "" + - DamageTypes.BuildSchema("damage strength") + "" + // TODO: how do these work? - Attack.prototype.bonusesSchema + Attack.prototype.preferredClassesSchema + Attack.prototype.restrictedClassesSchema + "" + @@ -633,9 +628,28 @@ "attackerOwner": attackerOwner }); } + else if (type == "Melee") + { + // Melee attack - hurt the target immediately. + cmpDamage.CauseDamage({ + "strengths": this.GetAttackStrengths(type), + "target": target, + "attacker": this.entity, + "multiplier": GetDamageBonus(this.entity, target, type, this.GetBonusTemplate(type)), + "type": type, + "attackerOwner": attackerOwner + }); + } + else if (type == "Slaughter") + { + // Special attack to instantly kill domestic animals. + let cmpTargetHealth = Engine.QueryInterface(target, IID_Health); + if (cmpTargetHealth) + cmpTargetHealth.Reduce(cmpTargetHealth.GetHitpoints()); + } else { - // Melee attack - hurt the target immediately + warn("This attack type is not (yet) implemented."); cmpDamage.CauseDamage({ "strengths": this.GetAttackStrengths(type), "target": target, 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 @@ -13,9 +13,6 @@ Field Palisade SiegeWall StoneWall - 100.0 - 0.0 - 0.0 2 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 @@ -13,9 +13,6 @@ Field Palisade SiegeWall StoneWall - 50.0 - 0.0 - 0.0 2 Index: binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml =================================================================== --- binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml +++ binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml @@ -10,9 +10,6 @@ 1000 - 25.0 - 0.0 - 0.0 2