added common script

Author: gitbrent

game_boards/board_space/game_board/GemBoard.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 GemBoardSpace
 # SIGNALS
@@ -11,6 +9,7 @@ signal board_match_multi(match_cnt:int)
 @onready var grid_container:GridContainer = $GridContainer
 @onready var hbox_container:HBoxContainer = $HBoxContainer
 #VARS
+var common = preload("res://game_boards/common.gd").new()
 const GEM_COLOR_NAMES = [Enums.GemColor.WHITE, Enums.GemColor.RED, Enums.GemColor.YELLOW, Enums.GemColor.GREEN, Enums.GemColor.PURPLE, Enums.GemColor.BROWN]
 const GEM_POINTS:int = 25
 var selected_cell_1:GemCellSpace = null
@@ -502,14 +501,7 @@ func new_game():
 	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.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)
+	common.new_game_explode_replace(hbox_container, GEM_COLOR_NAMES, Enums.EXPLODE_DELAY)
 	# C:
 	process_game_round()
 

game_boards/board_space/game_board/GemCell.gd

@@ -61,11 +61,11 @@ func replace_gem(colorIn: Enums.GemColor, rows_to_drop: int = 1):
 	sprite.visible = true  # Make sure the sprite is visible if it was hidden after explosion
 
 	# Call the drop animation deferred to ensure it starts after other logic
-	call_deferred("drop_in_gem", drop_height)
+	call_deferred("drop_in_gem")
 
-func drop_in_gem(drop_height: float):
-	# Tween the "fall" animation from the starting point to the final position
+func drop_in_gem():
 	var tween = get_tree().create_tween()
+	# DESIGN: final position should *always* be its default [relative] position
 	tween.tween_property(sprite, "position", Enums.SRPITE_POS, Enums.TWEEN_TIME)
 
 func update_texture():

game_boards/common.gd

@@ -0,0 +1,27 @@
+extends Node
+class_name Common
+
+func new_game_explode_replace(hbox:HBoxContainer, colors:Array, delay:float):
+	# A:
+	for vbox in hbox.get_children():
+		for gem_cell in vbox.get_children():
+			gem_cell.explode_gem(gem_cell.gem_color, 0)
+	
+	# B:
+	await delay_time(hbox, delay)
+	
+	# C:
+	for vbox in hbox.get_children():
+		for gem_cell in vbox.get_children():
+			gem_cell.replace_gem(colors[randi() % colors.size()], 1)
+
+func delay_time(node: Node, delay: float) -> void:
+	var tnode = node.get_parent()
+	var timer = Timer.new()
+	timer.wait_time = delay
+	timer.one_shot = true
+	tnode.add_child(timer)
+	timer.start()
+	await timer.timeout
+	tnode.remove_child(timer)
+	timer.queue_free()