moved files

Author: gitbrent

animated_cloud.tscn renamed to game/animated_cloud.tscn

@@ -17,7 +17,7 @@ tracks/0/keys = {
 "times": PackedFloat32Array(0, 30),
 "transitions": PackedFloat32Array(1, 1),
 "update": 0,
-"values": [Vector2(64, 90), Vector2(1936, 90)]
+"values": [Vector2(64, 220), Vector2(1936, 220)]
 }
 
 [sub_resource type="AnimationLibrary" id="AnimationLibrary_5m8mq"]
@@ -36,11 +36,14 @@ expand_mode = 2
 
 [node name="Debug-Panel" type="Panel" parent="."]
 visible = false
+anchors_preset = 10
+anchor_right = 1.0
 offset_right = 2000.0
-offset_bottom = 180.0
+offset_bottom = 150.0
+grow_horizontal = 2
 
 [node name="Sprite2D" type="Sprite2D" parent="."]
-position = Vector2(64, 90)
+position = Vector2(64, 220)
 texture = ExtResource("2_vo0va")
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="."]

game.gd renamed to game/game.gd

@@ -2,6 +2,7 @@ extends Node2D
 # SCENES
 @onready var game_board:GameBoard = $Board
 @onready var game_stats:VBoxContainer = $GameStats
+@onready var game_top_h_box:HBoxContainer = $GameTopHBox
 
 func _ready():
 	game_board.connect("props_updated_moves", self._on_props_updated_moves)
@@ -17,15 +18,11 @@ func _on_props_updated_gemsdict(gems_dict:Dictionary):
 	game_stats.get_child(4).get_child(1).text = str(gems_dict["PURPLE"])
 	game_stats.get_child(5).get_child(1).text = str(gems_dict["BROWN"])
 
-func _on_props_updated_moves(moves:int):
-	# TODO: name labels, then update base on this
-	#game_stats.get_child(4).get_child(1).text = str(moves)
-	print("TODO:") # TODO:
-
 func _on_props_updated_score(score:int):
-	# TODO: name labels, then update base on this
-	#game_stats.get_child(5).get_child(1).text = str(score)
-	print("TODO:") # TODO:
+	game_top_h_box.get_child(0).get_child(1).text = str(score)
+
+func _on_props_updated_moves(moves:int):
+	game_top_h_box.get_child(1).get_child(1).text = str(moves)
 
 func _on_newgame_button_pressed():
 	game_board.new_game()

game.tscn renamed to game/game.tscn

@@ -1,13 +1,14 @@
 [gd_scene load_steps=19 format=3 uid="uid://b5bfm2244ywxk"]
 
-[ext_resource type="Script" path="res://game.gd" id="1_ewnxx"]
+[ext_resource type="Script" path="res://game/game.gd" id="1_ewnxx"]
 [ext_resource type="Texture2D" uid="uid://cnlqirgwr8d4" path="res://assets/bkgd/Background.png" id="1_h8otn"]
 [ext_resource type="PackedScene" uid="uid://x4qq2j3l7nvb" path="res://game_board/board.tscn" id="2_2ltbx"]
-[ext_resource type="PackedScene" uid="uid://d0yw6oyw3qib0" path="res://animated_cloud.tscn" id="3_a1y13"]
+[ext_resource type="PackedScene" uid="uid://d0yw6oyw3qib0" path="res://game/animated_cloud.tscn" id="3_a1y13"]
 [ext_resource type="Texture2D" uid="uid://b8biy2iputyhe" path="res://assets/gems/characters_0002.png" id="3_qywvx"]
 [ext_resource type="Texture2D" uid="uid://duau66qew6757" path="res://assets/gems/characters_0001.png" id="3_sh4xh"]
+[ext_resource type="Theme" uid="uid://c58sv51ac2qkl" path="res://themes/game_top_label_theme.tres" id="4_1evut"]
 [ext_resource type="Texture2D" uid="uid://vu6oui2n7024" path="res://assets/gems/characters_0003.png" id="4_2reex"]
-[ext_resource type="Theme" uid="uid://1cdmnqyil8gy" path="res://game_stats_label_theme.tres" id="4_xf0vf"]
+[ext_resource type="Theme" uid="uid://1cdmnqyil8gy" path="res://themes/game_stats_label_theme.tres" id="4_xf0vf"]
 [ext_resource type="Texture2D" uid="uid://byliae6aa6ki2" path="res://assets/gems/characters_0005.png" id="5_g428h"]
 [ext_resource type="Texture2D" uid="uid://2vrsevjv4w43" path="res://assets/gems/characters_0007.png" id="6_ot4tf"]
 [ext_resource type="Texture2D" uid="uid://b1o34xq1pq82y" path="res://assets/gems/characters_0006.png" id="7_o4d3d"]
@@ -20,10 +21,7 @@
 bg_color = Color(0, 0, 0, 0.666667)
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_k3sk6"]
-bg_color = Color(0, 0, 0, 0.2)
-
-[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_imdoc"]
-bg_color = Color(0, 0, 0, 0.411765)
+bg_color = Color(0, 0, 0, 0.133333)
 
 [node name="Game" type="Node2D"]
 script = ExtResource("1_ewnxx")
@@ -47,18 +45,65 @@ grow_horizontal = 2
 grow_vertical = 2
 theme_override_styles/panel = SubResource("StyleBoxFlat_103kv")
 
+[node name="GameTopBkgd" type="Panel" parent="."]
+anchors_preset = 10
+anchor_right = 1.0
+offset_right = 2000.0
+offset_bottom = 150.0
+grow_horizontal = 2
+theme_override_styles/panel = SubResource("StyleBoxFlat_k3sk6")
+
+[node name="GameTopHBox" type="HBoxContainer" parent="."]
+custom_minimum_size = Vector2(2000, 150)
+offset_right = 40.0
+offset_bottom = 40.0
+
+[node name="HBoxContainer1" type="HBoxContainer" parent="GameTopHBox"]
+layout_mode = 2
+size_flags_horizontal = 3
+
+[node name="Label" type="Label" parent="GameTopHBox/HBoxContainer1"]
+layout_mode = 2
+size_flags_horizontal = 3
+theme = ExtResource("4_1evut")
+text = "Score "
+horizontal_alignment = 2
+
+[node name="Value" type="Label" parent="GameTopHBox/HBoxContainer1"]
+layout_mode = 2
+size_flags_horizontal = 3
+theme = ExtResource("4_1evut")
+text = "0"
+
+[node name="HBoxContainer2" type="HBoxContainer" parent="GameTopHBox"]
+layout_mode = 2
+size_flags_horizontal = 3
+
+[node name="Label" type="Label" parent="GameTopHBox/HBoxContainer2"]
+layout_mode = 2
+size_flags_horizontal = 3
+theme = ExtResource("4_1evut")
+text = "Moves "
+horizontal_alignment = 2
+
+[node name="Value" type="Label" parent="GameTopHBox/HBoxContainer2"]
+layout_mode = 2
+size_flags_horizontal = 3
+theme = ExtResource("4_1evut")
+text = "0"
+
 [node name="GameStatsBkgd" type="Panel" parent="."]
 offset_left = 75.0
-offset_top = 183.0
+offset_top = 250.0
 offset_right = 425.0
-offset_bottom = 1207.0
+offset_bottom = 1274.0
 theme_override_styles/panel = SubResource("StyleBoxFlat_k3sk6")
 
 [node name="GameStats" type="VBoxContainer" parent="."]
 offset_left = 120.0
-offset_top = 205.0
+offset_top = 250.0
 offset_right = 370.0
-offset_bottom = 1229.0
+offset_bottom = 1274.0
 theme_override_constants/separation = 40
 
 [node name="HBoxContainer1" type="HBoxContainer" parent="GameStats"]
@@ -200,37 +245,22 @@ vertical_alignment = 1
 [node name="BoardTextRect" type="Panel" parent="."]
 visible = false
 offset_left = 500.0
-offset_top = 183.0
+offset_top = 250.0
 offset_right = 1524.0
-offset_bottom = 1207.0
+offset_bottom = 1274.0
 theme_override_styles/panel = SubResource("StyleBoxFlat_103kv")
 
 [node name="Board" parent="." instance=ExtResource("2_2ltbx")]
-position = Vector2(500, 183)
-
-[node name="Panel" type="Panel" parent="."]
-visible = false
-anchors_preset = 8
-anchor_left = 0.5
-anchor_top = 0.5
-anchor_right = 0.5
-anchor_bottom = 0.5
-offset_left = 523.0
-offset_top = 69.0
-offset_right = 1046.0
-offset_bottom = 582.0
-grow_horizontal = 2
-grow_vertical = 2
-theme_override_styles/panel = SubResource("StyleBoxFlat_imdoc")
+position = Vector2(500, 250)
 
 [node name="AudioGemMove" type="AudioStreamPlayer" parent="."]
 stream = ExtResource("8_7jpwb")
 
 [node name="BtnNewGame" type="TextureButton" parent="."]
-offset_left = 1617.0
-offset_top = 293.0
-offset_right = 2776.0
-offset_bottom = 651.0
+offset_left = 1608.0
+offset_top = 255.0
+offset_right = 2767.0
+offset_bottom = 613.0
 scale = Vector2(0.3, 0.3)
 texture_normal = ExtResource("10_qtl06")
 
@@ -247,10 +277,11 @@ horizontal_alignment = 1
 vertical_alignment = 1
 
 [node name="BtnClearDebugLabels" type="TextureButton" parent="."]
-offset_left = 1668.0
-offset_top = 554.0
-offset_right = 2827.0
-offset_bottom = 912.0
+visible = false
+offset_left = 1657.0
+offset_top = 393.0
+offset_right = 2816.0
+offset_bottom = 751.0
 scale = Vector2(0.25, 0.25)
 texture_normal = ExtResource("11_bw3je")
 
@@ -267,10 +298,11 @@ horizontal_alignment = 1
 vertical_alignment = 1
 
 [node name="BtnMatchCol" type="TextureButton" parent="."]
-offset_left = 1667.0
-offset_top = 680.0
-offset_right = 2826.0
-offset_bottom = 1038.0
+visible = false
+offset_left = 1656.0
+offset_top = 519.0
+offset_right = 2815.0
+offset_bottom = 877.0
 scale = Vector2(0.25, 0.25)
 texture_normal = ExtResource("12_4fgvl")
 

game_board/gem_cell.tscn

@@ -5,7 +5,7 @@
 [ext_resource type="Script" path="res://game_board/GemControl.gd" id="3_sh1nc"]
 [ext_resource type="Texture2D" uid="uid://dacjcttesccxk" path="res://assets/effects/explode-06.png" id="4_qqixd"]
 [ext_resource type="FontFile" uid="uid://dlhwrp5jwkrll" path="res://assets/fonts/Acme-Regular.ttf" id="5_lb5dp"]
-[ext_resource type="Theme" uid="uid://hahh0mrfx2q1" path="res://debug_label_theme.tres" id="6_hn3w3"]
+[ext_resource type="Theme" uid="uid://hahh0mrfx2q1" path="res://themes/debug_label_theme.tres" id="6_hn3w3"]
 [ext_resource type="AudioStream" uid="uid://ca0jp78fn0bi1" path="res://assets/audio/bfh1_glass_breaking_02.ogg" id="7_50xdd"]
 [ext_resource type="AudioStream" uid="uid://ds53xomd2ha1b" path="res://assets/audio/Abstract2.ogg" id="8_cgn1d"]
 

project.godot

@@ -11,7 +11,7 @@ config_version=5
 [application]
 
 config/name="Godot Match 3"
-run/main_scene="res://game.tscn"
+run/main_scene="res://game/game.tscn"
 config/features=PackedStringArray("4.2", "GL Compatibility")
 config/icon="res://icon.svg"
 

debug_label_theme.tres renamed to themes/debug_label_theme.tres

@@ -0,0 +1,12 @@
+[gd_resource type="Theme" load_steps=2 format=3 uid="uid://c58sv51ac2qkl"]
+
+[ext_resource type="FontFile" uid="uid://bylgyjavx5yts" path="res://assets/fonts/Quicksand-Regular.ttf" id="1_0i4hy"]
+
+[resource]
+default_font = ExtResource("1_0i4hy")
+Label/colors/font_color = Color(0.945098, 0.945098, 0.945098, 1)
+Label/colors/font_outline_color = Color(0, 0, 0, 0.411765)
+Label/colors/font_shadow_color = Color(0, 0, 0, 0.411765)
+Label/constants/shadow_offset_x = 3
+Label/constants/shadow_offset_y = 3
+Label/font_sizes/font_size = 72