Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Major] Moving out Queue, Verifications and Sponsors #1435

Merged
merged 16 commits into from
Oct 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Content.Client/Content.Client.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
<ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj" />
<ProjectReference Include="..\RobustToolbox\Robust.Client\Robust.Client.csproj" />
<ProjectReference Include="..\Content.Shared\Content.Shared.csproj" />
<ProjectReference Include="..\Corvax\Content.Corvax.Interfaces.Shared\Content.Corvax.Interfaces.Shared.csproj" />
<ProjectReference Include="..\Corvax\Content.Corvax.Interfaces.Client\Content.Corvax.Interfaces.Client.csproj" />
</ItemGroup>
<Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
<Import Project="..\RobustToolbox\MSBuild\XamlIL.targets" />
Expand Down
28 changes: 0 additions & 28 deletions Content.Client/Corvax/DiscordAuth/DiscordAuthGui.xaml

This file was deleted.

35 changes: 0 additions & 35 deletions Content.Client/Corvax/DiscordAuth/DiscordAuthGui.xaml.cs

This file was deleted.

30 changes: 0 additions & 30 deletions Content.Client/Corvax/DiscordAuth/DiscordAuthManager.cs

This file was deleted.

34 changes: 0 additions & 34 deletions Content.Client/Corvax/DiscordAuth/DiscordAuthState.cs

This file was deleted.

26 changes: 0 additions & 26 deletions Content.Client/Corvax/JoinQueue/JoinQueueManager.cs

This file was deleted.

34 changes: 0 additions & 34 deletions Content.Client/Corvax/JoinQueue/QueueGui.xaml

This file was deleted.

41 changes: 0 additions & 41 deletions Content.Client/Corvax/JoinQueue/QueueGui.xaml.cs

This file was deleted.

52 changes: 0 additions & 52 deletions Content.Client/Corvax/JoinQueue/QueueState.cs

This file was deleted.

23 changes: 0 additions & 23 deletions Content.Client/Corvax/Sponsors/SponsorsManager.cs

This file was deleted.

11 changes: 8 additions & 3 deletions Content.Client/Corvax/TTS/HumanoidProfileEditor.TTS.cs
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
using System.Linq;
using Content.Client.Corvax.Sponsors;
using Content.Client.Corvax.TTS;
using Content.Shared.Corvax.TTS;
using Content.Shared.Preferences;
using Robust.Shared.Random;
using Content.Corvax.Interfaces.Client;

namespace Content.Client.Preferences.UI;

public sealed partial class HumanoidProfileEditor
{
private IRobustRandom _random = default!;
private TTSSystem _ttsSys = default!;
private IClientSponsorsManager? _sponsorsMgr;
private List<TTSVoicePrototype> _voiceList = default!;
private readonly List<string> _sampleText = new()
{
Expand All @@ -22,6 +23,9 @@ public sealed partial class HumanoidProfileEditor

private void InitializeVoice()
{
if (!IoCManager.Instance!.TryResolveType(out _sponsorsMgr))
return;

_random = IoCManager.Resolve<IRobustRandom>();
_ttsSys = _entMan.System<TTSSystem>();
_voiceList = _prototypeManager
Expand All @@ -41,7 +45,8 @@ private void InitializeVoice()

private void UpdateTTSVoicesControls()
{
if (Profile is null)
if (Profile is null ||
_sponsorsMgr is null)
return;

_voiceButton.Clear();
Expand All @@ -60,7 +65,7 @@ private void UpdateTTSVoicesControls()
firstVoiceChoiceId = i;

if (voice.SponsorOnly &&
IoCManager.Resolve<SponsorsManager>().TryGetInfo(out var sponsor) &&
_sponsorsMgr.TryGetInfo(out var sponsor) &&
!sponsor.AllowedMarkings.Contains(voice.ID))
{
_voiceButton.SetItemDisabled(_voiceButton.GetIdx(i), true);
Expand Down
Loading
Loading