UAT

Author: gitbrent

game_boards/board01/game_board/GameBoard.gd

@@ -1,5 +1,3 @@
-# WORKLIST:
-# 1. all gems need to explode at once (get_first_match_gems) needs to become return_all_matches!
 extends Node2D
 class_name GameBoard
 # SIGNALS

game_boards/board_space/game_board/GemBoard.gd

@@ -38,9 +38,9 @@ func fill_grid():
 	for i in range(size):
 		for j in range(size):
 			# Load the appropriate scene based on the checkerboard pattern
-			var brdsq_scene_path = "res://game_board/board_square_1.tscn"  # Assume light square
+			var brdsq_scene_path = "res://game_boards/board_space/game_board/board_square_1.tscn"  # Assume light square
 			if (i + j) % 2 == 0:
-				brdsq_scene_path = "res://game_board/board_square_0.tscn"  # Dark square
+				brdsq_scene_path = "res://game_boards/board_space/game_board/board_square_0.tscn"  # Dark square
 
 			# Load and instantiate the scene
 			var brdsq_scene = load(brdsq_scene_path)
@@ -55,7 +55,7 @@ func fill_hbox():
 			# A: random gem
 			var gem_type = GEM_COLOR_NAMES[randi() % GEM_COLOR_NAMES.size()]
 			# B: create/add
-			var gem_cell_scene = load("res://game_board/gem_cell.tscn")
+			var gem_cell_scene = load("res://game_boards/board_space/game_board/gem_cell.tscn")
 			var gem_cell:GemCellSpace = gem_cell_scene.instantiate()
 			hbox_container.get_child(col_idx).add_child(gem_cell)
 			gem_cell.initialize(gem_type)

game_boards/board_space/game_board/gem_board.tscn

@@ -1,14 +1,14 @@
 [gd_scene load_steps=5 format=3 uid="uid://b02gonq6mjgh8"]
 
-[ext_resource type="Script" path="res://game_boards/board01/game_board/GameBoard.gd" id="1_r742a"]
+[ext_resource type="Script" path="res://game_boards/board_space/game_board/GemBoard.gd" id="1_oexew"]
 [ext_resource type="PackedScene" uid="uid://bh2knk60qbton" path="res://game_boards/board01/game_board/board_square_0.tscn" id="2_j0p23"]
 [ext_resource type="PackedScene" uid="uid://cry3vnlah6fkx" path="res://game_boards/board01/game_board/board_square_1.tscn" id="3_hqege"]
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_yj5kd"]
 bg_color = Color(0, 0, 0, 0.411765)
 
 [node name="GemBoard" type="Node2D"]
-script = ExtResource("1_r742a")
+script = ExtResource("1_oexew")
 
 [node name="Background" type="Panel" parent="."]
 visible = false

game_boards/board_space/game_board/gem_cell.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=90 format=3 uid="uid://bkcnew3cxpisf"]
 
-[ext_resource type="Script" path="res://game_boards/board01/game_board/GemCell.gd" id="1_sic7w"]
+[ext_resource type="Script" path="res://game_boards/board_space/game_board/GemCell.gd" id="1_2k0fe"]
 [ext_resource type="Texture2D" uid="uid://duau66qew6757" path="res://assets/gems/characters_0001.png" id="2_eiavk"]
 [ext_resource type="Texture2D" uid="uid://c4u0bdf7rh0u3" path="res://assets/gems/Overlay-Lock.png" id="3_rc6em"]
 [ext_resource type="Texture2D" uid="uid://cooat8cgq2rb4" path="res://assets/gems/Overlay-Ice.png" id="4_2kyw5"]
@@ -625,7 +625,7 @@ layout_mode = 3
 anchors_preset = 0
 offset_right = 64.0
 offset_bottom = 64.0
-script = ExtResource("1_sic7w")
+script = ExtResource("1_2k0fe")
 
 [node name="BKGD" type="Panel" parent="."]
 visible = false

game_boards/board_space/game_space.gd

@@ -2,7 +2,7 @@ extends Node2D
 # SCENES
 @onready var game_top_h_box:HBoxContainer = $ContTopBar/GameTopHBox
 @onready var game_stats:VBoxContainer = $ContGameStats/GameStats
-@onready var game_board:GemBoardSpace = $ContBoard/Board
+@onready var game_board:GemBoardSpace = $ContBoard/GemBoard
 @onready var animation_player:AnimationPlayer = $ContMessages/AnimationPlayer
 
 func _ready():

game_boards/board_space/game_space.tscn

@@ -1,7 +1,6 @@
-[gd_scene load_steps=24 format=3 uid="uid://bkaimvifjwkai"]
+[gd_scene load_steps=23 format=3 uid="uid://bkaimvifjwkai"]
 
 [ext_resource type="Script" path="res://game_boards/board_space/game_space.gd" id="1_w6e46"]
-[ext_resource type="Texture2D" uid="uid://cnlqirgwr8d4" path="res://assets/bkgd/Background.png" id="2_ebh0e"]
 [ext_resource type="Texture2D" uid="uid://cwhjcn0y744nv" path="res://assets/gems/background-space.png" id="3_f5frv"]
 [ext_resource type="AudioStream" uid="uid://ds53xomd2ha1b" path="res://assets/audio/Abstract2.ogg" id="4_cbs6r"]
 [ext_resource type="PackedScene" uid="uid://d0yw6oyw3qib0" path="res://game_boards/board01/game/animated_cloud.tscn" id="5_mobdb"]
@@ -12,8 +11,8 @@
 [ext_resource type="Texture2D" uid="uid://vu6oui2n7024" path="res://assets/gems/characters_0003.png" id="10_xo434"]
 [ext_resource type="Texture2D" uid="uid://byliae6aa6ki2" path="res://assets/gems/characters_0005.png" id="11_ok78w"]
 [ext_resource type="Texture2D" uid="uid://2vrsevjv4w43" path="res://assets/gems/characters_0007.png" id="12_4tjwg"]
+[ext_resource type="PackedScene" uid="uid://b02gonq6mjgh8" path="res://game_boards/board_space/game_board/gem_board.tscn" id="13_3pfoy"]
 [ext_resource type="Texture2D" uid="uid://b1o34xq1pq82y" path="res://assets/gems/characters_0006.png" id="13_lu1md"]
-[ext_resource type="PackedScene" uid="uid://x4qq2j3l7nvb" path="res://game_boards/board01/game_board/board.tscn" id="14_4biqb"]
 [ext_resource type="Texture2D" uid="uid://27rcw10bp2xt" path="res://assets/gui/ButtonText_Large_Green_Round.png" id="15_qjgsg"]
 [ext_resource type="Texture2D" uid="uid://bebhmcgujnoxc" path="res://assets/gui/ButtonText_Large_GreyOutline_Round.png" id="16_20lur"]
 [ext_resource type="Texture2D" uid="uid://dcow071sb2a7i" path="res://assets/gui/ButtonText_Large_Orange_Round.png" id="17_oxovp"]
@@ -74,20 +73,12 @@ _data = {
 script = ExtResource("1_w6e46")
 
 [node name="Background" type="TextureRect" parent="."]
-visible = false
-offset_right = 2000.0
-offset_bottom = 1390.0
-texture = ExtResource("2_ebh0e")
-expand_mode = 2
-
-[node name="Background2" type="TextureRect" parent="."]
 offset_right = 2000.0
 offset_bottom = 1390.0
 texture = ExtResource("3_f5frv")
 expand_mode = 2
 
 [node name="DBGBkgdDimmer" type="Panel" parent="."]
-visible = false
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
@@ -337,7 +328,6 @@ offset_bottom = 40.0
 mouse_filter = 1
 
 [node name="DBGBoardRectArea" type="Panel" parent="ContBoard"]
-visible = false
 layout_mode = 0
 offset_left = 500.0
 offset_top = 250.0
@@ -346,7 +336,7 @@ offset_bottom = 1274.0
 mouse_filter = 2
 theme_override_styles/panel = SubResource("StyleBoxFlat_103kv")
 
-[node name="Board" parent="ContBoard" instance=ExtResource("14_4biqb")]
+[node name="GemBoard" parent="ContBoard" instance=ExtResource("13_3pfoy")]
 position = Vector2(500, 250)
 
 [node name="BtnNewGame" type="TextureButton" parent="."]

main.gd

@@ -1,6 +1,10 @@
 extends Node2D
 
 @onready var game_board_1 = $GameBoard1
+@onready var game_board_2 = $GameSpace
 
 func _on_btn_board_1_pressed():
 	game_board_1.visible = true
+
+func _on_btn_board_2_pressed():
+	game_board_2.visible = true

main.tscn

@@ -1,11 +1,12 @@
-[gd_scene load_steps=8 format=3 uid="uid://mu2k87xf3lma"]
+[gd_scene load_steps=9 format=3 uid="uid://mu2k87xf3lma"]
 
 [ext_resource type="Script" path="res://main.gd" id="1_73dvc"]
 [ext_resource type="Texture2D" uid="uid://cnlqirgwr8d4" path="res://assets/bkgd/Background.png" id="1_t1b1c"]
 [ext_resource type="FontFile" uid="uid://dlhwrp5jwkrll" path="res://assets/fonts/Acme-Regular.ttf" id="2_j1i6k"]
 [ext_resource type="Texture2D" uid="uid://27rcw10bp2xt" path="res://assets/gui/ButtonText_Large_Green_Round.png" id="3_nqt0h"]
 [ext_resource type="Texture2D" uid="uid://chrsqb6yhlqeq" path="res://assets/gui/ButtonText_Large_Blue_Round.png" id="4_e0b1k"]
 [ext_resource type="PackedScene" uid="uid://b5bfm2244ywxk" path="res://game_boards/board01/game/game.tscn" id="6_hsxpn"]
+[ext_resource type="PackedScene" uid="uid://bkaimvifjwkai" path="res://game_boards/board_space/game_space.tscn" id="7_w5d02"]
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_uhytr"]
 bg_color = Color(0, 0, 0, 0.133333)
@@ -93,4 +94,8 @@ vertical_alignment = 1
 [node name="GameBoard1" parent="." instance=ExtResource("6_hsxpn")]
 visible = false
 
+[node name="GameSpace" parent="." instance=ExtResource("7_w5d02")]
+visible = false
+
 [connection signal="pressed" from="BtnBoard1" to="." method="_on_btn_board_1_pressed"]
+[connection signal="pressed" from="BtnBoard2" to="." method="_on_btn_board_2_pressed"]