Index: binaries/data/mods/public/gui/credits/texts/programming.json =================================================================== --- binaries/data/mods/public/gui/credits/texts/programming.json +++ binaries/data/mods/public/gui/credits/texts/programming.json @@ -87,6 +87,7 @@ {"nick": "Fire Giant", "name": "Malte Schwarzkopf"}, {"name": "Fork AD"}, {"nick": "fpre", "name": "Frederick Stallmeyer"}, + {"nick": "Freagarach"}. {"nick": "freenity", "name": "Anton Galitch"}, {"nick": "Gallaecio", "name": "Adrián Chaves"}, {"nick": "gbish (aka Iny)", "name": "Grant Bishop"}, Index: binaries/data/mods/public/simulation/components/UnitAI.js =================================================================== --- binaries/data/mods/public/simulation/components/UnitAI.js +++ binaries/data/mods/public/simulation/components/UnitAI.js @@ -1893,8 +1893,9 @@ this.FaceTowardsTarget(this.order.data.target); + var cmpAttack = Engine.QueryInterface(this.entity, IID_Attack); var cmpBuildingAI = Engine.QueryInterface(this.entity, IID_BuildingAI); - if (cmpBuildingAI) + if (cmpAttack && cmpBuildingAI && !((cmpAttack.GetAttackTypes().indexOf("Capture") != -1) && (this.order.data.attackType == "Capture")) ) cmpBuildingAI.SetUnitAITarget(this.order.data.target); }, @@ -1944,8 +1945,9 @@ this.FaceTowardsTarget(target); // BuildingAI has it's own attack-routine + let cmpAttack = Engine.QueryInterface(this.entity, IID_Attack); var cmpBuildingAI = Engine.QueryInterface(this.entity, IID_BuildingAI); - if (!cmpBuildingAI) + if ( cmpAttack && (this.order.data.attackType == "Capture") ? (cmpAttack.GetAttackTypes().indexOf("Capture") != -1) : !cmpBuildingAI ) { let cmpAttack = Engine.QueryInterface(this.entity, IID_Attack); cmpAttack.PerformAttack(this.order.data.attackType, target); Index: binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_tower.xml =================================================================== --- binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_tower.xml +++ binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_tower.xml @@ -1,6 +1,11 @@ + + 10 + 8 + 1000 + 0.0 12.0