From 7e3ec91d30ffaef217c02cc5d73604b1441eceba Mon Sep 17 00:00:00 2001 From: Pavel Penev Date: Sat, 2 Jan 2016 16:47:56 +0200 Subject: [PATCH 1/3] Add support for multiple explosions to CreateEffectWarhead Have the engine pick one explosion at random from the provided list. --- .../UtilityCommands/UpgradeRules.cs | 12 ++++ .../Warheads/CreateEffectWarhead.cs | 13 ++-- mods/cnc/weapons/explosions.yaml | 14 ++--- mods/cnc/weapons/largecaliber.yaml | 12 ++-- mods/cnc/weapons/missiles.yaml | 28 ++++----- mods/cnc/weapons/other.yaml | 14 ++--- mods/cnc/weapons/smallcaliber.yaml | 18 +++--- mods/cnc/weapons/superweapons.yaml | 2 +- mods/d2k/weapons/debris.yaml | 8 +-- mods/d2k/weapons/largeguns.yaml | 12 ++-- mods/d2k/weapons/missiles.yaml | 10 ++-- mods/d2k/weapons/other.yaml | 34 +++++------ mods/d2k/weapons/smallguns.yaml | 14 ++--- mods/ra/maps/allies-05a/map.yaml | 2 +- mods/ra/maps/drop-zone-w/map.yaml | 4 +- mods/ra/maps/fort-lonestar/map.yaml | 16 ++--- mods/ra/maps/monster-tank-madness/map.yaml | 4 +- mods/ra/maps/soviet-02b/map.yaml | 2 +- mods/ra/maps/soviet-03/map.yaml | 2 +- mods/ra/maps/soviet-07/map.yaml | 8 +-- mods/ra/maps/survival02/map.yaml | 4 +- mods/ra/weapons/explosions.yaml | 32 +++++----- mods/ra/weapons/largecaliber.yaml | 32 +++++----- mods/ra/weapons/missiles.yaml | 56 ++++++++--------- mods/ra/weapons/other.yaml | 20 +++---- mods/ra/weapons/smallcaliber.yaml | 60 +++++++++---------- mods/ra/weapons/superweapons.yaml | 6 +- mods/ts/weapons/bombsandgrenades.yaml | 12 ++-- mods/ts/weapons/energyweapons.yaml | 8 +-- mods/ts/weapons/explosions.yaml | 6 +- mods/ts/weapons/largeguns.yaml | 16 ++--- mods/ts/weapons/missiles.yaml | 34 +++++------ mods/ts/weapons/otherweapons.yaml | 2 +- mods/ts/weapons/smallguns.yaml | 44 +++++++------- mods/ts/weapons/superweapons.yaml | 10 ++-- 35 files changed, 292 insertions(+), 279 deletions(-) diff --git a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs index 0a7f3929a6..6040d0d68b 100644 --- a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs +++ b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs @@ -3432,6 +3432,18 @@ namespace OpenRA.Mods.Common.UtilityCommands node.Value.Nodes.RemoveAll(x => x.Key == "Charges"); } + // Enhance CreateEffectWarhead + if (engineVersion < 20160131) + { + if (node.Key.StartsWith("Warhead") && node.Value.Value == "CreateEffect") + { + // Add support for multiple explosions to CreateEffectWarhead + var explosionNode = node.Value.Nodes.FirstOrDefault(x => x.Key == "Explosion"); + if (explosionNode != null) + explosionNode.Key = "Explosions"; + } + } + UpgradeWeaponRules(engineVersion, ref node.Value.Nodes, node, depth + 1); } } diff --git a/OpenRA.Mods.Common/Warheads/CreateEffectWarhead.cs b/OpenRA.Mods.Common/Warheads/CreateEffectWarhead.cs index e79d54322a..d1c0c3811b 100644 --- a/OpenRA.Mods.Common/Warheads/CreateEffectWarhead.cs +++ b/OpenRA.Mods.Common/Warheads/CreateEffectWarhead.cs @@ -17,11 +17,11 @@ namespace OpenRA.Mods.Common.Warheads { public class CreateEffectWarhead : Warhead { - [Desc("Explosion effect to use.")] - public readonly string Explosion = null; + [Desc("List of explosion effects that can be used.")] + public readonly string[] Explosions = new string[0]; - [Desc("Palette to use for explosion effect.")] - [PaletteReference("UsePlayerPalette")] public readonly string ExplosionPalette = "effect"; + [Desc("Palette to use for explosion effect."), PaletteReference("UsePlayerPalette")] + public readonly string ExplosionPalette = "effect"; [Desc("Remap explosion effect to player color, if art supports it.")] public readonly bool UsePlayerPalette = false; @@ -99,8 +99,9 @@ namespace OpenRA.Mods.Common.Warheads if (UsePlayerPalette) palette += firedBy.Owner.InternalName; - if (Explosion != null) - world.AddFrameEndTask(w => w.Add(new Explosion(w, pos, Explosion, palette))); + var explosion = Explosions.RandomOrDefault(Game.CosmeticRandom); + if (explosion != null) + world.AddFrameEndTask(w => w.Add(new Explosion(w, pos, explosion, palette))); if (ImpactSound != null) Game.Sound.Play(ImpactSound, pos); diff --git a/mods/cnc/weapons/explosions.yaml b/mods/cnc/weapons/explosions.yaml index c86de10018..bfa27bbffb 100644 --- a/mods/cnc/weapons/explosions.yaml +++ b/mods/cnc/weapons/explosions.yaml @@ -4,7 +4,7 @@ FlametankExplode: Damage: 100 DamageTypes: Prone50Percent, TriggerProne, FireDeath Warhead@2Eff: CreateEffect - Explosion: big_napalm + Explosions: big_napalm ImpactSound: xplobig6.aud HeliCrash: @@ -13,14 +13,14 @@ HeliCrash: Damage: 40 DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath Warhead@2Eff: CreateEffect - Explosion: poof + Explosions: poof ImpactSound: xplos.aud HeliExplode: Warhead@1Dam: SpreadDamage DamageTypes: ExplosionDeath Warhead@2Eff: CreateEffect - Explosion: small_building + Explosions: small_building ImpactSound: xplos.aud UnitExplode: @@ -34,7 +34,7 @@ UnitExplode: Heavy: 25 DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath Warhead@2Eff: CreateEffect - Explosion: poof + Explosions: poof ImpactSound: xplobig6.aud UnitExplodeSmall: @@ -48,7 +48,7 @@ UnitExplodeSmall: Heavy: 25 DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath Warhead@2Eff: CreateEffect - Explosion: big_frag + Explosions: big_frag ImpactSound: xplobig4.aud GrenadierExplode: @@ -62,7 +62,7 @@ GrenadierExplode: Heavy: 25 DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect - Explosion: poof + Explosions: poof ImpactSound: xplosml2.aud Napalm.Crate: @@ -80,5 +80,5 @@ Napalm.Crate: Warhead@2Smu: LeaveSmudge SmudgeType: Scorch Warhead@3Eff: CreateEffect - Explosion: med_napalm + Explosions: med_napalm ImpactSound: flamer2.aud diff --git a/mods/cnc/weapons/largecaliber.yaml b/mods/cnc/weapons/largecaliber.yaml index f383c8bd63..bb1b18c38a 100644 --- a/mods/cnc/weapons/largecaliber.yaml +++ b/mods/cnc/weapons/largecaliber.yaml @@ -18,7 +18,7 @@ Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: small_frag + Explosions: small_frag ImpactSound: xplos.aud 105mm: @@ -40,7 +40,7 @@ Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: small_frag + Explosions: small_frag ImpactSound: xplos.aud 120mm: @@ -63,7 +63,7 @@ Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: small_frag + Explosions: small_frag ImpactSound: xplos.aud 120mmDual: @@ -88,7 +88,7 @@ Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: small_frag + Explosions: small_frag ImpactSound: xplos.aud TurretGun: @@ -110,7 +110,7 @@ TurretGun: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: small_frag + Explosions: small_frag ImpactSound: xplos.aud ArtilleryShell: @@ -137,5 +137,5 @@ ArtilleryShell: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: poof + Explosions: poof ImpactSound: XPLOSML2.AUD diff --git a/mods/cnc/weapons/missiles.yaml b/mods/cnc/weapons/missiles.yaml index 6b8d129ea7..b74bdc7a49 100644 --- a/mods/cnc/weapons/missiles.yaml +++ b/mods/cnc/weapons/missiles.yaml @@ -28,7 +28,7 @@ Rockets: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: small_frag + Explosions: small_frag ImpactSound: xplos.aud BikeRockets: @@ -62,7 +62,7 @@ BikeRockets: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: small_frag + Explosions: small_frag ImpactSound: xplos.aud OrcaAGMissiles: @@ -96,7 +96,7 @@ OrcaAGMissiles: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: small_frag + Explosions: small_frag ImpactSound: xplos.aud OrcaAAMissiles: @@ -128,7 +128,7 @@ OrcaAAMissiles: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: small_frag + Explosions: small_frag ImpactSound: xplos.aud MammothMissiles: @@ -161,11 +161,11 @@ MammothMissiles: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: small_poof + Explosions: small_poof ImpactSound: xplos.aud InvalidImpactTypes: Air, AirHit Warhead@4EffAir: CreateEffect - Explosion: small_building + Explosions: small_building ImpactSound: xplos.aud ValidImpactTypes: Air, AirHit @@ -201,7 +201,7 @@ MammothMissiles: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: med_frag + Explosions: med_frag ImpactSound: xplos.aud 227mm.stnk: @@ -234,7 +234,7 @@ MammothMissiles: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: small_frag + Explosions: small_frag ImpactSound: xplos.aud BoatMissile: @@ -265,11 +265,11 @@ BoatMissile: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: small_poof + Explosions: small_poof ImpactSound: xplos.aud InvalidImpactTypes: Air, AirHit Warhead@4EffAir: CreateEffect - Explosion: small_building + Explosions: small_building ImpactSound: xplos.aud ValidImpactTypes: Air, AirHit @@ -301,7 +301,7 @@ TowerMissle: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: med_frag + Explosions: med_frag ImpactSound: xplos.aud SAMMissile: @@ -331,7 +331,7 @@ SAMMissile: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: small_building + Explosions: small_building ImpactSound: xplos.aud HonestJohn: @@ -360,7 +360,7 @@ HonestJohn: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: small_poof + Explosions: small_poof ImpactSound: xplos.aud Patriot: @@ -387,5 +387,5 @@ Patriot: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: poof + Explosions: poof ImpactSound: xplos.aud diff --git a/mods/cnc/weapons/other.yaml b/mods/cnc/weapons/other.yaml index b23274c1b7..22dcf2f009 100644 --- a/mods/cnc/weapons/other.yaml +++ b/mods/cnc/weapons/other.yaml @@ -18,7 +18,7 @@ Flamethrower: Warhead@2Smu: LeaveSmudge SmudgeType: Scorch Warhead@3Eff: CreateEffect - Explosion: small_napalm + Explosions: small_napalm ImpactSound: flamer2.aud BigFlamer: @@ -43,7 +43,7 @@ BigFlamer: Warhead@2Smu: LeaveSmudge SmudgeType: Scorch Warhead@3Eff: CreateEffect - Explosion: med_napalm + Explosions: med_napalm ImpactSound: flamer2.aud Chemspray: @@ -64,7 +64,7 @@ Chemspray: Warhead@2Smu: LeaveSmudge SmudgeType: Scorch Warhead@3Eff: CreateEffect - Explosion: chemball + Explosions: chemball ImpactSound: xplos.aud Grenade: @@ -89,7 +89,7 @@ Grenade: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: small_poof + Explosions: small_poof ImpactSound: xplos.aud Napalm: @@ -114,7 +114,7 @@ Napalm: Warhead@2Smu: LeaveSmudge SmudgeType: Scorch Warhead@3Eff: CreateEffect - Explosion: med_napalm + Explosions: med_napalm ImpactSound: flamer2.aud Laser: @@ -155,7 +155,7 @@ TiberiumExplosion: AddsResourceType: Tiberium Size: 1,1 Warhead@3Eff: CreateEffect - Explosion: chemball + Explosions: chemball ImpactSound: xplosml2.aud Heal: @@ -236,5 +236,5 @@ Demolish: Warhead@1Dam: SpreadDamage DamageTypes: DefaultDeath Warhead@2Eff: CreateEffect - Explosion: building + Explosions: building ImpactSound: xplobig6.aud diff --git a/mods/cnc/weapons/smallcaliber.yaml b/mods/cnc/weapons/smallcaliber.yaml index 9fb33caeba..ab01b3b58b 100644 --- a/mods/cnc/weapons/smallcaliber.yaml +++ b/mods/cnc/weapons/smallcaliber.yaml @@ -28,7 +28,7 @@ HighV: Heavy: 35 DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@2Eff: CreateEffect - Explosion: piffs + Explosions: piffs HeliAGGun: ReloadDelay: 20 @@ -52,7 +52,7 @@ HeliAGGun: Heavy: 25 DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@2Eff: CreateEffect - Explosion: piffs + Explosions: piffs HeliAAGun: ReloadDelay: 20 @@ -76,7 +76,7 @@ HeliAAGun: Heavy: 25 DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@2Eff: CreateEffect - Explosion: piffs + Explosions: piffs Pistol: ReloadDelay: 7 @@ -96,7 +96,7 @@ Pistol: Heavy: 25 DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@2Eff: CreateEffect - Explosion: piff + Explosions: piff M16: ReloadDelay: 20 @@ -116,7 +116,7 @@ M16: Heavy: 10 DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@2Eff: CreateEffect - Explosion: piff + Explosions: piff MachineGun: ReloadDelay: 20 @@ -138,7 +138,7 @@ MachineGun: Concrete: 10 DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@2Eff: CreateEffect - Explosion: piffs + Explosions: piffs Vulcan: ValidTargets: Ground, Water @@ -158,7 +158,7 @@ Vulcan: Heavy: 35 DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@2Eff: CreateEffect - Explosion: piffs + Explosions: piffs APCGun: ReloadDelay: 18 @@ -178,7 +178,7 @@ APCGun: Heavy: 50 DamageTypes: Prone50Percent, TriggerProne, DefaultDeath Warhead@2Eff: CreateEffect - Explosion: small_poof + Explosions: small_poof APCGun.AA: ReloadDelay: 18 @@ -196,4 +196,4 @@ APCGun.AA: Heavy: 50 DamageTypes: Prone50Percent, TriggerProne, DefaultDeath Warhead@2Eff: CreateEffect - Explosion: small_frag + Explosions: small_frag diff --git a/mods/cnc/weapons/superweapons.yaml b/mods/cnc/weapons/superweapons.yaml index 2547af94d4..bb0f41ec2d 100644 --- a/mods/cnc/weapons/superweapons.yaml +++ b/mods/cnc/weapons/superweapons.yaml @@ -13,7 +13,7 @@ Atomic: Heavy: 50 DamageTypes: Prone50Percent, TriggerProne, FireDeath Warhead@2Eff_impact: CreateEffect - Explosion: nuke_explosion + Explosions: nuke_explosion ImpactSound: nukexplo.aud Warhead@3Dam_areanukea: SpreadDamage Spread: 2c512 diff --git a/mods/d2k/weapons/debris.yaml b/mods/d2k/weapons/debris.yaml index b85684ad94..f111d35cac 100644 --- a/mods/d2k/weapons/debris.yaml +++ b/mods/d2k/weapons/debris.yaml @@ -26,7 +26,7 @@ Debris: Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater Warhead@3Eff: CreateEffect - Explosion: small_explosion + Explosions: small_explosion ImpactSound: EXPLLG5.WAV Debris2: @@ -60,7 +60,7 @@ Debris2: Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater Warhead@3Eff: CreateEffect - Explosion: med_explosion + Explosions: med_explosion ImpactSound: EXPLLG5.WAV Debris3: @@ -94,7 +94,7 @@ Debris3: Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater Warhead@3Eff: CreateEffect - Explosion: med_explosion + Explosions: med_explosion ImpactSound: EXPLLG5.WAV Debris4: @@ -128,5 +128,5 @@ Debris4: Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater Warhead@3Eff: CreateEffect - Explosion: large_explosion + Explosions: large_explosion ImpactSound: EXPLLG5.WAV diff --git a/mods/d2k/weapons/largeguns.yaml b/mods/d2k/weapons/largeguns.yaml index 54846b65d9..6de507ecba 100644 --- a/mods/d2k/weapons/largeguns.yaml +++ b/mods/d2k/weapons/largeguns.yaml @@ -25,7 +25,7 @@ Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect - Explosion: small_napalm + Explosions: small_napalm ImpactSound: EXPLSML4.WAV 80mm_A: @@ -53,7 +53,7 @@ Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect - Explosion: small_napalm + Explosions: small_napalm 80mm_H: ReloadDelay: 55 @@ -80,7 +80,7 @@ Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect - Explosion: small_napalm + Explosions: small_napalm 80mm_O: ReloadDelay: 45 @@ -107,7 +107,7 @@ Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect - Explosion: small_napalm + Explosions: small_napalm DevBullet: ReloadDelay: 75 @@ -131,7 +131,7 @@ DevBullet: Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect - Explosion: shockwave + Explosions: shockwave ImpactSound: EXPLMD1.WAV 155mm: @@ -162,5 +162,5 @@ DevBullet: Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect - Explosion: med_explosion + Explosions: med_explosion ImpactSound: EXPLMD2.WAV diff --git a/mods/d2k/weapons/missiles.yaml b/mods/d2k/weapons/missiles.yaml index a6d506c016..386f0d0444 100644 --- a/mods/d2k/weapons/missiles.yaml +++ b/mods/d2k/weapons/missiles.yaml @@ -28,7 +28,7 @@ Bazooka: Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect - Explosion: tiny_explosion + Explosions: tiny_explosion ImpactSound: EXPLSML1.WAV Rocket: @@ -60,7 +60,7 @@ Rocket: Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect - Explosion: rocket_explosion + Explosions: rocket_explosion ExplosionPalette: effect75alpha ImpactSound: EXPLSML1.WAV @@ -100,7 +100,7 @@ TowerMissile: Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect - Explosion: small_explosion + Explosions: small_explosion ImpactSound: EXPLSML1.WAV mtank_pri: @@ -138,7 +138,7 @@ mtank_pri: Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect - Explosion: small_explosion + Explosions: small_explosion ImpactSound: EXPLSML1.WAV DeviatorMissile: @@ -175,7 +175,7 @@ DeviatorMissile: Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect - Explosion: deviator + Explosions: deviator ExplosionPalette: deviatorgas UsePlayerPalette: true ImpactSound: EXPLSML1.WAV diff --git a/mods/d2k/weapons/other.yaml b/mods/d2k/weapons/other.yaml index d7fb2237c8..398723f856 100644 --- a/mods/d2k/weapons/other.yaml +++ b/mods/d2k/weapons/other.yaml @@ -23,8 +23,8 @@ Sound: building: 60 heavy: 60 invulnerable: 0 - cy: 20 - harvester: 50 + cy: 20 + harvester: 50 DamageTypes: Prone50Percent, TriggerProne, SoundDeath Warhead@2Dam: SpreadDamage Range: 0, 32 @@ -38,8 +38,8 @@ Sound: building: 60 heavy: 60 invulnerable: 0 - cy: 20 - harvester: 50 + cy: 20 + harvester: 50 DamageTypes: Prone50Percent, TriggerProne, SoundDeath Heal: @@ -91,7 +91,7 @@ OrniBomb: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: large_explosion + Explosions: large_explosion ImpactSound: NAPALM1.WAV Crush: @@ -105,7 +105,7 @@ Demolish: Warhead@1Dam: SpreadDamage DamageTypes: ExplosionDeath Warhead@2Eff: CreateEffect - Explosion: building + Explosions: building ImpactSound: EXPLLG2.WAV Atomic: @@ -125,7 +125,7 @@ Atomic: harvester: 60 DamageTypes: Prone50Percent, TriggerProne, SoundDeath Warhead@2Eff: CreateEffect - Explosion: nuke + Explosions: nuke ImpactSound: EXPLLG2.WAV CrateNuke: @@ -146,7 +146,7 @@ CrateNuke: AffectsParent: true DamageTypes: Prone50Percent, TriggerProne, SoundDeath Warhead@2Eff: CreateEffect - Explosion: nuke + Explosions: nuke ImpactSound: EXPLLG2.WAV CrateExplosion: @@ -167,22 +167,22 @@ CrateExplosion: AffectsParent: true DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect - Explosion: large_explosion + Explosions: large_explosion ImpactSound: EXPLSML4.WAV UnitExplodeSmall: Warhead@1Eff: CreateEffect - Explosion: self_destruct + Explosions: self_destruct ImpactSound: EXPLSML1.WAV UnitExplodeMed: Warhead@1Eff: CreateEffect - Explosion: building + Explosions: building ImpactSound: EXPLSML2.WAV UnitExplodeLarge: Warhead@1Eff: CreateEffect - Explosion: large_explosion + Explosions: large_explosion ImpactSound: EXPLLG2.WAV grenade: @@ -211,7 +211,7 @@ grenade: Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater Warhead@3Eff: CreateEffect - Explosion: med_explosion + Explosions: med_explosion ImpactSound: EXPLLG5.WAV Weathering: @@ -236,7 +236,7 @@ GrenDeath: Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect - Explosion: building + Explosions: building ImpactSound: EXPLSML4.WAV SardDeath: @@ -257,7 +257,7 @@ SardDeath: Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect - Explosion: small_napalm + Explosions: small_napalm ImpactSound: EXPLSML2.WAV SpiceExplosion: @@ -287,7 +287,7 @@ SpiceExplosion: AddsResourceType: Spice Size: 1 Warhead@3Eff: CreateEffect - Explosion: med_explosion + Explosions: med_explosion BloomExplosion: Report: EXPLMD1.WAV @@ -320,4 +320,4 @@ BloomSpawn: Blockable: false Image: null Warhead@1Eff: CreateEffect - Explosion: bloomspawn + Explosions: bloomspawn diff --git a/mods/d2k/weapons/smallguns.yaml b/mods/d2k/weapons/smallguns.yaml index e4b2fdf75c..57062a474d 100644 --- a/mods/d2k/weapons/smallguns.yaml +++ b/mods/d2k/weapons/smallguns.yaml @@ -19,7 +19,7 @@ LMG: harvester: 25 DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@2Eff: CreateEffect - Explosion: piffs + Explosions: piffs Fremen_S: ReloadDelay: 40 @@ -42,7 +42,7 @@ Fremen_S: harvester: 25 DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@2Eff: CreateEffect - Explosion: small_explosion + Explosions: small_explosion ImpactSound: EXPLSML2.WAV M_LMG: @@ -66,7 +66,7 @@ M_LMG: harvester: 25 DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@2Eff: CreateEffect - Explosion: piffs + Explosions: piffs M_HMG: ReloadDelay: 40 @@ -88,7 +88,7 @@ M_HMG: harvester: 50 DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@2Eff: CreateEffect - Explosion: piffs + Explosions: piffs Fremen_L: ReloadDelay: 40 @@ -111,7 +111,7 @@ Fremen_L: harvester: 50 DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect - Explosion: small_explosion + Explosions: small_explosion HMG: ReloadDelay: 20 @@ -134,7 +134,7 @@ HMG: harvester: 25 DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@2Eff: CreateEffect - Explosion: piffs + Explosions: piffs HMGo: ReloadDelay: 18 @@ -157,7 +157,7 @@ HMGo: harvester: 25 DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@2Eff: CreateEffect - Explosion: piffs + Explosions: piffs HMG_muzzle: ReloadDelay: 16 diff --git a/mods/ra/maps/allies-05a/map.yaml b/mods/ra/maps/allies-05a/map.yaml index 8df2078b03..a3639531d2 100644 --- a/mods/ra/maps/allies-05a/map.yaml +++ b/mods/ra/maps/allies-05a/map.yaml @@ -1834,7 +1834,7 @@ Weapons: Concrete: 0 DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@2Eff: CreateEffect - Explosion: piffs + Explosions: piffs InvalidImpactTypes: Water Voices: diff --git a/mods/ra/maps/drop-zone-w/map.yaml b/mods/ra/maps/drop-zone-w/map.yaml index 265e929e17..34bfd513ca 100644 --- a/mods/ra/maps/drop-zone-w/map.yaml +++ b/mods/ra/maps/drop-zone-w/map.yaml @@ -289,7 +289,7 @@ Weapons: Damage: 250 DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@1Eff: CreateEffect - Explosion: large_explosion + Explosions: large_explosion WaterExplosion: large_splash ImpactSound: kaboom12.aud WaterImpactSound: splash9.aud @@ -317,7 +317,7 @@ Weapons: Damage: 400 DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath Warhead@1Eff: CreateEffect - Explosion: large_explosion + Explosions: large_explosion WaterExplosion: large_splash ImpactSound: kaboom12.aud WaterImpactSound: splash9.aud diff --git a/mods/ra/maps/fort-lonestar/map.yaml b/mods/ra/maps/fort-lonestar/map.yaml index 3565eec41a..f8ef0a2100 100644 --- a/mods/ra/maps/fort-lonestar/map.yaml +++ b/mods/ra/maps/fort-lonestar/map.yaml @@ -816,7 +816,7 @@ Weapons: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: self_destruct + Explosions: self_destruct WaterExplosion: self_destruct MammothTusk: ReloadDelay: 300 @@ -850,7 +850,7 @@ Weapons: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: nuke + Explosions: nuke WaterExplosion: nuke TankNapalm: ReloadDelay: 40 @@ -879,7 +879,7 @@ Weapons: Warhead@2Smu: LeaveSmudge SmudgeType: Scorch Warhead@3Eff: CreateEffect - Explosion: small_explosion + Explosions: small_explosion WaterExplosion: small_explosion ImpactSound: firebl3.aud ParaBomb: @@ -901,7 +901,7 @@ Weapons: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: napalm + Explosions: napalm ImpactSound: firebl3.aud WaterExplosion: napalm 155mm: @@ -931,7 +931,7 @@ Weapons: Warhead@2Smu: LeaveSmudge SmudgeType: Scorch Warhead@3Eff: CreateEffect - Explosion: small_napalm + Explosions: small_napalm WaterExplosion: small_napalm ImpactSound: firebl3.aud FLAK-23: @@ -956,7 +956,7 @@ Weapons: Warhead@2Smu: LeaveSmudge SmudgeType: Scorch Warhead@3Eff: CreateEffect - Explosion: med_explosion + Explosions: med_explosion SCUD: ReloadDelay: 280 Range: 7c0 @@ -984,7 +984,7 @@ Weapons: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: nuke + Explosions: nuke WaterExplosion: large_splash ImpactSound: kaboom1.aud WaterImpactSound: kaboom1.aud @@ -1004,7 +1004,7 @@ Weapons: Damage: 150 DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@2Eff: CreateEffect - Explosion: piffs + Explosions: piffs Voices: diff --git a/mods/ra/maps/monster-tank-madness/map.yaml b/mods/ra/maps/monster-tank-madness/map.yaml index ec9951cb2f..367a9da05d 100644 --- a/mods/ra/maps/monster-tank-madness/map.yaml +++ b/mods/ra/maps/monster-tank-madness/map.yaml @@ -2404,10 +2404,10 @@ Weapons: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3EffGround: CreateEffect - Explosion: small_explosion + Explosions: small_explosion InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect - Explosion: small_splash + Explosions: small_splash ValidImpactTypes: Water Voices: diff --git a/mods/ra/maps/soviet-02b/map.yaml b/mods/ra/maps/soviet-02b/map.yaml index d50b9726f3..a70d909cc5 100644 --- a/mods/ra/maps/soviet-02b/map.yaml +++ b/mods/ra/maps/soviet-02b/map.yaml @@ -670,7 +670,7 @@ Weapons: Size: 2,1 Delay: 5 Warhead@3Eff: CreateEffect - Explosion: napalm + Explosions: napalm ImpactSound: firebl3.aud Delay: 5 diff --git a/mods/ra/maps/soviet-03/map.yaml b/mods/ra/maps/soviet-03/map.yaml index 4a773b00d6..662e546360 100644 --- a/mods/ra/maps/soviet-03/map.yaml +++ b/mods/ra/maps/soviet-03/map.yaml @@ -1290,7 +1290,7 @@ Weapons: Size: 2,1 Delay: 5 Warhead@3Eff: CreateEffect - Explosion: napalm + Explosions: napalm ImpactSound: firebl3.aud Delay: 5 diff --git a/mods/ra/maps/soviet-07/map.yaml b/mods/ra/maps/soviet-07/map.yaml index 8d8f2b825c..3696ea2079 100644 --- a/mods/ra/maps/soviet-07/map.yaml +++ b/mods/ra/maps/soviet-07/map.yaml @@ -891,10 +891,10 @@ Weapons: Concrete: 10 DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@2Eff: CreateEffect - Explosion: piffs + Explosions: piffs InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: water_piffs + Explosions: water_piffs ValidImpactTypes: Water FireballLauncherInterior: ReloadDelay: 65 @@ -918,7 +918,7 @@ Weapons: Warhead@2Smu: LeaveSmudge SmudgeType: Scorch Warhead@3Eff: CreateEffect - Explosion: napalm + Explosions: napalm ImpactSound: firebl3.aud MissionBarrelExplodeInterior: Warhead@1Dam: SpreadDamage @@ -938,7 +938,7 @@ Weapons: Size: 2,1 Delay: 5 Warhead@3Eff: CreateEffect - Explosion: napalm + Explosions: napalm ImpactSound: firebl3.aud Delay: 5 diff --git a/mods/ra/maps/survival02/map.yaml b/mods/ra/maps/survival02/map.yaml index 6d84cad992..8a30d23e16 100644 --- a/mods/ra/maps/survival02/map.yaml +++ b/mods/ra/maps/survival02/map.yaml @@ -1171,11 +1171,11 @@ Weapons: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: napalm + Explosions: napalm ImpactSound: firebl3.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect - Explosion: napalm + Explosions: napalm ImpactSound: splash9.aud ValidImpactTypes: Water diff --git a/mods/ra/weapons/explosions.yaml b/mods/ra/weapons/explosions.yaml index 37123678c0..e5f863227a 100644 --- a/mods/ra/weapons/explosions.yaml +++ b/mods/ra/weapons/explosions.yaml @@ -13,7 +13,7 @@ CrateNapalm: Warhead@2Smu: LeaveSmudge SmudgeType: Scorch Warhead@3Eff: CreateEffect - Explosion: napalm + Explosions: napalm ImpactSound: firebl3.aud CrateExplosion: @@ -29,7 +29,7 @@ CrateExplosion: AffectsParent: true DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath Warhead@2Eff: CreateEffect - Explosion: self_destruct + Explosions: self_destruct ImpactSound: kaboom15.aud CrateNuke: @@ -44,7 +44,7 @@ CrateNuke: DamageTypes: Prone50Percent, TriggerProne, FireDeath Warhead@2Res_impact: DestroyResource Warhead@3Eff_impact: CreateEffect - Explosion: nuke + Explosions: nuke ImpactSound: kaboom1.aud Warhead@4Dam_areanuke: SpreadDamage Spread: 1c0 @@ -81,7 +81,7 @@ MiniNuke: Warhead@2Res_impact: DestroyResource Size: 1 Warhead@3Eff_impact: CreateEffect - Explosion: nuke + Explosions: nuke ImpactSound: kaboom1.aud Warhead@4Dam_areanuke1: SpreadDamage Spread: 2c0 @@ -142,11 +142,11 @@ UnitExplode: Heavy: 25 DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath Warhead@2Eff: CreateEffect - Explosion: self_destruct + Explosions: self_destruct ImpactSound: kaboom22.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: large_splash + Explosions: large_splash ImpactSound: splash9.aud ValidImpactTypes: Water @@ -161,7 +161,7 @@ UnitExplodeShip: Heavy: 25 DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath Warhead@2Eff: CreateEffect - Explosion: building + Explosions: building ImpactSound: kaboom25.aud UnitExplodeSubmarine: @@ -175,7 +175,7 @@ UnitExplodeSubmarine: Heavy: 25 DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath Warhead@2Eff: CreateEffect - Explosion: large_splash + Explosions: large_splash ImpactSound: splash9.aud UnitExplodeSmall: @@ -189,11 +189,11 @@ UnitExplodeSmall: Heavy: 25 DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath Warhead@2Eff: CreateEffect - Explosion: large_explosion + Explosions: large_explosion ImpactSound: kaboom15.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: large_splash + Explosions: large_splash ImpactSound: splash9.aud ValidImpactTypes: Water @@ -208,11 +208,11 @@ ArtilleryExplode: Heavy: 25 DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath Warhead@2Eff: CreateEffect - Explosion: self_destruct + Explosions: self_destruct ImpactSound: kaboom22.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: large_splash + Explosions: large_splash ImpactSound: splash9.aud ValidImpactTypes: Water @@ -234,7 +234,7 @@ BarrelExplode: Size: 2,1 Delay: 5 Warhead@3Eff: CreateEffect - Explosion: napalm + Explosions: napalm ImpactSound: firebl3.aud Delay: 5 @@ -245,7 +245,7 @@ ATMine: AffectsParent: true DamageTypes: Prone50Percent, TriggerProne, DefaultDeath Warhead@2Eff: CreateEffect - Explosion: large_explosion + Explosions: large_explosion ImpactSound: mineblo1.aud APMine: @@ -255,7 +255,7 @@ APMine: AffectsParent: true DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect - Explosion: napalm + Explosions: napalm ImpactSound: mine1.aud OreExplosion: @@ -272,5 +272,5 @@ OreExplosion: AddsResourceType: Ore Size: 1,1 Warhead@3Eff: CreateEffect - Explosion: med_explosion + Explosions: med_explosion ImpactSound: kaboom25.aud diff --git a/mods/ra/weapons/largecaliber.yaml b/mods/ra/weapons/largecaliber.yaml index 852bc09d85..dc88785861 100644 --- a/mods/ra/weapons/largecaliber.yaml +++ b/mods/ra/weapons/largecaliber.yaml @@ -17,10 +17,10 @@ Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3EffGround: CreateEffect - Explosion: small_explosion + Explosions: small_explosion InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect - Explosion: small_splash + Explosions: small_splash ValidImpactTypes: Water 90mm: @@ -42,11 +42,11 @@ Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3EffGround: CreateEffect - Explosion: small_explosion + Explosions: small_explosion ImpactSound: kaboom12.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect - Explosion: small_splash + Explosions: small_splash ImpactSound: splash9.aud ValidImpactTypes: Water @@ -71,11 +71,11 @@ Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3EffGround: CreateEffect - Explosion: small_explosion + Explosions: small_explosion ImpactSound: kaboom12.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect - Explosion: small_splash + Explosions: small_splash ImpactSound: splash9.aud ValidImpactTypes: Water @@ -101,11 +101,11 @@ Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3EffGround: CreateEffect - Explosion: small_explosion + Explosions: small_explosion ImpactSound: kaboom12.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect - Explosion: small_splash + Explosions: small_splash ImpactSound: splash9.aud ValidImpactTypes: Water @@ -128,11 +128,11 @@ TurretGun: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3EffGround: CreateEffect - Explosion: small_explosion + Explosions: small_explosion ImpactSound: kaboom12.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect - Explosion: small_splash + Explosions: small_splash ImpactSound: splash9.aud ValidImpactTypes: Water @@ -161,11 +161,11 @@ TurretGun: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: artillery_explosion + Explosions: artillery_explosion ImpactSound: kaboom15.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect - Explosion: med_splash + Explosions: med_splash ImpactSound: splash9.aud ValidImpactTypes: Water @@ -194,11 +194,11 @@ TurretGun: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: artillery_explosion + Explosions: artillery_explosion ImpactSound: kaboom15.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect - Explosion: large_splash + Explosions: large_splash ImpactSound: splash9.aud ValidImpactTypes: Water @@ -221,10 +221,10 @@ TurretGun: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: small_explosion + Explosions: small_explosion ImpactSound: kaboom12.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect - Explosion: small_splash + Explosions: small_splash ImpactSound: splash9.aud ValidImpactTypes: Water diff --git a/mods/ra/weapons/missiles.yaml b/mods/ra/weapons/missiles.yaml index 4ee302a740..5ce65a87c7 100644 --- a/mods/ra/weapons/missiles.yaml +++ b/mods/ra/weapons/missiles.yaml @@ -28,11 +28,11 @@ Maverick: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: med_explosion + Explosions: med_explosion ImpactSound: kaboom25.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect - Explosion: med_splash + Explosions: med_splash ImpactSound: splash9.aud ValidImpactTypes: Water @@ -65,11 +65,11 @@ Dragon: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: med_explosion + Explosions: med_explosion ImpactSound: kaboom25.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect - Explosion: med_splash + Explosions: med_splash ImpactSound: splash9.aud ValidImpactTypes: Water @@ -103,11 +103,11 @@ HellfireAG: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: med_explosion + Explosions: med_explosion ImpactSound: kaboom25.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect - Explosion: med_splash + Explosions: med_splash ImpactSound: splash9.aud ValidImpactTypes: Water @@ -141,11 +141,11 @@ HellfireAA: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: med_explosion_air + Explosions: med_explosion_air ImpactSound: kaboom25.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect - Explosion: med_splash + Explosions: med_splash ImpactSound: splash9.aud ValidImpactTypes: Water @@ -177,15 +177,15 @@ MammothTusk: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3EffGround: CreateEffect - Explosion: med_explosion + Explosions: med_explosion ImpactSound: kaboom12.aud InvalidImpactTypes: Water, Air, AirHit Warhead@4EffWater: CreateEffect - Explosion: small_splash + Explosions: small_splash ImpactSound: splash9.aud ValidImpactTypes: Water Warhead@5EffAir: CreateEffect - Explosion: med_explosion_air + Explosions: med_explosion_air ImpactSound: kaboom25.aud ValidImpactTypes: Air, AirHit @@ -214,7 +214,7 @@ Nike: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: med_explosion_air + Explosions: med_explosion_air ImpactSound: kaboom25.aud RedEye: @@ -243,7 +243,7 @@ RedEye: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: med_explosion_air + Explosions: med_explosion_air ImpactSound: kaboom25.aud SubMissile: @@ -271,11 +271,11 @@ SubMissile: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: artillery_explosion + Explosions: artillery_explosion ImpactSound: kaboom15.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect - Explosion: large_splash + Explosions: large_splash ImpactSound: splash9.aud ValidImpactTypes: Water @@ -307,15 +307,15 @@ Stinger: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: med_explosion + Explosions: med_explosion ImpactSound: kaboom25.aud InvalidImpactTypes: Water, Air, AirHit Warhead@5EffAir: CreateEffect - Explosion: med_explosion_air + Explosions: med_explosion_air ImpactSound: kaboom25.aud ValidImpactTypes: Air, AirHit Warhead@4EffWater: CreateEffect - Explosion: med_splash + Explosions: med_splash ImpactSound: splash9.aud ValidImpactTypes: Water @@ -347,15 +347,15 @@ StingerAA: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: med_explosion + Explosions: med_explosion ImpactSound: kaboom25.aud InvalidImpactTypes: Water, Air, AirHit Warhead@5EffAir: CreateEffect - Explosion: med_explosion_air + Explosions: med_explosion_air ImpactSound: kaboom25.aud ValidImpactTypes: Air, AirHit Warhead@4EffWater: CreateEffect - Explosion: med_splash + Explosions: med_splash ImpactSound: splash9.aud ValidImpactTypes: Water @@ -388,15 +388,15 @@ TorpTube: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: large_explosion + Explosions: large_explosion ImpactSound: kaboom15.aud InvalidImpactTypes: Water, WaterHit Warhead@4EffWaterHit: CreateEffect - Explosion: artillery_explosion + Explosions: artillery_explosion ImpactSound: kaboom15.aud ValidImpactTypes: WaterHit Warhead@5EffWater: CreateEffect - Explosion: large_splash + Explosions: large_splash ImpactSound: splash9.aud ValidImpactTypes: Water @@ -427,11 +427,11 @@ SCUD: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: napalm + Explosions: napalm ImpactSound: firebl3.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect - Explosion: large_splash + Explosions: large_splash ImpactSound: splash9.aud ValidImpactTypes: Water @@ -463,10 +463,10 @@ APTusk: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: med_explosion + Explosions: med_explosion ImpactSound: kaboom25.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect - Explosion: med_splash + Explosions: med_splash ImpactSound: splash9.aud ValidImpactTypes: Water diff --git a/mods/ra/weapons/other.yaml b/mods/ra/weapons/other.yaml index 8ed09086da..e510ec5883 100644 --- a/mods/ra/weapons/other.yaml +++ b/mods/ra/weapons/other.yaml @@ -20,7 +20,7 @@ FireballLauncher: Warhead@2Smu: LeaveSmudge SmudgeType: Scorch Warhead@3Eff: CreateEffect - Explosion: napalm + Explosions: napalm ImpactSound: firebl3.aud Flamer: @@ -47,7 +47,7 @@ Flamer: Warhead@2Smu: LeaveSmudge SmudgeType: Scorch Warhead@3Eff: CreateEffect - Explosion: small_napalm + Explosions: small_napalm ImpactSound: firebl3.aud Napalm: @@ -69,11 +69,11 @@ Napalm: Warhead@2Smu: LeaveSmudge SmudgeType: Scorch Warhead@3Eff: CreateEffect - Explosion: napalm + Explosions: napalm ImpactSound: firebl3.aud InvalidImpactTypes: Water Warhead@4Eff: CreateEffect - Explosion: med_splash + Explosions: med_splash ImpactSound: splash9.aud ValidImpactTypes: Water @@ -99,11 +99,11 @@ Grenade: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: med_explosion + Explosions: med_explosion ImpactSound: kaboom25.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect - Explosion: small_splash + Explosions: small_splash ImpactSound: splash9.aud ValidImpactTypes: Water @@ -130,10 +130,10 @@ DepthCharge: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: large_splash + Explosions: large_splash ImpactSound: h2obomb2.aud Warhead@4EffHit: CreateEffect - Explosion: small_explosion + Explosions: small_explosion ImpactSound: kaboom15.aud ValidImpactTypes: WaterHit @@ -222,7 +222,7 @@ Demolish: Warhead@1Dam: SpreadDamage DamageTypes: DefaultDeath Warhead@2Eff: CreateEffect - Explosion: building + Explosions: building ImpactSound: kaboom25.aud Claw: @@ -274,5 +274,5 @@ MADTankDetonate: SmudgeType: Crater Size: 7,6 Warhead@3Eff: CreateEffect - Explosion: med_explosion + Explosions: med_explosion ImpactSound: mineblo1.aud diff --git a/mods/ra/weapons/smallcaliber.yaml b/mods/ra/weapons/smallcaliber.yaml index 3ee20fc798..7ed0d52aba 100644 --- a/mods/ra/weapons/smallcaliber.yaml +++ b/mods/ra/weapons/smallcaliber.yaml @@ -12,10 +12,10 @@ Colt45: ValidTargets: Barrel, Infantry DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@2Eff: CreateEffect - Explosion: piff + Explosions: piff InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: water_piff + Explosions: water_piff ValidImpactTypes: Water ZSU-23: @@ -39,7 +39,7 @@ ZSU-23: Concrete: 50 DamageTypes: Prone50Percent, TriggerProne, DefaultDeath Warhead@2Eff: CreateEffect - Explosion: small_explosion_air + Explosions: small_explosion_air Vulcan: ReloadDelay: 30 @@ -58,10 +58,10 @@ Vulcan: Concrete: 25 DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@2Eff_1: CreateEffect - Explosion: piffs + Explosions: piffs InvalidImpactTypes: Water Warhead@2Eff_1Water: CreateEffect - Explosion: water_piffs + Explosions: water_piffs ValidImpactTypes: Water Warhead@3Dam_2: SpreadDamage Spread: 128 @@ -75,11 +75,11 @@ Vulcan: Concrete: 25 DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@4Eff_2: CreateEffect - Explosion: piffs + Explosions: piffs InvalidImpactTypes: Water Delay: 2 Warhead@4Eff_2Water: CreateEffect - Explosion: water_piffs + Explosions: water_piffs ValidImpactTypes: Water Delay: 2 Warhead@5Dam_3: SpreadDamage @@ -94,11 +94,11 @@ Vulcan: Concrete: 25 DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@6Eff_3: CreateEffect - Explosion: piffs + Explosions: piffs InvalidImpactTypes: Water Delay: 4 Warhead@6Eff_3Water: CreateEffect - Explosion: water_piffs + Explosions: water_piffs ValidImpactTypes: Water Delay: 4 Warhead@7Dam_4: SpreadDamage @@ -113,11 +113,11 @@ Vulcan: Concrete: 25 DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@8Eff_4: CreateEffect - Explosion: piffs + Explosions: piffs InvalidImpactTypes: Water Delay: 6 Warhead@8Eff_4Water: CreateEffect - Explosion: water_piffs + Explosions: water_piffs ValidImpactTypes: Water Delay: 6 Warhead@9Dam_5: SpreadDamage @@ -132,11 +132,11 @@ Vulcan: Concrete: 25 DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@10Eff_5: CreateEffect - Explosion: piffs + Explosions: piffs InvalidImpactTypes: Water Delay: 8 Warhead@10Eff_5Water: CreateEffect - Explosion: water_piffs + Explosions: water_piffs ValidImpactTypes: Water Delay: 8 Warhead@11Dam_6: SpreadDamage @@ -151,11 +151,11 @@ Vulcan: Concrete: 25 DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@12Eff_6: CreateEffect - Explosion: piffs + Explosions: piffs InvalidImpactTypes: Water Delay: 10 Warhead@12Eff_6Water: CreateEffect - Explosion: water_piffs + Explosions: water_piffs ValidImpactTypes: Water Delay: 10 @@ -178,10 +178,10 @@ ChainGun: Concrete: 25 DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@2Eff: CreateEffect - Explosion: piffs + Explosions: piffs InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: water_piffs + Explosions: water_piffs ValidImpactTypes: Water ChainGun.Yak: @@ -202,10 +202,10 @@ ChainGun.Yak: Concrete: 25 DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@2Eff: CreateEffect - Explosion: piffs + Explosions: piffs InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: water_piffs + Explosions: water_piffs ValidImpactTypes: Water Pistol: @@ -224,10 +224,10 @@ Pistol: Concrete: 25 DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@2Eff: CreateEffect - Explosion: piff + Explosions: piff InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: water_piff + Explosions: water_piff ValidImpactTypes: Water M1Carbine: @@ -246,10 +246,10 @@ M1Carbine: Concrete: 10 DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@2Eff: CreateEffect - Explosion: piffs + Explosions: piffs InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: water_piffs + Explosions: water_piffs ValidImpactTypes: Water M60mg: @@ -269,10 +269,10 @@ M60mg: Concrete: 10 DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@2Eff: CreateEffect - Explosion: piffs + Explosions: piffs InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: water_piffs + Explosions: water_piffs ValidImpactTypes: Water SilencedPPK: @@ -289,10 +289,10 @@ SilencedPPK: ValidTargets: Infantry DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@2Eff: CreateEffect - Explosion: piffs + Explosions: piffs InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: water_piffs + Explosions: water_piffs ValidImpactTypes: Water FLAK-23-AA: @@ -315,7 +315,7 @@ FLAK-23-AA: Concrete: 20 DamageTypes: Prone50Percent, TriggerProne, DefaultDeath Warhead@2EffAir: CreateEffect - Explosion: small_explosion_air + Explosions: small_explosion_air ValidImpactTypes: Air, AirHit FLAK-23-AG: @@ -338,10 +338,10 @@ FLAK-23-AG: Concrete: 20 DamageTypes: Prone50Percent, TriggerProne, DefaultDeath Warhead@2Eff: CreateEffect - Explosion: small_explosion + Explosions: small_explosion InvalidImpactTypes: Air, AirHit Warhead@3EffWater: CreateEffect - Explosion: small_splash + Explosions: small_splash ValidImpactTypes: Water Sniper: diff --git a/mods/ra/weapons/superweapons.yaml b/mods/ra/weapons/superweapons.yaml index a5c88b6865..b7dab7edd2 100644 --- a/mods/ra/weapons/superweapons.yaml +++ b/mods/ra/weapons/superweapons.yaml @@ -19,11 +19,11 @@ ParaBomb: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: artillery_explosion + Explosions: artillery_explosion ImpactSound: kaboom15.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect - Explosion: small_splash + Explosions: small_splash ImpactSound: splash9.aud ValidImpactTypes: Water @@ -43,7 +43,7 @@ Atomic: SmudgeType: Scorch Size: 1 Warhead@4Eff_impact: CreateEffect - Explosion: nuke + Explosions: nuke ImpactSound: kaboom1.aud Warhead@5Dam_areanuke1: SpreadDamage Spread: 2c0 diff --git a/mods/ts/weapons/bombsandgrenades.yaml b/mods/ts/weapons/bombsandgrenades.yaml index a7afd8606c..2d55dab8a6 100644 --- a/mods/ts/weapons/bombsandgrenades.yaml +++ b/mods/ts/weapons/bombsandgrenades.yaml @@ -19,11 +19,11 @@ Grenade: Concrete: 28 DamageTypes: Prone70Percent, TriggerProne, ExplosionDeath Warhead@2Eff: CreateEffect - Explosion: large_grey_explosion + Explosions: large_grey_explosion ImpactSound: expnew13.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: small_watersplash + Explosions: small_watersplash ExplosionPalette: player ImpactSound: ssplash3.aud ValidImpactTypes: Water @@ -51,11 +51,11 @@ Bomb: Concrete: 100 DamageTypes: Prone100Percent, TriggerProne, ExplosionDeath Warhead@2Eff: CreateEffect - Explosion: large_explosion + Explosions: large_explosion ImpactSound: expnew09.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: small_watersplash + Explosions: small_watersplash ExplosionPalette: player ImpactSound: ssplash3.aud ValidImpactTypes: Water @@ -84,11 +84,11 @@ RPGTower: Concrete: 70 DamageTypes: Prone70Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect - Explosion: large_clsn + Explosions: large_clsn ImpactSound: expnew14.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: small_watersplash + Explosions: small_watersplash ExplosionPalette: player ImpactSound: ssplash2.aud ValidImpactTypes: Water diff --git a/mods/ts/weapons/energyweapons.yaml b/mods/ts/weapons/energyweapons.yaml index 28885a4aef..576fd6d3ef 100644 --- a/mods/ts/weapons/energyweapons.yaml +++ b/mods/ts/weapons/energyweapons.yaml @@ -123,11 +123,11 @@ CyCannon: Concrete: 80 DamageTypes: Prone350Percent, TriggerProne, EnergyDeath Warhead@2Eff: CreateEffect - Explosion: large_bang + Explosions: large_bang ImpactSound: expnew12.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: small_watersplash + Explosions: small_watersplash ExplosionPalette: player ImpactSound: ssplash3.aud ValidImpactTypes: Water @@ -160,11 +160,11 @@ Proton: Concrete: 60 DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath Warhead@2Eff: CreateEffect - Explosion: small_bang + Explosions: small_bang ImpactSound: expnew12.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: small_watersplash + Explosions: small_watersplash ExplosionPalette: player ImpactSound: ssplash3.aud ValidImpactTypes: Water diff --git a/mods/ts/weapons/explosions.yaml b/mods/ts/weapons/explosions.yaml index 7635d027d7..40d06b9402 100644 --- a/mods/ts/weapons/explosions.yaml +++ b/mods/ts/weapons/explosions.yaml @@ -10,7 +10,7 @@ UnitExplode: Heavy: 25 DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect - Explosion: large_twlt + Explosions: large_twlt ImpactSound: expnew09.aud UnitExplodeSmall: @@ -24,7 +24,7 @@ UnitExplodeSmall: Heavy: 25 DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect - Explosion: medium_brnl + Explosions: medium_brnl ImpactSound: expnew13.aud TiberiumExplosion: @@ -41,7 +41,7 @@ TiberiumExplosion: AddsResourceType: Tiberium Size: 1,1 Warhead@3Eff: CreateEffect - Explosion: large_explosion + Explosions: large_explosion ImpactSound: expnew09.aud SmallDebris: diff --git a/mods/ts/weapons/largeguns.yaml b/mods/ts/weapons/largeguns.yaml index da56f0434b..d64940ccea 100644 --- a/mods/ts/weapons/largeguns.yaml +++ b/mods/ts/weapons/largeguns.yaml @@ -19,11 +19,11 @@ Concrete: 60 DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect - Explosion: medium_clsn + Explosions: medium_clsn ImpactSound: expnew14.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: small_watersplash + Explosions: small_watersplash ExplosionPalette: player ImpactSound: ssplash3.aud ValidImpactTypes: Water @@ -47,11 +47,11 @@ Concrete: 60 DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect - Explosion: large_clsn + Explosions: large_clsn ImpactSound: expnew14.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: small_watersplash + Explosions: small_watersplash ExplosionPalette: player ImpactSound: ssplash3.aud ValidImpactTypes: Water @@ -81,11 +81,11 @@ Concrete: 60 DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect - Explosion: medium_clsn + Explosions: medium_clsn ImpactSound: expnew14.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: small_watersplash + Explosions: small_watersplash ExplosionPalette: player ImpactSound: ssplash3.aud ValidImpactTypes: Water @@ -115,11 +115,11 @@ Concrete: 35 DamageTypes: Prone100Percent, TriggerProne, ExplosionDeath Warhead@2Eff: CreateEffect - Explosion: large_explosion + Explosions: large_explosion ImpactSound: expnew06.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: small_watersplash + Explosions: small_watersplash ExplosionPalette: player ImpactSound: ssplash2.aud ValidImpactTypes: Water diff --git a/mods/ts/weapons/missiles.yaml b/mods/ts/weapons/missiles.yaml index f9dfe20ddd..034b3898fd 100644 --- a/mods/ts/weapons/missiles.yaml +++ b/mods/ts/weapons/missiles.yaml @@ -26,17 +26,17 @@ Bazooka: Concrete: 60 DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect - Explosion: small_clsn + Explosions: small_clsn ImpactSound: expnew12.aud InvalidImpactTypes: Water, Air, AirHit Warhead@3EffWater: CreateEffect - Explosion: small_watersplash + Explosions: small_watersplash ExplosionPalette: player ImpactSound: ssplash3.aud ValidImpactTypes: Water Warhead@4EffAir: CreateEffect ValidImpactTypes: Air, AirHit - Explosion: tiny_twlt + Explosions: tiny_twlt ImpactSound: expnew05.aud Warhead@5Smu: LeaveSmudge SmudgeType: SmallCrater @@ -70,16 +70,16 @@ HoverMissile: Concrete: 60 DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect - Explosion: small_clsn + Explosions: small_clsn ImpactSound: expnew12.aud InvalidImpactTypes: Water, Air, AirHit Warhead@3EffWater: CreateEffect - Explosion: small_watersplash + Explosions: small_watersplash ExplosionPalette: player ImpactSound: ssplash3.aud ValidImpactTypes: Water Warhead@4EffAir: CreateEffect - Explosion: small_twlt + Explosions: small_twlt ValidImpactTypes: Air, AirHit ImpactSound: expnew06.aud Warhead@5: LeaveSmudge @@ -113,11 +113,11 @@ MammothTusk: Concrete: 28 DamageTypes: Explosion Warhead@2Eff: CreateEffect - Explosion: medium_twlt + Explosions: medium_twlt ImpactSound: expnew07.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: small_watersplash + Explosions: small_watersplash ExplosionPalette: player ImpactSound: ssplash3.aud ValidImpactTypes: Water @@ -152,11 +152,11 @@ BikeMissile: Concrete: 60 DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect - Explosion: small_clsn + Explosions: small_clsn ImpactSound: expnew12.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: small_watersplash + Explosions: small_watersplash ExplosionPalette: player ImpactSound: ssplash3.aud ValidImpactTypes: Water @@ -192,16 +192,16 @@ Dragon: Concrete: 60 DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect - Explosion: small_clsn + Explosions: small_clsn ImpactSound: expnew12.aud InvalidImpactTypes: Water, Air, AirHit Warhead@3EffWater: CreateEffect - Explosion: small_watersplash + Explosions: small_watersplash ExplosionPalette: player ImpactSound: ssplash3.aud ValidImpactTypes: Water Warhead@4EffAir: CreateEffect - Explosion: small_twlt + Explosions: small_twlt ValidImpactTypes: Air, AirHit ImpactSound: expnew06.aud Warhead@5Smu: LeaveSmudge @@ -236,16 +236,16 @@ Hellfire: Concrete: 30 DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect - Explosion: small_clsn + Explosions: small_clsn ImpactSound: expnew12.aud InvalidImpactTypes: Water, Air, AirHit Warhead@3EffWater: CreateEffect - Explosion: small_watersplash + Explosions: small_watersplash ExplosionPalette: player ImpactSound: ssplash3.aud ValidImpactTypes: Water Warhead@4EffAir: CreateEffect - Explosion: small_twlt + Explosions: small_twlt ValidImpactTypes: Air, AirHit ImpactSound: expnew06.aud Warhead@5Smu: LeaveSmudge @@ -273,5 +273,5 @@ RedEye2: ValidTargets: Air DamageTypes: SmallExplosionDeath Warhead@2Eff: CreateEffect - Explosion: tiny_twlt + Explosions: tiny_twlt ImpactSound: expnew05.aud diff --git a/mods/ts/weapons/otherweapons.yaml b/mods/ts/weapons/otherweapons.yaml index 844e28b419..4d288575d2 100644 --- a/mods/ts/weapons/otherweapons.yaml +++ b/mods/ts/weapons/otherweapons.yaml @@ -41,7 +41,7 @@ FiendShard: Concrete: 20 DamageTypes: Prone100Percent, TriggerProne, BulletDeath Warhead@3EffWater: CreateEffect - Explosion: small_watersplash + Explosions: small_watersplash ExplosionPalette: player ImpactSound: ssplash3.aud ValidImpactTypes: Water diff --git a/mods/ts/weapons/smallguns.yaml b/mods/ts/weapons/smallguns.yaml index 1b3fc65e21..c080e4b1c1 100644 --- a/mods/ts/weapons/smallguns.yaml +++ b/mods/ts/weapons/smallguns.yaml @@ -14,10 +14,10 @@ Minigun: Concrete: 10 DamageTypes: Prone70Percent, TriggerProne, BulletDeath Warhead@2Eff: CreateEffect - Explosion: piffs + Explosions: piffs InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: water_piffs + Explosions: water_piffs ExplosionPalette: ra ValidImpactTypes: Water @@ -37,10 +37,10 @@ M1Carbine: Concrete: 10 DamageTypes: Prone70Percent, TriggerProne, BulletDeath Warhead@2Eff: CreateEffect - Explosion: piffs + Explosions: piffs InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: water_piffs + Explosions: water_piffs ExplosionPalette: ra ValidImpactTypes: Water @@ -60,10 +60,10 @@ Vulcan: Concrete: 10 DamageTypes: Prone70Percent, TriggerProne, BulletDeath Warhead@2Eff: CreateEffect - Explosion: piffs + Explosions: piffs InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: water_piffs + Explosions: water_piffs ExplosionPalette: ra ValidImpactTypes: Water @@ -85,10 +85,10 @@ Vulcan2: Concrete: 10 DamageTypes: Prone70Percent, TriggerProne, BulletDeath Warhead@2Eff: CreateEffect - Explosion: piffs + Explosions: piffs InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: water_piffs + Explosions: water_piffs ExplosionPalette: ra ValidImpactTypes: Water @@ -109,10 +109,10 @@ Vulcan3: Concrete: 10 DamageTypes: Prone70Percent, TriggerProne, BulletDeath Warhead@2Eff: CreateEffect - Explosion: piffs + Explosions: piffs InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: water_piffs + Explosions: water_piffs ExplosionPalette: ra ValidImpactTypes: Water @@ -132,10 +132,10 @@ VulcanTower: Concrete: 10 DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@2Eff: CreateEffect - Explosion: piffs + Explosions: piffs InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: water_piffs + Explosions: water_piffs ExplosionPalette: ra ValidImpactTypes: Water @@ -156,10 +156,10 @@ JumpCannon: Concrete: 10 DamageTypes: Prone70Percent, TriggerProne, BulletDeath Warhead@2Eff: CreateEffect - Explosion: piffs + Explosions: piffs InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: water_piffs + Explosions: water_piffs ExplosionPalette: ra ValidImpactTypes: Water @@ -179,10 +179,10 @@ AssaultCannon: Concrete: 10 DamageTypes: Prone70Percent, TriggerProne, BulletDeath Warhead@2Eff: CreateEffect - Explosion: piffs + Explosions: piffs InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: water_piffs + Explosions: water_piffs ExplosionPalette: ra ValidImpactTypes: Water @@ -204,10 +204,10 @@ RaiderCannon: Concrete: 10 DamageTypes: Prone70Percent, TriggerProne, BulletDeath Warhead@2Eff: CreateEffect - Explosion: piffs + Explosions: piffs InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: water_piffs + Explosions: water_piffs ExplosionPalette: ra ValidImpactTypes: Water @@ -229,10 +229,10 @@ HarpyClaw: Concrete: 10 DamageTypes: Prone70Percent, TriggerProne, BulletDeath Warhead@2Eff: CreateEffect - Explosion: piffs + Explosions: piffs InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: water_piffs + Explosions: water_piffs ExplosionPalette: ra ValidImpactTypes: Water @@ -252,10 +252,10 @@ Pistola: Concrete: 10 DamageTypes: Prone70Percent, TriggerProne, BulletDeath Warhead@2Eff: CreateEffect - Explosion: piff + Explosions: piff InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: water_piff + Explosions: water_piff ExplosionPalette: ra ValidImpactTypes: Water diff --git a/mods/ts/weapons/superweapons.yaml b/mods/ts/weapons/superweapons.yaml index 89a632be8c..6b9a1312a5 100644 --- a/mods/ts/weapons/superweapons.yaml +++ b/mods/ts/weapons/superweapons.yaml @@ -25,11 +25,11 @@ MultiCluster: Concrete: 60 DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath Warhead@2Eff: CreateEffect - Explosion: large_explosion + Explosions: large_explosion ImpactSound: expnew09.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: small_watersplash + Explosions: small_watersplash ExplosionPalette: player ImpactSound: ssplash2.aud ValidImpactTypes: Water @@ -61,7 +61,7 @@ IonCannon: ValidTargets: Ground, Air DamageTypes: Prone100Percent, TriggerProne, EnergyDeath Warhead@2Eff_impact: CreateEffect - Explosion: ionring + Explosions: ionring ImpactSound: ion1.aud Warhead@3Dam_area: SpreadDamage Spread: 1c0 @@ -86,7 +86,7 @@ EMPulseCannon: Angle: 62 Image: pulsball Warhead@1Eff: CreateEffect - Explosion: pulse_explosion + Explosions: pulse_explosion Warhead@emp: GrantUpgrade Range: 3c0 Duration: 250 @@ -103,7 +103,7 @@ ClusterMissile: Concrete: 25 DamageTypes: Prone50Percent, TriggerProne, FireDeath Warhead@SoundEffect0: CreateEffect - Explosion: large_explosion + Explosions: large_explosion ImpactSound: expnew19.aud Warhead@ResourceDestruction0: DestroyResource Size: 1 From 489ee9fc546075c519c0a6e75bce6e4b0b3ee95d Mon Sep 17 00:00:00 2001 From: Pavel Penev Date: Sat, 2 Jan 2016 16:48:45 +0200 Subject: [PATCH 2/3] Add support for multiple impact sounds to CreateEffectWarhead Have the engine pick one impact sound at random from the provided list. --- .../UtilityCommands/UpgradeRules.cs | 5 ++ .../Warheads/CreateEffectWarhead.cs | 9 +-- mods/cnc/weapons/explosions.yaml | 14 ++--- mods/cnc/weapons/largecaliber.yaml | 12 ++-- mods/cnc/weapons/missiles.yaml | 28 +++++----- mods/cnc/weapons/other.yaml | 14 ++--- mods/cnc/weapons/superweapons.yaml | 4 +- mods/d2k/weapons/debris.yaml | 8 +-- mods/d2k/weapons/largeguns.yaml | 6 +- mods/d2k/weapons/missiles.yaml | 10 ++-- mods/d2k/weapons/other.yaml | 24 ++++---- mods/d2k/weapons/smallguns.yaml | 2 +- mods/ra/maps/drop-zone-w/map.yaml | 4 +- mods/ra/maps/fort-lonestar/map.yaml | 8 +-- mods/ra/maps/soviet-02b/map.yaml | 2 +- mods/ra/maps/soviet-03/map.yaml | 2 +- mods/ra/maps/soviet-07/map.yaml | 4 +- mods/ra/maps/survival02/map.yaml | 4 +- mods/ra/weapons/explosions.yaml | 36 ++++++------ mods/ra/weapons/largecaliber.yaml | 28 +++++----- mods/ra/weapons/missiles.yaml | 56 +++++++++---------- mods/ra/weapons/other.yaml | 22 ++++---- mods/ra/weapons/superweapons.yaml | 8 +-- mods/ts/rules/nod-vehicles.yaml | 2 +- mods/ts/weapons/bombsandgrenades.yaml | 12 ++-- mods/ts/weapons/energyweapons.yaml | 8 +-- mods/ts/weapons/explosions.yaml | 6 +- mods/ts/weapons/largeguns.yaml | 16 +++--- mods/ts/weapons/missiles.yaml | 34 +++++------ mods/ts/weapons/otherweapons.yaml | 2 +- mods/ts/weapons/superweapons.yaml | 8 +-- 31 files changed, 202 insertions(+), 196 deletions(-) diff --git a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs index 6040d0d68b..5a9475ad5e 100644 --- a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs +++ b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs @@ -3441,6 +3441,11 @@ namespace OpenRA.Mods.Common.UtilityCommands var explosionNode = node.Value.Nodes.FirstOrDefault(x => x.Key == "Explosion"); if (explosionNode != null) explosionNode.Key = "Explosions"; + + // Add support for multiple impact sounds to CreateEffectWarhead + var impactSoundNode = node.Value.Nodes.FirstOrDefault(x => x.Key == "ImpactSound"); + if (impactSoundNode != null) + impactSoundNode.Key = "ImpactSounds"; } } diff --git a/OpenRA.Mods.Common/Warheads/CreateEffectWarhead.cs b/OpenRA.Mods.Common/Warheads/CreateEffectWarhead.cs index d1c0c3811b..6f88eb7eaf 100644 --- a/OpenRA.Mods.Common/Warheads/CreateEffectWarhead.cs +++ b/OpenRA.Mods.Common/Warheads/CreateEffectWarhead.cs @@ -26,8 +26,8 @@ namespace OpenRA.Mods.Common.Warheads [Desc("Remap explosion effect to player color, if art supports it.")] public readonly bool UsePlayerPalette = false; - [Desc("Sound to play on impact.")] - public readonly string ImpactSound = null; + [Desc("List of sounds that can be played on impact.")] + public readonly string[] ImpactSounds = new string[0]; [Desc("What impact types should this effect apply to.")] public readonly ImpactType ValidImpactTypes = ImpactType.Ground | ImpactType.Water | ImpactType.Air | ImpactType.GroundHit | ImpactType.WaterHit | ImpactType.AirHit; @@ -103,8 +103,9 @@ namespace OpenRA.Mods.Common.Warheads if (explosion != null) world.AddFrameEndTask(w => w.Add(new Explosion(w, pos, explosion, palette))); - if (ImpactSound != null) - Game.Sound.Play(ImpactSound, pos); + var impactSound = ImpactSounds.RandomOrDefault(Game.CosmeticRandom); + if (impactSound != null) + Game.Sound.Play(impactSound, pos); } public bool IsValidImpact(WPos pos, Actor firedBy) diff --git a/mods/cnc/weapons/explosions.yaml b/mods/cnc/weapons/explosions.yaml index bfa27bbffb..d6f2be7e53 100644 --- a/mods/cnc/weapons/explosions.yaml +++ b/mods/cnc/weapons/explosions.yaml @@ -5,7 +5,7 @@ FlametankExplode: DamageTypes: Prone50Percent, TriggerProne, FireDeath Warhead@2Eff: CreateEffect Explosions: big_napalm - ImpactSound: xplobig6.aud + ImpactSounds: xplobig6.aud HeliCrash: Warhead@1Dam: SpreadDamage @@ -14,14 +14,14 @@ HeliCrash: DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath Warhead@2Eff: CreateEffect Explosions: poof - ImpactSound: xplos.aud + ImpactSounds: xplos.aud HeliExplode: Warhead@1Dam: SpreadDamage DamageTypes: ExplosionDeath Warhead@2Eff: CreateEffect Explosions: small_building - ImpactSound: xplos.aud + ImpactSounds: xplos.aud UnitExplode: Warhead@1Dam: SpreadDamage @@ -35,7 +35,7 @@ UnitExplode: DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath Warhead@2Eff: CreateEffect Explosions: poof - ImpactSound: xplobig6.aud + ImpactSounds: xplobig6.aud UnitExplodeSmall: Warhead@1Dam: SpreadDamage @@ -49,7 +49,7 @@ UnitExplodeSmall: DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath Warhead@2Eff: CreateEffect Explosions: big_frag - ImpactSound: xplobig4.aud + ImpactSounds: xplobig4.aud GrenadierExplode: Warhead@1Dam: SpreadDamage @@ -63,7 +63,7 @@ GrenadierExplode: DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect Explosions: poof - ImpactSound: xplosml2.aud + ImpactSounds: xplosml2.aud Napalm.Crate: Warhead@1Dam: SpreadDamage @@ -81,4 +81,4 @@ Napalm.Crate: SmudgeType: Scorch Warhead@3Eff: CreateEffect Explosions: med_napalm - ImpactSound: flamer2.aud + ImpactSounds: flamer2.aud diff --git a/mods/cnc/weapons/largecaliber.yaml b/mods/cnc/weapons/largecaliber.yaml index bb1b18c38a..f6992c60a4 100644 --- a/mods/cnc/weapons/largecaliber.yaml +++ b/mods/cnc/weapons/largecaliber.yaml @@ -19,7 +19,7 @@ SmudgeType: Crater Warhead@3Eff: CreateEffect Explosions: small_frag - ImpactSound: xplos.aud + ImpactSounds: xplos.aud 105mm: ReloadDelay: 50 @@ -41,7 +41,7 @@ SmudgeType: Crater Warhead@3Eff: CreateEffect Explosions: small_frag - ImpactSound: xplos.aud + ImpactSounds: xplos.aud 120mm: ReloadDelay: 40 @@ -64,7 +64,7 @@ SmudgeType: Crater Warhead@3Eff: CreateEffect Explosions: small_frag - ImpactSound: xplos.aud + ImpactSounds: xplos.aud 120mmDual: ReloadDelay: 40 @@ -89,7 +89,7 @@ SmudgeType: Crater Warhead@3Eff: CreateEffect Explosions: small_frag - ImpactSound: xplos.aud + ImpactSounds: xplos.aud TurretGun: ReloadDelay: 20 @@ -111,7 +111,7 @@ TurretGun: SmudgeType: Crater Warhead@3Eff: CreateEffect Explosions: small_frag - ImpactSound: xplos.aud + ImpactSounds: xplos.aud ArtilleryShell: ReloadDelay: 65 @@ -138,4 +138,4 @@ ArtilleryShell: SmudgeType: Crater Warhead@3Eff: CreateEffect Explosions: poof - ImpactSound: XPLOSML2.AUD + ImpactSounds: XPLOSML2.AUD diff --git a/mods/cnc/weapons/missiles.yaml b/mods/cnc/weapons/missiles.yaml index b74bdc7a49..b60346c36d 100644 --- a/mods/cnc/weapons/missiles.yaml +++ b/mods/cnc/weapons/missiles.yaml @@ -29,7 +29,7 @@ Rockets: SmudgeType: Crater Warhead@3Eff: CreateEffect Explosions: small_frag - ImpactSound: xplos.aud + ImpactSounds: xplos.aud BikeRockets: ReloadDelay: 50 @@ -63,7 +63,7 @@ BikeRockets: SmudgeType: Crater Warhead@3Eff: CreateEffect Explosions: small_frag - ImpactSound: xplos.aud + ImpactSounds: xplos.aud OrcaAGMissiles: ReloadDelay: 12 @@ -97,7 +97,7 @@ OrcaAGMissiles: SmudgeType: Crater Warhead@3Eff: CreateEffect Explosions: small_frag - ImpactSound: xplos.aud + ImpactSounds: xplos.aud OrcaAAMissiles: ReloadDelay: 12 @@ -129,7 +129,7 @@ OrcaAAMissiles: SmudgeType: Crater Warhead@3Eff: CreateEffect Explosions: small_frag - ImpactSound: xplos.aud + ImpactSounds: xplos.aud MammothMissiles: ReloadDelay: 45 @@ -162,11 +162,11 @@ MammothMissiles: SmudgeType: Crater Warhead@3Eff: CreateEffect Explosions: small_poof - ImpactSound: xplos.aud + ImpactSounds: xplos.aud InvalidImpactTypes: Air, AirHit Warhead@4EffAir: CreateEffect Explosions: small_building - ImpactSound: xplos.aud + ImpactSounds: xplos.aud ValidImpactTypes: Air, AirHit 227mm: @@ -202,7 +202,7 @@ MammothMissiles: SmudgeType: Crater Warhead@3Eff: CreateEffect Explosions: med_frag - ImpactSound: xplos.aud + ImpactSounds: xplos.aud 227mm.stnk: ReloadDelay: 70 @@ -235,7 +235,7 @@ MammothMissiles: SmudgeType: Crater Warhead@3Eff: CreateEffect Explosions: small_frag - ImpactSound: xplos.aud + ImpactSounds: xplos.aud BoatMissile: ReloadDelay: 35 @@ -266,11 +266,11 @@ BoatMissile: SmudgeType: Crater Warhead@3Eff: CreateEffect Explosions: small_poof - ImpactSound: xplos.aud + ImpactSounds: xplos.aud InvalidImpactTypes: Air, AirHit Warhead@4EffAir: CreateEffect Explosions: small_building - ImpactSound: xplos.aud + ImpactSounds: xplos.aud ValidImpactTypes: Air, AirHit TowerMissle: @@ -302,7 +302,7 @@ TowerMissle: SmudgeType: Crater Warhead@3Eff: CreateEffect Explosions: med_frag - ImpactSound: xplos.aud + ImpactSounds: xplos.aud SAMMissile: ReloadDelay: 15 @@ -332,7 +332,7 @@ SAMMissile: SmudgeType: Crater Warhead@3Eff: CreateEffect Explosions: small_building - ImpactSound: xplos.aud + ImpactSounds: xplos.aud HonestJohn: ReloadDelay: 200 @@ -361,7 +361,7 @@ HonestJohn: SmudgeType: Crater Warhead@3Eff: CreateEffect Explosions: small_poof - ImpactSound: xplos.aud + ImpactSounds: xplos.aud Patriot: ReloadDelay: 25 @@ -388,4 +388,4 @@ Patriot: SmudgeType: Crater Warhead@3Eff: CreateEffect Explosions: poof - ImpactSound: xplos.aud + ImpactSounds: xplos.aud diff --git a/mods/cnc/weapons/other.yaml b/mods/cnc/weapons/other.yaml index 22dcf2f009..d255ef95c1 100644 --- a/mods/cnc/weapons/other.yaml +++ b/mods/cnc/weapons/other.yaml @@ -19,7 +19,7 @@ Flamethrower: SmudgeType: Scorch Warhead@3Eff: CreateEffect Explosions: small_napalm - ImpactSound: flamer2.aud + ImpactSounds: flamer2.aud BigFlamer: ReloadDelay: 50 @@ -44,7 +44,7 @@ BigFlamer: SmudgeType: Scorch Warhead@3Eff: CreateEffect Explosions: med_napalm - ImpactSound: flamer2.aud + ImpactSounds: flamer2.aud Chemspray: ReloadDelay: 65 @@ -65,7 +65,7 @@ Chemspray: SmudgeType: Scorch Warhead@3Eff: CreateEffect Explosions: chemball - ImpactSound: xplos.aud + ImpactSounds: xplos.aud Grenade: ReloadDelay: 50 @@ -90,7 +90,7 @@ Grenade: SmudgeType: Crater Warhead@3Eff: CreateEffect Explosions: small_poof - ImpactSound: xplos.aud + ImpactSounds: xplos.aud Napalm: ValidTargets: Ground, Water @@ -115,7 +115,7 @@ Napalm: SmudgeType: Scorch Warhead@3Eff: CreateEffect Explosions: med_napalm - ImpactSound: flamer2.aud + ImpactSounds: flamer2.aud Laser: ReloadDelay: 1 @@ -156,7 +156,7 @@ TiberiumExplosion: Size: 1,1 Warhead@3Eff: CreateEffect Explosions: chemball - ImpactSound: xplosml2.aud + ImpactSounds: xplosml2.aud Heal: ReloadDelay: 4 @@ -237,4 +237,4 @@ Demolish: DamageTypes: DefaultDeath Warhead@2Eff: CreateEffect Explosions: building - ImpactSound: xplobig6.aud + ImpactSounds: xplobig6.aud diff --git a/mods/cnc/weapons/superweapons.yaml b/mods/cnc/weapons/superweapons.yaml index bb0f41ec2d..e40d0c2127 100644 --- a/mods/cnc/weapons/superweapons.yaml +++ b/mods/cnc/weapons/superweapons.yaml @@ -14,7 +14,7 @@ Atomic: DamageTypes: Prone50Percent, TriggerProne, FireDeath Warhead@2Eff_impact: CreateEffect Explosions: nuke_explosion - ImpactSound: nukexplo.aud + ImpactSounds: nukexplo.aud Warhead@3Dam_areanukea: SpreadDamage Spread: 2c512 Damage: 100 @@ -35,7 +35,7 @@ Atomic: Size: 3 Delay: 3 Warhead@6Eff_areanukea: CreateEffect - ImpactSound: xplobig4.aud + ImpactSounds: xplobig4.aud Delay: 3 Warhead@7Dam_areanukeb: SpreadDamage Spread: 3c768 diff --git a/mods/d2k/weapons/debris.yaml b/mods/d2k/weapons/debris.yaml index f111d35cac..a689ee70b6 100644 --- a/mods/d2k/weapons/debris.yaml +++ b/mods/d2k/weapons/debris.yaml @@ -27,7 +27,7 @@ Debris: SmudgeType: SandCrater Warhead@3Eff: CreateEffect Explosions: small_explosion - ImpactSound: EXPLLG5.WAV + ImpactSounds: EXPLLG5.WAV Debris2: ReloadDelay: 60 @@ -61,7 +61,7 @@ Debris2: SmudgeType: SandCrater Warhead@3Eff: CreateEffect Explosions: med_explosion - ImpactSound: EXPLLG5.WAV + ImpactSounds: EXPLLG5.WAV Debris3: ReloadDelay: 60 @@ -95,7 +95,7 @@ Debris3: SmudgeType: SandCrater Warhead@3Eff: CreateEffect Explosions: med_explosion - ImpactSound: EXPLLG5.WAV + ImpactSounds: EXPLLG5.WAV Debris4: ReloadDelay: 60 @@ -129,4 +129,4 @@ Debris4: SmudgeType: SandCrater Warhead@3Eff: CreateEffect Explosions: large_explosion - ImpactSound: EXPLLG5.WAV + ImpactSounds: EXPLLG5.WAV diff --git a/mods/d2k/weapons/largeguns.yaml b/mods/d2k/weapons/largeguns.yaml index 6de507ecba..105bd06e96 100644 --- a/mods/d2k/weapons/largeguns.yaml +++ b/mods/d2k/weapons/largeguns.yaml @@ -26,7 +26,7 @@ SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect Explosions: small_napalm - ImpactSound: EXPLSML4.WAV + ImpactSounds: EXPLSML4.WAV 80mm_A: ReloadDelay: 50 @@ -132,7 +132,7 @@ DevBullet: SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect Explosions: shockwave - ImpactSound: EXPLMD1.WAV + ImpactSounds: EXPLMD1.WAV 155mm: ReloadDelay: 80 @@ -163,4 +163,4 @@ DevBullet: SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect Explosions: med_explosion - ImpactSound: EXPLMD2.WAV + ImpactSounds: EXPLMD2.WAV diff --git a/mods/d2k/weapons/missiles.yaml b/mods/d2k/weapons/missiles.yaml index 386f0d0444..2b23df7994 100644 --- a/mods/d2k/weapons/missiles.yaml +++ b/mods/d2k/weapons/missiles.yaml @@ -29,7 +29,7 @@ Bazooka: SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect Explosions: tiny_explosion - ImpactSound: EXPLSML1.WAV + ImpactSounds: EXPLSML1.WAV Rocket: ReloadDelay: 30 @@ -62,7 +62,7 @@ Rocket: Warhead@3Eff: CreateEffect Explosions: rocket_explosion ExplosionPalette: effect75alpha - ImpactSound: EXPLSML1.WAV + ImpactSounds: EXPLSML1.WAV TowerMissile: ReloadDelay: 60 @@ -101,7 +101,7 @@ TowerMissile: SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect Explosions: small_explosion - ImpactSound: EXPLSML1.WAV + ImpactSounds: EXPLSML1.WAV mtank_pri: ReloadDelay: 115 @@ -139,7 +139,7 @@ mtank_pri: SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect Explosions: small_explosion - ImpactSound: EXPLSML1.WAV + ImpactSounds: EXPLSML1.WAV DeviatorMissile: ReloadDelay: 160 @@ -178,7 +178,7 @@ DeviatorMissile: Explosions: deviator ExplosionPalette: deviatorgas UsePlayerPalette: true - ImpactSound: EXPLSML1.WAV + ImpactSounds: EXPLSML1.WAV Warhead@4OwnerChange: ChangeOwner Range: 256 Duration: 375 diff --git a/mods/d2k/weapons/other.yaml b/mods/d2k/weapons/other.yaml index 398723f856..2e87345fef 100644 --- a/mods/d2k/weapons/other.yaml +++ b/mods/d2k/weapons/other.yaml @@ -92,21 +92,21 @@ OrniBomb: SmudgeType: Crater Warhead@3Eff: CreateEffect Explosions: large_explosion - ImpactSound: NAPALM1.WAV + ImpactSounds: NAPALM1.WAV Crush: Warhead@1Dam: SpreadDamage Damage: 100 DamageTypes: ExplosionDeath Warhead@2Eff: CreateEffect - ImpactSound: CRUSH1.WAV + ImpactSounds: CRUSH1.WAV Demolish: Warhead@1Dam: SpreadDamage DamageTypes: ExplosionDeath Warhead@2Eff: CreateEffect Explosions: building - ImpactSound: EXPLLG2.WAV + ImpactSounds: EXPLLG2.WAV Atomic: Warhead@1Dam: SpreadDamage @@ -126,7 +126,7 @@ Atomic: DamageTypes: Prone50Percent, TriggerProne, SoundDeath Warhead@2Eff: CreateEffect Explosions: nuke - ImpactSound: EXPLLG2.WAV + ImpactSounds: EXPLLG2.WAV CrateNuke: Warhead@1Dam: SpreadDamage @@ -147,7 +147,7 @@ CrateNuke: DamageTypes: Prone50Percent, TriggerProne, SoundDeath Warhead@2Eff: CreateEffect Explosions: nuke - ImpactSound: EXPLLG2.WAV + ImpactSounds: EXPLLG2.WAV CrateExplosion: Warhead@1Dam: SpreadDamage @@ -168,22 +168,22 @@ CrateExplosion: DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect Explosions: large_explosion - ImpactSound: EXPLSML4.WAV + ImpactSounds: EXPLSML4.WAV UnitExplodeSmall: Warhead@1Eff: CreateEffect Explosions: self_destruct - ImpactSound: EXPLSML1.WAV + ImpactSounds: EXPLSML1.WAV UnitExplodeMed: Warhead@1Eff: CreateEffect Explosions: building - ImpactSound: EXPLSML2.WAV + ImpactSounds: EXPLSML2.WAV UnitExplodeLarge: Warhead@1Eff: CreateEffect Explosions: large_explosion - ImpactSound: EXPLLG2.WAV + ImpactSounds: EXPLLG2.WAV grenade: ReloadDelay: 50 @@ -212,7 +212,7 @@ grenade: SmudgeType: SandCrater Warhead@3Eff: CreateEffect Explosions: med_explosion - ImpactSound: EXPLLG5.WAV + ImpactSounds: EXPLLG5.WAV Weathering: ReloadDelay: 100 @@ -237,7 +237,7 @@ GrenDeath: SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect Explosions: building - ImpactSound: EXPLSML4.WAV + ImpactSounds: EXPLSML4.WAV SardDeath: Warhead@1Dam: SpreadDamage @@ -258,7 +258,7 @@ SardDeath: SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect Explosions: small_napalm - ImpactSound: EXPLSML2.WAV + ImpactSounds: EXPLSML2.WAV SpiceExplosion: Projectile: Bullet diff --git a/mods/d2k/weapons/smallguns.yaml b/mods/d2k/weapons/smallguns.yaml index 57062a474d..9c031108e1 100644 --- a/mods/d2k/weapons/smallguns.yaml +++ b/mods/d2k/weapons/smallguns.yaml @@ -43,7 +43,7 @@ Fremen_S: DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@2Eff: CreateEffect Explosions: small_explosion - ImpactSound: EXPLSML2.WAV + ImpactSounds: EXPLSML2.WAV M_LMG: ReloadDelay: 40 diff --git a/mods/ra/maps/drop-zone-w/map.yaml b/mods/ra/maps/drop-zone-w/map.yaml index 34bfd513ca..7deb501c42 100644 --- a/mods/ra/maps/drop-zone-w/map.yaml +++ b/mods/ra/maps/drop-zone-w/map.yaml @@ -291,7 +291,7 @@ Weapons: Warhead@1Eff: CreateEffect Explosions: large_explosion WaterExplosion: large_splash - ImpactSound: kaboom12.aud + ImpactSounds: kaboom12.aud WaterImpactSound: splash9.aud Warhead@2Smu: LeaveSmudge SmudgeType: Crater @@ -319,7 +319,7 @@ Weapons: Warhead@1Eff: CreateEffect Explosions: large_explosion WaterExplosion: large_splash - ImpactSound: kaboom12.aud + ImpactSounds: kaboom12.aud WaterImpactSound: splash9.aud Warhead@2Smu: LeaveSmudge SmudgeType: Crater diff --git a/mods/ra/maps/fort-lonestar/map.yaml b/mods/ra/maps/fort-lonestar/map.yaml index f8ef0a2100..2f0ceb9343 100644 --- a/mods/ra/maps/fort-lonestar/map.yaml +++ b/mods/ra/maps/fort-lonestar/map.yaml @@ -881,7 +881,7 @@ Weapons: Warhead@3Eff: CreateEffect Explosions: small_explosion WaterExplosion: small_explosion - ImpactSound: firebl3.aud + ImpactSounds: firebl3.aud ParaBomb: ReloadDelay: 5 Range: 5c0 @@ -902,7 +902,7 @@ Weapons: SmudgeType: Crater Warhead@3Eff: CreateEffect Explosions: napalm - ImpactSound: firebl3.aud + ImpactSounds: firebl3.aud WaterExplosion: napalm 155mm: ReloadDelay: 10 @@ -933,7 +933,7 @@ Weapons: Warhead@3Eff: CreateEffect Explosions: small_napalm WaterExplosion: small_napalm - ImpactSound: firebl3.aud + ImpactSounds: firebl3.aud FLAK-23: ReloadDelay: 10 Range: 8c0 @@ -986,7 +986,7 @@ Weapons: Warhead@3Eff: CreateEffect Explosions: nuke WaterExplosion: large_splash - ImpactSound: kaboom1.aud + ImpactSounds: kaboom1.aud WaterImpactSound: kaboom1.aud SilencedPPK: ReloadDelay: 80 diff --git a/mods/ra/maps/soviet-02b/map.yaml b/mods/ra/maps/soviet-02b/map.yaml index a70d909cc5..becb96fa45 100644 --- a/mods/ra/maps/soviet-02b/map.yaml +++ b/mods/ra/maps/soviet-02b/map.yaml @@ -671,7 +671,7 @@ Weapons: Delay: 5 Warhead@3Eff: CreateEffect Explosions: napalm - ImpactSound: firebl3.aud + ImpactSounds: firebl3.aud Delay: 5 Voices: diff --git a/mods/ra/maps/soviet-03/map.yaml b/mods/ra/maps/soviet-03/map.yaml index 662e546360..cfb20db954 100644 --- a/mods/ra/maps/soviet-03/map.yaml +++ b/mods/ra/maps/soviet-03/map.yaml @@ -1291,7 +1291,7 @@ Weapons: Delay: 5 Warhead@3Eff: CreateEffect Explosions: napalm - ImpactSound: firebl3.aud + ImpactSounds: firebl3.aud Delay: 5 Voices: diff --git a/mods/ra/maps/soviet-07/map.yaml b/mods/ra/maps/soviet-07/map.yaml index 3696ea2079..4a861e2985 100644 --- a/mods/ra/maps/soviet-07/map.yaml +++ b/mods/ra/maps/soviet-07/map.yaml @@ -919,7 +919,7 @@ Weapons: SmudgeType: Scorch Warhead@3Eff: CreateEffect Explosions: napalm - ImpactSound: firebl3.aud + ImpactSounds: firebl3.aud MissionBarrelExplodeInterior: Warhead@1Dam: SpreadDamage Spread: 350 @@ -939,7 +939,7 @@ Weapons: Delay: 5 Warhead@3Eff: CreateEffect Explosions: napalm - ImpactSound: firebl3.aud + ImpactSounds: firebl3.aud Delay: 5 Voices: diff --git a/mods/ra/maps/survival02/map.yaml b/mods/ra/maps/survival02/map.yaml index 8a30d23e16..a086d26648 100644 --- a/mods/ra/maps/survival02/map.yaml +++ b/mods/ra/maps/survival02/map.yaml @@ -1172,11 +1172,11 @@ Weapons: SmudgeType: Crater Warhead@3Eff: CreateEffect Explosions: napalm - ImpactSound: firebl3.aud + ImpactSounds: firebl3.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect Explosions: napalm - ImpactSound: splash9.aud + ImpactSounds: splash9.aud ValidImpactTypes: Water Voices: diff --git a/mods/ra/weapons/explosions.yaml b/mods/ra/weapons/explosions.yaml index e5f863227a..2493ea3b2d 100644 --- a/mods/ra/weapons/explosions.yaml +++ b/mods/ra/weapons/explosions.yaml @@ -14,7 +14,7 @@ CrateNapalm: SmudgeType: Scorch Warhead@3Eff: CreateEffect Explosions: napalm - ImpactSound: firebl3.aud + ImpactSounds: firebl3.aud CrateExplosion: Warhead@1Dam: SpreadDamage @@ -30,7 +30,7 @@ CrateExplosion: DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath Warhead@2Eff: CreateEffect Explosions: self_destruct - ImpactSound: kaboom15.aud + ImpactSounds: kaboom15.aud CrateNuke: Warhead@1Dam_impact: SpreadDamage @@ -45,7 +45,7 @@ CrateNuke: Warhead@2Res_impact: DestroyResource Warhead@3Eff_impact: CreateEffect Explosions: nuke - ImpactSound: kaboom1.aud + ImpactSounds: kaboom1.aud Warhead@4Dam_areanuke: SpreadDamage Spread: 1c0 Damage: 60 @@ -64,7 +64,7 @@ CrateNuke: Size: 5,4 Delay: 4 Warhead@7Eff_areanuke: CreateEffect - ImpactSound: kaboom22.aud + ImpactSounds: kaboom22.aud Delay: 4 MiniNuke: @@ -82,7 +82,7 @@ MiniNuke: Size: 1 Warhead@3Eff_impact: CreateEffect Explosions: nuke - ImpactSound: kaboom1.aud + ImpactSounds: kaboom1.aud Warhead@4Dam_areanuke1: SpreadDamage Spread: 2c0 Damage: 60 @@ -97,7 +97,7 @@ MiniNuke: Size: 2 Delay: 5 Warhead@6Eff_areanuke1: CreateEffect - ImpactSound: kaboom22.aud + ImpactSounds: kaboom22.aud Delay: 5 Warhead@7Dam_areanuke2: SpreadDamage Spread: 3c0 @@ -143,11 +143,11 @@ UnitExplode: DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath Warhead@2Eff: CreateEffect Explosions: self_destruct - ImpactSound: kaboom22.aud + ImpactSounds: kaboom22.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect Explosions: large_splash - ImpactSound: splash9.aud + ImpactSounds: splash9.aud ValidImpactTypes: Water UnitExplodeShip: @@ -162,7 +162,7 @@ UnitExplodeShip: DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath Warhead@2Eff: CreateEffect Explosions: building - ImpactSound: kaboom25.aud + ImpactSounds: kaboom25.aud UnitExplodeSubmarine: Warhead@1Dam: SpreadDamage @@ -176,7 +176,7 @@ UnitExplodeSubmarine: DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath Warhead@2Eff: CreateEffect Explosions: large_splash - ImpactSound: splash9.aud + ImpactSounds: splash9.aud UnitExplodeSmall: Warhead@1Dam: SpreadDamage @@ -190,11 +190,11 @@ UnitExplodeSmall: DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath Warhead@2Eff: CreateEffect Explosions: large_explosion - ImpactSound: kaboom15.aud + ImpactSounds: kaboom15.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect Explosions: large_splash - ImpactSound: splash9.aud + ImpactSounds: splash9.aud ValidImpactTypes: Water ArtilleryExplode: @@ -209,11 +209,11 @@ ArtilleryExplode: DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath Warhead@2Eff: CreateEffect Explosions: self_destruct - ImpactSound: kaboom22.aud + ImpactSounds: kaboom22.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect Explosions: large_splash - ImpactSound: splash9.aud + ImpactSounds: splash9.aud ValidImpactTypes: Water BarrelExplode: @@ -235,7 +235,7 @@ BarrelExplode: Delay: 5 Warhead@3Eff: CreateEffect Explosions: napalm - ImpactSound: firebl3.aud + ImpactSounds: firebl3.aud Delay: 5 ATMine: @@ -246,7 +246,7 @@ ATMine: DamageTypes: Prone50Percent, TriggerProne, DefaultDeath Warhead@2Eff: CreateEffect Explosions: large_explosion - ImpactSound: mineblo1.aud + ImpactSounds: mineblo1.aud APMine: Warhead@1Dam: SpreadDamage @@ -256,7 +256,7 @@ APMine: DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect Explosions: napalm - ImpactSound: mine1.aud + ImpactSounds: mine1.aud OreExplosion: Warhead@1Dam: SpreadDamage @@ -273,4 +273,4 @@ OreExplosion: Size: 1,1 Warhead@3Eff: CreateEffect Explosions: med_explosion - ImpactSound: kaboom25.aud + ImpactSounds: kaboom25.aud diff --git a/mods/ra/weapons/largecaliber.yaml b/mods/ra/weapons/largecaliber.yaml index dc88785861..27aaa37286 100644 --- a/mods/ra/weapons/largecaliber.yaml +++ b/mods/ra/weapons/largecaliber.yaml @@ -43,11 +43,11 @@ SmudgeType: Crater Warhead@3EffGround: CreateEffect Explosions: small_explosion - ImpactSound: kaboom12.aud + ImpactSounds: kaboom12.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect Explosions: small_splash - ImpactSound: splash9.aud + ImpactSounds: splash9.aud ValidImpactTypes: Water 105mm: @@ -72,11 +72,11 @@ SmudgeType: Crater Warhead@3EffGround: CreateEffect Explosions: small_explosion - ImpactSound: kaboom12.aud + ImpactSounds: kaboom12.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect Explosions: small_splash - ImpactSound: splash9.aud + ImpactSounds: splash9.aud ValidImpactTypes: Water 120mm: @@ -102,11 +102,11 @@ SmudgeType: Crater Warhead@3EffGround: CreateEffect Explosions: small_explosion - ImpactSound: kaboom12.aud + ImpactSounds: kaboom12.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect Explosions: small_splash - ImpactSound: splash9.aud + ImpactSounds: splash9.aud ValidImpactTypes: Water TurretGun: @@ -129,11 +129,11 @@ TurretGun: SmudgeType: Crater Warhead@3EffGround: CreateEffect Explosions: small_explosion - ImpactSound: kaboom12.aud + ImpactSounds: kaboom12.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect Explosions: small_splash - ImpactSound: splash9.aud + ImpactSounds: splash9.aud ValidImpactTypes: Water 155mm: @@ -162,11 +162,11 @@ TurretGun: SmudgeType: Crater Warhead@3Eff: CreateEffect Explosions: artillery_explosion - ImpactSound: kaboom15.aud + ImpactSounds: kaboom15.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect Explosions: med_splash - ImpactSound: splash9.aud + ImpactSounds: splash9.aud ValidImpactTypes: Water 8Inch: @@ -195,11 +195,11 @@ TurretGun: SmudgeType: Crater Warhead@3Eff: CreateEffect Explosions: artillery_explosion - ImpactSound: kaboom15.aud + ImpactSounds: kaboom15.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect Explosions: large_splash - ImpactSound: splash9.aud + ImpactSounds: splash9.aud ValidImpactTypes: Water 2Inch: @@ -222,9 +222,9 @@ TurretGun: SmudgeType: Crater Warhead@3Eff: CreateEffect Explosions: small_explosion - ImpactSound: kaboom12.aud + ImpactSounds: kaboom12.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect Explosions: small_splash - ImpactSound: splash9.aud + ImpactSounds: splash9.aud ValidImpactTypes: Water diff --git a/mods/ra/weapons/missiles.yaml b/mods/ra/weapons/missiles.yaml index 5ce65a87c7..9ce108f12d 100644 --- a/mods/ra/weapons/missiles.yaml +++ b/mods/ra/weapons/missiles.yaml @@ -29,11 +29,11 @@ Maverick: SmudgeType: Crater Warhead@3Eff: CreateEffect Explosions: med_explosion - ImpactSound: kaboom25.aud + ImpactSounds: kaboom25.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect Explosions: med_splash - ImpactSound: splash9.aud + ImpactSounds: splash9.aud ValidImpactTypes: Water Dragon: @@ -66,11 +66,11 @@ Dragon: SmudgeType: Crater Warhead@3Eff: CreateEffect Explosions: med_explosion - ImpactSound: kaboom25.aud + ImpactSounds: kaboom25.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect Explosions: med_splash - ImpactSound: splash9.aud + ImpactSounds: splash9.aud ValidImpactTypes: Water HellfireAG: @@ -104,11 +104,11 @@ HellfireAG: SmudgeType: Crater Warhead@3Eff: CreateEffect Explosions: med_explosion - ImpactSound: kaboom25.aud + ImpactSounds: kaboom25.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect Explosions: med_splash - ImpactSound: splash9.aud + ImpactSounds: splash9.aud ValidImpactTypes: Water HellfireAA: @@ -142,11 +142,11 @@ HellfireAA: SmudgeType: Crater Warhead@3Eff: CreateEffect Explosions: med_explosion_air - ImpactSound: kaboom25.aud + ImpactSounds: kaboom25.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect Explosions: med_splash - ImpactSound: splash9.aud + ImpactSounds: splash9.aud ValidImpactTypes: Water MammothTusk: @@ -178,15 +178,15 @@ MammothTusk: SmudgeType: Crater Warhead@3EffGround: CreateEffect Explosions: med_explosion - ImpactSound: kaboom12.aud + ImpactSounds: kaboom12.aud InvalidImpactTypes: Water, Air, AirHit Warhead@4EffWater: CreateEffect Explosions: small_splash - ImpactSound: splash9.aud + ImpactSounds: splash9.aud ValidImpactTypes: Water Warhead@5EffAir: CreateEffect Explosions: med_explosion_air - ImpactSound: kaboom25.aud + ImpactSounds: kaboom25.aud ValidImpactTypes: Air, AirHit Nike: @@ -215,7 +215,7 @@ Nike: SmudgeType: Crater Warhead@3Eff: CreateEffect Explosions: med_explosion_air - ImpactSound: kaboom25.aud + ImpactSounds: kaboom25.aud RedEye: ReloadDelay: 50 @@ -244,7 +244,7 @@ RedEye: SmudgeType: Crater Warhead@3Eff: CreateEffect Explosions: med_explosion_air - ImpactSound: kaboom25.aud + ImpactSounds: kaboom25.aud SubMissile: ReloadDelay: 300 @@ -272,11 +272,11 @@ SubMissile: SmudgeType: Crater Warhead@3Eff: CreateEffect Explosions: artillery_explosion - ImpactSound: kaboom15.aud + ImpactSounds: kaboom15.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect Explosions: large_splash - ImpactSound: splash9.aud + ImpactSounds: splash9.aud ValidImpactTypes: Water Stinger: @@ -308,15 +308,15 @@ Stinger: SmudgeType: Crater Warhead@3Eff: CreateEffect Explosions: med_explosion - ImpactSound: kaboom25.aud + ImpactSounds: kaboom25.aud InvalidImpactTypes: Water, Air, AirHit Warhead@5EffAir: CreateEffect Explosions: med_explosion_air - ImpactSound: kaboom25.aud + ImpactSounds: kaboom25.aud ValidImpactTypes: Air, AirHit Warhead@4EffWater: CreateEffect Explosions: med_splash - ImpactSound: splash9.aud + ImpactSounds: splash9.aud ValidImpactTypes: Water StingerAA: @@ -348,15 +348,15 @@ StingerAA: SmudgeType: Crater Warhead@3Eff: CreateEffect Explosions: med_explosion - ImpactSound: kaboom25.aud + ImpactSounds: kaboom25.aud InvalidImpactTypes: Water, Air, AirHit Warhead@5EffAir: CreateEffect Explosions: med_explosion_air - ImpactSound: kaboom25.aud + ImpactSounds: kaboom25.aud ValidImpactTypes: Air, AirHit Warhead@4EffWater: CreateEffect Explosions: med_splash - ImpactSound: splash9.aud + ImpactSounds: splash9.aud ValidImpactTypes: Water TorpTube: @@ -389,15 +389,15 @@ TorpTube: SmudgeType: Crater Warhead@3Eff: CreateEffect Explosions: large_explosion - ImpactSound: kaboom15.aud + ImpactSounds: kaboom15.aud InvalidImpactTypes: Water, WaterHit Warhead@4EffWaterHit: CreateEffect Explosions: artillery_explosion - ImpactSound: kaboom15.aud + ImpactSounds: kaboom15.aud ValidImpactTypes: WaterHit Warhead@5EffWater: CreateEffect Explosions: large_splash - ImpactSound: splash9.aud + ImpactSounds: splash9.aud ValidImpactTypes: Water SCUD: @@ -428,11 +428,11 @@ SCUD: SmudgeType: Crater Warhead@3Eff: CreateEffect Explosions: napalm - ImpactSound: firebl3.aud + ImpactSounds: firebl3.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect Explosions: large_splash - ImpactSound: splash9.aud + ImpactSounds: splash9.aud ValidImpactTypes: Water APTusk: @@ -464,9 +464,9 @@ APTusk: SmudgeType: Crater Warhead@3Eff: CreateEffect Explosions: med_explosion - ImpactSound: kaboom25.aud + ImpactSounds: kaboom25.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect Explosions: med_splash - ImpactSound: splash9.aud + ImpactSounds: splash9.aud ValidImpactTypes: Water diff --git a/mods/ra/weapons/other.yaml b/mods/ra/weapons/other.yaml index e510ec5883..2f9a7f6e42 100644 --- a/mods/ra/weapons/other.yaml +++ b/mods/ra/weapons/other.yaml @@ -21,7 +21,7 @@ FireballLauncher: SmudgeType: Scorch Warhead@3Eff: CreateEffect Explosions: napalm - ImpactSound: firebl3.aud + ImpactSounds: firebl3.aud Flamer: ReloadDelay: 50 @@ -48,7 +48,7 @@ Flamer: SmudgeType: Scorch Warhead@3Eff: CreateEffect Explosions: small_napalm - ImpactSound: firebl3.aud + ImpactSounds: firebl3.aud Napalm: ReloadDelay: 20 @@ -70,11 +70,11 @@ Napalm: SmudgeType: Scorch Warhead@3Eff: CreateEffect Explosions: napalm - ImpactSound: firebl3.aud + ImpactSounds: firebl3.aud InvalidImpactTypes: Water Warhead@4Eff: CreateEffect Explosions: med_splash - ImpactSound: splash9.aud + ImpactSounds: splash9.aud ValidImpactTypes: Water Grenade: @@ -100,11 +100,11 @@ Grenade: SmudgeType: Crater Warhead@3Eff: CreateEffect Explosions: med_explosion - ImpactSound: kaboom25.aud + ImpactSounds: kaboom25.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect Explosions: small_splash - ImpactSound: splash9.aud + ImpactSounds: splash9.aud ValidImpactTypes: Water DepthCharge: @@ -131,10 +131,10 @@ DepthCharge: SmudgeType: Crater Warhead@3Eff: CreateEffect Explosions: large_splash - ImpactSound: h2obomb2.aud + ImpactSounds: h2obomb2.aud Warhead@4EffHit: CreateEffect Explosions: small_explosion - ImpactSound: kaboom15.aud + ImpactSounds: kaboom15.aud ValidImpactTypes: WaterHit TeslaZap: @@ -216,14 +216,14 @@ Crush: Damage: 100 DamageTypes: Prone50Percent, TriggerProne, DefaultDeath Warhead@2Eff: CreateEffect - ImpactSound: squishy2.aud + ImpactSounds: squishy2.aud Demolish: Warhead@1Dam: SpreadDamage DamageTypes: DefaultDeath Warhead@2Eff: CreateEffect Explosions: building - ImpactSound: kaboom25.aud + ImpactSounds: kaboom25.aud Claw: ReloadDelay: 30 @@ -275,4 +275,4 @@ MADTankDetonate: Size: 7,6 Warhead@3Eff: CreateEffect Explosions: med_explosion - ImpactSound: mineblo1.aud + ImpactSounds: mineblo1.aud diff --git a/mods/ra/weapons/superweapons.yaml b/mods/ra/weapons/superweapons.yaml index b7dab7edd2..71861e544f 100644 --- a/mods/ra/weapons/superweapons.yaml +++ b/mods/ra/weapons/superweapons.yaml @@ -20,11 +20,11 @@ ParaBomb: SmudgeType: Crater Warhead@3Eff: CreateEffect Explosions: artillery_explosion - ImpactSound: kaboom15.aud + ImpactSounds: kaboom15.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect Explosions: small_splash - ImpactSound: splash9.aud + ImpactSounds: splash9.aud ValidImpactTypes: Water Atomic: @@ -44,7 +44,7 @@ Atomic: Size: 1 Warhead@4Eff_impact: CreateEffect Explosions: nuke - ImpactSound: kaboom1.aud + ImpactSounds: kaboom1.aud Warhead@5Dam_areanuke1: SpreadDamage Spread: 2c0 Damage: 60 @@ -62,7 +62,7 @@ Atomic: Size: 2 Delay: 5 Warhead@8Eff_areanuke1: CreateEffect - ImpactSound: kaboom22.aud + ImpactSounds: kaboom22.aud Delay: 5 Warhead@9Dam_areanuke2: SpreadDamage Spread: 3c0 diff --git a/mods/ts/rules/nod-vehicles.yaml b/mods/ts/rules/nod-vehicles.yaml index 0effe4bcb3..ef97ad2347 100644 --- a/mods/ts/rules/nod-vehicles.yaml +++ b/mods/ts/rules/nod-vehicles.yaml @@ -163,7 +163,7 @@ REPAIR: AttackFrontal: Voice: Attack Selectable: - Priority: 5 + Priority: 5 WEED: Inherits: ^VoxelTank diff --git a/mods/ts/weapons/bombsandgrenades.yaml b/mods/ts/weapons/bombsandgrenades.yaml index 2d55dab8a6..97b1033a5a 100644 --- a/mods/ts/weapons/bombsandgrenades.yaml +++ b/mods/ts/weapons/bombsandgrenades.yaml @@ -20,12 +20,12 @@ Grenade: DamageTypes: Prone70Percent, TriggerProne, ExplosionDeath Warhead@2Eff: CreateEffect Explosions: large_grey_explosion - ImpactSound: expnew13.aud + ImpactSounds: expnew13.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect Explosions: small_watersplash ExplosionPalette: player - ImpactSound: ssplash3.aud + ImpactSounds: ssplash3.aud ValidImpactTypes: Water Warhead@4Smu: LeaveSmudge SmudgeType: MediumCrater @@ -52,12 +52,12 @@ Bomb: DamageTypes: Prone100Percent, TriggerProne, ExplosionDeath Warhead@2Eff: CreateEffect Explosions: large_explosion - ImpactSound: expnew09.aud + ImpactSounds: expnew09.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect Explosions: small_watersplash ExplosionPalette: player - ImpactSound: ssplash3.aud + ImpactSounds: ssplash3.aud ValidImpactTypes: Water Warhead@4Smu: LeaveSmudge SmudgeType: MediumCrater @@ -85,12 +85,12 @@ RPGTower: DamageTypes: Prone70Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect Explosions: large_clsn - ImpactSound: expnew14.aud + ImpactSounds: expnew14.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect Explosions: small_watersplash ExplosionPalette: player - ImpactSound: ssplash2.aud + ImpactSounds: ssplash2.aud ValidImpactTypes: Water Warhead@4Smu: LeaveSmudge SmudgeType: MediumCrater diff --git a/mods/ts/weapons/energyweapons.yaml b/mods/ts/weapons/energyweapons.yaml index 576fd6d3ef..ad79e12516 100644 --- a/mods/ts/weapons/energyweapons.yaml +++ b/mods/ts/weapons/energyweapons.yaml @@ -124,12 +124,12 @@ CyCannon: DamageTypes: Prone350Percent, TriggerProne, EnergyDeath Warhead@2Eff: CreateEffect Explosions: large_bang - ImpactSound: expnew12.aud + ImpactSounds: expnew12.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect Explosions: small_watersplash ExplosionPalette: player - ImpactSound: ssplash3.aud + ImpactSounds: ssplash3.aud ValidImpactTypes: Water Warhead@4Smu: LeaveSmudge SmudgeType: SmallScorch @@ -161,12 +161,12 @@ Proton: DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath Warhead@2Eff: CreateEffect Explosions: small_bang - ImpactSound: expnew12.aud + ImpactSounds: expnew12.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect Explosions: small_watersplash ExplosionPalette: player - ImpactSound: ssplash3.aud + ImpactSounds: ssplash3.aud ValidImpactTypes: Water ObeliskLaserFire: diff --git a/mods/ts/weapons/explosions.yaml b/mods/ts/weapons/explosions.yaml index 40d06b9402..d2e3aabe9b 100644 --- a/mods/ts/weapons/explosions.yaml +++ b/mods/ts/weapons/explosions.yaml @@ -11,7 +11,7 @@ UnitExplode: DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect Explosions: large_twlt - ImpactSound: expnew09.aud + ImpactSounds: expnew09.aud UnitExplodeSmall: Warhead@1Dam: SpreadDamage @@ -25,7 +25,7 @@ UnitExplodeSmall: DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect Explosions: medium_brnl - ImpactSound: expnew13.aud + ImpactSounds: expnew13.aud TiberiumExplosion: Warhead@1Dam: SpreadDamage @@ -42,7 +42,7 @@ TiberiumExplosion: Size: 1,1 Warhead@3Eff: CreateEffect Explosions: large_explosion - ImpactSound: expnew09.aud + ImpactSounds: expnew09.aud SmallDebris: ReloadDelay: 60 diff --git a/mods/ts/weapons/largeguns.yaml b/mods/ts/weapons/largeguns.yaml index d64940ccea..cb692f0ec4 100644 --- a/mods/ts/weapons/largeguns.yaml +++ b/mods/ts/weapons/largeguns.yaml @@ -20,12 +20,12 @@ DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect Explosions: medium_clsn - ImpactSound: expnew14.aud + ImpactSounds: expnew14.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect Explosions: small_watersplash ExplosionPalette: player - ImpactSound: ssplash3.aud + ImpactSounds: ssplash3.aud ValidImpactTypes: Water Warhead@4Smu: LeaveSmudge SmudgeType: SmallCrater @@ -48,12 +48,12 @@ DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect Explosions: large_clsn - ImpactSound: expnew14.aud + ImpactSounds: expnew14.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect Explosions: small_watersplash ExplosionPalette: player - ImpactSound: ssplash3.aud + ImpactSounds: ssplash3.aud ValidImpactTypes: Water Warhead@4Smu: LeaveSmudge SmudgeType: MediumCrater @@ -82,12 +82,12 @@ DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect Explosions: medium_clsn - ImpactSound: expnew14.aud + ImpactSounds: expnew14.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect Explosions: small_watersplash ExplosionPalette: player - ImpactSound: ssplash3.aud + ImpactSounds: ssplash3.aud ValidImpactTypes: Water Warhead@4Smu: LeaveSmudge SmudgeType: MediumCrater @@ -116,12 +116,12 @@ DamageTypes: Prone100Percent, TriggerProne, ExplosionDeath Warhead@2Eff: CreateEffect Explosions: large_explosion - ImpactSound: expnew06.aud + ImpactSounds: expnew06.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect Explosions: small_watersplash ExplosionPalette: player - ImpactSound: ssplash2.aud + ImpactSounds: ssplash2.aud ValidImpactTypes: Water Warhead@4Smu: LeaveSmudge SmudgeType: MediumCrater diff --git a/mods/ts/weapons/missiles.yaml b/mods/ts/weapons/missiles.yaml index 034b3898fd..972dc7edfb 100644 --- a/mods/ts/weapons/missiles.yaml +++ b/mods/ts/weapons/missiles.yaml @@ -27,17 +27,17 @@ Bazooka: DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect Explosions: small_clsn - ImpactSound: expnew12.aud + ImpactSounds: expnew12.aud InvalidImpactTypes: Water, Air, AirHit Warhead@3EffWater: CreateEffect Explosions: small_watersplash ExplosionPalette: player - ImpactSound: ssplash3.aud + ImpactSounds: ssplash3.aud ValidImpactTypes: Water Warhead@4EffAir: CreateEffect ValidImpactTypes: Air, AirHit Explosions: tiny_twlt - ImpactSound: expnew05.aud + ImpactSounds: expnew05.aud Warhead@5Smu: LeaveSmudge SmudgeType: SmallCrater @@ -71,17 +71,17 @@ HoverMissile: DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect Explosions: small_clsn - ImpactSound: expnew12.aud + ImpactSounds: expnew12.aud InvalidImpactTypes: Water, Air, AirHit Warhead@3EffWater: CreateEffect Explosions: small_watersplash ExplosionPalette: player - ImpactSound: ssplash3.aud + ImpactSounds: ssplash3.aud ValidImpactTypes: Water Warhead@4EffAir: CreateEffect Explosions: small_twlt ValidImpactTypes: Air, AirHit - ImpactSound: expnew06.aud + ImpactSounds: expnew06.aud Warhead@5: LeaveSmudge SmudgeType: SmallCrater @@ -114,12 +114,12 @@ MammothTusk: DamageTypes: Explosion Warhead@2Eff: CreateEffect Explosions: medium_twlt - ImpactSound: expnew07.aud + ImpactSounds: expnew07.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect Explosions: small_watersplash ExplosionPalette: player - ImpactSound: ssplash3.aud + ImpactSounds: ssplash3.aud ValidImpactTypes: Water BikeMissile: @@ -153,12 +153,12 @@ BikeMissile: DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect Explosions: small_clsn - ImpactSound: expnew12.aud + ImpactSounds: expnew12.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect Explosions: small_watersplash ExplosionPalette: player - ImpactSound: ssplash3.aud + ImpactSounds: ssplash3.aud ValidImpactTypes: Water Warhead@4Smu: LeaveSmudge SmudgeType: SmallCrater @@ -193,17 +193,17 @@ Dragon: DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect Explosions: small_clsn - ImpactSound: expnew12.aud + ImpactSounds: expnew12.aud InvalidImpactTypes: Water, Air, AirHit Warhead@3EffWater: CreateEffect Explosions: small_watersplash ExplosionPalette: player - ImpactSound: ssplash3.aud + ImpactSounds: ssplash3.aud ValidImpactTypes: Water Warhead@4EffAir: CreateEffect Explosions: small_twlt ValidImpactTypes: Air, AirHit - ImpactSound: expnew06.aud + ImpactSounds: expnew06.aud Warhead@5Smu: LeaveSmudge SmudgeType: SmallCrater @@ -237,17 +237,17 @@ Hellfire: DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect Explosions: small_clsn - ImpactSound: expnew12.aud + ImpactSounds: expnew12.aud InvalidImpactTypes: Water, Air, AirHit Warhead@3EffWater: CreateEffect Explosions: small_watersplash ExplosionPalette: player - ImpactSound: ssplash3.aud + ImpactSounds: ssplash3.aud ValidImpactTypes: Water Warhead@4EffAir: CreateEffect Explosions: small_twlt ValidImpactTypes: Air, AirHit - ImpactSound: expnew06.aud + ImpactSounds: expnew06.aud Warhead@5Smu: LeaveSmudge SmudgeType: SmallCrater @@ -274,4 +274,4 @@ RedEye2: DamageTypes: SmallExplosionDeath Warhead@2Eff: CreateEffect Explosions: tiny_twlt - ImpactSound: expnew05.aud + ImpactSounds: expnew05.aud diff --git a/mods/ts/weapons/otherweapons.yaml b/mods/ts/weapons/otherweapons.yaml index 4d288575d2..7aab314efc 100644 --- a/mods/ts/weapons/otherweapons.yaml +++ b/mods/ts/weapons/otherweapons.yaml @@ -43,7 +43,7 @@ FiendShard: Warhead@3EffWater: CreateEffect Explosions: small_watersplash ExplosionPalette: player - ImpactSound: ssplash3.aud + ImpactSounds: ssplash3.aud ValidImpactTypes: Water SlimeAttack: diff --git a/mods/ts/weapons/superweapons.yaml b/mods/ts/weapons/superweapons.yaml index 6b9a1312a5..141cd562da 100644 --- a/mods/ts/weapons/superweapons.yaml +++ b/mods/ts/weapons/superweapons.yaml @@ -26,12 +26,12 @@ MultiCluster: DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath Warhead@2Eff: CreateEffect Explosions: large_explosion - ImpactSound: expnew09.aud + ImpactSounds: expnew09.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect Explosions: small_watersplash ExplosionPalette: player - ImpactSound: ssplash2.aud + ImpactSounds: ssplash2.aud ValidImpactTypes: Water Warhead@4Smu: LeaveSmudge SmudgeType: MediumCrater @@ -62,7 +62,7 @@ IonCannon: DamageTypes: Prone100Percent, TriggerProne, EnergyDeath Warhead@2Eff_impact: CreateEffect Explosions: ionring - ImpactSound: ion1.aud + ImpactSounds: ion1.aud Warhead@3Dam_area: SpreadDamage Spread: 1c0 Damage: 250 @@ -104,7 +104,7 @@ ClusterMissile: DamageTypes: Prone50Percent, TriggerProne, FireDeath Warhead@SoundEffect0: CreateEffect Explosions: large_explosion - ImpactSound: expnew19.aud + ImpactSounds: expnew19.aud Warhead@ResourceDestruction0: DestroyResource Size: 1 Warhead@ClusterSmudges0: LeaveSmudge From 6913ac29e650d1725b9a9e629fb161d3f7fb85a7 Mon Sep 17 00:00:00 2001 From: Pavel Penev Date: Sun, 31 Jan 2016 16:20:41 +0200 Subject: [PATCH 3/3] Clean up some dead YAML from Fort Lonestar and Drop Zone W weapons definitions There haven't been WaterExplosion and WaterImpactSound properties on CreateEffectWarhead for quite a while. --- mods/ra/maps/drop-zone-w/map.yaml | 18 ++++++++++++------ mods/ra/maps/fort-lonestar/map.yaml | 12 +++++------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/mods/ra/maps/drop-zone-w/map.yaml b/mods/ra/maps/drop-zone-w/map.yaml index 7deb501c42..f21f44374e 100644 --- a/mods/ra/maps/drop-zone-w/map.yaml +++ b/mods/ra/maps/drop-zone-w/map.yaml @@ -290,10 +290,13 @@ Weapons: DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@1Eff: CreateEffect Explosions: large_explosion - WaterExplosion: large_splash ImpactSounds: kaboom12.aud - WaterImpactSound: splash9.aud - Warhead@2Smu: LeaveSmudge + ValidImpactTypes: Ground + Warhead@2Eff: CreateEffect + Explosions: large_splash + ImpactSounds: splash9.aud + ValidImpactTypes: Water + Warhead@3Smu: LeaveSmudge SmudgeType: Crater SubMissile: ReloadDelay: 250 @@ -318,10 +321,13 @@ Weapons: DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath Warhead@1Eff: CreateEffect Explosions: large_explosion - WaterExplosion: large_splash ImpactSounds: kaboom12.aud - WaterImpactSound: splash9.aud - Warhead@2Smu: LeaveSmudge + ValidImpactTypes: Ground + Warhead@2Eff: CreateEffect + Explosions: large_splash + ImpactSounds: splash9.aud + ValidImpactTypes: Water + Warhead@3Smu: LeaveSmudge SmudgeType: Crater Voices: diff --git a/mods/ra/maps/fort-lonestar/map.yaml b/mods/ra/maps/fort-lonestar/map.yaml index 2f0ceb9343..d5a03e5708 100644 --- a/mods/ra/maps/fort-lonestar/map.yaml +++ b/mods/ra/maps/fort-lonestar/map.yaml @@ -817,7 +817,6 @@ Weapons: SmudgeType: Crater Warhead@3Eff: CreateEffect Explosions: self_destruct - WaterExplosion: self_destruct MammothTusk: ReloadDelay: 300 Range: 10c0 @@ -851,7 +850,6 @@ Weapons: SmudgeType: Crater Warhead@3Eff: CreateEffect Explosions: nuke - WaterExplosion: nuke TankNapalm: ReloadDelay: 40 Range: 8c0 @@ -880,7 +878,6 @@ Weapons: SmudgeType: Scorch Warhead@3Eff: CreateEffect Explosions: small_explosion - WaterExplosion: small_explosion ImpactSounds: firebl3.aud ParaBomb: ReloadDelay: 5 @@ -903,7 +900,6 @@ Weapons: Warhead@3Eff: CreateEffect Explosions: napalm ImpactSounds: firebl3.aud - WaterExplosion: napalm 155mm: ReloadDelay: 10 Range: 7c5 @@ -932,7 +928,6 @@ Weapons: SmudgeType: Scorch Warhead@3Eff: CreateEffect Explosions: small_napalm - WaterExplosion: small_napalm ImpactSounds: firebl3.aud FLAK-23: ReloadDelay: 10 @@ -985,9 +980,12 @@ Weapons: SmudgeType: Crater Warhead@3Eff: CreateEffect Explosions: nuke - WaterExplosion: large_splash ImpactSounds: kaboom1.aud - WaterImpactSound: kaboom1.aud + ValidImpactTypes: Ground + Warhead@4Eff: CreateEffect + Explosions: large_splash + ImpactSounds: kaboom1.aud + ValidImpactTypes: Water SilencedPPK: ReloadDelay: 80 Range: 25c0