From b68c9358079cd39f10343ef25bdf55c19f14fb05 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Wed, 6 Sep 2017 22:33:49 +0200 Subject: [PATCH] Fix water splash on bridge in RA On bleed, both the explosion as well as the water splash warhead of weapons triggered on bridges, since they have both the Ground and Water target types. Ground cannot be made invalid for water splashes without causing regressions elsewhere, so a new Bridge target type is introduced to explicitly make bridges invalid targets for water splash effect warheads. --- mods/ra/rules/defaults.yaml | 2 +- mods/ra/weapons/ballistics.yaml | 2 +- mods/ra/weapons/explosions.yaml | 2 +- mods/ra/weapons/missiles.yaml | 4 ++-- mods/ra/weapons/smallcaliber.yaml | 18 +++++++++--------- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index cc79ac5943..aafdd927e6 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -940,7 +940,7 @@ Name: Bridge ShowOwnerRow: false Targetable: - TargetTypes: Ground, Water + TargetTypes: Ground, Water, Bridge RequiresForceFire: true Building: Footprint: ____ ____ diff --git a/mods/ra/weapons/ballistics.yaml b/mods/ra/weapons/ballistics.yaml index 9fa0a7510b..02d1b5038d 100644 --- a/mods/ra/weapons/ballistics.yaml +++ b/mods/ra/weapons/ballistics.yaml @@ -26,7 +26,7 @@ Explosions: small_splash ImpactSounds: splash9.aud ValidTargets: Water, Underwater - InvalidTargets: Ship, Structure + InvalidTargets: Ship, Structure, Bridge 25mm: Inherits: ^Cannon diff --git a/mods/ra/weapons/explosions.yaml b/mods/ra/weapons/explosions.yaml index ed441e88e4..9fd0b6ef17 100644 --- a/mods/ra/weapons/explosions.yaml +++ b/mods/ra/weapons/explosions.yaml @@ -21,7 +21,7 @@ Explosions: large_splash ImpactSounds: splash9.aud ValidTargets: Water, Underwater - InvalidTargets: Ship, Structure + InvalidTargets: Ship, Structure, Bridge CrateNapalm: Inherits: ^Explosion diff --git a/mods/ra/weapons/missiles.yaml b/mods/ra/weapons/missiles.yaml index 23f38bc0a2..d4f7c3d2da 100644 --- a/mods/ra/weapons/missiles.yaml +++ b/mods/ra/weapons/missiles.yaml @@ -35,7 +35,7 @@ Explosions: med_splash ImpactSounds: splash9.aud ValidTargets: Water, Underwater - InvalidTargets: Ship, Structure + InvalidTargets: Ship, Structure, Bridge ^AntiAirMissile: Inherits: ^AntiGroundMissile @@ -258,7 +258,7 @@ TorpTube: Explosions: large_splash ImpactSounds: splash9.aud ValidTargets: Water - InvalidTargets: Ship, Structure, Underwater + InvalidTargets: Ship, Structure, Underwater, Bridge ^SubMissileDefault: Inherits: ^AntiGroundMissile diff --git a/mods/ra/weapons/smallcaliber.yaml b/mods/ra/weapons/smallcaliber.yaml index 29fe68fb4f..d6d5fe0639 100644 --- a/mods/ra/weapons/smallcaliber.yaml +++ b/mods/ra/weapons/smallcaliber.yaml @@ -55,7 +55,7 @@ FLAK-23-AG: Warhead@3EffWater: CreateEffect Explosions: small_splash ValidTargets: Water, Underwater - InvalidTargets: Ship, Structure + InvalidTargets: Ship, Structure, Bridge ^HeavyMG: ReloadDelay: 30 @@ -79,7 +79,7 @@ FLAK-23-AG: Warhead@3EffWater: CreateEffect Explosions: water_piffs ValidTargets: Water, Underwater - InvalidTargets: Ship, Structure + InvalidTargets: Ship, Structure, Bridge ^LightMG: Inherits: ^HeavyMG @@ -115,7 +115,7 @@ Vulcan: Warhead@4Eff_2Water: CreateEffect Explosions: water_piffs ValidTargets: Water, Underwater - InvalidTargets: Ship, Structure + InvalidTargets: Ship, Structure, Bridge Delay: 2 Warhead@5Dam_3: SpreadDamage Spread: 128 @@ -135,7 +135,7 @@ Vulcan: Warhead@6Eff_3Water: CreateEffect Explosions: water_piffs ValidTargets: Water, Underwater - InvalidTargets: Ship, Structure + InvalidTargets: Ship, Structure, Bridge Delay: 4 Warhead@7Dam_4: SpreadDamage Spread: 128 @@ -155,7 +155,7 @@ Vulcan: Warhead@8Eff_4Water: CreateEffect Explosions: water_piffs ValidTargets: Water, Underwater - InvalidTargets: Ship, Structure + InvalidTargets: Ship, Structure, Bridge Delay: 6 Warhead@9Dam_5: SpreadDamage Spread: 128 @@ -175,7 +175,7 @@ Vulcan: Warhead@10Eff_5Water: CreateEffect Explosions: water_piffs ValidTargets: Water, Underwater - InvalidTargets: Ship, Structure + InvalidTargets: Ship, Structure, Bridge Delay: 8 Warhead@11Dam_6: SpreadDamage Spread: 128 @@ -195,7 +195,7 @@ Vulcan: Warhead@12Eff_6Water: CreateEffect Explosions: water_piffs ValidTargets: Water, Underwater - InvalidTargets: Ship, Structure + InvalidTargets: Ship, Structure, Bridge Delay: 10 ChainGun: @@ -272,7 +272,7 @@ SilencedPPK: Warhead@3EffWater: CreateEffect Explosions: water_piffs ValidTargets: Water, Underwater - InvalidTargets: Ship, Structure + InvalidTargets: Ship, Structure, Bridge Colt45: Inherits: ^SnipeWeapon @@ -286,7 +286,7 @@ Colt45: Warhead@3EffWater: CreateEffect Explosions: water_piff ValidTargets: Water, Underwater - InvalidTargets: Ship, Structure + InvalidTargets: Ship, Structure, Bridge Sniper: Inherits: ^SnipeWeapon