From 489ee9fc546075c519c0a6e75bce6e4b0b3ee95d Mon Sep 17 00:00:00 2001 From: Pavel Penev Date: Sat, 2 Jan 2016 16:48:45 +0200 Subject: [PATCH] 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