From 9cad1e22bdfb74c9def3c8a15168458b6570a3b8 Mon Sep 17 00:00:00 2001 From: Antimundo Date: Wed, 3 Jan 2024 19:02:44 +0100 Subject: [PATCH] Refactor stuff --- scenes/main_menu/main_menu.gd | 16 ++++++++-------- scenes/main_menu/settings_controls.gd | 13 +++++-------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/scenes/main_menu/main_menu.gd b/scenes/main_menu/main_menu.gd index 4a8b1ae..ac6e336 100644 --- a/scenes/main_menu/main_menu.gd +++ b/scenes/main_menu/main_menu.gd @@ -3,25 +3,25 @@ extends Control @onready var panel := $HBoxContainer/Panel @onready var exit_button = $HBoxContainer/MarginContainer/VBoxContainer/Quit -func _ready(): +func _ready() -> void: hide_options() if OS.has_feature("web"): exit_button.visible = false -func _on_play_pressed(): +func _on_play_pressed() -> void: hide_options() $HBoxContainer/Panel/SelectLevel.visible = true -func _on_quit_pressed(): +func _on_quit_pressed() -> void: get_tree().quit() -func _on_settings_pressed(): +func _on_settings_pressed() -> void: hide_options() $HBoxContainer/Panel/Settings.visible = true - -func _on_source_code_pressed(): + +func _on_source_code_pressed() -> void: OS.shell_open("https://github.com/antimundo/libre-aim") - -func hide_options(): + +func hide_options() -> void: for child in panel.get_children(): child.visible = false diff --git a/scenes/main_menu/settings_controls.gd b/scenes/main_menu/settings_controls.gd index d1fd588..76c141e 100644 --- a/scenes/main_menu/settings_controls.gd +++ b/scenes/main_menu/settings_controls.gd @@ -7,19 +7,16 @@ const games_sensitivities: Dictionary = { @onready var game = $MarginContainer/VBoxContainer/HBoxContainer2/Game @onready var sensitivity = $MarginContainer/VBoxContainer/HBoxContainer2/Sensitivity -func _ready(): - AddGamesSensitivities() +func _ready() -> void: + for sens in games_sensitivities: + game.add_item(sens) var category = DataManager.categories.SETTINGS if DataManager.get_data(category, "sensitivity"): sensitivity.text = str(DataManager.get_data(category, "sensitivity")) if DataManager.get_data(category, "sensitivity_game"): game.selected = DataManager.get_data(category, "sensitivity_game") -func AddGamesSensitivities(): - for sens in games_sensitivities: - game.add_item(sens) - -func _on_sensitivity_text_changed(new_text): +func _on_sensitivity_text_changed(new_text) -> void: DataManager.save_data("sensitivity_game", game.get_selected_id(), \ DataManager.categories.SETTINGS) DataManager.save_data("sensitivity_game_value", games_sensitivities.get(game.get_item_text(game.get_selected_id())), \ @@ -27,7 +24,7 @@ func _on_sensitivity_text_changed(new_text): DataManager.save_data("sensitivity", float(new_text), \ DataManager.categories.SETTINGS) -func _on_game_item_selected(index): +func _on_game_item_selected(index) -> void: DataManager.save_data("sensitivity_game", index, \ DataManager.categories.SETTINGS) DataManager.save_data("sensitivity_game_value", games_sensitivities.get(game.get_item_text(index)), \