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

10
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");

21
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); }
}
} }

429
scripts/BoardScreen.cs
View File

@@ -1,264 +1,249 @@
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;
private const string RED_CHIP_PATH = "res://scenes/red_chip.tscn"; private const string RED_CHIP_PATH = "res://scenes/red_chip.tscn";
private const string YELLOW_CHIP_PATH = "res://scenes/yellow_chip.tscn"; private const string YELLOW_CHIP_PATH = "res://scenes/yellow_chip.tscn";
private const string BRACKET_SCENE_PATH = "res://scenes/bracket_view.tscn"; private const string BRACKET_SCENE_PATH = "res://scenes/bracket_view.tscn";
private const int CHIP_SCALE = 3; private const int CHIP_SCALE = 3;
private const int CHIP_SIZE = 24; private const int CHIP_SIZE = 24;
private const int CHIP_PADDING = 2; private const int CHIP_PADDING = 2;
private const int CHIP_X_OFF = -(CHIP_SIZE + CHIP_PADDING) * 7 / 2 + (CHIP_SIZE + CHIP_PADDING) / 2; private const int CHIP_X_OFF = -(CHIP_SIZE + CHIP_PADDING) * 7 / 2 + (CHIP_SIZE + CHIP_PADDING) / 2;
private const int Y_OFF = 300; private const int Y_OFF = 300;
private const int CARD_CENTER_X_DEFAULT = -536; private const int CARD_CENTER_X_DEFAULT = -536;
private const double MOVE_TIMEOUT_BEFORE_PLACE = 1.0f; private const double MOVE_TIMEOUT_BEFORE_PLACE = 1.0f;
private double currentTimeout = 0.0f; private double currentTimeout = 0.0f;
private PackedScene redChip; private PackedScene redChip;
private PackedScene ylwChip; private PackedScene ylwChip;
private Node2D player1Card; private Node2D player1Card;
private Node2D player2Card; private Node2D player2Card;
private MatchData matchData; private MatchData matchData;
private RigidBody2D[,] chips = new RigidBody2D[6, 7]; // 6 rows 7 cols | 0, 0 is top left private RigidBody2D[,] chips = new RigidBody2D[6, 7]; // 6 rows 7 cols | 0, 0 is top left
private bool _lastMove = false; private bool _lastMove = false;
private float _lastMoveTimer = 2.5f; private float _lastMoveTimer = 2.5f;
private string _winner = ""; private string _winner = "";
// Called when the node enters the scene tree for the first time. // Called when the node enters the scene tree for the first time.
public override void _Ready() { public override void _Ready() {
// Node initialization // Node initialization
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);
matchData = Connection.Instance.CurrentObservingMatch; matchData = Connection.Instance.CurrentObservingMatch;
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();
{ player2Card.GetNode<Label>("Status").Show();
player1Card.GetNode<Label>("Status").Hide(); }
player2Card.GetNode<Label>("Status").Show(); else {
} player1Card.GetNode<Label>("Status").Show();
else player2Card.GetNode<Label>("Status").Hide();
{ }
player1Card.GetNode<Label>("Status").Show();
player2Card.GetNode<Label>("Status").Hide();
}
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];
{ Connection.Instance.PreviousMoves.RemoveAt(0);
var move = Connection.Instance.PreviousMoves[0]; if (move.Item1 == matchData.player1) {
Connection.Instance.PreviousMoves.RemoveAt(0); spawnRed(move.Item2);
if (move.Item1 == matchData.player1) }
{ else {
spawnRed(move.Item2); spawnYellow(move.Item2);
} }
else
{
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 {
} showPopupMessage(_winner + " wins!");
else }
{ }
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 -= OnObserveMove;
Connection.Instance.OnObserveMove -= ObserveMove; }
}
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)
{ player2Card.GetNode<Label>("Status").Show();
if (!_lastMove) player1Card.GetNode<Label>("Status").Hide();
player2Card.GetNode<Label>("Status").Show(); }
player1Card.GetNode<Label>("Status").Hide(); else {
} if (!_lastMove)
else player1Card.GetNode<Label>("Status").Show();
{ player2Card.GetNode<Label>("Status").Hide();
if (!_lastMove) }
player1Card.GetNode<Label>("Status").Show();
player2Card.GetNode<Label>("Status").Hide();
}
Connection.Instance.PreviousMoves.Add((username, column));
}
private void PopupMessage(string message) Connection.Instance.PreviousMoves.Add((username, column));
{ }
var popup = new Popup();
popup.AlwaysOnTop = true;
popup.Size = new Vector2I(200, 100);
popup.Theme = GD.Load<Theme>("res://assets/theme.tres");
var text = new Label();
text.Text = message;
var sfx = new AudioStreamPlayer();
sfx.Stream = endingSfx;
sfx.VolumeDb = -2;
popup.AddChild(sfx);
popup.AddChild(text);
text.GrowHorizontal = Control.GrowDirection.Both;
text.GrowVertical = Control.GrowDirection.Both;
text.HorizontalAlignment = HorizontalAlignment.Center;
text.VerticalAlignment = VerticalAlignment.Center;
text.AnchorsPreset = (int) Control.LayoutPreset.FullRect;
popup.InitialPosition = Window.WindowInitialPosition.CenterMainWindowScreen;
popup.PopupHide += () => popup.QueueFree();
GetTree().Root.AddChild(popup);
popup.PopupCentered();
sfx.Play();
popup.Show();
TransitionToBracket();
}
private void TransitionToBracket() private void showPopupMessage(string message) {
{ var popup = new Popup();
GetTree().ChangeSceneToFile(BRACKET_SCENE_PATH); popup.AlwaysOnTop = true;
} popup.Size = new Vector2I(200, 100);
popup.Theme = GD.Load<Theme>("res://assets/theme.tres");
var text = new Label();
text.Text = message;
var sfx = new AudioStreamPlayer();
sfx.Stream = endingSfx;
sfx.VolumeDb = -2;
popup.AddChild(sfx);
popup.AddChild(text);
text.GrowHorizontal = Control.GrowDirection.Both;
text.GrowVertical = Control.GrowDirection.Both;
text.HorizontalAlignment = HorizontalAlignment.Center;
text.VerticalAlignment = VerticalAlignment.Center;
text.AnchorsPreset = (int)Control.LayoutPreset.FullRect;
popup.InitialPosition = Window.WindowInitialPosition.CenterMainWindowScreen;
popup.PopupHide += () => popup.QueueFree();
GetTree().Root.AddChild(popup);
popup.PopupCentered();
sfx.Play();
popup.Show();
transitionToBracket();
}
/* private void transitionToBracket() {
* Determines if the column can have a new chip placed GetTree().ChangeSceneToFile(BRACKET_SCENE_PATH);
* Will return -1 if invalid }
* or
* Will return row of board in which chip can be placed
*/
public int canPlaceOnCol(int col) {
if(col < 0 || col > 6) // Col out of range
return -1;
return getNextAvailRow(col); /*
} * Determines if the column can have a new chip placed
* Will return -1 if invalid
* or
* Will return row of board in which chip can be placed
*/
private int canPlaceOnCol(int col) {
if (col < 0 || col > 6) // Col out of range
return -1;
public int getNextAvailRow(int col) { return getNextAvailRow(col);
for(int i = chips.GetLength(0) - 1; i >= 0; i--) { // Start at bottom }
if(chips[i, col] == null)
return i;
}
return -1; private int getNextAvailRow(int col) {
} for (int i = chips.GetLength(0) - 1; i >= 0; i--) {
// Start at bottom
if (chips[i, col] == null)
return i;
}
private void spawnRed(int col) { return -1;
int row = canPlaceOnCol(col); }
if(row == -1) {
GD.Print("Invalid Placement!");
return;
}
RigidBody2D newNode = redChip.Instantiate<RigidBody2D>(); private void spawnRed(int col) {
AddChild(newNode); int row = canPlaceOnCol(col);
newNode.Position = new Vector2(CHIP_SCALE * (CHIP_X_OFF + (CHIP_SIZE + CHIP_PADDING) * col), -(CHIP_SIZE + CHIP_PADDING) * 7); if (row == -1) {
GD.Print("Invalid Placement!");
return;
}
chips[row, col] = newNode; RigidBody2D newNode = redChip.Instantiate<RigidBody2D>();
} AddChild(newNode);
newNode.Position = new Vector2(CHIP_SCALE * (CHIP_X_OFF + (CHIP_SIZE + CHIP_PADDING) * col),
-(CHIP_SIZE + CHIP_PADDING) * 7);
private void spawnYellow(int col) { chips[row, col] = newNode;
int row = canPlaceOnCol(col); }
if(row == -1) {
GD.Print("Invalid Placement!");
return;
}
RigidBody2D newNode = ylwChip.Instantiate<RigidBody2D>(); private void spawnYellow(int col) {
AddChild(newNode); int row = canPlaceOnCol(col);
newNode.Position = new Vector2(CHIP_SCALE * (CHIP_X_OFF + (CHIP_SIZE + CHIP_PADDING) * col), -(CHIP_SIZE + CHIP_PADDING) * 7); if (row == -1) {
GD.Print("Invalid Placement!");
return;
}
chips[row, col] = newNode; RigidBody2D newNode = ylwChip.Instantiate<RigidBody2D>();
} AddChild(newNode);
newNode.Position = new Vector2(CHIP_SCALE * (CHIP_X_OFF + (CHIP_SIZE + CHIP_PADDING) * col),
-(CHIP_SIZE + CHIP_PADDING) * 7);
private void setPlayerCardScale(float x, Node2D playerCard) { chips[row, col] = newNode;
Sprite2D cardCenter = playerCard.GetNode<Sprite2D>("Center"); }
Sprite2D cardRight = playerCard.GetNode<Sprite2D>("Right");
float offX = 16 * x / 2; private void setPlayerCardScale(float x, Node2D playerCard) {
cardCenter.Scale = new Vector2(x, 2); Sprite2D cardCenter = playerCard.GetNode<Sprite2D>("Center");
cardCenter.Position = new Vector2(CARD_CENTER_X_DEFAULT + offX, cardCenter.Position.Y); Sprite2D cardRight = playerCard.GetNode<Sprite2D>("Right");
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 float offX = 16 * x / 2;
} cardCenter.Scale = new Vector2(x, 2);
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
}
} }
enum Direction enum Direction {
{ UP,
UP, UP_RIGHT,
UP_RIGHT, RIGHT,
RIGHT, DOWN_RIGHT,
DOWN_RIGHT, DOWN,
DOWN, DOWN_LEFT,
DOWN_LEFT, LEFT,
LEFT, UP_LEFT
UP_LEFT
} }

170
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 = newPlayerList;
_playerList = playerList; 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);
{ item.SetText(0, newPlayerList[i].username);
var item = Players.CreateItem(root); item.SetText(1, newPlayerList[i].isReady ? "Yes" : "No");
item.SetText(0, playerList[i].username); item.SetText(2, newPlayerList[i].isPlaying ? "Yes" : "No");
item.SetText(1, playerList[i].isReady ? "Yes" : "No"); if (Connection.Instance.IsAdmin) {
item.SetText(2, playerList[i].isPlaying ? "Yes" : "No"); item.AddButton(0, TerminateKickButton, i, false, "Kick");
if (Connection.Instance.IsAdmin) }
{ }
item.AddButton(0, TerminateKickButton, i, false, "Kick"); }
}
}
}
private void UpdateMatches(List<MatchData> matchList) private void updateMatches(List<MatchData> newMatchList) {
{ Matches.Clear();
Matches.Clear(); matchList = newMatchList;
_matchList = matchList; var root = Matches.CreateItem();
var root = Matches.CreateItem(); for (int i = 0; i < newMatchList.Count; i++) {
for (int i = 0; i < matchList.Count; i++) var item = Matches.CreateItem(root);
{ item.SetText(0, newMatchList[i].matchId.ToString());
var item = Matches.CreateItem(root); item.SetText(1, newMatchList[i].player1);
item.SetText(0, matchList[i].matchId.ToString()); item.SetText(2, newMatchList[i].player2);
item.SetText(1, matchList[i].player1); item.AddButton(0, WatchButton, i, false, "Watch");
item.SetText(2, matchList[i].player2); if (Connection.Instance.IsAdmin) {
item.AddButton(0, WatchButton, i, false, "Watch"); item.AddButton(0, TerminateKickButton, 128 + i, false, "Terminate");
if (Connection.Instance.IsAdmin) }
{ }
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); }
}
} }

88
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) {
{ Connection.Instance.Connect(AddressField.Text);
if (inputEventKey.KeyLabel == Key.Enter) GetViewport().SetInputAsHandled();
{ }
Connection.Instance.Connect(AddressField.Text);
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; }
}
} }

1144
scripts/Connection.cs
View File

File diff suppressed because it is too large Load Diff

20
scripts/MatchData.cs
View File

@@ -1,13 +1,11 @@
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; }
}
} }

20
scripts/PlayerData.cs
View File

@@ -1,13 +1,11 @@
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
}