Merge pull request #7 from gitbrent/version-0.3.0

Version 0.3.0

Author: gitbrent

enums.gd

@@ -1,11 +1,11 @@
 extends Node
 
-const APP_VER:String = "0.1.0"
-const APP_BLD:String = "20240510"
+const APP_VER:String = "0.3.0"
+const APP_BLD:String = "20240511"
 const TWEEN_TIME:float = 0.25
-const EXPLODE_DELAY:int = 1
+const EXPLODE_DELAY:float = TWEEN_TIME*2.0
 const SRPITE_POS:Vector2 = Vector2(64,64)
-var current_debug_level = DEBUG_LEVEL.INFO  # Global variable to set the current debug level
+var current_debug_level = DEBUG_LEVEL.DEBUG  # Global variable to set the current debug level
 
 # =========================================================
 

game/animated_cloud.tscn

@@ -17,7 +17,7 @@ tracks/0/keys = {
 "times": PackedFloat32Array(0, 30),
 "transitions": PackedFloat32Array(1, 1),
 "update": 0,
-"values": [Vector2(64, 220), Vector2(1936, 220)]
+"values": [Vector2(64, 75), Vector2(1936, 75)]
 }
 
 [sub_resource type="AnimationLibrary" id="AnimationLibrary_5m8mq"]
@@ -43,7 +43,7 @@ offset_bottom = 150.0
 grow_horizontal = 2
 
 [node name="Sprite2D" type="Sprite2D" parent="."]
-position = Vector2(64, 220)
+position = Vector2(64, 75)
 texture = ExtResource("2_vo0va")
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="."]

game/game.tscn

@@ -32,7 +32,13 @@ offset_bottom = 1390.0
 texture = ExtResource("1_h8otn")
 expand_mode = 2
 
-[node name="AnimatedCloud" parent="." instance=ExtResource("3_a1y13")]
+[node name="AnimatedCloud1" parent="." instance=ExtResource("3_a1y13")]
+
+[node name="AnimatedCloud2" parent="." instance=ExtResource("3_a1y13")]
+position = Vector2(1000, 75)
+
+[node name="AnimatedCloud3" parent="." instance=ExtResource("3_a1y13")]
+position = Vector2(-1000, 100)
 
 [node name="BkgdDimmer" type="Panel" parent="."]
 visible = false
@@ -101,9 +107,9 @@ theme_override_styles/panel = SubResource("StyleBoxFlat_k3sk6")
 
 [node name="GameStats" type="VBoxContainer" parent="."]
 offset_left = 120.0
-offset_top = 250.0
+offset_top = 280.0
 offset_right = 370.0
-offset_bottom = 1274.0
+offset_bottom = 1304.0
 theme_override_constants/separation = 40
 
 [node name="HBoxContainer1" type="HBoxContainer" parent="GameStats"]
@@ -257,10 +263,10 @@ position = Vector2(500, 250)
 stream = ExtResource("8_7jpwb")
 
 [node name="BtnNewGame" type="TextureButton" parent="."]
-offset_left = 1608.0
-offset_top = 255.0
-offset_right = 2767.0
-offset_bottom = 613.0
+offset_left = 1600.0
+offset_top = 250.0
+offset_right = 2759.0
+offset_bottom = 608.0
 scale = Vector2(0.3, 0.3)
 texture_normal = ExtResource("10_qtl06")
 
@@ -298,7 +304,6 @@ horizontal_alignment = 1
 vertical_alignment = 1
 
 [node name="BtnMatchCol" type="TextureButton" parent="."]
-visible = false
 offset_left = 1656.0
 offset_top = 519.0
 offset_right = 2815.0

game_board/GameBoard.gd

@@ -11,6 +11,7 @@ signal props_updated_gemsdict(gems_dict:Dictionary)
 @onready var hbox_container:HBoxContainer = $HBoxContainer
 #VARS
 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:GemCell = null
 var selected_cell_2:GemCell = null
 var undo_cell_1:GemCell = null
@@ -27,14 +28,7 @@ func _ready():
 	fill_grid()
 	fill_hbox()
 	# B: check board after init
-	check_board_explode_matches()
-
-# TODO: feed props to parent controller for display
-func get_gem_props():
-	var brent:Dictionary = {
-		"GREEN": 99
-	}
-	return brent
+	process_game_round()
 
 # =========================================================
 
@@ -113,10 +107,10 @@ func are_cells_adjacent(gemcell1:GemCell, gemcell2:GemCell) -> bool:
 	# Cells are not adjacent
 	return false
 
-func get_first_match_gems() -> Array:
+func get_all_matches() -> Array:
 	var num_columns: int = hbox_container.get_child_count()
 	var num_rows: int = hbox_container.get_child(0).get_child_count()
-	var match_cells: Array = []
+	var matches = []
 
 	# Horizontal Check (check each row)
 	for row in range(num_rows):
@@ -129,19 +123,24 @@ func get_first_match_gems() -> Array:
 				streak += 1
 			else:
 				if streak >= 3:
-					# Collect matching GemCells
-					match_cells = []
+					var match_cells = []
 					for i in range(match_start, column):
 						match_cells.append(hbox_container.get_child(i).get_child(row))
-					return match_cells
+					matches.append({
+						"cells": match_cells,
+						"count": streak
+					})
 				streak = 1
 				match_start = column
 				last_color = gem_cell.gem_color
 		if streak >= 3:
-			match_cells = []
+			var match_cells = []
 			for i in range(match_start, num_columns):
 				match_cells.append(hbox_container.get_child(i).get_child(row))
-			return match_cells
+			matches.append({
+				"cells": match_cells,
+				"count": streak
+			})
 
 	# Vertical Check (check each column)
 	for column in range(num_columns):
@@ -154,21 +153,51 @@ func get_first_match_gems() -> Array:
 				streak += 1
 			else:
 				if streak >= 3:
-					# Collect matching GemCells
-					match_cells = []
+					var match_cells = []
 					for i in range(match_start, row):
 						match_cells.append(hbox_container.get_child(column).get_child(i))
-					return match_cells
+					matches.append({
+						"cells": match_cells,
+						"count": streak
+					})
 				streak = 1
 				match_start = row
 				last_color = gem_cell.gem_color
 		if streak >= 3:
-			match_cells = []
+			var match_cells = []
 			for i in range(match_start, num_rows):
 				match_cells.append(hbox_container.get_child(column).get_child(i))
-			return match_cells
-
-	return []  # No matches found
+			matches.append({
+				"cells": match_cells,
+				"count": streak
+			})
+
+	return matches
+
+func extract_gem_cells_from_matches(matches: Array) -> Array:
+	var all_gem_cells = []
+	for match in matches:
+		# `match["cells"]` is the array of gem cells for this particular match
+		all_gem_cells += match["cells"]  # Append all cells in this match to the master list
+	return all_gem_cells
+
+func calculate_score_for_matches(matches: Array) -> int:
+	var score = 0
+	for match in matches:
+		var match_length = match["count"]
+		# Define scoring logic, e.g., exponential growth for larger matches
+		var match_score = match_length * match_length  # Example: score grows quadratically with match length
+		score += match_score * GEM_POINTS
+	return score
+
+func calculate_scores_for_each_match(matches: Array) -> Dictionary:
+	var scores = {}
+	for match in matches:
+		var count = match["count"]
+		var score = count * GEM_POINTS
+		for cell in match["cells"]:
+			scores[cell] = score
+	return scores
 
 # STEP 1: Handle input (=capture first & second selection), swap gems
 # @desc: calls `swap_gem_cells()` when 2 cells selected and are adjacent
@@ -271,27 +300,43 @@ func tween_completed():
 
 	# C: once all tweens complete, check board
 	if tweens_running_cnt == 0:
-		check_board_explode_matches()
+		process_game_round()
 
 # STEP 4: Check board, then explode first match found... (repeat until exhausted)
 
-func check_board_explode_matches():
-	Enums.debug_print("[check_board_explode_matches]: =====================================", Enums.DEBUG_LEVEL.INFO)
-	Enums.debug_print("[check_board_explode_matches]: CHECKING BOARD...                    ", Enums.DEBUG_LEVEL.INFO)
-	Enums.debug_print("[check_board_explode_matches]: =====================================", Enums.DEBUG_LEVEL.INFO)
+func process_game_round():
+	Enums.debug_print("[process_game_round]: =====================================", Enums.DEBUG_LEVEL.INFO)
+	Enums.debug_print("[process_game_round]: CHECKING BOARD...                    ", Enums.DEBUG_LEVEL.INFO)
+	Enums.debug_print("[process_game_round]: =====================================", Enums.DEBUG_LEVEL.INFO)
 
-	# TDDO: WIP: this will change once we start exploding all at once
-	board_props_score += 10
+	# A:
+	# EX:
+	# matches[
+	#   {
+	#     "cells":["@Control@112:<Control#89338678177>","@Control@113:<Control#90143984570>","@Control@114:<Control#90949290963>"],
+	#     "count":3},
+	#   {
+	#     "cells":["@Control@119:<Control#95781129321>","@Control@120:<Control#96586435714>","@Control@121:<Control#97391742107>"],
+	#     "count":3
+	#   }
+	#]
+	var matches = get_all_matches()
+	var gem_cells = extract_gem_cells_from_matches(matches)
+	Enums.debug_print("[process_game_round]: matches.. = "+JSON.stringify(matches), Enums.DEBUG_LEVEL.DEBUG)
+	Enums.debug_print("[process_game_round]: gem_cells = "+str(gem_cells), Enums.DEBUG_LEVEL.DEBUG)
+	if matches.size() > 0 and Enums.current_debug_level == Enums.DEBUG_LEVEL.DEBUG:
+		debug_print_ascii_table(gem_cells)
+
+	# B:
+	var score = calculate_score_for_matches(matches)
+	board_props_score += score
 	emit_signal("props_updated_score", board_props_score)
 
-	# A:
+	# C: Update UI or game state as necessary
 	signal_game_props_count_gems()
 
-	# B:
-	var gem_matches = get_first_match_gems()
-	if gem_matches.size() > 0:
-		debug_print_ascii_table(gem_matches)
-	if gem_matches.size() == 0:
+	# D: Handle resuolts: explode matches, or halt
+	if matches.size() == 0:
 		Enums.debug_print("[check_board_explode_matches]: No more matches. Board stable.", Enums.DEBUG_LEVEL.INFO)
 		# A:
 		# B: TODO: check for "NO MORE MOVES"
@@ -305,38 +350,49 @@ func check_board_explode_matches():
 		undo_cell_1 = null
 		undo_cell_2 = null
 		# B: explode matched gems
-		explode_refill_gems(gem_matches)
+		var match_scores = calculate_scores_for_each_match(matches)
+		explode_refill_gems(matches, match_scores)
 
-func explode_refill_gems(gem_cells: Array):
-	Enums.debug_print("[explode_refill_gems........]: =====================================", Enums.DEBUG_LEVEL.INFO)
-	Enums.debug_print("[explode_refill_gems........]: *EXPLODING* gem_cell count: "+str(gem_cells.size()), Enums.DEBUG_LEVEL.INFO)
-	Enums.debug_print("[explode_refill_gems........]: =====================================", Enums.DEBUG_LEVEL.INFO)
+func explode_refill_gems(matches: Array, match_scores: Dictionary):
+	Enums.debug_print("[explode_refill_gems]: !!!!!!!!!!!=====================================", Enums.DEBUG_LEVEL.INFO)
+	Enums.debug_print("[explode_refill_gems]: *EXPLODING* gem_cell count: "+str(matches.size()), Enums.DEBUG_LEVEL.INFO)
+	Enums.debug_print("[explode_refill_gems]: !!!!!!!!!!!=====================================", Enums.DEBUG_LEVEL.INFO)
 	if Enums.current_debug_level == Enums.DEBUG_LEVEL.DEBUG:
-		debug_print_ascii_table(gem_cells)
+		debug_print_ascii_table(extract_gem_cells_from_matches(matches))
 
 	# A: explode selected
-	for gem_cell in gem_cells:
-		gem_cell.explode_gem(gem_cell.gem_color)
-	await get_tree().create_timer(Enums.EXPLODE_DELAY).timeout
+	for match in matches:
+		for gem_cell in match["cells"]:
+			var score = match_scores[gem_cell]
+			gem_cell.explode_gem(gem_cell.gem_color, score)
+	
+	# TODO: FIXME: gem counts need to update faster (they currently update after the animation completes)!!
+	# seemingly, this would work fine located here but its not - the UI update requires a frame update i guess?
+	signal_game_props_count_gems()
 
-	# B: Dictionary to track columns and the number of gems to add in each column
+	# B: let explode animation run
+	await get_tree().create_timer(Enums.TWEEN_TIME).timeout
+	
+	# C: Dictionary to track columns and the number of gems to add in each column
 	var columns_to_refill = {}
-	for gem_cell in gem_cells:
-		var column_index = gem_cell.get_parent().get_index()
-		var row_index = gem_cell.get_index()
-		if column_index in columns_to_refill:
-			columns_to_refill[column_index]["count"] += 1
-			columns_to_refill[column_index]["highest"] = max(columns_to_refill[column_index]["highest"], row_index)
-		else:
-			columns_to_refill[column_index] = {"highest": row_index, "count": 1}
+	for match in matches:
+		for gem_cell in match["cells"]:
+			var column_index = gem_cell.get_parent().get_index()
+			var row_index = gem_cell.get_index()
+			if column_index in columns_to_refill:
+				columns_to_refill[column_index]["count"] += 1
+				columns_to_refill[column_index]["highest"] = max(columns_to_refill[column_index]["highest"], row_index)
+			else:
+				columns_to_refill[column_index] = {"highest": row_index, "count": 1}
 
 	# C: Process each column that needs refilling
 	for column_index in columns_to_refill.keys():
 		var details = columns_to_refill[column_index]
 		refill_column(column_index, details["highest"], details["count"])
 
 	# D:
-	check_board_explode_matches()
+	await get_tree().create_timer(Enums.EXPLODE_DELAY).timeout # let refill animations above complete (otherwise new, matching gems would start exploding before they're even in place!)
+	process_game_round()
 
 func refill_column(column_index: int, highest_exploded_row: int, count_exploded: int):
 	var column = hbox_container.get_child(column_index)
@@ -444,7 +500,7 @@ func new_game():
 			gem_cell.get_child(1).visible = true
 			gem_cell.get_child(1).position = Enums.SRPITE_POS
 	# B:
-	check_board_explode_matches()
+	process_game_round()
 
 func debug_clear_debug_labels():
 	for vbox in hbox_container.get_children():
@@ -477,4 +533,5 @@ func debug_make_gem_grid():
 			gem.initialize(Enums.GemColor.GREEN)
 			if (i + j) % 2 == 0:
 				gem.initialize(Enums.GemColor.WHITE)
+				gem.get_child(1).position = Enums.SRPITE_POS
 	signal_game_props_count_gems()