From c580a94ab72e1db903ef26da82a94627a9aecff1 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sat, 9 May 2020 23:35:25 +0200 Subject: [PATCH] Fix RA weapon ValidTargets --- mods/ra/maps/allies-03b/weapons.yaml | 2 +- mods/ra/maps/allies-05a/weapons.yaml | 1 + mods/ra/maps/fort-lonestar/weapons.yaml | 6 +++--- .../soviet-soldier-volkov-n-chitzkoi/weapons.yaml | 4 ++-- mods/ra/weapons/ballistics.yaml | 1 + mods/ra/weapons/explosions.yaml | 12 ++++++++---- mods/ra/weapons/missiles.yaml | 11 ++++++----- mods/ra/weapons/other.yaml | 7 ++++++- mods/ra/weapons/smallcaliber.yaml | 4 ++-- mods/ra/weapons/superweapons.yaml | 3 ++- 10 files changed, 32 insertions(+), 19 deletions(-) diff --git a/mods/ra/maps/allies-03b/weapons.yaml b/mods/ra/maps/allies-03b/weapons.yaml index a43729f23b..6d7835ff02 100644 --- a/mods/ra/maps/allies-03b/weapons.yaml +++ b/mods/ra/maps/allies-03b/weapons.yaml @@ -1,5 +1,5 @@ Colt45: - ValidTargets: Ground, Infantry, Truk + ValidTargets: Ground, GroundActor, Infantry, Truk Warhead@1Dam: SpreadDamage ValidTargets: Barrel, Infantry, Truk Versus: diff --git a/mods/ra/maps/allies-05a/weapons.yaml b/mods/ra/maps/allies-05a/weapons.yaml index bd85e066ee..19ddd8f2a5 100644 --- a/mods/ra/maps/allies-05a/weapons.yaml +++ b/mods/ra/maps/allies-05a/weapons.yaml @@ -1,4 +1,5 @@ PrisonColt: + ValidTargets: Ground, GroundActor ReloadDelay: 5 Report: gun5.aud Projectile: InstantHit diff --git a/mods/ra/maps/fort-lonestar/weapons.yaml b/mods/ra/maps/fort-lonestar/weapons.yaml index 5170db5a36..46d338eb2e 100644 --- a/mods/ra/maps/fort-lonestar/weapons.yaml +++ b/mods/ra/maps/fort-lonestar/weapons.yaml @@ -23,7 +23,7 @@ MammothTusk: ReloadDelay: 300 Range: 10c0 - ValidTargets: Ground, Air + ValidTargets: Ground, GroundActor, AirborneActor Projectile: Missile Blockable: false Speed: 128 @@ -49,7 +49,7 @@ TankNapalm: ReloadDelay: 40 Range: 8c0 Report: aacanon3.aud - ValidTargets: Ground + ValidTargets: Ground, GroundActor Burst: 6 BurstDelays: 1 Projectile: Bullet @@ -124,7 +124,7 @@ FLAK-23: ReloadDelay: 10 Range: 8c0 Report: aacanon3.aud - ValidTargets: Air, Ground + ValidTargets: AirborneActor, Ground, GroundActor Projectile: Bullet Speed: 1c682 Blockable: false diff --git a/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/weapons.yaml b/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/weapons.yaml index 7d3bb5e6fc..f2ca5dff45 100644 --- a/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/weapons.yaml +++ b/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/weapons.yaml @@ -10,8 +10,8 @@ VolkovWeapon: Inherits: SilencedPPK ReloadDelay: 25 Range: 6c0 - -ValidTargets: - InvalidTargets: Air, Bridge, Structure + ValidTargets: Ground, GroundActor, Water, WaterActor + InvalidTargets: Bridge, Structure Warhead@1Dam: SpreadDamage Spread: 256 Versus: diff --git a/mods/ra/weapons/ballistics.yaml b/mods/ra/weapons/ballistics.yaml index 06979122bd..67a6749ea7 100644 --- a/mods/ra/weapons/ballistics.yaml +++ b/mods/ra/weapons/ballistics.yaml @@ -2,6 +2,7 @@ ReloadDelay: 50 Range: 4c768 Report: cannon1.aud + ValidTargets: Ground, Water, GroundActor, WaterActor Projectile: Bullet Speed: 682 Image: 120MM diff --git a/mods/ra/weapons/explosions.yaml b/mods/ra/weapons/explosions.yaml index 568103eb64..c49a668e34 100644 --- a/mods/ra/weapons/explosions.yaml +++ b/mods/ra/weapons/explosions.yaml @@ -1,5 +1,5 @@ ^Explosion: - ValidTargets: Ground, Water, Air + ValidTargets: Ground, Water, Air, GroundActor, WaterActor, AirborneActor Warhead@1Dam: SpreadDamage Spread: 426 Damage: 5000 @@ -25,7 +25,7 @@ CrateNapalm: Inherits: ^Explosion - ValidTargets: Ground, Trees + ValidTargets: Ground, GroundActor, WaterActor, Trees Warhead@1Dam: SpreadDamage Spread: 170 Damage: 6000 @@ -112,6 +112,7 @@ V2Explode: -Report: BuildingExplode: + ValidTargets: Ground, Water, GroundActor, WaterActor Warhead@2Eff: CreateEffect Explosions: building, building_napalm, large_explosion, self_destruct, large_napalm Warhead@Smu: LeaveSmudge @@ -124,6 +125,7 @@ SmallBuildingExplode: Explosions: building, building_napalm, large_explosion, self_destruct CivPanicExplosion: + ValidTargets: Ground, GroundActor Warhead@1Dam: SpreadDamage # Used to panic civilians which are emitted from a killed CivBuilding Falloff: 100, 100 Range: 0, 128 @@ -153,6 +155,7 @@ BarrelExplode: Delay: 5 ATMine: + ValidTargets: Ground, Water, GroundActor, WaterActor Warhead@1Dam: SpreadDamage Spread: 256 Damage: 40000 @@ -177,6 +180,7 @@ APMine: SmudgeType: Scorch OreExplosion: + ValidTargets: Ground, Water, GroundActor, WaterActor Warhead@1Dam: SpreadDamage Spread: 9 Damage: 1000 @@ -194,7 +198,7 @@ OreExplosion: ImpactSounds: kaboom25.aud CrateNuke: - ValidTargets: Ground, Trees, Water, Air + ValidTargets: Ground, GroundActor, Trees, Water, WaterActor, Underwater, Air, AirborneActor Warhead@1Dam_impact: SpreadDamage Spread: 1c0 Damage: 10000 @@ -240,7 +244,7 @@ CrateNuke: DamageTypes: Incendiary MiniNuke: - ValidTargets: Ground, Trees, Water, Underwater, Air + ValidTargets: Ground, GroundActor, Trees, Water, WaterActor, Underwater, Air, AirborneActor Warhead@1Dam_impact: SpreadDamage Spread: 1c0 Damage: 15000 diff --git a/mods/ra/weapons/missiles.yaml b/mods/ra/weapons/missiles.yaml index 04f604762f..6b1f543d04 100644 --- a/mods/ra/weapons/missiles.yaml +++ b/mods/ra/weapons/missiles.yaml @@ -3,6 +3,7 @@ Range: 5c0 MinRange: 0c512 Report: missile6.aud + ValidTargets: Ground, Water, GroundActor, WaterActor Projectile: Missile Speed: 213 Arm: 2 @@ -39,7 +40,7 @@ ^AntiAirMissile: Inherits: ^AntiGroundMissile - ValidTargets: Air + ValidTargets: AirborneActor Warhead@3Eff: CreateEffect ImpactActors: false @@ -115,7 +116,7 @@ MammothTusk: ReloadDelay: 60 Range: 6c512 Burst: 2 - ValidTargets: Air, Infantry + ValidTargets: AirborneActor, Infantry Projectile: Missile Speed: 341 HorizontalRateOfTurn: 15 @@ -196,7 +197,7 @@ Stinger: StingerAA: Inherits: Stinger - ValidTargets: Air + ValidTargets: AirborneActor Projectile: Missile Speed: 255 CloseEnough: 298 @@ -222,7 +223,7 @@ TorpTube: ReloadDelay: 100 Range: 9c0 Report: torpedo1.aud - ValidTargets: Water, Underwater, Bridge + ValidTargets: Water, WaterActor, Underwater, Bridge Burst: 2 BurstDelays: 20 Projectile: Missile @@ -304,7 +305,7 @@ SubMissile: SubMissileAA: Inherits: ^SubMissileDefault - ValidTargets: Air + ValidTargets: AirborneActor Warhead@1Dam: SpreadDamage Damage: 1500 diff --git a/mods/ra/weapons/other.yaml b/mods/ra/weapons/other.yaml index c68f5f92af..353b30702e 100644 --- a/mods/ra/weapons/other.yaml +++ b/mods/ra/weapons/other.yaml @@ -1,5 +1,5 @@ ^FireWeapon: - ValidTargets: Ground, Water, Trees + ValidTargets: Ground, Water, GroundActor, WaterActor, Trees ReloadDelay: 65 Range: 5c0 Warhead@1Dam: SpreadDamage @@ -76,6 +76,7 @@ Napalm: Range: 8c0 Report: tesla1.aud Projectile: TeslaZap + ValidTargets: Ground, Water, GroundActor, WaterActor Warhead@1Dam: SpreadDamage Spread: 42 Damage: 10000 @@ -140,6 +141,7 @@ Repair: ValidTargets: Repair Demolish: + ValidTargets: GroundActor, WaterActor Warhead@1Dam: SpreadDamage DamageTypes: DefaultDeath Warhead@2Eff: CreateEffect @@ -149,6 +151,7 @@ Demolish: Claw: ReloadDelay: 30 Range: 1c512 + ValidTargets: Ground, Water, GroundActor, WaterActor Projectile: Bullet Speed: 1c682 Warhead@1Dam: SpreadDamage @@ -216,6 +219,7 @@ DemoTruckTargeting: ValidTargets: DetonateAttack MADTankThump: + ValidTargets: GroundActor, WaterActor InvalidTargets: MADTank, Infantry Warhead@1Dam: HealthPercentageDamage Spread: 7c0 @@ -227,6 +231,7 @@ MADTankThump: Multiplier: 1,0 MADTankDetonate: + ValidTargets: GroundActor, WaterActor InvalidTargets: MADTank, Infantry Warhead@1Dam: HealthPercentageDamage Spread: 7c0 diff --git a/mods/ra/weapons/smallcaliber.yaml b/mods/ra/weapons/smallcaliber.yaml index 8201aa7bf5..92bb80a0e8 100644 --- a/mods/ra/weapons/smallcaliber.yaml +++ b/mods/ra/weapons/smallcaliber.yaml @@ -2,7 +2,7 @@ ReloadDelay: 10 Range: 8c0 Report: aacanon3.aud - ValidTargets: Air + ValidTargets: AirborneActor Projectile: InstantHit Warhead@1Dam: SpreadDamage Spread: 213 @@ -59,6 +59,7 @@ FLAK-23-AG: ReloadDelay: 30 Range: 6c0 Report: gun13.aud + ValidTargets: Ground, Water, GroundActor, WaterActor Projectile: InstantHit Blockable: true Warhead@1Dam: SpreadDamage @@ -267,7 +268,6 @@ M60mg: Range: 2c512 Report: gun5.aud ValidTargets: Ground, Infantry - InvalidTargets: Vehicle, Water, Structure, Wall, Husk, Mine Projectile: InstantHit Blockable: true Warhead@1Dam: SpreadDamage diff --git a/mods/ra/weapons/superweapons.yaml b/mods/ra/weapons/superweapons.yaml index a3ed674787..b7a427648f 100644 --- a/mods/ra/weapons/superweapons.yaml +++ b/mods/ra/weapons/superweapons.yaml @@ -2,6 +2,7 @@ ParaBomb: ReloadDelay: 8 Range: 3c0 Report: chute1.aud + ValidTargets: Ground, Water, GroundActor, WaterActor Projectile: GravityBomb Image: PARABOMB OpenSequence: open @@ -31,7 +32,7 @@ ParaBomb: InvalidTargets: Ship, Structure Atomic: - ValidTargets: Ground, Trees, Water, Underwater, Air + ValidTargets: Ground, GroundActor, Trees, Water, WaterActor, Underwater, Air, AirborneActor Warhead@1Dam_impact: SpreadDamage Spread: 1c0 Damage: 15000