joshuafhiggins/connect4-moderator-observer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases 8 Activity

fix: made disconnecct behavior more reliable, fixed some errors

Browse Source
This commit is contained in:
Joshua Higgins
2025-12-08 14:18:24 -05:00
Unverified
parent 95c3cef1be
commit aad4a918da
4 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/BoardScreen.cs
View File

@@ -4,7 +4,6 @@ using System.Linq;
public partial class BoardScreen : Node2D public partial class BoardScreen : Node2D
{ {
[Export] private AudioStream endingSfx; [Export] private AudioStream endingSfx;
[Export] private Theme theme; [Export] private Theme theme;
@@ -71,7 +70,6 @@ public partial class BoardScreen : Node2D
Connection.Instance.OnObserveTerminated += () => PopupMessage("Match Terminated"); Connection.Instance.OnObserveTerminated += () => PopupMessage("Match Terminated");
Connection.Instance.OnObserveMove += ObserveMove; Connection.Instance.OnObserveMove += ObserveMove;
Connection.Instance.OnTournamentEnd += ShowTournamentScoreboard; Connection.Instance.OnTournamentEnd += ShowTournamentScoreboard;
Connection.Instance.OnWSDisconnect += () => GetTree().ChangeSceneToFile("res://scenes/main_menu.tscn");
} }
public override void _Process(double delta) public override void _Process(double delta)
@@ -139,7 +137,6 @@ public partial class BoardScreen : Node2D
{ {
var popup = new Popup(); var popup = new Popup();
popup.AlwaysOnTop = true; popup.AlwaysOnTop = true;
popup.PopupCentered();
popup.Size = new Vector2I(200, 100); popup.Size = new Vector2I(200, 100);
popup.Theme = GD.Load<Theme>("res://assets/theme.tres"); popup.Theme = GD.Load<Theme>("res://assets/theme.tres");
var text = new Label(); var text = new Label();
@@ -157,6 +154,7 @@ public partial class BoardScreen : Node2D
popup.InitialPosition = Window.WindowInitialPosition.CenterMainWindowScreen; popup.InitialPosition = Window.WindowInitialPosition.CenterMainWindowScreen;
popup.PopupHide += () => popup.QueueFree(); popup.PopupHide += () => popup.QueueFree();
GetTree().Root.AddChild(popup); GetTree().Root.AddChild(popup);
popup.PopupCentered();
sfx.Play(); sfx.Play();
popup.Show(); popup.Show();
TransitionToBracket(); TransitionToBracket();

1
scripts/BracketScene.cs
View File

@@ -32,7 +32,6 @@ public partial class BracketScene : Control
Connection.Instance.OnUpdatedMatches += UpdateMatches; Connection.Instance.OnUpdatedMatches += UpdateMatches;
Connection.Instance.OnWatchGameAck += TransitionToBoard; Connection.Instance.OnWatchGameAck += TransitionToBoard;
Connection.Instance.OnTournamentEnd += ShowTournamentScoreboard; Connection.Instance.OnTournamentEnd += ShowTournamentScoreboard;
Connection.Instance.OnWSDisconnect += () => GetTree().ChangeSceneToFile("res://scenes/main_menu.tscn");
} }
public override void _ExitTree() public override void _ExitTree()

4
scripts/ConnectButtonUI.cs
View File

@@ -8,8 +8,8 @@ public partial class ConnectButtonUI : Button
public override void _Ready() public override void _Ready()
{ {
Connection.Instance.OnWSConnectionSuccess += () => GetTree().ChangeSceneToFile(BRACKET_SCENE_PATH); Connection.Instance.OnWsConnectionSuccess += () => GetTree().ChangeSceneToFile(BRACKET_SCENE_PATH);
Connection.Instance.OnWSConnectionFailed += () => ErrorLabel.Text = "Couldn't connect to server! " + Connection.Instance.LastError; Connection.Instance.OnWsConnectionFailed += () => ErrorLabel.Text = "Couldn't connect to server! " + Connection.Instance.LastError;
} }
public override void _Pressed() public override void _Pressed()

13
scripts/Connection.cs
View File

@@ -33,9 +33,9 @@ public partial class Connection : Node
public event Action<List<(string, int)>> OnTournamentEnd; public event Action<List<(string, int)>> OnTournamentEnd;
public event Action OnBecomeAdmin; public event Action OnBecomeAdmin;
public event Action OnWSConnectionSuccess; public event Action OnWsConnectionSuccess;
public event Action OnWSConnectionFailed; public event Action OnWsConnectionFailed;
public event Action OnWSDisconnect; public event Action OnWsDisconnect;
// Already prints to console // Already prints to console
public event Action<string> OnError; public event Action<string> OnError;
@@ -61,6 +61,7 @@ public partial class Connection : Node
Instance = this; Instance = this;
_webSocket.SetHeartbeatInterval(5.0); _webSocket.SetHeartbeatInterval(5.0);
_webSocket.HeartbeatInterval = 5.0; _webSocket.HeartbeatInterval = 5.0;
Instance.OnWsDisconnect += () => GetTree().ChangeSceneToFile("res://scenes/main_menu.tscn");
} }
public void Connect(string address) public void Connect(string address)
@@ -93,7 +94,7 @@ public partial class Connection : Node
{ {
_connecting = false; _connecting = false;
_connected = true; _connected = true;
OnWSConnectionSuccess?.Invoke(); OnWsConnectionSuccess?.Invoke();
StartGameListRefreshLoop(); StartGameListRefreshLoop();
} }
@@ -116,7 +117,7 @@ public partial class Connection : Node
if (_connecting) if (_connecting)
{ {
_connecting = false; _connecting = false;
OnWSConnectionFailed?.Invoke(); OnWsConnectionFailed?.Invoke();
} }
else if (_connected) else if (_connected)
{ {
@@ -125,7 +126,7 @@ public partial class Connection : Node
var code = _webSocket.GetCloseCode(); var code = _webSocket.GetCloseCode();
var reason = _webSocket.GetCloseReason(); var reason = _webSocket.GetCloseReason();
GD.PrintErr("WebSocket closed with code: " + code + ", reason " + reason + ". Clean: " + (code != -1)); GD.PrintErr("WebSocket closed with code: " + code + ", reason " + reason + ". Clean: " + (code != -1));
OnWSDisconnect?.Invoke(); OnWsDisconnect?.Invoke();
} }
} }
} }