nett00n/skelly
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feature/saves-and-score (#8)

Browse Source 
Reviewed-on: #8
Co-authored-by: Vladimir nett00n Budylnikov <git@nett00n.org>
Co-committed-by: Vladimir nett00n Budylnikov <git@nett00n.org>
This commit is contained in:
Vladimir nett00n Budylnikov
2025-09-25 20:58:23 +02:00
committed by nett00n
parent ea8c85d7ad
commit ca233f4171
14 changed files with 1200 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
scenes/ui/DebugMenuBase.gd
View File

@@ -12,8 +12,16 @@ extends Control
@export var target_script_path: String = "res://scenes/game/gameplays/match3_gameplay.gd"
@export var log_category: String = "DebugMenu"
# Safety constants matching match3_gameplay.gd
const MAX_GRID_SIZE := 15
const MAX_TILE_TYPES := 10
const MIN_GRID_SIZE := 3
const MIN_TILE_TYPES := 3
var match3_scene: Node2D
var search_timer: Timer
var last_scene_search_time: float = 0.0
const SCENE_SEARCH_COOLDOWN := 0.5 # Prevent excessive scene searching
func _exit_tree():
if search_timer:
@@ -43,27 +51,27 @@ func _ready():
_find_target_scene()
func _initialize_spinboxes():
# Initialize gem types spinbox
gem_types_spinbox.min_value = 3
gem_types_spinbox.max_value = 8
# Initialize gem types spinbox with safety limits
gem_types_spinbox.min_value = MIN_TILE_TYPES
gem_types_spinbox.max_value = MAX_TILE_TYPES
gem_types_spinbox.step = 1
gem_types_spinbox.value = 5 # Default value
# Initialize grid size spinboxes
grid_width_spinbox.min_value = 4
grid_width_spinbox.max_value = 12
# Initialize grid size spinboxes with safety limits
grid_width_spinbox.min_value = MIN_GRID_SIZE
grid_width_spinbox.max_value = MAX_GRID_SIZE
grid_width_spinbox.step = 1
grid_width_spinbox.value = 8 # Default value
grid_height_spinbox.min_value = 4
grid_height_spinbox.max_value = 12
grid_height_spinbox.min_value = MIN_GRID_SIZE
grid_height_spinbox.max_value = MAX_GRID_SIZE
grid_height_spinbox.step = 1
grid_height_spinbox.value = 8 # Default value
func _setup_scene_finding():
# Create timer for periodic scene search
# Create timer for periodic scene search with longer intervals to reduce CPU usage
search_timer = Timer.new()
search_timer.wait_time = 0.1
search_timer.wait_time = 0.5 # Reduced frequency from 0.1 to 0.5 seconds
search_timer.timeout.connect(_find_target_scene)
add_child(search_timer)
@@ -92,6 +100,11 @@ func _update_ui_from_scene():
if not match3_scene:
return
# Connect to grid state loaded signal if not already connected
if match3_scene.has_signal("grid_state_loaded") and not match3_scene.grid_state_loaded.is_connected(_on_grid_state_loaded):
match3_scene.grid_state_loaded.connect(_on_grid_state_loaded)
DebugManager.log_debug("Connected to grid_state_loaded signal", log_category)
# Update gem types display
if match3_scene.has_method("get") and "TILE_TYPES" in match3_scene:
gem_types_spinbox.value = match3_scene.TILE_TYPES
@@ -105,6 +118,18 @@ func _update_ui_from_scene():
grid_width_label.text = "Width: " + str(grid_size.x)
grid_height_label.text = "Height: " + str(grid_size.y)
func _on_grid_state_loaded(grid_size: Vector2i, tile_types: int):
DebugManager.log_debug("Grid state loaded signal received: size=%s, types=%d" % [grid_size, tile_types], log_category)
# Update the UI with the actual loaded values
gem_types_spinbox.value = tile_types
gem_types_label.text = "Gem Types: " + str(tile_types)
grid_width_spinbox.value = grid_size.x
grid_height_spinbox.value = grid_size.y
grid_width_label.text = "Width: " + str(grid_size.x)
grid_height_label.text = "Height: " + str(grid_size.y)
func _stop_search_timer():
if search_timer and search_timer.timeout.is_connected(_find_target_scene):
search_timer.stop()
@@ -122,6 +147,14 @@ func _on_debug_toggled(enabled: bool):
if not match3_scene:
_find_target_scene()
_update_ui_from_scene()
# Force refresh the values in case they changed while debug was hidden
_refresh_current_values()
func _refresh_current_values():
# Refresh UI with current values from the scene
if match3_scene:
DebugManager.log_debug("Refreshing debug menu values from current scene state", log_category)
_update_ui_from_scene()
func _on_regenerate_pressed():
if not match3_scene:
@@ -138,17 +171,25 @@ func _on_regenerate_pressed():
DebugManager.log_error("Target scene does not have regenerate_grid method", log_category)
func _on_gem_types_changed(value: float):
# Rate limiting for scene searches
var current_time = Time.get_ticks_msec() / 1000.0
if current_time - last_scene_search_time < SCENE_SEARCH_COOLDOWN:
return
if not match3_scene:
_find_target_scene()
last_scene_search_time = current_time
if not match3_scene:
DebugManager.log_error("Could not find target scene for gem types change", log_category)
return
var new_value = int(value)
# Input validation
if new_value < gem_types_spinbox.min_value or new_value > gem_types_spinbox.max_value:
DebugManager.log_error("Invalid gem types value: %d (range: %d-%d)" % [new_value, gem_types_spinbox.min_value, gem_types_spinbox.max_value], log_category)
# Enhanced input validation with safety constants
if new_value < MIN_TILE_TYPES or new_value > MAX_TILE_TYPES:
DebugManager.log_error("Invalid gem types value: %d (range: %d-%d)" % [new_value, MIN_TILE_TYPES, MAX_TILE_TYPES], log_category)
# Reset to valid value
gem_types_spinbox.value = clamp(new_value, MIN_TILE_TYPES, MAX_TILE_TYPES)
return
if match3_scene.has_method("set_tile_types"):
@@ -163,17 +204,25 @@ func _on_gem_types_changed(value: float):
gem_types_label.text = "Gem Types: " + str(new_value)
func _on_grid_width_changed(value: float):
# Rate limiting for scene searches
var current_time = Time.get_ticks_msec() / 1000.0
if current_time - last_scene_search_time < SCENE_SEARCH_COOLDOWN:
return
if not match3_scene:
_find_target_scene()
last_scene_search_time = current_time
if not match3_scene:
DebugManager.log_error("Could not find target scene for grid width change", log_category)
return
var new_width = int(value)
# Input validation
if new_width < grid_width_spinbox.min_value or new_width > grid_width_spinbox.max_value:
DebugManager.log_error("Invalid grid width value: %d (range: %d-%d)" % [new_width, grid_width_spinbox.min_value, grid_width_spinbox.max_value], log_category)
# Enhanced input validation with safety constants
if new_width < MIN_GRID_SIZE or new_width > MAX_GRID_SIZE:
DebugManager.log_error("Invalid grid width value: %d (range: %d-%d)" % [new_width, MIN_GRID_SIZE, MAX_GRID_SIZE], log_category)
# Reset to valid value
grid_width_spinbox.value = clamp(new_width, MIN_GRID_SIZE, MAX_GRID_SIZE)
return
grid_width_label.text = "Width: " + str(new_width)
@@ -188,17 +237,25 @@ func _on_grid_width_changed(value: float):
DebugManager.log_error("Target scene does not have set_grid_size method", log_category)
func _on_grid_height_changed(value: float):
# Rate limiting for scene searches
var current_time = Time.get_ticks_msec() / 1000.0
if current_time - last_scene_search_time < SCENE_SEARCH_COOLDOWN:
return
if not match3_scene:
_find_target_scene()
last_scene_search_time = current_time
if not match3_scene:
DebugManager.log_error("Could not find target scene for grid height change", log_category)
return
var new_height = int(value)
# Input validation
if new_height < grid_height_spinbox.min_value or new_height > grid_height_spinbox.max_value:
DebugManager.log_error("Invalid grid height value: %d (range: %d-%d)" % [new_height, grid_height_spinbox.min_value, grid_height_spinbox.max_value], log_category)
# Enhanced input validation with safety constants
if new_height < MIN_GRID_SIZE or new_height > MAX_GRID_SIZE:
DebugManager.log_error("Invalid grid height value: %d (range: %d-%d)" % [new_height, MIN_GRID_SIZE, MAX_GRID_SIZE], log_category)
# Reset to valid value
grid_height_spinbox.value = clamp(new_height, MIN_GRID_SIZE, MAX_GRID_SIZE)
return
grid_height_label.text = "Height: " + str(new_height)