New Game now explodes and drops in gems

Author: gitbrent

game_boards/board01/game_board/GameBoard.gd

@@ -497,6 +497,9 @@ func debug_print_ascii_table(affected_cells: Array):
 func new_game():
 	Enums.debug_print("Starting new game, resetting board.", Enums.DEBUG_LEVEL.INFO)
 	# A:
+	board_props_moves = 0
+	board_props_score = 0
+	# A:
 	for vbox in hbox_container.get_children():
 		for gem_cell in vbox.get_children():
 			gem_cell.initialize(GEM_COLOR_NAMES[randi() % GEM_COLOR_NAMES.size()])

game_boards/board_space/game_board/GemBoard.gd

@@ -499,12 +499,18 @@ func debug_print_ascii_table(affected_cells: Array):
 func new_game():
 	Enums.debug_print("Starting new game, resetting board.", Enums.DEBUG_LEVEL.INFO)
 	# A:
+	board_props_moves = 0
+	board_props_score = 0
+	# B:
 	for vbox in hbox_container.get_children():
 		for gem_cell in vbox.get_children():
-			gem_cell.initialize(GEM_COLOR_NAMES[randi() % GEM_COLOR_NAMES.size()])
-			gem_cell.get_child(1).visible = true
-			gem_cell.get_child(1).position = Enums.SRPITE_POS
+			gem_cell.explode_gem(gem_cell.gem_color, 0)
+	await get_tree().create_timer(Enums.EXPLODE_DELAY).timeout
 	# B:
+	for vbox in hbox_container.get_children():
+		for gem_cell in vbox.get_children():
+			gem_cell.replace_gem(GEM_COLOR_NAMES[randi() % GEM_COLOR_NAMES.size()], 1)
+	# C:
 	process_game_round()
 
 func debug_clear_debug_labels():
@@ -513,9 +519,9 @@ func debug_clear_debug_labels():
 			gem_cell.debug_show_debug_panel(false)
 			gem_cell.get_child(1).visible = true
 			gem_cell.get_child(1).position = Enums.SRPITE_POS
-			var debug_name = Enums.get_color_name_by_value(gem_cell.gem_color).substr(0,1)
-			var debug_str = "["+debug_name+"] " + str(gem_cell.get_child(1).visible)
-			Enums.debug_print(debug_str, Enums.DEBUG_LEVEL.DEBUG)
+			#var debug_name = Enums.get_color_name_by_value(gem_cell.gem_color).substr(0,1)
+			#var debug_str = "[debug_clear_debug_labels] ["+debug_name+"] " + str(gem_cell.get_child(1).visible)
+			#Enums.debug_print(debug_str, Enums.DEBUG_LEVEL.DEBUG)
 
 func debug_make_match_col():
 	var col0:VBoxContainer = hbox_container.get_child(0)

game_boards/board_space/game_board/GemCell.gd

@@ -54,7 +54,8 @@ func replace_gem(colorIn: Enums.GemColor, rows_to_drop: int = 1):
 
 	var beg_pos = Vector2(sprite.position.x, sprite.position.y - drop_height)
 	sprite.position = beg_pos
-
+	sprite.visible = true
+	
 	# Initialize the gem with the new color and ensure it's visible
 	initialize(colorIn)
 	sprite.visible = true  # Make sure the sprite is visible if it was hidden after explosion
@@ -64,9 +65,8 @@ func replace_gem(colorIn: Enums.GemColor, rows_to_drop: int = 1):
 
 func drop_in_gem(drop_height: float):
 	# Tween the "fall" animation from the starting point to the final position
-	var end_pos = Vector2(sprite.position.x, sprite.position.y + drop_height)
 	var tween = get_tree().create_tween()
-	tween.tween_property(sprite, "position", end_pos, Enums.TWEEN_TIME)
+	tween.tween_property(sprite, "position", Enums.SRPITE_POS, Enums.TWEEN_TIME)
 
 func update_texture():
 	if gem_color in gem_textures:
@@ -100,7 +100,8 @@ func play_anim_explode(points:int):
 
 	# C: show points
 	label_points.text = "+"+str(points)
-	anim_player_fx.play("new_points")
+	if points > 0:
+		anim_player_fx.play("new_points")
 
 	# D: explode animation (exploding sprite)
 	anim_sprite_explode.visible = true

game_boards/board_space/game_space.gd

@@ -41,3 +41,6 @@ func _on_btn_quit_game():
 func _on_btn_checkerboard():
 	game_board.debug_make_gem_grid()
 	#game_board.debug_make_match_col()
+
+func _on_btn_debug_pressed():
+	game_board.debug_clear_debug_labels()

game_boards/board_space/game_space.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=30 format=3 uid="uid://bkaimvifjwkai"]
+[gd_scene load_steps=31 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://cwhjcn0y744nv" path="res://assets/gems/background-space.png" id="3_f5frv"]
@@ -18,6 +18,7 @@
 [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"]
 [ext_resource type="Theme" uid="uid://duftrpb020ewi" path="res://themes/game_msg_btm.tres" id="18_jrjnv"]
+[ext_resource type="Texture2D" uid="uid://chrsqb6yhlqeq" path="res://assets/gui/ButtonText_Large_Blue_Round.png" id="18_y8cds"]
 [ext_resource type="Theme" uid="uid://c68uhjmxln8ao" path="res://themes/game_msg_top.tres" id="19_iidij"]
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_103kv"]
@@ -397,23 +398,23 @@ text = "NEW GAME"
 horizontal_alignment = 1
 vertical_alignment = 1
 
-[node name="BtnQuitGame" type="TextureButton" parent="."]
+[node name="BtnDebug" type="TextureButton" parent="."]
 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("16_20lur")
 
-[node name="Label" type="Label" parent="BtnQuitGame"]
+[node name="Label" type="Label" parent="BtnDebug"]
 layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 theme_override_font_sizes/font_size = 120
-text = "Quit"
+text = "CLEAR/RESET"
 horizontal_alignment = 1
 vertical_alignment = 1
 
@@ -437,6 +438,26 @@ text = "CHECKERED"
 horizontal_alignment = 1
 vertical_alignment = 1
 
+[node name="BtnQuitGame" type="TextureButton" parent="."]
+offset_left = 1659.0
+offset_top = 696.0
+offset_right = 2818.0
+offset_bottom = 1054.0
+scale = Vector2(0.25, 0.25)
+texture_normal = ExtResource("18_y8cds")
+
+[node name="Label" type="Label" parent="BtnQuitGame"]
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+theme_override_font_sizes/font_size = 120
+text = "Quit"
+horizontal_alignment = 1
+vertical_alignment = 1
+
 [node name="ContMessages" type="Control" parent="."]
 custom_minimum_size = Vector2(2000, 230)
 layout_mode = 3
@@ -513,5 +534,6 @@ autowrap_mode = 0
 shortcut_keys_enabled = false
 
 [connection signal="pressed" from="BtnNewGame" to="." method="_on_btn_newgame_pressed"]
-[connection signal="pressed" from="BtnQuitGame" to="." method="_on_btn_quit_game"]
+[connection signal="pressed" from="BtnDebug" to="." method="_on_btn_debug_pressed"]
 [connection signal="pressed" from="BtnCheckerboard" to="." method="_on_btn_checkerboard"]
+[connection signal="pressed" from="BtnQuitGame" to="." method="_on_btn_quit_game"]