diff --git a/OpenRA.Game/GameRules/WeaponInfo.cs b/OpenRA.Game/GameRules/WeaponInfo.cs index 23ba47a914..4f8f46c98b 100644 --- a/OpenRA.Game/GameRules/WeaponInfo.cs +++ b/OpenRA.Game/GameRules/WeaponInfo.cs @@ -37,8 +37,8 @@ namespace OpenRA.GameRules [Desc("The sound played when the weapon is fired.")] public readonly string[] Report = null; - [Desc("Rate of Fire = Delay in ticks between reloading ammo magazines.")] - public readonly int ROF = 1; + [Desc("Delay in ticks between reloading ammo magazines.")] + public readonly int ReloadDelay = 1; [Desc("Number of shots in a single ammo magazine.")] public readonly int Burst = 1; diff --git a/OpenRA.Game/Traits/TraitsInterfaces.cs b/OpenRA.Game/Traits/TraitsInterfaces.cs index be008b25ba..47b17e3a23 100644 --- a/OpenRA.Game/Traits/TraitsInterfaces.cs +++ b/OpenRA.Game/Traits/TraitsInterfaces.cs @@ -170,6 +170,7 @@ namespace OpenRA.Traits public interface IDamageModifier { int GetDamageModifier(Actor attacker, DamageWarhead warhead); } public interface ISpeedModifier { int GetSpeedModifier(); } public interface IFirepowerModifier { int GetFirepowerModifier(); } + public interface IReloadModifier { int GetReloadModifier(); } public interface ILoadsPalettes { void LoadPalettes(WorldRenderer wr); } public interface IPaletteModifier { void AdjustPalette(IReadOnlyDictionary b); } public interface IPips { IEnumerable GetPips(Actor self); } diff --git a/OpenRA.Mods.Cnc/PoisonedByTiberium.cs b/OpenRA.Mods.Cnc/PoisonedByTiberium.cs index 967589b6fb..2b5d795f51 100644 --- a/OpenRA.Mods.Cnc/PoisonedByTiberium.cs +++ b/OpenRA.Mods.Cnc/PoisonedByTiberium.cs @@ -44,7 +44,7 @@ namespace OpenRA.Mods.Cnc var weapon = self.World.Map.Rules.Weapons[info.Weapon.ToLowerInvariant()]; weapon.Impact(self.CenterPosition, self.World.WorldActor, 1f); - poisonTicks = weapon.ROF; + poisonTicks = weapon.ReloadDelay; } } } diff --git a/OpenRA.Mods.D2k/DamagedWithoutFoundation.cs b/OpenRA.Mods.D2k/DamagedWithoutFoundation.cs index 51d9b001db..c30edebde6 100644 --- a/OpenRA.Mods.D2k/DamagedWithoutFoundation.cs +++ b/OpenRA.Mods.D2k/DamagedWithoutFoundation.cs @@ -66,7 +66,7 @@ namespace OpenRA.Mods.D2k return; weapon.Impact(self.CenterPosition, self.World.WorldActor, 1f); - damageTicks = weapon.ROF; + damageTicks = weapon.ReloadDelay; } } } diff --git a/OpenRA.Mods.RA/Armament.cs b/OpenRA.Mods.RA/Armament.cs index 176488022e..397bab0986 100644 --- a/OpenRA.Mods.RA/Armament.cs +++ b/OpenRA.Mods.RA/Armament.cs @@ -187,7 +187,9 @@ namespace OpenRA.Mods.RA FireDelay = Weapon.BurstDelay; else { - FireDelay = Weapon.ROF; + var modifiers = self.TraitsImplementing() + .Select(m => m.GetReloadModifier()); + FireDelay = Util.ApplyPercentageModifiers(Weapon.ReloadDelay, modifiers); Burst = Weapon.Burst; } diff --git a/OpenRA.Mods.RA/GainsExperience.cs b/OpenRA.Mods.RA/GainsExperience.cs index d8d179ea1c..8ba0de8ec5 100644 --- a/OpenRA.Mods.RA/GainsExperience.cs +++ b/OpenRA.Mods.RA/GainsExperience.cs @@ -43,10 +43,10 @@ namespace OpenRA.Mods.RA { return new Dictionary() { - { 200, new[] { "firepower", "armor", "speed" } }, - { 400, new[] { "firepower", "armor", "speed" } }, - { 800, new[] { "firepower", "armor", "speed" } }, - { 1600, new[] { "firepower", "armor", "speed" } } + { 200, new[] { "firepower", "armor", "speed", "reload" } }, + { 400, new[] { "firepower", "armor", "speed", "reload" } }, + { 800, new[] { "firepower", "armor", "speed", "reload" } }, + { 1600, new[] { "firepower", "armor", "speed", "reload" } } }; } diff --git a/OpenRA.Mods.RA/GainsStatUpgrades.cs b/OpenRA.Mods.RA/GainsStatUpgrades.cs index 2e1527ed70..bf54966c0b 100644 --- a/OpenRA.Mods.RA/GainsStatUpgrades.cs +++ b/OpenRA.Mods.RA/GainsStatUpgrades.cs @@ -19,7 +19,7 @@ namespace OpenRA.Mods.RA public class GainsStatUpgradesInfo : ITraitInfo { public readonly string FirepowerUpgrade = "firepower"; - public readonly int[] FirepowerModifier = { 110, 115, 120, 150 }; + public readonly int[] FirepowerModifier = { 110, 115, 120, 130 }; public readonly string ArmorUpgrade = "armor"; public readonly int[] ArmorModifier = { 110, 120, 130, 150 }; @@ -27,15 +27,19 @@ namespace OpenRA.Mods.RA public readonly string SpeedUpgrade = "speed"; public readonly int[] SpeedModifier = { 110, 115, 120, 150 }; + public readonly string ReloadUpgrade = "reload"; + public readonly int[] ReloadModifier = { 95, 90, 85, 75 }; + public object Create(ActorInitializer init) { return new GainsStatUpgrades(this); } } - public class GainsStatUpgrades : IUpgradable, IFirepowerModifier, IDamageModifier, ISpeedModifier + public class GainsStatUpgrades : IUpgradable, IFirepowerModifier, IDamageModifier, ISpeedModifier, IReloadModifier { readonly GainsStatUpgradesInfo info; [Sync] int firepowerLevel = 0; [Sync] int speedLevel = 0; [Sync] int armorLevel = 0; + [Sync] int reloadLevel = 0; public GainsStatUpgrades(GainsStatUpgradesInfo info) { @@ -46,7 +50,8 @@ namespace OpenRA.Mods.RA { return (type == info.FirepowerUpgrade && firepowerLevel < info.FirepowerModifier.Length) || (type == info.ArmorUpgrade && armorLevel < info.ArmorModifier.Length) - || (type == info.SpeedUpgrade && speedLevel < info.SpeedModifier.Length); + || (type == info.SpeedUpgrade && speedLevel < info.SpeedModifier.Length) + || (type == info.ReloadUpgrade && reloadLevel < info.ReloadModifier.Length); } public void UpgradeAvailable(Actor self, string type, bool available) @@ -58,6 +63,8 @@ namespace OpenRA.Mods.RA armorLevel = (armorLevel + mod).Clamp(0, info.ArmorModifier.Length); else if (type == info.SpeedUpgrade) speedLevel = (speedLevel + mod).Clamp(0, info.SpeedModifier.Length); + else if (type == info.ReloadUpgrade) + reloadLevel = (reloadLevel + mod).Clamp(0, info.ReloadModifier.Length); } public int GetDamageModifier(Actor attacker, DamageWarhead warhead) @@ -74,5 +81,10 @@ namespace OpenRA.Mods.RA { return speedLevel > 0 ? info.SpeedModifier[speedLevel - 1] : 100; } + + public int GetReloadModifier() + { + return reloadLevel > 0 ? info.ReloadModifier[reloadLevel - 1] : 100; + } } } diff --git a/OpenRA.Utility/UpgradeRules.cs b/OpenRA.Utility/UpgradeRules.cs index e259651fd4..e4631d0436 100644 --- a/OpenRA.Utility/UpgradeRules.cs +++ b/OpenRA.Utility/UpgradeRules.cs @@ -732,6 +732,15 @@ namespace OpenRA.Utility } } + if (engineVersion < 20140818) + { + if (depth == 1) + { + if (node.Key == "ROF") + node.Key = "ReloadDelay"; + } + } + UpgradeWeaponRules(engineVersion, ref node.Value.Nodes, node, depth + 1); } } diff --git a/mods/cnc/weapons.yaml b/mods/cnc/weapons.yaml index c8f9317c38..ce1ffc0909 100644 --- a/mods/cnc/weapons.yaml +++ b/mods/cnc/weapons.yaml @@ -167,7 +167,7 @@ IonCannon: Sniper: Report: RAMGUN2.AUD ValidTargets: Infantry - ROF: 40 + ReloadDelay: 40 Range: 6c0 Projectile: Bullet Speed: 1c682 @@ -178,7 +178,7 @@ Sniper: ValidTargets: Infantry HighV: - ROF: 25 + ReloadDelay: 25 Range: 6c0 Report: GUN8.AUD Projectile: Bullet @@ -196,7 +196,7 @@ HighV: Explosion: piffs HeliAGGun: - ROF: 20 + ReloadDelay: 20 Burst: 2 BurstDelay: 0 Range: 4c0 @@ -219,7 +219,7 @@ HeliAGGun: Explosion: piffs HeliAAGun: - ROF: 20 + ReloadDelay: 20 Burst: 2 BurstDelay: 0 Range: 4c0 @@ -242,7 +242,7 @@ HeliAAGun: Explosion: piffs Pistol: - ROF: 7 + ReloadDelay: 7 Range: 3c0 InvalidTargets: Wall Report: GUN18.AUD @@ -262,7 +262,7 @@ Pistol: Explosion: piff M16: - ROF: 20 + ReloadDelay: 20 Range: 4c0 InvalidTargets: Wall Report: MGUN2.AUD @@ -282,7 +282,7 @@ M16: Explosion: piff Rockets: - ROF: 50 + ReloadDelay: 50 Range: 6c0 Report: BAZOOK1.AUD ValidTargets: Ground, Air @@ -314,7 +314,7 @@ Rockets: ImpactSound: xplos.aud BikeRockets: - ROF: 50 + ReloadDelay: 50 Range: 6c0 Report: BAZOOK1.AUD ValidTargets: Ground, Air @@ -348,7 +348,7 @@ BikeRockets: ImpactSound: xplos.aud OrcaAGMissiles: - ROF: 12 + ReloadDelay: 12 Burst: 2 BurstDelay: 12 Range: 5c0 @@ -381,7 +381,7 @@ OrcaAGMissiles: ImpactSound: xplos.aud OrcaAAMissiles: - ROF: 12 + ReloadDelay: 12 Burst: 2 BurstDelay: 12 Range: 5c0 @@ -412,7 +412,7 @@ OrcaAAMissiles: ImpactSound: xplos.aud Flamethrower: - ROF: 55 + ReloadDelay: 55 Range: 2c512 InvalidTargets: Wall Report: FLAMER2.AUD @@ -435,7 +435,7 @@ Flamethrower: ImpactSound: flamer2.aud BigFlamer: - ROF: 50 + ReloadDelay: 50 Range: 3c512 InvalidTargets: Wall Report: FLAMER2.AUD @@ -460,7 +460,7 @@ BigFlamer: ImpactSound: flamer2.aud Chemspray: - ROF: 70 + ReloadDelay: 70 Range: 3c0 Report: FLAMER2.AUD Projectile: Bullet @@ -481,7 +481,7 @@ Chemspray: ImpactSound: xplos.aud Grenade: - ROF: 50 + ReloadDelay: 50 Range: 4c0 Report: toss1.aud Projectile: Bullet @@ -506,7 +506,7 @@ Grenade: ImpactSound: xplos.aud 70mm: - ROF: 30 + ReloadDelay: 30 Range: 4c0 Report: TNKFIRE3.AUD Projectile: Bullet @@ -529,7 +529,7 @@ Grenade: ImpactSound: xplos.aud 105mm: - ROF: 50 + ReloadDelay: 50 Range: 4c768 Report: TNKFIRE4.AUD Projectile: Bullet @@ -551,7 +551,7 @@ Grenade: ImpactSound: xplos.aud 120mm: - ROF: 40 + ReloadDelay: 40 Range: 4c768 Report: TNKFIRE6.AUD Projectile: Bullet @@ -574,7 +574,7 @@ Grenade: ImpactSound: xplos.aud 120mmDual: - ROF: 40 + ReloadDelay: 40 Range: 4c768 Report: TNKFIRE6.AUD Burst: 2 @@ -599,7 +599,7 @@ Grenade: ImpactSound: xplos.aud TurretGun: - ROF: 20 + ReloadDelay: 20 Range: 6c0 Report: TNKFIRE6.AUD Projectile: Bullet @@ -621,7 +621,7 @@ TurretGun: ImpactSound: xplos.aud MammothMissiles: - ROF: 45 + ReloadDelay: 45 Range: 5c0 Report: ROCKET1.AUD ValidTargets: Ground, Air @@ -659,7 +659,7 @@ MammothMissiles: ValidImpactTypes: Air, AirHit 227mm: - ROF: 140 + ReloadDelay: 140 Range: 12c0 MinRange: 3c0 Burst: 4 @@ -694,7 +694,7 @@ MammothMissiles: ImpactSound: xplos.aud 227mm.stnk: - ROF: 70 + ReloadDelay: 70 Range: 7c0 Report: ROCKET1.AUD Burst: 2 @@ -727,7 +727,7 @@ MammothMissiles: ImpactSound: xplos.aud ArtilleryShell: - ROF: 65 + ReloadDelay: 65 Range: 11c0 MinRange: 2c896 Report: TNKFIRE2.AUD @@ -754,7 +754,7 @@ ArtilleryShell: ImpactSound: XPLOSML2.AUD MachineGun: - ROF: 20 + ReloadDelay: 20 Burst: 5 InvalidTargets: Wall Range: 4c0 @@ -776,7 +776,7 @@ MachineGun: Explosion: piffs BoatMissile: - ROF: 35 + ReloadDelay: 35 Range: 8c0 Burst: 2 BurstDelay: 7 @@ -812,7 +812,7 @@ BoatMissile: ValidImpactTypes: Air, AirHit TowerMissle: - ROF: 15 + ReloadDelay: 15 Range: 7c0 Report: ROCKET2.AUD ValidTargets: Ground @@ -844,7 +844,7 @@ TowerMissle: Vulcan: ValidTargets: Ground, Water - ROF: 2 + ReloadDelay: 2 Range: 6c0 Report: gun5.aud Projectile: Bullet @@ -864,7 +864,7 @@ Vulcan: Napalm: ValidTargets: Ground, Water - ROF: 4 + ReloadDelay: 4 Range: 2c0 Burst: 2 BurstDelay: 2 @@ -903,7 +903,7 @@ Napalm.Crate: ImpactSound: flamer2.aud Laser: - ROF: 1 + ReloadDelay: 1 Range: 7c512 Charges: true Report: OBELRAY1.AUD @@ -920,7 +920,7 @@ Laser: SmudgeType: Scorch SAMMissile: - ROF: 15 + ReloadDelay: 15 Range: 8c0 Report: ROCKET2.AUD ValidTargets: Air @@ -950,7 +950,7 @@ SAMMissile: ImpactSound: xplos.aud HonestJohn: - ROF: 200 + ReloadDelay: 200 Range: 10c0 Report: ROCKET1.AUD Projectile: Bullet @@ -979,7 +979,7 @@ HonestJohn: ImpactSound: xplos.aud Tiberium: - ROF: 16 + ReloadDelay: 16 Warhead@1Dam: SpreadDamage Spread: 42 Damage: 2 @@ -1004,14 +1004,14 @@ TiberiumExplosion: ImpactSound: xplosml2.aud Heal: - ROF: 4 + ReloadDelay: 4 Warhead@1Dam: SpreadDamage Spread: 42 Damage: -1 PreventProne: yes APCGun: - ROF: 18 + ReloadDelay: 18 Range: 5c0 Report: gun20.aud ValidTargets: Ground @@ -1030,7 +1030,7 @@ APCGun: Explosion: small_poof APCGun.AA: - ROF: 18 + ReloadDelay: 18 Range: 7c0 Report: gun20.aud ValidTargets: Air @@ -1047,7 +1047,7 @@ APCGun.AA: Explosion: small_frag Patriot: - ROF: 25 + ReloadDelay: 25 Range: 9c0 MinRange: 1c0 Report: ROCKET2.AUD @@ -1078,7 +1078,7 @@ Patriot: ImpactSound: xplos.aud Tail: - ROF: 30 + ReloadDelay: 30 Range: 1c0 Projectile: Bullet Speed: 1c682 @@ -1094,7 +1094,7 @@ Tail: Concrete: 10% Horn: - ROF: 20 + ReloadDelay: 20 Range: 1c0 Projectile: Bullet Speed: 1c682 @@ -1110,7 +1110,7 @@ Horn: Concrete: 10% Teeth: - ROF: 30 + ReloadDelay: 30 Range: 1c0 Projectile: Bullet Speed: 1c682 @@ -1126,7 +1126,7 @@ Teeth: Concrete: 10% Claw: - ROF: 10 + ReloadDelay: 10 Range: 1c0 Projectile: Bullet Speed: 1c682 diff --git a/mods/d2k/weapons.yaml b/mods/d2k/weapons.yaml index 67961eb3b3..f68ecd0ac1 100644 --- a/mods/d2k/weapons.yaml +++ b/mods/d2k/weapons.yaml @@ -1,5 +1,5 @@ LMG: - ROF: 20 + ReloadDelay: 20 Range: 5c0 Report: MGUN2.WAV Projectile: Bullet @@ -21,7 +21,7 @@ LMG: Explosion: piffs Bazooka: - ROF: 50 + ReloadDelay: 50 Range: 5c0 Report: BAZOOK1.WAV ValidTargets: Ground @@ -51,7 +51,7 @@ Bazooka: ImpactSound: EXPLSML1.WAV Sniper: - ROF: 100 + ReloadDelay: 100 Range: 8c512 Report: FREMODD1.WAV Projectile: Bullet @@ -72,7 +72,7 @@ Sniper: Concrete: 0% Vulcan: - ROF: 30 + ReloadDelay: 30 Range: 5c768 Report: VULCAN.AUD ValidTargets: Ground, Air @@ -96,7 +96,7 @@ Vulcan: Explosion: piffs Slung: - ROF: 60 + ReloadDelay: 60 Delay: 5 Range: 5c512 Report: BAZOOK2.WAV @@ -124,7 +124,7 @@ Slung: ImpactSound: EXPLLG5.WAV HMG: - ROF: 30 + ReloadDelay: 30 Range: 5c0 Burst: 2 BurstDelay: 5 @@ -148,7 +148,7 @@ HMG: Explosion: piffs HMGo: - ROF: 30 + ReloadDelay: 30 Range: 5c0 Burst: 2 BurstDelay: 5 @@ -172,7 +172,7 @@ HMGo: Explosion: piffs QuadRockets: - ROF: 40 + ReloadDelay: 40 Burst: 2 BurstDelay: 25 Range: 7c0 @@ -203,7 +203,7 @@ QuadRockets: ImpactSound: EXPLSML1.WAV TurretGun: - ROF: 35 + ReloadDelay: 35 Range: 7c0 Report: TURRET1.WAV Projectile: Bullet @@ -228,7 +228,7 @@ TurretGun: ImpactSound: EXPLSML4.WAV TowerMissile: - ROF: 35 + ReloadDelay: 35 Range: 7c768 MinRange: 1c0 Report: ROCKET1.WAV @@ -263,7 +263,7 @@ TowerMissile: ImpactSound: EXPLMD1.WAV 90mm: - ROF: 50 + ReloadDelay: 50 Range: 5c768 Report: MEDTANK1.WAV Projectile: Bullet @@ -286,7 +286,7 @@ TowerMissile: ImpactSound: EXPLSML4.WAV 90mma: - ROF: 50 + ReloadDelay: 50 Range: 7c0 Report: MEDTANK1.WAV Projectile: Bullet @@ -309,7 +309,7 @@ TowerMissile: ImpactSound: EXPLSML4.WAV DevBullet: - ROF: 50 + ReloadDelay: 50 Range: 5c0 Report: TANKHVY1.WAV Projectile: Bullet @@ -331,7 +331,7 @@ DevBullet: Explosion: shockwave 227mm: - ROF: 100 + ReloadDelay: 100 Range: 10c0 MinRange: 4c0 Burst: 4 @@ -366,7 +366,7 @@ DevBullet: ImpactSound: EXPLMD3.WAV FakeMissile: - ROF: 120 + ReloadDelay: 120 Range: 8c0 Burst: 1 Report: MISSLE1.WAV @@ -393,7 +393,7 @@ FakeMissile: ImpactSound: EXPLSML2.WAV 155mm: - ROF: 75 + ReloadDelay: 75 Range: 8c0 MinRange: 2c0 Report: MORTAR1.WAV @@ -422,7 +422,7 @@ FakeMissile: ImpactSound: EXPLLG3.WAV Sound: - ROF: 100 + ReloadDelay: 100 Range: 8c512 Report: SONIC1.WAV Projectile: LaserZap @@ -441,7 +441,7 @@ Sound: Concrete: 75% ChainGun: - ROF: 10 + ReloadDelay: 10 Range: 5c0 MinRange: 1c0 Report: 20MMGUN1.WAV @@ -461,7 +461,7 @@ ChainGun: Explosion: piffs Heal: - ROF: 160 + ReloadDelay: 160 Range: 4c0 Report: Projectile: Bullet @@ -477,7 +477,7 @@ Heal: Concrete: 0% WormJaw: - ROF: 10 + ReloadDelay: 10 Range: 3c0 Report: WORM.WAV Warhead@1Dam: SpreadDamage @@ -488,7 +488,7 @@ WormJaw: Concrete: 0% ParaBomb: - ROF: 10 + ReloadDelay: 10 Range: 4c512 Report: Projectile: GravityBomb @@ -509,7 +509,7 @@ ParaBomb: ImpactSound: EXPLLG3.WAV Napalm: - ROF: 2 + ReloadDelay: 2 Range: 3c0 Projectile: GravityBomb Image: BOMBS @@ -642,7 +642,7 @@ UnitExplodeScale: ImpactSound: EXPLLG2.WAV, EXPLLG3.WAV, EXPLLG5.WAV Grenade: - ROF: 60 + ReloadDelay: 60 Range: 4c0 Report: Projectile: Bullet @@ -667,12 +667,12 @@ Grenade: ImpactSound: EXPLLG5.WAV Weathering: - ROF: 100 + ReloadDelay: 100 Warhead@1Dam: SpreadDamage Damage: 5 Shrapnel: - ROF: 60 + ReloadDelay: 60 Range: 4c0 Report: Projectile: Bullet diff --git a/mods/ra/maps/allies-01-classic/map.yaml b/mods/ra/maps/allies-01-classic/map.yaml index 427eb01ffc..eb668466c8 100644 --- a/mods/ra/maps/allies-01-classic/map.yaml +++ b/mods/ra/maps/allies-01-classic/map.yaml @@ -617,7 +617,7 @@ Weapons: Range: 25c0 M60mg: Range: 5c0 - ROF: 20 + ReloadDelay: 20 Burst: 1 Warhead: SpreadDamage Damage: 20 diff --git a/mods/ra/maps/allies-02-classic/map.yaml b/mods/ra/maps/allies-02-classic/map.yaml index ab1c51bbf1..be5e9ca389 100644 --- a/mods/ra/maps/allies-02-classic/map.yaml +++ b/mods/ra/maps/allies-02-classic/map.yaml @@ -953,7 +953,7 @@ VoxelSequences: Weapons: M60mg: Range: 5c0 - ROF: 20 + ReloadDelay: 20 Burst: 1 Warhead: SpreadDamage Damage: 20 diff --git a/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml b/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml index 52eae61774..493f64159c 100644 --- a/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml +++ b/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml @@ -362,7 +362,7 @@ VoxelSequences: Weapons: PortaTesla: - ROF: 20 + ReloadDelay: 20 Range: 10c0 Warhead: SpreadDamage Spread: 42 diff --git a/mods/ra/maps/drop-zone-w/map.yaml b/mods/ra/maps/drop-zone-w/map.yaml index dba9624318..3a1ed4a6a3 100644 --- a/mods/ra/maps/drop-zone-w/map.yaml +++ b/mods/ra/maps/drop-zone-w/map.yaml @@ -302,7 +302,7 @@ VoxelSequences: Weapons: 8Inch: - ROF: 200 + ReloadDelay: 200 Range: 32c0 Burst: 4 Report: TURRET1 @@ -330,7 +330,7 @@ Weapons: Warhead@2Smu: LeaveSmudge SmudgeType: Crater SubMissile: - ROF: 250 + ReloadDelay: 250 Range: 32c0 Burst: 4 Report: MISSILE6 diff --git a/mods/ra/maps/drop-zone/map.yaml b/mods/ra/maps/drop-zone/map.yaml index 5785d7ca5a..a4c1196a5d 100644 --- a/mods/ra/maps/drop-zone/map.yaml +++ b/mods/ra/maps/drop-zone/map.yaml @@ -257,7 +257,7 @@ VoxelSequences: Weapons: PortaTesla: - ROF: 20 + ReloadDelay: 20 Range: 10c0 Warhead: SpreadDamage Spread: 42 diff --git a/mods/ra/maps/fort-lonestar/map.yaml b/mods/ra/maps/fort-lonestar/map.yaml index 959ca7b8cd..bd21cd60a8 100644 --- a/mods/ra/maps/fort-lonestar/map.yaml +++ b/mods/ra/maps/fort-lonestar/map.yaml @@ -761,7 +761,7 @@ VoxelSequences: Weapons: 120mm: - ROF: 150 + ReloadDelay: 150 Range: 10c0 Report: CANNON1.AUD Burst: 6 @@ -786,7 +786,7 @@ Weapons: Explosion: self_destruct WaterExplosion: self_destruct MammothTusk: - ROF: 300 + ReloadDelay: 300 Range: 10c0 Report: MISSILE6.AUD Burst: 2 @@ -820,7 +820,7 @@ Weapons: Explosion: nuke WaterExplosion: nuke TankNapalm: - ROF: 40 + ReloadDelay: 40 Range: 8c0 Report: AACANON3.AUD ValidTargets: Ground @@ -850,7 +850,7 @@ Weapons: WaterExplosion: small_explosion ImpactSound: firebl3.aud ParaBomb: - ROF: 5 + ReloadDelay: 5 Range: 5c0 Report: CHUTE1.AUD Projectile: GravityBomb @@ -871,7 +871,7 @@ Weapons: ImpactSound: firebl3.aud WaterExplosion: napalm 155mm: - ROF: 10 + ReloadDelay: 10 Range: 7c5 Burst: 20 MinRange: 3c0 @@ -901,7 +901,7 @@ Weapons: WaterExplosion: small_napalm ImpactSound: firebl3.aud FLAK-23: - ROF: 10 + ReloadDelay: 10 Range: 8c0 Report: AACANON3.AUD ValidTargets: Air, Ground @@ -923,7 +923,7 @@ Weapons: Warhead@3Eff: CreateEffect Explosion: med_explosion SCUD: - ROF: 280 + ReloadDelay: 280 Range: 7c0 MinRange: 3c0 Report: MISSILE1.AUD @@ -954,7 +954,7 @@ Weapons: ImpactSound: kaboom1.aud WaterImpactSound: kaboom1.aud SilencedPPK: - ROF: 80 + ReloadDelay: 80 Range: 25c0 Report: silppk.aud Projectile: Bullet diff --git a/mods/ra/weapons.yaml b/mods/ra/weapons.yaml index 46709b4afd..b3c245a8ee 100644 --- a/mods/ra/weapons.yaml +++ b/mods/ra/weapons.yaml @@ -1,5 +1,5 @@ Colt45: - ROF: 5 + ReloadDelay: 5 Range: 7c0 Report: GUN5.AUD Projectile: Bullet @@ -24,7 +24,7 @@ Colt45: ZSU-23: Burst: 2 BurstDelay: 5 - ROF: 0 + ReloadDelay: 0 Range: 10c0 Report: AACANON3.AUD ValidTargets: Air @@ -44,7 +44,7 @@ ZSU-23: Explosion: small_explosion_air Vulcan: - ROF: 30 + ReloadDelay: 30 Range: 6c0 Report: GUN13.AUD Projectile: Bullet @@ -156,7 +156,7 @@ Vulcan: Delay: 10 Maverick: - ROF: 30 + ReloadDelay: 30 Range: 9c0 MinRange: 3c0 Report: MISSILE7.AUD @@ -194,7 +194,7 @@ Maverick: ValidImpactTypes: Water FireballLauncher: - ROF: 65 + ReloadDelay: 65 Range: 5c0 Burst: 2 BurstDelay: 20 @@ -219,7 +219,7 @@ FireballLauncher: ImpactSound: firebl3.aud Flamer: - ROF: 50 + ReloadDelay: 50 Range: 5c0 Burst: 15 BurstDelay: 1 @@ -246,7 +246,7 @@ Flamer: ImpactSound: firebl3.aud ChainGun: - ROF: 10 + ReloadDelay: 10 Range: 5c0 MinRange: 1c0 Report: GUN13.AUD @@ -271,7 +271,7 @@ ChainGun: ValidImpactTypes: Water ChainGun.Yak: - ROF: 3 + ReloadDelay: 3 Range: 5c0 MinRange: 3c0 Report: GUN13.AUD @@ -295,7 +295,7 @@ ChainGun.Yak: ValidImpactTypes: Water Pistol: - ROF: 7 + ReloadDelay: 7 Range: 3c0 Report: GUN27.AUD Projectile: Bullet @@ -317,7 +317,7 @@ Pistol: ValidImpactTypes: Water M1Carbine: - ROF: 20 + ReloadDelay: 20 Range: 5c0 Report: GUN11.AUD Projectile: Bullet @@ -339,7 +339,7 @@ M1Carbine: ValidImpactTypes: Water Dragon: - ROF: 50 + ReloadDelay: 50 Range: 5c0 Report: MISSILE6.AUD ValidTargets: Ground, Water @@ -375,7 +375,7 @@ Dragon: ValidImpactTypes: Water HellfireAG: - ROF: 60 + ReloadDelay: 60 Range: 4c0 Report: MISSILE6.AUD Burst: 2 @@ -412,7 +412,7 @@ HellfireAG: ValidImpactTypes: Water HellfireAA: - ROF: 60 + ReloadDelay: 60 Range: 4c0 Report: MISSILE6.AUD Burst: 2 @@ -449,7 +449,7 @@ HellfireAA: ValidImpactTypes: Water Grenade: - ROF: 60 + ReloadDelay: 60 Range: 4c0 Report: grenade1.aud Projectile: Bullet @@ -479,7 +479,7 @@ Grenade: ValidImpactTypes: Water 25mm: - ROF: 13 + ReloadDelay: 13 Range: 4c0 Report: CANNON2.AUD Projectile: Bullet @@ -504,7 +504,7 @@ Grenade: ValidImpactTypes: Water 90mm: - ROF: 50 + ReloadDelay: 50 Range: 4c768 Report: CANNON1.AUD Projectile: Bullet @@ -531,7 +531,7 @@ Grenade: ValidImpactTypes: Water 105mm: - ROF: 70 + ReloadDelay: 70 Range: 4c768 Report: CANNON1.AUD Burst: 2 @@ -560,7 +560,7 @@ Grenade: ValidImpactTypes: Water 120mm: - ROF: 90 + ReloadDelay: 90 Range: 4c768 Report: CANNON1.AUD Burst: 2 @@ -590,7 +590,7 @@ Grenade: ValidImpactTypes: Water TurretGun: - ROF: 30 + ReloadDelay: 30 Range: 7c0 Report: TURRET1.AUD Projectile: Bullet @@ -617,7 +617,7 @@ TurretGun: ValidImpactTypes: Water MammothTusk: - ROF: 60 + ReloadDelay: 60 Range: 8c0 Report: MISSILE6.AUD Burst: 2 @@ -657,7 +657,7 @@ MammothTusk: ValidImpactTypes: Air, AirHit 155mm: - ROF: 85 + ReloadDelay: 85 Range: 14c0 MinRange: 3c0 Report: TANK5.AUD @@ -690,7 +690,7 @@ MammothTusk: ValidImpactTypes: Water M60mg: - ROF: 30 + ReloadDelay: 30 Range: 4c0 Report: PILLBOX1.AUD Burst: 5 @@ -713,7 +713,7 @@ M60mg: ValidImpactTypes: Water Napalm: - ROF: 20 + ReloadDelay: 20 Range: 4c512 Projectile: Bullet Image: BOMBLET @@ -814,7 +814,7 @@ CrateNuke: Delay: 4 TeslaZap: - ROF: 3 + ReloadDelay: 3 Charges: true Range: 8c512 Report: TESLA1.AUD @@ -828,7 +828,7 @@ TeslaZap: Wood: 60% Nike: - ROF: 15 + ReloadDelay: 15 Range: 7c512 Report: MISSILE1.AUD ValidTargets: Air @@ -858,7 +858,7 @@ Nike: ImpactSound: kaboom25.aud RedEye: - ROF: 50 + ReloadDelay: 50 Range: 7c512 Report: MISSILE1.AUD ValidTargets: Air @@ -887,7 +887,7 @@ RedEye: ImpactSound: kaboom25.aud 8Inch: - ROF: 250 + ReloadDelay: 250 Range: 16c0 Burst: 2 Report: TURRET1.AUD @@ -919,7 +919,7 @@ RedEye: ValidImpactTypes: Water SubMissile: - ROF: 300 + ReloadDelay: 300 Range: 16c0 Burst: 2 Report: MISSILE6.AUD @@ -951,7 +951,7 @@ SubMissile: ValidImpactTypes: Water Stinger: - ROF: 60 + ReloadDelay: 60 Range: 9c0 Report: MISSILE6.AUD Burst: 2 @@ -992,7 +992,7 @@ Stinger: ValidImpactTypes: Water TorpTube: - ROF: 100 + ReloadDelay: 100 Range: 9c0 Report: TORPEDO1.AUD ValidTargets: Water, Underwater, Bridge @@ -1033,7 +1033,7 @@ TorpTube: ValidImpactTypes: Water 2Inch: - ROF: 60 + ReloadDelay: 60 Range: 5c512 Report: CANNON2.AUD Projectile: Bullet @@ -1060,7 +1060,7 @@ TorpTube: ValidImpactTypes: Water DepthCharge: - ROF: 60 + ReloadDelay: 60 Range: 5c0 ValidTargets: Underwater Projectile: Bullet @@ -1090,7 +1090,7 @@ DepthCharge: ValidImpactTypes: WaterHit ParaBomb: - ROF: 10 + ReloadDelay: 10 Range: 3c0 Report: CHUTE1.AUD Projectile: GravityBomb @@ -1119,7 +1119,7 @@ ParaBomb: DogJaw: ValidTargets: Infantry - ROF: 10 + ReloadDelay: 10 Range: 3c0 Report: DOGG5P.AUD Warhead@1Dam: SpreadDamage @@ -1134,7 +1134,7 @@ DogJaw: Concrete: 0% Heal: - ROF: 80 + ReloadDelay: 80 Range: 4c0 Report: HEAL2.AUD Projectile: Bullet @@ -1150,7 +1150,7 @@ Heal: Concrete: 0% Repair: - ROF: 80 + ReloadDelay: 80 Range: 4c0 Report: FIXIT1.AUD ValidTargets: Repair @@ -1169,7 +1169,7 @@ Repair: Concrete: 0% SilencedPPK: - ROF: 80 + ReloadDelay: 80 Range: 2c512 Report: silppk.aud Projectile: Bullet @@ -1191,7 +1191,7 @@ SilencedPPK: ValidImpactTypes: Water SCUD: - ROF: 240 + ReloadDelay: 240 Range: 10c0 MinRange: 3c0 Report: MISSILE1.AUD @@ -1478,7 +1478,7 @@ Demolish: ImpactSound: kaboom25.aud PortaTesla: - ROF: 70 + ReloadDelay: 70 Range: 3c512 Report: TESLA1.AUD Charges: yes @@ -1491,7 +1491,7 @@ PortaTesla: None: 1000% TTankZap: - ROF: 120 + ReloadDelay: 120 Range: 7c0 Report: TESLA1.AUD Charges: yes @@ -1504,7 +1504,7 @@ TTankZap: None: 1000% FLAK-23: - ROF: 10 + ReloadDelay: 10 Range: 8c0 Report: AACANON3.AUD ValidTargets: Air, Ground, Water @@ -1533,7 +1533,7 @@ FLAK-23: Sniper: Report: GUN5.AUD - ROF: 70 + ReloadDelay: 70 Range: 10c0 Projectile: Bullet Speed: 1c682 @@ -1549,7 +1549,7 @@ Sniper: Concrete: 0% APTusk: - ROF: 60 + ReloadDelay: 60 Range: 6c0 Report: MISSILE6.AUD ValidTargets: Ground, Water @@ -1585,7 +1585,7 @@ APTusk: ValidImpactTypes: Water Claw: - ROF: 30 + ReloadDelay: 30 Range: 1c0 Projectile: Bullet Speed: 1c682 @@ -1601,7 +1601,7 @@ Claw: Concrete: 10% Mandible: - ROF: 10 + ReloadDelay: 10 Range: 1c0 Projectile: Bullet Speed: 1c682 diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index 223141f59e..b1856e8a94 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -114,12 +114,13 @@ GainsExperience: ChevronPalette: ra Upgrades: - 500: firepower, armor, speed - 1000: firepower, armor, speed + 500: firepower, armor, speed, reload + 1000: firepower, armor, speed, reload GainsStatUpgrades: - FirepowerModifier: 120, 150 + FirepowerModifier: 110, 130 ArmorModifier: 120, 150 SpeedModifier: 120, 150 + ReloadModifier: 90, 75 GivesExperience: DrawLineToTarget: ActorLostNotification: @@ -203,12 +204,13 @@ GainsExperience: ChevronPalette: ra Upgrades: - 500: firepower, armor, speed - 1000: firepower, armor, speed + 500: firepower, armor, speed, reload + 1000: firepower, armor, speed, reload GainsStatUpgrades: - FirepowerModifier: 120, 150 + FirepowerModifier: 110, 130 ArmorModifier: 120, 150 SpeedModifier: 120, 150 + ReloadModifier: 90, 75 GivesExperience: DrawLineToTarget: ActorLostNotification: @@ -255,12 +257,13 @@ GainsExperience: ChevronPalette: ra Upgrades: - 500: firepower, armor, speed - 1000: firepower, armor, speed + 500: firepower, armor, speed, reload + 1000: firepower, armor, speed, reload GainsStatUpgrades: - FirepowerModifier: 120, 150 + FirepowerModifier: 110, 130 ArmorModifier: 120, 150 SpeedModifier: 120, 150 + ReloadModifier: 90, 75 GivesExperience: DrawLineToTarget: ActorLostNotification: @@ -301,12 +304,13 @@ GainsExperience: ChevronPalette: ra Upgrades: - 500: firepower, armor, speed - 1000: firepower, armor, speed + 500: firepower, armor, speed, reload + 1000: firepower, armor, speed, reload GainsStatUpgrades: - FirepowerModifier: 120, 150 + FirepowerModifier: 110, 130 ArmorModifier: 120, 150 SpeedModifier: 120, 150 + ReloadModifier: 90, 75 GivesExperience: DrawLineToTarget: ActorLostNotification: diff --git a/mods/ts/weapons.yaml b/mods/ts/weapons.yaml index 55a0697a61..f7f2bfcb7c 100644 --- a/mods/ts/weapons.yaml +++ b/mods/ts/weapons.yaml @@ -27,7 +27,7 @@ UnitExplodeSmall: ImpactSound: expnew13.aud Minigun: - ROF: 21 + ReloadDelay: 21 Range: 4c0 Report: INFGUN3.AUD Projectile: Bullet @@ -50,7 +50,7 @@ Minigun: ValidImpactTypes: Water Grenade: - ROF: 60 + ReloadDelay: 60 Range: 4c512 Projectile: Bullet Speed: 85 @@ -80,7 +80,7 @@ Grenade: ValidImpactTypes: Water Bazooka: - ROF: 60 + ReloadDelay: 60 Range: 6c0 Report: RKETINF1.AUD ValidTargets: Ground, Air @@ -119,7 +119,7 @@ Bazooka: ValidImpactTypes: Air, AirHit MultiCluster: - ROF: 80 + ReloadDelay: 80 Range: 6c0 Report: MISL1.AUD ValidTargets: Ground @@ -154,7 +154,7 @@ MultiCluster: ValidImpactTypes: Water Heal: - ROF: 80 + ReloadDelay: 80 Range: 2c849 Report: HEALER1.AUD Projectile: Bullet @@ -171,7 +171,7 @@ Heal: Concrete: 0% Sniper: - ROF: 60 + ReloadDelay: 60 Range: 6c768 Report: SILENCER.AUD Projectile: Bullet @@ -189,7 +189,7 @@ Sniper: Concrete: 0% M1Carbine: - ROF: 20 + ReloadDelay: 20 Range: 4c0 Report: INFGUN3.AUD Projectile: Bullet @@ -212,7 +212,7 @@ M1Carbine: ValidImpactTypes: Water LtRail: - ROF: 60 + ReloadDelay: 60 Range: 6c0 Report: BIGGGUN1.AUD Projectile: LaserZap @@ -233,7 +233,7 @@ LtRail: Concrete: 5% CyCannon: - ROF: 50 + ReloadDelay: 50 Range: 7c0 Report: SCRIN5B.AUD ValidTargets: Ground @@ -264,7 +264,7 @@ CyCannon: ValidImpactTypes: Water Vulcan3: - ROF: 30 + ReloadDelay: 30 Burst: 3 Range: 4c0 Report: CYGUN1.AUD @@ -288,7 +288,7 @@ Vulcan3: ValidImpactTypes: Water Vulcan2: - ROF: 50 + ReloadDelay: 50 Burst: 3 Range: 6c0 Report: TSGUN4.AUD @@ -313,7 +313,7 @@ Vulcan2: ValidImpactTypes: Water Vulcan: - ROF: 60 + ReloadDelay: 60 Range: 4c0 Report: CHAINGN1.AUD Projectile: Bullet @@ -336,7 +336,7 @@ Vulcan: ValidImpactTypes: Water FiendShard: - ROF: 30 + ReloadDelay: 30 Burst: 3 Range: 5c0 Report: FIEND2.AUD @@ -362,7 +362,7 @@ FiendShard: ValidImpactTypes: Water JumpCannon: - ROF: 40 + ReloadDelay: 40 Burst: 2 Range: 5c0 Report: JUMPJET1.AUD @@ -386,7 +386,7 @@ JumpCannon: ValidImpactTypes: Water HoverMissile: - ROF: 68 + ReloadDelay: 68 Burst: 2 Range: 8c0 Report: HOVRMIS1.AUD @@ -426,7 +426,7 @@ HoverMissile: ValidImpactTypes: Air, AirHit 120mmx: - ROF: 80 + ReloadDelay: 80 Range: 6c768 Report: 120MMF.AUD Burst: 2 @@ -457,7 +457,7 @@ HoverMissile: ValidImpactTypes: Water MammothTusk: - ROF: 80 + ReloadDelay: 80 Range: 6c0 Report: MISL1.AUD ValidTargets: Air @@ -494,7 +494,7 @@ MammothTusk: ValidImpactTypes: Water Repair: - ROF: 80 + ReloadDelay: 80 Range: 1c819 Report: REPAIR11.AUD Projectile: Bullet @@ -512,7 +512,7 @@ Repair: Concrete: 0% SlimeAttack: - ROF: 80 + ReloadDelay: 80 Burst: 3 Range: 5c0 Report: VICER1.AUD @@ -529,7 +529,7 @@ SlimeAttack: Concrete: 10% SuicideBomb: - ROF: 1 + ReloadDelay: 1 Range: 0c512 Report: HUNTER2.AUD Warhead@1Dam: SpreadDamage @@ -544,7 +544,7 @@ SuicideBomb: Warhead@2Res: DestroyResource 120mm: - ROF: 80 + ReloadDelay: 80 Range: 6c768 Report: 120MMF.AUD Projectile: Bullet @@ -569,7 +569,7 @@ SuicideBomb: ValidImpactTypes: Water MechRailgun: - ROF: 60 + ReloadDelay: 60 Range: 8c0 Burst: 2 BurstDelay: 10 @@ -590,7 +590,7 @@ MechRailgun: Concrete: 25% AssaultCannon: - ROF: 50 + ReloadDelay: 50 Range: 5c0 Report: TSGUN4.AUD Projectile: Bullet @@ -613,7 +613,7 @@ AssaultCannon: ValidImpactTypes: Water BikeMissile: - ROF: 60 + ReloadDelay: 60 Burst: 2 BurstDelay: 60 Range: 5c0 @@ -650,7 +650,7 @@ BikeMissile: ValidImpactTypes: Water RaiderCannon: - ROF: 55 + ReloadDelay: 55 Range: 4c0 Burst: 2 BurstDelay: 55 @@ -675,7 +675,7 @@ RaiderCannon: ValidImpactTypes: Water FireballLauncher: - ROF: 50 + ReloadDelay: 50 Range: 4c256 Report: FLAMTNK1.AUD Projectile: Bullet @@ -697,7 +697,7 @@ FireballLauncher: Concrete: 2% SonicZap: - ROF: 120 + ReloadDelay: 120 Range: 6c0 Charges: yes Report: SONIC4.AUD @@ -714,7 +714,7 @@ SonicZap: Concrete: 60% Dragon: - ROF: 50 + ReloadDelay: 50 Range: 6c0 Burst: 2 Report: MISL1.AUD @@ -754,7 +754,7 @@ Dragon: ValidImpactTypes: Air, AirHit 90mm: - ROF: 50 + ReloadDelay: 50 Range: 6c768 Report: 120MMF.AUD Palette: ra @@ -783,7 +783,7 @@ Dragon: ValidImpactTypes: Water 155mm: - ROF: 110 + ReloadDelay: 110 Range: 18c0 Report: 120MMF.AUD Palette: ra @@ -815,7 +815,7 @@ Dragon: ValidImpactTypes: Water Hellfire: - ROF: 50 + ReloadDelay: 50 Range: 6c0 Report: ORCAMIS1.AUD Burst: 2 @@ -855,7 +855,7 @@ Hellfire: ValidImpactTypes: Air, AirHit Bomb: - ROF: 10 + ReloadDelay: 10 Range: 5c0 Palette: player Projectile: Bullet @@ -883,7 +883,7 @@ Bomb: ValidImpactTypes: Water Proton: - ROF: 3 + ReloadDelay: 3 Range: 5c0 Report: SCRIN5B.AUD Burst: 2 @@ -918,7 +918,7 @@ Proton: ValidImpactTypes: Water HarpyClaw: - ROF: 36 + ReloadDelay: 36 Range: 5c0 Report: CYGUN1.AUD Projectile: Bullet @@ -943,7 +943,7 @@ HarpyClaw: ValidImpactTypes: Water Pistola: - ROF: 20 + ReloadDelay: 20 Range: 3c0 Report: GUN18.AUD Projectile: Bullet @@ -966,7 +966,7 @@ Pistola: ValidImpactTypes: Water Tiberium: - ROF: 16 + ReloadDelay: 16 Warhead@1Dam: SpreadDamage Spread: 42 Damage: 2 @@ -974,7 +974,7 @@ Tiberium: PreventProne: yes TiberiumHeal: - ROF: 16 + ReloadDelay: 16 Warhead@1Dam: SpreadDamage Spread: 42 Damage: -2 @@ -1003,7 +1003,7 @@ IonCannon: Delay: 3 VulcanTower: - ROF: 26 + ReloadDelay: 26 Range: 6c0 Report: CHAINGN1.AUD Projectile: Bullet @@ -1025,7 +1025,7 @@ VulcanTower: ValidImpactTypes: Water RPGTower: - ROF: 80 + ReloadDelay: 80 Range: 8c0 Report: GLNCH4.AUD Palette: player @@ -1056,7 +1056,7 @@ RPGTower: ValidImpactTypes: Water SAMTower: - ROF: 55 + ReloadDelay: 55 Range: 15c0 Report: SAMSHOT1.AUD ValidTargets: Air @@ -1080,7 +1080,7 @@ SAMTower: ImpactSound: expnew12.aud ObeliskLaser: - ROF: 120 + ReloadDelay: 120 Range: 10c512 Charges: true Report: OBELRAY1.AUD @@ -1095,7 +1095,7 @@ ObeliskLaser: SmudgeType: Scorch TurretLaser: - ROF: 40 + ReloadDelay: 40 Range: 5c512 Report: LASTUR1.AUD Projectile: LaserZap