WIP: timer works well

Author: gitbrent

enums.gd

@@ -1,10 +1,13 @@
 extends Node
-
+# APP
 const APP_VER:String = "0.5.0"
 const APP_BLD:String = "20240519"
+# GAME
 const TWEEN_TIME:float = 0.25
 const EXPLODE_DELAY:float = TWEEN_TIME*2.0
 const SRPITE_POS:Vector2 = Vector2(64,64)
+const HINT_DELAY:int = 5
+# VARS
 var current_debug_level = DEBUG_LEVEL.INFO  # Global variable to set the current debug level
 
 # =========================================================

game_boards/all_common/cmn_gem_cell.tscn

@@ -35,8 +35,7 @@ tracks/0/keys = {
 
 [sub_resource type="Animation" id="Animation_xv0ay"]
 resource_name = "highlight"
-length = 3.6
-loop_mode = 1
+length = 0.8
 step = 0.2
 tracks/0/type = "value"
 tracks/0/imported = false

game_boards/all_common/common.gd

@@ -89,17 +89,6 @@ func highlight_first_swap(hbox:HBoxContainer) -> void:
 		highlight_gem2 = swap[1]
 		highlight_gem1.highlight()
 		highlight_gem2.highlight()
-		# Optionally set a timer to remove highlight after a few seconds
-		await delay_time(hbox, 3)
-		_on_HighlightTimer_timeout()
-
-func _on_HighlightTimer_timeout():
-	if highlight_gem1 and highlight_gem2:
-		highlight_gem1.unhighlight()
-		highlight_gem2.unhighlight()
-		# Reset highlight gems to null
-		highlight_gem1 = null
-		highlight_gem2 = null
 
 func has_match_at(x, y, board):
 	var color = board[x][y].gem_color

game_boards/board_space/board_space.gd

@@ -9,12 +9,17 @@ signal show_game_msg(msg:String)
 # SCENES
 @onready var grid_container:GridContainer = $GridContainer
 @onready var hbox_container:HBoxContainer = $HBoxContainer
-#VARS
+@onready var inactivity_timer:Timer = $InactivityTimer
+@onready var cont_debug_label:Label = $"../../ContDebug/VBoxContainer/ContDebugLabel"
+@onready var cont_debug_value:Label = $"../../ContDebug/VBoxContainer/ContDebugValue"
+# PRELOAD
 var CmnFunc = preload("res://game_boards/all_common/common.gd").new()
 var CmnDbg = preload("res://game_boards/all_common/common_debug.gd").new()
+# CONST
 const GEM_COLOR_NAMES = [Enums.GemColor.RED, Enums.GemColor.ORG, Enums.GemColor.YLW, Enums.GemColor.GRN, Enums.GemColor.BLU, Enums.GemColor.PRP]
 const GEM_POINTS:int = 25
 const GEM_DICT:Enums.GemDict = Enums.GemDict.SPACE
+# VARS
 var selected_cell_1:CommonGemCell = null
 var selected_cell_2:CommonGemCell = null
 var undo_cell_1:CommonGemCell = null
@@ -27,14 +32,15 @@ var board_props_score:int = 0
 func _ready():
 	# godot setup
 	randomize()
+	inactivity_timer.wait_time = Enums.HINT_DELAY # sync UI to logic
 	# A: populate board
 	const brd_sq0 = "res://game_boards/board_space/assets/board_square_0.tscn"
 	const brd_sq1 = "res://game_boards/board_space/assets/board_square_1.tscn"
 	CmnFunc.fill_grid(hbox_container, grid_container, brd_sq0, brd_sq1)
-	# 20240520: WIP: moved below to "init_game"
-	#CmnFunc.fill_hbox(hbox_container, GEM_DICT, self._on_cell_click)
-	# B: check board after init
-	#process_game_round()
+
+func _process(delta):
+	cont_debug_label.text = "TIMER left secs..."
+	cont_debug_value.text = str(round(inactivity_timer.time_left))
 
 # NOTE: iOS [Xcode] has no cells if "CmnFunc.fill_hbox()" is in the _ready() func above
 # So, instead of having [game_space.gd] flip `visible` flag on this scene, let's do both of these here to alleviate the issue
@@ -81,6 +87,10 @@ func _on_cell_click(gem_cell:CommonGemCell):
 	Enums.debug_print("[_on_cell_click] gem_cell.......: "+JSON.stringify(CmnFunc.find_gem_indices(gem_cell)), Enums.DEBUG_LEVEL.INFO)
 	Enums.debug_print("[_on_cell_click] ---------------------------------------------", Enums.DEBUG_LEVEL.INFO)
 
+	# A: Reset the inactivity_timer timer on any user input
+	inactivity_timer.stop()
+	inactivity_timer.start()
+	
 	# Clear first, we'll set later
 	if selected_cell_1:
 		selected_cell_1.play_selected_anim(false)
@@ -214,8 +224,6 @@ func process_game_round():
 		# B: TODO: check for "NO MORE MOVES"
 		var brent = CmnFunc.check_for_possible_moves(hbox_container)
 		print("CHECK FOR MOVES = ", str(brent))
-		# C: TODO: highlight available moves after short delay
-		CmnFunc.highlight_first_swap(hbox_container)
 		# C: Reset undo cells or perform other cleanup here.
 		if undo_cell_1 and undo_cell_2:
 			swap_gem_cells(undo_cell_2, undo_cell_1)
@@ -329,3 +337,13 @@ func debug_make_gem_grid():
 
 func debug_clear_debug_labels():
 	CmnDbg.debug_clear_debug_labels(hbox_container)
+
+func _on_inactivity_timer_timeout():
+	# A: Deselect all (e.g.: maybe one gem was clicked on and is just pulsating on screen)
+	# TODO: ^^^
+	# B: Call the highlight function on timeout
+	# WIP: highlight available moves after short delay
+	#cont_debug_label.text += "- highlight_first_swap! \n"
+	CmnFunc.highlight_first_swap(hbox_container)
+	# C: Restart timer
+	inactivity_timer.start()

game_boards/board_space/board_space.tscn

@@ -84,3 +84,9 @@ theme_override_constants/separation = 0
 custom_minimum_size = Vector2(128, 0)
 layout_mode = 2
 theme_override_constants/separation = 0
+
+[node name="InactivityTimer" type="Timer" parent="."]
+wait_time = 10.0
+one_shot = true
+
+[connection signal="timeout" from="InactivityTimer" to="." method="_on_inactivity_timer_timeout"]

game_boards/board_space/game_space.gd

@@ -1,5 +1,5 @@
 extends Node2D
-#
+# VARS
 var CmnFunc = preload("res://game_boards/all_common/common.gd").new()
 # SCENES
 @onready var game_top_h_box:HBoxContainer = $ContTopBar/GameTopHBox
@@ -20,6 +20,8 @@ func _ready():
 	# B:
 	center_container.visible = false
 
+# =========================================================
+
 func _on_props_updated_gemsdict(gems_dict:Dictionary):
 	# EX: `{ "RED": 9, "ORG": 11, "YLW": 14, "GRN": 9, "BLU": 9, "PRP": 12 }`
 	game_stats.get_child(0).get_child(1).text = str(gems_dict["RED"])
@@ -61,5 +63,7 @@ func _on_btn_checkerboard():
 func _on_btn_debug_pressed():
 	game_board.debug_clear_debug_labels()
 
+# =========================================================
+
 func init_game():
 	game_board.init_game()

game_boards/board_space/game_space.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=32 format=3 uid="uid://bkaimvifjwkai"]
+[gd_scene load_steps=34 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"]
@@ -14,8 +14,10 @@
 [ext_resource type="Texture2D" uid="uid://cvlodafggu8vg" path="res://assets/gems/space/Space_B.png" id="12_rwo65"]
 [ext_resource type="Texture2D" uid="uid://cnx5i4dv14xma" path="res://assets/gems/space/Space_P.png" id="13_wc6j4"]
 [ext_resource type="PackedScene" uid="uid://b02gonq6mjgh8" path="res://game_boards/board_space/board_space.tscn" id="14_xjwh6"]
+[ext_resource type="FontFile" uid="uid://dlhwrp5jwkrll" path="res://assets/fonts/Acme-Regular.ttf" id="15_qcr5o"]
 [ext_resource type="Texture2D" uid="uid://27rcw10bp2xt" path="res://assets/gui/ButtonText_Large_Green_Round.png" id="15_qjgsg"]
 [ext_resource type="Texture2D" uid="uid://bebhmcgujnoxc" path="res://assets/gui/ButtonText_Large_GreyOutline_Round.png" id="16_20lur"]
+[ext_resource type="FontFile" uid="uid://bylgyjavx5yts" path="res://assets/fonts/Quicksand-Regular.ttf" id="16_donlk"]
 [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"]
@@ -420,6 +422,52 @@ theme_override_styles/panel = SubResource("StyleBoxFlat_103kv")
 [node name="GemBoard" parent="ContBoard" instance=ExtResource("14_xjwh6")]
 position = Vector2(500, 250)
 
+[node name="ContDebug" type="Control" parent="."]
+layout_mode = 3
+anchors_preset = 0
+offset_left = 1642.0
+offset_top = 881.0
+offset_right = 1892.0
+offset_bottom = 1231.0
+
+[node name="ContDebugBkgd" type="Panel" parent="ContDebug"]
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+theme_override_styles/panel = SubResource("StyleBoxFlat_k3sk6")
+
+[node name="VBoxContainer" type="VBoxContainer" parent="ContDebug"]
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_left = 10.0
+offset_top = 10.0
+offset_right = -10.0
+offset_bottom = -10.0
+grow_horizontal = 2
+grow_vertical = 2
+
+[node name="ContDebugLabel" type="Label" parent="ContDebug/VBoxContainer"]
+layout_mode = 2
+size_flags_vertical = 3
+theme_override_fonts/font = ExtResource("15_qcr5o")
+theme_override_font_sizes/font_size = 32
+text = "ContDebugLabel"
+vertical_alignment = 1
+text_overrun_behavior = 1
+
+[node name="ContDebugValue" type="Label" parent="ContDebug/VBoxContainer"]
+layout_mode = 2
+theme_override_fonts/font = ExtResource("16_donlk")
+theme_override_font_sizes/font_size = 52
+text = "Cont
+Debug
+Value"
+
 [node name="BtnNewGame" type="TextureButton" parent="."]
 offset_left = 1600.0
 offset_top = 250.0