Index: ps/trunk/binaries/data/mods/public/simulation/components/Attack.js =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/components/Attack.js +++ ps/trunk/binaries/data/mods/public/simulation/components/Attack.js @@ -74,6 +74,7 @@ "1600" + "50.0" + "2.5" + + "1000" + "" + "" + "Cavalry" + @@ -136,6 +137,7 @@ "" + "" + "" + + "" + Attack.prototype.bonusesSchema + Attack.prototype.preferredClassesSchema + Attack.prototype.restrictedClassesSchema + @@ -515,7 +517,7 @@ data.splashStrengths = this.GetAttackStrengths(type + ".Splash"); data.splashBonus = this.GetBonusTemplate(type + ".Splash"); } - cmpTimer.SetTimeout(SYSTEM_ENTITY, IID_Damage, "MissileHit", timeToTarget * 1000, data); + cmpTimer.SetTimeout(SYSTEM_ENTITY, IID_Damage, "MissileHit", timeToTarget * 1000 + +this.template.Ranged.Delay, data); } else if (type == "Capture") { Index: ps/trunk/binaries/data/mods/public/simulation/components/tests/test_Damage.js =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/components/tests/test_Damage.js +++ ps/trunk/binaries/data/mods/public/simulation/components/tests/test_Damage.js @@ -29,7 +29,7 @@ let attacker = 11; let atkPlayerEntity = 1; let attackerOwner = 6; - let cmpAttack = ConstructComponent(attacker, "Attack", { "Ranged": { "ProjectileSpeed": 500, "Gravity": 9.81, "Spread": 0.5, "MaxRange": 50, "MinRange": 0 } } ); + let cmpAttack = ConstructComponent(attacker, "Attack", { "Ranged": { "ProjectileSpeed": 500, "Gravity": 9.81, "Spread": 0.5, "MaxRange": 50, "MinRange": 0, "Delay": 0 } } ); let damage = 5; let target = 21; let targetOwner = 7; Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/plane.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/other/plane.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/other/plane.xml @@ -12,6 +12,7 @@ 0 10000 1.0 + 0 Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml @@ -22,6 +22,7 @@ 1200 2000 1.5 + 0 Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml @@ -25,6 +25,7 @@ 1200 2000 1.5 + 0 Human Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defense_defense_tower.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defense_defense_tower.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defense_defense_tower.xml @@ -13,6 +13,7 @@ 1200 2000 1.5 + 0 Human Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defense_outpost.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defense_outpost.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defense_outpost.xml @@ -22,6 +22,7 @@ 1200 2000 1.5 + 0 Human Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_tower.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_tower.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_tower.xml @@ -12,6 +12,7 @@ 1200 2000 1.5 + 0 Human Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml @@ -17,6 +17,7 @@ 1200 2000 1.5 + 0 Human Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml @@ -12,6 +12,7 @@ 1000 1500 3.0 + 0 Human Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml @@ -12,6 +12,7 @@ 500 1000 1.0 + 0 Human Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml @@ -12,6 +12,7 @@ 750 1250 1.0 + 0 Human Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml @@ -12,6 +12,7 @@ 300 500 1.0 + 0 Human Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml @@ -12,6 +12,7 @@ 500 1000 1.0 + 0 Human Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml @@ -12,6 +12,7 @@ 1200 2000 0.5 + 0 Human Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml @@ -12,6 +12,7 @@ 750 1250 0.5 + 0 Human Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml @@ -12,6 +12,7 @@ 200 300 0.5 + 0 Human Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelinist.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelinist.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelinist.xml @@ -12,6 +12,7 @@ 600 1000 0.5 + 0 Human Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged.xml @@ -17,6 +17,7 @@ 750 1250 3.0 + 0 Human Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_bireme.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_bireme.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_bireme.xml @@ -12,6 +12,7 @@ 1000 2000 2.0 + 0 Ship Human Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_quinquereme.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_quinquereme.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_quinquereme.xml @@ -12,6 +12,7 @@ 2000 5000 4.0 + 0 Circular 10 Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_trireme.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_trireme.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_trireme.xml @@ -12,6 +12,7 @@ 1000 2000 2.0 + 0 Ship Human Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ballista.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ballista.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ballista.xml @@ -12,6 +12,7 @@ 9.81 3000 4000 + 0 Linear 8.0 Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_onager.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_onager.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_onager.xml @@ -12,6 +12,7 @@ 4000 5000 4.0 + 0 Circular 10 Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_tower.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_tower.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_tower.xml @@ -13,6 +13,7 @@ 1200 2000 2.0 + 0 Human Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/theb_mechanical_siege_fireraiser.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/theb_mechanical_siege_fireraiser.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/theb_mechanical_siege_fireraiser.xml @@ -12,6 +12,7 @@ 2000 2000 2.0 + 0