From 1f24357f1f37ccf488fb0c6d166b0108a13aeb71 Mon Sep 17 00:00:00 2001 From: Snoweuph Date: Tue, 11 Apr 2023 22:39:58 +0200 Subject: [PATCH] Implement Controller Aim Rebind --- Prefabs/Settings Menu.tscn | 85 +++++++++++++++++++++++----- Scripts/SaveSystem/GameDataSaver.gd | 4 ++ Scripts/SaveSystem/GlobalSettings.gd | 6 +- 3 files changed, 80 insertions(+), 15 deletions(-) diff --git a/Prefabs/Settings Menu.tscn b/Prefabs/Settings Menu.tscn index f6aee97..1afcc5e 100644 --- a/Prefabs/Settings Menu.tscn +++ b/Prefabs/Settings Menu.tscn @@ -299,21 +299,42 @@ layout_mode = 2 text = "Move Up Controller " -[node name="MoveLeftController" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Label"] -custom_minimum_size = Vector2(0, 48) -layout_mode = 2 -text = "Move Left Controller" - [node name="MoveDownController" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Label"] custom_minimum_size = Vector2(0, 48) layout_mode = 2 text = "Move Down Controller" +[node name="MoveLeftController" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Label"] +custom_minimum_size = Vector2(0, 48) +layout_mode = 2 +text = "Move Left Controller" + [node name="MoveRightController" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Label"] custom_minimum_size = Vector2(0, 48) layout_mode = 2 text = "Move Right Controller" +[node name="AimUpController" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Label"] +custom_minimum_size = Vector2(0, 48) +layout_mode = 2 +text = "Aim Up Controller +" + +[node name="AimDownController" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Label"] +custom_minimum_size = Vector2(0, 48) +layout_mode = 2 +text = "Aim Down Controller" + +[node name="AimLeftController" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Label"] +custom_minimum_size = Vector2(0, 48) +layout_mode = 2 +text = "Aim Left Controller" + +[node name="AimRightController" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Label"] +custom_minimum_size = Vector2(0, 48) +layout_mode = 2 +text = "Aim Right Controller" + [node name="AttackController" type="Label" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Label"] custom_minimum_size = Vector2(0, 48) layout_mode = 2 @@ -382,14 +403,6 @@ script = ExtResource("2_4asaa") input_action_name = "move_up_controller" remap_controller = NodePath("../../../../../../../../../../Remap Controller") -[node name="MoveLeftRemapButton2" type="Button" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Item" node_paths=PackedStringArray("remap_controller")] -custom_minimum_size = Vector2(0, 48) -layout_mode = 2 -size_flags_horizontal = 3 -script = ExtResource("2_4asaa") -input_action_name = "move_left_controller" -remap_controller = NodePath("../../../../../../../../../../Remap Controller") - [node name="MoveDownControllerRemapButton" type="Button" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Item" node_paths=PackedStringArray("remap_controller")] custom_minimum_size = Vector2(0, 48) layout_mode = 2 @@ -398,6 +411,14 @@ script = ExtResource("2_4asaa") input_action_name = "move_down_controller" remap_controller = NodePath("../../../../../../../../../../Remap Controller") +[node name="MoveLeftControllerRemapButton" type="Button" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Item" node_paths=PackedStringArray("remap_controller")] +custom_minimum_size = Vector2(0, 48) +layout_mode = 2 +size_flags_horizontal = 3 +script = ExtResource("2_4asaa") +input_action_name = "move_left_controller" +remap_controller = NodePath("../../../../../../../../../../Remap Controller") + [node name="MoveRightControllerRemapButton" type="Button" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Item" node_paths=PackedStringArray("remap_controller")] custom_minimum_size = Vector2(0, 48) layout_mode = 2 @@ -407,6 +428,38 @@ script = ExtResource("2_4asaa") input_action_name = "move_right_controller" remap_controller = NodePath("../../../../../../../../../../Remap Controller") +[node name="AimUpControllerRemapButton" type="Button" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Item" node_paths=PackedStringArray("remap_controller")] +custom_minimum_size = Vector2(0, 48) +layout_mode = 2 +script = ExtResource("2_4asaa") +input_action_name = "aim_up_controller" +remap_controller = NodePath("../../../../../../../../../../Remap Controller") + +[node name="AimDownControllerRemapButton" type="Button" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Item" node_paths=PackedStringArray("remap_controller")] +custom_minimum_size = Vector2(0, 48) +layout_mode = 2 +size_flags_horizontal = 3 +script = ExtResource("2_4asaa") +input_action_name = "aim_down_controller" +remap_controller = NodePath("../../../../../../../../../../Remap Controller") + +[node name="AimLeftControllerRemapButton" type="Button" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Item" node_paths=PackedStringArray("remap_controller")] +custom_minimum_size = Vector2(0, 48) +layout_mode = 2 +size_flags_horizontal = 3 +script = ExtResource("2_4asaa") +input_action_name = "aim_left_controller" +remap_controller = NodePath("../../../../../../../../../../Remap Controller") + +[node name="AimRightControllerRemapButton" type="Button" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Item" node_paths=PackedStringArray("remap_controller")] +custom_minimum_size = Vector2(0, 48) +layout_mode = 2 +size_flags_horizontal = 3 +focus_neighbor_bottom = NodePath("../../../../../../../MarginContainer/Back Button") +script = ExtResource("2_4asaa") +input_action_name = "aim_right_controller" +remap_controller = NodePath("../../../../../../../../../../Remap Controller") + [node name="AttackControllerRemapButton" type="Button" parent="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Item" node_paths=PackedStringArray("remap_controller")] custom_minimum_size = Vector2(0, 48) layout_mode = 2 @@ -440,8 +493,12 @@ text = "Back" [connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Item/MoveRightRemapButton" to="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Item/MoveRightRemapButton" method="_on_pressed"] [connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Item/AttackRemapButton" to="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Item/AttackRemapButton" method="_on_pressed"] [connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Item/MoveUpControllerRemapButton" to="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Item/MoveUpControllerRemapButton" method="_on_pressed"] -[connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Item/MoveLeftRemapButton2" to="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Item/MoveLeftRemapButton2" method="_on_pressed"] [connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Item/MoveDownControllerRemapButton" to="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Item/MoveDownControllerRemapButton" method="_on_pressed"] +[connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Item/MoveLeftControllerRemapButton" to="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Item/MoveLeftControllerRemapButton" method="_on_pressed"] [connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Item/MoveRightControllerRemapButton" to="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Item/MoveRightControllerRemapButton" method="_on_pressed"] +[connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Item/AimUpControllerRemapButton" to="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Item/AimUpControllerRemapButton" method="_on_pressed"] +[connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Item/AimDownControllerRemapButton" to="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Item/AimDownControllerRemapButton" method="_on_pressed"] +[connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Item/AimLeftControllerRemapButton" to="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Item/AimLeftControllerRemapButton" method="_on_pressed"] +[connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Item/AimRightControllerRemapButton" to="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Item/AimRightControllerRemapButton" method="_on_pressed"] [connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Item/AttackControllerRemapButton" to="Panel/MarginContainer/VBoxContainer/SettingsTabs/Controls/ScrollView/MarginContainer/HBoxContainer/Item/AttackControllerRemapButton" method="_on_pressed"] [connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/MarginContainer/Back Button" to="." method="_on_back_pressed"] diff --git a/Scripts/SaveSystem/GameDataSaver.gd b/Scripts/SaveSystem/GameDataSaver.gd index 948c914..655ab13 100644 --- a/Scripts/SaveSystem/GameDataSaver.gd +++ b/Scripts/SaveSystem/GameDataSaver.gd @@ -26,6 +26,10 @@ func load_data(): "move_down_controller": "j" + str(JOY_AXIS_LEFT_Y) + "/1.00", "move_right_controller": "j" + str(JOY_AXIS_LEFT_X) + "/1.00", "attack_controller": "b" + str(JOY_BUTTON_A), + "aim_up_controller": "j" + str(JOY_AXIS_RIGHT_Y) + "/-1.00", + "aim_left_controller": "j" + str(JOY_AXIS_RIGHT_X) + "/-1.00", + "aim_down_controller": "j" + str(JOY_AXIS_RIGHT_Y) + "/1.00", + "aim_right_controller": "j" + str(JOY_AXIS_RIGHT_X) + "/1.00", } save_data() else: diff --git a/Scripts/SaveSystem/GlobalSettings.gd b/Scripts/SaveSystem/GlobalSettings.gd index 63954f8..4329fd1 100644 --- a/Scripts/SaveSystem/GlobalSettings.gd +++ b/Scripts/SaveSystem/GlobalSettings.gd @@ -14,7 +14,11 @@ extends Node "move_down_controller", "move_left_controller", "move_right_controller", - "attack_controller" + "attack_controller", + "aim_up_controller", + "aim_left_controller", + "aim_down_controller", + "aim_right_controller" ] const resolutions_dictionary : Dictionary = {