diff --git a/mods/ra/maps/fort-lonestar/rules.yaml b/mods/ra/maps/fort-lonestar/rules.yaml index b527cdee84..8b802a4ab8 100644 --- a/mods/ra/maps/fort-lonestar/rules.yaml +++ b/mods/ra/maps/fort-lonestar/rules.yaml @@ -305,8 +305,6 @@ ARTY: V2RL: Health: HP: 10000 - ReloadAmmoPool: - Delay: 280 4TNK: Health: diff --git a/mods/ra/maps/fort-lonestar/weapons.yaml b/mods/ra/maps/fort-lonestar/weapons.yaml index b42b0e06bc..6616df3c45 100644 --- a/mods/ra/maps/fort-lonestar/weapons.yaml +++ b/mods/ra/maps/fort-lonestar/weapons.yaml @@ -146,6 +146,7 @@ FLAK-23: SCUD: Range: 7c0 + ReloadDelay: 280 Projectile: Bullet Arm: 10 TrailImage: smokey diff --git a/mods/ra/rules/vehicles.yaml b/mods/ra/rules/vehicles.yaml index bc3cbf6491..778d0032e5 100644 --- a/mods/ra/rules/vehicles.yaml +++ b/mods/ra/rules/vehicles.yaml @@ -24,21 +24,14 @@ V2RL: Range: 4c0 Armament: Weapon: SCUD - PauseOnCondition: !ammo + ReloadingCondition: reloading AutoTarget: ScanRadius: 10 - AmmoPool: - Ammo: 1 - PipCount: 0 - AmmoCondition: ammo - ReloadAmmoPool: - Delay: 240 - Count: 1 AttackFrontal: WithFacingSpriteBody: - RequiresCondition: ammo + RequiresCondition: !reloading WithFacingSpriteBody@EMPTY: - RequiresCondition: !ammo + RequiresCondition: reloading Sequence: empty-idle SelectionDecorations: Explodes: diff --git a/mods/ra/weapons/missiles.yaml b/mods/ra/weapons/missiles.yaml index e332dc4d47..fc3f08bb52 100644 --- a/mods/ra/weapons/missiles.yaml +++ b/mods/ra/weapons/missiles.yaml @@ -319,7 +319,7 @@ SubMissileAA: SCUD: Inherits: ^AntiGroundMissile - ReloadDelay: 0 + ReloadDelay: 240 Range: 10c0 MinRange: 4c0 Report: missile1.aud