From ce8f3ed1686b0793b84196ea1f3cd51feeb20129 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Fri, 23 Jun 2017 22:30:59 +0200 Subject: [PATCH] RA mission weapon warhead fixes --- mods/ra/maps/drop-zone-w/weapons.yaml | 20 ------------------- .../ra/maps/monster-tank-madness/weapons.yaml | 5 ++--- mods/ra/maps/soviet-07/weapons.yaml | 4 ---- mods/ra/maps/survival02/weapons.yaml | 6 +----- 4 files changed, 3 insertions(+), 32 deletions(-) diff --git a/mods/ra/maps/drop-zone-w/weapons.yaml b/mods/ra/maps/drop-zone-w/weapons.yaml index 3c39f60a4b..afc99eafb5 100644 --- a/mods/ra/maps/drop-zone-w/weapons.yaml +++ b/mods/ra/maps/drop-zone-w/weapons.yaml @@ -19,16 +19,6 @@ Heavy: 25 Damage: 250 DamageTypes: Prone50Percent, TriggerProne, BulletDeath - Warhead@1Eff: CreateEffect - Explosions: large_explosion - ImpactSounds: kaboom12.aud - ValidImpactTypes: Ground - Warhead@2Eff: CreateEffect - Explosions: large_splash - ImpactSounds: splash9.aud - ValidImpactTypes: Water - Warhead@3Smu: LeaveSmudge - SmudgeType: Crater SubMissile: ReloadDelay: 250 @@ -51,13 +41,3 @@ SubMissile: Heavy: 30 Damage: 400 DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath - Warhead@1Eff: CreateEffect - Explosions: large_explosion - ImpactSounds: kaboom12.aud - ValidImpactTypes: Ground - Warhead@2Eff: CreateEffect - Explosions: large_splash - ImpactSounds: splash9.aud - ValidImpactTypes: Water - Warhead@3Smu: LeaveSmudge - SmudgeType: Crater diff --git a/mods/ra/maps/monster-tank-madness/weapons.yaml b/mods/ra/maps/monster-tank-madness/weapons.yaml index 26bd9a3928..b7385ff421 100644 --- a/mods/ra/maps/monster-tank-madness/weapons.yaml +++ b/mods/ra/maps/monster-tank-madness/weapons.yaml @@ -7,6 +7,7 @@ TurretGun: Blockable: false SuperTankPrimary: + Inherits: ^Cannon ROF: 70 Range: 4c768 Report: turret1.aud @@ -27,9 +28,7 @@ SuperTankPrimary: DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath Warhead@2Smu: LeaveSmudge SmudgeType: Crater - Warhead@3EffGround: CreateEffect + Warhead@3Eff: CreateEffect Explosions: small_explosion - InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect Explosions: small_splash - ValidImpactTypes: Water diff --git a/mods/ra/maps/soviet-07/weapons.yaml b/mods/ra/maps/soviet-07/weapons.yaml index 98de71bba4..f83776da76 100644 --- a/mods/ra/maps/soviet-07/weapons.yaml +++ b/mods/ra/maps/soviet-07/weapons.yaml @@ -15,10 +15,6 @@ M1CarbineInterior: DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@2Eff: CreateEffect Explosions: piffs - InvalidImpactTypes: Water - Warhead@3EffWater: CreateEffect - Explosions: water_piffs - ValidImpactTypes: Water FireballLauncherInterior: ReloadDelay: 65 diff --git a/mods/ra/maps/survival02/weapons.yaml b/mods/ra/maps/survival02/weapons.yaml index b66f3bfdcc..f3f94b237a 100644 --- a/mods/ra/maps/survival02/weapons.yaml +++ b/mods/ra/maps/survival02/weapons.yaml @@ -15,13 +15,9 @@ ParaBomb: Heavy: 50 Concrete: 25 DamageTypes: Prone50Percent, TriggerProne, FireDeath - Warhead@2Smu: LeaveSmudge - SmudgeType: Crater Warhead@3Eff: CreateEffect Explosions: napalm ImpactSounds: firebl3.aud - InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect Explosions: napalm - ImpactSounds: splash9.aud - ValidImpactTypes: Water + ImpactSounds: firebl3.aud