Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Observers are now shown in the Lobby as Observers (#1834)

Browse Source 
* Observers are now shown in the Lobby as Observers

* Weviews adwessed
This commit is contained in:
Exp
2020-08-21 11:24:06 +02:00
committed by GitHub
parent 8fe211bf88
commit 02b5632dac
5 changed files with 60 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Client/GameTicking/ClientGameTicker.cs
View File

@@ -30,7 +30,7 @@ namespace Content.Client.GameTicking
[ViewVariables] public string ServerInfoBlob { get; private set; }
[ViewVariables] public DateTime StartTime { get; private set; }
[ViewVariables] public bool Paused { get; private set; }
[ViewVariables] public Dictionary<NetSessionId, bool> Ready { get; private set; }
[ViewVariables] public Dictionary<NetSessionId, PlayerStatus> Status { get; private set; }
public event Action InfoBlobUpdated;
public event Action LobbyStatusUpdated;
@@ -54,7 +54,7 @@ namespace Content.Client.GameTicking
});
_netManager.RegisterNetMessage<MsgTickerLateJoinStatus>(nameof(MsgTickerLateJoinStatus), LateJoinStatus);
Ready = new Dictionary<NetSessionId, bool>();
Status = new Dictionary<NetSessionId, PlayerStatus>();
_initialized = true;
}
@@ -77,7 +77,7 @@ namespace Content.Client.GameTicking
AreWeReady = message.YouAreReady;
Paused = message.Paused;
if (IsGameStarted)
Ready.Clear();
Status.Clear();
LobbyStatusUpdated?.Invoke();
}
@@ -103,9 +103,9 @@ namespace Content.Client.GameTicking
private void LobbyReady(MsgTickerLobbyReady message)
{
// Merge the Dictionaries
foreach (var p in message.PlayerReady)
foreach (var p in message.PlayerStatus)
{
Ready[p.Key] = p.Value;
Status[p.Key] = p.Value;
}
LobbyReadyUpdated?.Invoke();
}

3
Content.Client/Interfaces/IClientGameTicker.cs
View File

@@ -1,6 +1,7 @@
using Robust.Shared.Network;
using System;
using System.Collections.Generic;
using static Content.Shared.SharedGameTicker;
namespace Content.Client.Interfaces
{
@@ -12,7 +13,7 @@ namespace Content.Client.Interfaces
bool DisallowedLateJoin { get; }
DateTime StartTime { get; }
bool Paused { get; }
Dictionary<NetSessionId, bool> Ready { get; }
Dictionary<NetSessionId, PlayerStatus> Status { get; }
void Initialize();
event Action InfoBlobUpdated;

25
Content.Client/State/LobbyState.cs
View File

@@ -18,6 +18,7 @@ using Robust.Shared.Localization;
using Robust.Shared.Prototypes;
using Robust.Shared.Timing;
using Robust.Shared.ViewVariables;
using static Content.Shared.SharedGameTicker;
namespace Content.Client.State
{
@@ -112,7 +113,7 @@ namespace Content.Client.State
_clientGameTicker.LobbyReadyUpdated -= LobbyReadyUpdated;
_clientGameTicker.LobbyLateJoinStatusUpdated -= LobbyLateJoinStatusUpdated;
_clientGameTicker.Ready.Clear();
_clientGameTicker.Status.Clear();
_lobby.Dispose();
_characterSetup.Dispose();
@@ -158,11 +159,14 @@ namespace Content.Client.State
private void PlayerManagerOnPlayerListUpdated(object sender, EventArgs e)
{
// Remove disconnected sessions from the Ready Dict
foreach (var p in _clientGameTicker.Ready)
foreach (var p in _clientGameTicker.Status)
{
if (!_playerManager.SessionsDict.TryGetValue(p.Key, out _))
{
_clientGameTicker.Ready.Remove(p.Key);
// This is a shitty fix. Observers can rejoin because they are already in the game.
// So we don't delete them, but keep them if they decide to rejoin
if (p.Value != PlayerStatus.Observer)
_clientGameTicker.Status.Remove(p.Key);
}
}
UpdatePlayerList();
@@ -218,12 +222,19 @@ namespace Content.Client.State
// Don't show ready state if we're ingame
if (!_clientGameTicker.IsGameStarted)
{
var ready = false;
var status = PlayerStatus.NotReady;
if (session.SessionId == _playerManager.LocalPlayer.SessionId)
ready = _clientGameTicker.AreWeReady;
status = _clientGameTicker.AreWeReady ? PlayerStatus.Ready : PlayerStatus.NotReady;
else
_clientGameTicker.Ready.TryGetValue(session.SessionId, out ready);
readyState = ready ? Loc.GetString("Ready") : Loc.GetString("Not Ready");
_clientGameTicker.Status.TryGetValue(session.SessionId, out status);
readyState = status switch
{
PlayerStatus.NotReady => Loc.GetString("Not Ready"),
PlayerStatus.Ready => Loc.GetString("Ready"),
PlayerStatus.Observer => Loc.GetString("Observer"),
_ => "",
};
}
_lobby.PlayerReadyList.AddItem(readyState, null, false);
}