diff --git a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs index 0a7f3929a6..5a9475ad5e 100644 --- a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs +++ b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs @@ -3432,6 +3432,23 @@ 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"; + + // Add support for multiple impact sounds to CreateEffectWarhead + var impactSoundNode = node.Value.Nodes.FirstOrDefault(x => x.Key == "ImpactSound"); + if (impactSoundNode != null) + impactSoundNode.Key = "ImpactSounds"; + } + } + 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..6f88eb7eaf 100644 --- a/OpenRA.Mods.Common/Warheads/CreateEffectWarhead.cs +++ b/OpenRA.Mods.Common/Warheads/CreateEffectWarhead.cs @@ -17,17 +17,17 @@ 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; - [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; @@ -99,11 +99,13 @@ 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); + 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 c86de10018..d6f2be7e53 100644 --- a/mods/cnc/weapons/explosions.yaml +++ b/mods/cnc/weapons/explosions.yaml @@ -4,8 +4,8 @@ FlametankExplode: Damage: 100 DamageTypes: Prone50Percent, TriggerProne, FireDeath Warhead@2Eff: CreateEffect - Explosion: big_napalm - ImpactSound: xplobig6.aud + Explosions: big_napalm + ImpactSounds: xplobig6.aud HeliCrash: Warhead@1Dam: SpreadDamage @@ -13,15 +13,15 @@ HeliCrash: Damage: 40 DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath Warhead@2Eff: CreateEffect - Explosion: poof - ImpactSound: xplos.aud + Explosions: poof + ImpactSounds: xplos.aud HeliExplode: Warhead@1Dam: SpreadDamage DamageTypes: ExplosionDeath Warhead@2Eff: CreateEffect - Explosion: small_building - ImpactSound: xplos.aud + Explosions: small_building + ImpactSounds: xplos.aud UnitExplode: Warhead@1Dam: SpreadDamage @@ -34,8 +34,8 @@ UnitExplode: Heavy: 25 DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath Warhead@2Eff: CreateEffect - Explosion: poof - ImpactSound: xplobig6.aud + Explosions: poof + ImpactSounds: xplobig6.aud UnitExplodeSmall: Warhead@1Dam: SpreadDamage @@ -48,8 +48,8 @@ UnitExplodeSmall: Heavy: 25 DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath Warhead@2Eff: CreateEffect - Explosion: big_frag - ImpactSound: xplobig4.aud + Explosions: big_frag + ImpactSounds: xplobig4.aud GrenadierExplode: Warhead@1Dam: SpreadDamage @@ -62,8 +62,8 @@ GrenadierExplode: Heavy: 25 DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect - Explosion: poof - ImpactSound: xplosml2.aud + Explosions: poof + ImpactSounds: xplosml2.aud Napalm.Crate: Warhead@1Dam: SpreadDamage @@ -80,5 +80,5 @@ Napalm.Crate: Warhead@2Smu: LeaveSmudge SmudgeType: Scorch Warhead@3Eff: CreateEffect - Explosion: med_napalm - ImpactSound: flamer2.aud + Explosions: med_napalm + ImpactSounds: flamer2.aud diff --git a/mods/cnc/weapons/largecaliber.yaml b/mods/cnc/weapons/largecaliber.yaml index f383c8bd63..f6992c60a4 100644 --- a/mods/cnc/weapons/largecaliber.yaml +++ b/mods/cnc/weapons/largecaliber.yaml @@ -18,8 +18,8 @@ Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: small_frag - ImpactSound: xplos.aud + Explosions: small_frag + ImpactSounds: xplos.aud 105mm: ReloadDelay: 50 @@ -40,8 +40,8 @@ Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: small_frag - ImpactSound: xplos.aud + Explosions: small_frag + ImpactSounds: xplos.aud 120mm: ReloadDelay: 40 @@ -63,8 +63,8 @@ Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: small_frag - ImpactSound: xplos.aud + Explosions: small_frag + ImpactSounds: xplos.aud 120mmDual: ReloadDelay: 40 @@ -88,8 +88,8 @@ Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: small_frag - ImpactSound: xplos.aud + Explosions: small_frag + ImpactSounds: xplos.aud TurretGun: ReloadDelay: 20 @@ -110,8 +110,8 @@ TurretGun: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: small_frag - ImpactSound: xplos.aud + Explosions: small_frag + ImpactSounds: xplos.aud ArtilleryShell: ReloadDelay: 65 @@ -137,5 +137,5 @@ ArtilleryShell: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: poof - ImpactSound: XPLOSML2.AUD + Explosions: poof + ImpactSounds: XPLOSML2.AUD diff --git a/mods/cnc/weapons/missiles.yaml b/mods/cnc/weapons/missiles.yaml index 6b8d129ea7..b60346c36d 100644 --- a/mods/cnc/weapons/missiles.yaml +++ b/mods/cnc/weapons/missiles.yaml @@ -28,8 +28,8 @@ Rockets: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: small_frag - ImpactSound: xplos.aud + Explosions: small_frag + ImpactSounds: xplos.aud BikeRockets: ReloadDelay: 50 @@ -62,8 +62,8 @@ BikeRockets: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: small_frag - ImpactSound: xplos.aud + Explosions: small_frag + ImpactSounds: xplos.aud OrcaAGMissiles: ReloadDelay: 12 @@ -96,8 +96,8 @@ OrcaAGMissiles: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: small_frag - ImpactSound: xplos.aud + Explosions: small_frag + ImpactSounds: xplos.aud OrcaAAMissiles: ReloadDelay: 12 @@ -128,8 +128,8 @@ OrcaAAMissiles: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: small_frag - ImpactSound: xplos.aud + Explosions: small_frag + ImpactSounds: xplos.aud MammothMissiles: ReloadDelay: 45 @@ -161,12 +161,12 @@ MammothMissiles: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: small_poof - ImpactSound: xplos.aud + Explosions: small_poof + ImpactSounds: xplos.aud InvalidImpactTypes: Air, AirHit Warhead@4EffAir: CreateEffect - Explosion: small_building - ImpactSound: xplos.aud + Explosions: small_building + ImpactSounds: xplos.aud ValidImpactTypes: Air, AirHit 227mm: @@ -201,8 +201,8 @@ MammothMissiles: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: med_frag - ImpactSound: xplos.aud + Explosions: med_frag + ImpactSounds: xplos.aud 227mm.stnk: ReloadDelay: 70 @@ -234,8 +234,8 @@ MammothMissiles: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: small_frag - ImpactSound: xplos.aud + Explosions: small_frag + ImpactSounds: xplos.aud BoatMissile: ReloadDelay: 35 @@ -265,12 +265,12 @@ BoatMissile: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: small_poof - ImpactSound: xplos.aud + Explosions: small_poof + ImpactSounds: xplos.aud InvalidImpactTypes: Air, AirHit Warhead@4EffAir: CreateEffect - Explosion: small_building - ImpactSound: xplos.aud + Explosions: small_building + ImpactSounds: xplos.aud ValidImpactTypes: Air, AirHit TowerMissle: @@ -301,8 +301,8 @@ TowerMissle: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: med_frag - ImpactSound: xplos.aud + Explosions: med_frag + ImpactSounds: xplos.aud SAMMissile: ReloadDelay: 15 @@ -331,8 +331,8 @@ SAMMissile: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: small_building - ImpactSound: xplos.aud + Explosions: small_building + ImpactSounds: xplos.aud HonestJohn: ReloadDelay: 200 @@ -360,8 +360,8 @@ HonestJohn: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: small_poof - ImpactSound: xplos.aud + Explosions: small_poof + ImpactSounds: xplos.aud Patriot: ReloadDelay: 25 @@ -387,5 +387,5 @@ Patriot: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: poof - ImpactSound: xplos.aud + Explosions: poof + ImpactSounds: xplos.aud diff --git a/mods/cnc/weapons/other.yaml b/mods/cnc/weapons/other.yaml index b23274c1b7..d255ef95c1 100644 --- a/mods/cnc/weapons/other.yaml +++ b/mods/cnc/weapons/other.yaml @@ -18,8 +18,8 @@ Flamethrower: Warhead@2Smu: LeaveSmudge SmudgeType: Scorch Warhead@3Eff: CreateEffect - Explosion: small_napalm - ImpactSound: flamer2.aud + Explosions: small_napalm + ImpactSounds: flamer2.aud BigFlamer: ReloadDelay: 50 @@ -43,8 +43,8 @@ BigFlamer: Warhead@2Smu: LeaveSmudge SmudgeType: Scorch Warhead@3Eff: CreateEffect - Explosion: med_napalm - ImpactSound: flamer2.aud + Explosions: med_napalm + ImpactSounds: flamer2.aud Chemspray: ReloadDelay: 65 @@ -64,8 +64,8 @@ Chemspray: Warhead@2Smu: LeaveSmudge SmudgeType: Scorch Warhead@3Eff: CreateEffect - Explosion: chemball - ImpactSound: xplos.aud + Explosions: chemball + ImpactSounds: xplos.aud Grenade: ReloadDelay: 50 @@ -89,8 +89,8 @@ Grenade: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: small_poof - ImpactSound: xplos.aud + Explosions: small_poof + ImpactSounds: xplos.aud Napalm: ValidTargets: Ground, Water @@ -114,8 +114,8 @@ Napalm: Warhead@2Smu: LeaveSmudge SmudgeType: Scorch Warhead@3Eff: CreateEffect - Explosion: med_napalm - ImpactSound: flamer2.aud + Explosions: med_napalm + ImpactSounds: flamer2.aud Laser: ReloadDelay: 1 @@ -155,8 +155,8 @@ TiberiumExplosion: AddsResourceType: Tiberium Size: 1,1 Warhead@3Eff: CreateEffect - Explosion: chemball - ImpactSound: xplosml2.aud + Explosions: chemball + ImpactSounds: xplosml2.aud Heal: ReloadDelay: 4 @@ -236,5 +236,5 @@ Demolish: Warhead@1Dam: SpreadDamage DamageTypes: DefaultDeath Warhead@2Eff: CreateEffect - Explosion: building - ImpactSound: xplobig6.aud + Explosions: building + ImpactSounds: 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..e40d0c2127 100644 --- a/mods/cnc/weapons/superweapons.yaml +++ b/mods/cnc/weapons/superweapons.yaml @@ -13,8 +13,8 @@ Atomic: Heavy: 50 DamageTypes: Prone50Percent, TriggerProne, FireDeath Warhead@2Eff_impact: CreateEffect - Explosion: nuke_explosion - ImpactSound: nukexplo.aud + Explosions: nuke_explosion + 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 b85684ad94..a689ee70b6 100644 --- a/mods/d2k/weapons/debris.yaml +++ b/mods/d2k/weapons/debris.yaml @@ -26,8 +26,8 @@ Debris: Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater Warhead@3Eff: CreateEffect - Explosion: small_explosion - ImpactSound: EXPLLG5.WAV + Explosions: small_explosion + ImpactSounds: EXPLLG5.WAV Debris2: ReloadDelay: 60 @@ -60,8 +60,8 @@ Debris2: Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater Warhead@3Eff: CreateEffect - Explosion: med_explosion - ImpactSound: EXPLLG5.WAV + Explosions: med_explosion + ImpactSounds: EXPLLG5.WAV Debris3: ReloadDelay: 60 @@ -94,8 +94,8 @@ Debris3: Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater Warhead@3Eff: CreateEffect - Explosion: med_explosion - ImpactSound: EXPLLG5.WAV + Explosions: med_explosion + ImpactSounds: EXPLLG5.WAV Debris4: ReloadDelay: 60 @@ -128,5 +128,5 @@ Debris4: Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater Warhead@3Eff: CreateEffect - Explosion: large_explosion - ImpactSound: EXPLLG5.WAV + Explosions: large_explosion + ImpactSounds: EXPLLG5.WAV diff --git a/mods/d2k/weapons/largeguns.yaml b/mods/d2k/weapons/largeguns.yaml index 54846b65d9..105bd06e96 100644 --- a/mods/d2k/weapons/largeguns.yaml +++ b/mods/d2k/weapons/largeguns.yaml @@ -25,8 +25,8 @@ Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect - Explosion: small_napalm - ImpactSound: EXPLSML4.WAV + Explosions: small_napalm + ImpactSounds: EXPLSML4.WAV 80mm_A: ReloadDelay: 50 @@ -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,8 +131,8 @@ DevBullet: Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect - Explosion: shockwave - ImpactSound: EXPLMD1.WAV + Explosions: shockwave + ImpactSounds: EXPLMD1.WAV 155mm: ReloadDelay: 80 @@ -162,5 +162,5 @@ DevBullet: Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect - Explosion: med_explosion - ImpactSound: EXPLMD2.WAV + Explosions: med_explosion + ImpactSounds: EXPLMD2.WAV diff --git a/mods/d2k/weapons/missiles.yaml b/mods/d2k/weapons/missiles.yaml index a6d506c016..2b23df7994 100644 --- a/mods/d2k/weapons/missiles.yaml +++ b/mods/d2k/weapons/missiles.yaml @@ -28,8 +28,8 @@ Bazooka: Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect - Explosion: tiny_explosion - ImpactSound: EXPLSML1.WAV + Explosions: tiny_explosion + ImpactSounds: EXPLSML1.WAV Rocket: ReloadDelay: 30 @@ -60,9 +60,9 @@ Rocket: Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect - Explosion: rocket_explosion + Explosions: rocket_explosion ExplosionPalette: effect75alpha - ImpactSound: EXPLSML1.WAV + ImpactSounds: EXPLSML1.WAV TowerMissile: ReloadDelay: 60 @@ -100,8 +100,8 @@ TowerMissile: Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect - Explosion: small_explosion - ImpactSound: EXPLSML1.WAV + Explosions: small_explosion + ImpactSounds: EXPLSML1.WAV mtank_pri: ReloadDelay: 115 @@ -138,8 +138,8 @@ mtank_pri: Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect - Explosion: small_explosion - ImpactSound: EXPLSML1.WAV + Explosions: small_explosion + ImpactSounds: EXPLSML1.WAV DeviatorMissile: ReloadDelay: 160 @@ -175,10 +175,10 @@ DeviatorMissile: Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect - Explosion: deviator + 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 d7fb2237c8..2e87345fef 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,22 +91,22 @@ OrniBomb: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: large_explosion - ImpactSound: NAPALM1.WAV + Explosions: large_explosion + 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 - Explosion: building - ImpactSound: EXPLLG2.WAV + Explosions: building + ImpactSounds: EXPLLG2.WAV Atomic: Warhead@1Dam: SpreadDamage @@ -125,8 +125,8 @@ Atomic: harvester: 60 DamageTypes: Prone50Percent, TriggerProne, SoundDeath Warhead@2Eff: CreateEffect - Explosion: nuke - ImpactSound: EXPLLG2.WAV + Explosions: nuke + ImpactSounds: EXPLLG2.WAV CrateNuke: Warhead@1Dam: SpreadDamage @@ -146,8 +146,8 @@ CrateNuke: AffectsParent: true DamageTypes: Prone50Percent, TriggerProne, SoundDeath Warhead@2Eff: CreateEffect - Explosion: nuke - ImpactSound: EXPLLG2.WAV + Explosions: nuke + ImpactSounds: EXPLLG2.WAV CrateExplosion: Warhead@1Dam: SpreadDamage @@ -167,23 +167,23 @@ CrateExplosion: AffectsParent: true DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect - Explosion: large_explosion - ImpactSound: EXPLSML4.WAV + Explosions: large_explosion + ImpactSounds: EXPLSML4.WAV UnitExplodeSmall: Warhead@1Eff: CreateEffect - Explosion: self_destruct - ImpactSound: EXPLSML1.WAV + Explosions: self_destruct + ImpactSounds: EXPLSML1.WAV UnitExplodeMed: Warhead@1Eff: CreateEffect - Explosion: building - ImpactSound: EXPLSML2.WAV + Explosions: building + ImpactSounds: EXPLSML2.WAV UnitExplodeLarge: Warhead@1Eff: CreateEffect - Explosion: large_explosion - ImpactSound: EXPLLG2.WAV + Explosions: large_explosion + ImpactSounds: EXPLLG2.WAV grenade: ReloadDelay: 50 @@ -211,8 +211,8 @@ grenade: Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater Warhead@3Eff: CreateEffect - Explosion: med_explosion - ImpactSound: EXPLLG5.WAV + Explosions: med_explosion + ImpactSounds: EXPLLG5.WAV Weathering: ReloadDelay: 100 @@ -236,8 +236,8 @@ GrenDeath: Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect - Explosion: building - ImpactSound: EXPLSML4.WAV + Explosions: building + ImpactSounds: EXPLSML4.WAV SardDeath: Warhead@1Dam: SpreadDamage @@ -257,8 +257,8 @@ SardDeath: Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect - Explosion: small_napalm - ImpactSound: EXPLSML2.WAV + Explosions: small_napalm + ImpactSounds: EXPLSML2.WAV SpiceExplosion: Projectile: Bullet @@ -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..9c031108e1 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,8 +42,8 @@ Fremen_S: harvester: 25 DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@2Eff: CreateEffect - Explosion: small_explosion - ImpactSound: EXPLSML2.WAV + Explosions: small_explosion + ImpactSounds: EXPLSML2.WAV M_LMG: ReloadDelay: 40 @@ -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..f21f44374e 100644 --- a/mods/ra/maps/drop-zone-w/map.yaml +++ b/mods/ra/maps/drop-zone-w/map.yaml @@ -289,11 +289,14 @@ Weapons: Damage: 250 DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@1Eff: CreateEffect - Explosion: large_explosion - WaterExplosion: large_splash - ImpactSound: kaboom12.aud - WaterImpactSound: splash9.aud - Warhead@2Smu: LeaveSmudge + Explosions: large_explosion + ImpactSounds: kaboom12.aud + ValidImpactTypes: Ground + Warhead@2Eff: CreateEffect + Explosions: large_splash + ImpactSounds: splash9.aud + ValidImpactTypes: Water + Warhead@3Smu: LeaveSmudge SmudgeType: Crater SubMissile: ReloadDelay: 250 @@ -317,11 +320,14 @@ Weapons: Damage: 400 DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath Warhead@1Eff: CreateEffect - Explosion: large_explosion - WaterExplosion: large_splash - ImpactSound: kaboom12.aud - WaterImpactSound: splash9.aud - Warhead@2Smu: LeaveSmudge + Explosions: large_explosion + ImpactSounds: kaboom12.aud + 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 3565eec41a..d5a03e5708 100644 --- a/mods/ra/maps/fort-lonestar/map.yaml +++ b/mods/ra/maps/fort-lonestar/map.yaml @@ -816,8 +816,7 @@ Weapons: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: self_destruct - WaterExplosion: self_destruct + Explosions: self_destruct MammothTusk: ReloadDelay: 300 Range: 10c0 @@ -850,8 +849,7 @@ Weapons: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: nuke - WaterExplosion: nuke + Explosions: nuke TankNapalm: ReloadDelay: 40 Range: 8c0 @@ -879,9 +877,8 @@ Weapons: Warhead@2Smu: LeaveSmudge SmudgeType: Scorch Warhead@3Eff: CreateEffect - Explosion: small_explosion - WaterExplosion: small_explosion - ImpactSound: firebl3.aud + Explosions: small_explosion + ImpactSounds: firebl3.aud ParaBomb: ReloadDelay: 5 Range: 5c0 @@ -901,9 +898,8 @@ Weapons: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: napalm - ImpactSound: firebl3.aud - WaterExplosion: napalm + Explosions: napalm + ImpactSounds: firebl3.aud 155mm: ReloadDelay: 10 Range: 7c5 @@ -931,9 +927,8 @@ Weapons: Warhead@2Smu: LeaveSmudge SmudgeType: Scorch Warhead@3Eff: CreateEffect - Explosion: small_napalm - WaterExplosion: small_napalm - ImpactSound: firebl3.aud + Explosions: small_napalm + ImpactSounds: firebl3.aud FLAK-23: ReloadDelay: 10 Range: 8c0 @@ -956,7 +951,7 @@ Weapons: Warhead@2Smu: LeaveSmudge SmudgeType: Scorch Warhead@3Eff: CreateEffect - Explosion: med_explosion + Explosions: med_explosion SCUD: ReloadDelay: 280 Range: 7c0 @@ -984,10 +979,13 @@ Weapons: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: nuke - WaterExplosion: large_splash - ImpactSound: kaboom1.aud - WaterImpactSound: kaboom1.aud + Explosions: nuke + ImpactSounds: kaboom1.aud + ValidImpactTypes: Ground + Warhead@4Eff: CreateEffect + Explosions: large_splash + ImpactSounds: kaboom1.aud + ValidImpactTypes: Water SilencedPPK: ReloadDelay: 80 Range: 25c0 @@ -1004,7 +1002,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..becb96fa45 100644 --- a/mods/ra/maps/soviet-02b/map.yaml +++ b/mods/ra/maps/soviet-02b/map.yaml @@ -670,8 +670,8 @@ Weapons: Size: 2,1 Delay: 5 Warhead@3Eff: CreateEffect - Explosion: napalm - ImpactSound: firebl3.aud + Explosions: napalm + 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 4a773b00d6..cfb20db954 100644 --- a/mods/ra/maps/soviet-03/map.yaml +++ b/mods/ra/maps/soviet-03/map.yaml @@ -1290,8 +1290,8 @@ Weapons: Size: 2,1 Delay: 5 Warhead@3Eff: CreateEffect - Explosion: napalm - ImpactSound: firebl3.aud + Explosions: napalm + 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 8d8f2b825c..4a861e2985 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,8 +918,8 @@ Weapons: Warhead@2Smu: LeaveSmudge SmudgeType: Scorch Warhead@3Eff: CreateEffect - Explosion: napalm - ImpactSound: firebl3.aud + Explosions: napalm + ImpactSounds: firebl3.aud MissionBarrelExplodeInterior: Warhead@1Dam: SpreadDamage Spread: 350 @@ -938,8 +938,8 @@ Weapons: Size: 2,1 Delay: 5 Warhead@3Eff: CreateEffect - Explosion: napalm - ImpactSound: firebl3.aud + Explosions: napalm + ImpactSounds: firebl3.aud Delay: 5 Voices: diff --git a/mods/ra/maps/survival02/map.yaml b/mods/ra/maps/survival02/map.yaml index 6d84cad992..a086d26648 100644 --- a/mods/ra/maps/survival02/map.yaml +++ b/mods/ra/maps/survival02/map.yaml @@ -1171,12 +1171,12 @@ Weapons: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: napalm - ImpactSound: firebl3.aud + Explosions: napalm + ImpactSounds: firebl3.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect - Explosion: napalm - ImpactSound: splash9.aud + Explosions: napalm + ImpactSounds: splash9.aud ValidImpactTypes: Water Voices: diff --git a/mods/ra/weapons/explosions.yaml b/mods/ra/weapons/explosions.yaml index 37123678c0..2493ea3b2d 100644 --- a/mods/ra/weapons/explosions.yaml +++ b/mods/ra/weapons/explosions.yaml @@ -13,8 +13,8 @@ CrateNapalm: Warhead@2Smu: LeaveSmudge SmudgeType: Scorch Warhead@3Eff: CreateEffect - Explosion: napalm - ImpactSound: firebl3.aud + Explosions: napalm + ImpactSounds: firebl3.aud CrateExplosion: Warhead@1Dam: SpreadDamage @@ -29,8 +29,8 @@ CrateExplosion: AffectsParent: true DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath Warhead@2Eff: CreateEffect - Explosion: self_destruct - ImpactSound: kaboom15.aud + Explosions: self_destruct + ImpactSounds: kaboom15.aud CrateNuke: Warhead@1Dam_impact: SpreadDamage @@ -44,8 +44,8 @@ CrateNuke: DamageTypes: Prone50Percent, TriggerProne, FireDeath Warhead@2Res_impact: DestroyResource Warhead@3Eff_impact: CreateEffect - Explosion: nuke - ImpactSound: kaboom1.aud + Explosions: nuke + 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: @@ -81,8 +81,8 @@ MiniNuke: Warhead@2Res_impact: DestroyResource Size: 1 Warhead@3Eff_impact: CreateEffect - Explosion: nuke - ImpactSound: kaboom1.aud + Explosions: nuke + 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 @@ -142,12 +142,12 @@ UnitExplode: Heavy: 25 DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath Warhead@2Eff: CreateEffect - Explosion: self_destruct - ImpactSound: kaboom22.aud + Explosions: self_destruct + ImpactSounds: kaboom22.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: large_splash - ImpactSound: splash9.aud + Explosions: large_splash + ImpactSounds: splash9.aud ValidImpactTypes: Water UnitExplodeShip: @@ -161,8 +161,8 @@ UnitExplodeShip: Heavy: 25 DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath Warhead@2Eff: CreateEffect - Explosion: building - ImpactSound: kaboom25.aud + Explosions: building + ImpactSounds: kaboom25.aud UnitExplodeSubmarine: Warhead@1Dam: SpreadDamage @@ -175,8 +175,8 @@ UnitExplodeSubmarine: Heavy: 25 DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath Warhead@2Eff: CreateEffect - Explosion: large_splash - ImpactSound: splash9.aud + Explosions: large_splash + ImpactSounds: splash9.aud UnitExplodeSmall: Warhead@1Dam: SpreadDamage @@ -189,12 +189,12 @@ UnitExplodeSmall: Heavy: 25 DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath Warhead@2Eff: CreateEffect - Explosion: large_explosion - ImpactSound: kaboom15.aud + Explosions: large_explosion + ImpactSounds: kaboom15.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: large_splash - ImpactSound: splash9.aud + Explosions: large_splash + ImpactSounds: splash9.aud ValidImpactTypes: Water ArtilleryExplode: @@ -208,12 +208,12 @@ ArtilleryExplode: Heavy: 25 DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath Warhead@2Eff: CreateEffect - Explosion: self_destruct - ImpactSound: kaboom22.aud + Explosions: self_destruct + ImpactSounds: kaboom22.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: large_splash - ImpactSound: splash9.aud + Explosions: large_splash + ImpactSounds: splash9.aud ValidImpactTypes: Water BarrelExplode: @@ -234,8 +234,8 @@ BarrelExplode: Size: 2,1 Delay: 5 Warhead@3Eff: CreateEffect - Explosion: napalm - ImpactSound: firebl3.aud + Explosions: napalm + ImpactSounds: firebl3.aud Delay: 5 ATMine: @@ -245,8 +245,8 @@ ATMine: AffectsParent: true DamageTypes: Prone50Percent, TriggerProne, DefaultDeath Warhead@2Eff: CreateEffect - Explosion: large_explosion - ImpactSound: mineblo1.aud + Explosions: large_explosion + ImpactSounds: mineblo1.aud APMine: Warhead@1Dam: SpreadDamage @@ -255,8 +255,8 @@ APMine: AffectsParent: true DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect - Explosion: napalm - ImpactSound: mine1.aud + Explosions: napalm + ImpactSounds: mine1.aud OreExplosion: Warhead@1Dam: SpreadDamage @@ -272,5 +272,5 @@ OreExplosion: AddsResourceType: Ore Size: 1,1 Warhead@3Eff: CreateEffect - Explosion: med_explosion - ImpactSound: kaboom25.aud + Explosions: med_explosion + ImpactSounds: kaboom25.aud diff --git a/mods/ra/weapons/largecaliber.yaml b/mods/ra/weapons/largecaliber.yaml index 852bc09d85..27aaa37286 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,12 +42,12 @@ Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3EffGround: CreateEffect - Explosion: small_explosion - ImpactSound: kaboom12.aud + Explosions: small_explosion + ImpactSounds: kaboom12.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect - Explosion: small_splash - ImpactSound: splash9.aud + Explosions: small_splash + ImpactSounds: splash9.aud ValidImpactTypes: Water 105mm: @@ -71,12 +71,12 @@ Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3EffGround: CreateEffect - Explosion: small_explosion - ImpactSound: kaboom12.aud + Explosions: small_explosion + ImpactSounds: kaboom12.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect - Explosion: small_splash - ImpactSound: splash9.aud + Explosions: small_splash + ImpactSounds: splash9.aud ValidImpactTypes: Water 120mm: @@ -101,12 +101,12 @@ Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3EffGround: CreateEffect - Explosion: small_explosion - ImpactSound: kaboom12.aud + Explosions: small_explosion + ImpactSounds: kaboom12.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect - Explosion: small_splash - ImpactSound: splash9.aud + Explosions: small_splash + ImpactSounds: splash9.aud ValidImpactTypes: Water TurretGun: @@ -128,12 +128,12 @@ TurretGun: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3EffGround: CreateEffect - Explosion: small_explosion - ImpactSound: kaboom12.aud + Explosions: small_explosion + ImpactSounds: kaboom12.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect - Explosion: small_splash - ImpactSound: splash9.aud + Explosions: small_splash + ImpactSounds: splash9.aud ValidImpactTypes: Water 155mm: @@ -161,12 +161,12 @@ TurretGun: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: artillery_explosion - ImpactSound: kaboom15.aud + Explosions: artillery_explosion + ImpactSounds: kaboom15.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect - Explosion: med_splash - ImpactSound: splash9.aud + Explosions: med_splash + ImpactSounds: splash9.aud ValidImpactTypes: Water 8Inch: @@ -194,12 +194,12 @@ TurretGun: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: artillery_explosion - ImpactSound: kaboom15.aud + Explosions: artillery_explosion + ImpactSounds: kaboom15.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect - Explosion: large_splash - ImpactSound: splash9.aud + Explosions: large_splash + ImpactSounds: splash9.aud ValidImpactTypes: Water 2Inch: @@ -221,10 +221,10 @@ TurretGun: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: small_explosion - ImpactSound: kaboom12.aud + Explosions: small_explosion + ImpactSounds: kaboom12.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect - Explosion: small_splash - ImpactSound: splash9.aud + Explosions: small_splash + ImpactSounds: splash9.aud ValidImpactTypes: Water diff --git a/mods/ra/weapons/missiles.yaml b/mods/ra/weapons/missiles.yaml index 4ee302a740..9ce108f12d 100644 --- a/mods/ra/weapons/missiles.yaml +++ b/mods/ra/weapons/missiles.yaml @@ -28,12 +28,12 @@ Maverick: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: med_explosion - ImpactSound: kaboom25.aud + Explosions: med_explosion + ImpactSounds: kaboom25.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect - Explosion: med_splash - ImpactSound: splash9.aud + Explosions: med_splash + ImpactSounds: splash9.aud ValidImpactTypes: Water Dragon: @@ -65,12 +65,12 @@ Dragon: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: med_explosion - ImpactSound: kaboom25.aud + Explosions: med_explosion + ImpactSounds: kaboom25.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect - Explosion: med_splash - ImpactSound: splash9.aud + Explosions: med_splash + ImpactSounds: splash9.aud ValidImpactTypes: Water HellfireAG: @@ -103,12 +103,12 @@ HellfireAG: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: med_explosion - ImpactSound: kaboom25.aud + Explosions: med_explosion + ImpactSounds: kaboom25.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect - Explosion: med_splash - ImpactSound: splash9.aud + Explosions: med_splash + ImpactSounds: splash9.aud ValidImpactTypes: Water HellfireAA: @@ -141,12 +141,12 @@ HellfireAA: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: med_explosion_air - ImpactSound: kaboom25.aud + Explosions: med_explosion_air + ImpactSounds: kaboom25.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect - Explosion: med_splash - ImpactSound: splash9.aud + Explosions: med_splash + ImpactSounds: splash9.aud ValidImpactTypes: Water MammothTusk: @@ -177,16 +177,16 @@ MammothTusk: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3EffGround: CreateEffect - Explosion: med_explosion - ImpactSound: kaboom12.aud + Explosions: med_explosion + ImpactSounds: kaboom12.aud InvalidImpactTypes: Water, Air, AirHit Warhead@4EffWater: CreateEffect - Explosion: small_splash - ImpactSound: splash9.aud + Explosions: small_splash + ImpactSounds: splash9.aud ValidImpactTypes: Water Warhead@5EffAir: CreateEffect - Explosion: med_explosion_air - ImpactSound: kaboom25.aud + Explosions: med_explosion_air + ImpactSounds: kaboom25.aud ValidImpactTypes: Air, AirHit Nike: @@ -214,8 +214,8 @@ Nike: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: med_explosion_air - ImpactSound: kaboom25.aud + Explosions: med_explosion_air + ImpactSounds: kaboom25.aud RedEye: ReloadDelay: 50 @@ -243,8 +243,8 @@ RedEye: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: med_explosion_air - ImpactSound: kaboom25.aud + Explosions: med_explosion_air + ImpactSounds: kaboom25.aud SubMissile: ReloadDelay: 300 @@ -271,12 +271,12 @@ SubMissile: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: artillery_explosion - ImpactSound: kaboom15.aud + Explosions: artillery_explosion + ImpactSounds: kaboom15.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect - Explosion: large_splash - ImpactSound: splash9.aud + Explosions: large_splash + ImpactSounds: splash9.aud ValidImpactTypes: Water Stinger: @@ -307,16 +307,16 @@ Stinger: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: med_explosion - ImpactSound: kaboom25.aud + Explosions: med_explosion + ImpactSounds: kaboom25.aud InvalidImpactTypes: Water, Air, AirHit Warhead@5EffAir: CreateEffect - Explosion: med_explosion_air - ImpactSound: kaboom25.aud + Explosions: med_explosion_air + ImpactSounds: kaboom25.aud ValidImpactTypes: Air, AirHit Warhead@4EffWater: CreateEffect - Explosion: med_splash - ImpactSound: splash9.aud + Explosions: med_splash + ImpactSounds: splash9.aud ValidImpactTypes: Water StingerAA: @@ -347,16 +347,16 @@ StingerAA: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: med_explosion - ImpactSound: kaboom25.aud + Explosions: med_explosion + ImpactSounds: kaboom25.aud InvalidImpactTypes: Water, Air, AirHit Warhead@5EffAir: CreateEffect - Explosion: med_explosion_air - ImpactSound: kaboom25.aud + Explosions: med_explosion_air + ImpactSounds: kaboom25.aud ValidImpactTypes: Air, AirHit Warhead@4EffWater: CreateEffect - Explosion: med_splash - ImpactSound: splash9.aud + Explosions: med_splash + ImpactSounds: splash9.aud ValidImpactTypes: Water TorpTube: @@ -388,16 +388,16 @@ TorpTube: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: large_explosion - ImpactSound: kaboom15.aud + Explosions: large_explosion + ImpactSounds: kaboom15.aud InvalidImpactTypes: Water, WaterHit Warhead@4EffWaterHit: CreateEffect - Explosion: artillery_explosion - ImpactSound: kaboom15.aud + Explosions: artillery_explosion + ImpactSounds: kaboom15.aud ValidImpactTypes: WaterHit Warhead@5EffWater: CreateEffect - Explosion: large_splash - ImpactSound: splash9.aud + Explosions: large_splash + ImpactSounds: splash9.aud ValidImpactTypes: Water SCUD: @@ -427,12 +427,12 @@ SCUD: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: napalm - ImpactSound: firebl3.aud + Explosions: napalm + ImpactSounds: firebl3.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect - Explosion: large_splash - ImpactSound: splash9.aud + Explosions: large_splash + ImpactSounds: splash9.aud ValidImpactTypes: Water APTusk: @@ -463,10 +463,10 @@ APTusk: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: med_explosion - ImpactSound: kaboom25.aud + Explosions: med_explosion + ImpactSounds: kaboom25.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect - Explosion: med_splash - ImpactSound: splash9.aud + Explosions: med_splash + ImpactSounds: splash9.aud ValidImpactTypes: Water diff --git a/mods/ra/weapons/other.yaml b/mods/ra/weapons/other.yaml index 8ed09086da..2f9a7f6e42 100644 --- a/mods/ra/weapons/other.yaml +++ b/mods/ra/weapons/other.yaml @@ -20,8 +20,8 @@ FireballLauncher: Warhead@2Smu: LeaveSmudge SmudgeType: Scorch Warhead@3Eff: CreateEffect - Explosion: napalm - ImpactSound: firebl3.aud + Explosions: napalm + ImpactSounds: firebl3.aud Flamer: ReloadDelay: 50 @@ -47,8 +47,8 @@ Flamer: Warhead@2Smu: LeaveSmudge SmudgeType: Scorch Warhead@3Eff: CreateEffect - Explosion: small_napalm - ImpactSound: firebl3.aud + Explosions: small_napalm + ImpactSounds: firebl3.aud Napalm: ReloadDelay: 20 @@ -69,12 +69,12 @@ Napalm: Warhead@2Smu: LeaveSmudge SmudgeType: Scorch Warhead@3Eff: CreateEffect - Explosion: napalm - ImpactSound: firebl3.aud + Explosions: napalm + ImpactSounds: firebl3.aud InvalidImpactTypes: Water Warhead@4Eff: CreateEffect - Explosion: med_splash - ImpactSound: splash9.aud + Explosions: med_splash + ImpactSounds: splash9.aud ValidImpactTypes: Water Grenade: @@ -99,12 +99,12 @@ Grenade: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: med_explosion - ImpactSound: kaboom25.aud + Explosions: med_explosion + ImpactSounds: kaboom25.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect - Explosion: small_splash - ImpactSound: splash9.aud + Explosions: small_splash + ImpactSounds: splash9.aud ValidImpactTypes: Water DepthCharge: @@ -130,11 +130,11 @@ DepthCharge: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: large_splash - ImpactSound: h2obomb2.aud + Explosions: large_splash + ImpactSounds: h2obomb2.aud Warhead@4EffHit: CreateEffect - Explosion: small_explosion - ImpactSound: kaboom15.aud + Explosions: small_explosion + 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 - Explosion: building - ImpactSound: kaboom25.aud + Explosions: building + ImpactSounds: kaboom25.aud Claw: ReloadDelay: 30 @@ -274,5 +274,5 @@ MADTankDetonate: SmudgeType: Crater Size: 7,6 Warhead@3Eff: CreateEffect - Explosion: med_explosion - ImpactSound: mineblo1.aud + Explosions: med_explosion + ImpactSounds: 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..71861e544f 100644 --- a/mods/ra/weapons/superweapons.yaml +++ b/mods/ra/weapons/superweapons.yaml @@ -19,12 +19,12 @@ ParaBomb: Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect - Explosion: artillery_explosion - ImpactSound: kaboom15.aud + Explosions: artillery_explosion + ImpactSounds: kaboom15.aud InvalidImpactTypes: Water Warhead@4EffWater: CreateEffect - Explosion: small_splash - ImpactSound: splash9.aud + Explosions: small_splash + ImpactSounds: splash9.aud ValidImpactTypes: Water Atomic: @@ -43,8 +43,8 @@ Atomic: SmudgeType: Scorch Size: 1 Warhead@4Eff_impact: CreateEffect - Explosion: nuke - ImpactSound: kaboom1.aud + Explosions: nuke + 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 a7afd8606c..97b1033a5a 100644 --- a/mods/ts/weapons/bombsandgrenades.yaml +++ b/mods/ts/weapons/bombsandgrenades.yaml @@ -19,13 +19,13 @@ Grenade: Concrete: 28 DamageTypes: Prone70Percent, TriggerProne, ExplosionDeath Warhead@2Eff: CreateEffect - Explosion: large_grey_explosion - ImpactSound: expnew13.aud + Explosions: large_grey_explosion + ImpactSounds: expnew13.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: small_watersplash + Explosions: small_watersplash ExplosionPalette: player - ImpactSound: ssplash3.aud + ImpactSounds: ssplash3.aud ValidImpactTypes: Water Warhead@4Smu: LeaveSmudge SmudgeType: MediumCrater @@ -51,13 +51,13 @@ Bomb: Concrete: 100 DamageTypes: Prone100Percent, TriggerProne, ExplosionDeath Warhead@2Eff: CreateEffect - Explosion: large_explosion - ImpactSound: expnew09.aud + Explosions: large_explosion + ImpactSounds: expnew09.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: small_watersplash + Explosions: small_watersplash ExplosionPalette: player - ImpactSound: ssplash3.aud + ImpactSounds: ssplash3.aud ValidImpactTypes: Water Warhead@4Smu: LeaveSmudge SmudgeType: MediumCrater @@ -84,13 +84,13 @@ RPGTower: Concrete: 70 DamageTypes: Prone70Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect - Explosion: large_clsn - ImpactSound: expnew14.aud + Explosions: large_clsn + ImpactSounds: expnew14.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: small_watersplash + 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 28885a4aef..ad79e12516 100644 --- a/mods/ts/weapons/energyweapons.yaml +++ b/mods/ts/weapons/energyweapons.yaml @@ -123,13 +123,13 @@ CyCannon: Concrete: 80 DamageTypes: Prone350Percent, TriggerProne, EnergyDeath Warhead@2Eff: CreateEffect - Explosion: large_bang - ImpactSound: expnew12.aud + Explosions: large_bang + ImpactSounds: expnew12.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: small_watersplash + Explosions: small_watersplash ExplosionPalette: player - ImpactSound: ssplash3.aud + ImpactSounds: ssplash3.aud ValidImpactTypes: Water Warhead@4Smu: LeaveSmudge SmudgeType: SmallScorch @@ -160,13 +160,13 @@ Proton: Concrete: 60 DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath Warhead@2Eff: CreateEffect - Explosion: small_bang - ImpactSound: expnew12.aud + Explosions: small_bang + ImpactSounds: expnew12.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: small_watersplash + 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 7635d027d7..d2e3aabe9b 100644 --- a/mods/ts/weapons/explosions.yaml +++ b/mods/ts/weapons/explosions.yaml @@ -10,8 +10,8 @@ UnitExplode: Heavy: 25 DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect - Explosion: large_twlt - ImpactSound: expnew09.aud + Explosions: large_twlt + ImpactSounds: expnew09.aud UnitExplodeSmall: Warhead@1Dam: SpreadDamage @@ -24,8 +24,8 @@ UnitExplodeSmall: Heavy: 25 DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect - Explosion: medium_brnl - ImpactSound: expnew13.aud + Explosions: medium_brnl + ImpactSounds: expnew13.aud TiberiumExplosion: Warhead@1Dam: SpreadDamage @@ -41,8 +41,8 @@ TiberiumExplosion: AddsResourceType: Tiberium Size: 1,1 Warhead@3Eff: CreateEffect - Explosion: large_explosion - ImpactSound: expnew09.aud + Explosions: large_explosion + ImpactSounds: expnew09.aud SmallDebris: ReloadDelay: 60 diff --git a/mods/ts/weapons/largeguns.yaml b/mods/ts/weapons/largeguns.yaml index da56f0434b..cb692f0ec4 100644 --- a/mods/ts/weapons/largeguns.yaml +++ b/mods/ts/weapons/largeguns.yaml @@ -19,13 +19,13 @@ Concrete: 60 DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect - Explosion: medium_clsn - ImpactSound: expnew14.aud + Explosions: medium_clsn + ImpactSounds: expnew14.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: small_watersplash + Explosions: small_watersplash ExplosionPalette: player - ImpactSound: ssplash3.aud + ImpactSounds: ssplash3.aud ValidImpactTypes: Water Warhead@4Smu: LeaveSmudge SmudgeType: SmallCrater @@ -47,13 +47,13 @@ Concrete: 60 DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect - Explosion: large_clsn - ImpactSound: expnew14.aud + Explosions: large_clsn + ImpactSounds: expnew14.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: small_watersplash + Explosions: small_watersplash ExplosionPalette: player - ImpactSound: ssplash3.aud + ImpactSounds: ssplash3.aud ValidImpactTypes: Water Warhead@4Smu: LeaveSmudge SmudgeType: MediumCrater @@ -81,13 +81,13 @@ Concrete: 60 DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect - Explosion: medium_clsn - ImpactSound: expnew14.aud + Explosions: medium_clsn + ImpactSounds: expnew14.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: small_watersplash + Explosions: small_watersplash ExplosionPalette: player - ImpactSound: ssplash3.aud + ImpactSounds: ssplash3.aud ValidImpactTypes: Water Warhead@4Smu: LeaveSmudge SmudgeType: MediumCrater @@ -115,13 +115,13 @@ Concrete: 35 DamageTypes: Prone100Percent, TriggerProne, ExplosionDeath Warhead@2Eff: CreateEffect - Explosion: large_explosion - ImpactSound: expnew06.aud + Explosions: large_explosion + ImpactSounds: expnew06.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: small_watersplash + 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 f9dfe20ddd..972dc7edfb 100644 --- a/mods/ts/weapons/missiles.yaml +++ b/mods/ts/weapons/missiles.yaml @@ -26,18 +26,18 @@ Bazooka: Concrete: 60 DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect - Explosion: small_clsn - ImpactSound: expnew12.aud + Explosions: small_clsn + ImpactSounds: expnew12.aud InvalidImpactTypes: Water, Air, AirHit Warhead@3EffWater: CreateEffect - Explosion: small_watersplash + Explosions: small_watersplash ExplosionPalette: player - ImpactSound: ssplash3.aud + ImpactSounds: ssplash3.aud ValidImpactTypes: Water Warhead@4EffAir: CreateEffect ValidImpactTypes: Air, AirHit - Explosion: tiny_twlt - ImpactSound: expnew05.aud + Explosions: tiny_twlt + ImpactSounds: expnew05.aud Warhead@5Smu: LeaveSmudge SmudgeType: SmallCrater @@ -70,18 +70,18 @@ HoverMissile: Concrete: 60 DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect - Explosion: small_clsn - ImpactSound: expnew12.aud + Explosions: small_clsn + ImpactSounds: expnew12.aud InvalidImpactTypes: Water, Air, AirHit Warhead@3EffWater: CreateEffect - Explosion: small_watersplash + Explosions: small_watersplash ExplosionPalette: player - ImpactSound: ssplash3.aud + ImpactSounds: ssplash3.aud ValidImpactTypes: Water Warhead@4EffAir: CreateEffect - Explosion: small_twlt + Explosions: small_twlt ValidImpactTypes: Air, AirHit - ImpactSound: expnew06.aud + ImpactSounds: expnew06.aud Warhead@5: LeaveSmudge SmudgeType: SmallCrater @@ -113,13 +113,13 @@ MammothTusk: Concrete: 28 DamageTypes: Explosion Warhead@2Eff: CreateEffect - Explosion: medium_twlt - ImpactSound: expnew07.aud + Explosions: medium_twlt + ImpactSounds: expnew07.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: small_watersplash + Explosions: small_watersplash ExplosionPalette: player - ImpactSound: ssplash3.aud + ImpactSounds: ssplash3.aud ValidImpactTypes: Water BikeMissile: @@ -152,13 +152,13 @@ BikeMissile: Concrete: 60 DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect - Explosion: small_clsn - ImpactSound: expnew12.aud + Explosions: small_clsn + ImpactSounds: expnew12.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: small_watersplash + Explosions: small_watersplash ExplosionPalette: player - ImpactSound: ssplash3.aud + ImpactSounds: ssplash3.aud ValidImpactTypes: Water Warhead@4Smu: LeaveSmudge SmudgeType: SmallCrater @@ -192,18 +192,18 @@ Dragon: Concrete: 60 DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect - Explosion: small_clsn - ImpactSound: expnew12.aud + Explosions: small_clsn + ImpactSounds: expnew12.aud InvalidImpactTypes: Water, Air, AirHit Warhead@3EffWater: CreateEffect - Explosion: small_watersplash + Explosions: small_watersplash ExplosionPalette: player - ImpactSound: ssplash3.aud + ImpactSounds: ssplash3.aud ValidImpactTypes: Water Warhead@4EffAir: CreateEffect - Explosion: small_twlt + Explosions: small_twlt ValidImpactTypes: Air, AirHit - ImpactSound: expnew06.aud + ImpactSounds: expnew06.aud Warhead@5Smu: LeaveSmudge SmudgeType: SmallCrater @@ -236,18 +236,18 @@ Hellfire: Concrete: 30 DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect - Explosion: small_clsn - ImpactSound: expnew12.aud + Explosions: small_clsn + ImpactSounds: expnew12.aud InvalidImpactTypes: Water, Air, AirHit Warhead@3EffWater: CreateEffect - Explosion: small_watersplash + Explosions: small_watersplash ExplosionPalette: player - ImpactSound: ssplash3.aud + ImpactSounds: ssplash3.aud ValidImpactTypes: Water Warhead@4EffAir: CreateEffect - Explosion: small_twlt + Explosions: small_twlt ValidImpactTypes: Air, AirHit - ImpactSound: expnew06.aud + ImpactSounds: expnew06.aud Warhead@5Smu: LeaveSmudge SmudgeType: SmallCrater @@ -273,5 +273,5 @@ RedEye2: ValidTargets: Air DamageTypes: SmallExplosionDeath Warhead@2Eff: CreateEffect - Explosion: tiny_twlt - ImpactSound: expnew05.aud + Explosions: tiny_twlt + ImpactSounds: expnew05.aud diff --git a/mods/ts/weapons/otherweapons.yaml b/mods/ts/weapons/otherweapons.yaml index 844e28b419..7aab314efc 100644 --- a/mods/ts/weapons/otherweapons.yaml +++ b/mods/ts/weapons/otherweapons.yaml @@ -41,9 +41,9 @@ FiendShard: Concrete: 20 DamageTypes: Prone100Percent, TriggerProne, BulletDeath Warhead@3EffWater: CreateEffect - Explosion: small_watersplash + Explosions: small_watersplash ExplosionPalette: player - ImpactSound: ssplash3.aud + ImpactSounds: ssplash3.aud ValidImpactTypes: Water SlimeAttack: 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..141cd562da 100644 --- a/mods/ts/weapons/superweapons.yaml +++ b/mods/ts/weapons/superweapons.yaml @@ -25,13 +25,13 @@ MultiCluster: Concrete: 60 DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath Warhead@2Eff: CreateEffect - Explosion: large_explosion - ImpactSound: expnew09.aud + Explosions: large_explosion + ImpactSounds: expnew09.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect - Explosion: small_watersplash + Explosions: small_watersplash ExplosionPalette: player - ImpactSound: ssplash2.aud + ImpactSounds: ssplash2.aud ValidImpactTypes: Water Warhead@4Smu: LeaveSmudge SmudgeType: MediumCrater @@ -61,8 +61,8 @@ IonCannon: ValidTargets: Ground, Air DamageTypes: Prone100Percent, TriggerProne, EnergyDeath Warhead@2Eff_impact: CreateEffect - Explosion: ionring - ImpactSound: ion1.aud + Explosions: ionring + ImpactSounds: ion1.aud Warhead@3Dam_area: SpreadDamage Spread: 1c0 Damage: 250 @@ -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,8 +103,8 @@ ClusterMissile: Concrete: 25 DamageTypes: Prone50Percent, TriggerProne, FireDeath Warhead@SoundEffect0: CreateEffect - Explosion: large_explosion - ImpactSound: expnew19.aud + Explosions: large_explosion + ImpactSounds: expnew19.aud Warhead@ResourceDestruction0: DestroyResource Size: 1 Warhead@ClusterSmudges0: LeaveSmudge