DONE with support for various gem sprites

Author: gitbrent

enums.gd

@@ -1,11 +1,11 @@
 extends Node
 
 const APP_VER:String = "0.4.0"
-const APP_BLD:String = "20240513"
+const APP_BLD:String = "20240517"
 const TWEEN_TIME:float = 0.25
 const EXPLODE_DELAY:float = TWEEN_TIME*2.0
 const SRPITE_POS:Vector2 = Vector2(64,64)
-var current_debug_level = DEBUG_LEVEL.DEBUG  # Global variable to set the current debug level
+var current_debug_level = DEBUG_LEVEL.INFO  # Global variable to set the current debug level
 
 # =========================================================
 
@@ -26,6 +26,13 @@ func get_color_name_by_value(value: int) -> String:
 
 # =========================================================
 
+enum GemDict {
+	FOOD,
+	GEMS
+}
+
+# =========================================================
+
 enum DEBUG_LEVEL {
 	NONE,    # No debug output
 	ERROR,   # Critical errors only

game_boards/all_common/cmn_gem_cell.gd

@@ -15,30 +15,40 @@ class_name CommonGemCell
 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)
 var gem_color:Enums.GemColor
+var gem_dict:Enums.GemDict
 # Declare and preload textures
-var gem_textures: Dictionary = {
+const gem_textures_gems: Dictionary = {
 	Enums.GemColor.WHITE: preload("res://assets/gems/space/gem1.png"),
 	Enums.GemColor.RED: preload("res://assets/gems/space/gem2.png"),
 	Enums.GemColor.YELLOW: preload("res://assets/gems/space/gem3.png"),
 	Enums.GemColor.GREEN: preload("res://assets/gems/space/gem4.png"),
-	Enums.GemColor.BROWN: preload("res://assets/gems/space/gem5.png"),
-	Enums.GemColor.PURPLE: preload("res://assets/gems/space/gem6.png")
+	Enums.GemColor.PURPLE: preload("res://assets/gems/space/gem5.png"),
+	Enums.GemColor.BROWN: preload("res://assets/gems/space/gem6.png")
 }
-var gem_textures_food: Dictionary = {
+const gem_textures_food: Dictionary = {
 	Enums.GemColor.WHITE: preload("res://assets/gems/characters_0001.png"),
 	Enums.GemColor.RED: preload("res://assets/gems/characters_0002.png"),
 	Enums.GemColor.YELLOW: preload("res://assets/gems/characters_0003.png"),
 	Enums.GemColor.GREEN: preload("res://assets/gems/characters_0005.png"),
-	Enums.GemColor.BROWN: preload("res://assets/gems/characters_0006.png"),
-	Enums.GemColor.PURPLE: preload("res://assets/gems/characters_0007.png")
+	Enums.GemColor.PURPLE: preload("res://assets/gems/characters_0007.png"),
+	Enums.GemColor.BROWN: preload("res://assets/gems/characters_0006.png")
 }
+var gem_textures:Dictionary = {}
 
-func initialize(colorIn: Enums.GemColor):
+func initialize(colorIn: Enums.GemColor, dictIn:Enums.GemDict):
 	# A:
 	gem_color = colorIn
+	gem_dict = dictIn
 	# B:
-	update_texture()
+	if dictIn == Enums.GemDict.FOOD:
+		gem_textures = gem_textures_food
+	elif dictIn == Enums.GemDict.GEMS:
+		gem_textures = gem_textures_gems
+	else:
+		print("ERROR: Unknown `GemDict`!")
 	# C:
+	update_texture()
+	# D:
 	#panel_hover.visible = false
 
 func explode_gem(colorIn: Enums.GemColor, pointsIn:int):
@@ -65,7 +75,7 @@ func replace_gem(colorIn: Enums.GemColor, rows_to_drop: int = 1):
 	sprite.visible = true
 
 	# Initialize the gem with the new color and ensure it's visible
-	initialize(colorIn)
+	initialize(colorIn, gem_dict)
 	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
@@ -81,7 +91,8 @@ func update_texture():
 		sprite.texture = gem_textures[gem_color]
 		#print("[gem_cell] loaded sprite.texture: ", gem_color)
 	else:
-		print("ERROR: Texture for gem color not found")
+		print("ERROR: Texture for gem color not found!")
+		print("gem_textures: ", gem_textures)
 
 # =========================================================
 

game_boards/all_common/cmn_gem_cell.tscn

@@ -1,7 +1,6 @@
-[gd_scene load_steps=92 format=3 uid="uid://8rbpehubrrps"]
+[gd_scene load_steps=90 format=3 uid="uid://8rbpehubrrps"]
 
 [ext_resource type="Script" path="res://game_boards/all_common/cmn_gem_cell.gd" id="1_taq7m"]
-[ext_resource type="Shader" path="res://game_boards/all_common/gem_cell.gdshader" id="2_5jui1"]
 [ext_resource type="Texture2D" uid="uid://duau66qew6757" path="res://assets/gems/characters_0001.png" id="2_nap56"]
 [ext_resource type="Texture2D" uid="uid://c4u0bdf7rh0u3" path="res://assets/gems/space/Overlay-Lock.png" id="3_ry8vu"]
 [ext_resource type="Texture2D" uid="uid://cooat8cgq2rb4" path="res://assets/gems/space/Overlay-Ice.png" id="4_r411p"]
@@ -18,11 +17,6 @@
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_lpbyf"]
 bg_color = Color(0, 0, 0, 0.533333)
 
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_geoqq"]
-shader = ExtResource("2_5jui1")
-shader_parameter/line_color = Color(1, 1, 1, 1)
-shader_parameter/line_thickness = 7.0
-
 [sub_resource type="Animation" id="Animation_3mn62"]
 resource_name = "explode"
 length = 0.5
@@ -644,7 +638,6 @@ grow_vertical = 2
 theme_override_styles/panel = SubResource("StyleBoxFlat_lpbyf")
 
 [node name="Sprite2D" type="Sprite2D" parent="."]
-material = SubResource("ShaderMaterial_geoqq")
 position = Vector2(64, 64)
 scale = Vector2(0.5, 0.5)
 texture = ExtResource("2_nap56")

game_boards/all_common/common.gd

@@ -22,7 +22,7 @@ func fill_grid(hbox:HBoxContainer, grid:GridContainer):
 			# Add the instantiated square to the grid container
 			grid.add_child(brdsq)
 
-func fill_hbox(hbox:HBoxContainer, on_cell_click):
+func fill_hbox(hbox:HBoxContainer, gem_dict:Enums.GemDict, on_cell_click):
 	for col_idx in range(hbox.get_child_count()):
 		for row_idx in range(8):
 			# A: random gem
@@ -31,7 +31,7 @@ func fill_hbox(hbox:HBoxContainer, on_cell_click):
 			var gem_cell_scene = load("res://game_boards/all_common/cmn_gem_cell.tscn")
 			var gem_cell:CommonGemCell = gem_cell_scene.instantiate()
 			hbox.get_child(col_idx).add_child(gem_cell)
-			gem_cell.initialize(gem_type)
+			gem_cell.initialize(gem_type, gem_dict)
 			var control_node = gem_cell.get_node("GemControl")
 			control_node.connect("cell_click", on_cell_click)
 			#control_node.connect("drag_start", self._on_cell_click) # TODO:

game_boards/all_common/common_debug.gd

@@ -63,25 +63,25 @@ func debug_clear_debug_labels(hbox:HBoxContainer):
 			#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(hbox:HBoxContainer):
+func debug_make_match_col(hbox:HBoxContainer, gemDict:Enums.GemDict):
 	var col0:VBoxContainer = hbox.get_child(0)
 	var col0_child4:CommonGemCell = col0.get_child(4)
-	col0_child4.initialize(Enums.GemColor.GREEN)
+	col0_child4.initialize(Enums.GemColor.GREEN, gemDict)
 	var col0_child5:CommonGemCell = col0.get_child(5)
-	col0_child5.initialize(Enums.GemColor.GREEN)
+	col0_child5.initialize(Enums.GemColor.GREEN, gemDict)
 	var col0_child6:CommonGemCell = col0.get_child(6)
-	col0_child6.initialize(Enums.GemColor.GREEN)
+	col0_child6.initialize(Enums.GemColor.GREEN, gemDict)
 	var col0_child7:CommonGemCell = col0.get_child(7)
-	col0_child7.initialize(Enums.GemColor.GREEN)
+	col0_child7.initialize(Enums.GemColor.GREEN, gemDict)
 
-func debug_make_gem_grid(hbox:HBoxContainer):
+func debug_make_gem_grid(hbox:HBoxContainer, gemDict:Enums.GemDict):
 	var size = hbox.get_child_count()
 	for i in range(size):
 		var vbox = hbox.get_child(i)
 		for j in range(size):
 			var gem = vbox.get_child(j)
 			# Load the appropriate scene based on the checkerboard pattern
-			gem.initialize(Enums.GemColor.GREEN)
+			gem.initialize(Enums.GemColor.GREEN, gemDict)
 			if (i + j) % 2 == 0:
-				gem.initialize(Enums.GemColor.WHITE)
+				gem.initialize(Enums.GemColor.WHITE, gemDict)
 				gem.get_child(1).position = Enums.SRPITE_POS

game_boards/board_food/game/game.gd

@@ -34,6 +34,10 @@ func on_board_match_multi(match_cnt:int):
 func _on_newgame_button_pressed():
 	game_board.new_game()
 
+func _on_btn_quit_game():
+	# TODO: 20240515: convert to `signal()` for Main.tscn to hide all boards, etc.
+	visible = false
+
 func _on_btn_clear_debug_labels_pressed():
 	game_board.debug_clear_debug_labels()
 

game_boards/board_food/game/game.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=24 format=3 uid="uid://b5bfm2244ywxk"]
+[gd_scene load_steps=25 format=3 uid="uid://b5bfm2244ywxk"]
 
 [ext_resource type="Script" path="res://game_boards/board_food/game/game.gd" id="1_ewnxx"]
 [ext_resource type="Texture2D" uid="uid://cnlqirgwr8d4" path="res://assets/bkgd/Background.png" id="1_h8otn"]
@@ -17,6 +17,7 @@
 [ext_resource type="Texture2D" uid="uid://27rcw10bp2xt" path="res://assets/gui/ButtonText_Large_Green_Round.png" id="10_qtl06"]
 [ext_resource type="Texture2D" uid="uid://bebhmcgujnoxc" path="res://assets/gui/ButtonText_Large_GreyOutline_Round.png" id="11_bw3je"]
 [ext_resource type="Texture2D" uid="uid://dcow071sb2a7i" path="res://assets/gui/ButtonText_Large_Orange_Round.png" id="12_4fgvl"]
+[ext_resource type="Texture2D" uid="uid://chrsqb6yhlqeq" path="res://assets/gui/ButtonText_Large_Blue_Round.png" id="16_d1duj"]
 [ext_resource type="Theme" uid="uid://c68uhjmxln8ao" path="res://themes/game_msg_top.tres" id="17_j7spk"]
 [ext_resource type="Theme" uid="uid://duftrpb020ewi" path="res://themes/game_msg_btm.tres" id="18_p5dta"]
 
@@ -369,6 +370,26 @@ text = "NEW GAME"
 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("16_d1duj")
+
+[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="BtnClearDebugLabels" type="TextureButton" parent="."]
 visible = false
 offset_left = 1657.0
@@ -486,5 +507,6 @@ autowrap_mode = 0
 shortcut_keys_enabled = false
 
 [connection signal="pressed" from="BtnNewGame" to="." method="_on_newgame_button_pressed"]
+[connection signal="pressed" from="BtnQuitGame" to="." method="_on_btn_quit_game"]
 [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_boards/board_food/game_board/Board.gd

@@ -27,7 +27,7 @@ func _ready():
 	randomize()
 	# A: populate board
 	CmnFunc.fill_grid(hbox_container, grid_container)
-	CmnFunc.fill_hbox(hbox_container, self._on_cell_click)
+	CmnFunc.fill_hbox(hbox_container, Enums.GemDict.FOOD, self._on_cell_click)
 	# B: check board after init
 	process_game_round()
 
@@ -103,8 +103,8 @@ func swap_gem_cells(swap_cell_1:CommonGemCell, swap_cell_2:CommonGemCell):
 	# C: logially swap
 	var gem_cell_1 = swap_cell_1.gem_color
 	var gem_cell_2 = swap_cell_2.gem_color
-	swap_cell_1.initialize(gem_cell_2)
-	swap_cell_2.initialize(gem_cell_1)
+	swap_cell_1.initialize(gem_cell_2, Enums.GemDict.FOOD)
+	swap_cell_2.initialize(gem_cell_1, Enums.GemDict.FOOD)
 	#debug_print_ascii_table([swap_cell_1,swap_cell_2])
 
 	# D: get position to restore to after move so tween sets/flows smoothly

game_boards/board_space/game_board/GemBoard.gd

@@ -27,7 +27,7 @@ func _ready():
 	randomize()
 	# A: populate board
 	CmnFunc.fill_grid(hbox_container, grid_container)
-	CmnFunc.fill_hbox(hbox_container, self._on_cell_click)
+	CmnFunc.fill_hbox(hbox_container, Enums.GemDict.GEMS, self._on_cell_click)
 	# B: check board after init
 	process_game_round()
 
@@ -103,8 +103,8 @@ func swap_gem_cells(swap_cell_1:CommonGemCell, swap_cell_2:CommonGemCell):
 	# C: logially swap
 	var gem_cell_1 = swap_cell_1.gem_color
 	var gem_cell_2 = swap_cell_2.gem_color
-	swap_cell_1.initialize(gem_cell_2)
-	swap_cell_2.initialize(gem_cell_1)
+	swap_cell_1.initialize(gem_cell_2, Enums.GemDict.GEMS)
+	swap_cell_2.initialize(gem_cell_1, Enums.GemDict.GEMS)
 
 	# D: get position to restore to after move so tween sets/flows smoothly
 	var orig_pos_cell_1 = swap_cell_1.sprite.global_position
@@ -286,8 +286,10 @@ func signal_game_props_count_gems():
 	# Emit signal with the updated gems dictionary
 	emit_signal("props_updated_gemsdict", gems_dict)
 
+# === Following are for buttons that arent on Food-Board
+
 func debug_make_gem_grid():
-	CmnDbg.debug_make_gem_grid(hbox_container)
+	CmnDbg.debug_make_gem_grid(hbox_container, Enums.GemDict.GEMS)
 	signal_game_props_count_gems()
 
 func debug_clear_debug_labels():