Added intercom cockpit effect as optional

Added F4 Expansion radio
ciribob · May 15, 2024 · ccfd647 · ccfd647
1 parent 7206c60
commit ccfd647
Show file tree

Hide file tree

Showing 9 changed files with 70 additions and 3 deletions.
diff --git 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
diff --git a/DCS-SR-Client/DCS-SR-Client.csproj b/DCS-SR-Client/DCS-SR-Client.csproj
@@ -514,6 +514,7 @@
     <Content Include="AudioEffects\Ambient\F16.wav">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="AudioEffects\Ambient\F4.wav" />
     <Content Include="AudioEffects\Ambient\F5.wav">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>

diff --git a/DCS-SR-Client/Properties/Resources.Designer.cs b/DCS-SR-Client/Properties/Resources.Designer.cs
diff --git a/DCS-SR-Client/Properties/Resources.resx b/DCS-SR-Client/Properties/Resources.resx
@@ -314,6 +314,9 @@
   <data name="AmbientEffectToggle" xml:space="preserve">
     <value>Enable Ambient Cockpit Effects</value>
   </data>
+  <data name="AmbientEffectIntercomToggle" xml:space="preserve">
+    <value>Enable Ambient Intercom Effects</value>
+  </data>
   <data name="AmbientEffectVolume" xml:space="preserve">
     <value>Ambient Cockpit Effect Volume</value>
   </data>

diff --git 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
@@ -1951,6 +1951,7 @@
                                         <RowDefinition />
                                         <RowDefinition />
                                         <RowDefinition />
+                                        <RowDefinition />
                                     </Grid.RowDefinitions>
 
 
@@ -2536,12 +2537,40 @@
 
 
                                     <Label Grid.Row="18"
+                                           Grid.Column="0"
+                                           HorizontalContentAlignment="Center"
+                                           VerticalContentAlignment="Center"
+                                           Content="{x:Static p:Resources.AmbientEffectIntercomToggle}" />
+
+                                    <ToggleButton Name="AmbientIntercomEffectToggle"
+                                                  Grid.Row="18"
+                                                  Grid.Column="1"
+                                                  HorizontalContentAlignment="Center"
+                                                  VerticalContentAlignment="Center"
+                                                  Click="AmbientCockpitEffectIntercomToggle_OnClick">
+                                        <ToggleButton.Style>
+                                            <Style TargetType="{x:Type ToggleButton}">
+                                                <Setter Property="Content" Value="{x:Static p:Resources.ValueON}" />
+                                                <Style.Triggers>
+                                                    <Trigger Property="IsChecked" Value="True">
+                                                        <Setter Property="Content" Value="{x:Static p:Resources.ValueON}" />
+                                                    </Trigger>
+                                                    <Trigger Property="IsChecked" Value="False">
+                                                        <Setter Property="Content" Value="{x:Static p:Resources.ValueOFF}" />
+                                                    </Trigger>
+                                                </Style.Triggers>
+                                            </Style>
+                                        </ToggleButton.Style>
+                                    </ToggleButton>
+
+
+                                    <Label Grid.Row="19"
                                                Grid.Column="0"
                                                HorizontalContentAlignment="Center"
                                                VerticalContentAlignment="Center"
                                                Content="{x:Static p:Resources.AmbientEffectVolume}" />
 
-                                        <StackPanel Grid.Row="18"
+                                        <StackPanel Grid.Row="19"
                                                     Grid.Column="1" Margin="10">
 
                                             <Slider x:Name="AmbientCockpitEffectVolume"

diff --git a/DCS-SR-Client/UI/ClientWindow/MainWindow.xaml.cs b/DCS-SR-Client/UI/ClientWindow/MainWindow.xaml.cs
@@ -904,6 +904,7 @@ private void ReloadProfileSettings()
 
 
             AmbientCockpitEffectToggle.IsChecked = _globalSettings.ProfileSettingsStore.GetClientSettingBool(ProfileSettingsKeys.AmbientCockpitNoiseEffect);
+            AmbientIntercomEffectToggle.IsChecked = _globalSettings.ProfileSettingsStore.GetClientSettingBool(ProfileSettingsKeys.AmbientCockpitIntercomNoiseEffect);
 
             AmbientCockpitEffectVolume.IsEnabled = false;
             AmbientCockpitEffectVolume.ValueChanged += (sender, e) =>
@@ -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);
+        }
     }
 }
diff --git 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