From a16a44ba7a6b4326d4edd8027c56dd32b4e93eb2 Mon Sep 17 00:00:00 2001
From: Multiplyster <boylecheng@gmail.com>
Date: Thu, 4 Dec 2025 01:30:10 -0500
Subject: [PATCH] feat: button to bring back to bracket

---
 assets/sprites/AssetTileset.png               | Bin 1386 -> 1899 bytes
 project.godot                                 |   2 +-
 scenes/board_screen.tscn                      |  17 ++++++-
 scenes/button_medium.tscn                     |  44 +++++++++++++++++
 scenes/button_small.tscn                      |  46 +++++-------------
 scenes/create_join_room.tscn                  |   2 +-
 scripts/BoardScreen.cs                        |   2 +
 scripts/{button_small.gd => button_medium.gd} |   5 +-
 ...tton_small.gd.uid => button_medium.gd.uid} |   0
 9 files changed, 81 insertions(+), 37 deletions(-)
 create mode 100644 scenes/button_medium.tscn
 rename scripts/{button_small.gd => button_medium.gd} (80%)
 rename scripts/{button_small.gd.uid => button_medium.gd.uid} (100%)

diff --git a/assets/sprites/AssetTileset.png b/assets/sprites/AssetTileset.png
index e9977319d0ef441235abccb075b6047eab4022c1..b785d6a93239c89a0f257518798f569bb4848662 100644
GIT binary patch
delta 1885
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
XGNeX5%z6rH00000NkvXXu0mjfZQ5$_

delta 1368
zcmV-e1*iJ!4(bY!BYy=SNkl<ZcmeF1&5G1O6oqTtxzLs1PH`s)`T(wdbYDOa+==c4
zR|<-&meX({6X>Z*a(^pFxFnra-FtG**VEeLqc-yA-G@tys1a>kbI5@{00<r<zJG4b
zvoKR;<D6yUKpy~%MesO!R>Vxt=SwoH55T`aNu*MSg#&#6EPtkE>xqw=3>DzZxdD*S
z@o|%(M2{l~eE|Occ9gRkW%=;~vnBM^*szzP2ilxO^Z{@Z;yMNf!)(`~8-_s}G;Y|k
zb*ZdBCjj#F%j1hTt!=60-ooeS1K{=h%k}$=WoQT<ukp?sDXf(}IJYS1fL4p%i=Mdw
z@c8?O1PQ|z#(%V@&)U6O-jlVmcX_Yad2Rr_%#=W79>V|iv$bX6n%u{6y$9C{76DlQ
zO9Me8_;r}LhI{Ml#b2Kf0L_n;H9Q4j7y}@J{D_$a13W6Z55Tuich?~Z#IrC|X5-wd
zG=CykX;kdHZq)|>J03r2Eut{nyKa5f1Ag4|)?+-c4}XCCTlB}*);tRjF0*m&SqK_|
z%S@c(n!KLq*arX)i{NqetcaO-K7@^0299%FLt)KC)d%2ApOFX{VWZX|;~ENU<lY3{
z^Z}5E<<Z{(2fzpbVwHC_-r;!tP{|tE^U&G?_i_W^@D8|s-HV{M1S)F<2JA0dxdE^+
z72hpLfPd0og2eTa!amu9bBlrwXjSTctIhcUxa9-_-BP#u6uW*-0PxPjJ1lEh&<2eT
z`pyXejD^848im&x3R+Om=A`Gm0Ki}vje_ZW>iMht|7m1TkL4a{K|z~Sof`l#8K&>4
zFCXvPo_)9Wh#toy0dO=s<ESwJ@MFqbeZ)-fXMapEuMYrzTtO%T@hr@g**ItIa-g@V
z4?wR2@0WI<55UW}m+KR5`I1CqEr!Z$oU=?E=mUVU2oy)pikRv7d`V`F0gyy2W#~IV
z0Q5aA)sX;{ic4QC0nqofR7V0(Dz0&{qbmu(s8f@!BLI^IJNj4zVAQEe*Aak8gB^V=
z0)H^-)THYOz@)*BKGqlj_%-loN3C@cGqtoA>eB~6ekYGWJPRhuY@D-(9N4<34*)tM
zh={^$mZ<|{0GLW(^GF8>K&1N#W)pw}Aw)_b0Fmw|m`wl@gb*o#07SZ<U^W3r5Q2t;
zy*&uPUgsv+M*t=Xa_?ghfW6L5vX1~v5`X00#~=WEottDI0hlDny^lcv_BuDoJ_1lY
z$fNQJz)=T_?<WAo13W69033C&_<jOVJiw#!3BXYYi|;1@#REJlp8y<nu=sugP&7a-
z*#tn#$)bG-K+)i|WD@`_CyVwW07Zk-l1%`#oGjXh02B>QOEv+}a<XV20#GbCZGX80
zK-<w`{Rlv@z_jHO0BuK$^&<eq0@IdD0JI$~){g)b3rt%s0nm1|SU&<#Brq$P1i;GK
zB7F%!k)W((5&$b_i}WP`MS`-DNdT;zEz*|&6bZ^oCIPT=wn$$BkUS`Bc?7`P;pF`Z
zK=OdB<q-gDhm-dw0LcTgmPY`r9e+;Vp8zBe$XXr&uy#0ke*%y+ATL=2z{}~Ra|l4v
zV7z1z057ML&LIFvgYl9@0KA+|I)?xx4aQ3r0q}A<=^O%(EEsP&1i;(zWb+6>vOv7$
z5CCt-lg%Rl$pZ0~Ljb%TPd1MLBn!k_4gv6XJlQ+~kR*^O83Z88`6P1*Kv9w)qGS+&
zDCd*RB>+i+h>}47qMT1MmjEOQB1#4Uh;ly3TmldrMD+Oo00030|CX?VZ2$lO21!Ig
aR09BQXmKBc#+zyY0000<MNUMnLSTZ<_F-QD

diff --git a/project.godot b/project.godot
index e5dd0be..7600f5e 100644
--- a/project.godot
+++ b/project.godot
@@ -11,7 +11,7 @@ config_version=5
 [application]
 
 config/name="connect4-moderator-observer"
-run/main_scene="uid://dcx5nvs0pa7me"
+run/main_scene="uid://cr8fi0e4r88s8"
 config/features=PackedStringArray("4.5", "C#", "Forward Plus")
 config/icon="uid://ckmfi0cjgxgyk"
 
diff --git a/scenes/board_screen.tscn b/scenes/board_screen.tscn
index d6a8bdb..bb74e96 100644
--- a/scenes/board_screen.tscn
+++ b/scenes/board_screen.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=11 format=3 uid="uid://m542qwlp7hl7"]
+[gd_scene load_steps=13 format=3 uid="uid://m542qwlp7hl7"]
 
 [ext_resource type="Script" uid="uid://dg5jt0o0r0v3r" path="res://scripts/BoardScreen.cs" id="1_b3w8x"]
 [ext_resource type="Texture2D" uid="uid://dlx02qat7j6lf" path="res://assets/sprites/AssetTileset.png" id="3_1tlhv"]
@@ -6,6 +6,7 @@
 [ext_resource type="Texture2D" uid="uid://ckmfi0cjgxgyk" path="res://assets/sprites/RedChip.png" id="4_1hrcj"]
 [ext_resource type="Texture2D" uid="uid://qy30emdgrk7o" path="res://assets/sprites/YellowChip.png" id="5_i2o8i"]
 [ext_resource type="Texture2D" uid="uid://8un28mol7qow" path="res://assets/sprites/BoardTileMap.png" id="6_i2o8i"]
+[ext_resource type="PackedScene" uid="uid://pdean68jjg80" path="res://scenes/button_small.tscn" id="7_glh1q"]
 
 [sub_resource type="WorldBoundaryShape2D" id="WorldBoundaryShape2D_b3w8x"]
 
@@ -25,6 +26,10 @@ texture_region_size = Vector2i(26, 26)
 tile_size = Vector2i(26, 26)
 sources/0 = SubResource("TileSetAtlasSource_i2o8i")
 
+[sub_resource type="AtlasTexture" id="AtlasTexture_glh1q"]
+atlas = ExtResource("3_1tlhv")
+region = Rect2(112, 32, 16, 16)
+
 [node name="BoardScreen" type="Node2D"]
 script = ExtResource("1_b3w8x")
 
@@ -167,3 +172,13 @@ tile_set = SubResource("TileSet_glh1q")
 format = 2
 layer_0/z_index = 100
 layer_0/tile_data = PackedInt32Array(-3, 0, 0, -2, 0, 0, -1, 0, 0, -65536, 0, 0, -65535, 0, 0, -65534, 0, 0, -4, 0, 0, -65540, 0, 0, -131076, 0, 0, -196612, 0, 0, -262148, 0, 0, -327684, 0, 0, -327683, 0, 0, -327682, 0, 0, -327681, 0, 0, -393216, 0, 0, -393215, 0, 0, -393214, 0, 0, -327678, 0, 0, -262142, 0, 0, -196606, 0, 0, -131070, 0, 0, -131071, 0, 0, -131072, 0, 0, -65537, 0, 0, -65538, 0, 0, -65539, 0, 0, -131075, 0, 0, -131074, 0, 0, -131073, 0, 0, -196608, 0, 0, -196607, 0, 0, -262143, 0, 0, -262144, 0, 0, -196609, 0, 0, -196610, 0, 0, -196611, 0, 0, -262147, 0, 0, -262146, 0, 0, -262145, 0, 0, -327680, 0, 0, -327679, 0, 0, -5, 196608, 536870912, -65541, 65536, 0, -131077, 65536, 0, -196613, 65536, 0, -262149, 65536, 0, -327685, 196608, 0, 65532, 196608, 1610612736, 2, 196608, 1879048192, -65533, 196608, 805306368, -393213, 196608, 268435456, -458750, 196608, 1342177280, -393219, 65536, 1073741824, -393218, 65536, 1073741824, -393217, 65536, 1073741824, -458752, 65536, 1073741824, -458751, 65536, 1073741824, -393220, 196608, 1073741824, -327677, 65536, 268435456, -262141, 65536, 268435456, -196605, 65536, 268435456, -131069, 65536, 268435456, 65533, 65536, 1879048192, 65534, 65536, 1879048192, 65535, 65536, 1879048192, 0, 65536, 1879048192, 1, 65536, 1879048192)
+
+[node name="BracketButton" parent="." instance=ExtResource("7_glh1q")]
+offset_left = -566.0
+offset_top = 281.0
+offset_right = -550.0
+offset_bottom = 297.0
+
+[node name="Sprite2D" type="Sprite2D" parent="BracketButton"]
+position = Vector2(8, 8)
+texture = SubResource("AtlasTexture_glh1q")
diff --git a/scenes/button_medium.tscn b/scenes/button_medium.tscn
new file mode 100644
index 0000000..b4f9714
--- /dev/null
+++ b/scenes/button_medium.tscn
@@ -0,0 +1,44 @@
+[gd_scene load_steps=7 format=3 uid="uid://d1wr0v5ht8vqb"]
+
+[ext_resource type="Script" uid="uid://frisgjvf17ym" path="res://scripts/button_medium.gd" id="2_06p6p"]
+[ext_resource type="Texture2D" uid="uid://dlx02qat7j6lf" path="res://assets/sprites/AssetTileset.png" id="2_q2stu"]
+[ext_resource type="FontFile" uid="uid://c3jmev24lo6ci" path="res://assets/fonts/PixelOperator8.ttf" id="3_dxjfy"]
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_6ptbq"]
+atlas = ExtResource("2_q2stu")
+region = Rect2(8, 16, 32, 16)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_06p6p"]
+atlas = ExtResource("2_q2stu")
+region = Rect2(8, 32, 32, 16)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_q2stu"]
+atlas = ExtResource("2_q2stu")
+region = Rect2(8, 0, 32, 16)
+
+[node name="ButtonSmall" type="TextureButton"]
+offset_left = -32.0
+offset_top = -32.0
+offset_right = 32.0
+texture_normal = SubResource("AtlasTexture_6ptbq")
+texture_pressed = SubResource("AtlasTexture_06p6p")
+texture_hover = SubResource("AtlasTexture_q2stu")
+stretch_mode = 4
+script = ExtResource("2_06p6p")
+
+[node name="Label" type="Label" parent="."]
+layout_mode = 0
+offset_left = 2.0
+offset_top = 9.0
+offset_right = 62.0
+offset_bottom = 25.0
+theme_override_colors/font_color = Color(2.7723312e-05, 0.60865843, 0.9772685, 1)
+theme_override_fonts/font = ExtResource("3_dxjfy")
+theme_override_font_sizes/font_size = 16
+text = "TEMP"
+horizontal_alignment = 1
+
+[connection signal="button_down" from="." to="." method="onButtonDown"]
+[connection signal="button_up" from="." to="." method="onButtonUp"]
+[connection signal="mouse_entered" from="." to="." method="onMouseEnter"]
+[connection signal="mouse_exited" from="." to="." method="onMouseExit"]
diff --git a/scenes/button_small.tscn b/scenes/button_small.tscn
index e8e1ebd..fc78ffd 100644
--- a/scenes/button_small.tscn
+++ b/scenes/button_small.tscn
@@ -1,44 +1,24 @@
-[gd_scene load_steps=7 format=3 uid="uid://d1wr0v5ht8vqb"]
+[gd_scene load_steps=5 format=3 uid="uid://pdean68jjg80"]
 
-[ext_resource type="Script" uid="uid://frisgjvf17ym" path="res://scripts/button_small.gd" id="2_06p6p"]
 [ext_resource type="Texture2D" uid="uid://dlx02qat7j6lf" path="res://assets/sprites/AssetTileset.png" id="2_q2stu"]
-[ext_resource type="FontFile" uid="uid://c3jmev24lo6ci" path="res://assets/fonts/PixelOperator8.ttf" id="3_dxjfy"]
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_qlcsu"]
+atlas = ExtResource("2_q2stu")
+region = Rect2(0, 64, 16, 16)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_6ptbq"]
 atlas = ExtResource("2_q2stu")
-region = Rect2(8, 16, 32, 16)
+region = Rect2(0, 80, 16, 16)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_06p6p"]
 atlas = ExtResource("2_q2stu")
-region = Rect2(8, 32, 32, 16)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_q2stu"]
-atlas = ExtResource("2_q2stu")
-region = Rect2(8, 0, 32, 16)
+region = Rect2(0, 48, 16, 16)
 
 [node name="ButtonSmall" type="TextureButton"]
-offset_left = -32.0
+offset_left = -16.0
 offset_top = -32.0
-offset_right = 32.0
-texture_normal = SubResource("AtlasTexture_6ptbq")
-texture_pressed = SubResource("AtlasTexture_06p6p")
-texture_hover = SubResource("AtlasTexture_q2stu")
-stretch_mode = 4
-script = ExtResource("2_06p6p")
-
-[node name="Label" type="Label" parent="."]
-layout_mode = 0
-offset_left = 2.0
-offset_top = 9.0
-offset_right = 62.0
-offset_bottom = 25.0
-theme_override_colors/font_color = Color(2.7723312e-05, 0.60865843, 0.9772685, 1)
-theme_override_fonts/font = ExtResource("3_dxjfy")
-theme_override_font_sizes/font_size = 16
-text = "TEMP"
-horizontal_alignment = 1
-
-[connection signal="button_down" from="." to="." method="onButtonDown"]
-[connection signal="button_up" from="." to="." method="onButtonUp"]
-[connection signal="mouse_entered" from="." to="." method="onMouseEnter"]
-[connection signal="mouse_exited" from="." to="." method="onMouseExit"]
+offset_bottom = -16.0
+scale = Vector2(2, 2)
+texture_normal = SubResource("AtlasTexture_qlcsu")
+texture_pressed = SubResource("AtlasTexture_6ptbq")
+texture_hover = SubResource("AtlasTexture_06p6p")
diff --git a/scenes/create_join_room.tscn b/scenes/create_join_room.tscn
index 912287a..3c6aa65 100644
--- a/scenes/create_join_room.tscn
+++ b/scenes/create_join_room.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=3 format=3 uid="uid://cct663hb47yka"]
 
-[ext_resource type="PackedScene" uid="uid://d1wr0v5ht8vqb" path="res://scenes/button_small.tscn" id="1_4km6l"]
+[ext_resource type="PackedScene" uid="uid://d1wr0v5ht8vqb" path="res://scenes/button_medium.tscn" id="1_4km6l"]
 [ext_resource type="Script" uid="uid://b1ogflafdte71" path="res://scripts/create_join_room.gd" id="1_k6yuv"]
 
 [node name="CreateJoinRoom" type="Node2D"]
diff --git a/scripts/BoardScreen.cs b/scripts/BoardScreen.cs
index 3b4a4e5..faa83a6 100644
--- a/scripts/BoardScreen.cs
+++ b/scripts/BoardScreen.cs
@@ -39,6 +39,8 @@ public partial class BoardScreen : Node2D {
 		player1Card.GetNode<Label>("Name").Text = matchData.player1;
 		player2Card.GetNode<Label>("Name").Text = matchData.player2;
 
+		GetNode<TextureButton>("BracketButton").Pressed += TransitionToBracket;
+
 		Connection.Instance.OnObserveWin += ObserveWin;
 		Connection.Instance.OnObserveDraw += ObserveDraw;
 		Connection.Instance.OnObserveTerminated += ObserveTerminated;
diff --git a/scripts/button_small.gd b/scripts/button_medium.gd
similarity index 80%
rename from scripts/button_small.gd
rename to scripts/button_medium.gd
index 53f0aaf..1409601 100644
--- a/scripts/button_small.gd
+++ b/scripts/button_medium.gd
@@ -10,7 +10,10 @@ func onMouseEnter() -> void:
 	label.add_theme_color_override("font_color", HOVERED_COLOR);
 
 func onMouseExit() -> void:
-	label.add_theme_color_override("font_color", DEFAULT_COLOR);
+	if button_down:
+		label.add_theme_color_override("font_color", CLICKED_COLOR);
+	else:
+		label.add_theme_color_override("font_color", DEFAULT_COLOR);
 
 func onButtonDown() -> void:
 	label.add_theme_color_override("font_color", CLICKED_COLOR);
diff --git a/scripts/button_small.gd.uid b/scripts/button_medium.gd.uid
similarity index 100%
rename from scripts/button_small.gd.uid
rename to scripts/button_medium.gd.uid