From 6a492850eb000e1a4e08e14d231e0d8c6163c4ea Mon Sep 17 00:00:00 2001
From: FaDeOkno <logkedr18@gmail.com>
Date: Mon, 12 Aug 2024 08:21:31 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D1=81=D0=BB=D0=B5=D0=B4=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D1=84=D0=B8=D0=BA=D1=81=D1=8B=20(=D0=B2=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B4=D0=B5)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Content.Client/Corvax/TTS/TTSSystem.cs       | 6 +++---
 Content.Client/Options/UI/Tabs/AudioTab.xaml | 6 ++++--
 Content.Shared/ADT/CCVar/ADTCCVars.cs        | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Content.Client/Corvax/TTS/TTSSystem.cs b/Content.Client/Corvax/TTS/TTSSystem.cs
index 2821b508e8c..2afe479bdb7 100644
--- a/Content.Client/Corvax/TTS/TTSSystem.cs
+++ b/Content.Client/Corvax/TTS/TTSSystem.cs
@@ -70,13 +70,13 @@ private void OnTtsVolumeChanged(float volume)
 
     private void OnPlayTTS(PlayTTSEvent ev)
     {
+        if (_cfg.GetCVar(ADTCCVars.ReplaceTTSWithBarks) == true)
+            return;
+
         _sawmill.Verbose($"Play TTS audio {ev.Data.Length} bytes from {ev.SourceUid} entity");
 
         var filePath = new ResPath($"{_fileIdx++}.ogg");
 
-        if (_cfg.GetCVar(ADTCCVars.ReplaceTTSWithBarks) == true)
-            return;
-
         // Languages TTS support start
         var player = _playerManager.LocalSession?.AttachedEntity;
         if (player != null)
diff --git a/Content.Client/Options/UI/Tabs/AudioTab.xaml b/Content.Client/Options/UI/Tabs/AudioTab.xaml
index f286560185f..a05f6492ada 100644
--- a/Content.Client/Options/UI/Tabs/AudioTab.xaml
+++ b/Content.Client/Options/UI/Tabs/AudioTab.xaml
@@ -11,15 +11,17 @@
                 <!-- Corvax-TTS-Start --><ui:OptionSlider Name="SliderVolumeTts" Title="{Loc 'ui-options-tts-volume'}" /><!-- Corvax-TTS-End -->
                 <!-- ADT Barks start -->
                 <ui:OptionSlider Name="SliderVolumeBarks" Title="{Loc 'ui-options-barks-volume'}" />
-                <ui:OptionDropDown Name="DropDownBarksOrTTS" Title="{Loc 'ui-options-barks-or-tts'}" />
                 <!-- ADT Barks end -->
                 <ui:OptionSlider Name="SliderVolumeMidi" Title="{Loc 'ui-options-midi-volume'}" />
                 <ui:OptionSlider Name="SliderVolumeAmbientMusic" Title="{Loc 'ui-options-ambient-music-volume'}" />
                 <ui:OptionSlider Name="SliderVolumeAmbience" Title="{Loc 'ui-options-ambience-volume'}" />
                 <ui:OptionSlider Name="SliderVolumeLobby" Title="{Loc 'ui-options-lobby-volume'}" />
                 <ui:OptionSlider Name="SliderVolumeInterface" Title="{Loc 'ui-options-interface-volume'}" />
-                <ui:OptionSlider Name="SliderMaxAmbienceSounds" Title="{Loc 'ui-options-ambience-max-sounds'}"
+                <ui:OptionSlider Name="SliderMaxAmbienceSounds" Title="{Loc 'ui-options-ambience-max-sounds'}" />
+                <!-- ADT Barks start -->
+                <ui:OptionDropDown Name="DropDownBarksOrTTS" Title="{Loc 'ui-options-barks-or-tts'}"
                                  Margin="0 0 0 8" />
+                <!-- ADT Barks end -->
                 <CheckBox Name="LobbyMusicCheckBox" Text="{Loc 'ui-options-lobby-music'}" />
                 <CheckBox Name="RestartSoundsCheckBox" Text="{Loc 'ui-options-restart-sounds'}" />
                 <CheckBox Name="EventMusicCheckBox" Text="{Loc 'ui-options-event-music'}" />
diff --git a/Content.Shared/ADT/CCVar/ADTCCVars.cs b/Content.Shared/ADT/CCVar/ADTCCVars.cs
index 5f329b07382..837d9b9d122 100644
--- a/Content.Shared/ADT/CCVar/ADTCCVars.cs
+++ b/Content.Shared/ADT/CCVar/ADTCCVars.cs
@@ -27,6 +27,6 @@ public sealed class ADTCCVars
         CVarDef.Create("barks.replace_tts", true, CVar.CLIENTONLY | CVar.ARCHIVE);
 
     public static readonly CVarDef<float> BarksVolume =
-        CVarDef.Create("barks.volume", 0f, CVar.CLIENTONLY | CVar.ARCHIVE);
+        CVarDef.Create("barks.volume", 1f, CVar.CLIENTONLY | CVar.ARCHIVE);
 
 }