diff --git a/DCS-SR-Client/Audio/Providers/ClientAudioProvider.cs b/DCS-SR-Client/Audio/Providers/ClientAudioProvider.cs
index e38f30ca9..c981e51c5 100644
--- a/DCS-SR-Client/Audio/Providers/ClientAudioProvider.cs
+++ b/DCS-SR-Client/Audio/Providers/ClientAudioProvider.cs
@@ -38,6 +38,7 @@ public class ClientAudioProvider : AudioProvider
private float ambientCockpitEffectVolume = 1.0f;
private bool ambientCockpitEffectEnabled = true;
+ private bool ambientCockpitIntercomEffectEnabled = true;
private ProfileSettingsStore settingsStore = GlobalSettingsStore.Instance.ProfileSettingsStore;
private double lastLoaded = 0;
@@ -136,8 +137,9 @@ public JitterBufferAudio AddClientAudioSamples(ClientAudio audio)
//adjust for LOS + Distance + Volume
AdjustVolumeForLoss(audio);
- //Add cockpit effect - but not for Intercom
- if(ambientCockpitEffectEnabled && audio.Modulation != (short)Modulation.INTERCOM)
+ //Add cockpit effect - but not for Intercom unless you specifically opt in
+ if((ambientCockpitEffectEnabled && audio.Modulation != (short)Modulation.INTERCOM )
+ || (ambientCockpitEffectEnabled && audio.Modulation == (short)Modulation.INTERCOM && ambientCockpitIntercomEffectEnabled))
AddCockpitAmbientAudio(audio);
}
else
@@ -238,6 +240,8 @@ private void ReLoadSettings()
ambientCockpitEffectEnabled = settingsStore.GetClientSettingBool(ProfileSettingsKeys.AmbientCockpitNoiseEffect);
ambientCockpitEffectVolume =
settingsStore.GetClientSettingFloat(ProfileSettingsKeys.AmbientCockpitNoiseEffectVolume);
+ ambientCockpitIntercomEffectEnabled =
+ settingsStore.GetClientSettingBool(ProfileSettingsKeys.AmbientCockpitIntercomNoiseEffect);
}
}
diff --git a/DCS-SR-Client/AudioEffects/Ambient/F4.wav b/DCS-SR-Client/AudioEffects/Ambient/F4.wav
new file mode 100644
index 000000000..946368751
Binary files /dev/null and b/DCS-SR-Client/AudioEffects/Ambient/F4.wav differ
diff --git a/DCS-SR-Client/DCS-SR-Client.csproj b/DCS-SR-Client/DCS-SR-Client.csproj
index 2acd14e00..85dee65a7 100644
--- a/DCS-SR-Client/DCS-SR-Client.csproj
+++ b/DCS-SR-Client/DCS-SR-Client.csproj
@@ -514,6 +514,7 @@
Always
+
Always
diff --git a/DCS-SR-Client/Properties/Resources.Designer.cs b/DCS-SR-Client/Properties/Resources.Designer.cs
index 7fb0e43c3..9b57cb63a 100644
--- a/DCS-SR-Client/Properties/Resources.Designer.cs
+++ b/DCS-SR-Client/Properties/Resources.Designer.cs
@@ -123,6 +123,15 @@ public static string AlwaysAllowTransponderOverlay {
}
}
+ ///
+ /// Looks up a localized string similar to Enable Ambient Intercom Effects.
+ ///
+ public static string AmbientEffectIntercomToggle {
+ get {
+ return ResourceManager.GetString("AmbientEffectIntercomToggle", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Enable Ambient Cockpit Effects.
///
diff --git a/DCS-SR-Client/Properties/Resources.resx b/DCS-SR-Client/Properties/Resources.resx
index 431e7c3d2..442a4b3ef 100644
--- a/DCS-SR-Client/Properties/Resources.resx
+++ b/DCS-SR-Client/Properties/Resources.resx
@@ -314,6 +314,9 @@
Enable Ambient Cockpit Effects
+
+ Enable Ambient Intercom Effects
+
Ambient Cockpit Effect Volume
diff --git a/DCS-SR-Client/Settings/ProfileSettingsStore.cs b/DCS-SR-Client/Settings/ProfileSettingsStore.cs
index 459e64ab9..700a8f492 100644
--- a/DCS-SR-Client/Settings/ProfileSettingsStore.cs
+++ b/DCS-SR-Client/Settings/ProfileSettingsStore.cs
@@ -70,6 +70,7 @@ public enum ProfileSettingsKeys
AMCollisionVolume,
AmbientCockpitNoiseEffect,
AmbientCockpitNoiseEffectVolume,
+ AmbientCockpitIntercomNoiseEffect,
}
public class ProfileSettingsStore
@@ -141,6 +142,7 @@ public string CurrentProfileName
{ProfileSettingsKeys.AmbientCockpitNoiseEffect.ToString(), "true"},
{ProfileSettingsKeys.AmbientCockpitNoiseEffectVolume.ToString(), "1.0"}, //relative volume as the incoming volume is variable
+ {ProfileSettingsKeys.AmbientCockpitIntercomNoiseEffect.ToString(), "false"},
};
diff --git a/DCS-SR-Client/UI/ClientWindow/MainWindow.xaml b/DCS-SR-Client/UI/ClientWindow/MainWindow.xaml
index 827295306..7cc061ef1 100644
--- a/DCS-SR-Client/UI/ClientWindow/MainWindow.xaml
+++ b/DCS-SR-Client/UI/ClientWindow/MainWindow.xaml
@@ -1951,6 +1951,7 @@
+
@@ -2536,12 +2537,40 @@
+
+
+
+
+
+
+
+
+
-
@@ -2136,5 +2137,10 @@ private void AmbientCockpitEffectToggle_OnClick(object sender, RoutedEventArgs e
{
_globalSettings.ProfileSettingsStore.SetClientSettingBool(ProfileSettingsKeys.AmbientCockpitNoiseEffect, (bool)AmbientCockpitEffectToggle.IsChecked);
}
+
+ private void AmbientCockpitEffectIntercomToggle_OnClick(object sender, RoutedEventArgs e)
+ {
+ _globalSettings.ProfileSettingsStore.SetClientSettingBool(ProfileSettingsKeys.AmbientCockpitNoiseEffect, (bool)AmbientIntercomEffectToggle.IsChecked);
+ }
}
}
\ No newline at end of file
diff --git a/Scripts/DCS-SRS/Scripts/DCS-SimpleRadioStandalone.lua b/Scripts/DCS-SRS/Scripts/DCS-SimpleRadioStandalone.lua
index c462f6be0..5a9bb7d6a 100644
--- a/Scripts/DCS-SRS/Scripts/DCS-SimpleRadioStandalone.lua
+++ b/Scripts/DCS-SRS/Scripts/DCS-SimpleRadioStandalone.lua
@@ -6308,6 +6308,19 @@ function SR.exportRadioF4(_data)
_data.radios[3].encKey = ky28_key
_data.radios[3].enc = is_encrypted
_data.radios[3].encMode = 2
+
+
+ -- Expansion Radio - Server Side Controlled
+ _data.radios[4].name = "AN/ARC-186(V)"
+ _data.radios[4].freq = 124.8 * 1000000 --116,00-151,975 MHz
+ _data.radios[4].modulation = 0
+ _data.radios[4].secFreq = 121.5 * 1000000
+ _data.radios[4].volume = 1.0
+ _data.radios[4].freqMin = 116 * 1000000
+ _data.radios[4].freqMax = 151.975 * 1000000
+ _data.radios[4].expansion = true
+ _data.radios[4].volMode = 1
+ _data.radios[4].freqMode = 1
_data.intercomHotMic = intercom_hot_mic