added game props and animated cloud

Author: gitbrent

animated_cloud.tscn

@@ -0,0 +1,50 @@
+[gd_scene load_steps=5 format=3 uid="uid://d0yw6oyw3qib0"]
+
+[ext_resource type="Texture2D" uid="uid://cnlqirgwr8d4" path="res://assets/bkgd/Background.png" id="1_p4wo5"]
+[ext_resource type="Texture2D" uid="uid://cfdjrsigqjjjk" path="res://assets/bkgd/Cloud_2.png" id="2_vo0va"]
+
+[sub_resource type="Animation" id="Animation_0x8pj"]
+resource_name = "move_cloud"
+length = 30.0
+loop_mode = 2
+tracks/0/type = "value"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath("Sprite2D:position")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"times": PackedFloat32Array(0, 30),
+"transitions": PackedFloat32Array(1, 1),
+"update": 0,
+"values": [Vector2(64, 90), Vector2(1936, 90)]
+}
+
+[sub_resource type="AnimationLibrary" id="AnimationLibrary_5m8mq"]
+_data = {
+"move_cloud": SubResource("Animation_0x8pj")
+}
+
+[node name="AnimatedCloud" type="Node2D"]
+
+[node name="Debug-Background" type="TextureRect" parent="."]
+visible = false
+offset_right = 2000.0
+offset_bottom = 1390.0
+texture = ExtResource("1_p4wo5")
+expand_mode = 2
+
+[node name="Debug-Panel" type="Panel" parent="."]
+visible = false
+offset_right = 2000.0
+offset_bottom = 180.0
+
+[node name="Sprite2D" type="Sprite2D" parent="."]
+position = Vector2(64, 90)
+texture = ExtResource("2_vo0va")
+
+[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
+libraries = {
+"": SubResource("AnimationLibrary_5m8mq")
+}
+autoplay = "move_cloud"

game.gd

@@ -1,22 +1,20 @@
 extends Node2D
 # SCENES
-@onready var audio_gem_move:AudioStreamPlayer = $AudioGemMove
 @onready var game_board:GameBoard = $Board
-@onready var game_stats = $GameStats
+@onready var game_stats:VBoxContainer = $GameStats
 
-func _on_board_gem_swapped():
-	play_move_sound()
-	#GameProps.get_props()
-	update_game_props()
+func _ready():
+	game_board.connect("props_updated_moves", self._on_props_updated_moves)
+	game_board.connect("props_updated_score", self._on_props_updated_score)
 
-func play_move_sound():
-	audio_gem_move.play()
-	
-func update_game_props():
-	var brent = game_board.get_gem_props()
-	print("brent: ", brent)
+func _on_props_updated_moves(moves:int):
 	# TODO: name labels, then update base on this
-	game_stats.get_child(0).get_child(1).text = "99"
+	game_stats.get_child(0).get_child(1).text = str(moves)
+
+func _on_props_updated_score(score:int):
+	# TODO: name labels, then update base on this
+	game_stats.get_child(1).get_child(1).text = str(score)
+	game_stats.get_child(2).get_child(1).text = str(score)
 
 func _on_newgame_button_pressed():
 	game_board.new_game()

game.tscn

@@ -1,8 +1,9 @@
-[gd_scene load_steps=18 format=3 uid="uid://b5bfm2244ywxk"]
+[gd_scene load_steps=19 format=3 uid="uid://b5bfm2244ywxk"]
 
 [ext_resource type="Script" path="res://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="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="Texture2D" uid="uid://vu6oui2n7024" path="res://assets/gems/characters_0003.png" id="4_2reex"]
@@ -33,6 +34,8 @@ offset_bottom = 1390.0
 texture = ExtResource("1_h8otn")
 expand_mode = 2
 
+[node name="AnimatedCloud" parent="." instance=ExtResource("3_a1y13")]
+
 [node name="BkgdDimmer" type="Panel" parent="."]
 visible = false
 anchors_preset = 15
@@ -46,16 +49,16 @@ theme_override_styles/panel = SubResource("StyleBoxFlat_103kv")
 
 [node name="GameStatsBkgd" type="Panel" parent="."]
 offset_left = 75.0
-offset_top = 150.0
+offset_top = 183.0
 offset_right = 425.0
-offset_bottom = 1174.0
+offset_bottom = 1207.0
 theme_override_styles/panel = SubResource("StyleBoxFlat_k3sk6")
 
 [node name="GameStats" type="VBoxContainer" parent="."]
 offset_left = 100.0
-offset_top = 175.0
+offset_top = 203.0
 offset_right = 425.0
-offset_bottom = 1199.0
+offset_bottom = 1227.0
 theme_override_constants/separation = 40
 
 [node name="HBoxContainer1" type="HBoxContainer" parent="GameStats"]
@@ -186,13 +189,13 @@ text = "0"
 [node name="BoardTextRect" type="Panel" parent="."]
 visible = false
 offset_left = 500.0
-offset_top = 150.0
+offset_top = 183.0
 offset_right = 1524.0
-offset_bottom = 1174.0
+offset_bottom = 1207.0
 theme_override_styles/panel = SubResource("StyleBoxFlat_103kv")
 
 [node name="Board" parent="." instance=ExtResource("2_2ltbx")]
-position = Vector2(500, 150)
+position = Vector2(500, 183)
 
 [node name="Panel" type="Panel" parent="."]
 visible = false
@@ -272,7 +275,6 @@ text = "CHECKERED"
 horizontal_alignment = 1
 vertical_alignment = 1
 
-[connection signal="gem_swapped" from="Board" to="." method="_on_board_gem_swapped"]
 [connection signal="pressed" from="BtnNewGame" to="." method="_on_newgame_button_pressed"]
 [connection signal="pressed" from="BtnClearDebugLabels" to="." method="_on_btn_clear_debug_labels_pressed"]
 [connection signal="pressed" from="BtnMatchCol" to="." method="_on_btn_make_vert_pressed"]

game_board/GameBoard.gd

@@ -3,7 +3,8 @@
 extends Node2D
 class_name GameBoard
 # SIGNALS
-signal gem_swapped()
+signal props_updated_moves(moves:int)
+signal props_updated_score(score:int)
 # SCENES
 @onready var grid_container:GridContainer = $GridContainer
 @onready var hbox_container:HBoxContainer = $HBoxContainer
@@ -13,7 +14,9 @@ var selected_cell_1:GemCell = null
 var selected_cell_2:GemCell = null
 var undo_cell_1:GemCell = null
 var undo_cell_2:GemCell = null
-var tweens_running:int = 0
+var tweens_running_cnt:int = 0
+var board_props_moves:int = 0
+var board_props_score:int = 0
 
 # Called when the node enters the scene tree for the first time.
 func _ready():
@@ -55,16 +58,15 @@ func fill_hbox():
 		for row_idx in range(8):
 			# A: random gem
 			var gem_type = GEM_COLOR_NAMES[randi() % GEM_COLOR_NAMES.size()]
-			#var gem_type = Enums.GemColor.WHITE
 			# B: create/add
 			var gem_cell_scene = load("res://game_board/gem_cell.tscn")
 			var gem_cell:GemCell = gem_cell_scene.instantiate()
 			hbox_container.get_child(col_idx).add_child(gem_cell)
 			gem_cell.initialize(gem_type)
 			var control_node = gem_cell.get_node("GemControl")
-			#control_node.connect("drag_start", self._on_cell_click)
 			control_node.connect("cell_click", self._on_cell_click)
-			#control_node.connect("drag_ended", self._on_cell_click)
+			#control_node.connect("drag_start", self._on_cell_click) # TODO:
+			#control_node.connect("drag_ended", self._on_cell_click) # TODO:
 
 # =========================================================
 
@@ -217,7 +219,10 @@ func swap_gem_cells(swap_cell_1:GemCell, swap_cell_2:GemCell):
 		return
 
 	# A: signal game controller
-	emit_signal("gem_swapped") # notify controller (play sound, increase moves counter, etc.)
+	swap_cell_1.play_audio_gem_move()
+	swap_cell_2.play_audio_gem_move()
+	board_props_moves += 1
+	emit_signal("props_updated_moves", board_props_moves)
 
 	# B: turn off anim/effects before moving
 	swap_cell_1.play_selected_anim(false)
@@ -240,17 +245,17 @@ func swap_gem_cells(swap_cell_1:GemCell, swap_cell_2:GemCell):
 
 func setup_tween(gem_cell:GemCell, start_pos:Vector2, end_pos:Vector2):
 	gem_cell.sprite.global_position = start_pos # NOTE: Set initial position right before tweening
-	tweens_running += 1
+	tweens_running_cnt += 1
 	var tween = get_tree().create_tween()
 	tween.tween_property(gem_cell.sprite, "global_position", end_pos, Enums.TWEEN_TIME)
 	tween.tween_callback(tween_completed)
 
 # STEP 3: Tween complete: clear vars/scan board
 
 func tween_completed():
-	Enums.debug_print("[tween_completed]: (counter="+str(tweens_running)+")", Enums.DEBUG_LEVEL.INFO)
+	Enums.debug_print("[tween_completed]: (counter="+str(tweens_running_cnt)+")", Enums.DEBUG_LEVEL.INFO)
 	# A: update counter
-	tweens_running -= 1
+	tweens_running_cnt -= 1
 
 	# B: clear selections
 	if selected_cell_1:
@@ -261,7 +266,7 @@ func tween_completed():
 		selected_cell_2 = null
 
 	# C: once all tweens complete, check board
-	if tweens_running == 0:
+	if tweens_running_cnt == 0:
 		check_board_explode_matches()
 
 # STEP 4: Check board, then explode first match found... (repeat until exhausted)
@@ -271,6 +276,10 @@ func check_board_explode_matches():
 	Enums.debug_print("[check_board_explode_matches]: CHECKING BOARD...                    ", Enums.DEBUG_LEVEL.INFO)
 	Enums.debug_print("[check_board_explode_matches]: =====================================", Enums.DEBUG_LEVEL.INFO)
 
+	# TDDO: WIP: this will change once we start exploding all at once
+	board_props_score += 10
+	emit_signal("props_updated_score", board_props_score)
+	
 	var gem_matches = get_first_match_gems()
 	if gem_matches.size() > 0:
 		debug_print_ascii_table(gem_matches)

game_board/GemCell.gd

@@ -7,6 +7,7 @@ class_name GemCell
 @onready var debug_label_sel_num:Label = $DebugLabelSelNum
 @onready var debug_ui_panel:Panel = $DebugUIPanel
 @onready var audio_gem_explode:AudioStreamPlayer = $AudioGemExplode
+@onready var audio_gem_move:AudioStreamPlayer = $AudioGemMove
 # PROPS
 const SPRITE_SCALE:Vector2 = Vector2(0.5, 0.5)
 const DROP_OFFSET:int = 128 # (the sprite is centered in the 128x128 container, and uses a 64,64 position)
@@ -76,6 +77,9 @@ func update_texture():
 
 # =========================================================
 
+func play_audio_gem_move():
+	audio_gem_move.play()
+
 func play_selected_anim(selected:bool):
 	if selected:
 		anim_player_fx.play("selected")

game_board/gem_cell.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=25 format=3 uid="uid://clfnptdc2tu5l"]
+[gd_scene load_steps=26 format=3 uid="uid://clfnptdc2tu5l"]
 
 [ext_resource type="Script" path="res://game_board/GemCell.gd" id="1_rhspx"]
 [ext_resource type="Texture2D" uid="uid://duau66qew6757" path="res://assets/gems/characters_0001.png" id="2_33s7h"]
@@ -7,6 +7,7 @@
 [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="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"]
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_lpbyf"]
 bg_color = Color(0, 0, 0, 0.533333)
@@ -273,3 +274,6 @@ horizontal_alignment = 2
 
 [node name="AudioGemExplode" type="AudioStreamPlayer" parent="."]
 stream = ExtResource("7_50xdd")
+
+[node name="AudioGemMove" type="AudioStreamPlayer" parent="."]
+stream = ExtResource("8_cgn1d")