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

Compare commits

base: joshuafhiggins:v1.0.0
Branches Tags
joshuafhiggins:main joshuafhiggins:old-observer
joshuafhiggins:v2.0.0 joshuafhiggins:v2.0.0-rc4 joshuafhiggins:v2.0.0-rc3 joshuafhiggins:v2.0.0-rc2 joshuafhiggins:v2.0.0-rc1 joshuafhiggins:v1.0.1 joshuafhiggins:v1.0.0 joshuafhiggins:v0.2.0 joshuafhiggins:v0.1.3 joshuafhiggins:v0.1.2 joshuafhiggins:v0.1.1 joshuafhiggins:v0.1.0
...
compare: joshuafhiggins:old-observer
Branches Tags
joshuafhiggins:main joshuafhiggins:old-observer
joshuafhiggins:v2.0.0 joshuafhiggins:v2.0.0-rc4 joshuafhiggins:v2.0.0-rc3 joshuafhiggins:v2.0.0-rc2 joshuafhiggins:v2.0.0-rc1 joshuafhiggins:v1.0.1 joshuafhiggins:v1.0.0 joshuafhiggins:v0.2.0 joshuafhiggins:v0.1.3 joshuafhiggins:v0.1.2 joshuafhiggins:v0.1.1 joshuafhiggins:v0.1.0

11 Commits
v1.0.0 ... old-observ

15 changed files with 1504 additions and 1136 deletions
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

45
export_presets.cfg
View File

@@ -3,7 +3,6 @@
name="macOS" name="macOS"
platform="macOS" platform="macOS"
runnable=true runnable=true
advanced_options=true
dedicated_server=false dedicated_server=false
custom_features="" custom_features=""
export_filter="all_resources" export_filter="all_resources"
@@ -11,6 +10,11 @@ include_filter=""
exclude_filter="" exclude_filter=""
export_path="../../Downloads/connect4-moderator-observer.dmg" export_path="../../Downloads/connect4-moderator-observer.dmg"
patches=PackedStringArray() patches=PackedStringArray()
patch_delta_encoding=false
patch_delta_compression_level_zstd=19
patch_delta_min_reduction=0.1
patch_delta_include_filters="*"
patch_delta_exclude_filters=""
encryption_include_filters="" encryption_include_filters=""
encryption_exclude_filters="" encryption_exclude_filters=""
seed=0 seed=0
@@ -25,6 +29,7 @@ binary_format/architecture="universal"
custom_template/debug="" custom_template/debug=""
custom_template/release="" custom_template/release=""
debug/export_console_wrapper=0 debug/export_console_wrapper=0
application/liquid_glass_icon="res://icon.icon"
application/icon="uid://dd7lvnidxr5ss" application/icon="uid://dd7lvnidxr5ss"
application/icon_interpolation=0 application/icon_interpolation=0
application/bundle_identifier="com.abunchofknowitalls.connect4" application/bundle_identifier="com.abunchofknowitalls.connect4"
@@ -32,7 +37,7 @@ application/signature=""
application/app_category="Games" application/app_category="Games"
application/short_version="" application/short_version=""
application/version="" application/version=""
application/copyright="RPI Minds and Machines" application/copyright="RPI Minds & Machines"
application/copyright_localized={} application/copyright_localized={}
application/min_macos_version_x86_64="10.12" application/min_macos_version_x86_64="10.12"
application/min_macos_version_arm64="11.00" application/min_macos_version_arm64="11.00"
@@ -185,10 +190,10 @@ privacy/collected_data/browsing_history/collected=false
privacy/collected_data/browsing_history/linked_to_user=false privacy/collected_data/browsing_history/linked_to_user=false
privacy/collected_data/browsing_history/used_for_tracking=false privacy/collected_data/browsing_history/used_for_tracking=false
privacy/collected_data/browsing_history/collection_purposes=0 privacy/collected_data/browsing_history/collection_purposes=0
privacy/collected_data/search_hhistory/collected=false privacy/collected_data/search_history/collected=false
privacy/collected_data/search_hhistory/linked_to_user=false privacy/collected_data/search_history/linked_to_user=false
privacy/collected_data/search_hhistory/used_for_tracking=false privacy/collected_data/search_history/used_for_tracking=false
privacy/collected_data/search_hhistory/collection_purposes=0 privacy/collected_data/search_history/collection_purposes=0
privacy/collected_data/user_id/collected=false privacy/collected_data/user_id/collected=false
privacy/collected_data/user_id/linked_to_user=false privacy/collected_data/user_id/linked_to_user=false
privacy/collected_data/user_id/used_for_tracking=false privacy/collected_data/user_id/used_for_tracking=false
@@ -255,13 +260,16 @@ rm -rf \"{temp_dir}\""
dotnet/include_scripts_content=false dotnet/include_scripts_content=false
dotnet/include_debug_symbols=false dotnet/include_debug_symbols=false
dotnet/embed_build_outputs=false dotnet/embed_build_outputs=false
privacy/collected_data/search_hhistory/collected=false
privacy/collected_data/search_hhistory/linked_to_user=false
privacy/collected_data/search_hhistory/used_for_tracking=false
privacy/collected_data/search_hhistory/collection_purposes=0
[preset.1] [preset.1]
name="Windows (x86_64)" name="Windows (x86_64)"
platform="Windows Desktop" platform="Windows Desktop"
runnable=true runnable=true
advanced_options=true
dedicated_server=false dedicated_server=false
custom_features="" custom_features=""
export_filter="all_resources" export_filter="all_resources"
@@ -269,6 +277,11 @@ include_filter=""
exclude_filter="" exclude_filter=""
export_path="../../Downloads/connect4-moderator-observer (win-x86_64).exe" export_path="../../Downloads/connect4-moderator-observer (win-x86_64).exe"
patches=PackedStringArray() patches=PackedStringArray()
patch_delta_encoding=false
patch_delta_compression_level_zstd=19
patch_delta_min_reduction=0.1
patch_delta_include_filters="*"
patch_delta_exclude_filters=""
encryption_include_filters="" encryption_include_filters=""
encryption_exclude_filters="" encryption_exclude_filters=""
seed=0 seed=0
@@ -332,7 +345,6 @@ dotnet/embed_build_outputs=true
name="Windows (arm64)" name="Windows (arm64)"
platform="Windows Desktop" platform="Windows Desktop"
runnable=false runnable=false
advanced_options=true
dedicated_server=false dedicated_server=false
custom_features="" custom_features=""
export_filter="all_resources" export_filter="all_resources"
@@ -340,6 +352,11 @@ include_filter=""
exclude_filter="" exclude_filter=""
export_path="../../Downloads/connect4-moderator-observer (win-arm64).exe" export_path="../../Downloads/connect4-moderator-observer (win-arm64).exe"
patches=PackedStringArray() patches=PackedStringArray()
patch_delta_encoding=false
patch_delta_compression_level_zstd=19
patch_delta_min_reduction=0.1
patch_delta_include_filters="*"
patch_delta_exclude_filters=""
encryption_include_filters="" encryption_include_filters=""
encryption_exclude_filters="" encryption_exclude_filters=""
seed=0 seed=0
@@ -403,7 +420,6 @@ dotnet/embed_build_outputs=true
name="Linux (x86_64)" name="Linux (x86_64)"
platform="Linux" platform="Linux"
runnable=true runnable=true
advanced_options=true
dedicated_server=false dedicated_server=false
custom_features="" custom_features=""
export_filter="all_resources" export_filter="all_resources"
@@ -411,6 +427,11 @@ include_filter=""
exclude_filter="" exclude_filter=""
export_path="../../Downloads/connect4-moderator-observer (linux-x86_64).out" export_path="../../Downloads/connect4-moderator-observer (linux-x86_64).out"
patches=PackedStringArray() patches=PackedStringArray()
patch_delta_encoding=false
patch_delta_compression_level_zstd=19
patch_delta_min_reduction=0.1
patch_delta_include_filters="*"
patch_delta_exclude_filters=""
encryption_include_filters="" encryption_include_filters=""
encryption_exclude_filters="" encryption_exclude_filters=""
seed=0 seed=0
@@ -449,7 +470,6 @@ dotnet/embed_build_outputs=true
name="Linux (arm64)" name="Linux (arm64)"
platform="Linux" platform="Linux"
runnable=false runnable=false
advanced_options=true
dedicated_server=false dedicated_server=false
custom_features="" custom_features=""
export_filter="all_resources" export_filter="all_resources"
@@ -457,6 +477,11 @@ include_filter=""
exclude_filter="" exclude_filter=""
export_path="../../Downloads/connect4-moderator-observer (linux-arm64).out" export_path="../../Downloads/connect4-moderator-observer (linux-arm64).out"
patches=PackedStringArray() patches=PackedStringArray()
patch_delta_encoding=false
patch_delta_compression_level_zstd=19
patch_delta_min_reduction=0.1
patch_delta_include_filters="*"
patch_delta_exclude_filters=""
encryption_include_filters="" encryption_include_filters=""
encryption_exclude_filters="" encryption_exclude_filters=""
seed=0 seed=0

8
project.godot
View File

@@ -8,12 +8,16 @@
config_version=5 config_version=5
[animation]
compatibility/default_parent_skeleton_in_mesh_instance_3d=true
[application] [application]
config/name="Connect4 Observer" config/name="Connect4 Observer"
config/version="1.0.0" config/version="1.0.1"
run/main_scene="uid://dcx5nvs0pa7me" run/main_scene="uid://dcx5nvs0pa7me"
config/features=PackedStringArray("4.5", "C#", "Forward Plus") config/features=PackedStringArray("4.6", "C#", "Forward Plus")
boot_splash/image="uid://dd7lvnidxr5ss" boot_splash/image="uid://dd7lvnidxr5ss"
config/icon="uid://dd7lvnidxr5ss" config/icon="uid://dd7lvnidxr5ss"

8
scripts/AddressUI.cs
View File

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

236
scripts/AdminControls.cs
View File

@@ -1,149 +1,133 @@
using Godot; using Godot;
public partial class AdminControls : HBoxContainer public partial class AdminControls : HBoxContainer {
{ [Export] public Button BecomeAdmin;
[Export] public Button BecomeAdmin; [Export] public Button StartTournament;
[Export] public Button StartTournament; [Export] public Button CancelTournament;
[Export] public Button CancelTournament; [Export] public Label Label;
[Export] public Label Label; [Export] public Slider Timeout;
[Export] public Slider Timeout;
public override void _Ready() public override void _Ready() {
Connection.Instance.OnBecomeAdmin += UpdateUI;
Connection.Instance.OnTournamentEnd += UpdateUI;
Connection.Instance.OnStartTournament += UpdateUI;
Connection.Instance.OnCancelTournamentAck += UpdateUI;
Connection.Instance.OnGetDataAcks += UpdateUI;
Connection.Instance.OnSetDataAcks += UpdateUI;
StartTournament.Pressed += () => Connection.Instance.StartTournament();
CancelTournament.Pressed += () => Connection.Instance.CancelTournament();
UpdateUI();
Timeout.ValueChanged += value =>
{ {
Connection.Instance.OnBecomeAdmin += UpdateUI; Connection.Instance.SetMoveWait((float)value);
Connection.Instance.OnTournamentEnd += UpdateUI; var time = Connection.Instance.CurrentWaitTimeout.ToString();
Connection.Instance.OnStartTournamentAck += UpdateUI; if (time.Length > 3) {
Connection.Instance.OnCancelTournamentAck += UpdateUI; time = time.Substring(0, 3);
Connection.Instance.OnGetDataAcks += UpdateUI; }
Label.Text = "Wait To Move: " + time + "s ";
};
StartTournament.Pressed += () => Connection.Instance.StartTournament(); BecomeAdmin.Pressed += showAuthPopup;
CancelTournament.Pressed += () => Connection.Instance.CancelTournament(); }
UpdateUI(); public override void _ExitTree() {
Connection.Instance.OnBecomeAdmin -= UpdateUI;
Connection.Instance.OnTournamentEnd -= UpdateUI;
Connection.Instance.OnStartTournament -= UpdateUI;
Connection.Instance.OnCancelTournamentAck -= UpdateUI;
Connection.Instance.OnGetDataAcks -= UpdateUI;
Connection.Instance.OnSetDataAcks -= UpdateUI;
}
Timeout.ValueChanged += value => private void UpdateUI() {
{ if (!Connection.Instance.IsAdmin) {
Connection.Instance.SetTournamentWait((float)value); BecomeAdmin.Show();
var time = Connection.Instance.CurrentWaitTimeout.ToString(); StartTournament.Hide();
if (time.Length > 3) CancelTournament.Hide();
{ Label.Hide();
time = time.Substring(0, 3); Timeout.Hide();
} } else {
Label.Text = "Wait To Move: " + time + "s "; BecomeAdmin.Hide();
}; Label.Show();
Timeout.Show();
BecomeAdmin.Pressed += ShowAuthPopup;
} }
public override void _ExitTree() if (Connection.Instance.IsAdmin && Connection.Instance.DemoMode) {
{ StartTournament.Hide();
Connection.Instance.OnBecomeAdmin -= UpdateUI; CancelTournament.Hide();
Connection.Instance.OnTournamentEnd -= UpdateUI; } else if (Connection.Instance.IsAdmin && Connection.Instance.ActiveTournament != TournamentType.None) {
Connection.Instance.OnStartTournamentAck -= UpdateUI; StartTournament.Hide();
Connection.Instance.OnCancelTournamentAck -= UpdateUI; CancelTournament.Show();
Connection.Instance.OnGetDataAcks -= UpdateUI; } else if (Connection.Instance.IsAdmin) {
StartTournament.Show();
CancelTournament.Hide();
} }
private void UpdateUI() Timeout.Value = Connection.Instance.CurrentWaitTimeout;
{ var time = Connection.Instance.CurrentWaitTimeout.ToString();
if (!Connection.Instance.IsAdmin) if (time.Length > 3) {
{ time = time.Substring(0, 3);
BecomeAdmin.Show();
StartTournament.Hide();
CancelTournament.Hide();
Label.Hide();
Timeout.Hide();
}
else
{
BecomeAdmin.Hide();
Label.Show();
Timeout.Show();
}
if (Connection.Instance.IsAdmin && Connection.Instance.DemoMode)
{
StartTournament.Hide();
CancelTournament.Hide();
}
else if (Connection.Instance.IsAdmin && Connection.Instance.ActiveTournament)
{
StartTournament.Hide();
CancelTournament.Show();
}
else if (Connection.Instance.IsAdmin)
{
StartTournament.Show();
CancelTournament.Hide();
}
Timeout.Value = Connection.Instance.CurrentWaitTimeout;
var time = Connection.Instance.CurrentWaitTimeout.ToString();
if (time.Length > 3)
{
time = time.Substring(0, 3);
}
Label.Text = "Wait To Move: " + time + "s ";
} }
private void ShowAuthPopup() Label.Text = "Wait To Move: " + time + "s ";
}
private void showAuthPopup() {
var authWindow = new Window();
authWindow.Theme = GD.Load<Theme>("res://assets/theme.tres");
authWindow.AlwaysOnTop = true;
authWindow.MaximizeDisabled = true;
authWindow.Unresizable = true;
authWindow.InitialPosition = Window.WindowInitialPosition.CenterMainWindowScreen;
authWindow.Size = new Vector2I(256, 128);
authWindow.CloseRequested += () =>
{ {
var authWindow = new Window(); GetTree().Root.CallDeferred(Node.MethodName.RemoveChild, authWindow);
authWindow.Theme = GD.Load<Theme>("res://assets/theme.tres"); };
authWindow.AlwaysOnTop = true;
authWindow.MaximizeDisabled = true;
authWindow.Unresizable = true;
authWindow.InitialPosition = Window.WindowInitialPosition.CenterMainWindowScreen;
authWindow.Size = new Vector2I(256, 128);
authWindow.CloseRequested += () =>
{
GetTree().Root.CallDeferred(Node.MethodName.RemoveChild, authWindow);
};
var vbox = new VBoxContainer(); var vbox = new VBoxContainer();
vbox.LayoutMode = 1; vbox.LayoutMode = 1;
vbox.AnchorBottom = 1.0f; vbox.AnchorBottom = 1.0f;
vbox.AnchorRight = 1.0f; vbox.AnchorRight = 1.0f;
vbox.GrowHorizontal = GrowDirection.Both; vbox.GrowHorizontal = GrowDirection.Both;
vbox.GrowVertical = GrowDirection.Both; vbox.GrowVertical = GrowDirection.Both;
vbox.Alignment = AlignmentMode.Center; vbox.Alignment = AlignmentMode.Center;
var passwordBox = new TextEdit(); var passwordBox = new TextEdit();
passwordBox.PlaceholderText = "Password"; passwordBox.PlaceholderText = "Password";
passwordBox.SetCustomMinimumSize(new Vector2(32, 32)); passwordBox.SetCustomMinimumSize(new Vector2(32, 32));
passwordBox.GuiInput += e => passwordBox.GuiInput += e =>
{ {
if (passwordBox.HasFocus() && e is InputEventKey inputEventKey && inputEventKey.IsPressed()) if (passwordBox.HasFocus() && e is InputEventKey inputEventKey && inputEventKey.IsPressed()) {
{ if (inputEventKey.KeyLabel == Key.Enter) {
if (inputEventKey.KeyLabel == Key.Enter) Connection.Instance.AdminAuth(passwordBox.Text);
{ GetTree().Root.CallDeferred(Node.MethodName.RemoveChild, authWindow);
Connection.Instance.AdminAuth(passwordBox.Text); GetViewport().SetInputAsHandled();
GetTree().Root.CallDeferred(Node.MethodName.RemoveChild, authWindow); }
GetViewport().SetInputAsHandled();
}
if (inputEventKey.KeyLabel == Key.Space) if (inputEventKey.KeyLabel == Key.Space) {
{ GetViewport().SetInputAsHandled();
GetViewport().SetInputAsHandled(); }
} }
} };
};
var button = new Button(); var button = new Button();
button.Text = "Login"; button.Text = "Login";
button.Pressed += () => button.Pressed += () =>
{ {
Connection.Instance.AdminAuth(passwordBox.Text); Connection.Instance.AdminAuth(passwordBox.Text);
GetTree().Root.CallDeferred(Node.MethodName.RemoveChild, authWindow); GetTree().Root.CallDeferred(Node.MethodName.RemoveChild, authWindow);
}; };
vbox.AddChild(passwordBox); vbox.AddChild(passwordBox);
vbox.AddChild(button); vbox.AddChild(button);
authWindow.AddChild(vbox); authWindow.AddChild(vbox);
GetTree().Root.AddChild(authWindow); GetTree().Root.AddChild(authWindow);
} }
} }

19
scripts/BackButton.cs
View File

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

431
scripts/BoardScreen.cs
View File

@@ -1,264 +1,241 @@
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) {
} player1Card.GetNode<Label>("Status").Hide();
else if (Connection.Instance.PreviousMoves.Last().Item1 == matchData.player1) player2Card.GetNode<Label>("Status").Show();
{ } else {
player1Card.GetNode<Label>("Status").Hide(); player1Card.GetNode<Label>("Status").Show();
player2Card.GetNode<Label>("Status").Show(); player2Card.GetNode<Label>("Status").Hide();
}
else
{
player1Card.GetNode<Label>("Status").Show();
player2Card.GetNode<Label>("Status").Hide();
}
Connection.Instance.OnObserveWin += OnObserveWin;
Connection.Instance.OnObserveDraw += OnObserveDraw;
Connection.Instance.OnObserveTerminated += OnObserveTerminated;
Connection.Instance.OnObserveMove += ObserveMove;
} }
public override void _Process(double delta) Connection.Instance.OnObserveWin += OnObserveWin;
{ Connection.Instance.OnObserveDraw += OnObserveDraw;
if (Connection.Instance.PreviousMoves.Count != 0 && currentTimeout <= 0.0f) Connection.Instance.OnObserveTerminated += OnObserveTerminated;
{ Connection.Instance.OnObserveMove += OnObserveMove;
var move = Connection.Instance.PreviousMoves[0]; }
Connection.Instance.PreviousMoves.RemoveAt(0);
if (move.Item1 == matchData.player1)
{
spawnRed(move.Item2);
}
else
{
spawnYellow(move.Item2);
}
currentTimeout = MOVE_TIMEOUT_BEFORE_PLACE; public override void _Process(double delta) {
} if (Connection.Instance.PreviousMoves.Count != 0 && currentTimeout <= 0.0f) {
else if (currentTimeout >= 0.0f) var move = Connection.Instance.PreviousMoves[0];
{ Connection.Instance.PreviousMoves.RemoveAt(0);
currentTimeout -= delta; if (move.Item1 == matchData.player1) {
} spawnRed(move.Item2);
} else {
spawnYellow(move.Item2);
}
if (_lastMove) currentTimeout = MOVE_TIMEOUT_BEFORE_PLACE;
{ } else if (currentTimeout >= 0.0f) {
_lastMoveTimer -= (float) delta; currentTimeout -= delta;
}
if (_lastMoveTimer <= 0.0f)
{
if (_winner == "")
{
PopupMessage("Draw!");
}
else
{
PopupMessage(_winner + " wins!");
}
}
} }
public override void _ExitTree() if (_lastMove) {
{ _lastMoveTimer -= (float)delta;
Connection.Instance.OnObserveWin -= OnObserveWin;
Connection.Instance.OnObserveDraw -= OnObserveDraw;
Connection.Instance.OnObserveTerminated -= OnObserveTerminated;
Connection.Instance.OnObserveMove -= ObserveMove;
} }
private void OnObserveWin(string winner) if (_lastMoveTimer <= 0.0f) {
{ if (_winner == "") {
_lastMove = true; showPopupMessage("Draw!");
_winner = winner; } else {
player1Card.GetNode<Label>("Status").Hide(); showPopupMessage(_winner + " wins!");
player2Card.GetNode<Label>("Status").Hide(); }
}
}
public override void _ExitTree() {
Connection.Instance.OnObserveWin -= OnObserveWin;
Connection.Instance.OnObserveDraw -= OnObserveDraw;
Connection.Instance.OnObserveTerminated -= OnObserveTerminated;
Connection.Instance.OnObserveMove -= OnObserveMove;
}
private void OnObserveWin(string winner) {
_lastMove = true;
_winner = winner;
player1Card.GetNode<Label>("Status").Hide();
player2Card.GetNode<Label>("Status").Hide();
}
private void OnObserveDraw() {
_lastMove = true;
player1Card.GetNode<Label>("Status").Hide();
player2Card.GetNode<Label>("Status").Hide();
}
private void OnObserveTerminated() {
showPopupMessage("Match Terminated");
player1Card.GetNode<Label>("Status").Hide();
player2Card.GetNode<Label>("Status").Hide();
}
private void OnObserveMove(string username, int column) {
if (username == matchData.player1) {
if (!_lastMove)
player2Card.GetNode<Label>("Status").Show();
player1Card.GetNode<Label>("Status").Hide();
} else {
if (!_lastMove)
player1Card.GetNode<Label>("Status").Show();
player2Card.GetNode<Label>("Status").Hide();
} }
private void OnObserveDraw() Connection.Instance.PreviousMoves.Add((username, column));
{ }
_lastMove = true;
player1Card.GetNode<Label>("Status").Hide(); private void showPopupMessage(string message) {
player2Card.GetNode<Label>("Status").Hide(); 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() { GetTree().ChangeSceneToFile(BRACKET_SCENE_PATH); }
/*
* 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;
return getNextAvailRow(col);
}
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 OnObserveTerminated() return -1;
{ }
PopupMessage("Match Terminated");
player1Card.GetNode<Label>("Status").Hide(); private void spawnRed(int col) {
player2Card.GetNode<Label>("Status").Hide(); int row = canPlaceOnCol(col);
if (row == -1) {
GD.Print("Invalid Placement!");
return;
} }
private void ObserveMove(string username, int column) RigidBody2D newNode = redChip.Instantiate<RigidBody2D>();
{ AddChild(newNode);
if (username == matchData.player1) newNode.Position = new Vector2(CHIP_SCALE * (CHIP_X_OFF + (CHIP_SIZE + CHIP_PADDING) * col),
{ -(CHIP_SIZE + CHIP_PADDING) * 7);
if (!_lastMove)
player2Card.GetNode<Label>("Status").Show(); chips[row, col] = newNode;
player1Card.GetNode<Label>("Status").Hide(); }
}
else private void spawnYellow(int col) {
{ int row = canPlaceOnCol(col);
if (!_lastMove) if (row == -1) {
player1Card.GetNode<Label>("Status").Show(); GD.Print("Invalid Placement!");
player2Card.GetNode<Label>("Status").Hide(); return;
}
Connection.Instance.PreviousMoves.Add((username, column));
} }
private void PopupMessage(string message) RigidBody2D newNode = ylwChip.Instantiate<RigidBody2D>();
{ AddChild(newNode);
var popup = new Popup(); newNode.Position = new Vector2(CHIP_SCALE * (CHIP_X_OFF + (CHIP_SIZE + CHIP_PADDING) * col),
popup.AlwaysOnTop = true; -(CHIP_SIZE + CHIP_PADDING) * 7);
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() chips[row, col] = newNode;
{ }
GetTree().ChangeSceneToFile(BRACKET_SCENE_PATH);
}
/* private void setPlayerCardScale(float x, Node2D playerCard) {
* Determines if the column can have a new chip placed Sprite2D cardCenter = playerCard.GetNode<Sprite2D>("Center");
* Will return -1 if invalid Sprite2D cardRight = playerCard.GetNode<Sprite2D>("Right");
* 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); float offX = 16 * x / 2;
} cardCenter.Scale = new Vector2(x, 2);
cardCenter.Position = new Vector2(CARD_CENTER_X_DEFAULT + offX, cardCenter.Position.Y);
public int getNextAvailRow(int col) { cardRight.Position =
for(int i = chips.GetLength(0) - 1; i >= 0; i--) { // Start at bottom new Vector2(CARD_CENTER_X_DEFAULT + offX * 2 + 8,
if(chips[i, col] == null) cardRight.Position.Y); // 8 is a magic number (im too lazy) for the size of the card edge multipled by 2
return i; }
}
return -1;
}
private void spawnRed(int col) {
int row = canPlaceOnCol(col);
if(row == -1) {
GD.Print("Invalid Placement!");
return;
}
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);
chips[row, col] = newNode;
}
private void spawnYellow(int col) {
int row = canPlaceOnCol(col);
if(row == -1) {
GD.Print("Invalid Placement!");
return;
}
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);
chips[row, col] = newNode;
}
private void setPlayerCardScale(float x, Node2D playerCard) {
Sprite2D cardCenter = playerCard.GetNode<Sprite2D>("Center");
Sprite2D cardRight = playerCard.GetNode<Sprite2D>("Right");
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
} }

162
scripts/BracketScene.cs
View File

@@ -1,109 +1,91 @@
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() {
Connection.Instance.OnUpdatedPlayers -= updatePlayers;
Connection.Instance.OnUpdatedMatches -= updateMatches;
Connection.Instance.OnWatchGameAck -= transitionToBoard;
}
private void updatePlayers(List<PlayerData> newPlayerList) {
Players.Clear();
playerList = newPlayerList;
playerList.Sort((a, b) => a.Username.CompareTo(b.Username));
var root = Players.CreateItem();
for (int i = 0; i < playerList.Count; i++) {
var item = Players.CreateItem(root);
item.SetText(0, newPlayerList[i].Username);
item.SetText(1, newPlayerList[i].IsReady ? "Yes" : "No");
item.SetText(2, newPlayerList[i].IsPlaying ? "Yes" : "No");
if (Connection.Instance.IsAdmin) {
item.AddButton(0, TerminateKickButton, i, false, "Kick");
}
} }
}
public override void _ExitTree() private void updateMatches(List<MatchData> newMatchList) {
{ Matches.Clear();
Connection.Instance.OnUpdatedPlayers -= UpdatePlayers; matchList = newMatchList;
Connection.Instance.OnUpdatedMatches -= UpdateMatches; var root = Matches.CreateItem();
Connection.Instance.OnWatchGameAck -= TransitionToBoard; for (int i = 0; i < newMatchList.Count; i++) {
var item = Matches.CreateItem(root);
item.SetText(0, newMatchList[i].matchId.ToString());
item.SetText(1, newMatchList[i].player1);
item.SetText(2, newMatchList[i].player2);
item.AddButton(0, WatchButton, i, false, "Watch");
if (Connection.Instance.IsAdmin) {
item.AddButton(0, TerminateKickButton, 128 + i, false, "Terminate");
}
} }
}
private void UpdatePlayers(List<PlayerData> playerList) private void watchGame(TreeItem item, long column, long id, long mouseButtonIndex) {
{ if (mouseButtonIndex == 1 && column == 0 && id < 128) {
Players.Clear(); Connection.Instance.SendWatchGame(matchList[(int)id].matchId);
_playerList = playerList;
_playerList.Sort((a, b) => a.username.CompareTo(b.username));
var root = Players.CreateItem();
for (int i = 0; i < _playerList.Count; i++)
{
var item = Players.CreateItem(root);
item.SetText(0, playerList[i].username);
item.SetText(1, playerList[i].isReady ? "Yes" : "No");
item.SetText(2, playerList[i].isPlaying ? "Yes" : "No");
if (Connection.Instance.IsAdmin)
{
item.AddButton(0, TerminateKickButton, i, false, "Kick");
}
}
} }
}
private void UpdateMatches(List<MatchData> matchList) private void terminateGame(TreeItem item, long column, long id, long mouseButtonIndex) {
{ if (mouseButtonIndex == 1 && column == 0 && id - 128 >= 0 && matchList[(int)id - 128] != null) {
Matches.Clear(); Connection.Instance.TerminateGame(matchList[(int)id - 128].matchId);
_matchList = matchList;
var root = Matches.CreateItem();
for (int i = 0; i < matchList.Count; i++)
{
var item = Matches.CreateItem(root);
item.SetText(0, matchList[i].matchId.ToString());
item.SetText(1, matchList[i].player1);
item.SetText(2, matchList[i].player2);
item.AddButton(0, WatchButton, i, false, "Watch");
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 kickPlayer(TreeItem item, long column, long id, long mouseButtonIndex) {
{ if (mouseButtonIndex == 1 && column == 0) {
if (mouseButtonIndex == 1 && column == 0 && id < 128) Connection.Instance.KickPlayer(playerList[(int)id].Username);
{
Connection.Instance.SendWatchGame(_matchList[(int) id].matchId);
}
} }
}
private void TerminateGame(TreeItem item, long column, long id, long mouseButtonIndex) private void transitionToBoard() { GetTree().ChangeSceneToFile(BOARD_SCENE_PATH); }
{
if (mouseButtonIndex == 1 && column == 0 && id - 128 >= 0 && _matchList[(int) id - 128] != null)
{
Connection.Instance.TerminateGame(_matchList[(int) id - 128].matchId);
}
}
private void KickPlayer(TreeItem item, long column, long id, long mouseButtonIndex)
{
if (mouseButtonIndex == 1 && column == 0)
{
Connection.Instance.KickPlayer(_playerList[(int) id].username);
}
}
private void TransitionToBoard()
{
GetTree().ChangeSceneToFile(BOARD_SCENE_PATH);
}
} }

404
scripts/Connect4WinProbability.cs Normal file
View File

@@ -0,0 +1,404 @@
using System;
using System.Numerics;
/// <summary>
/// Estimates Red/Yellow/Draw chances from a Connect 4 board state.
///
/// Implementation notes:
/// - Uses a near-perfect solver core (negamax + alpha-beta + transposition table) on a standard 7x6 bitboard.
/// - Converts the exact (perfect-play) score into a "chess.com-like" practical win% using:
/// (1) a sigmoid mapping of engine score -> win probability,
/// (2) an optional complexity adjustment based on how many moves preserve the best outcome.
/// </summary>
public static class Connect4WinProbability {
public const int Width = 7;
public const int Height = 6;
/// <summary>
/// Cell content.
/// </summary>
public enum Cell {
None = 0,
Red = 1,
Yellow = 2,
}
public readonly record struct Chances(double RedWinChance, double YellowWinChance, double DrawChance) {
public Chances Normalize() {
var sum = RedWinChance + YellowWinChance + DrawChance;
if (sum <= 0) return new Chances(0.5, 0.5, 0.0);
return new Chances(RedWinChance / sum, YellowWinChance / sum, DrawChance / sum);
}
}
/// <summary>
/// Estimate win/draw chances for the given board.
///
/// Expected board shape is [7,6]. The first index is column (0..6) and the second is row (0..5).
/// Row orientation is auto-detected: this method will accept either row=0 bottom or row=0 top,
/// as long as the position is gravity-valid.
///
/// <paramref name="toMove"/> must be Red or Yellow.
/// </summary>
/// <param name="board">2D array [7,6].</param>
/// <param name="toMove">Who is to play next.</param>
/// <param name="nodeBudget">Maximum explored nodes before falling back to the best-so-far estimate.</param>
/// <param name="enableComplexityAdjustment">If true, adjusts probabilities using move uniqueness/fragility.</param>
public static Chances Evaluate(Cell[,] board, Cell toMove, int nodeBudget = 350_000, bool enableComplexityAdjustment = true) {
if (board == null) throw new ArgumentNullException(nameof(board));
if (board.GetLength(0) != Width || board.GetLength(1) != Height)
throw new ArgumentException($"Board must be [{Width},{Height}]", nameof(board));
if (toMove is not Cell.Red and not Cell.Yellow)
throw new ArgumentException("toMove must be Cell.Red or Cell.Yellow", nameof(toMove));
if (!TryParseBoard(board, out var redBits, out var yellowBits)) {
// If the board is invalid, avoid lying with a confident number.
return new Chances(0.45, 0.45, 0.10).Normalize();
}
var mask = redBits | yellowBits;
var nbMoves = BitOperations.PopCount(mask);
// If someone has already won (shouldn't happen in a "next move" position, but observers might see it).
if (HasAlignment(redBits) && HasAlignment(yellowBits)) {
// Illegal: both cannot have 4-in-a-row in a legal game.
return new Chances(0.45, 0.45, 0.10).Normalize();
}
if (HasAlignment(redBits)) return new Chances(1.0, 0.0, 0.0);
if (HasAlignment(yellowBits)) return new Chances(0.0, 1.0, 0.0);
var position = Position.FromBitboards(mask, toMove == Cell.Red ? redBits : yellowBits);
// Solve the exact perfect-play score.
var tt = new TranspositionTable(1 << 20);
var solver = new Solver(tt, nodeBudget);
int bestScore = solver.Negamax(position, alpha: -Position.MaxScore, beta: Position.MaxScore);
// Optional complexity: score all immediate child moves (only up to 7) to see how "fragile" the outcome is.
int legalMoves = 0;
int bestMoves = 0;
int drawingMoves = 0;
if (enableComplexityAdjustment) {
for (int col = 0; col < Width; col++) {
if (!position.CanPlay(col)) continue;
legalMoves++;
var child = position;
child.Play(col);
// Reuse the same TT for speed.
int score = -solver.Negamax(child, alpha: -Position.MaxScore, beta: Position.MaxScore);
if (score == bestScore) bestMoves++;
if (score == 0) drawingMoves++;
}
if (legalMoves == 0) {
// Board full.
return new Chances(0.0, 0.0, 1.0);
}
} else {
for (int col = 0; col < Width; col++) if (position.CanPlay(col)) legalMoves++;
if (legalMoves == 0) return new Chances(0.0, 0.0, 1.0);
bestMoves = Math.Max(1, legalMoves / 2);
drawingMoves = 0;
}
var (pCurrentWin, pDraw) = ScoreToPracticalProbabilities(bestScore, nbMoves, legalMoves, bestMoves, drawingMoves);
var pCurrentLoss = Math.Max(0.0, 1.0 - pDraw - pCurrentWin);
// Map from current-player POV to Red/Yellow.
Chances result = toMove == Cell.Red
? new Chances(pCurrentWin, pCurrentLoss, pDraw)
: new Chances(pCurrentLoss, pCurrentWin, pDraw);
return result.Normalize();
}
private static (double pCurrentWin, double pDraw) ScoreToPracticalProbabilities(
int score,
int nbMoves,
int legalMoves,
int bestMoves,
int drawingMoves
) {
// Normalize score by the maximum possible magnitude at this ply.
// The classic perfect-solver scoring is within [-21, 21] on a 7x6 board.
var maxAtPly = Math.Max(1, (Width * Height + 1 - nbMoves) / 2); // similar to gamesolver.org tutorial scoring
double s = Math.Clamp(score / (double)maxAtPly, -1.0, 1.0);
// Base win probability ignoring draws: a sigmoid curve similar in spirit to chess eval->win% mappings.
const double sigmoidScale = 3.0;
double pWinNoDraw = Sigmoid(s * sigmoidScale);
// Complexity/fragility: if only a few moves preserve the best outcome, the practical win% should be less extreme.
// complexity = 0 means many best moves (easy), 1 means only one best move (fragile).
double complexity = 1.0;
if (legalMoves > 0) {
complexity = 1.0 - Math.Clamp(bestMoves / (double)legalMoves, 0.0, 1.0);
}
// Blend toward 50% based on complexity.
// (If there are many good moves, keep the evaluation confident; if there's only one, flatten it.)
double flatten = 0.60 * complexity;
pWinNoDraw = Lerp(pWinNoDraw, 0.5, flatten);
// Draw propensity.
// - If perfect play draws (score == 0), put a significant mass on draw, more so if many moves keep it drawn.
// - If perfect play is decisive, keep draw small but non-zero (practical mistakes can still drift to a draw).
double drawMoveRatio = legalMoves > 0 ? (drawingMoves / (double)legalMoves) : 0.0;
double pDraw;
if (score == 0) {
pDraw = 0.55 + 0.35 * drawMoveRatio; // 0.55..0.90
// If draw is very "fragile" (few drawing moves), reduce draw slightly.
pDraw -= 0.10 * complexity;
} else {
// Keep it small, but let it rise a bit for positions where many moves still lead to a theoretical draw.
pDraw = 0.02 + 0.10 * drawMoveRatio;
// If the position is very complex, increase draw slightly (practical play drifts).
pDraw += 0.03 * complexity;
}
pDraw = Math.Clamp(pDraw, 0.0, 0.90);
// Combine.
double pWin = (1.0 - pDraw) * pWinNoDraw;
pWin = Math.Clamp(pWin, 0.0, 1.0 - pDraw);
return (pWin, pDraw);
}
private static double Sigmoid(double x) => 1.0 / (1.0 + Math.Exp(-x));
private static double Lerp(double a, double b, double t) => a + (b - a) * Math.Clamp(t, 0.0, 1.0);
private static bool TryParseBoard(Cell[,] board, out ulong redBits, out ulong yellowBits) {
// We accept either row=0 bottom OR row=0 top as long as it is gravity-valid.
// We try both and select the first valid representation.
if (TryParseBoard(board, row0IsBottom: true, out redBits, out yellowBits)) return true;
if (TryParseBoard(board, row0IsBottom: false, out redBits, out yellowBits)) return true;
redBits = 0;
yellowBits = 0;
return false;
}
private static bool TryParseBoard(Cell[,] board, bool row0IsBottom, out ulong redBits, out ulong yellowBits) {
redBits = 0;
yellowBits = 0;
for (int col = 0; col < Width; col++) {
bool seenEmptyBelow = false;
for (int rowIdx = 0; rowIdx < Height; rowIdx++) {
int row = row0IsBottom ? rowIdx : (Height - 1 - rowIdx);
var cell = board[col, row];
if (cell == Cell.None) {
seenEmptyBelow = true;
continue;
}
if (seenEmptyBelow) {
// A disc is "floating" above an empty cell in this interpretation.
return false;
}
int bitRow = rowIdx; // bottom=0
ulong bit = 1UL << (col * (Height + 1) + bitRow);
if (cell == Cell.Red) redBits |= bit;
else if (cell == Cell.Yellow) yellowBits |= bit;
else return false;
}
}
// Additional sanity: overlap check.
return (redBits & yellowBits) == 0;
}
private static bool HasAlignment(ulong pos) {
// Checks 4-in-a-row for a bitboard with (Height+1)=7 stride per column.
// Shifts correspond to:
// - 1: vertical
// - (Height+1): horizontal
// - (Height+1)+1: diagonal /
// - (Height+1)-1: diagonal \
int h1 = Height + 1;
// vertical
if (HasFour(pos, 1)) return true;
// horizontal
if (HasFour(pos, h1)) return true;
// diag / (up-right)
if (HasFour(pos, h1 + 1)) return true;
// diag \ (down-right)
if (HasFour(pos, h1 - 1)) return true;
return false;
}
private static bool HasFour(ulong pos, int shift) {
ulong m = pos & (pos >> shift);
return (m & (m >> (2 * shift))) != 0;
}
private struct Position {
// Bitboard representation (Pascal Pons / Tromp style):
// - mask: all occupied cells
// - current: stones of the player to move
public ulong Mask;
public ulong Current;
public const int MaxScore = (Width * Height + 1) / 2; // 21
private static readonly ulong[] BottomMask = new ulong[Width];
private static readonly ulong[] TopMask = new ulong[Width];
private static readonly ulong[] ColumnMask = new ulong[Width];
private static readonly ulong BoardMask;
static Position() {
for (int c = 0; c < Width; c++) {
BottomMask[c] = 1UL << (c * (Height + 1));
TopMask[c] = 1UL << (c * (Height + 1) + (Height - 1));
ulong colMask = 0;
for (int r = 0; r < Height; r++) colMask |= 1UL << (c * (Height + 1) + r);
ColumnMask[c] = colMask;
}
ulong bm = 0;
for (int c = 0; c < Width; c++) bm |= ColumnMask[c];
BoardMask = bm;
}
public static Position FromBitboards(ulong mask, ulong currentToMoveBits) {
return new Position { Mask = mask, Current = currentToMoveBits };
}
public int NbMoves() => BitOperations.PopCount(Mask);
public bool CanPlay(int col) {
if ((uint)col >= Width) return false;
return (Mask & TopMask[col]) == 0;
}
public void Play(int col) {
// Switch side-to-move by XOR with mask (classic trick).
Current ^= Mask;
// Drop a disc into the given column.
Mask |= Mask + BottomMask[col];
// Ensure Mask only contains board cells.
Mask &= BoardMask;
}
public bool IsWinningMove(int col) {
// Compute the position of the current player AFTER playing this column.
ulong pos = Current;
ulong m = Mask;
// play into column: get the bit for the new disc
ulong newMask = (m | (m + BottomMask[col])) & BoardMask;
ulong moveBit = newMask ^ m;
pos |= moveBit;
return HasAlignment(pos);
}
public ulong Key() {
// Mix mask + current into a stable 64-bit key.
// Good enough for a fixed-size transposition table.
unchecked {
ulong x = Mask * 6364136223846793005UL + 1442695040888963407UL;
return x ^ (Current * 11400714819323198485UL);
}
}
}
private sealed class TranspositionTable {
private struct Entry {
public ulong Key;
public sbyte Value;
public byte Used;
}
private readonly Entry[] _entries;
private readonly int _mask;
public TranspositionTable(int sizePowerOfTwo) {
if (sizePowerOfTwo <= 0 || (sizePowerOfTwo & (sizePowerOfTwo - 1)) != 0)
throw new ArgumentException("TT size must be a power of two", nameof(sizePowerOfTwo));
_entries = new Entry[sizePowerOfTwo];
_mask = sizePowerOfTwo - 1;
}
public bool TryGet(ulong key, out int value) {
ref var e = ref _entries[(int)key & _mask];
if (e.Used != 0 && e.Key == key) {
value = e.Value;
return true;
}
value = 0;
return false;
}
public void Put(ulong key, int value) {
ref var e = ref _entries[(int)key & _mask];
e.Key = key;
e.Value = (sbyte)Math.Clamp(value, -127, 127);
e.Used = 1;
}
}
private sealed class Solver {
private readonly TranspositionTable _tt;
private readonly int _nodeBudget;
private int _nodes;
public Solver(TranspositionTable tt, int nodeBudget) {
_tt = tt;
_nodeBudget = Math.Max(10_000, nodeBudget);
_nodes = 0;
}
public int Negamax(Position p, int alpha, int beta) {
// Budget guard: if we run out, return a conservative estimate.
if (_nodes++ > _nodeBudget) return 0;
int moves = p.NbMoves();
if (moves >= Width * Height) return 0; // draw by full board
// Tight theoretical bounds for this ply (helps alpha-beta).
int max = (Width * Height + 1 - moves) / 2;
int min = -(Width * Height - moves) / 2;
if (alpha < min) alpha = min;
if (beta > max) beta = max;
if (alpha >= beta) return alpha;
// Immediate win check.
for (int col = 0; col < Width; col++) {
if (!p.CanPlay(col)) continue;
if (p.IsWinningMove(col)) return max;
}
ulong key = p.Key();
if (_tt.TryGet(key, out int cached)) return cached;
int best = min;
// Center-first move ordering (classic Connect 4 heuristic).
// Order: 3,4,2,5,1,6,0
Span<int> order = stackalloc int[Width] { 3, 4, 2, 5, 1, 6, 0 };
for (int i = 0; i < order.Length; i++) {
int col = order[i];
if (!p.CanPlay(col)) continue;
var child = p;
child.Play(col);
int score = -Negamax(child, -beta, -alpha);
if (score > best) best = score;
if (score > alpha) alpha = score;
if (alpha >= beta) break;
}
_tt.Put(key, best);
return best;
}
}
}

85
scripts/ConnectButtonUI.cs
View File

@@ -1,62 +1,47 @@
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.OnWsConnectionFailed += OnConnectionFailed;
if (Connection.Instance.LastUsedConnectionAddress.Length > 0) {
AddressField.Text = Connection.Instance.LastUsedConnectionAddress;
}
if (Connection.Instance.LastError.Length > 0) {
ErrorLabel.Text = Connection.Instance.LastError;
}
AddressField.GuiInput += e =>
{ {
Connection.Instance.OnWsConnectionSuccess += OnConnectionSuccess; if (AddressField.HasFocus() && e is InputEventKey inputEventKey && inputEventKey.IsPressed()) {
Connection.Instance.OnWsConnectionFailed += OnConnectionFailed; if (inputEventKey.KeyLabel == Key.Enter) {
Connection.Instance.Connect(AddressField.Text);
if (Connection.Instance.LastUsedConnectionAddress.Length > 0) GetViewport().SetInputAsHandled();
{
AddressField.Text = Connection.Instance.LastUsedConnectionAddress;
} }
if (Connection.Instance.LastError.Length > 0) if (inputEventKey.KeyLabel == Key.Space) {
{ GetViewport().SetInputAsHandled();
ErrorLabel.Text = Connection.Instance.LastError;
} }
}
};
}
AddressField.GuiInput += e => public override void _ExitTree() {
{ Connection.Instance.OnWsConnectionSuccess -= OnConnectionSuccess;
if (AddressField.HasFocus() && e is InputEventKey inputEventKey && inputEventKey.IsPressed()) Connection.Instance.OnWsConnectionFailed -= OnConnectionFailed;
{ }
if (inputEventKey.KeyLabel == Key.Enter)
{
Connection.Instance.Connect(AddressField.Text);
GetViewport().SetInputAsHandled();
}
if (inputEventKey.KeyLabel == Key.Space) public override void _Pressed() { Connection.Instance.Connect(AddressField.Text); }
{
GetViewport().SetInputAsHandled();
}
}
};
}
public override void _ExitTree() private void OnConnectionSuccess() { GetTree().ChangeSceneToFile(BRACKET_SCENE_PATH); }
{
Connection.Instance.OnWsConnectionSuccess -= OnConnectionSuccess;
Connection.Instance.OnWsConnectionFailed -= OnConnectionFailed;
}
public override void _Pressed() private void OnConnectionFailed() {
{ ErrorLabel.Text = "Couldn't connect to server! " + Connection.Instance.LastError;
Connection.Instance.Connect(AddressField.Text); }
}
private void OnConnectionSuccess()
{
GetTree().ChangeSceneToFile(BRACKET_SCENE_PATH);
}
private void OnConnectionFailed()
{
ErrorLabel.Text = "Couldn't connect to server! " + Connection.Instance.LastError;
}
} }

1129
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) {
{ Username = username;
this.username = username; IsReady = isReady;
this.isReady = isReady; IsPlaying = isPlaying;
this.isPlaying = isPlaying; }
}
} }

4
scripts/TournamentType.cs Normal file
View File

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

1
scripts/TournamentType.cs.uid Normal file
View File

@@ -0,0 +1 @@
uid://dwb6ioubllb24