Login tips (#22234)
* Init coomit * meh * okay * Revert "okay" This reverts commit bb638aa4baa8dbd0e285c3435aabf83171a4806a. * enable-d * Update Content.Client/Launcher/LauncherConnectingGui.xaml.cs Co-authored-by: Kara <lunarautomaton6@gmail.com> * review --------- Co-authored-by: Kara <lunarautomaton6@gmail.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
@@ -1,9 +1,12 @@
|
|||||||
using System;
|
using System;
|
||||||
using Robust.Client;
|
using Robust.Client;
|
||||||
using Robust.Client.UserInterface;
|
using Robust.Client.UserInterface;
|
||||||
|
using Robust.Shared.Configuration;
|
||||||
using Robust.Shared.IoC;
|
using Robust.Shared.IoC;
|
||||||
using Robust.Shared.Log;
|
using Robust.Shared.Log;
|
||||||
using Robust.Shared.Network;
|
using Robust.Shared.Network;
|
||||||
|
using Robust.Shared.Prototypes;
|
||||||
|
using Robust.Shared.Random;
|
||||||
|
|
||||||
namespace Content.Client.Launcher
|
namespace Content.Client.Launcher
|
||||||
{
|
{
|
||||||
@@ -13,6 +16,9 @@ namespace Content.Client.Launcher
|
|||||||
[Dependency] private readonly IClientNetManager _clientNetManager = default!;
|
[Dependency] private readonly IClientNetManager _clientNetManager = default!;
|
||||||
[Dependency] private readonly IGameController _gameController = default!;
|
[Dependency] private readonly IGameController _gameController = default!;
|
||||||
[Dependency] private readonly IBaseClient _baseClient = default!;
|
[Dependency] private readonly IBaseClient _baseClient = default!;
|
||||||
|
[Dependency] private readonly IRobustRandom _random = default!;
|
||||||
|
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
|
||||||
|
[Dependency] private readonly IConfigurationManager _cfg = default!;
|
||||||
|
|
||||||
private LauncherConnectingGui? _control;
|
private LauncherConnectingGui? _control;
|
||||||
|
|
||||||
@@ -51,7 +57,7 @@ namespace Content.Client.Launcher
|
|||||||
|
|
||||||
protected override void Startup()
|
protected override void Startup()
|
||||||
{
|
{
|
||||||
_control = new LauncherConnectingGui(this);
|
_control = new LauncherConnectingGui(this, _random, _prototypeManager, _cfg);
|
||||||
|
|
||||||
_userInterfaceManager.StateRoot.AddChild(_control);
|
_userInterfaceManager.StateRoot.AddChild(_control);
|
||||||
|
|
||||||
|
|||||||
@@ -54,4 +54,17 @@
|
|||||||
</BoxContainer>
|
</BoxContainer>
|
||||||
</BoxContainer>
|
</BoxContainer>
|
||||||
</Control>
|
</Control>
|
||||||
|
<!-- Bottom window for tips -->
|
||||||
|
<PanelContainer Name="LoginTips" StyleClasses="AngleRect" Margin="0 10" MaxWidth="600" VerticalExpand="True" VerticalAlignment="Bottom">
|
||||||
|
<BoxContainer Orientation="Vertical" VerticalExpand="True">
|
||||||
|
<controls:StripeBack>
|
||||||
|
<BoxContainer Orientation="Horizontal" HorizontalAlignment="Center">
|
||||||
|
<Label Name="LoginTipTitle" Text="Tip" StyleClasses="LabelHeading" Align="Center"/>
|
||||||
|
</BoxContainer>
|
||||||
|
</controls:StripeBack>
|
||||||
|
<BoxContainer Orientation="Vertical" Margin="5 5 5 5" >
|
||||||
|
<RichTextLabel Name="LoginTip" VerticalExpand="True" />
|
||||||
|
</BoxContainer>
|
||||||
|
</BoxContainer>
|
||||||
|
</PanelContainer>
|
||||||
</Control>
|
</Control>
|
||||||
|
|||||||
@@ -1,12 +1,18 @@
|
|||||||
|
using System.Linq;
|
||||||
using Content.Client.Stylesheets;
|
using Content.Client.Stylesheets;
|
||||||
|
using Content.Shared.CCVar;
|
||||||
|
using Content.Shared.Dataset;
|
||||||
using Robust.Client.AutoGenerated;
|
using Robust.Client.AutoGenerated;
|
||||||
using Robust.Client.UserInterface;
|
using Robust.Client.UserInterface;
|
||||||
using Robust.Client.UserInterface.Controls;
|
using Robust.Client.UserInterface.Controls;
|
||||||
using Robust.Client.UserInterface.XAML;
|
using Robust.Client.UserInterface.XAML;
|
||||||
|
using Robust.Shared.Configuration;
|
||||||
using Robust.Shared.IoC;
|
using Robust.Shared.IoC;
|
||||||
using Robust.Shared.Timing;
|
using Robust.Shared.Timing;
|
||||||
using Robust.Shared.Localization;
|
using Robust.Shared.Localization;
|
||||||
using Robust.Shared.Network;
|
using Robust.Shared.Network;
|
||||||
|
using Robust.Shared.Prototypes;
|
||||||
|
using Robust.Shared.Random;
|
||||||
|
|
||||||
namespace Content.Client.Launcher
|
namespace Content.Client.Launcher
|
||||||
{
|
{
|
||||||
@@ -15,11 +21,19 @@ namespace Content.Client.Launcher
|
|||||||
{
|
{
|
||||||
private const float RedialWaitTimeSeconds = 15f;
|
private const float RedialWaitTimeSeconds = 15f;
|
||||||
private readonly LauncherConnecting _state;
|
private readonly LauncherConnecting _state;
|
||||||
|
private readonly IRobustRandom _random;
|
||||||
|
private readonly IPrototypeManager _prototype;
|
||||||
|
private readonly IConfigurationManager _cfg;
|
||||||
|
|
||||||
private float _redialWaitTime = RedialWaitTimeSeconds;
|
private float _redialWaitTime = RedialWaitTimeSeconds;
|
||||||
|
|
||||||
public LauncherConnectingGui(LauncherConnecting state)
|
public LauncherConnectingGui(LauncherConnecting state, IRobustRandom random,
|
||||||
|
IPrototypeManager prototype, IConfigurationManager config)
|
||||||
{
|
{
|
||||||
_state = state;
|
_state = state;
|
||||||
|
_random = random;
|
||||||
|
_prototype = prototype;
|
||||||
|
_cfg = config;
|
||||||
|
|
||||||
RobustXamlLoader.Load(this);
|
RobustXamlLoader.Load(this);
|
||||||
|
|
||||||
@@ -27,6 +41,7 @@ namespace Content.Client.Launcher
|
|||||||
|
|
||||||
Stylesheet = IoCManager.Resolve<IStylesheetManager>().SheetSpace;
|
Stylesheet = IoCManager.Resolve<IStylesheetManager>().SheetSpace;
|
||||||
|
|
||||||
|
ChangeLoginTip();
|
||||||
ReconnectButton.OnPressed += _ => _state.RetryConnect();
|
ReconnectButton.OnPressed += _ => _state.RetryConnect();
|
||||||
// Redial shouldn't fail, but if it does, try a reconnect (maybe we're being run from debug)
|
// Redial shouldn't fail, but if it does, try a reconnect (maybe we're being run from debug)
|
||||||
RedialButton.OnPressed += _ =>
|
RedialButton.OnPressed += _ =>
|
||||||
@@ -67,6 +82,29 @@ namespace Content.Client.Launcher
|
|||||||
ReconnectButton.Visible = !redialFlag;
|
ReconnectButton.Visible = !redialFlag;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void ChangeLoginTip()
|
||||||
|
{
|
||||||
|
var tipsDataset = _cfg.GetCVar(CCVars.LoginTipsDataset);
|
||||||
|
var loginTipsEnabled = _prototype.TryIndex<DatasetPrototype>(tipsDataset, out var tips);
|
||||||
|
|
||||||
|
LoginTips.Visible = loginTipsEnabled;
|
||||||
|
if (!loginTipsEnabled)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var tipList = tips!.Values;
|
||||||
|
|
||||||
|
if (tipList.Count == 0)
|
||||||
|
return;
|
||||||
|
|
||||||
|
var randomIndex = _random.Next(tipList.Count);
|
||||||
|
var tip = tipList[randomIndex];
|
||||||
|
LoginTip.SetMessage(tip);
|
||||||
|
|
||||||
|
LoginTipTitle.Text = Loc.GetString("connecting-window-tip", ("numberTip", randomIndex));
|
||||||
|
}
|
||||||
|
|
||||||
protected override void FrameUpdate(FrameEventArgs args)
|
protected override void FrameUpdate(FrameEventArgs args)
|
||||||
{
|
{
|
||||||
base.FrameUpdate(args);
|
base.FrameUpdate(args);
|
||||||
|
|||||||
@@ -504,6 +504,9 @@ namespace Content.Shared.CCVar
|
|||||||
public static readonly CVarDef<float> TipFrequencyInRound =
|
public static readonly CVarDef<float> TipFrequencyInRound =
|
||||||
CVarDef.Create("tips.in_game_frequency", 60f * 60);
|
CVarDef.Create("tips.in_game_frequency", 60f * 60);
|
||||||
|
|
||||||
|
public static readonly CVarDef<string> LoginTipsDataset =
|
||||||
|
CVarDef.Create("tips.login_dataset", "Tips");
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Console
|
* Console
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ connecting-redial-wait = Please wait: { TOSTRING($time, "G3") }
|
|||||||
connecting-in-progress = Connecting to server...
|
connecting-in-progress = Connecting to server...
|
||||||
connecting-disconnected = Disconnected from server:
|
connecting-disconnected = Disconnected from server:
|
||||||
connecting-tip = Don't die!
|
connecting-tip = Don't die!
|
||||||
|
connecting-window-tip = Tip { $numberTip }
|
||||||
connecting-version = ver 0.1
|
connecting-version = ver 0.1
|
||||||
connecting-fail-reason = Failed to connect to server:
|
connecting-fail-reason = Failed to connect to server:
|
||||||
{ $reason }
|
{ $reason }
|
||||||
|
|||||||
Reference in New Issue
Block a user