Merge branch 'newtts' of https://github.com/KashRas2/MorbinTime into …

…newtts

Content.Client/ADT/Bark/Systems/HumanoidProfileEditor.Barks.cs

@@ -0,0 +1,90 @@
+using System.Linq;
+using Content.Client.ADT.SpeechBarks;
+using Content.Shared.ADT.SpeechBarks;
+
+namespace Content.Client.Lobby.UI;
+
+public sealed partial class HumanoidProfileEditor
+{
+    private List<BarkPrototype> _barkList = new();
+
+    private void InitializeBarks()
+    {
+        _barkList = _prototypeManager
+            .EnumeratePrototypes<BarkPrototype>()
+            .Where(o => o.RoundStart)
+            .OrderBy(o => Loc.GetString(o.Name))
+            .ToList();
+
+        BarkProtoButton.OnItemSelected += args =>
+        {
+            BarkProtoButton.SelectId(args.Id);
+            SetBarkProto(_barkList[args.Id].ID);
+        };
+
+        PitchEdit.OnTextChanged += args =>
+        {
+            if (!float.TryParse(args.Text, out var newPitch))
+                return;
+
+            SetBarkPitch(newPitch);
+        };
+
+        DelayVariationMinEdit.OnTextChanged += args =>
+        {
+            if (!float.TryParse(args.Text, out var newVar))
+                return;
+
+            SetBarkMinVariation(newVar);
+        };
+
+        DelayVariationMaxEdit.OnTextChanged += args =>
+        {
+            if (!float.TryParse(args.Text, out var newVar))
+                return;
+
+            SetBarkMaxVariation(newVar);
+        };
+
+        BarkPlayButton.OnPressed += _ => PlayPreviewBark();
+    }
+
+    private void UpdateBarkVoicesControls()
+    {
+        if (Profile is null)
+            return;
+
+        BarkProtoButton.Clear();
+
+        PitchEdit.Text = Profile.BarkPitch.ToString();
+        DelayVariationMinEdit.Text = Profile.BarkLowVar.ToString();
+        DelayVariationMaxEdit.Text = Profile.BarkHighVar.ToString();
+
+        var firstVoiceChoiceId = 1;
+        for (var i = 0; i < _barkList.Count; i++)
+        {
+            var voice = _barkList[i];
+
+            var name = Loc.GetString(voice.Name);
+            BarkProtoButton.AddItem(name, i);
+
+            if (firstVoiceChoiceId == 1)
+                firstVoiceChoiceId = i;
+        }
+
+        var voiceChoiceId = _barkList.FindIndex(x => x.ID == Profile.BarkProto);
+        if (!BarkProtoButton.TrySelectId(voiceChoiceId) &&
+            BarkProtoButton.TrySelectId(firstVoiceChoiceId))
+        {
+            SetBarkProto(_barkList[firstVoiceChoiceId].ID);
+        }
+    }
+
+    private void PlayPreviewBark()
+    {
+        if (Profile is null)
+            return;
+
+        _entManager.System<SpeechBarksSystem>().PlayDataPrewiew(Profile.BarkProto, Profile.BarkPitch, Profile.BarkLowVar, Profile.BarkHighVar);
+    }
+}

Content.Client/ADT/Bark/Systems/SpeechBarksSystem.cs

@@ -0,0 +1,163 @@
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+using Content.Shared.ADT.SpeechBarks;
+using Content.Shared.Chat;
+using Robust.Shared.Player;
+using Robust.Client.Audio;
+using Robust.Shared.Audio;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Configuration;
+using System.Threading.Tasks;
+using Robust.Client.ResourceManagement;
+using Robust.Shared.Utility;
+using Robust.Client.Player;
+using Content.Shared.ADT.CCVar;
+using Robust.Shared.Timing;
+using Content.Shared.Corvax.CCCVars;
+using Robust.Client.Audio.Effects;
+using Robust.Shared.Audio.Effects;
+
+namespace Content.Client.ADT.SpeechBarks;
+
+public sealed class SpeechBarksSystem : SharedSpeechBarksSystem
+{
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
+    [Dependency] private readonly AudioSystem _audio = default!;
+    [Dependency] private readonly IPrototypeManager _proto = default!;
+    [Dependency] private readonly IPlayerManager _player = default!;
+    [Dependency] private readonly IGameTiming _time = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        _cfg.OnValueChanged(ADTCCVars.BarksVolume, OnVolumeChanged, true);
+
+        SubscribeNetworkEvent<PlaySpeechBarksEvent>(OnEntitySpoke);
+    }
+
+    public override void Shutdown()
+    {
+        base.Shutdown();
+        _cfg.UnsubValueChanged(ADTCCVars.BarksVolume, OnVolumeChanged);
+    }
+
+    private readonly List<string> _sampleText =
+    new()
+    {
+            "Тест мессЭдж 1.",
+            "Тест мессЭдж 2!",
+            "Тест мессЭдж 3?",
+            "Здесь был котя."
+    };
+
+    private const float MinimalVolume = -10f;
+    private float _volume = 0.0f;
+    private const float WhisperFade = 4f;
+
+    private void OnVolumeChanged(float volume)
+    {
+        _volume = volume;
+    }
+
+    private float AdjustVolume(bool isWhisper)
+    {
+        var volume = MinimalVolume + SharedAudioSystem.GainToVolume(_volume);
+
+        if (isWhisper)
+        {
+            volume -= SharedAudioSystem.GainToVolume(WhisperFade);
+        }
+
+        return volume;
+    }
+
+    private float AdjustDistance(bool isWhisper)
+    {
+        return isWhisper ? SharedChatSystem.WhisperMuffledRange : SharedChatSystem.VoiceRange;
+    }
+
+    private async void OnEntitySpoke(PlaySpeechBarksEvent ev)
+    {
+        if (_cfg.GetCVar(ADTCCVars.ReplaceTTSWithBarks) == false)
+            return;
+
+        if (ev.Message == null)
+            return;
+
+        if (ev.Source != null)
+        {
+            var audioParams = AudioParams.Default
+                .WithVolume(AdjustVolume(ev.IsWhisper))
+                .WithMaxDistance(AdjustDistance(ev.IsWhisper))
+                .WithPlayOffset(0f)
+                .WithReferenceDistance(100f);
+
+            if (ev.Message.EndsWith('!'))
+                audioParams = audioParams.WithVolume(audioParams.Volume * 1.2f);
+
+            var audioResource = new AudioResource();
+            string str = ev.Sound;
+
+            var path = new ResPath(str);
+            audioResource.Load(IoCManager.Instance!, path);
+
+            var count = (int)ev.Message.Length / 3f;
+
+            for (var i = 0; i < count; i++)
+            {
+                if (_player.LocalSession == null)
+                    break;
+                var entity = GetEntity(ev.Source.Value);
+                if (entity == EntityUid.Invalid || _player.LocalEntity == null)
+                    break;
+                if (Deleted(entity) || Terminating(entity))
+                    break;
+                if (!HasComp<TransformComponent>(entity) || !HasComp<TransformComponent>(_player.LocalEntity.Value))
+                    continue;
+                if (Transform(entity).Coordinates.TryDistance(EntityManager, Transform(_player.LocalEntity.Value).Coordinates, out var distance) &&
+                    distance > SharedChatSystem.VoiceRange)
+                    continue;
+                if (Transform(entity).ParentUid == EntityUid.Invalid)
+                    continue;
+
+                _audio.PlayEntity(audioResource.AudioStream, entity, audioParams.WithPitchScale(_random.NextFloat(ev.Pitch - 0.1f, ev.Pitch + 0.1f)));
+
+                await Task.Delay(TimeSpan.FromSeconds(_random.NextFloat(ev.LowVar, ev.HighVar)));
+            }
+
+        }
+    }
+
+    public async void PlayDataPrewiew(string protoId, float pitch, float lowVar, float highVar)
+    {
+        if (!_proto.TryIndex<BarkPrototype>(protoId, out var proto))
+            return;
+
+        var message = _random.Pick(_sampleText);
+
+        var audioParams = AudioParams.Default
+            .WithVolume(AdjustVolume(false));
+
+        var count = (int)message.Length / 3f;
+        var audioResource = new AudioResource();
+        string str = proto.Sound;
+
+        if (message.EndsWith('!'))
+            audioParams = audioParams.WithVolume(audioParams.Volume * 1.2f);
+
+        var path = new ResPath(str);
+        audioResource.Load(IoCManager.Instance!, path);
+
+        for (var i = 0; i < count; i++)
+        {
+            if (_player.LocalSession == null)
+                break;
+
+            _audio.PlayGlobal(str, _player.LocalSession, audioParams.WithPitchScale(_random.NextFloat(pitch - 0.1f, pitch + 0.1f)));
+
+            await Task.Delay(TimeSpan.FromSeconds(_random.NextFloat(lowVar, highVar)));
+        }
+    }
+}

Content.Client/ADT/Chaplain/EUI/AcceptReligionEui.cs

@@ -0,0 +1,46 @@
+using Content.Client.Eui;
+using Content.Shared.Cloning;
+using JetBrains.Annotations;
+using Robust.Client.Graphics;
+using Content.Shared.Chaplain;
+using Content.Shared.Bible.Components;
+
+namespace Content.Client.Chaplain;
+
+[UsedImplicitly]
+public sealed class AcceptReligionEui : BaseEui
+{
+    private readonly AcceptReligionWindow _window;
+
+    public AcceptReligionEui()
+    {
+        _window = new AcceptReligionWindow();
+
+        _window.DenyButton.OnPressed += _ =>
+        {
+            SendMessage(new AcceptReligionChoiceMessage(AcceptReligionButton.Deny));
+            _window.Close();
+        };
+
+        _window.OnClose += () => SendMessage(new AcceptReligionChoiceMessage(AcceptReligionButton.Deny));
+
+        _window.AcceptButton.OnPressed += _ =>
+        {
+            SendMessage(new AcceptReligionChoiceMessage(AcceptReligionButton.Accept));
+            _window.Close();
+        };
+    }
+
+    public override void Opened()
+    {
+        IoCManager.Resolve<IClyde>().RequestWindowAttention();
+        _window.OpenCentered();
+    }
+
+    public override void Closed()
+    {
+        _window.Close();
+    }
+
+}
+

Content.Client/ADT/Chaplain/EUI/AcceptReligionEuiWindow.cs

@@ -0,0 +1,61 @@
+using System.Numerics;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Shared.Localization;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
+
+namespace Content.Client.Chaplain;
+
+public sealed class AcceptReligionWindow : DefaultWindow
+{
+    public readonly Button DenyButton;
+    public readonly Button AcceptButton;
+
+    public AcceptReligionWindow()
+    {
+
+        Title = Loc.GetString("accept-religion-window-title");
+
+        Contents.AddChild(new BoxContainer
+        {
+            Orientation = LayoutOrientation.Vertical,
+            Children =
+            {
+                new BoxContainer
+                {
+                    Orientation = LayoutOrientation.Vertical,
+                    Children =
+                    {
+                        (new Label()
+                        {
+                            Text = Loc.GetString("accept-religion-window-prompt-text-part")
+                        }),
+                        new BoxContainer
+                        {
+                            Orientation = LayoutOrientation.Horizontal,
+                            Align = AlignMode.Center,
+                            Children =
+                            {
+                                (AcceptButton = new Button
+                                {
+                                    Text = Loc.GetString("accept-religion-window-accept-button"),
+                                }),
+
+                                (new Control()
+                                {
+                                    MinSize = new Vector2(20, 0)
+                                }),
+
+                                (DenyButton = new Button
+                                {
+                                    Text = Loc.GetString("accept-religion-window-deny-button"),
+                                })
+                            }
+                        },
+                    }
+                },
+            }
+        });
+    }
+}