From 20efd1fc299991acce69298d3b36fa8c16bd9032 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sat, 22 Jul 2017 20:36:09 +0200 Subject: [PATCH] Fix RA effect waheads - take Trees into consideration (they don't have Ground TargetType) - fixed the delayed effect warheads on Vulcan --- mods/ra/weapons/ballistics.yaml | 2 +- mods/ra/weapons/explosions.yaml | 4 ++-- mods/ra/weapons/missiles.yaml | 4 ++-- mods/ra/weapons/smallcaliber.yaml | 35 ++++++++++++++++++------------- mods/ra/weapons/superweapons.yaml | 3 ++- 5 files changed, 27 insertions(+), 21 deletions(-) diff --git a/mods/ra/weapons/ballistics.yaml b/mods/ra/weapons/ballistics.yaml index 329258d45a..c7a1b24027 100644 --- a/mods/ra/weapons/ballistics.yaml +++ b/mods/ra/weapons/ballistics.yaml @@ -21,7 +21,7 @@ Warhead@3Eff: CreateEffect Explosions: small_explosion ImpactSounds: kaboom12.aud - ValidTargets: Ground, Ship + ValidTargets: Ground, Ship, Trees Warhead@4EffWater: CreateEffect Explosions: small_splash ImpactSounds: splash9.aud diff --git a/mods/ra/weapons/explosions.yaml b/mods/ra/weapons/explosions.yaml index e0d50f10cb..ed441e88e4 100644 --- a/mods/ra/weapons/explosions.yaml +++ b/mods/ra/weapons/explosions.yaml @@ -16,7 +16,7 @@ Warhead@2Eff: CreateEffect Explosions: self_destruct ImpactSounds: kaboom22.aud - ValidTargets: Ground, Air, Ship + ValidTargets: Ground, Air, Ship, Trees Warhead@3EffWater: CreateEffect Explosions: large_splash ImpactSounds: splash9.aud @@ -39,7 +39,7 @@ CrateNapalm: Warhead@2Eff: CreateEffect Explosions: napalm ImpactSounds: firebl3.aud - ValidTargets: Ground, Water, Air + ValidTargets: Ground, Water, Air, Trees -Warhead@3EffWater: CreateEffect Warhead@Smu: LeaveSmudge SmudgeType: Scorch diff --git a/mods/ra/weapons/missiles.yaml b/mods/ra/weapons/missiles.yaml index 08cde5c34e..54cb7b7fab 100644 --- a/mods/ra/weapons/missiles.yaml +++ b/mods/ra/weapons/missiles.yaml @@ -30,7 +30,7 @@ Warhead@3Eff: CreateEffect Explosions: med_explosion ImpactSounds: kaboom25.aud - ValidTargets: Ground, Air, Ship + ValidTargets: Ground, Air, Ship, Trees Warhead@4EffWater: CreateEffect Explosions: med_splash ImpactSounds: splash9.aud @@ -128,7 +128,7 @@ MammothTusk: DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@3Eff: CreateEffect ImpactSounds: kaboom12.aud - ValidTargets: Ground + ValidTargets: Ground, Trees Warhead@5EffAir: CreateEffect Explosions: med_explosion_air ImpactSounds: kaboom25.aud diff --git a/mods/ra/weapons/smallcaliber.yaml b/mods/ra/weapons/smallcaliber.yaml index 6fc26464ed..e9c87a0f47 100644 --- a/mods/ra/weapons/smallcaliber.yaml +++ b/mods/ra/weapons/smallcaliber.yaml @@ -19,7 +19,7 @@ DamageTypes: Prone50Percent, TriggerProne, DefaultDeath Warhead@2Eff: CreateEffect Explosions: small_explosion_air - ValidTargets: Air, Ground, Water + ValidTargets: Air, Ground, Water, Trees ZSU-23: Inherits: ^AACannon @@ -51,7 +51,7 @@ FLAK-23-AG: ValidTargets: Air, Ground, Water Warhead@2Eff: CreateEffect Explosions: flak_explosion_ground - ValidTargets: Ground, Ship, Air + ValidTargets: Ground, Ship, Air, Trees Warhead@3EffWater: CreateEffect Explosions: small_splash ValidTargets: Water, Underwater @@ -75,7 +75,7 @@ FLAK-23-AG: DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@2Eff: CreateEffect Explosions: piffs - ValidTargets: Ground, Ship, Air + ValidTargets: Ground, Ship, Air, Trees Warhead@3EffWater: CreateEffect Explosions: water_piffs ValidTargets: Water, Underwater @@ -110,11 +110,12 @@ Vulcan: DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@4Eff_2: CreateEffect Explosions: piffs - ValidTargets: Ground + ValidTargets: Ground, Ship, Trees Delay: 2 Warhead@4Eff_2Water: CreateEffect Explosions: water_piffs - ValidTargets: Water + ValidTargets: Water, Underwater + InvalidTargets: Ship, Structure Delay: 2 Warhead@5Dam_3: SpreadDamage Spread: 128 @@ -129,11 +130,12 @@ Vulcan: DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@6Eff_3: CreateEffect Explosions: piffs - ValidTargets: Ground + ValidTargets: Ground, Ship, Trees Delay: 4 Warhead@6Eff_3Water: CreateEffect Explosions: water_piffs - ValidTargets: Water + ValidTargets: Water, Underwater + InvalidTargets: Ship, Structure Delay: 4 Warhead@7Dam_4: SpreadDamage Spread: 128 @@ -148,11 +150,12 @@ Vulcan: DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@8Eff_4: CreateEffect Explosions: piffs - ValidTargets: Ground + ValidTargets: Ground, Ship, Trees Delay: 6 Warhead@8Eff_4Water: CreateEffect Explosions: water_piffs - ValidTargets: Water + ValidTargets: Water, Underwater + InvalidTargets: Ship, Structure Delay: 6 Warhead@9Dam_5: SpreadDamage Spread: 128 @@ -167,11 +170,12 @@ Vulcan: DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@10Eff_5: CreateEffect Explosions: piffs - ValidTargets: Ground + ValidTargets: Ground, Ship, Trees Delay: 8 Warhead@10Eff_5Water: CreateEffect Explosions: water_piffs - ValidTargets: Water + ValidTargets: Water, Underwater + InvalidTargets: Ship, Structure Delay: 8 Warhead@11Dam_6: SpreadDamage Spread: 128 @@ -186,11 +190,12 @@ Vulcan: DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@12Eff_6: CreateEffect Explosions: piffs - ValidTargets: Ground + ValidTargets: Ground, Ship, Trees Delay: 10 Warhead@12Eff_6Water: CreateEffect Explosions: water_piffs - ValidTargets: Water + ValidTargets: Water, Underwater + InvalidTargets: Ship, Structure Delay: 10 ChainGun: @@ -263,7 +268,7 @@ SilencedPPK: Spread: 128 Warhead@2Eff: CreateEffect Explosions: piffs - ValidTargets: Ground, Ship, Air + ValidTargets: Ground, Ship, Air, Trees Warhead@3EffWater: CreateEffect Explosions: water_piffs ValidTargets: Water, Underwater @@ -277,7 +282,7 @@ Colt45: Damage: 50 Warhead@2Eff: CreateEffect Explosions: piff - ValidTargets: Ground, Ship, Air + ValidTargets: Ground, Ship, Air, Trees Warhead@3EffWater: CreateEffect Explosions: water_piff ValidTargets: Water, Underwater diff --git a/mods/ra/weapons/superweapons.yaml b/mods/ra/weapons/superweapons.yaml index 27d04ca95c..5a17eb8553 100644 --- a/mods/ra/weapons/superweapons.yaml +++ b/mods/ra/weapons/superweapons.yaml @@ -23,7 +23,7 @@ ParaBomb: Warhead@3Eff: CreateEffect Explosions: artillery_explosion ImpactSounds: kaboom15.aud - ValidTargets: Ground, Ship + ValidTargets: Ground, Ship, Trees Warhead@4EffWater: CreateEffect Explosions: small_splash ImpactSounds: splash9.aud @@ -51,6 +51,7 @@ Atomic: Explosions: nuke ImpactSounds: kaboom1.aud VictimScanRadius: 0 + ValidTargets: Ground, Water, Air Warhead@5Dam_areanuke1: SpreadDamage Spread: 2c0 Damage: 60