Merge remote-tracking branch 'origin/master'

Lost-Paradise-Project · Sep 2, 2024 · 56bcb2b · 56bcb2b
2 parents d726826 + 38c5dc8
commit 56bcb2b
Show file tree

Hide file tree

Showing 24 changed files with 5,710 additions and 8 deletions.
diff --git a/Content.Client/Corvax/TTS/TTSSystem.cs b/Content.Client/Corvax/TTS/TTSSystem.cs
@@ -75,6 +75,12 @@ private void OnTtsVolumeChanged(float volume)
 
     private void OnPlayTTS(PlayTTSEvent ev)
     {
+        var canPlay = false;
+#if LPP_TTS_play   //это предназначено для того, чтобы в случае отсутствия ссылки на ТТС, игра не пыталась выполнить обработку звука
+        canPlay = true;
+#endif
+        if (!canPlay)
+            return;
         _sawmill.Debug($"Play TTS audio {ev.Data.Length} bytes from {ev.SourceUid} entity");
 
         var volume = AdjustVolume(ev.IsWhisper);

diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs
@@ -74,6 +74,9 @@ public sealed class EntryPoint : GameClient
         [Dependency] private readonly ILogManager _logManager = default!;
         [Dependency] private readonly JoinQueueManager _joinQueue = default!;
         [Dependency] private readonly DiscordAuthManager _discordAuth = default!;
+        #if LPP_Sponsors  // _LostParadise-Sponsors
+          [Dependency] private readonly SponsorsManager _sponsorsManager = default!;
+        #endif
 
         public override void Init()
         {
@@ -165,6 +168,11 @@ public override void PostInit()
             _voteManager.Initialize();
             _userInterfaceManager.SetDefaultTheme("SS14DefaultTheme");
             _userInterfaceManager.SetActiveTheme(_configManager.GetCVar(CVars.InterfaceTheme));
+
+            #if LPP_Sponsors
+              _sponsorsManager.Initialize(); // _LostParadise-Sponsors
+            #endif
+
             _documentParsingManager.Initialize();
             _joinQueue.Initialize();
             _discordAuth.Initialize();

diff --git a/Content.Client/IoC/ClientContentIoC.cs b/Content.Client/IoC/ClientContentIoC.cs
@@ -57,6 +57,9 @@ public static void Register()
             collection.Register<ISharedPlaytimeManager, JobRequirementsManager>();
             IoCManager.Register<JoinQueueManager>();
             IoCManager.Register<DiscordAuthManager>();
+            #if LPP_Sponsors  // _LostParadise-Sponsors
+              collection.Register<SponsorsManager>();
+            #endif
         }
     }
 }
diff --git a/Content.Client/Preferences/ClientPreferencesManager.cs b/Content.Client/Preferences/ClientPreferencesManager.cs
@@ -9,6 +9,9 @@
 using Robust.Shared.Network;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
+#if LPP_Sponsors  // _LostParadise-Sponsors
+  using Content.Client._LostParadise.Sponsors;
+#endif
 
 namespace Content.Client.Preferences
 {
@@ -24,6 +27,9 @@ public sealed class ClientPreferencesManager : IClientPreferencesManager
         [Dependency] private readonly IConfigurationManager _cfg = default!;
         [Dependency] private readonly IPrototypeManager _prototypes = default!;
         [Dependency] private readonly IPlayerManager _playerManager = default!;
+        #if LPP_Sponsors  // _LostParadise-Sponsors
+          [Dependency] private readonly SponsorsManager _sponsorsManager = default!;
+        #endif
 
         public event Action? OnServerDataLoaded;
 
@@ -67,6 +73,13 @@ public void SelectCharacter(int slot)
         public void UpdateCharacter(ICharacterProfile profile, int slot)
         {
             var collection = IoCManager.Instance!;
+
+            #if LPP_Sponsors  // _LostParadise-Sponsors
+              var allowedMarkings = _sponsorsManager.TryGetInfo(out var sponsor) ? sponsor.AllowedMarkings : [];
+              var session = _playerManager.LocalSession!;
+              profile.EnsureValid(session, collection, allowedMarkings);
+            #endif
+
             profile.EnsureValid(_playerManager.LocalSession!, collection);
             var characters = new Dictionary<int, ICharacterProfile>(Preferences.Characters) {[slot] = profile};
             Preferences = new PlayerPreferences(characters, Preferences.SelectedCharacterIndex, Preferences.AdminOOCColor);

diff --git a/Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs b/Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
@@ -111,8 +111,22 @@ private void UpdateUI()
                 Loc.GetString("character-setup-gui-create-new-character-button-tooltip",
                 ("maxCharacters", _preferencesManager.Settings!.MaxCharacterSlots));
 
+            #if LPP_Sponsors
+              var isDisplayedMaxSlots = false; // _LostParadise-Sponsors возможно использование дополнительных слотов
+            #endif
+
             foreach (var (slot, character) in _preferencesManager.Preferences!.Characters)
             {
+                if (character is null)
+                {
+                  continue;
+                }
+
+                #if LPP_SUBS // _LostParadise-Sponsors
+                  isDisplayedMaxSlots = numberOfFullSlots >= _preferencesManager.Settings.MaxCharacterSlots;
+                  if (isDisplayedMaxSlots) break;
+                #endif
+
                 numberOfFullSlots++;
                 var characterPickerButton = new CharacterPickerButton(_entityManager,
                     _preferencesManager,
@@ -133,8 +147,12 @@ private void UpdateUI()
                 };
             }
 
+            #if LPP_Sponsors // _LostParadise-Sponsors
+              _createNewCharacterButton.Disabled = isDisplayedMaxSlots;
+            #else
             _createNewCharacterButton.Disabled =
                 numberOfFullSlots >= _preferencesManager.Settings.MaxCharacterSlots;
+            #endif
             Characters.AddChild(_createNewCharacterButton);
             // TODO: Move this shit to the Lobby UI controller
         }