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

feat: all new networking changes (except reservations), huge refactor and fmt

Browse Source
This commit is contained in:
Joshua Higgins
2026-02-03 13:39:16 -05:00
Unverified
parent ade6b9b4e4
commit 4ccc501700
11 changed files with 895 additions and 958 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.editorconfig
View File

@@ -2,3 +2,9 @@ root = true
[*] [*]
charset = utf-8 charset = utf-8
indent_style = space
indent_size = 2
tab_width = 2
[*.{cs,vb}]
dotnet_diagnostic.CA1050.severity = none

6
scripts/AddressUI.cs
View File

@@ -1,10 +1,8 @@
using Godot; using Godot;
using System; using System;
public partial class AddressUI : TextEdit public partial class AddressUI : TextEdit {
{ public override void _Ready() {
public override void _Ready()
{
Text = Connection.WS_DEFAULT_ADDRESS; Text = Connection.WS_DEFAULT_ADDRESS;
} }
} }

14
scripts/AdminControls.cs
View File

@@ -12,9 +12,10 @@ public partial class AdminControls : HBoxContainer
{ {
Connection.Instance.OnBecomeAdmin += UpdateUI; Connection.Instance.OnBecomeAdmin += UpdateUI;
Connection.Instance.OnTournamentEnd += UpdateUI; Connection.Instance.OnTournamentEnd += UpdateUI;
Connection.Instance.OnStartTournamentAck += UpdateUI; Connection.Instance.OnStartTournament += UpdateUI;
Connection.Instance.OnCancelTournamentAck += UpdateUI; Connection.Instance.OnCancelTournamentAck += UpdateUI;
Connection.Instance.OnGetDataAcks += UpdateUI; Connection.Instance.OnGetDataAcks += UpdateUI;
Connection.Instance.OnSetDataAcks += UpdateUI;
StartTournament.Pressed += () => Connection.Instance.StartTournament(); StartTournament.Pressed += () => Connection.Instance.StartTournament();
CancelTournament.Pressed += () => Connection.Instance.CancelTournament(); CancelTournament.Pressed += () => Connection.Instance.CancelTournament();
@@ -23,7 +24,7 @@ public partial class AdminControls : HBoxContainer
Timeout.ValueChanged += value => Timeout.ValueChanged += value =>
{ {
Connection.Instance.SetTournamentWait((float)value); Connection.Instance.SetMoveWait((float)value);
var time = Connection.Instance.CurrentWaitTimeout.ToString(); var time = Connection.Instance.CurrentWaitTimeout.ToString();
if (time.Length > 3) if (time.Length > 3)
{ {
@@ -32,16 +33,17 @@ public partial class AdminControls : HBoxContainer
Label.Text = "Wait To Move: " + time + "s "; Label.Text = "Wait To Move: " + time + "s ";
}; };
BecomeAdmin.Pressed += ShowAuthPopup; BecomeAdmin.Pressed += showAuthPopup;
} }
public override void _ExitTree() public override void _ExitTree()
{ {
Connection.Instance.OnBecomeAdmin -= UpdateUI; Connection.Instance.OnBecomeAdmin -= UpdateUI;
Connection.Instance.OnTournamentEnd -= UpdateUI; Connection.Instance.OnTournamentEnd -= UpdateUI;
Connection.Instance.OnStartTournamentAck -= UpdateUI; Connection.Instance.OnStartTournament -= UpdateUI;
Connection.Instance.OnCancelTournamentAck -= UpdateUI; Connection.Instance.OnCancelTournamentAck -= UpdateUI;
Connection.Instance.OnGetDataAcks -= UpdateUI; Connection.Instance.OnGetDataAcks -= UpdateUI;
Connection.Instance.OnSetDataAcks -= UpdateUI;
} }
private void UpdateUI() private void UpdateUI()
@@ -66,7 +68,7 @@ public partial class AdminControls : HBoxContainer
StartTournament.Hide(); StartTournament.Hide();
CancelTournament.Hide(); CancelTournament.Hide();
} }
else if (Connection.Instance.IsAdmin && Connection.Instance.ActiveTournament) else if (Connection.Instance.IsAdmin && Connection.Instance.ActiveTournament != TournamentType.None)
{ {
StartTournament.Hide(); StartTournament.Hide();
CancelTournament.Show(); CancelTournament.Show();
@@ -87,7 +89,7 @@ public partial class AdminControls : HBoxContainer
Label.Text = "Wait To Move: " + time + "s "; Label.Text = "Wait To Move: " + time + "s ";
} }
private void ShowAuthPopup() private void showAuthPopup()
{ {
var authWindow = new Window(); var authWindow = new Window();
authWindow.Theme = GD.Load<Theme>("res://assets/theme.tres"); authWindow.Theme = GD.Load<Theme>("res://assets/theme.tres");

9
scripts/BackButton.cs
View File

@@ -1,18 +1,15 @@
using Godot; using Godot;
using System; using System;
public partial class BackButton : TextureButton public partial class BackButton : TextureButton {
{
private const string BRACKET_SCENE_PATH = "res://scenes/bracket_view.tscn"; private const string BRACKET_SCENE_PATH = "res://scenes/bracket_view.tscn";
public override void _Pressed() public override void _Pressed() {
{
TransitionToBracket(); TransitionToBracket();
base._Pressed(); base._Pressed();
} }
private void TransitionToBracket() private void TransitionToBracket() {
{
GetTree().ChangeSceneToFile(BRACKET_SCENE_PATH); GetTree().ChangeSceneToFile(BRACKET_SCENE_PATH);
} }
} }

105
scripts/BoardScreen.cs
View File

@@ -1,8 +1,7 @@
using Godot; using Godot;
using System.Linq; 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;
@@ -38,8 +37,10 @@ public partial class BoardScreen : Node2D
player1Card = GetNode<Node2D>("Player1Card"); player1Card = GetNode<Node2D>("Player1Card");
player2Card = GetNode<Node2D>("Player2Card"); player2Card = GetNode<Node2D>("Player2Card");
player1Card.GetNode<Label>("Name").Resized += () => setPlayerCardScale((player1Card.GetNode<Label>("Name").GetRect().Size.X + 7) / 16, player1Card); player1Card.GetNode<Label>("Name").Resized += () =>
player2Card.GetNode<Label>("Name").Resized += () => setPlayerCardScale((player2Card.GetNode<Label>("Name").GetRect().Size.X + 7) / 16, player2Card); setPlayerCardScale((player1Card.GetNode<Label>("Name").GetRect().Size.X + 7) / 16, player1Card);
player2Card.GetNode<Label>("Name").Resized += () =>
setPlayerCardScale((player2Card.GetNode<Label>("Name").GetRect().Size.X + 7) / 16, player2Card);
redChip = GD.Load<PackedScene>(RED_CHIP_PATH); redChip = GD.Load<PackedScene>(RED_CHIP_PATH);
ylwChip = GD.Load<PackedScene>(YELLOW_CHIP_PATH); ylwChip = GD.Load<PackedScene>(YELLOW_CHIP_PATH);
@@ -48,18 +49,15 @@ public partial class BoardScreen : Node2D
player1Card.GetNode<Label>("Name").Text = matchData.player1; player1Card.GetNode<Label>("Name").Text = matchData.player1;
player2Card.GetNode<Label>("Name").Text = matchData.player2; player2Card.GetNode<Label>("Name").Text = matchData.player2;
if (Connection.Instance.PreviousMoves.Count == 0) if (Connection.Instance.PreviousMoves.Count == 0) {
{
player1Card.GetNode<Label>("Status").Show(); player1Card.GetNode<Label>("Status").Show();
player2Card.GetNode<Label>("Status").Hide(); player2Card.GetNode<Label>("Status").Hide();
} }
else if (Connection.Instance.PreviousMoves.Last().Item1 == matchData.player1) else if (Connection.Instance.PreviousMoves.Last().Item1 == matchData.player1) {
{
player1Card.GetNode<Label>("Status").Hide(); player1Card.GetNode<Label>("Status").Hide();
player2Card.GetNode<Label>("Status").Show(); player2Card.GetNode<Label>("Status").Show();
} }
else else {
{
player1Card.GetNode<Label>("Status").Show(); player1Card.GetNode<Label>("Status").Show();
player2Card.GetNode<Label>("Status").Hide(); player2Card.GetNode<Label>("Status").Hide();
} }
@@ -67,98 +65,82 @@ public partial class BoardScreen : Node2D
Connection.Instance.OnObserveWin += OnObserveWin; Connection.Instance.OnObserveWin += OnObserveWin;
Connection.Instance.OnObserveDraw += OnObserveDraw; Connection.Instance.OnObserveDraw += OnObserveDraw;
Connection.Instance.OnObserveTerminated += OnObserveTerminated; Connection.Instance.OnObserveTerminated += OnObserveTerminated;
Connection.Instance.OnObserveMove += ObserveMove; Connection.Instance.OnObserveMove += OnObserveMove;
} }
public override void _Process(double delta) public override void _Process(double delta) {
{ if (Connection.Instance.PreviousMoves.Count != 0 && currentTimeout <= 0.0f) {
if (Connection.Instance.PreviousMoves.Count != 0 && currentTimeout <= 0.0f)
{
var move = Connection.Instance.PreviousMoves[0]; var move = Connection.Instance.PreviousMoves[0];
Connection.Instance.PreviousMoves.RemoveAt(0); Connection.Instance.PreviousMoves.RemoveAt(0);
if (move.Item1 == matchData.player1) if (move.Item1 == matchData.player1) {
{
spawnRed(move.Item2); spawnRed(move.Item2);
} }
else else {
{
spawnYellow(move.Item2); spawnYellow(move.Item2);
} }
currentTimeout = MOVE_TIMEOUT_BEFORE_PLACE; currentTimeout = MOVE_TIMEOUT_BEFORE_PLACE;
} }
else if (currentTimeout >= 0.0f) else if (currentTimeout >= 0.0f) {
{
currentTimeout -= delta; currentTimeout -= delta;
} }
if (_lastMove) if (_lastMove) {
{
_lastMoveTimer -= (float)delta; _lastMoveTimer -= (float)delta;
} }
if (_lastMoveTimer <= 0.0f) if (_lastMoveTimer <= 0.0f) {
{ if (_winner == "") {
if (_winner == "") showPopupMessage("Draw!");
{
PopupMessage("Draw!");
} }
else else {
{ showPopupMessage(_winner + " wins!");
PopupMessage(_winner + " wins!");
} }
} }
} }
public override void _ExitTree() public override void _ExitTree() {
{
Connection.Instance.OnObserveWin -= OnObserveWin; Connection.Instance.OnObserveWin -= OnObserveWin;
Connection.Instance.OnObserveDraw -= OnObserveDraw; Connection.Instance.OnObserveDraw -= OnObserveDraw;
Connection.Instance.OnObserveTerminated -= OnObserveTerminated; Connection.Instance.OnObserveTerminated -= OnObserveTerminated;
Connection.Instance.OnObserveMove -= ObserveMove; Connection.Instance.OnObserveMove -= OnObserveMove;
} }
private void OnObserveWin(string winner) private void OnObserveWin(string winner) {
{
_lastMove = true; _lastMove = true;
_winner = winner; _winner = winner;
player1Card.GetNode<Label>("Status").Hide(); player1Card.GetNode<Label>("Status").Hide();
player2Card.GetNode<Label>("Status").Hide(); player2Card.GetNode<Label>("Status").Hide();
} }
private void OnObserveDraw() private void OnObserveDraw() {
{
_lastMove = true; _lastMove = true;
player1Card.GetNode<Label>("Status").Hide(); player1Card.GetNode<Label>("Status").Hide();
player2Card.GetNode<Label>("Status").Hide(); player2Card.GetNode<Label>("Status").Hide();
} }
private void OnObserveTerminated() private void OnObserveTerminated() {
{ showPopupMessage("Match Terminated");
PopupMessage("Match Terminated");
player1Card.GetNode<Label>("Status").Hide(); player1Card.GetNode<Label>("Status").Hide();
player2Card.GetNode<Label>("Status").Hide(); player2Card.GetNode<Label>("Status").Hide();
} }
private void ObserveMove(string username, int column) private void OnObserveMove(string username, int column) {
{ if (username == matchData.player1) {
if (username == matchData.player1)
{
if (!_lastMove) if (!_lastMove)
player2Card.GetNode<Label>("Status").Show(); player2Card.GetNode<Label>("Status").Show();
player1Card.GetNode<Label>("Status").Hide(); player1Card.GetNode<Label>("Status").Hide();
} }
else else {
{
if (!_lastMove) if (!_lastMove)
player1Card.GetNode<Label>("Status").Show(); player1Card.GetNode<Label>("Status").Show();
player2Card.GetNode<Label>("Status").Hide(); player2Card.GetNode<Label>("Status").Hide();
} }
Connection.Instance.PreviousMoves.Add((username, column)); Connection.Instance.PreviousMoves.Add((username, column));
} }
private void PopupMessage(string message) private void showPopupMessage(string message) {
{
var popup = new Popup(); var popup = new Popup();
popup.AlwaysOnTop = true; popup.AlwaysOnTop = true;
popup.Size = new Vector2I(200, 100); popup.Size = new Vector2I(200, 100);
@@ -181,11 +163,10 @@ public partial class BoardScreen : Node2D
popup.PopupCentered(); popup.PopupCentered();
sfx.Play(); sfx.Play();
popup.Show(); popup.Show();
TransitionToBracket(); transitionToBracket();
} }
private void TransitionToBracket() private void transitionToBracket() {
{
GetTree().ChangeSceneToFile(BRACKET_SCENE_PATH); GetTree().ChangeSceneToFile(BRACKET_SCENE_PATH);
} }
@@ -195,15 +176,16 @@ public partial class BoardScreen : Node2D
* or * or
* Will return row of board in which chip can be placed * Will return row of board in which chip can be placed
*/ */
public int canPlaceOnCol(int col) { private int canPlaceOnCol(int col) {
if (col < 0 || col > 6) // Col out of range if (col < 0 || col > 6) // Col out of range
return -1; return -1;
return getNextAvailRow(col); return getNextAvailRow(col);
} }
public int getNextAvailRow(int col) { private int getNextAvailRow(int col) {
for(int i = chips.GetLength(0) - 1; i >= 0; i--) { // Start at bottom for (int i = chips.GetLength(0) - 1; i >= 0; i--) {
// Start at bottom
if (chips[i, col] == null) if (chips[i, col] == null)
return i; return i;
} }
@@ -220,7 +202,8 @@ public partial class BoardScreen : Node2D
RigidBody2D newNode = redChip.Instantiate<RigidBody2D>(); RigidBody2D newNode = redChip.Instantiate<RigidBody2D>();
AddChild(newNode); AddChild(newNode);
newNode.Position = new Vector2(CHIP_SCALE * (CHIP_X_OFF + (CHIP_SIZE + CHIP_PADDING) * col), -(CHIP_SIZE + CHIP_PADDING) * 7); newNode.Position = new Vector2(CHIP_SCALE * (CHIP_X_OFF + (CHIP_SIZE + CHIP_PADDING) * col),
-(CHIP_SIZE + CHIP_PADDING) * 7);
chips[row, col] = newNode; chips[row, col] = newNode;
} }
@@ -234,7 +217,8 @@ public partial class BoardScreen : Node2D
RigidBody2D newNode = ylwChip.Instantiate<RigidBody2D>(); RigidBody2D newNode = ylwChip.Instantiate<RigidBody2D>();
AddChild(newNode); AddChild(newNode);
newNode.Position = new Vector2(CHIP_SCALE * (CHIP_X_OFF + (CHIP_SIZE + CHIP_PADDING) * col), -(CHIP_SIZE + CHIP_PADDING) * 7); newNode.Position = new Vector2(CHIP_SCALE * (CHIP_X_OFF + (CHIP_SIZE + CHIP_PADDING) * col),
-(CHIP_SIZE + CHIP_PADDING) * 7);
chips[row, col] = newNode; chips[row, col] = newNode;
} }
@@ -247,12 +231,13 @@ public partial class BoardScreen : Node2D
cardCenter.Scale = new Vector2(x, 2); cardCenter.Scale = new Vector2(x, 2);
cardCenter.Position = new Vector2(CARD_CENTER_X_DEFAULT + offX, cardCenter.Position.Y); cardCenter.Position = new Vector2(CARD_CENTER_X_DEFAULT + offX, cardCenter.Position.Y);
cardRight.Position = new Vector2(CARD_CENTER_X_DEFAULT + offX * 2 + 8, cardRight.Position.Y); // 8 is a magic number (im too lazy) for the size of the card edge multipled by 2 cardRight.Position =
new Vector2(CARD_CENTER_X_DEFAULT + offX * 2 + 8,
cardRight.Position.Y); // 8 is a magic number (im too lazy) for the size of the card edge multipled by 2
} }
} }
enum Direction enum Direction {
{
UP, UP,
UP_RIGHT, UP_RIGHT,
RIGHT, RIGHT,

94
scripts/BracketScene.cs
View File

@@ -1,109 +1,93 @@
using Godot; using Godot;
using System.Collections.Generic; using System.Collections.Generic;
public partial class BracketScene : Control public partial class BracketScene : Control {
{
[Export] public Tree Players; [Export] public Tree Players;
[Export] public Tree Matches; [Export] public Tree Matches;
[Export] public Texture2D WatchButton; [Export] public Texture2D WatchButton;
[Export] public Texture2D TerminateKickButton; [Export] public Texture2D TerminateKickButton;
private const string BOARD_SCENE_PATH = "res://scenes/game.tscn"; private const string BOARD_SCENE_PATH = "res://scenes/game.tscn";
private List<PlayerData> _playerList; private List<PlayerData> playerList;
private List<MatchData> _matchList; private List<MatchData> matchList;
public override void _Ready() public override void _Ready() {
{
Players.SetColumnTitle(0, "Name"); Players.SetColumnTitle(0, "Name");
Players.SetColumnTitle(1, "Ready"); Players.SetColumnTitle(1, "Ready");
Players.SetColumnTitle(2, "Playing"); Players.SetColumnTitle(2, "Playing");
Players.HideRoot = true; Players.HideRoot = true;
Players.ButtonClicked += KickPlayer; Players.ButtonClicked += kickPlayer;
Matches.SetColumnTitle(0, "Match"); Matches.SetColumnTitle(0, "Match");
Matches.SetColumnTitle(1, "Red"); Matches.SetColumnTitle(1, "Red");
Matches.SetColumnTitle(2, "Yellow"); Matches.SetColumnTitle(2, "Yellow");
Matches.HideRoot = true; Matches.HideRoot = true;
Matches.ButtonClicked += WatchGame; Matches.ButtonClicked += watchGame;
Matches.ButtonClicked += TerminateGame; Matches.ButtonClicked += terminateGame;
Connection.Instance.OnUpdatedPlayers += UpdatePlayers; Connection.Instance.OnUpdatedPlayers += updatePlayers;
Connection.Instance.OnUpdatedMatches += UpdateMatches; Connection.Instance.OnUpdatedMatches += updateMatches;
Connection.Instance.OnWatchGameAck += TransitionToBoard; Connection.Instance.OnWatchGameAck += transitionToBoard;
} }
public override void _ExitTree() public override void _ExitTree() {
{ Connection.Instance.OnUpdatedPlayers -= updatePlayers;
Connection.Instance.OnUpdatedPlayers -= UpdatePlayers; Connection.Instance.OnUpdatedMatches -= updateMatches;
Connection.Instance.OnUpdatedMatches -= UpdateMatches; Connection.Instance.OnWatchGameAck -= transitionToBoard;
Connection.Instance.OnWatchGameAck -= TransitionToBoard;
} }
private void UpdatePlayers(List<PlayerData> playerList) private void updatePlayers(List<PlayerData> newPlayerList) {
{
Players.Clear(); Players.Clear();
_playerList = playerList; playerList = newPlayerList;
_playerList.Sort((a, b) => a.username.CompareTo(b.username)); playerList.Sort((a, b) => a.username.CompareTo(b.username));
var root = Players.CreateItem(); var root = Players.CreateItem();
for (int i = 0; i < _playerList.Count; i++) for (int i = 0; i < playerList.Count; i++) {
{
var item = Players.CreateItem(root); var item = Players.CreateItem(root);
item.SetText(0, playerList[i].username); item.SetText(0, newPlayerList[i].username);
item.SetText(1, playerList[i].isReady ? "Yes" : "No"); item.SetText(1, newPlayerList[i].isReady ? "Yes" : "No");
item.SetText(2, playerList[i].isPlaying ? "Yes" : "No"); item.SetText(2, newPlayerList[i].isPlaying ? "Yes" : "No");
if (Connection.Instance.IsAdmin) if (Connection.Instance.IsAdmin) {
{
item.AddButton(0, TerminateKickButton, i, false, "Kick"); item.AddButton(0, TerminateKickButton, i, false, "Kick");
} }
} }
} }
private void UpdateMatches(List<MatchData> matchList) private void updateMatches(List<MatchData> newMatchList) {
{
Matches.Clear(); Matches.Clear();
_matchList = matchList; matchList = newMatchList;
var root = Matches.CreateItem(); var root = Matches.CreateItem();
for (int i = 0; i < matchList.Count; i++) for (int i = 0; i < newMatchList.Count; i++) {
{
var item = Matches.CreateItem(root); var item = Matches.CreateItem(root);
item.SetText(0, matchList[i].matchId.ToString()); item.SetText(0, newMatchList[i].matchId.ToString());
item.SetText(1, matchList[i].player1); item.SetText(1, newMatchList[i].player1);
item.SetText(2, matchList[i].player2); item.SetText(2, newMatchList[i].player2);
item.AddButton(0, WatchButton, i, false, "Watch"); item.AddButton(0, WatchButton, i, false, "Watch");
if (Connection.Instance.IsAdmin) if (Connection.Instance.IsAdmin) {
{
item.AddButton(0, TerminateKickButton, 128 + i, false, "Terminate"); item.AddButton(0, TerminateKickButton, 128 + i, false, "Terminate");
} }
} }
} }
private void WatchGame(TreeItem item, long column, long id, long mouseButtonIndex) private void watchGame(TreeItem item, long column, long id, long mouseButtonIndex) {
{ if (mouseButtonIndex == 1 && column == 0 && id < 128) {
if (mouseButtonIndex == 1 && column == 0 && id < 128) Connection.Instance.SendWatchGame(matchList[(int)id].matchId);
{
Connection.Instance.SendWatchGame(_matchList[(int) id].matchId);
} }
} }
private void TerminateGame(TreeItem item, long column, long id, long mouseButtonIndex) private void terminateGame(TreeItem item, long column, long id, long mouseButtonIndex) {
{ if (mouseButtonIndex == 1 && column == 0 && id - 128 >= 0 && matchList[(int)id - 128] != null) {
if (mouseButtonIndex == 1 && column == 0 && id - 128 >= 0 && _matchList[(int) id - 128] != null) Connection.Instance.TerminateGame(matchList[(int)id - 128].matchId);
{
Connection.Instance.TerminateGame(_matchList[(int) id - 128].matchId);
} }
} }
private void KickPlayer(TreeItem item, long column, long id, long mouseButtonIndex) private void kickPlayer(TreeItem item, long column, long id, long mouseButtonIndex) {
{ if (mouseButtonIndex == 1 && column == 0) {
if (mouseButtonIndex == 1 && column == 0) Connection.Instance.KickPlayer(playerList[(int)id].username);
{
Connection.Instance.KickPlayer(_playerList[(int) id].username);
} }
} }
private void TransitionToBoard() private void transitionToBoard() {
{
GetTree().ChangeSceneToFile(BOARD_SCENE_PATH); GetTree().ChangeSceneToFile(BOARD_SCENE_PATH);
} }
} }

36
scripts/ConnectButtonUI.cs
View File

@@ -1,62 +1,50 @@
using Godot; using Godot;
public partial class ConnectButtonUI : Button public partial class ConnectButtonUI : Button {
{
[Export] public TextEdit AddressField; [Export] public TextEdit AddressField;
[Export] public Label ErrorLabel; [Export] public Label ErrorLabel;
private const string BRACKET_SCENE_PATH = "res://scenes/bracket_view.tscn"; private const string BRACKET_SCENE_PATH = "res://scenes/bracket_view.tscn";
public override void _Ready() public override void _Ready() {
{
Connection.Instance.OnWsConnectionSuccess += OnConnectionSuccess; Connection.Instance.OnWsConnectionSuccess += OnConnectionSuccess;
Connection.Instance.OnWsConnectionFailed += OnConnectionFailed; Connection.Instance.OnWsConnectionFailed += OnConnectionFailed;
if (Connection.Instance.LastUsedConnectionAddress.Length > 0) if (Connection.Instance.LastUsedConnectionAddress.Length > 0) {
{
AddressField.Text = Connection.Instance.LastUsedConnectionAddress; AddressField.Text = Connection.Instance.LastUsedConnectionAddress;
} }
if (Connection.Instance.LastError.Length > 0) if (Connection.Instance.LastError.Length > 0) {
{
ErrorLabel.Text = Connection.Instance.LastError; ErrorLabel.Text = Connection.Instance.LastError;
} }
AddressField.GuiInput += e => AddressField.GuiInput += e => {
{ if (AddressField.HasFocus() && e is InputEventKey inputEventKey && inputEventKey.IsPressed()) {
if (AddressField.HasFocus() && e is InputEventKey inputEventKey && inputEventKey.IsPressed()) if (inputEventKey.KeyLabel == Key.Enter) {
{
if (inputEventKey.KeyLabel == Key.Enter)
{
Connection.Instance.Connect(AddressField.Text); Connection.Instance.Connect(AddressField.Text);
GetViewport().SetInputAsHandled(); GetViewport().SetInputAsHandled();
} }
if (inputEventKey.KeyLabel == Key.Space) if (inputEventKey.KeyLabel == Key.Space) {
{
GetViewport().SetInputAsHandled(); GetViewport().SetInputAsHandled();
} }
} }
}; };
} }
public override void _ExitTree() public override void _ExitTree() {
{
Connection.Instance.OnWsConnectionSuccess -= OnConnectionSuccess; Connection.Instance.OnWsConnectionSuccess -= OnConnectionSuccess;
Connection.Instance.OnWsConnectionFailed -= OnConnectionFailed; Connection.Instance.OnWsConnectionFailed -= OnConnectionFailed;
} }
public override void _Pressed() public override void _Pressed() {
{
Connection.Instance.Connect(AddressField.Text); Connection.Instance.Connect(AddressField.Text);
} }
private void OnConnectionSuccess() private void OnConnectionSuccess() {
{
GetTree().ChangeSceneToFile(BRACKET_SCENE_PATH); GetTree().ChangeSceneToFile(BRACKET_SCENE_PATH);
} }
private void OnConnectionFailed() private void OnConnectionFailed() {
{
ErrorLabel.Text = "Couldn't connect to server! " + Connection.Instance.LastError; ErrorLabel.Text = "Couldn't connect to server! " + Connection.Instance.LastError;
} }
} }

416
scripts/Connection.cs
View File

@@ -1,18 +1,24 @@
using Godot; using Godot;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading;
public partial class Connection : Node public partial class Connection : Node {
{
public const string WS_DEFAULT_ADDRESS = "wss://connect4.abunchofknowitalls.com"; public const string WS_DEFAULT_ADDRESS = "wss://connect4.abunchofknowitalls.com";
private static TournamentType? parseTournamentType(string type) {
switch (type) {
case "RoundRobin":
return TournamentType.RoundRobin;
case "false":
return TournamentType.None;
default:
return null;
}
}
public static Connection Instance { get; private set; } public static Connection Instance { get; private set; }
private WebSocketPeer _webSocket = new (); private WebSocketPeer webSocket = new WebSocketPeer();
private Thread _gameListThread;
private bool _gameListThreadRunning;
public event Action OnConnected; public event Action OnConnected;
public event Action OnReadyAcknowledged; public event Action OnReadyAcknowledged;
public event Action<bool> OnGameStart; public event Action<bool> OnGameStart;
@@ -29,11 +35,12 @@ public partial class Connection : Node
public event Action<string, int> OnObserveMove; public event Action<string, int> OnObserveMove;
public event Action<List<MatchData>> OnUpdatedMatches; public event Action<List<MatchData>> OnUpdatedMatches;
public event Action<List<PlayerData>> OnUpdatedPlayers; public event Action<List<PlayerData>> OnUpdatedPlayers;
public event Action OnStartTournamentAck; public event Action OnStartTournament;
public event Action OnTournamentEnd; public event Action OnTournamentEnd;
public event Action OnCancelTournamentAck; public event Action OnCancelTournamentAck;
public event Action OnBecomeAdmin; public event Action OnBecomeAdmin;
public event Action OnGetDataAcks; public event Action OnGetDataAcks;
public event Action OnSetDataAcks;
public event Action OnWsConnectionSuccess; public event Action OnWsConnectionSuccess;
public event Action OnWsConnectionFailed; public event Action OnWsConnectionFailed;
@@ -44,116 +51,100 @@ public partial class Connection : Node
public bool IsAdmin { get; private set; } public bool IsAdmin { get; private set; }
public bool IsPlayer { get; private set; } public bool IsPlayer { get; private set; }
public bool ActiveTournament { get; private set; } public TournamentType ActiveTournament { get; private set; }
public bool DemoMode { get; private set; } public bool DemoMode { get; private set; }
public List<(string, int)> PreviousMoves { get; private set; } = []; public List<(string, int)> PreviousMoves { get; private set; } = [];
public double CurrentWaitTimeout { get; private set; } = 5.0; public double CurrentWaitTimeout { get; private set; } = 5.0;
public double MaxTimeout { get; private set; } = 30.0;
public MatchData CurrentObservingMatch { get; private set; } public MatchData CurrentObservingMatch { get; private set; }
public string LastUsedConnectionAddress { get; private set; } = ""; public string LastUsedConnectionAddress { get; private set; } = "";
public string LastError { get; private set; } = ""; public string LastError { get; private set; } = "";
private bool IsSocketOpen => _webSocket.GetReadyState() == WebSocketPeer.State.Open; private bool IsSocketOpen => webSocket.GetReadyState() == WebSocketPeer.State.Open;
private bool _connecting = false; private bool isConnecting = false;
private bool _connected = false; private bool isConnected = false;
private List<(string, int)> _lastScoreboard = []; private List<(string, int)> lastScoreboard = [];
private bool _shouldShowTournamentResults = false; private bool shouldShowTournamentResults = false;
private float _refreshGamePlayerListTimer = 5.0f; private float refreshGamePlayerListTimer = 5.0f;
public override void _Ready() public override void _Ready() {
{
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"); Instance.OnWsDisconnect += () => GetTree().ChangeSceneToFile("res://scenes/main_menu.tscn");
} }
public void Connect(string address) public void Connect(string address) {
{ isConnecting = true;
_connecting = true;
LastUsedConnectionAddress = address; LastUsedConnectionAddress = address;
if (_connected) if (isConnected) {
{
return; return;
} }
Error error = _webSocket.ConnectToUrl(address); Error error = webSocket.ConnectToUrl(address);
if (error != Error.Ok) if (error != Error.Ok) {
{
LastError = error.ToString(); LastError = error.ToString();
} }
} }
public override void _Process(double delta) public override void _Process(double delta) {
{ webSocket.Poll();
_webSocket.Poll(); WebSocketPeer.State state = webSocket.GetReadyState();
WebSocketPeer.State state = _webSocket.GetReadyState(); if (state == WebSocketPeer.State.Open) {
if (state == WebSocketPeer.State.Open) if (isConnecting) {
{ isConnecting = false;
if (_connecting) isConnected = true;
{
_connecting = false;
_connected = true;
LastError = ""; LastError = "";
OnWsConnectionSuccess?.Invoke(); OnWsConnectionSuccess?.Invoke();
UpdateGameList(); UpdateGameList();
UpdatePlayerList(); UpdatePlayerList();
_refreshGamePlayerListTimer = 5.0f; refreshGamePlayerListTimer = 5.0f;
} else if (_refreshGamePlayerListTimer <= 0.0f) }
{ else if (refreshGamePlayerListTimer <= 0.0f) {
UpdateGameList(); UpdateGameList();
UpdatePlayerList(); UpdatePlayerList();
_refreshGamePlayerListTimer = 5.0f; refreshGamePlayerListTimer = 5.0f;
} }
else else {
{ refreshGamePlayerListTimer -= (float)delta;
_refreshGamePlayerListTimer -= (float) delta;
} }
while (_webSocket.GetAvailablePacketCount() > 0) while (webSocket.GetAvailablePacketCount() > 0) {
{ string message = webSocket.GetPacket().GetStringFromUtf8();
string message = _webSocket.GetPacket().GetStringFromUtf8(); handleServerMessage(message);
HandleServerMessage(message);
} }
if (_shouldShowTournamentResults) if (shouldShowTournamentResults) {
{
var children = GetTree().Root.GetChildren(); var children = GetTree().Root.GetChildren();
foreach (var child in children) foreach (var child in children) {
{ if (child.Name.ToString() == "BracketView") {
if (child.Name.ToString() == "BracketView") shouldShowTournamentResults = false;
{ ShowTournamentScoreboard(lastScoreboard);
_shouldShowTournamentResults = false;
ShowTournamentScoreboard(_lastScoreboard);
} }
} }
} }
} }
else if (state == WebSocketPeer.State.Connecting) else if (state == WebSocketPeer.State.Connecting) {
{
// Do nothing // Do nothing
} }
else if (state == WebSocketPeer.State.Closing) else if (state == WebSocketPeer.State.Closing) {
{
// Do nothing // Do nothing
} }
else if (state == WebSocketPeer.State.Closed) else if (state == WebSocketPeer.State.Closed) {
{ if (isConnecting) {
if (_connecting) isConnecting = false;
{
_connecting = false;
OnWsConnectionFailed?.Invoke(); OnWsConnectionFailed?.Invoke();
} }
else if (_connected) else if (isConnected) {
{ isConnected = false;
_connected = false;
IsAdmin = false; IsAdmin = false;
CurrentWaitTimeout = 5.0; CurrentWaitTimeout = 5.0;
ActiveTournament = false; ActiveTournament = TournamentType.None;
DemoMode = false; DemoMode = false;
_refreshGamePlayerListTimer = 5.0f; refreshGamePlayerListTimer = 5.0f;
var code = _webSocket.GetCloseCode(); var code = webSocket.GetCloseCode();
var reason = _webSocket.GetCloseReason(); var reason = webSocket.GetCloseReason();
LastError = "Unexpected Disconnect. Reason: " + reason + ", Code: " + code; LastError = "Unexpected Disconnect. Reason: " + reason + ", Code: " + code;
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();
@@ -162,116 +153,120 @@ public partial class Connection : Node
} }
// Player commands // Player commands
public void SendConnect(string clientId) public void SendConnect(string clientId) {
{ if (string.IsNullOrWhiteSpace(clientId)) {
if (string.IsNullOrWhiteSpace(clientId))
{
GD.PrintErr("Client ID is required to CONNECT."); GD.PrintErr("Client ID is required to CONNECT.");
return; return;
} }
clientId = clientId.Trim(); clientId = clientId.Trim();
if (clientId.Contains(":")) if (clientId.Contains(":")) {
{
GD.PrintErr("Client ID cannot contain ':' characters."); GD.PrintErr("Client ID cannot contain ':' characters.");
return; return;
} }
SendCommand("CONNECT", clientId); sendCommand("CONNECT", clientId);
} }
public void SendReady() public void SendDisconnect() {
{ sendCommand("DISCONNECT");
SendCommand("READY");
} }
public void SendPlay(int column) public void SendReady() {
{ sendCommand("READY");
SendCommand("PLAY", column.ToString()); }
public void SendPlay(int column) {
sendCommand("PLAY", column.ToString());
} }
// Observer commands // Observer commands
public void UpdateGameList() public void UpdateGameList() {
{ sendCommand("GAME", "LIST");
SendCommand("GAME", "LIST");
} }
public void UpdatePlayerList() public void UpdatePlayerList() {
{ sendCommand("PLAYER", "LIST");
SendCommand("PLAYER", "LIST");
} }
public void SendWatchGame(int matchID) public void SendWatchGame(int matchID) {
{ sendCommand("GAME", "WATCH:" + matchID);
SendCommand("GAME", "WATCH:" + matchID);
} }
public void AdminAuth(string password) public void AdminAuth(string password) {
{
if (IsAdmin) return; if (IsAdmin) return;
SendCommand("ADMIN", "AUTH:" + password); sendCommand("ADMIN", "AUTH:" + password);
} }
public void GetMoveWait() public void GetMoveWait() {
{ sendCommand("GET", "MOVE_WAIT");
SendCommand("GET", "MOVE_WAIT");
} }
public void GetTournamentStatus() public void GetTournamentStatus() {
{ sendCommand("GET", "TOURNAMENT_STATUS");
SendCommand("GET", "TOURNAMENT_STATUS"); }
public void GetDemoMode() {
sendCommand("GET", "DEMO_MODE");
}
public void GetMaxTimeout() {
sendCommand("GET", "MAX_TIMEOUT");
} }
// Admin commands // Admin commands
public void KickPlayer(string playerId) public void KickPlayer(string playerId) {
{
if (!IsAdmin) return; if (!IsAdmin) return;
SendCommand("ADMIN", "KICK:" + playerId); sendCommand("ADMIN", "KICK:" + playerId);
} }
public void StartTournament() public void StartTournament(string tournamentType = "RoundRobin") {
{
if (!IsAdmin) return; if (!IsAdmin) return;
SendCommand("TOURNAMENT", "START"); sendCommand("TOURNAMENT", "START:" + tournamentType);
} }
public void CancelTournament() public void CancelTournament() {
{
if (!IsAdmin) return; if (!IsAdmin) return;
SendCommand("TOURNAMENT", "CANCEL"); sendCommand("TOURNAMENT", "CANCEL");
} }
public void TerminateGame(int matchID) public void TerminateGame(int matchID) {
{
if (!IsAdmin) return; if (!IsAdmin) return;
SendCommand("GAME", "TERMINATE:" + matchID); sendCommand("GAME", "TERMINATE:" + matchID);
} }
public void SetTournamentWait(float waitTime) public void SetMoveWait(float waitTime) {
{
if (!IsAdmin) return; if (!IsAdmin) return;
CurrentWaitTimeout = waitTime; CurrentWaitTimeout = waitTime;
SendCommand("TOURNAMENT", "WAIT:" + waitTime); sendCommand("SET", "MOVE_WAIT:" + waitTime);
} }
private void SendCommand(string header, string body = "") public void SetDemoMode(bool demoMode) {
{ if (!IsAdmin) return;
if (!IsSocketOpen) DemoMode = demoMode;
{ sendCommand("SET", "DEMO_MODE:" + demoMode);
}
public void SetMaxTimeout(float maxTimeout) {
if (!IsAdmin) return;
MaxTimeout = maxTimeout;
sendCommand("SET", "MAX_TIMEOUT:" + maxTimeout);
}
private void sendCommand(string header, string body = "") {
if (!IsSocketOpen) {
GD.PrintErr($"Cannot send {header}, socket is not open."); GD.PrintErr($"Cannot send {header}, socket is not open.");
return; return;
} }
string payload = string.IsNullOrEmpty(body) ? header : $"{header}:{body}"; string payload = string.IsNullOrEmpty(body) ? header : $"{header}:{body}";
_webSocket.SendText(payload); webSocket.SendText(payload);
} }
private void HandleServerMessage(string message) private void handleServerMessage(string message) {
{ if (string.IsNullOrWhiteSpace(message)) {
if (string.IsNullOrWhiteSpace(message))
{
return; return;
} }
@@ -280,56 +275,48 @@ public partial class Connection : Node
string header; string header;
string body; string body;
int separatorIndex = message.IndexOf(':'); int separatorIndex = message.IndexOf(':');
if (separatorIndex >= 0) if (separatorIndex >= 0) {
{
header = message.Substring(0, separatorIndex).Trim(); header = message.Substring(0, separatorIndex).Trim();
body = message.Substring(separatorIndex + 1).Trim(); body = message.Substring(separatorIndex + 1).Trim();
} }
else else {
{
header = message.Trim(); header = message.Trim();
body = string.Empty; body = string.Empty;
} }
header = header.ToUpperInvariant(); header = header.ToUpperInvariant();
switch (header) switch (header) {
{
case "CONNECT": case "CONNECT":
if (body.Equals("ACK", StringComparison.OrdinalIgnoreCase)) if (body.Equals("ACK", StringComparison.OrdinalIgnoreCase)) {
{
IsPlayer = true; IsPlayer = true;
OnConnected?.Invoke(); OnConnected?.Invoke();
} }
break; break;
case "READY": case "READY":
if (body.Equals("ACK", StringComparison.OrdinalIgnoreCase)) if (body.Equals("ACK", StringComparison.OrdinalIgnoreCase)) {
{
OnReadyAcknowledged?.Invoke(); OnReadyAcknowledged?.Invoke();
} }
break; break;
case "GAME": case "GAME":
HandleGameMessage(body); handleGameMessage(body);
break; break;
case "PLAYER": case "PLAYER":
HandlePlayerList(body); handlePlayerList(body);
break; break;
case "OPPONENT": case "OPPONENT":
if (int.TryParse(body, out int column)) if (int.TryParse(body, out int column)) {
{
OnOpponentMove?.Invoke(column); OnOpponentMove?.Invoke(column);
} }
else else {
{
GD.PrintErr($"Invalid opponent column: {body}"); GD.PrintErr($"Invalid opponent column: {body}");
} }
break; break;
case "ADMIN": case "ADMIN":
if (body == "AUTH:ACK") if (body == "AUTH:ACK") {
{
IsAdmin = true; IsAdmin = true;
GetMoveWait(); GetMoveWait();
GetTournamentStatus(); GetTournamentStatus();
@@ -338,28 +325,38 @@ public partial class Connection : Node
break; break;
case "TOURNAMENT": case "TOURNAMENT":
HandleTournamentMessage(body); handleTournamentMessage(body);
break; break;
case "GET": case "GET":
if (body.StartsWith("MOVE_WAIT")) string data = body.Split(":")[1];
{ if (body.StartsWith("MOVE_WAIT")) {
CurrentWaitTimeout = double.Parse(body.Split(":")[1]); CurrentWaitTimeout = double.Parse(data);
} }
else if (body.StartsWith("TOURNAMENT_STATUS")) else if (body.StartsWith("MAX_TIMEOUT")) {
{ MaxTimeout = double.Parse(data);
string status = body.Split(":")[1];
if (status != "DEMO")
{
ActiveTournament = bool.Parse(status);
} }
else else if (body.StartsWith("DEMO_MODE")) {
{ DemoMode = bool.Parse(data);
ActiveTournament = false; }
DemoMode = true; else if (body.StartsWith("TOURNAMENT_STATUS")) {
TournamentType? type = parseTournamentType(data);
if (type == null) {
GD.PrintErr($"Unhandled tournament type: {data}");
}
else {
ActiveTournament = type.Value;
} }
} }
else {
GD.PrintErr($"Unhandled data get: {body}");
}
OnGetDataAcks?.Invoke(); OnGetDataAcks?.Invoke();
break; break;
case "SET":
OnSetDataAcks?.Invoke();
break;
case "ERROR": case "ERROR":
GD.PrintErr(message); GD.PrintErr(message);
OnError?.Invoke(message); OnError?.Invoke(message);
@@ -370,10 +367,8 @@ public partial class Connection : Node
} }
} }
private void HandleTournamentMessage(string body) private void handleTournamentMessage(string body) {
{ if (string.IsNullOrWhiteSpace(body)) {
if (string.IsNullOrWhiteSpace(body))
{
return; return;
} }
@@ -381,65 +376,60 @@ public partial class Connection : Node
string command = segments[0].Trim().ToUpperInvariant(); string command = segments[0].Trim().ToUpperInvariant();
string argument = segments.Length > 1 ? segments[1].Trim() : string.Empty; string argument = segments.Length > 1 ? segments[1].Trim() : string.Empty;
switch (command) switch (command) {
{ case "END": {
case "END": ActiveTournament = TournamentType.None;
{
ActiveTournament = false;
List<(string, int)> playerScoreboard = new List<(string, int)>(); List<(string, int)> playerScoreboard = new List<(string, int)>();
string[] entries = segments[1].Split("|"); string[] entries = segments[1].Split("|");
foreach (string entry in entries) foreach (string entry in entries) {
{
string[] data = entry.Split(','); string[] data = entry.Split(',');
playerScoreboard.Add((data[0], int.Parse(data[1]))); playerScoreboard.Add((data[0], int.Parse(data[1])));
} }
_lastScoreboard = playerScoreboard; lastScoreboard = playerScoreboard;
_shouldShowTournamentResults = true; shouldShowTournamentResults = true;
OnTournamentEnd?.Invoke(); OnTournamentEnd?.Invoke();
break; break;
} }
case "START": case "START": {
{ TournamentType? type = parseTournamentType(argument);
ActiveTournament = true; if (type == null) {
OnStartTournamentAck?.Invoke(); GD.PrintErr($"Unhandled tournament type: {argument}");
}
else {
ActiveTournament = type.Value;
OnStartTournament?.Invoke();
}
break; break;
} }
case "CANCEL": case "CANCEL": {
{ ActiveTournament = TournamentType.None;
ActiveTournament = false;
OnCancelTournamentAck?.Invoke(); OnCancelTournamentAck?.Invoke();
break; break;
} }
} }
} }
private void HandlePlayerList(string body) private void handlePlayerList(string body) {
{ if (string.IsNullOrWhiteSpace(body)) {
if (string.IsNullOrWhiteSpace(body))
{
return; return;
} }
string[] segments = body.Split(':'); string[] segments = body.Split(':');
string command = segments[0].Trim().ToUpperInvariant(); string command = segments[0].Trim().ToUpperInvariant();
string argument = segments.Length > 1 ? segments[1].Trim() : string.Empty;
switch (command) switch (command) {
{ case "LIST": {
case "LIST":
{
List<PlayerData> players = new List<PlayerData>(); List<PlayerData> players = new List<PlayerData>();
if (segments.Length < 2) if (segments.Length < 2) {
{
OnUpdatedPlayers?.Invoke(players); OnUpdatedPlayers?.Invoke(players);
break; break;
} }
string[] entries = segments[1].Split("|"); string[] entries = segments[1].Split("|");
foreach (string entry in entries) foreach (string entry in entries) {
{
string[] data = entry.Split(','); string[] data = entry.Split(',');
players.Add(new PlayerData(data[0], bool.Parse(data[1]), bool.Parse(data[2]))); players.Add(new PlayerData(data[0], bool.Parse(data[1]), bool.Parse(data[2])));
} }
@@ -450,10 +440,8 @@ public partial class Connection : Node
} }
} }
private void HandleGameMessage(string body) private void handleGameMessage(string body) {
{ if (string.IsNullOrWhiteSpace(body)) {
if (string.IsNullOrWhiteSpace(body))
{
return; return;
} }
@@ -461,10 +449,8 @@ public partial class Connection : Node
string command = segments[0].Trim().ToUpperInvariant(); string command = segments[0].Trim().ToUpperInvariant();
string argument = segments.Length > 1 ? segments[1].Trim() : string.Empty; string argument = segments.Length > 1 ? segments[1].Trim() : string.Empty;
if (IsPlayer) if (IsPlayer) {
{ switch (command) {
switch (command)
{
case "START": case "START":
bool isFirst = argument == "1" || argument.Equals("TRUE", StringComparison.OrdinalIgnoreCase); bool isFirst = argument == "1" || argument.Equals("TRUE", StringComparison.OrdinalIgnoreCase);
OnGameStart?.Invoke(isFirst); OnGameStart?.Invoke(isFirst);
@@ -488,8 +474,7 @@ public partial class Connection : Node
} }
else // Regular observer/admin else // Regular observer/admin
{ {
switch (command) switch (command) {
{
case "WIN": case "WIN":
OnObserveWin?.Invoke(segments[1]); OnObserveWin?.Invoke(segments[1]);
break; break;
@@ -505,15 +490,13 @@ public partial class Connection : Node
case "LIST": case "LIST":
List<MatchData> matches = new List<MatchData>(); List<MatchData> matches = new List<MatchData>();
if (segments.Length < 2) if (segments.Length < 2) {
{
OnUpdatedMatches?.Invoke(matches); OnUpdatedMatches?.Invoke(matches);
break; break;
} }
string[] entries = segments[1].Split("|"); string[] entries = segments[1].Split("|");
foreach (string entry in entries) foreach (string entry in entries) {
{
string[] data = entry.Split(','); string[] data = entry.Split(',');
matches.Add(new MatchData(int.Parse(data[0]), data[1], data[2])); matches.Add(new MatchData(int.Parse(data[0]), data[1], data[2]));
} }
@@ -524,21 +507,19 @@ public partial class Connection : Node
CurrentObservingMatch = null; CurrentObservingMatch = null;
PreviousMoves.Clear(); PreviousMoves.Clear();
string[] activeMatchData = segments[2].Split("|"); string[] activeMatchData = segments[2].Split("|");
if (activeMatchData.IsEmpty()) if (activeMatchData.IsEmpty()) {
{
string[] matchData = segments[2].Split(','); string[] matchData = segments[2].Split(',');
CurrentObservingMatch = new MatchData(int.Parse(matchData[0]), matchData[1], matchData[2]); CurrentObservingMatch = new MatchData(int.Parse(matchData[0]), matchData[1], matchData[2]);
} }
else else {
{
string[] matchData = activeMatchData[0].Split(','); string[] matchData = activeMatchData[0].Split(',');
CurrentObservingMatch = new MatchData(int.Parse(matchData[0]), matchData[1], matchData[2]); CurrentObservingMatch = new MatchData(int.Parse(matchData[0]), matchData[1], matchData[2]);
for (int i = 1; i < activeMatchData.Length; i++) for (int i = 1; i < activeMatchData.Length; i++) {
{
string[] moveData = activeMatchData[i].Split(','); string[] moveData = activeMatchData[i].Split(',');
PreviousMoves.Add((moveData[0], int.Parse(moveData[1]))); PreviousMoves.Add((moveData[0], int.Parse(moveData[1])));
} }
} }
OnWatchGameAck?.Invoke(); OnWatchGameAck?.Invoke();
break; break;
default: default:
@@ -548,8 +529,7 @@ public partial class Connection : Node
} }
} }
public void ShowTournamentScoreboard(List<(string, int)> playerScoreboard) public void ShowTournamentScoreboard(List<(string, int)> playerScoreboard) {
{
var scoreboardWindow = new Window(); var scoreboardWindow = new Window();
scoreboardWindow.Theme = GD.Load<Theme>("res://assets/theme.tres"); scoreboardWindow.Theme = GD.Load<Theme>("res://assets/theme.tres");
scoreboardWindow.AlwaysOnTop = true; scoreboardWindow.AlwaysOnTop = true;
@@ -557,10 +537,7 @@ public partial class Connection : Node
scoreboardWindow.Unresizable = true; scoreboardWindow.Unresizable = true;
scoreboardWindow.InitialPosition = Window.WindowInitialPosition.CenterMainWindowScreen; scoreboardWindow.InitialPosition = Window.WindowInitialPosition.CenterMainWindowScreen;
scoreboardWindow.Size = new Vector2I(256, 512); scoreboardWindow.Size = new Vector2I(256, 512);
scoreboardWindow.CloseRequested += () => scoreboardWindow.CloseRequested += () => { GetTree().Root.RemoveChild(scoreboardWindow); };
{
GetTree().Root.RemoveChild(scoreboardWindow);
};
var tree = new Tree(); var tree = new Tree();
tree.HideRoot = true; tree.HideRoot = true;
@@ -573,8 +550,7 @@ public partial class Connection : Node
tree.SetColumnTitle(1, "Score"); tree.SetColumnTitle(1, "Score");
var root = tree.CreateItem(); var root = tree.CreateItem();
foreach ((string, int) entry in playerScoreboard) foreach ((string, int) entry in playerScoreboard) {
{
var item = tree.CreateItem(root); var item = tree.CreateItem(root);
item.SetText(0, entry.Item1); item.SetText(0, entry.Item1);
item.SetText(1, entry.Item2.ToString()); item.SetText(1, entry.Item2.ToString());

6
scripts/MatchData.cs
View File

@@ -1,11 +1,9 @@
public class MatchData public class MatchData {
{
public int matchId { get; private set; } public int matchId { get; private set; }
public string player1 { get; private set; } public string player1 { get; private set; }
public string player2 { get; private set; } public string player2 { get; private set; }
public MatchData(int matchId, string player1, string player2) public MatchData(int matchId, string player1, string player2) {
{
this.matchId = matchId; this.matchId = matchId;
this.player1 = player1; this.player1 = player1;
this.player2 = player2; this.player2 = player2;

6
scripts/PlayerData.cs
View File

@@ -1,11 +1,9 @@
public class PlayerData public class PlayerData {
{
public string username { get; private set; } public string username { get; private set; }
public bool isReady { get; private set; } public bool isReady { get; private set; }
public bool isPlaying { get; private set; } public bool isPlaying { get; private set; }
public PlayerData(string username, bool isReady, bool isPlaying) public PlayerData(string username, bool isReady, bool isPlaying) {
{
this.username = username; this.username = username;
this.isReady = isReady; this.isReady = isReady;
this.isPlaying = isPlaying; this.isPlaying = isPlaying;

5
scripts/TournamentType.cs Normal file
View File

@@ -0,0 +1,5 @@
public enum TournamentType {
None,
RoundRobin
}