diff --git a/OpenRA.Game/GameRules/WeaponInfo.cs b/OpenRA.Game/GameRules/WeaponInfo.cs index cd257c81bf..b02bb98ace 100644 --- a/OpenRA.Game/GameRules/WeaponInfo.cs +++ b/OpenRA.Game/GameRules/WeaponInfo.cs @@ -83,6 +83,7 @@ namespace OpenRA.GameRules public readonly bool Charges = false; public readonly bool Underwater = false; public readonly string[] ValidTargets = { "Ground" }; + public readonly int BurstDelay = 5; public IProjectileInfo Projectile; public List Warheads = new List(); diff --git a/OpenRA.Game/Traits/Attack/AttackBase.cs b/OpenRA.Game/Traits/Attack/AttackBase.cs index b0ec02a3d3..2d03b67882 100755 --- a/OpenRA.Game/Traits/Attack/AttackBase.cs +++ b/OpenRA.Game/Traits/Attack/AttackBase.cs @@ -120,7 +120,6 @@ namespace OpenRA.Traits if (info.PrimaryWeapon != null && CheckFire(self, unit, info.PrimaryWeapon, ref primaryFireDelay, info.PrimaryOffset, ref primaryBurst, info.PrimaryLocalOffset)) { - secondaryFireDelay = Math.Max(4, secondaryFireDelay); primaryRecoil = 1; return; } @@ -159,7 +158,7 @@ namespace OpenRA.Traits offset.ElementAtOrDefault(3) }; if (--burst > 0) - fireDelay = 5; + fireDelay = weapon.BurstDelay; else { fireDelay = weapon.ROF; diff --git a/mods/ra/vehicles.yaml b/mods/ra/vehicles.yaml index 2256c2bc2d..933f37c715 100644 --- a/mods/ra/vehicles.yaml +++ b/mods/ra/vehicles.yaml @@ -175,7 +175,6 @@ V2RL: ROT: 5 AttackTurreted: PrimaryWeapon: 105mm - SecondaryWeapon: 105mm Recoil: 3 RenderUnitTurreted: AutoTarget: diff --git a/mods/ra/weapons.yaml b/mods/ra/weapons.yaml index 8dd1776ac1..cdc91d796e 100644 --- a/mods/ra/weapons.yaml +++ b/mods/ra/weapons.yaml @@ -245,6 +245,8 @@ Grenade: ROF: 70 Range: 4.75 Report: CANNON1 + Burst: 2 + BurstDelay: 4 Bullet: Speed: 40 Image: 120MM