From 00c878968e95b39f79ef8e8a71a0409d5a2f0abb Mon Sep 17 00:00:00 2001
From: Joshua Higgins <joshuafhiggins@gmail.com>
Date: Wed, 3 Dec 2025 22:38:11 -0500
Subject: [PATCH] feat: oh yeah it's all coming together

---
 project.godot            |  4 +--
 scenes/bracket_view.tscn |  2 +-
 scripts/BoardScreen.cs   | 66 +++++++++++++++++++++++++++++++++++++---
 3 files changed, 64 insertions(+), 8 deletions(-)

diff --git a/project.godot b/project.godot
index 4c8487c..e5dd0be 100644
--- a/project.godot
+++ b/project.godot
@@ -11,9 +11,9 @@ config_version=5
 [application]
 
 config/name="connect4-moderator-observer"
-run/main_scene="uid://cr8fi0e4r88s8"
+run/main_scene="uid://dcx5nvs0pa7me"
 config/features=PackedStringArray("4.5", "C#", "Forward Plus")
-config/icon="res://icon.svg"
+config/icon="uid://ckmfi0cjgxgyk"
 
 [autoload]
 
diff --git a/scenes/bracket_view.tscn b/scenes/bracket_view.tscn
index 3c66987..77b028f 100644
--- a/scenes/bracket_view.tscn
+++ b/scenes/bracket_view.tscn
@@ -2,7 +2,7 @@
 
 [ext_resource type="Script" uid="uid://dm25u0a2lqk2x" path="res://scripts/BracketScene.cs" id="1_dvj3m"]
 [ext_resource type="Texture2D" uid="uid://ckmfi0cjgxgyk" path="res://assets/sprites/RedChip.png" id="2_7c11m"]
-[ext_resource type="PackedScene" uid="uid://m542qwlp7hl7" path="res://scenes/board_screen.tscn" id="3_1511b"]
+[ext_resource type="PackedScene" uid="uid://cr8fi0e4r88s8" path="res://scenes/game.tscn" id="3_1511b"]
 
 [node name="BracketView" type="Control" node_paths=PackedStringArray("Players", "Matches")]
 layout_mode = 3
diff --git a/scripts/BoardScreen.cs b/scripts/BoardScreen.cs
index 1ac1225..3b4a4e5 100644
--- a/scripts/BoardScreen.cs
+++ b/scripts/BoardScreen.cs
@@ -2,6 +2,9 @@ using Godot;
 using System;
 
 public partial class BoardScreen : Node2D {
+	
+	[Export] public PackedScene BracketScene;
+	
 	private const string RED_CHIP_PATH = "res://scenes/red_chip.tscn";
 	private const string YELLOW_CHIP_PATH = "res://scenes/yellow_chip.tscn";
 	private const int CHIP_SCALE = 3;
@@ -16,8 +19,7 @@ public partial class BoardScreen : Node2D {
 
 	private Node2D player1Card; 
 	private Node2D player2Card;
-	private PlayerData p1;
-	private PlayerData p2;
+	private MatchData matchData;
 
 	private RigidBody2D[,] chips = new RigidBody2D[6, 7]; // 6 rows 7 cols | 0, 0 is top left
 
@@ -32,31 +34,85 @@ public partial class BoardScreen : Node2D {
 
 		redChip = GD.Load<PackedScene>(RED_CHIP_PATH);
 		ylwChip = GD.Load<PackedScene>(YELLOW_CHIP_PATH);
+		
+		matchData = Connection.Instance.CurrentObservingMatch;
+		player1Card.GetNode<Label>("Name").Text = matchData.player1;
+		player2Card.GetNode<Label>("Name").Text = matchData.player2;
+
+		Connection.Instance.OnObserveWin += ObserveWin;
+		Connection.Instance.OnObserveDraw += ObserveDraw;
+		Connection.Instance.OnObserveTerminated += ObserveTerminated;
+		Connection.Instance.OnObserveMove += ObserveMove;
+	}
+
+	public override void _ExitTree()
+	{
+		Connection.Instance.OnObserveWin -= ObserveWin;
+		Connection.Instance.OnObserveDraw -= ObserveDraw;
+		Connection.Instance.OnObserveTerminated -= ObserveTerminated;
+		Connection.Instance.OnObserveMove -= ObserveMove;
+	}
+
+	private void ObserveMove(string username, int column)
+	{
+		if (username == matchData.player1)
+		{
+			spawnRed(column);
+		}
+		else
+		{
+			spawnYellow(column);
+		}
+	}
+
+	private void ObserveWin(string winner)
+	{
+		// TODO
+		TransitionToBracket();
+	}
+	
+	private void ObserveDraw()
+	{
+		// TODO
+		TransitionToBracket();
+	}
+	
+	private void ObserveTerminated()
+	{
+		// TODO
+		TransitionToBracket();
+	}
+	
+	private void TransitionToBracket()
+	{
+		GetTree().ChangeSceneToPacked(BracketScene);
 	}
 
 	// Called every frame. 'delta' is the elapsed time since the previous frame.
 	public override void _Process(double delta) {
+		/*
 		if(p1 != null) {
             Label username = player1Card.GetNode<Label>("Name");
 			username.Text = p1.username;
-
+		
 			if(p1.isReady) {
 				Label status = player1Card.GetNode<Label>("Status");
 				status.Text = "Ready!";
 				status.AddThemeColorOverride("font_color", Colors.LimeGreen);
 			}
         }
-
+		
 		if(p2 != null) {
             Label username = player2Card.GetNode<Label>("Name");
 			username.Text = p2.username;
-
+  
 			if(p2.isReady) {
 				Label status = player2Card.GetNode<Label>("Status");
 				status.Text = "Ready!";
 				status.AddThemeColorOverride("font_color", Colors.LimeGreen);
 			}
         }
+        */
 	}
 
 	/*