diff --git a/OpenRA.Game/Traits/Player/EvaAlerts.cs b/OpenRA.Game/Traits/Player/EvaAlerts.cs index 8c4de05fb3..e88b409b97 100644 --- a/OpenRA.Game/Traits/Player/EvaAlerts.cs +++ b/OpenRA.Game/Traits/Player/EvaAlerts.cs @@ -43,7 +43,6 @@ namespace OpenRA.Traits public readonly string UnitReadyAudio = "unitrdy1.aud"; public readonly string OnHoldAudio = "onhold1.aud"; public readonly string CancelledAudio = "cancld1.aud"; - public readonly string ClickAudio = "ramenu1.aud"; public readonly string NewOptions = "newopt1.aud"; // For manual powerup/down in ra-ng @@ -57,6 +56,9 @@ namespace OpenRA.Traits public readonly string NavalUnitLost = "navylst1.aud"; public readonly string PrimaryBuildingSelected = "pribldg1.aud"; public readonly string CreditsStolen = "credit1.aud"; + + // Special powers + public readonly string AbilityInsufficientPower = "nopowr1.aud"; } public class EvaAlerts {} diff --git a/OpenRA.Game/Traits/SupportPower.cs b/OpenRA.Game/Traits/SupportPower.cs index 4eae60b823..a6b393ba01 100644 --- a/OpenRA.Game/Traits/SupportPower.cs +++ b/OpenRA.Game/Traits/SupportPower.cs @@ -136,14 +136,12 @@ namespace OpenRA.Traits public void Activate() { if (!IsAvailable || !IsReady) - { - Sound.Play("briefing.aud"); return; - } if (Info.RequiresPower && !IsPowered()) { - Sound.Play("nopowr1.aud"); + var eva = Owner.World.WorldActor.Info.Traits.Get(); + Sound.Play(eva.AbilityInsufficientPower); return; } diff --git a/mods/cnc/system.yaml b/mods/cnc/system.yaml index 3e407d15be..4e07a75f1b 100644 --- a/mods/cnc/system.yaml +++ b/mods/cnc/system.yaml @@ -6,7 +6,7 @@ Player: TechTreeCache: NukePower: Image: atomicnh - ChargeTime: 13 + ChargeTime: 5 Description: Atom Bomb LongDesc: Launches a nuclear missile at a target location. Prerequisites: TMPL @@ -27,8 +27,8 @@ Player: LaunchSound: ion1.aud SelectTargetSound: select1.aud AirstrikePower: - Image: a10icnh - ChargeTime: 8 + Image: bombicnh + ChargeTime: 4 Description: Airstrike LongDesc: Delivers a load of napalm on your target. Prerequisites: hq @@ -243,6 +243,7 @@ World: UnitLost: unitlost.aud NavalUnitLost: unitlost.aud PrimaryBuildingSelected: pribldg1.aud + AbilityInsufficientPower: nopower1.aud SpatialBins: BinSize: 4 Shroud: \ No newline at end of file