From 5cd8acada4abf8a10c56ab1bfb2892425012bbcb Mon Sep 17 00:00:00 2001 From: reaperrr Date: Fri, 23 Jun 2017 22:12:19 +0200 Subject: [PATCH] Adapt TS effect warheads to CEWH refactor --- mods/ts/weapons/ballisticweapons.yaml | 5 +++-- mods/ts/weapons/energyweapons.yaml | 5 +++-- mods/ts/weapons/missiles.yaml | 5 +++-- mods/ts/weapons/otherweapons.yaml | 13 ++++++++----- mods/ts/weapons/smallguns.yaml | 5 +++-- mods/ts/weapons/superweapons.yaml | 6 +++--- 6 files changed, 23 insertions(+), 16 deletions(-) diff --git a/mods/ts/weapons/ballisticweapons.yaml b/mods/ts/weapons/ballisticweapons.yaml index 408a9dfdad..c7d6241432 100644 --- a/mods/ts/weapons/ballisticweapons.yaml +++ b/mods/ts/weapons/ballisticweapons.yaml @@ -23,12 +23,13 @@ Explosions: medium_clsn ExplosionPalette: effect-ignore-lighting-alpha75 ImpactSounds: expnew14.aud - InvalidImpactTypes: Water + ValidTargets: Ground, Air Warhead@3EffWater: CreateEffect Explosions: small_watersplash ExplosionPalette: player ImpactSounds: ssplash3.aud - ValidImpactTypes: Water + ValidTargets: Water + InvalidTargets: Vehicle Warhead@4Smu: LeaveSmudge SmudgeType: MediumCrater InvalidTargets: Vehicle, Building, Wall diff --git a/mods/ts/weapons/energyweapons.yaml b/mods/ts/weapons/energyweapons.yaml index c30aef18f0..652a54602e 100644 --- a/mods/ts/weapons/energyweapons.yaml +++ b/mods/ts/weapons/energyweapons.yaml @@ -107,12 +107,13 @@ SonicZap: Explosions: large_explosion ExplosionPalette: effect-ignore-lighting-alpha75 ImpactSounds: expnew12.aud - InvalidImpactTypes: Water + ValidTargets: Ground, Air Warhead@3EffWater: CreateEffect Explosions: small_watersplash ExplosionPalette: player ImpactSounds: ssplash3.aud - ValidImpactTypes: Water + ValidTargets: Water + InvalidTargets: Vehicle Warhead@4Smu: LeaveSmudge SmudgeType: SmallScorch InvalidTargets: Vehicle, Building, Wall diff --git a/mods/ts/weapons/missiles.yaml b/mods/ts/weapons/missiles.yaml index 6f7932bfa7..8a960a267b 100644 --- a/mods/ts/weapons/missiles.yaml +++ b/mods/ts/weapons/missiles.yaml @@ -37,12 +37,13 @@ Explosions: small_clsn ExplosionPalette: effect-ignore-lighting-alpha75 ImpactSounds: expnew12.aud - InvalidImpactTypes: Water + ValidTargets: Ground, Air Warhead@3EffWater: CreateEffect Explosions: small_watersplash ExplosionPalette: player ImpactSounds: ssplash3.aud - ValidImpactTypes: Water + ValidTargets: Water + InvalidTargets: Vehicle Warhead@Smu: LeaveSmudge SmudgeType: SmallCrater InvalidTargets: Vehicle, Building, Wall diff --git a/mods/ts/weapons/otherweapons.yaml b/mods/ts/weapons/otherweapons.yaml index 1d232a200f..5536d89e46 100644 --- a/mods/ts/weapons/otherweapons.yaml +++ b/mods/ts/weapons/otherweapons.yaml @@ -50,12 +50,13 @@ Bomb: Explosions: large_explosion ExplosionPalette: effect-ignore-lighting-alpha75 ImpactSounds: expnew09.aud - InvalidImpactTypes: Water + ValidTargets: Ground, Air Warhead@3EffWater: CreateEffect Explosions: small_watersplash ExplosionPalette: player ImpactSounds: ssplash3.aud - ValidImpactTypes: Water + ValidTargets: Water + InvalidTargets: Vehicle Warhead@4Smu: LeaveSmudge SmudgeType: MediumCrater InvalidTargets: Vehicle, Building, Wall @@ -85,7 +86,8 @@ FiendShard: Explosions: small_watersplash ExplosionPalette: player ImpactSounds: ssplash3.aud - ValidImpactTypes: Water + ValidTargets: Water + InvalidTargets: Vehicle SlimeAttack: ReloadDelay: 80 @@ -151,12 +153,13 @@ Veins: Warhead@2Eff: CreateEffect Explosions: tiny_twlt ExplosionPalette: effect-ignore-lighting-alpha75 - InvalidImpactTypes: Water + ValidTargets: Ground, Air Warhead@3EffWater: CreateEffect Explosions: small_watersplash ExplosionPalette: player ImpactSounds: ssplash3.aud - ValidImpactTypes: Water + ValidTargets: Water + InvalidTargets: Vehicle Warhead@4Smu: LeaveSmudge SmudgeType: SmallScorch InvalidTargets: Vehicle, Building, Wall diff --git a/mods/ts/weapons/smallguns.yaml b/mods/ts/weapons/smallguns.yaml index 0195e185f2..5a60df5ce4 100644 --- a/mods/ts/weapons/smallguns.yaml +++ b/mods/ts/weapons/smallguns.yaml @@ -15,11 +15,12 @@ DamageTypes: Prone70Percent, TriggerProne, BulletDeath Warhead@2Eff: CreateEffect Explosions: piffs - InvalidImpactTypes: Water + ValidTargets: Ground, Air Warhead@3EffWater: CreateEffect Explosions: water_piffs ExplosionPalette: ra - ValidImpactTypes: Water + ValidTargets: Water + InvalidTargets: Vehicle Minigun: Inherits: ^MG diff --git a/mods/ts/weapons/superweapons.yaml b/mods/ts/weapons/superweapons.yaml index 89f3bf73fd..dfac7d3674 100644 --- a/mods/ts/weapons/superweapons.yaml +++ b/mods/ts/weapons/superweapons.yaml @@ -29,12 +29,12 @@ MultiCluster: Warhead@2Eff: CreateEffect Explosions: large_explosion ImpactSounds: expnew09.aud - InvalidImpactTypes: Water + ValidTargets: Ground, Air Warhead@3EffWater: CreateEffect Explosions: small_watersplash ExplosionPalette: player - ImpactSounds: ssplash2.aud - ValidImpactTypes: Water + ValidTargets: Water + InvalidTargets: Vehicle Warhead@4Smu: LeaveSmudge SmudgeType: MediumCrater InvalidTargets: Vehicle, Building, Wall