From db1e9b9c24627b544ea95fe8bacb5b230f68d9e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 30 Aug 2014 10:32:57 +0200 Subject: [PATCH] don't hard-code sounds for one mod to avoid confusion --- OpenRA.Mods.RA/CrushableInfantry.cs | 2 +- OpenRA.Mods.RA/Parachutable.cs | 4 ++-- mods/cnc/rules/defaults.yaml | 2 ++ mods/ra/rules/defaults.yaml | 2 ++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/OpenRA.Mods.RA/CrushableInfantry.cs b/OpenRA.Mods.RA/CrushableInfantry.cs index 4e50f24bf2..52ec8b843a 100644 --- a/OpenRA.Mods.RA/CrushableInfantry.cs +++ b/OpenRA.Mods.RA/CrushableInfantry.cs @@ -17,7 +17,7 @@ namespace OpenRA.Mods.RA { class CrushableInfantryInfo : ITraitInfo, Requires, Requires { - public readonly string CrushSound = "squish2.aud"; + public readonly string CrushSound = null; public readonly string CorpseSequence = "die-crushed"; public readonly string[] CrushClasses = { "infantry" }; public readonly int WarnProbability = 75; diff --git a/OpenRA.Mods.RA/Parachutable.cs b/OpenRA.Mods.RA/Parachutable.cs index 6a2e8264e7..c6670d4442 100644 --- a/OpenRA.Mods.RA/Parachutable.cs +++ b/OpenRA.Mods.RA/Parachutable.cs @@ -20,11 +20,11 @@ namespace OpenRA.Mods.RA [Desc("If we land on invalid terrain for my actor type should we be killed?")] public readonly bool KilledOnImpassableTerrain = true; - public readonly string GroundImpactSound = "squish2.aud"; + public readonly string GroundImpactSound = null; public readonly string GroundCorpseSequence = "corpse"; public readonly string GroundCorpsePalette = "effect"; - public readonly string WaterImpactSound = "splash9.aud"; + public readonly string WaterImpactSound = null; public readonly string WaterCorpseSequence = "small_splash"; public readonly string WaterCorpsePalette = "effect"; diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml index 6e248c0888..1771f90b39 100644 --- a/mods/cnc/rules/defaults.yaml +++ b/mods/cnc/rules/defaults.yaml @@ -166,6 +166,7 @@ Probability: 10 CrushableInfantry: WarnProbability: 67 + CrushSound: squish2.aud CombatDebugOverlay: Guard: Guardable: @@ -220,6 +221,7 @@ NotifyAll: true ScaredyCat: CrushableInfantry: + CrushSound: squish2.aud ^DINO: AppearsOnRadar: diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index f8e25bc348..ff53a42a86 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -182,6 +182,8 @@ KilledOnImpassableTerrain: true ParachuteSequence: parach ShadowSequence: parach-shadow + GroundImpactSound: squishy2.aud + WaterImpactSound: splash9.aud Cloneable: Types: Infantry GainsStatUpgrades: