From 7bcf440eeaa28e897931abcdf757416d10bdf938 Mon Sep 17 00:00:00 2001 From: MeowcaTheoRange Date: Sat, 23 Nov 2024 22:14:32 -0600 Subject: [PATCH] Fix stupid shit --- scenes/config.tscn | 2 +- scripts/Config.gd | 4 ++-- scripts/GlobalConfigPreInit.gd | 4 ++-- scripts/config/open_file_dialog.gd | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scenes/config.tscn b/scenes/config.tscn index e39df68..4409380 100644 --- a/scenes/config.tscn +++ b/scenes/config.tscn @@ -76,7 +76,7 @@ custom_minimum_size = Vector2(40, 40) layout_mode = 2 size_flags_horizontal = 4 size_flags_vertical = 4 -tooltip_text = "Save and exit." +tooltip_text = "Reset your configuration." theme_override_fonts/font = ExtResource("2_pm82g") theme_override_font_sizes/font_size = 24 text = "reset_settings" diff --git a/scripts/Config.gd b/scripts/Config.gd index 9d1eed1..3039d73 100644 --- a/scripts/Config.gd +++ b/scripts/Config.gd @@ -85,8 +85,8 @@ var bpm_increase:Array[Key] = [ KEY_R ] var bpm_decrease:Array[Key] = [ KEY_F ] var bpm_tsincrease:Array[Key] = [ KEY_T ] var bpm_tsdecrease:Array[Key] = [ KEY_G ] -var bpm_opaincrease:Array[Key] = [ KEY_BRACELEFT ] -var bpm_opadecrease:Array[Key] = [ KEY_BRACERIGHT ] +var bpm_opaincrease:Array[Key] = [ KEY_Y ] +var bpm_opadecrease:Array[Key] = [ KEY_H ] var bpm_reset:Array[Key] = [ KEY_V ] # Bind modifiers diff --git a/scripts/GlobalConfigPreInit.gd b/scripts/GlobalConfigPreInit.gd index aa5fddc..78221b0 100644 --- a/scripts/GlobalConfigPreInit.gd +++ b/scripts/GlobalConfigPreInit.gd @@ -4,6 +4,8 @@ extends Config # Called when the node enters the scene tree for the first time. func _ready() -> void: load_from_file() + bind_keys() + print(InputMap.get_actions()) func bind_keys() -> void: bind_all_keys(self.bpm_increase, "bpm_increase") @@ -58,5 +60,3 @@ func load_from_file() -> void: var value = config.get_value("FunkPanion", key) if value != null: self[key] = value - - bind_keys() diff --git a/scripts/config/open_file_dialog.gd b/scripts/config/open_file_dialog.gd index df86654..a0b9e9e 100644 --- a/scripts/config/open_file_dialog.gd +++ b/scripts/config/open_file_dialog.gd @@ -32,7 +32,7 @@ func _ready() -> void: upload_file.pressed.connect(func(): if path.text.length() > 0: print("path text yes", path.text) - if FileAccess.file_exists(path.text) and path.text.findn("user://") != 0 and ProjectSettings.localize_path(path.text).findn("user://") != 0: + if FileAccess.file_exists(path.text) and path.text.findn("user://") != 0 and path.text.findn("res://") != 0 and ProjectSettings.localize_path(path.text).findn("user://") != 0: print("path exists") if not DirAccess.dir_exists_absolute("user://uploads/"): DirAccess.make_dir_absolute("user://uploads/")